Refac

Author: armin-reichert

pacman-app-arcade-pacman/src/main/java/de/amr/pacmanfx/arcade/pacman/ArcadeCommon_GameModel.java

@@ -12,7 +12,9 @@
 import de.amr.pacmanfx.model.GameLevel;
 import de.amr.pacmanfx.model.GateKeeper;
 import de.amr.pacmanfx.model.MapSelector;
+import de.amr.pacmanfx.model.actors.CommonAnimationID;
 import de.amr.pacmanfx.model.actors.Ghost;
+import de.amr.pacmanfx.model.actors.GhostState;
 import de.amr.pacmanfx.steering.Steering;
 import org.tinylog.Logger;
 
@@ -92,7 +94,8 @@ public void onGhostKilled(Ghost ghost) {
         int killedSoFar = level.victims().size();
         int points = 100 * KILLED_GHOST_VALUE_FACTORS[killedSoFar];
         level.victims().add(ghost);
-        ghost.eaten(killedSoFar);
+        ghost.setState(GhostState.EATEN);
+        ghost.selectAnimation(CommonAnimationID.ANIM_GHOST_NUMBER, killedSoFar);
         scoreManager().scorePoints(points);
         Logger.info("Scored {} points for killing {} at tile {}", points, ghost.name(), ghost.tile());
         level.registerGhostKilled();

pacman-app-arcade-pacman/src/test/java/TestEatingFood.java

@@ -21,7 +21,7 @@ static void setup() {
 
     @BeforeEach
     public void createGameLevel() {
-        theGameContext().game().buildNormalLevel(theGameContext(), 1);
+        theGameContext().game().buildNormalLevel(1);
     }
 
     private GameLevel gameLevel() { return theGameContext().gameLevel(); }

pacman-app-tengen-mspacman/src/main/java/de/amr/pacmanfx/tengen/ms_pacman/model/TengenMsPacMan_GameModel.java

@@ -733,7 +733,8 @@ public void onGhostKilled(Ghost ghost) {
         int killedSoFar = level.victims().size();
         int points = 100 * KILLED_GHOST_VALUE_FACTORS[killedSoFar];
         level.victims().add(ghost);
-        ghost.eaten(killedSoFar);
+        ghost.setState(GhostState.EATEN);
+        ghost.selectAnimation(CommonAnimationID.ANIM_GHOST_NUMBER, killedSoFar);
         scoreManager.scorePoints(points);
         Logger.info("Scored {} points for killing {} at tile {}", points, ghost.name(), ghost.tile());
     }

pacman-core/src/main/java/de/amr/pacmanfx/model/actors/Ghost.java

@@ -256,11 +256,6 @@ public void tick(GameContext gameContext) {
         }
     }
 
-    public void eaten(int index) {
-        setState(GhostState.EATEN);
-        selectAnimation(ANIM_GHOST_NUMBER, index);
-    }
-
     // --- LOCKED ---
 
     /**