From f11240a49bcaee2841a468fcd25466d43b30365b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=A9r=C3=A9my=20Zurcher?= <jeremy@asynk.ch>
Date: Sun, 14 Sep 2014 00:57:26 +0200
Subject: pack textures

---
 android/assets/images/ace.png                | Bin 17386 -> 0 bytes
 android/assets/images/ap_2.png               | Bin 22626 -> 0 bytes
 android/assets/images/ap_3.png               | Bin 22565 -> 0 bytes
 android/assets/images/ap_4.png               | Bin 22101 -> 0 bytes
 android/assets/images/ap_spent.png           | Bin 24185 -> 0 bytes
 android/assets/images/back.png               | Bin 17872 -> 0 bytes
 android/assets/images/counters.pack          |  60 +++++++++++++++++++++++++++
 android/assets/images/counters.png           | Bin 0 -> 153395 bytes
 android/assets/images/ge.pack                |  53 +++++++++++++++++++++++
 android/assets/images/ge.png                 | Bin 0 -> 155125 bytes
 android/assets/images/ge_atgun.png           | Bin 24241 -> 0 bytes
 android/assets/images/ge_infantry.png        | Bin 24975 -> 0 bytes
 android/assets/images/ge_kingtiger.png       | Bin 21611 -> 0 bytes
 android/assets/images/ge_panzer_iv.png       | Bin 23997 -> 0 bytes
 android/assets/images/ge_panzer_iv_hq.png    | Bin 24495 -> 0 bytes
 android/assets/images/ge_tiger.png           | Bin 22277 -> 0 bytes
 android/assets/images/ge_wespe.png           | Bin 23084 -> 0 bytes
 android/assets/images/turn_back.png          | Bin 18221 -> 0 bytes
 android/assets/images/turn_front.png         | Bin 17210 -> 0 bytes
 android/assets/images/us.pack                |  60 +++++++++++++++++++++++++++
 android/assets/images/us.png                 | Bin 0 -> 168542 bytes
 android/assets/images/us_atgun.png           | Bin 24693 -> 0 bytes
 android/assets/images/us_infantry.png        | Bin 26139 -> 0 bytes
 android/assets/images/us_pershing.png        | Bin 29109 -> 0 bytes
 android/assets/images/us_pershing_hq.png     | Bin 24763 -> 0 bytes
 android/assets/images/us_priest.png          | Bin 24587 -> 0 bytes
 android/assets/images/us_sherman.png         | Bin 25072 -> 0 bytes
 android/assets/images/us_sherman_hq.png      | Bin 25383 -> 0 bytes
 android/assets/images/us_wolverine.png       | Bin 25188 -> 0 bytes
 core/src/ch/asynk/tankontank/TankOnTank.java |  60 +++++----------------------
 30 files changed, 183 insertions(+), 50 deletions(-)
 delete mode 100644 android/assets/images/ace.png
 delete mode 100644 android/assets/images/ap_2.png
 delete mode 100644 android/assets/images/ap_3.png
 delete mode 100644 android/assets/images/ap_4.png
 delete mode 100644 android/assets/images/ap_spent.png
 delete mode 100644 android/assets/images/back.png
 create mode 100644 android/assets/images/counters.pack
 create mode 100644 android/assets/images/counters.png
 create mode 100644 android/assets/images/ge.pack
 create mode 100644 android/assets/images/ge.png
 delete mode 100644 android/assets/images/ge_atgun.png
 delete mode 100644 android/assets/images/ge_infantry.png
 delete mode 100644 android/assets/images/ge_kingtiger.png
 delete mode 100644 android/assets/images/ge_panzer_iv.png
 delete mode 100644 android/assets/images/ge_panzer_iv_hq.png
 delete mode 100644 android/assets/images/ge_tiger.png
 delete mode 100644 android/assets/images/ge_wespe.png
 delete mode 100644 android/assets/images/turn_back.png
 delete mode 100644 android/assets/images/turn_front.png
 create mode 100644 android/assets/images/us.pack
 create mode 100644 android/assets/images/us.png
 delete mode 100644 android/assets/images/us_atgun.png
 delete mode 100644 android/assets/images/us_infantry.png
 delete mode 100644 android/assets/images/us_pershing.png
 delete mode 100644 android/assets/images/us_pershing_hq.png
 delete mode 100644 android/assets/images/us_priest.png
 delete mode 100644 android/assets/images/us_sherman.png
 delete mode 100644 android/assets/images/us_sherman_hq.png
 delete mode 100644 android/assets/images/us_wolverine.png

