Naming attack -> engagement - move -> movement

4 files changed, 10 insertions, 10 deletions

diff --git a/core/src/ch/asynk/tankontank/game/states/StateCommon.java b/core/src/ch/asynk/tankontank/game/states/StateCommon.java
index 7c71a9a..9dbd177 100644
--- a/core/src/ch/asynk/tankontank/game/states/StateCommon.java
+++ b/core/src/ch/asynk/tankontank/game/states/StateCommon.java
@@ -64,7 +64,7 @@ public abstract class StateCommon implements State
     protected void showPossibilities(Unit pawn)
     {
         if (ctrl.cfg.showMoves && pawn.canMove()) map.showPossibleMoves();
-        if (ctrl.cfg.showTargets && pawn.canAttack()) map.showPossibleTargets();
+        if (ctrl.cfg.showTargets && pawn.canEngage()) map.showPossibleTargets();
         if (ctrl.cfg.showMoveAssists && pawn.canMove()) map.showMoveablePawns();
     }
 
diff --git a/core/src/ch/asynk/tankontank/game/states/StateEngage.java b/core/src/ch/asynk/tankontank/game/states/StateEngage.java
index c157a69..af461e8 100644
--- a/core/src/ch/asynk/tankontank/game/states/StateEngage.java
+++ b/core/src/ch/asynk/tankontank/game/states/StateEngage.java
@@ -56,17 +56,17 @@ public class StateEngage extends StateCommon
         StateType nextState = StateType.DONE;
         int d1 = ctrl.player.d6();
         int d2 = ctrl.player.d6();
-        if (map.attackPawn(selectedUnit, activeUnit, d1, d2)) {
-            ctrl.player.wonAttackCount += 1;
-            ctrl.hud.notify(selectedUnit.attack.calculus + " : " + activeUnit + " is destroyed");
+        if (map.engagePawn(selectedUnit, activeUnit, d1, d2)) {
+            ctrl.player.wonEngagementCount += 1;
+            ctrl.hud.notify(selectedUnit.engagement.calculus + " : " + activeUnit + " is destroyed");
             ctrl.opponent.casualty(activeUnit);
             if (map.breakPawns.size() > 0) {
                 ctrl.hud.pushNotify("Break move possible");
                 nextState = StateType.BREAK;
             }
         } else {
-            ctrl.player.lostAttackCount += 1;
-            ctrl.hud.notify(selectedUnit.attack.calculus + " : failure");
+            ctrl.player.lostEngagementCount += 1;
+            ctrl.hud.notify(selectedUnit.engagement.calculus + " : failure");
         }
 
         activeUnit.showTarget();
@@ -97,7 +97,7 @@ public class StateEngage extends StateCommon
             ctrl.hud.actionButtons.show(Buttons.ENGAGE.b | Buttons.DONE.b | ((ctrl.cfg.canCancel) ? Buttons.ABORT.b : 0));
         }
 
-        if ((activeUnit != null) && map.attackAssists.contains(unit)) {
+        if ((activeUnit != null) && map.engagementAssists.contains(unit)) {
             if(map.toggleAttackAssist(unit))
                 ctrl.hud.notify(unit + " will fire");
             else
diff --git a/core/src/ch/asynk/tankontank/game/states/StateMove.java b/core/src/ch/asynk/tankontank/game/states/StateMove.java
index fbc71ea..333f1b0 100644
--- a/core/src/ch/asynk/tankontank/game/states/StateMove.java
+++ b/core/src/ch/asynk/tankontank/game/states/StateMove.java
@@ -58,7 +58,7 @@ public class StateMove extends StateCommon
         hideAssists();
         ctrl.setAnimationCount(map.activatedPawns.size());
         map.revertMoves();
-        if (activeUnit.move.entryMove) {
+        if (activeUnit.movement.entryMove) {
             map.leaveBoard(activeUnit);
             ctrl.player.revertUnitEntry(activeUnit);
         }
diff --git a/core/src/ch/asynk/tankontank/game/states/StateRotate.java b/core/src/ch/asynk/tankontank/game/states/StateRotate.java
index 2066a8a..ec085b0 100644
--- a/core/src/ch/asynk/tankontank/game/states/StateRotate.java
+++ b/core/src/ch/asynk/tankontank/game/states/StateRotate.java
@@ -47,7 +47,7 @@ public class StateRotate extends StateCommon
     {
         StateType nextState = StateType.ABORT;
         ctrl.hud.actionButtons.hide();
-        if (activeUnit.move.entryMove) {
+        if (activeUnit.movement.entryMove) {
             map.leaveBoard(activeUnit);
             ctrl.player.revertUnitEntry(activeUnit);
         }
@@ -81,7 +81,7 @@ public class StateRotate extends StateCommon
         o = Orientation.fromAdj(to.getCol(), to.getRow(), downHex.getCol(), downHex.getRow());
 
         if (o == Orientation.KEEP) return;
-        if (!activeUnit.move.entryMove && rotateOnly && (o == activeUnit.getOrientation())) return;
+        if (!activeUnit.movement.entryMove && rotateOnly && (o == activeUnit.getOrientation())) return;
         rotationSet = true;