splite head into us-head and ge-head

6 files changed, 44 insertions, 37 deletions

diff --git a/android/assets/data/pawns.atlas b/android/assets/data/pawns.atlas
index 0aca331..4b39859 100644
--- a/android/assets/data/pawns.atlas
+++ b/android/assets/data/pawns.atlas
@@ -5,119 +5,126 @@ filter: Nearest,Nearest
 repeat: none
 ge-at-gun
   rotate: false
-  xy: 331, 305
+  xy: 386, 315
   size: 124, 124
   orig: 124, 124
   offset: 0, 0
   index: -1
+ge-head
+  rotate: false
+  xy: 2, 35
+  size: 104, 185
+  orig: 104, 185
+  offset: 0, 0
+  index: -1
 ge-infantry
   rotate: false
-  xy: 457, 305
+  xy: 512, 315
   size: 124, 124
   orig: 124, 124
   offset: 0, 0
   index: -1
 ge-kingtiger
   rotate: false
-  xy: 583, 305
+  xy: 638, 315
   size: 124, 124
   orig: 124, 124
   offset: 0, 0
   index: -1
 ge-panzer-iv
   rotate: false
-  xy: 835, 305
+  xy: 890, 315
   size: 124, 124
   orig: 124, 124
   offset: 0, 0
   index: -1
 ge-panzer-iv-hq
   rotate: false
-  xy: 709, 305
+  xy: 764, 315
   size: 124, 124
   orig: 124, 124
   offset: 0, 0
   index: -1
 ge-tiger
   rotate: false
-  xy: 128, 128
+  xy: 128, 163
   size: 124, 124
   orig: 124, 124
   offset: 0, 0
   index: -1
 ge-wespe
   rotate: false
-  xy: 128, 2
+  xy: 108, 37
   size: 124, 124
   orig: 124, 124
   offset: 0, 0
   index: -1
-head
-  rotate: false
-  xy: 2, 254
-  size: 175, 175
-  orig: 175, 175
-  offset: 0, 0
-  index: -1
 us-at-gun
   rotate: false
-  xy: 254, 153
+  xy: 254, 128
   size: 124, 124
   orig: 124, 124
   offset: 0, 0
   index: -1
+us-head
+  rotate: false
+  xy: 280, 254
+  size: 104, 185
+  orig: 104, 185
+  offset: 0, 0
+  index: -1
 us-infantry
   rotate: false
-  xy: 254, 27
+  xy: 234, 2
   size: 124, 124
   orig: 124, 124
   offset: 0, 0
   index: -1
 us-pershing
   rotate: false
-  xy: 380, 53
+  xy: 512, 189
   size: 124, 124
   orig: 124, 124
   offset: 0, 0
   index: -1
 us-pershing-hq
   rotate: false
-  xy: 380, 179
+  xy: 386, 189
   size: 124, 124
   orig: 124, 124
   offset: 0, 0
   index: -1
 us-priest
   rotate: false
-  xy: 506, 179
+  xy: 638, 189
   size: 124, 124
   orig: 124, 124
   offset: 0, 0
   index: -1
 us-sherman
   rotate: false
-  xy: 2, 35
+  xy: 2, 222
   size: 124, 217
   orig: 124, 217
   offset: 0, 0
   index: -1
 us-sherman-head
   rotate: false
-  xy: 179, 279
+  xy: 128, 289
   size: 150, 150
   orig: 150, 150
   offset: 0, 0
   index: -1
 us-sherman-hq
   rotate: false
-  xy: 506, 53
+  xy: 764, 189
   size: 124, 124
   orig: 124, 124
   offset: 0, 0
   index: -1
 us-wolverine
   rotate: false
-  xy: 632, 179
+  xy: 890, 189
   size: 124, 124
   orig: 124, 124
   offset: 0, 0
