From d092218b596ae157d4432161626a084f4b7448c8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A9r=C3=A9my=20Zurcher?= Date: Sat, 1 Nov 2014 19:00:33 +0100 Subject: Hex,Map: add Hex.OBJECTIVE, howObjective(Hex) hideObjective(Hex) --- android/assets/data/tile-overlays.atlas | 7 +++++++ android/assets/data/tile-overlays.png | Bin 82517 -> 104203 bytes core/src/ch/asynk/tankontank/game/Hex.java | 1 + core/src/ch/asynk/tankontank/game/Map.java | 2 ++ data/assets/tile-overlays/06_objective.png | Bin 0 -> 23747 bytes 5 files changed, 10 insertions(+) create mode 100644 data/assets/tile-overlays/06_objective.png diff --git a/android/assets/data/tile-overlays.atlas b/android/assets/data/tile-overlays.atlas index dcd5bc9..e2821ed 100644 --- a/android/assets/data/tile-overlays.atlas +++ b/android/assets/data/tile-overlays.atlas @@ -45,3 +45,10 @@ repeat: none orig: 230, 240 offset: 0, 0 index: -1 +06_objective + rotate: false + xy: 618, 267 + size: 190, 217 + orig: 190, 217 + offset: 0, 0 + index: -1 diff --git a/android/assets/data/tile-overlays.png b/android/assets/data/tile-overlays.png index 89c339a..10c9a3c 100644 Binary files a/android/assets/data/tile-overlays.png and b/android/assets/data/tile-overlays.png differ diff --git a/core/src/ch/asynk/tankontank/game/Hex.java b/core/src/ch/asynk/tankontank/game/Hex.java index 47048b5..7c23392 100644 --- a/core/src/ch/asynk/tankontank/game/Hex.java +++ b/core/src/ch/asynk/tankontank/game/Hex.java @@ -28,6 +28,7 @@ public class Hex extends Tile public static final int MOVE = 3; public static final int DIRECTIONS = 4; public static final int ORIENTATION = 5; + public static final int OBJECTIVE = 6; public Terrain terrain; public int roads; diff --git a/core/src/ch/asynk/tankontank/game/Map.java b/core/src/ch/asynk/tankontank/game/Map.java index 93256ab..64d3329 100644 --- a/core/src/ch/asynk/tankontank/game/Map.java +++ b/core/src/ch/asynk/tankontank/game/Map.java @@ -319,6 +319,8 @@ public abstract class Map extends Board public void showBreakPawns() { breakPawns.enable(Unit.MOVE, true); } public void hideBreakPawns() { breakPawns.enable(Unit.MOVE, false); } + public void showObjective(Hex hex) { enableOverlayOn(hex, Hex.OBJECTIVE, true); } + public void hideObjective(Hex hex) { enableOverlayOn(hex, Hex.OBJECTIVE, true); } public void selectHex(Hex hex) { enableOverlayOn(hex, Hex.SELECT, true); } public void unselectHex(Hex hex) { enableOverlayOn(hex, Hex.SELECT, false); } diff --git a/data/assets/tile-overlays/06_objective.png b/data/assets/tile-overlays/06_objective.png new file mode 100644 index 0000000..e076771 Binary files /dev/null and b/data/assets/tile-overlays/06_objective.png differ -- cgit v1.1-2-g2b99