diff --git a/android/assets/images/ace.png b/android/assets/images/ace.png
deleted file mode 100644
index f4f3240..0000000
Binary files a/android/assets/images/ace.png and /dev/null differ
diff --git a/android/assets/images/ap_2.png b/android/assets/images/ap_2.png
deleted file mode 100644
index e89956a..0000000
Binary files a/android/assets/images/ap_2.png and /dev/null differ
diff --git a/android/assets/images/ap_3.png b/android/assets/images/ap_3.png
deleted file mode 100644
index 7d1b11f..0000000
Binary files a/android/assets/images/ap_3.png and /dev/null differ
diff --git a/android/assets/images/ap_4.png b/android/assets/images/ap_4.png
deleted file mode 100644
index e897628..0000000
Binary files a/android/assets/images/ap_4.png and /dev/null differ
diff --git a/android/assets/images/ap_spent.png b/android/assets/images/ap_spent.png
deleted file mode 100644
index cb399d8..0000000
Binary files a/android/assets/images/ap_spent.png and /dev/null differ
diff --git a/android/assets/images/back.png b/android/assets/images/back.png
deleted file mode 100644
index e7eb5ef..0000000
Binary files a/android/assets/images/back.png and /dev/null differ
diff --git a/android/assets/images/counters.pack b/android/assets/images/counters.pack
new file mode 100644
index 0000000..176d079
--- /dev/null
+++ b/android/assets/images/counters.pack
@@ -0,0 +1,60 @@
+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
new file mode 100644
index 0000000..b9bbb0d
Binary files /dev/null and b/android/assets/images/counters.png differ
diff --git a/android/assets/images/ge.pack b/android/assets/images/ge.pack
new file mode 100644
index 0000000..5c75324
--- /dev/null
+++ b/android/assets/images/ge.pack
@@ -0,0 +1,53 @@
+ge.png
+format: RGBA8888
+filter: Nearest,Nearest
+repeat: none
+at-gun
+  rotate: false
+  xy: 1, 1
+  size: 124, 124
+  orig: 124, 124
+  offset: 0, 0
+  index: 1
+infantry
+  rotate: false
+  xy: 125, 1
+  size: 124, 124
+  orig: 124, 124
+  offset: 0, 0
+  index: 1
+kingtiger
+  rotate: false
+  xy: 249, 1
+  size: 124, 124
+  orig: 124, 124
+  offset: 0, 0
+  index: 1
+panzer4
+  rotate: false
+  xy: 373, 1
+  size: 124, 124
+  orig: 124, 124
+  offset: 0, 0
+  index: 1
+panzer4-hq
+  rotate: false
+  xy: 497, 1
+  size: 124, 124
+  orig: 124, 124
+  offset: 0, 0
+  index: 1
+tiger
+  rotate: false
+  xy: 621, 1
+  size: 124, 124
+  orig: 124, 124
+  offset: 0, 0
+  index: 1
+wespe
+  rotate: false
+  xy: 745, 1
+  size: 124, 124
+  orig: 124, 124
+  offset: 0, 0
+  index: 1
diff --git a/android/assets/images/ge.png b/android/assets/images/ge.png
new file mode 100644
index 0000000..879a738
Binary files /dev/null and b/android/assets/images/ge.png differ
diff --git a/android/assets/images/ge_atgun.png b/android/assets/images/ge_atgun.png
deleted file mode 100644
index f81a4b1..0000000
Binary files a/android/assets/images/ge_atgun.png and /dev/null differ
diff --git a/android/assets/images/ge_infantry.png b/android/assets/images/ge_infantry.png
deleted file mode 100644
index ef4cee9..0000000
Binary files a/android/assets/images/ge_infantry.png and /dev/null differ
diff --git a/android/assets/images/ge_kingtiger.png b/android/assets/images/ge_kingtiger.png
deleted file mode 100644
index e45171b..0000000
Binary files a/android/assets/images/ge_kingtiger.png and /dev/null differ
diff --git a/android/assets/images/ge_panzer_iv.png b/android/assets/images/ge_panzer_iv.png
deleted file mode 100644
index 35ab9c3..0000000
Binary files a/android/assets/images/ge_panzer_iv.png and /dev/null differ
diff --git a/android/assets/images/ge_panzer_iv_hq.png b/android/assets/images/ge_panzer_iv_hq.png
deleted file mode 100644
index 2785941..0000000
Binary files a/android/assets/images/ge_panzer_iv_hq.png and /dev/null differ
diff --git a/android/assets/images/ge_tiger.png b/android/assets/images/ge_tiger.png
deleted file mode 100644
index 72e7b6c..0000000
Binary files a/android/assets/images/ge_tiger.png and /dev/null differ
diff --git a/android/assets/images/ge_wespe.png b/android/assets/images/ge_wespe.png
deleted file mode 100644
index 566e5b3..0000000
Binary files a/android/assets/images/ge_wespe.png and /dev/null differ
diff --git a/android/assets/images/turn_back.png b/android/assets/images/turn_back.png
deleted file mode 100644
index 3f681d8..0000000
Binary files a/android/assets/images/turn_back.png and /dev/null differ
diff --git a/android/assets/images/turn_front.png b/android/assets/images/turn_front.png
deleted file mode 100644
index b08806b..0000000
Binary files a/android/assets/images/turn_front.png and /dev/null differ
diff --git a/android/assets/images/us.pack b/android/assets/images/us.pack
new file mode 100644
index 0000000..e8b592d
--- /dev/null
+++ b/android/assets/images/us.pack
@@ -0,0 +1,60 @@
+us.png
+format: RGBA8888
+filter: Nearest,Nearest
+repeat: none
+at-gun
+  rotate: false
+  xy: 1, 1
+  size: 124, 124
+  orig: 124, 124
+  offset: 0, 0
+  index: 1
+infantry
+  rotate: false
+  xy: 125, 1
+  size: 124, 124
+  orig: 124, 124
+  offset: 0, 0
+  index: 1
+pershing
+  rotate: false
+  xy: 249, 1
+  size: 124, 124
+  orig: 124, 124
+  offset: 0, 0
+  index: 1
+pershing-hq
+  rotate: false
+  xy: 373, 1
+  size: 124, 124
+  orig: 124, 124
+  offset: 0, 0
+  index: 1
+priest
+  rotate: false
+  xy: 497, 1
+  size: 124, 124
+  orig: 124, 124
+  offset: 0, 0
+  index: 1
+sherman
+  rotate: false
+  xy: 621, 1
+  size: 124, 124
+  orig: 124, 124
+  offset: 0, 0
+  index: 1
+sherman-hq
+  rotate: false
+  xy: 745, 1
+  size: 124, 124
+  orig: 124, 124
+  offset: 0, 0
+  index: 1
+wolverine
+  rotate: false
+  xy: 869, 1
+  size: 124, 124
+  orig: 124, 124
+  offset: 0, 0
+  index: 1
diff --git a/android/assets/images/us.png b/android/assets/images/us.png
new file mode 100644
index 0000000..4c88952
Binary files /dev/null and b/android/assets/images/us.png differ
diff --git a/android/assets/images/us_atgun.png b/android/assets/images/us_atgun.png
deleted file mode 100644
index 9991ecf..0000000
Binary files a/android/assets/images/us_atgun.png and /dev/null differ
diff --git a/android/assets/images/us_infantry.png b/android/assets/images/us_infantry.png
deleted file mode 100644
index 9cea3c2..0000000
Binary files a/android/assets/images/us_infantry.png and /dev/null differ
diff --git a/android/assets/images/us_pershing.png b/android/assets/images/us_pershing.png
deleted file mode 100644
index 605563f..0000000
Binary files a/android/assets/images/us_pershing.png and /dev/null differ
diff --git a/android/assets/images/us_pershing_hq.png b/android/assets/images/us_pershing_hq.png
deleted file mode 100644
index 10b9364..0000000
Binary files a/android/assets/images/us_pershing_hq.png and /dev/null differ
diff --git a/android/assets/images/us_priest.png b/android/assets/images/us_priest.png
deleted file mode 100644
index 0dd6623..0000000
Binary files a/android/assets/images/us_priest.png and /dev/null differ
diff --git a/android/assets/images/us_sherman.png b/android/assets/images/us_sherman.png
deleted file mode 100644
index 03306d8..0000000
Binary files a/android/assets/images/us_sherman.png and /dev/null differ
diff --git a/android/assets/images/us_sherman_hq.png b/android/assets/images/us_sherman_hq.png
deleted file mode 100644
index bf54ea6..0000000
Binary files a/android/assets/images/us_sherman_hq.png and /dev/null differ
diff --git a/android/assets/images/us_wolverine.png b/android/assets/images/us_wolverine.png
deleted file mode 100644
index 9ce6dc3..0000000
Binary files a/android/assets/images/us_wolverine.png and /dev/null differ
diff --git a/core/src/ch/asynk/tankontank/TankOnTank.java b/core/src/ch/asynk/tankontank/TankOnTank.java
index ad04382..45e7cf1 100644
--- a/core/src/ch/asynk/tankontank/TankOnTank.java
+++ b/core/src/ch/asynk/tankontank/TankOnTank.java
@@ -33,31 +33,11 @@ public class TankOnTank extends Game
         manager.load("images/map_a.png", Texture.class);
         manager.load("images/map_b.png", Texture.class);
         manager.load("images/dice.pack", TextureAtlas.class);