diff --git a/android/assets/data/pawns.png b/android/assets/data/pawns.png
index 46194d1..a9a4a1c 100644
--- a/android/assets/data/pawns.png
+++ b/android/assets/data/pawns.png
diff --git a/core/src/ch/asynk/tankontank/game/battles/Factory.java b/core/src/ch/asynk/tankontank/game/battles/Factory.java
index 7b2e01a..59b748e 100644
--- a/core/src/ch/asynk/tankontank/game/battles/Factory.java
+++ b/core/src/ch/asynk/tankontank/game/battles/Factory.java
@@ -116,54 +116,54 @@ public class Factory implements Board.TileBuilder, Disposable
         switch(id) {
             case GE_AT_GUN:
                 ut = UnitType.AT_GUN;
-                u = new Unit(Army.GE, id, ut, 3, 8, 9, 1, "ge-at-gun", "head", pawnsAtlas, pawnOverlaysAtlas);
+                u = new Unit(Army.GE, id, ut, 3, 8, 9, 1, "ge-at-gun", "ge-head", pawnsAtlas, pawnOverlaysAtlas);
                 break;
             case GE_INFANTRY:
                 ut = UnitType.INFANTRY;
-                u = new Unit(Army.GE, id, ut, 1, 7, 10, 1, "ge-infantry", "head", pawnsAtlas, pawnOverlaysAtlas);
+                u = new Unit(Army.GE, id, ut, 1, 7, 10, 1, "ge-infantry", "ge-head", pawnsAtlas, pawnOverlaysAtlas);
                 break;
             case GE_KINGTIGER:
-                u = new Unit(Army.GE, id, ut, 3, 12, 1, "ge-kingtiger", "head", pawnsAtlas, pawnOverlaysAtlas);
+                u = new Unit(Army.GE, id, ut, 3, 12, 1, "ge-kingtiger", "ge-head", pawnsAtlas, pawnOverlaysAtlas);
                 break;
             case GE_PANZER_IV:
-                u = new Unit(Army.GE, id, ut, 2, 9, 2, "ge-panzer-iv", "head", pawnsAtlas, pawnOverlaysAtlas);
+                u = new Unit(Army.GE, id, ut, 2, 9, 2, "ge-panzer-iv", "ge-head", pawnsAtlas, pawnOverlaysAtlas);
                 break;
             case GE_PANZER_IV_HQ:
-                u = new Unit(Army.GE, id, utHq, 2, 9, 2, "ge-panzer-iv-hq", "head", pawnsAtlas, pawnOverlaysAtlas);
+                u = new Unit(Army.GE, id, utHq, 2, 9, 2, "ge-panzer-iv-hq", "ge-head", pawnsAtlas, pawnOverlaysAtlas);
                 break;
             case GE_TIGER:
-                u = new Unit(Army.GE, id, ut, 3, 11, 1, "ge-tiger", "head", pawnsAtlas, pawnOverlaysAtlas);
+                u = new Unit(Army.GE, id, ut, 3, 11, 1, "ge-tiger", "ge-head", pawnsAtlas, pawnOverlaysAtlas);
                 break;
             case GE_WESPE:
                 ut = UnitType.ARTILLERY;
-                u = new Unit(Army.GE, id, ut, 5, 8, 1, "ge-wespe", "head", pawnsAtlas, pawnOverlaysAtlas);
+                u = new Unit(Army.GE, id, ut, 5, 8, 1, "ge-wespe", "ge-head", pawnsAtlas, pawnOverlaysAtlas);
                 break;
             case US_AT_GUN:
                 ut = UnitType.AT_GUN;
-                u = new Unit(Army.US, id, ut, 1, 7, 10, 1, "us-at-gun", "head", pawnsAtlas, pawnOverlaysAtlas);
+                u = new Unit(Army.US, id, ut, 1, 7, 10, 1, "us-at-gun", "us-head", pawnsAtlas, pawnOverlaysAtlas);
                 break;
             case US_INFANTRY:
                 ut = UnitType.INFANTRY;
-                u = new Unit(Army.US, id, ut, 1, 7, 10, 1, "us-infantry", "head", pawnsAtlas, pawnOverlaysAtlas);
+                u = new Unit(Army.US, id, ut, 1, 7, 10, 1, "us-infantry", "us-head", pawnsAtlas, pawnOverlaysAtlas);
                 break;
             case US_PERSHING:
-                u = new Unit(Army.US, id, ut, 3, 10, 2, "us-pershing", "head", pawnsAtlas, pawnOverlaysAtlas);
+                u = new Unit(Army.US, id, ut, 3, 10, 2, "us-pershing", "us-head", pawnsAtlas, pawnOverlaysAtlas);
                 break;
             case US_PERSHING_HQ:
-                u = new Unit(Army.US, id, utHq, 3, 10, 2, "us-pershing-hq", "head", pawnsAtlas, pawnOverlaysAtlas);
+                u = new Unit(Army.US, id, utHq, 3, 10, 2, "us-pershing-hq", "us-head", pawnsAtlas, pawnOverlaysAtlas);
                 break;
             case US_PRIEST:
                 ut = UnitType.ARTILLERY;
-                u = new Unit(Army.US, id, ut, 5, 8, 1, "us-priest", "head", pawnsAtlas, pawnOverlaysAtlas);
+                u = new Unit(Army.US, id, ut, 5, 8, 1, "us-priest", "us-head", pawnsAtlas, pawnOverlaysAtlas);
                 break;
             case US_SHERMAN:
                 u = new Unit(Army.US, id, ut, 2, 9, 2, "us-sherman", "us-sherman-head", pawnsAtlas, pawnOverlaysAtlas);
                 break;
             case US_SHERMAN_HQ:
-                u = new Unit(Army.US, id, utHq, 2, 9, 2, "us-sherman-hq", "head", pawnsAtlas, pawnOverlaysAtlas);
+                u = new Unit(Army.US, id, utHq, 2, 9, 2, "us-sherman-hq", "us-head", pawnsAtlas, pawnOverlaysAtlas);
                 break;
             case US_WOLVERINE:
-                u = new Unit(Army.US, id, ut, 3, 8, 3, "us-wolverine", "head", pawnsAtlas, pawnOverlaysAtlas);
+                u = new Unit(Army.US, id, ut, 3, 8, 3, "us-wolverine", "us-head", pawnsAtlas, pawnOverlaysAtlas);
                 break;
         }
 
diff --git a/data/assets/pawns/ge-head.png b/data/assets/pawns/ge-head.png
new file mode 100644
index 0000000..7aa65c7
--- /dev/null
+++ b/data/assets/pawns/ge-head.png
diff --git a/data/assets/pawns/head.png b/data/assets/pawns/head.png
deleted file mode 100644
index a79a840..0000000
--- a/data/assets/pawns/head.png
+++ /dev/null
diff --git a/data/assets/pawns/us-head.png b/data/assets/pawns/us-head.png
new file mode 100644
index 0000000..1affb71
--- /dev/null
+++ b/data/assets/pawns/us-head.png