summaryrefslogtreecommitdiffstats
path: root/core
diff options
context:
space:
mode:
authorJérémy Zurcher <jeremy@asynk.ch>2014-11-16 13:29:10 +0100
committerJérémy Zurcher <jeremy@asynk.ch>2014-11-16 13:29:10 +0100
commit2dcb4ab821677c04d4edfdb288e4cf40036fb015 (patch)
tree775b536a0b423c10b240b784f39d03d60462c8fe /core
parentf4d9a5304161e90fefb79b609a4c9469d8fd80e1 (diff)
downloadRustAndDust-2dcb4ab821677c04d4edfdb288e4cf40036fb015.zip
RustAndDust-2dcb4ab821677c04d4edfdb288e4cf40036fb015.tar.gz
Battle: code reorder
Diffstat (limited to 'core')
-rw-r--r--core/src/ch/asynk/tankontank/game/battles/BattleFrontalAssault.java16
-rw-r--r--core/src/ch/asynk/tankontank/game/battles/BattleHeadToHead.java21
2 files changed, 19 insertions, 18 deletions
diff --git a/core/src/ch/asynk/tankontank/game/battles/BattleFrontalAssault.java b/core/src/ch/asynk/tankontank/game/battles/BattleFrontalAssault.java
index 4ed9f44..9942289 100644
--- a/core/src/ch/asynk/tankontank/game/battles/BattleFrontalAssault.java
+++ b/core/src/ch/asynk/tankontank/game/battles/BattleFrontalAssault.java
@@ -108,14 +108,6 @@ public class BattleFrontalAssault extends BattleCommon
geEntry.add(map.getHex(i, 1));
addEntryPoint(geEntry);
- EntryPoint usEntry = new EntryPoint(map, 10);
- usEntry.orientation = Orientation.SOUTH_EAST;
- for (int i = 4; i < 14; i++)
- usEntry.add(map.getHex(i, 8));
- for (int i = 4; i < 13; i++)
- usEntry.add(map.getHex(i, 7));
- addEntryPoint(usEntry);
-
Orientation o = Orientation.NORTH;
addReinforcement(gePlayer, geEntry, UnitId.GE_TIGER);
addReinforcement(gePlayer, geEntry, UnitId.GE_TIGER);
@@ -126,6 +118,14 @@ public class BattleFrontalAssault extends BattleCommon
addReinforcement(gePlayer, geEntry, UnitId.GE_PANZER_IV);
addReinforcement(gePlayer, geEntry, UnitId.GE_PANZER_IV);
+ EntryPoint usEntry = new EntryPoint(map, 10);
+ usEntry.orientation = Orientation.SOUTH_EAST;
+ for (int i = 4; i < 14; i++)
+ usEntry.add(map.getHex(i, 8));
+ for (int i = 4; i < 13; i++)
+ usEntry.add(map.getHex(i, 7));
+ addEntryPoint(usEntry);
+
o = Orientation.SOUTH;
addReinforcement(usPlayer, usEntry, UnitId.US_PRIEST);
addReinforcement(usPlayer, usEntry, UnitId.US_WOLVERINE);
diff --git a/core/src/ch/asynk/tankontank/game/battles/BattleHeadToHead.java b/core/src/ch/asynk/tankontank/game/battles/BattleHeadToHead.java
index 0ee2b19..c77d0e8 100644
--- a/core/src/ch/asynk/tankontank/game/battles/BattleHeadToHead.java
+++ b/core/src/ch/asynk/tankontank/game/battles/BattleHeadToHead.java
@@ -111,6 +111,17 @@ public class BattleHeadToHead extends BattleCommon
geEntry.add(map.getHex(4, 8));
addEntryPoint(geEntry);
+ Orientation o = Orientation.NORTH;
+ addReinforcement(gePlayer, geEntry, UnitId.GE_TIGER);
+ addReinforcement(gePlayer, geEntry, UnitId.GE_TIGER);
+ addReinforcement(gePlayer, geEntry, UnitId.GE_PANZER_IV_HQ);
+ addReinforcement(gePlayer, geEntry, UnitId.GE_PANZER_IV_HQ);
+ addReinforcement(gePlayer, geEntry, UnitId.GE_PANZER_IV);
+ addReinforcement(gePlayer, geEntry, UnitId.GE_PANZER_IV);
+ addReinforcement(gePlayer, geEntry, UnitId.GE_PANZER_IV);
+ addReinforcement(gePlayer, geEntry, UnitId.GE_PANZER_IV);
+
+
EntryPoint usEntry = new EntryPoint(map, 10);
usEntry.allowedMoves = (Orientation.SOUTH.s | Orientation.SOUTH_EAST.s | Orientation.SOUTH_WEST.s);
usEntry.add(map.getHex(9, 0));
@@ -124,16 +135,6 @@ public class BattleHeadToHead extends BattleCommon
usEntry.add(map.getHex(13, 8));
addEntryPoint(usEntry);
- Orientation o = Orientation.NORTH;
- addReinforcement(gePlayer, geEntry, UnitId.GE_TIGER);
- addReinforcement(gePlayer, geEntry, UnitId.GE_TIGER);
- addReinforcement(gePlayer, geEntry, UnitId.GE_PANZER_IV_HQ);
- addReinforcement(gePlayer, geEntry, UnitId.GE_PANZER_IV_HQ);
- addReinforcement(gePlayer, geEntry, UnitId.GE_PANZER_IV);
- addReinforcement(gePlayer, geEntry, UnitId.GE_PANZER_IV);
- addReinforcement(gePlayer, geEntry, UnitId.GE_PANZER_IV);
- addReinforcement(gePlayer, geEntry, UnitId.GE_PANZER_IV);
-
o = Orientation.SOUTH;
addReinforcement(usPlayer, usEntry, UnitId.US_PRIEST);
addReinforcement(usPlayer, usEntry, UnitId.US_WOLVERINE);