diff options
| -rw-r--r-- | core/src/ch/asynk/rustanddust/game/Map.java | 10 | ||||
| -rw-r--r-- | core/src/ch/asynk/rustanddust/game/states/StateEngage.java | 8 | ||||
| -rw-r--r-- | core/src/ch/asynk/rustanddust/game/states/StateSelect.java | 4 |
3 files changed, 11 insertions, 11 deletions
diff --git a/core/src/ch/asynk/rustanddust/game/Map.java b/core/src/ch/asynk/rustanddust/game/Map.java index 4d68010..d597813 100644 --- a/core/src/ch/asynk/rustanddust/game/Map.java +++ b/core/src/ch/asynk/rustanddust/game/Map.java @@ -212,7 +212,7 @@ public abstract class Map extends Board implements MoveToAnimationCb, ObjectiveS return paths.toggleCtrlTile(hex); } - public int collectPossibleTargets(Unit unit, UnitList foes) + public int collectTargets(Unit unit, UnitList foes) { if (unit.canEngage()) return collectPossibleTargets(unit, foes.asPawns(), targetUnits.asPawns()); @@ -221,7 +221,7 @@ public abstract class Map extends Board implements MoveToAnimationCb, ObjectiveS return 0; } - public int collectMoveableUnits(Unit unit) + public int collectMoveable(Unit unit) { if (unit.canHQMove()) collectMoveAssists(unit, moveableUnits.asPawns()); @@ -234,14 +234,14 @@ public abstract class Map extends Board implements MoveToAnimationCb, ObjectiveS return moveableUnits.size(); } - public int collectAttackAssists(Unit unit, Unit target, UnitList units) + public int collectAssists(Unit unit, Unit target, UnitList units) { int s = collectAttackAssists(unit, target, units.asPawns(), assistUnits.asPawns()); activatedUnits.add(unit); return s; } - public boolean toggleAttackAssist(Unit unit) + public boolean toggleAssist(Unit unit) { if (activatedUnits.contains(unit)) { activatedUnits.remove(unit); @@ -261,7 +261,7 @@ public abstract class Map extends Board implements MoveToAnimationCb, ObjectiveS movesHide(); unitsHide(UnitType.MOVEABLE); movesCollect(unit); - collectMoveableUnits(unit); + collectMoveable(unit); movesShow(); unitsShow(UnitType.MOVEABLE); activatedUnits.clear(); diff --git a/core/src/ch/asynk/rustanddust/game/states/StateEngage.java b/core/src/ch/asynk/rustanddust/game/states/StateEngage.java index e2e655f..1ff4c56 100644 --- a/core/src/ch/asynk/rustanddust/game/states/StateEngage.java +++ b/core/src/ch/asynk/rustanddust/game/states/StateEngage.java @@ -19,7 +19,7 @@ public class StateEngage extends StateCommon activeUnit = null; // use selectedHex and selectedUnit map.unitsHide(UnitType.TARGETS); - map.collectPossibleTargets(selectedUnit, ctrl.opponent.units); + map.collectTargets(selectedUnit, ctrl.opponent.units); map.unitsShow(UnitType.TARGETS); if (to != null) { // quick fire -> replay touchUp @@ -88,7 +88,7 @@ public class StateEngage extends StateCommon to = upHex; activeUnit = unit; activeUnit.showTarget(); - map.collectAttackAssists(selectedUnit, activeUnit, ctrl.player.units); + map.collectAssists(selectedUnit, activeUnit, ctrl.player.units); map.unitsShow(UnitType.ASSISTS); ctrl.hud.actionButtons.show((ctrl.cfg.mustValidate ? Buttons.DONE.b : 0) | (ctrl.cfg.canCancel ? Buttons.ABORT.b : 0)); } @@ -96,8 +96,8 @@ public class StateEngage extends StateCommon ctrl.setState(StateType.DONE); } else if ((activeUnit != null) && map.unitsContains(UnitType.ASSISTS, unit)) { - map.toggleAttackAssist(unit); - // if(map.toggleAttackAssist(unit)) + map.toggleAssist(unit); + // if(map.toggleAssist(unit)) // ctrl.hud.notify(unit + " will fire"); // else // ctrl.hud.notify(unit + " wont fire"); diff --git a/core/src/ch/asynk/rustanddust/game/states/StateSelect.java b/core/src/ch/asynk/rustanddust/game/states/StateSelect.java index def2224..3ec2274 100644 --- a/core/src/ch/asynk/rustanddust/game/states/StateSelect.java +++ b/core/src/ch/asynk/rustanddust/game/states/StateSelect.java @@ -117,10 +117,10 @@ public class StateSelect extends StateCommon return; int moves = map.movesCollect(selectedUnit); - int targets = map.collectPossibleTargets(selectedUnit, (isEnemy ? ctrl.player.units : ctrl.opponent.units)); + int targets = map.collectTargets(selectedUnit, (isEnemy ? ctrl.player.units : ctrl.opponent.units)); if (moves > 0) - map.collectMoveableUnits(selectedUnit); + map.collectMoveable(selectedUnit); if ((moves > 0) || (targets > 0)) { map.hexSelect(selectedHex); |