Support 2 sets of pawns depending of Config.graphics

61 files changed, 235 insertions, 50 deletions

diff --git a/android/assets/data/unit-overlays0.atlas b/android/assets/data/unit-overlays0.atlas
new file mode 100644
index 0000000..6eb726b
--- /dev/null
+++ b/android/assets/data/unit-overlays0.atlas
@@ -0,0 +1,62 @@
+
+unit-overlays0.png
+size: 1024,256
+format: RGBA8888
+filter: Nearest,Nearest
+repeat: none
+00_move
+  rotate: false
+  xy: 2, 24
+  size: 190, 217
+  orig: 190, 217
+  offset: 0, 0
+  index: -1
+01_target
+  rotate: false
+  xy: 608, 151
+  size: 90, 90
+  orig: 90, 90
+  offset: 0, 0
+  index: -1
+02_fire
+  rotate: false
+  xy: 194, 91
+  size: 100, 150
+  orig: 100, 150
+  offset: 0, 0
+  index: -1
+03_may_fire
+  rotate: false
+  xy: 296, 91
+  size: 100, 150
+  orig: 100, 150
+  offset: 0, 0
+  index: -1
+04_ace
+  rotate: false
+  xy: 700, 106
+  size: 29, 135
+  orig: 29, 135
+  offset: 0, 0
+  index: -1
+05_hq
+  rotate: false
+  xy: 2, 2
+  size: 60, 20
+  orig: 60, 20
+  offset: 0, 0
+  index: -1
+06_fired
+  rotate: false
+  xy: 398, 120
+  size: 112, 121
+  orig: 112, 121
+  offset: 0, 0
+  index: -1
+07_moved
+  rotate: false
+  xy: 512, 122
+  size: 94, 119
+  orig: 94, 119
+  offset: 0, 0
+  index: -1
diff --git a/android/assets/data/unit-overlays0.png b/android/assets/data/unit-overlays0.png
new file mode 100644
index 0000000..305012d
--- /dev/null
+++ b/android/assets/data/unit-overlays0.png
diff --git a/android/assets/data/unit-overlays.atlas b/android/assets/data/unit-overlays1.atlas
index fe8f966..b74fa43 100644
--- a/android/assets/data/unit-overlays.atlas
+++ b/android/assets/data/unit-overlays1.atlas
@@ -1,5 +1,5 @@
 
-unit-overlays.png
+unit-overlays1.png
 size: 1024,256
 format: RGBA8888
 filter: Nearest,Nearest
