From 1662f014d288f66772e303470ee44db23291b9e2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=A9r=C3=A9my=20Zurcher?= <jeremy@asynk.ch>
Date: Fri, 3 Oct 2014 23:54:03 +0200
Subject: images update

---
 android/assets/images/counters.atlas         |  27 +++++++-----
 android/assets/images/counters.pack          |  60 ---------------------------
 android/assets/images/counters.png           | Bin 288231 -> 298559 bytes
 core/src/ch/asynk/tankontank/TankOnTank.java |   4 +-
 data/counters/ap1.png                        | Bin 0 -> 20533 bytes
 data/counters/ap2.png                        | Bin 0 -> 22626 bytes
 data/counters/ap3.png                        | Bin 0 -> 22565 bytes
 data/counters/ap4.png                        | Bin 0 -> 22101 bytes
 data/counters/ap_1.png                       | Bin 20533 -> 0 bytes
 data/counters/ap_2.png                       | Bin 22626 -> 0 bytes
 data/counters/ap_3.png                       | Bin 22565 -> 0 bytes
 data/counters/ap_4.png                       | Bin 22101 -> 0 bytes
 data/counters/move.png                       | Bin 0 -> 8670 bytes
 13 files changed, 19 insertions(+), 72 deletions(-)
 delete mode 100644 android/assets/images/counters.pack
 create mode 100644 data/counters/ap1.png
 create mode 100644 data/counters/ap2.png
 create mode 100644 data/counters/ap3.png
 create mode 100644 data/counters/ap4.png
 delete mode 100644 data/counters/ap_1.png
 delete mode 100644 data/counters/ap_2.png
 delete mode 100644 data/counters/ap_3.png
 delete mode 100644 data/counters/ap_4.png
 create mode 100644 data/counters/move.png

diff --git a/android/assets/images/counters.atlas b/android/assets/images/counters.atlas
index 9f0de4a..f022234 100644
--- a/android/assets/images/counters.atlas
+++ b/android/assets/images/counters.atlas
@@ -10,34 +10,34 @@ ace
   orig: 124, 124
   offset: 0, 0
   index: -1
-ap
+ap1
   rotate: false
   xy: 2, 2
   size: 124, 124
   orig: 124, 124
   offset: 0, 0
-  index: 1
-ap
+  index: -1
+ap2
   rotate: false
   xy: 128, 128
   size: 124, 124
   orig: 124, 124
   offset: 0, 0
-  index: 2
-ap
+  index: -1
+ap3
   rotate: false
   xy: 128, 2
   size: 124, 124
   orig: 124, 124
   offset: 0, 0
-  index: 3
-ap
+  index: -1
+ap4
   rotate: false
   xy: 254, 128
   size: 124, 124
   orig: 124, 124
   offset: 0, 0
-  index: 4
+  index: -1
 ap_spent
   rotate: false
   xy: 254, 2
@@ -52,17 +52,24 @@ back
   orig: 124, 124
   offset: 0, 0
   index: -1
-turn_back
+move
   rotate: false
   xy: 380, 2
   size: 124, 124
   orig: 124, 124
   offset: 0, 0
   index: -1
-turn_front
+turn_back
   rotate: false
   xy: 506, 128
   size: 124, 124
   orig: 124, 124
   offset: 0, 0
   index: -1
