diff options
author | Jérémy Zurcher <jeremy@asynk.ch> | 2015-12-08 22:30:57 +0100 |
---|---|---|
committer | Jérémy Zurcher <jeremy@asynk.ch> | 2015-12-08 22:30:57 +0100 |
commit | 4688f1a831743ba3f3db06a02f41e9343d0c9f5b (patch) | |
tree | c9b637df62d45e705409df2a52da7d006fb06164 /core/src/ch/asynk/rustanddust/game | |
parent | adfbc1f7edcbfb0ca11e4cc5ca6450e4ff0df979 (diff) | |
download | RustAndDust-4688f1a831743ba3f3db06a02f41e9343d0c9f5b.zip RustAndDust-4688f1a831743ba3f3db06a02f41e9343d0c9f5b.tar.gz |
BattleTest: reorder code
Diffstat (limited to 'core/src/ch/asynk/rustanddust/game')
-rw-r--r-- | core/src/ch/asynk/rustanddust/game/battles/BattleTest.java | 30 |
1 files changed, 15 insertions, 15 deletions
diff --git a/core/src/ch/asynk/rustanddust/game/battles/BattleTest.java b/core/src/ch/asynk/rustanddust/game/battles/BattleTest.java index 7faa0cc..1532efd 100644 --- a/core/src/ch/asynk/rustanddust/game/battles/BattleTest.java +++ b/core/src/ch/asynk/rustanddust/game/battles/BattleTest.java @@ -54,21 +54,6 @@ public class BattleTest extends BattleCommon return true; } - private Unit setUnit(Map map, Player player, UnitId unitId, int col, int row, Orientation orientation, Zone exitZone) - { - return setUnit(map, player, unitId, col, row, orientation, false, exitZone); - } - - private Unit setUnit(Map map, Player player, UnitId unitId, int col, int row, Orientation orientation, boolean ace, Zone exitZone) - { - Unit u = factory.getUnit(unitId); - u.setAce(ace); - if (exitZone != null) - unitExit.put(u, exitZone); - map.setOnBoard(u, map.getHex(col, row), orientation); - return u; - } - @Override public Map setup(Ctrl ctrl) { @@ -118,4 +103,19 @@ public class BattleTest extends BattleCommon return this.map; } + + private Unit setUnit(Map map, Player player, UnitId unitId, int col, int row, Orientation orientation, Zone exitZone) + { + return setUnit(map, player, unitId, col, row, orientation, false, exitZone); + } + + private Unit setUnit(Map map, Player player, UnitId unitId, int col, int row, Orientation orientation, boolean ace, Zone exitZone) + { + Unit u = factory.getUnit(unitId); + u.setAce(ace); + if (exitZone != null) + unitExit.put(u, exitZone); + map.setOnBoard(u, map.getHex(col, row), orientation); + return u; + } } |