diff options
| author | Jérémy Zurcher <jeremy@asynk.ch> | 2015-12-08 11:32:46 +0100 |
|---|---|---|
| committer | Jérémy Zurcher <jeremy@asynk.ch> | 2015-12-08 11:32:46 +0100 |
| commit | 70faf6463cfdee8445f850cf1ab0360b7dc52568 (patch) | |
| tree | ef9ca7e53c5b899d83b0e365132b78ca9bb1d318 /core/src/ch/asynk/rustanddust/game/states | |
| parent | 336894f618fa128c600e12e201b20ab062334019 (diff) | |
| download | RustAndDust-70faf6463cfdee8445f850cf1ab0360b7dc52568.zip RustAndDust-70faf6463cfdee8445f850cf1ab0360b7dc52568.tar.gz | |
Map: simplify collectBlah method names
Diffstat (limited to 'core/src/ch/asynk/rustanddust/game/states')
| -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 |
2 files changed, 6 insertions, 6 deletions
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); |