-        manager.load("images/cup.jpg", Texture.class);
-        manager.load("images/back.png", Texture.class);
-        manager.load("images/small.png", Texture.class);
-        manager.load("images/turn_back.png", Texture.class);
-        manager.load("images/turn_front.png", Texture.class);
-        manager.load("images/ace.png", Texture.class);
-        manager.load("images/ap_spent.png", Texture.class);
-        manager.load("images/ap_2.png", Texture.class);
-        manager.load("images/ap_3.png", Texture.class);
-        manager.load("images/ap_4.png", Texture.class);
-        manager.load("images/ge_atgun.png", Texture.class);
-        manager.load("images/ge_infantry.png", Texture.class);
-        manager.load("images/ge_tiger.png", Texture.class);
-        manager.load("images/ge_kingtiger.png", Texture.class);
-        manager.load("images/ge_panzer_iv.png", Texture.class);
-        manager.load("images/ge_panzer_iv_hq.png", Texture.class);
-        manager.load("images/ge_wespe.png", Texture.class);
-        manager.load("images/us_atgun.png", Texture.class);
-        manager.load("images/us_infantry.png", Texture.class);
-        manager.load("images/us_pershing.png", Texture.class);
-        manager.load("images/us_pershing_hq.png", Texture.class);
-        manager.load("images/us_priest.png", Texture.class);
-        manager.load("images/us_sherman.png", Texture.class);
-        manager.load("images/us_sherman_hq.png", Texture.class);
-        manager.load("images/us_wolverine.png", Texture.class);
+        manager.load("images/counters.pack", TextureAtlas.class);
+        manager.load("images/ge.pack", TextureAtlas.class);
+        manager.load("images/us.pack", TextureAtlas.class);
+        // manager.load("images/cup.jpg", Texture.class);
+        // manager.load("images/small.png", Texture.class);
     }
 
     public void unloadAssets()
