From 7b5a827abd46ee5700793f024f5e70f4a4a3e723 Mon Sep 17 00:00:00 2001 From: Jérémy Zurcher Date: Mon, 13 Oct 2014 14:03:47 +0200 Subject: Map: fix attackPawn: must mark attacks done whatever the dic roll --- core/src/ch/asynk/tankontank/game/Map.java | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/core/src/ch/asynk/tankontank/game/Map.java b/core/src/ch/asynk/tankontank/game/Map.java index 1df308f7..7f9e7ae2 100644 --- a/core/src/ch/asynk/tankontank/game/Map.java +++ b/core/src/ch/asynk/tankontank/game/Map.java @@ -267,11 +267,15 @@ public abstract class Map extends Board int activatedUnits = activatedPawns.size(); - if (dice == 2) return false; - if (dice == 12) return true; - - // TODO : flank attack - boolean success = (dice + activatedUnits >= hex.defenseFor(target, activatedPawns)); + boolean success; + if (dice == 2) { + success = false; + } else if (dice == 12) { + success = true; + } else { + // TODO : flank attack + success = (dice + activatedUnits >= hex.defenseFor(target, activatedPawns)); + } // TODO : free move for infantry for (Pawn p : activatedPawns) -- cgit v1.2.3