diff options
| author | Jérémy Zurcher <jeremy@asynk.ch> | 2014-11-01 19:00:33 +0100 |
|---|---|---|
| committer | Jérémy Zurcher <jeremy@asynk.ch> | 2014-11-01 19:00:33 +0100 |
| commit | d092218b596ae157d4432161626a084f4b7448c8 (patch) | |
| tree | 74089177b7dff76bb9c36c56f0ae196b785c1912 | |
| parent | f8ce9bff9796a912a63d8c513a351f6c116883f5 (diff) | |
| download | RustAndDust-d092218b596ae157d4432161626a084f4b7448c8.zip RustAndDust-d092218b596ae157d4432161626a084f4b7448c8.tar.gz | |
Hex,Map: add Hex.OBJECTIVE, howObjective(Hex) hideObjective(Hex)
| -rw-r--r-- | android/assets/data/tile-overlays.atlas | 7 | ||||
| -rw-r--r-- | android/assets/data/tile-overlays.png | bin | 82517 -> 104203 bytes | |||
| -rw-r--r-- | core/src/ch/asynk/tankontank/game/Hex.java | 1 | ||||
| -rw-r--r-- | core/src/ch/asynk/tankontank/game/Map.java | 2 | ||||
| -rw-r--r-- | data/assets/tile-overlays/06_objective.png | bin | 0 -> 23747 bytes |
5 files changed, 10 insertions, 0 deletions
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 Binary files differindex 89c339a..10c9a3c 100644 --- a/android/assets/data/tile-overlays.png +++ b/android/assets/data/tile-overlays.png 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 Binary files differnew file mode 100644 index 0000000..e076771 --- /dev/null +++ b/data/assets/tile-overlays/06_objective.png |
