From aa525cbbde227b1bb84da62fbfa43f243cb1dff0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A9r=C3=A9my=20Zurcher?= Date: Wed, 1 Oct 2014 17:14:26 +0200 Subject: add hex overlays MOVE and ROSE --- android/assets/images/hex.atlas | 22 ++++++++++++++++++---- android/assets/images/hex.png | Bin 18801 -> 52654 bytes core/src/ch/asynk/tankontank/game/Hex.java | 2 ++ data/hex/06_move.png | Bin 0 -> 11005 bytes data/hex/07_rose.png | Bin 0 -> 18135 bytes 5 files changed, 20 insertions(+), 4 deletions(-) create mode 100644 data/hex/06_move.png create mode 100644 data/hex/07_rose.png diff --git a/android/assets/images/hex.atlas b/android/assets/images/hex.atlas index ec0804e..ede214a 100644 --- a/android/assets/images/hex.atlas +++ b/android/assets/images/hex.atlas @@ -12,29 +12,43 @@ repeat: none index: -1 02_blue rotate: false - xy: 194, 2 + xy: 234, 244 size: 190, 217 orig: 190, 217 offset: 0, 0 index: -1 03_green rotate: false - xy: 386, 2 + xy: 426, 244 size: 190, 217 orig: 190, 217 offset: 0, 0 index: -1 04_red rotate: false - xy: 578, 2 + xy: 618, 244 size: 190, 217 orig: 190, 217 offset: 0, 0 index: -1 05_dot rotate: false - xy: 770, 2 + xy: 810, 244 + size: 190, 217 + orig: 190, 217 + offset: 0, 0 + index: -1 +06_move + rotate: false + xy: 194, 2 size: 190, 217 orig: 190, 217 offset: 0, 0 index: -1 +07_rose + rotate: false + xy: 2, 221 + size: 230, 240 + orig: 230, 240 + offset: 0, 0 + index: -1 diff --git a/android/assets/images/hex.png b/android/assets/images/hex.png index 6f8a399..828e726 100644 Binary files a/android/assets/images/hex.png and b/android/assets/images/hex.png differ diff --git a/core/src/ch/asynk/tankontank/game/Hex.java b/core/src/ch/asynk/tankontank/game/Hex.java index 4af663d..8fb7be8 100644 --- a/core/src/ch/asynk/tankontank/game/Hex.java +++ b/core/src/ch/asynk/tankontank/game/Hex.java @@ -25,6 +25,8 @@ public class Hex extends Tile public static final int GREEN = 2; public static final int RED = 3; public static final int DOT = 4; + public static final int MOVE = 5; + public static final int ROSE = 6; public Terrain terrain; public int roads; diff --git a/data/hex/06_move.png b/data/hex/06_move.png new file mode 100644 index 0000000..e0204a9 Binary files /dev/null and b/data/hex/06_move.png differ diff --git a/data/hex/07_rose.png b/data/hex/07_rose.png new file mode 100644 index 0000000..fd9c7b7 Binary files /dev/null and b/data/hex/07_rose.png differ -- cgit v1.1-2-g2b99