Board,Map: add attack(Pawn, Pawn, boolean) to recompute and validate attack

2 files changed, 7 insertions, 0 deletions

diff --git a/core/src/ch/asynk/tankontank/engine/Board.java b/core/src/ch/asynk/tankontank/engine/Board.java
index b8aead6..a097454 100644
--- a/core/src/ch/asynk/tankontank/engine/Board.java
+++ b/core/src/ch/asynk/tankontank/engine/Board.java
@@ -465,6 +465,12 @@ public abstract class Board implements Disposable, Animation
         pawn.revertLastMove();
     }
 
+    public void attack(final Pawn pawn, final Pawn target, boolean clearVisibility)
+    {
+        if (!pawn.canEngage(target) || !searchBoard.canAttack(pawn, target, clearVisibility))
+            throw new RuntimeException(String.format("%s cannot attack %s", pawn, target));
+    }
+
     public Tile getTileAt(float mx, float my)
     {
         // compute row
diff --git a/core/src/ch/asynk/tankontank/game/Map.java b/core/src/ch/asynk/tankontank/game/Map.java
index 2ef7749..b3b1ed3 100644
--- a/core/src/ch/asynk/tankontank/game/Map.java
+++ b/core/src/ch/asynk/tankontank/game/Map.java
@@ -544,6 +544,7 @@ public abstract class Map extends Board implements MoveToAnimationCb, ObjectiveS
 
     public boolean engageUnit(Unit unit, final Unit target)
     {
+        attack(unit, target, true);
 
         boolean success = resolveFight(unit, target, engagement);