Refac

Author: armin-reichert

pacman-app-arcade-mspacman/src/main/java/de/amr/pacmanfx/arcade/ms_pacman/ArcadeMsPacMan_GameModel.java

@@ -199,10 +199,11 @@ protected LevelData createLevelData(int levelNumber) {
 
     private static final int DEMO_LEVEL_MIN_DURATION_SEC = 20;
 
-    private final ArcadeMsPacMan_HUDData hud = new ArcadeMsPacMan_HUDData();
-    private final ScoreManager scoreManager;
-    private final HuntingTimer huntingTimer;
-    private final ActorSpeedControl actorSpeedControl;
+    protected final MapSelector mapSelector;
+    protected final ArcadeMsPacMan_HUDData hud = new ArcadeMsPacMan_HUDData();
+    protected final ScoreManager scoreManager;
+    protected final HuntingTimer huntingTimer;
+    protected final ActorSpeedControl actorSpeedControl;
 
     /**
      * Called via reflection by builder.
@@ -263,6 +264,11 @@ public long huntingTicks(int levelNumber, int phaseIndex) {
         mapSelector.loadAllMaps();
     }
 
+    @Override
+    public MapSelector mapSelector() {
+        return mapSelector;
+    }
+
     @Override
     public ScoreManager scoreManager() {
         return scoreManager;
@@ -358,7 +364,7 @@ protected boolean isBonusReached() {
      * </table>
      * </p>
      */
-    private byte computeBonusSymbol(int levelNumber) {
+    protected byte computeBonusSymbol(int levelNumber) {
         if (levelNumber <= 7) return (byte) (levelNumber - 1);
         int coin = randomInt(0, 320);
         if (coin <  50) return 0; // 5/32 probability
@@ -438,7 +444,7 @@ public void activateNextBonus() {
         eventManager().publishEvent(GameEventType.BONUS_ACTIVATED, bonus.tile());
     }
 
-    private Portal randomPortal(GameLevel level) {
+    protected Portal randomPortal(GameLevel level) {
         return level.portals().get(new Random().nextInt(level.portals().size()));
     }
 

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

@@ -11,7 +11,6 @@
 import de.amr.pacmanfx.model.AbstractGameModel;
 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;
@@ -37,7 +36,6 @@ public abstract class ArcadeCommon_GameModel extends AbstractGameModel {
 
     protected final GameContext gameContext;
     protected GameLevel gameLevel;
-    protected MapSelector mapSelector;
     protected GateKeeper gateKeeper;
     protected Steering autopilot;
     protected Steering demoLevelSteering;
@@ -164,11 +162,6 @@ public void startNewGame() {
     @Override
     public Optional<GateKeeper> optGateKeeper() { return Optional.of(gateKeeper); }
 
-    @Override
-    public MapSelector mapSelector() {
-        return mapSelector;
-    }
-
     @Override
     public double pacPowerSeconds(GameLevel level) {
         return level.data().pacPowerSeconds();

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

@@ -168,15 +168,16 @@ protected static LevelData createLevelData(int levelNumber) {
     }
 
     // Note: level numbering starts with 1
-    private static final byte[] BONUS_SYMBOLS_BY_LEVEL_NUMBER = { -1, 0, 1, 2, 2, 3, 3, 4, 4, 5, 5, 6, 6, 7 };
+    protected static final byte[] BONUS_SYMBOLS_BY_LEVEL_NUMBER = { -1, 0, 1, 2, 2, 3, 3, 4, 4, 5, 5, 6, 6, 7 };
 
     // bonus points = multiplier * 100
-    private static final byte[] BONUS_VALUE_MULTIPLIERS = { 1, 3, 5, 7, 10, 20, 30, 50 };
+    protected static final byte[] BONUS_VALUE_MULTIPLIERS = { 1, 3, 5, 7, 10, 20, 30, 50 };
 
-    private final HUDData hud = new ArcadePacMan_HUDData();
-    private final ScoreManager scoreManager;
-    private final HuntingTimer huntingTimer;
-    private final ActorSpeedControl actorSpeedControl;
+    protected final MapSelector mapSelector;
+    protected final HUDData hud = new ArcadePacMan_HUDData();
+    protected final ScoreManager scoreManager;
+    protected final HuntingTimer huntingTimer;
+    protected final ActorSpeedControl actorSpeedControl;
 
     public ArcadePacMan_GameModel(GameContext gameContext, File highScoreFile) {
         this(gameContext, new ArcadePacMan_MapSelector(), highScoreFile);
@@ -248,6 +249,11 @@ public long huntingTicks(int levelNumber, int phaseIndex) {
         mapSelector.loadAllMaps();
     }
 
+    @Override
+    public MapSelector mapSelector() {
+        return mapSelector;
+    }
+
     @Override
     public ScoreManager scoreManager() {
         return scoreManager;

pacman-app-arcade-pacmanxxl/src/main/java/de/amr/pacmanfx/arcade/pacman_xxl/PacManXXL_MsPacMan_GameModel.java

@@ -8,14 +8,13 @@
 import de.amr.pacmanfx.arcade.ms_pacman.ArcadeMsPacMan_GameModel;
 import de.amr.pacmanfx.event.GameEventType;
 import de.amr.pacmanfx.model.MapSelectionMode;
-import de.amr.pacmanfx.model.MapSelector;
 
 import java.io.File;
 import java.util.Random;
 
 public class PacManXXL_MsPacMan_GameModel extends ArcadeMsPacMan_GameModel {
 
-    public PacManXXL_MsPacMan_GameModel(GameContext gameContext, MapSelector mapSelector, File higScoreFile) {
+    public PacManXXL_MsPacMan_GameModel(GameContext gameContext, PacManXXL_Common_MapSelector mapSelector, File higScoreFile) {
         super(gameContext, mapSelector, higScoreFile);
     }
 

pacman-app-arcade-pacmanxxl/src/main/java/de/amr/pacmanfx/arcade/pacman_xxl/PacManXXL_PacMan_GameModel.java

@@ -8,7 +8,6 @@
 import de.amr.pacmanfx.arcade.pacman.ArcadePacMan_GameModel;
 import de.amr.pacmanfx.event.GameEventType;
 import de.amr.pacmanfx.model.MapSelectionMode;
-import de.amr.pacmanfx.model.MapSelector;
 import de.amr.pacmanfx.steering.RuleBasedPacSteering;
 
 import java.io.File;
@@ -21,7 +20,7 @@
  */
 public class PacManXXL_PacMan_GameModel extends ArcadePacMan_GameModel {
 
-    public PacManXXL_PacMan_GameModel(GameContext gameContext, MapSelector mapSelector, File highSCoreFile) {
+    public PacManXXL_PacMan_GameModel(GameContext gameContext, PacManXXL_Common_MapSelector mapSelector, File highSCoreFile) {
         super(gameContext, mapSelector, highSCoreFile);
         // Demo level map could be custom map, so use generic automatic steering
         demoLevelSteering = new RuleBasedPacSteering(gameContext);