diff --git a/android/assets/data/unit-overlays.png b/android/assets/data/unit-overlays1.png
index e581b78..e581b78 100644
--- a/android/assets/data/unit-overlays.png
+++ b/android/assets/data/unit-overlays1.png
diff --git a/android/assets/data/units.png b/android/assets/data/units.png
deleted file mode 100644
index 35ddcb0..0000000
--- a/android/assets/data/units.png
+++ /dev/null
diff --git a/android/assets/data/units0.atlas b/android/assets/data/units0.atlas
new file mode 100644
index 0000000..d2fef02
--- /dev/null
+++ b/android/assets/data/units0.atlas
@@ -0,0 +1,104 @@
+
+units0.png
+size: 1024,512
+format: RGBA8888
+filter: Nearest,Nearest
+repeat: none
+ge-at-gun
+  rotate: false
+  xy: 2, 272
+  size: 133, 133
+  orig: 133, 133
+  offset: 0, 0
+  index: -1
+ge-head
+  rotate: false
+  xy: 542, 73
+  size: 25, 206
+  orig: 25, 206
+  offset: 0, 0
+  index: -1
+ge-infantry
+  rotate: false
+  xy: 2, 137
+  size: 133, 133
+  orig: 133, 133
+  offset: 0, 0
+  index: -1
+ge-kingtiger
+  rotate: false
+  xy: 542, 281
+  size: 124, 124
+  orig: 124, 124
+  offset: 0, 0
+  index: -1
+ge-panzer-iv
+  rotate: false
+  xy: 137, 272
+  size: 133, 133
+  orig: 133, 133
+  offset: 0, 0
+  index: -1
+ge-tiger
+  rotate: false
+  xy: 2, 2
+  size: 133, 133
+  orig: 133, 133
+  offset: 0, 0
+  index: -1
+ge-wespe
+  rotate: false
+  xy: 137, 137
+  size: 133, 133
+  orig: 133, 133
+  offset: 0, 0
+  index: -1
+us-at-gun
+  rotate: false
+  xy: 272, 272
+  size: 133, 133
+  orig: 133, 133
+  offset: 0, 0
+  index: -1
+us-head
+  rotate: false
+  xy: 569, 73
+  size: 25, 206
+  orig: 25, 206
+  offset: 0, 0
+  index: -1
+us-infantry
+  rotate: false
+  xy: 137, 2
+  size: 133, 133
+  orig: 133, 133
+  offset: 0, 0
+  index: -1
+us-pershing
+  rotate: false
+  xy: 272, 137
+  size: 133, 133
+  orig: 133, 133
+  offset: 0, 0
+  index: -1
+us-priest
+  rotate: false
+  xy: 407, 272
+  size: 133, 133
+  orig: 133, 133
+  offset: 0, 0
+  index: -1
+us-sherman
+  rotate: false
+  xy: 272, 2
+  size: 133, 133
+  orig: 133, 133
+  offset: 0, 0
+  index: -1
+us-wolverine
+  rotate: false
+  xy: 407, 137
+  size: 133, 133
+  orig: 133, 133
+  offset: 0, 0
+  index: -1
diff --git a/android/assets/data/units0.png b/android/assets/data/units0.png
new file mode 100644
index 0000000..37b74f1
--- /dev/null
+++ b/android/assets/data/units0.png
diff --git a/android/assets/data/units.atlas b/android/assets/data/units1.atlas
index 3f540e7..3bb8239 100644
--- a/android/assets/data/units.atlas
+++ b/android/assets/data/units1.atlas
@@ -1,138 +1,124 @@
 
-units.png
+units1.png
 size: 1024,512
 format: RGBA8888
 filter: Nearest,Nearest
 repeat: none
 ge-at-gun
   rotate: false
-  xy: 2, 128
+  xy: 2, 380
   size: 124, 124
   orig: 124, 124
   offset: 0, 0
   index: -1
 ge-head
   rotate: false
-  xy: 254, 113
+  xy: 380, 46
   size: 25, 206
   orig: 25, 206
   offset: 0, 0
   index: -1
 ge-infantry
   rotate: false
-  xy: 128, 195
+  xy: 2, 254
   size: 124, 124
   orig: 124, 124
   offset: 0, 0
   index: -1
 ge-kingtiger
   rotate: false
-  xy: 280, 347
+  xy: 128, 380
   size: 124, 124
   orig: 124, 124
   offset: 0, 0
   index: -1
 ge-panzer-iv
   rotate: false
-  xy: 2, 2
+  xy: 2, 128
   size: 124, 124
   orig: 124, 124
   offset: 0, 0
   index: -1
 ge-panzer-iv-hq
   rotate: false
-  xy: 128, 69
+  xy: 128, 254
   size: 124, 124
   orig: 124, 124
   offset: 0, 0
   index: -1
 ge-tiger
   rotate: false
-  xy: 406, 347
+  xy: 254, 380
   size: 124, 124
   orig: 124, 124
   offset: 0, 0
   index: -1
 ge-wespe
   rotate: false
-  xy: 532, 347
+  xy: 2, 2
   size: 124, 124
   orig: 124, 124
   offset: 0, 0
   index: -1
 us-at-gun
   rotate: false
-  xy: 658, 347
+  xy: 128, 128
   size: 124, 124
   orig: 124, 124
   offset: 0, 0
   index: -1
 us-head
   rotate: false
-  xy: 407, 13
+  xy: 407, 46
   size: 25, 206
   orig: 25, 206
   offset: 0, 0
   index: -1
 us-infantry
   rotate: false
-  xy: 784, 347
+  xy: 254, 254
   size: 124, 124
   orig: 124, 124
   offset: 0, 0
   index: -1
 us-pershing
   rotate: false
