summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--android/assets/images/hex.atlas15
-rw-r--r--android/assets/images/hex.pngbin15115 -> 18801 bytes
-rw-r--r--core/src/ch/asynk/tankontank/game/Hex.java7
-rw-r--r--data/hex/01_fog.png (renamed from data/hex/fog.png)bin10897 -> 10897 bytes
-rw-r--r--data/hex/02_blue.png (renamed from data/hex/blue.png)bin10935 -> 10935 bytes
-rw-r--r--data/hex/03_green.png (renamed from data/hex/green.png)bin10895 -> 10895 bytes
-rw-r--r--data/hex/04_red.png (renamed from data/hex/red.png)bin10931 -> 10931 bytes
-rw-r--r--data/hex/05_dot.pngbin0 -> 11330 bytes
8 files changed, 15 insertions, 7 deletions
diff --git a/android/assets/images/hex.atlas b/android/assets/images/hex.atlas
index 442ee78..ec0804e 100644
--- a/android/assets/images/hex.atlas
+++ b/android/assets/images/hex.atlas
@@ -3,31 +3,38 @@ hex.png
format: RGBA8888
filter: Nearest,Nearest
repeat: none
-blue
+01_fog
rotate: false
xy: 2, 2
size: 190, 217
orig: 190, 217
offset: 0, 0
index: -1
-fog
+02_blue
rotate: false
xy: 194, 2
size: 190, 217
orig: 190, 217
offset: 0, 0
index: -1
-green
+03_green
rotate: false
xy: 386, 2
size: 190, 217
orig: 190, 217
offset: 0, 0
index: -1
-red
+04_red
rotate: false
xy: 578, 2
size: 190, 217
orig: 190, 217
offset: 0, 0
index: -1
+05_dot
+ rotate: false
+ xy: 770, 2
+ size: 190, 217
+ orig: 190, 217
+ offset: 0, 0
+ index: -1
diff --git a/android/assets/images/hex.png b/android/assets/images/hex.png
index bccd7bc..6f8a399 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 238f47a..4af663d 100644
--- a/core/src/ch/asynk/tankontank/game/Hex.java
+++ b/core/src/ch/asynk/tankontank/game/Hex.java
@@ -20,10 +20,11 @@ public class Hex extends Tile
TOWN
}
- public static final int FOG = 1;
- public static final int RED = 3;
+ public static final int FOG = 0;
+ public static final int BLUE = 1;
public static final int GREEN = 2;
- public static final int BLUE = 0;
+ public static final int RED = 3;
+ public static final int DOT = 4;
public Terrain terrain;
public int roads;
diff --git a/data/hex/fog.png b/data/hex/01_fog.png
index 7d85d98..7d85d98 100644
--- a/data/hex/fog.png
+++ b/data/hex/01_fog.png
Binary files differ
diff --git a/data/hex/blue.png b/data/hex/02_blue.png
index 12fcba8..12fcba8 100644
--- a/data/hex/blue.png
+++ b/data/hex/02_blue.png
Binary files differ
diff --git a/data/hex/green.png b/data/hex/03_green.png
index 78b8f75..78b8f75 100644
--- a/data/hex/green.png
+++ b/data/hex/03_green.png
Binary files differ
diff --git a/data/hex/red.png b/data/hex/04_red.png
index 1320f4a..1320f4a 100644
--- a/data/hex/red.png
+++ b/data/hex/04_red.png
Binary files differ
diff --git a/data/hex/05_dot.png b/data/hex/05_dot.png
new file mode 100644
index 0000000..6c3a53c
--- /dev/null
+++ b/data/hex/05_dot.png
Binary files differ