From f931a3e108031a5c214ac2fa8fa2d9b6207fd5ed Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A9r=C3=A9my=20Zurcher?= Date: Wed, 1 Oct 2014 16:12:13 +0200 Subject: rework hex overheads images --- android/assets/images/hex.atlas | 15 +++++++++++---- android/assets/images/hex.png | Bin 15115 -> 18801 bytes core/src/ch/asynk/tankontank/game/Hex.java | 7 ++++--- data/hex/01_fog.png | Bin 0 -> 10897 bytes data/hex/02_blue.png | Bin 0 -> 10935 bytes data/hex/03_green.png | Bin 0 -> 10895 bytes data/hex/04_red.png | Bin 0 -> 10931 bytes data/hex/05_dot.png | Bin 0 -> 11330 bytes data/hex/blue.png | Bin 10935 -> 0 bytes data/hex/fog.png | Bin 10897 -> 0 bytes data/hex/green.png | Bin 10895 -> 0 bytes data/hex/red.png | Bin 10931 -> 0 bytes 12 files changed, 15 insertions(+), 7 deletions(-) create mode 100644 data/hex/01_fog.png create mode 100644 data/hex/02_blue.png create mode 100644 data/hex/03_green.png create mode 100644 data/hex/04_red.png create mode 100644 data/hex/05_dot.png delete mode 100644 data/hex/blue.png delete mode 100644 data/hex/fog.png delete mode 100644 data/hex/green.png delete mode 100644 data/hex/red.png 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 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 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/01_fog.png b/data/hex/01_fog.png new file mode 100644 index 0000000..7d85d98 Binary files /dev/null and b/data/hex/01_fog.png differ diff --git a/data/hex/02_blue.png b/data/hex/02_blue.png new file mode 100644 index 0000000..12fcba8 Binary files /dev/null and b/data/hex/02_blue.png differ diff --git a/data/hex/03_green.png b/data/hex/03_green.png new file mode 100644 index 0000000..78b8f75 Binary files /dev/null and b/data/hex/03_green.png differ diff --git a/data/hex/04_red.png b/data/hex/04_red.png new file mode 100644 index 0000000..1320f4a Binary files /dev/null and b/data/hex/04_red.png differ diff --git a/data/hex/05_dot.png b/data/hex/05_dot.png new file mode 100644 index 0000000..6c3a53c Binary files /dev/null and b/data/hex/05_dot.png differ diff --git a/data/hex/blue.png b/data/hex/blue.png deleted file mode 100644 index 12fcba8..0000000 Binary files a/data/hex/blue.png and /dev/null differ diff --git a/data/hex/fog.png b/data/hex/fog.png deleted file mode 100644 index 7d85d98..0000000 Binary files a/data/hex/fog.png and /dev/null differ diff --git a/data/hex/green.png b/data/hex/green.png deleted file mode 100644 index 78b8f75..0000000 Binary files a/data/hex/green.png and /dev/null differ diff --git a/data/hex/red.png b/data/hex/red.png deleted file mode 100644 index 1320f4a..0000000 Binary files a/data/hex/red.png and /dev/null differ -- cgit v1.1-2-g2b99