-  xy: 281, 221
+  xy: 380, 380
   size: 124, 124
   orig: 124, 124
   offset: 0, 0
   index: -1
 us-pershing-hq
   rotate: false
-  xy: 407, 221
+  xy: 128, 2
   size: 124, 124
   orig: 124, 124
   offset: 0, 0
   index: -1
 us-priest
   rotate: false
-  xy: 533, 221
+  xy: 254, 128
   size: 124, 124
   orig: 124, 124
   offset: 0, 0
   index: -1
 us-sherman
   rotate: false
-  xy: 659, 221
+  xy: 380, 254
   size: 124, 124
   orig: 124, 124
   offset: 0, 0
   index: -1
-us-sherman-head
-  rotate: false
-  xy: 128, 321
-  size: 150, 150
-  orig: 150, 150
-  offset: 0, 0
-  index: -1
 us-sherman-hq
   rotate: false
-  xy: 785, 221
+  xy: 506, 380
   size: 124, 124
   orig: 124, 124
   offset: 0, 0
   index: -1
-us-sherman-values
-  rotate: false
-  xy: 2, 254
-  size: 124, 217
-  orig: 124, 217
-  offset: 0, 0
-  index: -1
 us-wolverine
   rotate: false
-  xy: 281, 95
+  xy: 254, 2
   size: 124, 124
   orig: 124, 124
   offset: 0, 0
diff --git a/android/assets/data/units1.png b/android/assets/data/units1.png
new file mode 100644
index 0000000..3210322
--- /dev/null
+++ b/android/assets/data/units1.png
diff --git a/assets/build.gradle b/assets/build.gradle
index 674c38a..58843cf 100644
--- a/assets/build.gradle
+++ b/assets/build.gradle
@@ -48,16 +48,29 @@ task packHud(type: JavaExec) {
     args = ['../assets/hud', '../android/assets/data', 'hud']
 }
 
