Debugging the battle back when ignoring flags

README.md

@@ -34,6 +34,13 @@ image to appear.  The parameters are:
   * prune *n*: for the first *n* nodes in the tree, we only show the main line, not showing other subtrees
   * iterations, playouts: configure AI parameters
 
+# BUGS
+
+Recently I tried to fix a bug: if a unit ignores flags and stays in its hex, it should battle back.
+
+ - now the AI is broken
+ - the retreat UI does not work correctly
+
 # AI TESTS
 
   - Early game

src/model/commands/abstract_combat_command.js

@@ -64,7 +64,7 @@ export class AbstractCombatCommand extends Command {
             if (attackingUnit.side === game.currentSide) {
                 game.unshiftPhase(new AdvanceAfterCombatPhase(defendingHex, game.hexOfUnit(attackingUnit)));
             }
-            game.unshiftPhase(new RetreatPhase(attackingUnit, defendingUnit.side, defendingHex, flagResult.retreats));
+            game.unshiftPhase(new RetreatPhase(game.hexOfUnit(attackingUnit), defendingUnit.side, defendingHex, flagResult.retreats));
         }
         return events;
     }

src/model/phases/RetreatPhase.js

@@ -8,16 +8,16 @@ import { IgnoreFlagAndBattleBackCommand } from "../commands/abstract_combat_comm
 export class RetreatPhase extends Phase {
     /**
      * @param {Hex} attackingHex
-     * @param {Side} temporarySide
-     * @param {Hex} fromHex
-     * @param {Hex[]} toHexes
+     * @param {Side} defendingSide
+     * @param {Hex} defendingHex
+     * @param {Hex[]} retreatHexes
      */
-    constructor(attackingHex, temporarySide, fromHex, toHexes) {
+    constructor(attackingHex, defendingSide, defendingHex, retreatHexes) {
         super("retreat");
         this.attackingHex = attackingHex;
-        this.temporarySide = temporarySide;
-        this.fromHex = fromHex;
-        this.toHexes = toHexes;
+        this.temporarySide = defendingSide;
+        this.fromHex = defendingHex;
+        this.toHexes = retreatHexes;
     }
 
     validCommands(game) {