@@ -66,31 +46,11 @@ public class TankOnTank extends Game
         manager.unload("images/map_a.png");
         manager.unload("images/map_b.png");
         manager.unload("images/dice.pack");
-        manager.unload("images/cup.jpg");
-        manager.unload("images/back.png");
-        manager.unload("images/small.png");
-        manager.unload("images/turn_back.png");
-        manager.unload("images/turn_front.png");
-        manager.unload("images/ace.png");
-        manager.unload("images/ap_spent.png");
-        manager.unload("images/ap_2.png");
-        manager.unload("images/ap_3.png");
-        manager.unload("images/ap_4.png");
-        manager.unload("images/ge_atgun.png");
-        manager.unload("images/ge_infantry.png");
-        manager.unload("images/ge_tiger.png");
-        manager.unload("images/ge_kingtiger.png");
-        manager.unload("images/ge_panzer_iv.png");
-        manager.unload("images/ge_panzer_iv_hq.png");
-        manager.unload("images/ge_wespe.png");
-        manager.unload("images/us_atgun.png");
-        manager.unload("images/us_infantry.png");
-        manager.unload("images/us_pershing.png");
-        manager.unload("images/us_pershing_hq.png");
-        manager.unload("images/us_priest.png");
-        manager.unload("images/us_sherman.png");
-        manager.unload("images/us_sherman_hq.png");
-        manager.unload("images/us_wolverine.png");
+        manager.unload("images/counters.pack");
+        manager.unload("images/ge.pack");
+        manager.unload("images/us.pack");
+        // manager.unload("images/cup.jpg");
+        // manager.unload("images/small.png");
     }
 
 
-- 
cgit v1.1-2-g2b99