-task packUnits(type: JavaExec) {
+task packUnits0(type: JavaExec) {
+
+    main = 'com.badlogic.gdx.tools.texturepacker.TexturePacker'
+    classpath = configurations.texturePacker
+    args = ['../assets/units0', '../android/assets/data', 'units0']
+}
+
+task packUnits1(type: JavaExec) {
+    main = 'com.badlogic.gdx.tools.texturepacker.TexturePacker'
+    classpath = configurations.texturePacker
+    args = ['../assets/units1', '../android/assets/data', 'units1']
+}
+
+task packUnitOverlays0(type: JavaExec) {
     main = 'com.badlogic.gdx.tools.texturepacker.TexturePacker'
     classpath = configurations.texturePacker
-    args = ['../assets/units', '../android/assets/data', 'units']
+    args = ['../assets/unit-overlays0', '../android/assets/data', 'unit-overlays0']
 }
 
-task packUnitOverlays(type: JavaExec) {
+task packUnitOverlays1(type: JavaExec) {
     main = 'com.badlogic.gdx.tools.texturepacker.TexturePacker'
     classpath = configurations.texturePacker
-    args = ['../assets/unit-overlays', '../android/assets/data', 'unit-overlays']
+    args = ['../assets/unit-overlays1', '../android/assets/data', 'unit-overlays1']
 }
 
 task packHexOverlays(type: JavaExec) {
diff --git a/assets/units/us-sherman-head.png b/assets/raw/us-sherman-head.png
index 62a390e..62a390e 100644
--- a/assets/units/us-sherman-head.png
+++ b/assets/raw/us-sherman-head.png
diff --git a/assets/units/us-sherman-values.png b/assets/raw/us-sherman-values.png
index 4d42c73..4d42c73 100644
--- a/assets/units/us-sherman-values.png
+++ b/assets/raw/us-sherman-values.png
diff --git a/assets/unit-overlays/00_move.png b/assets/unit-overlays0/00_move.png
index 5303cce..5303cce 100644
--- a/assets/unit-overlays/00_move.png
+++ b/assets/unit-overlays0/00_move.png
diff --git a/assets/unit-overlays/01_target.png b/assets/unit-overlays0/01_target.png
index 953151d..953151d 100644
--- a/assets/unit-overlays/01_target.png
+++ b/assets/unit-overlays0/01_target.png
diff --git a/assets/unit-overlays/02_fire.png b/assets/unit-overlays0/02_fire.png
index 2344671..2344671 100644
--- a/assets/unit-overlays/02_fire.png
+++ b/assets/unit-overlays0/02_fire.png
diff --git a/assets/unit-overlays/03_may_fire.png b/assets/unit-overlays0/03_may_fire.png
index 52b29dd..52b29dd 100644
--- a/assets/unit-overlays/03_may_fire.png
+++ b/assets/unit-overlays0/03_may_fire.png
diff --git a/assets/unit-overlays0/04_ace.png b/assets/unit-overlays0/04_ace.png
new file mode 100644
index 0000000..a94d504
--- /dev/null
+++ b/assets/unit-overlays0/04_ace.png
diff --git a/assets/unit-overlays0/05_hq.png b/assets/unit-overlays0/05_hq.png
new file mode 100644
index 0000000..308a5f7
--- /dev/null
+++ b/assets/unit-overlays0/05_hq.png
diff --git a/assets/unit-overlays0/06_fired.png b/assets/unit-overlays0/06_fired.png
new file mode 100644
index 0000000..9107707
--- /dev/null
+++ b/assets/unit-overlays0/06_fired.png
diff --git a/assets/unit-overlays0/07_moved.png b/assets/unit-overlays0/07_moved.png
new file mode 100644
index 0000000..7bd96e5
--- /dev/null
+++ b/assets/unit-overlays0/07_moved.png
diff --git a/assets/unit-overlays1/00_move.png b/assets/unit-overlays1/00_move.png
new file mode 100644
index 0000000..5303cce
--- /dev/null
+++ b/assets/unit-overlays1/00_move.png
diff --git a/assets/unit-overlays1/01_target.png b/assets/unit-overlays1/01_target.png
new file mode 100644
index 0000000..953151d
--- /dev/null
+++ b/assets/unit-overlays1/01_target.png
diff --git a/assets/unit-overlays1/02_fire.png b/assets/unit-overlays1/02_fire.png
new file mode 100644
index 0000000..2344671
--- /dev/null
+++ b/assets/unit-overlays1/02_fire.png
diff --git a/assets/unit-overlays1/03_may_fire.png b/assets/unit-overlays1/03_may_fire.png
new file mode 100644
index 0000000..52b29dd
--- /dev/null
+++ b/assets/unit-overlays1/03_may_fire.png
diff --git a/assets/unit-overlays/04_ace.png b/assets/unit-overlays1/04_ace.png
index 38d32b4..38d32b4 100644
--- a/assets/unit-overlays/04_ace.png
+++ b/assets/unit-overlays1/04_ace.png
diff --git a/assets/unit-overlays/05_hq.png b/assets/unit-overlays1/05_hq.png
index d1dd2d8..d1dd2d8 100644
--- a/assets/unit-overlays/05_hq.png
+++ b/assets/unit-overlays1/05_hq.png
diff --git a/assets/unit-overlays/06_fired.png b/assets/unit-overlays1/06_fired.png
index b03d25e..b03d25e 100644
--- a/assets/unit-overlays/06_fired.png
+++ b/assets/unit-overlays1/06_fired.png
diff --git a/assets/unit-overlays/07_moved.png b/assets/unit-overlays1/07_moved.png
index bc01362..bc01362 100644
--- a/assets/unit-overlays/07_moved.png
+++ b/assets/unit-overlays1/07_moved.png
diff --git a/assets/units0/ge-at-gun.png b/assets/units0/ge-at-gun.png
new file mode 100644
index 0000000..90eee00
--- /dev/null
+++ b/assets/units0/ge-at-gun.png
diff --git a/assets/units/ge-head.png b/assets/units0/ge-head.png
index 2a540be..2a540be 100644
--- a/assets/units/ge-head.png
+++ b/assets/units0/ge-head.png
diff --git a/assets/units0/ge-infantry.png b/assets/units0/ge-infantry.png
new file mode 100644
index 0000000..f03b508
--- /dev/null
+++ b/assets/units0/ge-infantry.png
diff --git a/assets/units/ge-kingtiger.png b/assets/units0/ge-kingtiger.png
index e45171b..e45171b 100644
--- a/assets/units/ge-kingtiger.png
+++ b/assets/units0/ge-kingtiger.png
diff --git a/assets/units0/ge-panzer-iv.png b/assets/units0/ge-panzer-iv.png
new file mode 100644
index 0000000..2e466b7
--- /dev/null
+++ b/assets/units0/ge-panzer-iv.png
diff --git a/assets/units0/ge-tiger.png b/assets/units0/ge-tiger.png
new file mode 100644
index 0000000..3338d39
--- /dev/null
+++ b/assets/units0/ge-tiger.png
diff --git a/assets/units0/ge-wespe.png b/assets/units0/ge-wespe.png
new file mode 100644
index 0000000..b429c1c
--- /dev/null
+++ b/assets/units0/ge-wespe.png
diff --git a/assets/units0/us-at-gun.png b/assets/units0/us-at-gun.png
new file mode 100644
index 0000000..f227228
--- /dev/null
+++ b/assets/units0/us-at-gun.png
diff --git a/assets/units/us-head.png b/assets/units0/us-head.png
index fceed7a..fceed7a 100644
--- a/assets/units/us-head.png
+++ b/assets/units0/us-head.png
diff --git a/assets/units0/us-infantry.png b/assets/units0/us-infantry.png
new file mode 100644
index 0000000..77896cd
--- /dev/null
+++ b/assets/units0/us-infantry.png
diff --git a/assets/units0/us-pershing.png b/assets/units0/us-pershing.png
new file mode 100644
index 0000000..196e8bc
--- /dev/null
+++ b/assets/units0/us-pershing.png
diff --git a/assets/units0/us-priest.png b/assets/units0/us-priest.png
new file mode 100644
index 0000000..de175c3
--- /dev/null
+++ b/assets/units0/us-priest.png
diff --git a/assets/units0/us-sherman.png b/assets/units0/us-sherman.png
new file mode 100644
index 0000000..78f3baa
--- /dev/null
+++ b/assets/units0/us-sherman.png
diff --git a/assets/units0/us-wolverine.png b/assets/units0/us-wolverine.png
new file mode 100644
index 0000000..fe42d7b
--- /dev/null
+++ b/assets/units0/us-wolverine.png
diff --git a/assets/units/ge-at-gun.png b/assets/units1/ge-at-gun.png
index f81a4b1..f81a4b1 100644
--- a/assets/units/ge-at-gun.png
+++ b/assets/units1/ge-at-gun.png
diff --git a/assets/units1/ge-head.png b/assets/units1/ge-head.png
new file mode 100644
index 0000000..2a540be
--- /dev/null
+++ b/assets/units1/ge-head.png
diff --git a/assets/units/ge-infantry.png b/assets/units1/ge-infantry.png
index ef4cee9..ef4cee9 100644
--- a/assets/units/ge-infantry.png
+++ b/assets/units1/ge-infantry.png
diff --git a/assets/units1/ge-kingtiger.png b/assets/units1/ge-kingtiger.png
new file mode 100644
index 0000000..e45171b
--- /dev/null
+++ b/assets/units1/ge-kingtiger.png
diff --git a/assets/units/ge-panzer-iv-hq.png b/assets/units1/ge-panzer-iv-hq.png
index 2785941..2785941 100644
--- a/assets/units/ge-panzer-iv-hq.png
+++ b/assets/units1/ge-panzer-iv-hq.png
diff --git a/assets/units/ge-panzer-iv.png b/assets/units1/ge-panzer-iv.png
index 35ab9c3..35ab9c3 100644
--- a/assets/units/ge-panzer-iv.png
+++ b/assets/units1/ge-panzer-iv.png
diff --git a/assets/units/ge-tiger.png b/assets/units1/ge-tiger.png
index 72e7b6c..72e7b6c 100644
--- a/assets/units/ge-tiger.png
+++ b/assets/units1/ge-tiger.png
diff --git a/assets/units/ge-wespe.png b/assets/units1/ge-wespe.png
index 566e5b3..566e5b3 100644
--- a/assets/units/ge-wespe.png
+++ b/assets/units1/ge-wespe.png
diff --git a/assets/units/us-at-gun.png b/assets/units1/us-at-gun.png
index 9991ecf..9991ecf 100644
--- a/assets/units/us-at-gun.png
+++ b/assets/units1/us-at-gun.png
diff --git a/assets/units1/us-head.png b/assets/units1/us-head.png
new file mode 100644
index 0000000..fceed7a
--- /dev/null
+++ b/assets/units1/us-head.png
diff --git a/assets/units/us-infantry.png b/assets/units1/us-infantry.png
index 9cea3c2..9cea3c2 100644
--- a/assets/units/us-infantry.png
+++ b/assets/units1/us-infantry.png
diff --git a/assets/units/us-pershing-hq.png b/assets/units1/us-pershing-hq.png
index 10b9364..10b9364 100644
--- a/assets/units/us-pershing-hq.png
+++ b/assets/units1/us-pershing-hq.png
diff --git a/assets/units/us-pershing.png b/assets/units1/us-pershing.png
index 605563f..605563f 100644
--- a/assets/units/us-pershing.png
+++ b/assets/units1/us-pershing.png
diff --git a/assets/units/us-priest.png b/assets/units1/us-priest.png
index 0dd6623..0dd6623 100644
--- a/assets/units/us-priest.png
+++ b/assets/units1/us-priest.png
diff --git a/assets/units/us-sherman-hq.png b/assets/units1/us-sherman-hq.png
index bf54ea6..bf54ea6 100644
--- a/assets/units/us-sherman-hq.png
+++ b/assets/units1/us-sherman-hq.png
diff --git a/assets/units/us-sherman.png b/assets/units1/us-sherman.png
index 03306d8..03306d8 100644
--- a/assets/units/us-sherman.png
+++ b/assets/units1/us-sherman.png
diff --git a/assets/units/us-wolverine.png b/assets/units1/us-wolverine.png
index 9ce6dc3..9ce6dc3 100644
--- a/assets/units/us-wolverine.png
+++ b/assets/units1/us-wolverine.png
diff --git a/core/src/ch/asynk/tankontank/TankOnTank.java b/core/src/ch/asynk/tankontank/TankOnTank.java
index ac3e5ce..40e4240 100644
--- a/core/src/ch/asynk/tankontank/TankOnTank.java
+++ b/core/src/ch/asynk/tankontank/TankOnTank.java
@@ -87,10 +87,18 @@ public class TankOnTank extends Game
             manager.load("data/map_a.png", Texture.class);
         if (config.battle.getMapType() == Factory.MapType.MAP_B)
             manager.load("data/map_b.png", Texture.class);
+        switch (config.graphics) {
+            case MINE:
+                manager.load("data/units0.atlas", TextureAtlas.class);
+                manager.load("data/unit-overlays0.atlas", TextureAtlas.class);
+                break;
+            case ORIGINAL:
+                manager.load("data/units1.atlas", TextureAtlas.class);
+                manager.load("data/unit-overlays1.atlas", TextureAtlas.class);
+                break;
+        }
         manager.load("data/hex.png", Texture.class);
         manager.load("data/hud.atlas", TextureAtlas.class);
-        manager.load("data/units.atlas", TextureAtlas.class);
-        manager.load("data/unit-overlays.atlas", TextureAtlas.class);
         manager.load("data/hex-overlays.atlas", TextureAtlas.class);
         manager.load("data/dice.png", Texture.class);
         manager.load("data/infantry_fire.png", Texture.class);
@@ -115,10 +123,18 @@ public class TankOnTank extends Game
             manager.unload("data/map_a.png");
         if (config.battle.getMapType() == Factory.MapType.MAP_B)
             manager.unload("data/map_b.png");
+        switch (config.graphics) {
+            case MINE:
+                manager.unload("data/units0.atlas");
+                manager.unload("data/unit-overlays0.atlas");
+                break;
+            case ORIGINAL:
+                manager.unload("data/units1.atlas");
+                manager.unload("data/unit-overlays1.atlas");
+                break;
+        }
         manager.unload("data/hex.png");
         manager.unload("data/hud.atlas");
-        manager.unload("data/units.atlas");
-        manager.unload("data/unit-overlays.atlas");
         manager.unload("data/hex-overlays.atlas");
         manager.unload("data/dice.png");
         manager.unload("data/infantry_fire.png");
diff --git a/core/src/ch/asynk/tankontank/game/battles/Factory.java b/core/src/ch/asynk/tankontank/game/battles/Factory.java
index db81537..57328ad 100644
--- a/core/src/ch/asynk/tankontank/game/battles/Factory.java
+++ b/core/src/ch/asynk/tankontank/game/battles/Factory.java
@@ -61,9 +61,17 @@ public class Factory implements Board.TileBuilder, Disposable
     {
         if (assetsLoaded) return;
         this.hudAtlas = game.manager.get("data/hud.atlas", TextureAtlas.class);
-        this.pawnsAtlas = game.manager.get("data/units.atlas", TextureAtlas.class);
-        this.pawnOverlaysAtlas = game.manager.get("data/unit-overlays.atlas", TextureAtlas.class);
         this.tileOverlaysAtlas = game.manager.get("data/hex-overlays.atlas", TextureAtlas.class);
+        switch (game.config.graphics) {
+            case MINE:
+                this.pawnsAtlas = game.manager.get("data/units0.atlas", TextureAtlas.class);
+                this.pawnOverlaysAtlas = game.manager.get("data/unit-overlays0.atlas", TextureAtlas.class);
+                break;
+            case ORIGINAL:
+                this.pawnsAtlas = game.manager.get("data/units1.atlas", TextureAtlas.class);
+                this.pawnOverlaysAtlas = game.manager.get("data/unit-overlays1.atlas", TextureAtlas.class);
+                break;
+        }
         this.assetsLoaded = true;
     }
 
@@ -122,7 +130,6 @@ public class Factory implements Board.TileBuilder, Disposable
 
     public Unit getUnit(UnitId id)
     {
-        boolean regular = game.config.regularPawns;
         Unit u = null;
         UnitType ut = UnitType.HARD_TARGET;
         UnitType utHq = UnitType.HARD_TARGET_HQ;
@@ -142,7 +149,7 @@ public class Factory implements Board.TileBuilder, Disposable
                 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", "ge-head", pawnsAtlas, pawnOverlaysAtlas);
+                u = new Unit(Army.GE, id, utHq, 2, 9, 2, "ge-panzer-iv", "ge-head", pawnsAtlas, pawnOverlaysAtlas);
                 break;
             case GE_TIGER:
                 u = new Unit(Army.GE, id, ut, 3, 11, 1, "ge-tiger", "ge-head", pawnsAtlas, pawnOverlaysAtlas);
@@ -163,20 +170,17 @@ public class Factory implements Board.TileBuilder, Disposable
                 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", "us-head", pawnsAtlas, pawnOverlaysAtlas);
+                u = new Unit(Army.US, id, utHq, 3, 10, 2, "us-pershing", "us-head", pawnsAtlas, pawnOverlaysAtlas);
                 break;
             case US_PRIEST:
                 ut = UnitType.ARTILLERY;
                 u = new Unit(Army.US, id, ut, 5, 8, 1, "us-priest", "us-head", pawnsAtlas, pawnOverlaysAtlas);
                 break;
             case US_SHERMAN:
-                if (regular)
                     u = new Unit(Army.US, id, ut, 2, 9, 2, "us-sherman", "us-head", pawnsAtlas, pawnOverlaysAtlas);
-                else
-                    u = new Unit(Army.US, id, ut, 2, 9, 2, "us-sherman-values", "us-sherman-head", pawnsAtlas, pawnOverlaysAtlas);
                 break;
             case US_SHERMAN_HQ:
-                u = new Unit(Army.US, id, utHq, 2, 9, 2, "us-sherman-hq", "us-head", pawnsAtlas, pawnOverlaysAtlas);
+                u = new Unit(Army.US, id, utHq, 2, 9, 2, "us-sherman", "us-head", pawnsAtlas, pawnOverlaysAtlas);
                 break;
             case US_WOLVERINE:
                 u = new Unit(Army.US, id, ut, 3, 8, 3, "us-wolverine", "us-head", pawnsAtlas, pawnOverlaysAtlas);