Map: moveableUnits,assistUnits,breakthroughUnits -> activableUnits

6 files changed, 14 insertions, 13 deletions

diff --git a/core/src/ch/asynk/rustanddust/game/states/StateBreak.java b/core/src/ch/asynk/rustanddust/game/states/StateBreak.java
index f94dfe6..317051d 100644
--- a/core/src/ch/asynk/rustanddust/game/states/StateBreak.java
+++ b/core/src/ch/asynk/rustanddust/game/states/StateBreak.java
@@ -15,13 +15,13 @@ public class StateBreak extends StateCommon
         activeUnit = null;
         ctrl.hud.actionButtons.show(Buttons.DONE.b);
         ctrl.hud.notify("Break Through possible");
-        map.unitsBreakThroughShow();
+        map.unitsActivableShow();
     }
 
     @Override
     public void leave(StateType nextState)
     {
-        map.unitsBreakThroughHide();
+        map.unitsActivableHide();
         map.hexMoveHide(to);
         map.hexDirectionsHide(to);
         if (activeUnit != null) map.hexMoveHide(activeUnit.getHex());
@@ -45,12 +45,12 @@ public class StateBreak extends StateCommon
         // TODO : cancel preview move before showing rotation
         if (activeUnit == null) {
             Unit unit = hex.getUnit();
-            if (map.unitsBreakThroughContains(unit)) {
+            if (map.unitsActivableContains(unit)) {
                 activeUnit = unit;
                 map.hexMoveShow(hex);
                 map.hexMoveShow(to);
                 map.hexDirectionsShow(to);
-                map.unitsBreakThroughHide();
+                map.unitsActivableHide();
             }
         } else {
             o = Orientation.fromAdj(to, hex);
diff --git a/core/src/ch/asynk/rustanddust/game/states/StateCommon.java b/core/src/ch/asynk/rustanddust/game/states/StateCommon.java
index 3d5ef9a..b894c0f 100644
--- a/core/src/ch/asynk/rustanddust/game/states/StateCommon.java
+++ b/core/src/ch/asynk/rustanddust/game/states/StateCommon.java
@@ -37,7 +37,7 @@ public abstract class StateCommon implements State
     {
         if (cfg.showMoves && unit.canMove()) map.movesShow();
         if (cfg.showTargets && unit.canEngage()) map.unitsTargetShow();
-        if (cfg.showMoveAssists && unit.canMove()) map.unitsMoveableShow();
+        if (cfg.showMoveAssists && unit.canMove()) map.unitsActivableShow();
         unit.hideActiveable();
     }
 
@@ -45,7 +45,7 @@ public abstract class StateCommon implements State
     {
         map.movesHide();
         map.unitsTargetHide();
-        map.unitsMoveableHide();
+        map.unitsActivableHide();
     }
 
     @Override
diff --git a/core/src/ch/asynk/rustanddust/game/states/StateEngage.java b/core/src/ch/asynk/rustanddust/game/states/StateEngage.java
index 37fed6c..c45acb6 100644
--- a/core/src/ch/asynk/rustanddust/game/states/StateEngage.java
+++ b/core/src/ch/asynk/rustanddust/game/states/StateEngage.java
@@ -49,11 +49,12 @@ public class StateEngage extends StateCommon
     @Override
     public StateType execute()
     {
+        map.unitsAssistHide();
         StateType nextState = StateType.DONE;
         if (map.engageUnit(selectedUnit, activeUnit)) {
             ctrl.battle.getPlayer().engagementWon += 1;
             ctrl.battle.getOpponent().casualty(activeUnit);
-            if (map.unitsBreakThroughSize() > 0) {
+            if (map.unitsActivableSize() > 0) {
                 nextState = StateType.BREAK;
             }
         } else {
@@ -85,7 +86,7 @@ public class StateEngage extends StateCommon
         else if (unit == activeUnit) {
             ctrl.setState(StateType.DONE);
         }
-        else if ((activeUnit != null) && map.unitsAssistContains(unit)) {
+        else if ((activeUnit != null) && map.unitsActivableContains(unit)) {
             map.toggleAssist(unit);
             // if (map.toggleAssist(unit))
             //     ctrl.hud.notify(unit + " will fire");
diff --git a/core/src/ch/asynk/rustanddust/game/states/StateMove.java b/core/src/ch/asynk/rustanddust/game/states/StateMove.java
index 16d5dd3..5e11f85 100644
--- a/core/src/ch/asynk/rustanddust/game/states/StateMove.java
+++ b/core/src/ch/asynk/rustanddust/game/states/StateMove.java
@@ -104,7 +104,7 @@ public class StateMove extends StateCommon
 
         Unit unit = hex.getUnit();
 
-        if (map.unitsMoveableContains(unit)) {
+        if (map.unitsActivableContains(unit)) {
             if (unit != activeUnit)
                 changeUnit(unit);
         } else if ((s == 0) && map.movesContains(hex)) {
@@ -116,7 +116,7 @@ public class StateMove extends StateCommon
 
     private void hideAssists()
     {
-        map.unitsMoveableHide();
+        map.unitsActivableHide();
     }
 
     private void changeUnit(Unit unit)
diff --git a/core/src/ch/asynk/rustanddust/game/states/StateRotate.java b/core/src/ch/asynk/rustanddust/game/states/StateRotate.java
index c2a96e8..7408472 100644
--- a/core/src/ch/asynk/rustanddust/game/states/StateRotate.java
+++ b/core/src/ch/asynk/rustanddust/game/states/StateRotate.java
@@ -12,7 +12,7 @@ public class StateRotate extends StateCommon
     @Override
     public void enter(StateType prevState)
     {
-        if (!cfg.showMoveAssists) map.unitsMoveableHide();
+        if (!cfg.showMoveAssists) map.unitsActivableHide();
 
         if (activeUnit == null)
             activeUnit = selectedUnit;
@@ -56,7 +56,7 @@ public class StateRotate extends StateCommon
             map.revertEnter(activeUnit);
             nextState = StateType.ABORT;
         } else if (map.unitsActivatedSize() == 0) {
-            map.unitsMoveableHide();
+            map.unitsActivableHide();
         } else {
             nextState = StateType.MOVE;
         }
diff --git a/core/src/ch/asynk/rustanddust/game/states/StateSelect.java b/core/src/ch/asynk/rustanddust/game/states/StateSelect.java
index 53c68ff..d6fb021 100644
--- a/core/src/ch/asynk/rustanddust/game/states/StateSelect.java
+++ b/core/src/ch/asynk/rustanddust/game/states/StateSelect.java
@@ -80,7 +80,7 @@ public class StateSelect extends StateCommon
 
         isEnemy = ctrl.battle.getPlayer().isEnemy(unit);
         if (!isEnemy && (unit == selectedUnit) && unit.canMove()) {
-            if (unit.isHq() && (map.unitsMoveableSize() > 1)) {
+            if (unit.isHq() && (map.unitsActivableSize() > 1)) {
                 ctrl.hud.notify("HQ activation");
                 select(hex, unit, isEnemy);
                 ctrl.setState(StateType.MOVE);