Evasion almost works

README.md

@@ -40,6 +40,8 @@ image to appear.  The parameters are:
 
 # WIP
 
+Must set the temporarySide to the opponent during evasion phases
+
 # AI TESTS
 
   - Early game
@@ -66,7 +68,6 @@ image to appear.  The parameters are:
 
 # TODO RULES
 
-- evasion
 - more cards
 - cavalry bonus movement
 - cavalry, chariot bonus combat

src/ai/__snapshots__/mcts_player.test.js.snap

@@ -51,38 +51,36 @@ exports[`2 on 2 1`] = `
 `;
 
 exports[`close combat from light to heavy 1`] = `
-"-24/30: undefined -> Roman play one card -> 1
- -24/30: PlayCard(Order Light Troops) -> Roman order 1 light units -> 1
-  -24/29: End phase -> Roman movement -> 1
-   -23/28: MacroCommand(Move [2,3] to [3,2]) -> Roman battle -> 1
+"-21/30: undefined -> Roman play one card -> 1
+ -21/30: PlayCard(Order Light Troops) -> Roman order 1 light units -> 1
+  -21/29: End phase -> Roman movement -> 1
+   -20/28: MacroCommand(Move [2,3] to [3,2]) -> Roman battle -> 1
     CHANCE/27: Close Combat from [3,2] to [2,2] -> Roman battle -> 5
-     -1/4: Close Combat from [3,2] to [2,2] -> Carthaginian retreat -> 2
-      1/4: Retreat [2,2] to [2,1] -> Roman advance after combat -> 2
-       0/1: Momentum advance [3,2] to [2,2] -> Roman battle -> 0
-       2/2: Skip Momentum Advance -> Roman battle -> 1
+     -3/3: Close Combat from [3,2] to [2,2] -> Carthaginian retreat -> 2
       0/0: Retreat [2,2] to [3,1] -> Roman advance after combat -> 0
-     -8/8: Close Combat from [3,2] to [2,2] -> Roman attacker retreat -> 3
-      -3/3: Retreat [3,2] to [2,4] -> Roman battle -> 1
-       2/2: End phase -> Carthaginian play one card -> 1
+      3/3: Retreat [2,2] to [2,1] -> Roman advance after combat -> 2
+       1/1: Momentum advance [3,2] to [2,2] -> Roman battle -> 0
+       1/1: Skip Momentum Advance -> Roman battle -> 1
+     -5/6: Close Combat from [3,2] to [2,2] -> Roman attacker retreat -> 3
       -2/2: Retreat [3,2] to [3,4] -> Roman battle -> 1
        2/2: End phase -> Carthaginian play one card -> 1
-      -3/3: Retreat [3,2] to [1,4] -> Roman battle -> 1
-       3/3: End phase -> Carthaginian play one card -> 1
-     -4/4: Close Combat from [3,2] to [2,2] -> Roman attacker retreat -> 3
       -2/2: Retreat [3,2] to [1,4] -> Roman battle -> 1
-       1/1: End phase -> Carthaginian play one card -> 0
-      -1/1: Retreat [3,2] to [3,4] -> Roman battle -> 1
-       1/1: End phase -> Carthaginian play one card -> 0
-      -1/1: Retreat [3,2] to [2,4] -> Roman battle -> 1
-       1/1: End phase -> Carthaginian play one card -> 0
-     3/3: Close Combat from [3,2] to [2,2] -> Carthaginian retreat -> 2
-      -3/3: Retreat [2,2] to [3,1] -> Roman advance after combat -> 2
-       -1/1: Momentum advance [3,2] to [2,2] -> Roman battle -> 0
-       -1/1: Skip Momentum Advance -> Roman battle -> 1
-      0/0: Retreat [2,2] to [2,1] -> Roman advance after combat -> 0
+       2/2: End phase -> Carthaginian play one card -> 1
+      -1/2: Retreat [3,2] to [2,4] -> Roman battle -> 1
+       0/1: End phase -> Carthaginian play one card -> 0
      -7/7: Close Combat from [3,2] to [2,2] -> Roman battle -> 1
       7/7: End phase -> Carthaginian play one card -> 1
        6/6: PlayCard(Order Heavy Troops) -> Carthaginian order 1 heavy units -> 1
+     -9/9: Close Combat from [3,2] to [2,2] -> Roman attacker retreat -> 3
+      -3/3: Retreat [3,2] to [1,4] -> Roman battle -> 1
+       2/2: End phase -> Carthaginian play one card -> 1
+      -3/3: Retreat [3,2] to [3,4] -> Roman battle -> 1
+       3/3: End phase -> Carthaginian play one card -> 1
+      -3/3: Retreat [3,2] to [2,4] -> Roman battle -> 1
+       3/3: End phase -> Carthaginian play one card -> 1
+     0/1: Close Combat from [3,2] to [2,2] -> Carthaginian retreat -> 2
+      0/1: Retreat [2,2] to [3,1] -> Roman advance after combat -> 0
+      0/0: Retreat [2,2] to [2,1] -> Roman advance after combat -> 0
 "
 `;
 

src/model/commands/EvadeCommand.js

@@ -14,8 +14,8 @@ export class EvadeCommand extends Command {
     }
 
     play(game) {
-        game.shiftPhase();
         game.moveUnit(this.toHex, this.fromHex);
+        game.endPhase();
         return [new DefenderEvasionEvent(this.toHex, this.fromHex)];
     }
 

src/model/phases/BattlePhase.js

@@ -21,11 +21,11 @@ export class BattlePhase extends Phase {
             }
             attackingUnit.validCloseCombatTargets(attackingHex, game).forEach(defendingHex => {
                 const defendingUnit = game.unitAt(defendingHex);
-                // if (defendingUnit.canEvade(attackingUnit) && game.evasionPaths(defendingHex).length > 0) {
-                //     commands.push(new AskOpponentIfTheyIntendToEvadeCommand(defendingHex, attackingHex));
-                // } else {
+                if (defendingUnit.canEvade(attackingUnit) && game.evasionPaths(defendingHex).length > 0) {
+                    commands.push(new AskOpponentIfTheyIntendToEvadeCommand(defendingHex, attackingHex));
+                } else {
                     commands.push(new CloseCombatCommand(defendingHex, attackingHex));
-                // }
+                }
             });
             attackingUnit.validRangedCombatTargets(attackingHex, game).forEach(to => {
                 commands.push(new RangedCombatCommand(to, attackingHex));

src/model/scenarios.js

@@ -145,8 +145,8 @@ export class HeavyVersusLightScenario extends Scenario {
         board.placeUnit(hexOf(-1, 6), new units.RomanHeavyInfantry());
         board.placeUnit(hexOf(0, 6), new units.RomanHeavyInfantry());
 
-        board.placeUnit(hexOf(0, 4), new units.CarthaginianLightInfantry());
-        board.placeUnit(hexOf(1, 4), new units.CarthaginianLightInfantry());
+        board.placeUnit(hexOf(0, 5), new units.CarthaginianLightInfantry());
+        board.placeUnit(hexOf(1, 5), new units.CarthaginianLightInfantry());
     }
 }