repack armies

6 files changed, 38 insertions, 36 deletions

diff --git a/android/assets/images/ge.pack b/android/assets/images/ge.atlas
index 25d3b29..51b3737 100644
--- a/android/assets/images/ge.pack
+++ b/android/assets/images/ge.atlas
@@ -1,53 +1,54 @@
+
 ge.png
 format: RGBA8888
 filter: Nearest,Nearest
 repeat: none
 at-gun
   rotate: false
-  xy: 1, 1
+  xy: 2, 2
   size: 124, 124
   orig: 124, 124
   offset: 0, 0
-  index: 1
+  index: -1
 infantry
   rotate: false
-  xy: 125, 1
+  xy: 128, 2
   size: 124, 124
   orig: 124, 124
   offset: 0, 0
-  index: 1
+  index: -1
 kingtiger
   rotate: false
-  xy: 249, 1
+  xy: 254, 2
   size: 124, 124
   orig: 124, 124
   offset: 0, 0
-  index: 1
+  index: -1
 panzer-iv
   rotate: false
-  xy: 373, 1
+  xy: 506, 2
   size: 124, 124
   orig: 124, 124
   offset: 0, 0
-  index: 1
+  index: -1
 panzer-iv-hq
   rotate: false
-  xy: 497, 1
+  xy: 380, 2
   size: 124, 124
   orig: 124, 124
   offset: 0, 0
-  index: 1
+  index: -1
 tiger
   rotate: false
-  xy: 621, 1
+  xy: 632, 2
   size: 124, 124
   orig: 124, 124
   offset: 0, 0
-  index: 1
+  index: -1
 wespe
   rotate: false
-  xy: 745, 1
+  xy: 758, 2
   size: 124, 124
   orig: 124, 124
   offset: 0, 0
-  index: 1
+  index: -1
diff --git a/android/assets/images/ge.png b/android/assets/images/ge.png
index 879a738..2fc415c 100644
--- a/android/assets/images/ge.png
+++ b/android/assets/images/ge.png
diff --git a/android/assets/images/us.pack b/android/assets/images/us.atlas
index e8b592d..d78a777 100644
--- a/android/assets/images/us.pack
+++ b/android/assets/images/us.atlas
@@ -1,60 +1,61 @@
+
 us.png
 format: RGBA8888
 filter: Nearest,Nearest
 repeat: none
 at-gun
   rotate: false
-  xy: 1, 1
+  xy: 2, 2
   size: 124, 124
   orig: 124, 124
   offset: 0, 0
-  index: 1
+  index: -1
 infantry
   rotate: false
-  xy: 125, 1
+  xy: 128, 2
   size: 124, 124
   orig: 124, 124
   offset: 0, 0
-  index: 1
+  index: -1
 pershing
   rotate: false
-  xy: 249, 1
+  xy: 380, 2
   size: 124, 124
   orig: 124, 124
   offset: 0, 0
-  index: 1
+  index: -1
 pershing-hq
   rotate: false
-  xy: 373, 1
+  xy: 254, 2
   size: 124, 124
   orig: 124, 124
   offset: 0, 0
-  index: 1
+  index: -1
 priest
   rotate: false
-  xy: 497, 1
+  xy: 506, 2
   size: 124, 124
   orig: 124, 124
   offset: 0, 0
-  index: 1
+  index: -1
 sherman
   rotate: false
-  xy: 621, 1
+  xy: 758, 2
   size: 124, 124
   orig: 124, 124
   offset: 0, 0
-  index: 1
+  index: -1
 sherman-hq
   rotate: false
-  xy: 745, 1
+  xy: 632, 2
   size: 124, 124
   orig: 124, 124
   offset: 0, 0
-  index: 1
+  index: -1
 wolverine
   rotate: false
-  xy: 869, 1
+  xy: 884, 2
   size: 124, 124
   orig: 124, 124
   offset: 0, 0
-  index: 1
+  index: -1
diff --git a/android/assets/images/us.png b/android/assets/images/us.png
index 4c88952..bba46f3 100644
--- a/android/assets/images/us.png
+++ b/android/assets/images/us.png
diff --git a/core/src/ch/asynk/tankontank/TankOnTank.java b/core/src/ch/asynk/tankontank/TankOnTank.java
index 99f708f..8501e19 100644
--- a/core/src/ch/asynk/tankontank/TankOnTank.java
+++ b/core/src/ch/asynk/tankontank/TankOnTank.java
@@ -34,9 +34,9 @@ public class TankOnTank extends Game
         // manager.load("images/map_b.png", Texture.class);
         manager.load("images/dice.pack", TextureAtlas.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/hex.png", Texture.class);
+        manager.load("images/ge.atlas", TextureAtlas.class);
+        manager.load("images/us.atlas", TextureAtlas.class);
         // manager.load("images/cup.jpg", Texture.class);
         // manager.load("images/small.png", Texture.class);
     }
@@ -49,9 +49,9 @@ public class TankOnTank extends Game
         // manager.unload("images/map_b.png");
         manager.unload("images/dice.pack");
         manager.unload("images/counters.pack");
-        manager.unload("images/ge.pack");
-        manager.unload("images/us.pack");
         manager.unload("images/hex.png");
+        manager.unload("images/ge.atlas");
+        manager.unload("images/us.atlas");
         // manager.unload("images/cup.jpg");
         // manager.unload("images/small.png");
         Gdx.app.debug("TankOnTank", "diagnostics:\n" + manager.getDiagnostics() );
diff --git a/core/src/ch/asynk/tankontank/game/GameFactory.java b/core/src/ch/asynk/tankontank/game/GameFactory.java
index 8716c49..27fc239 100644
--- a/core/src/ch/asynk/tankontank/game/GameFactory.java
+++ b/core/src/ch/asynk/tankontank/game/GameFactory.java
@@ -16,8 +16,8 @@ public class GameFactory
 
     public static void init(AssetManager manager)
     {
-        usAtlas = manager.get("images/us.pack", TextureAtlas.class);
-        geAtlas = manager.get("images/ge.pack", TextureAtlas.class);
+        usAtlas = manager.get("images/us.atlas", TextureAtlas.class);
+        geAtlas = manager.get("images/ge.atlas", TextureAtlas.class);
     }
 
     public static void dispose()