summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJérémy Zurcher <jeremy@asynk.ch>2014-10-01 17:14:26 +0200
committerJérémy Zurcher <jeremy@asynk.ch>2014-10-01 17:14:26 +0200
commitaa525cbbde227b1bb84da62fbfa43f243cb1dff0 (patch)
tree7ebdf39d3491075d52d402402ced5d10c46f0739
parentf931a3e108031a5c214ac2fa8fa2d9b6207fd5ed (diff)
downloadRustAndDust-aa525cbbde227b1bb84da62fbfa43f243cb1dff0.zip
RustAndDust-aa525cbbde227b1bb84da62fbfa43f243cb1dff0.tar.gz
add hex overlays MOVE and ROSE
-rw-r--r--android/assets/images/hex.atlas22
-rw-r--r--android/assets/images/hex.pngbin18801 -> 52654 bytes
-rw-r--r--core/src/ch/asynk/tankontank/game/Hex.java2
-rw-r--r--data/hex/06_move.pngbin0 -> 11005 bytes
-rw-r--r--data/hex/07_rose.pngbin0 -> 18135 bytes
5 files changed, 20 insertions, 4 deletions
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
--- a/android/assets/images/hex.png
+++ b/android/assets/images/hex.png
Binary files 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
--- /dev/null
+++ b/data/hex/06_move.png
Binary files differ
diff --git a/data/hex/07_rose.png b/data/hex/07_rose.png
new file mode 100644
index 0000000..fd9c7b7
--- /dev/null
+++ b/data/hex/07_rose.png
Binary files differ