+turn_front
+  rotate: false
+  xy: 506, 2
+  size: 124, 124
+  orig: 124, 124
+  offset: 0, 0
+  index: -1
diff --git a/android/assets/images/counters.pack b/android/assets/images/counters.pack
deleted file mode 100644
index 176d079..0000000
--- a/android/assets/images/counters.pack
+++ /dev/null
@@ -1,60 +0,0 @@
-counters.png
-format: RGBA8888
-filter: Nearest,Nearest
-repeat: none
-ace
-  rotate: false
-  xy: 1, 1
-  size: 124, 124
-  orig: 124, 124
-  offset: 0, 0
-  index: 1
-back
-  rotate: false
-  xy: 125, 1
-  size: 124, 124
-  orig: 124, 124
-  offset: 0, 0
-  index: 1
-ap-spent
-  rotate: false
-  xy: 249, 1
-  size: 124, 124
-  orig: 124, 124
-  offset: 0, 0
-  index: 1
-turn
-  rotate: false
-  xy: 373, 1
-  size: 124, 124
-  orig: 124, 124
-  offset: 0, 0
-  index: 1
-ap2
-  rotate: false
-  xy: 1, 125
-  size: 124, 124
-  orig: 124, 124
-  offset: 0, 0
-  index: 1
-ap3
-  rotate: false
-  xy: 125, 125
-  size: 124, 124
-  orig: 124, 124
-  offset: 0, 0
-  index: 1
-ap4
-  rotate: false
-  xy: 249, 125
-  size: 124, 124
-  orig: 124, 124
-  offset: 0, 0
-  index: 1
-turn-more
-  rotate: false
-  xy: 373, 125
-  size: 124, 124
-  orig: 124, 124
-  offset: 0, 0
-  index: 1
diff --git a/android/assets/images/counters.png b/android/assets/images/counters.png
index 1b493f9..88feeb9 100644
Binary files a/android/assets/images/counters.png and b/android/assets/images/counters.png differ
diff --git a/core/src/ch/asynk/tankontank/TankOnTank.java b/core/src/ch/asynk/tankontank/TankOnTank.java
index 49cd23b..2590c30 100644
--- a/core/src/ch/asynk/tankontank/TankOnTank.java
+++ b/core/src/ch/asynk/tankontank/TankOnTank.java
@@ -32,7 +32,7 @@ public class TankOnTank extends Game
         Gdx.app.debug("TankOnTank", "  load assets : " + (Gdx.app.getJavaHeap()/1024.0f) + "KB");
         manager.load("images/map_a.png", Texture.class);
         manager.load("images/map_b.png", Texture.class);
-        manager.load("images/counters.pack", TextureAtlas.class);
+        manager.load("images/counters.atlas", TextureAtlas.class);
         manager.load("images/ge.atlas", TextureAtlas.class);
         manager.load("images/us.atlas", TextureAtlas.class);
         manager.load("images/hex.atlas", TextureAtlas.class);
@@ -45,7 +45,7 @@ public class TankOnTank extends Game
         Gdx.app.debug("TankOnTank", "diagnostics:\n" + manager.getDiagnostics() );
         manager.unload("images/map_a.png");
         manager.unload("images/map_b.png");
-        manager.unload("images/counters.pack");
+        manager.unload("images/counters.atlas");
         manager.unload("images/ge.atlas");
         manager.unload("images/us.atlas");
         manager.unload("images/hex.atlas");
diff --git a/data/counters/ap1.png b/data/counters/ap1.png
new file mode 100644
index 0000000..c47d15e
Binary files /dev/null and b/data/counters/ap1.png differ
diff --git a/data/counters/ap2.png b/data/counters/ap2.png
new file mode 100644
index 0000000..e89956a
Binary files /dev/null and b/data/counters/ap2.png differ
diff --git a/data/counters/ap3.png b/data/counters/ap3.png
new file mode 100644
index 0000000..7d1b11f
Binary files /dev/null and b/data/counters/ap3.png differ
diff --git a/data/counters/ap4.png b/data/counters/ap4.png
new file mode 100644
index 0000000..e897628
Binary files /dev/null and b/data/counters/ap4.png differ
diff --git a/data/counters/ap_1.png b/data/counters/ap_1.png
deleted file mode 100644
index c47d15e..0000000
Binary files a/data/counters/ap_1.png and /dev/null differ
diff --git a/data/counters/ap_2.png b/data/counters/ap_2.png
deleted file mode 100644
index e89956a..0000000
Binary files a/data/counters/ap_2.png and /dev/null differ
diff --git a/data/counters/ap_3.png b/data/counters/ap_3.png
deleted file mode 100644
index 7d1b11f..0000000
Binary files a/data/counters/ap_3.png and /dev/null differ
diff --git a/data/counters/ap_4.png b/data/counters/ap_4.png
deleted file mode 100644
index e897628..0000000
Binary files a/data/counters/ap_4.png and /dev/null differ
diff --git a/data/counters/move.png b/data/counters/move.png
new file mode 100644
index 0000000..aaa0f98
Binary files /dev/null and b/data/counters/move.png differ
-- 
cgit v1.1-2-g2b99