diff options
| author | Jérémy Zurcher <jeremy@asynk.ch> | 2014-11-06 15:53:40 +0100 |
|---|---|---|
| committer | Jérémy Zurcher <jeremy@asynk.ch> | 2014-11-06 15:53:40 +0100 |
| commit | f6469f181af872ee8387453bac0e884abc276fb4 (patch) | |
| tree | a9549f67328b3577987e467ff4d37bc273112f96 /core/src | |
| parent | 21592b3cf4f0904d2d3b7a70a95d76bcca6dcf69 (diff) | |
| download | RustAndDust-f6469f181af872ee8387453bac0e884abc276fb4.zip RustAndDust-f6469f181af872ee8387453bac0e884abc276fb4.tar.gz | |
BattleCommon: add protected TileSet objectives, use it in BattleHeadToHead
Diffstat (limited to 'core/src')
| -rw-r--r-- | core/src/ch/asynk/tankontank/game/battles/BattleCommon.java | 1 | ||||
| -rw-r--r-- | core/src/ch/asynk/tankontank/game/battles/BattleHeadToHead.java | 8 |
2 files changed, 6 insertions, 3 deletions
diff --git a/core/src/ch/asynk/tankontank/game/battles/BattleCommon.java b/core/src/ch/asynk/tankontank/game/battles/BattleCommon.java index e22d388..8d2c5fc 100644 --- a/core/src/ch/asynk/tankontank/game/battles/BattleCommon.java +++ b/core/src/ch/asynk/tankontank/game/battles/BattleCommon.java @@ -22,6 +22,7 @@ public abstract class BattleCommon implements Battle protected Factory factory; protected ArrayList<TileSet> entryPoints = new ArrayList<TileSet>(); protected HashMap<Unit, TileSet> pawnEntry = new HashMap<Unit, TileSet>(); + protected TileSet objectives; public BattleCommon(Factory factory) { diff --git a/core/src/ch/asynk/tankontank/game/battles/BattleHeadToHead.java b/core/src/ch/asynk/tankontank/game/battles/BattleHeadToHead.java index 28fa7dc..42c01d2 100644 --- a/core/src/ch/asynk/tankontank/game/battles/BattleHeadToHead.java +++ b/core/src/ch/asynk/tankontank/game/battles/BattleHeadToHead.java @@ -85,9 +85,11 @@ public class BattleHeadToHead extends BattleCommon gePlayer = a; } - map.showObjective(map.getHex(7, 7)); - map.showObjective(map.getHex(6, 4)); - map.showObjective(map.getHex(6, 1)); + objectives = new TileSet(map, 3); + objectives.add(map.getHex(7, 7)); + objectives.add(map.getHex(6, 4)); + objectives.add(map.getHex(6, 1)); + objectives.enable(Hex.OBJECTIVE, true); TileSet geEntry = new TileSet(map, 10); geEntry.add(map.getHex(0, 0)); |