From f6469f181af872ee8387453bac0e884abc276fb4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A9r=C3=A9my=20Zurcher?= Date: Thu, 6 Nov 2014 15:53:40 +0100 Subject: BattleCommon: add protected TileSet objectives, use it in BattleHeadToHead --- core/src/ch/asynk/tankontank/game/battles/BattleCommon.java | 1 + 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 entryPoints = new ArrayList(); protected HashMap pawnEntry = new HashMap(); + 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)); -- cgit v1.1-2-g2b99