refactor other scenarios for worm state changes

Half-Shot · Dec 28, 2024 · fe2852d · fe2852d
1 parent 89a8fa4
commit fe2852d
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 12 deletions.
diff --git a/src/entities/playable/remoteWorm.ts b/src/entities/playable/remoteWorm.ts
@@ -3,10 +3,11 @@ import { WormInstance } from "../../logic/teams";
 import { Toaster } from "../../overlays/toaster";
 import { Coordinate } from "../../utils";
 import { GameWorld } from "../../world";
-import { FireFn, Worm, WormState } from "./worm";
+import { FireFn, Worm } from "./worm";
 import { StateWormAction } from "../../state/model";
 import { InputKind } from "../../input";
 import Logger from "../../log";
+import { InnerWormState } from "./wormState";
 
 const logger = new Logger("RemoteWorm");
 
@@ -78,7 +79,7 @@ export class RemoteWorm extends Worm {
   }
 
   update(dt: number): void {
-    if (this.state === WormState.Firing) {
+    if (this.state.isFiring) {
       if (
         this.remoteWeaponFiringDuration === undefined ||
         this.fireWeaponDuration > this.remoteWeaponFiringDuration
@@ -90,12 +91,12 @@ export class RemoteWorm extends Worm {
     }
     super.update(dt);
     if (
-      this.state === WormState.MovingLeft ||
-      this.state === WormState.MovingRight
+      this.state.state === InnerWormState.MovingLeft ||
+      this.state.state === InnerWormState.MovingRight
     ) {
       this.movementCyclesLeft -= 1;
       if (this.movementCyclesLeft === 0) {
-        this.state = WormState.Idle;
+        this.state.transition(InnerWormState.Idle);
       }
     }
   }

diff --git a/src/scenarios/netGame.ts b/src/scenarios/netGame.ts
@@ -3,7 +3,7 @@ import { Background } from "../entities/background";
 import { BitmapTerrain } from "../entities/bitmapTerrain";
 import type { Game } from "../game";
 import { Water } from "../entities/water";
-import { Worm, WormState } from "../entities/playable/worm";
+import { Worm } from "../entities/playable/worm";
 import { Coordinate, MetersValue } from "../utils/coodinate";
 import { GameState } from "../logic/gamestate";
 import { TeamGroup } from "../logic/teams";
@@ -172,7 +172,7 @@ export default async function runScenario(game: Game) {
       }
       return;
     }
-    if (currentWorm && currentWorm.currentState !== WormState.Inactive) {
+    if (currentWorm && currentWorm.currentState.active) {
       return;
     }
     if (endOfRoundWaitDuration === null) {

diff --git a/src/scenarios/replayTesting.ts b/src/scenarios/replayTesting.ts
@@ -3,7 +3,7 @@ import { Background } from "../entities/background";
 import { BitmapTerrain } from "../entities/bitmapTerrain";
 import type { Game } from "../game";
 import { Water } from "../entities/water";
-import { Worm, WormState } from "../entities/playable/worm";
+import { Worm } from "../entities/playable/worm";
 import { Coordinate, MetersValue } from "../utils/coodinate";
 import { GameState } from "../logic/gamestate";
 import { GameStateOverlay } from "../overlays/gameStateOverlay";
@@ -209,7 +209,7 @@ export default async function runScenario(game: Game) {
       }
       return;
     }
-    if (currentWorm && currentWorm.currentState !== WormState.Inactive) {
+    if (currentWorm && currentWorm.currentState.active) {
       return;
     }
     if (endOfRoundWaitDuration === null) {

diff --git a/src/scenarios/testingGround.ts b/src/scenarios/testingGround.ts
@@ -3,7 +3,7 @@ import { Background } from "../entities/background";
 import { BitmapTerrain } from "../entities/bitmapTerrain";
 import type { Game } from "../game";
 import { Water } from "../entities/water";
-import { Worm, WormState } from "../entities/playable/worm";
+import { Worm } from "../entities/playable/worm";
 import { Coordinate, MetersValue } from "../utils/coodinate";
 import { GameState } from "../logic/gamestate";
 import { TeamGroup } from "../logic/teams";
@@ -159,7 +159,7 @@ export default async function runScenario(game: Game) {
   });
   weaponText.position.set(20, 50);
   staticController.on("inputEnd", (kind: InputKind) => {
-    if (currentWorm?.currentState !== WormState.Idle) {
+    if (currentWorm?.currentState.showWeapon) {
       return;
     }
     if (kind === InputKind.WeaponMenu) {
@@ -188,7 +188,7 @@ export default async function runScenario(game: Game) {
       }
       return;
     }
-    if (currentWorm && currentWorm.currentState !== WormState.Inactive) {
+    if (currentWorm && currentWorm.currentState.active) {
       return;
     }
     if (endOfRoundWaitDuration === null) {