data -> assets: use TexturePacker instead of packer plugin

149 files changed, 572 insertions, 35 deletions

diff --git a/android/assets/data/hex-overlays.atlas b/android/assets/data/hex-overlays.atlas
index 72fae15..0db6728 100644
--- a/android/assets/data/hex-overlays.atlas
+++ b/android/assets/data/hex-overlays.atlas
@@ -1,5 +1,6 @@
 
 hex-overlays.png
+size: 1024,512
 format: RGBA8888
 filter: Nearest,Nearest
 repeat: none
diff --git a/android/assets/data/hex-overlays.png b/android/assets/data/hex-overlays.png
index 4a3a8ce..07fcec4 100644
--- a/android/assets/data/hex-overlays.png
+++ b/android/assets/data/hex-overlays.png
diff --git a/android/assets/data/hud.atlas b/android/assets/data/hud.atlas
index 8acee99..46a30ec 100644
--- a/android/assets/data/hud.atlas
+++ b/android/assets/data/hud.atlas
@@ -1,109 +1,119 @@
 
 hud.png
+size: 512,512
 format: RGBA8888
 filter: Nearest,Nearest
 repeat: none
 aps
   rotate: false
-  xy: 370, 462
+  xy: 2, 2
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 attack
   rotate: false
-  xy: 324, 358
+  xy: 486, 435
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
   index: -1
+button
+  rotate: false
+  xy: 2, 52
+  size: 65, 64
+  split: 29, 29, 28, 27
+  pad: 19, 17, 15, 18
+  orig: 65, 64
+  offset: 0, 0
+  index: -1
 cancel
   rotate: false
-  xy: 2, 19
+  xy: 69, 68
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 defense
   rotate: false
-  xy: 134, 93
+  xy: 324, 357
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
   index: -1
 disabled
   rotate: false
-  xy: 84, 69
+  xy: 242, 283
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 ge-flag
   rotate: false
-  xy: 2, 69
+  xy: 242, 333
   size: 80, 48
   orig: 80, 48
   offset: 0, 0
   index: -1
 ok
   rotate: false
-  xy: 52, 19
+  xy: 370, 411
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 promote
   rotate: false
-  xy: 242, 284
+  xy: 452, 461
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 reinforcement
   rotate: false
-  xy: 370, 412
+  xy: 119, 68
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 reinforcement-selected
   rotate: false
-  xy: 242, 384
+  xy: 242, 383
   size: 126, 126
   orig: 126, 126
   offset: 0, 0
   index: -1
 stars
   rotate: false
-  xy: 2, 2
+  xy: 420, 444
   size: 64, 15
   orig: 64, 15
   offset: 0, 0
   index: -1
 turns
   rotate: false
-  xy: 420, 462
+  xy: 242, 233
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 us-flag
   rotate: false
-  xy: 242, 334
+  xy: 370, 461
   size: 80, 48
   orig: 80, 48
   offset: 0, 0
   index: -1
 veteran-black
   rotate: false
-  xy: 2, 119
+  xy: 2, 118
   size: 118, 391
   orig: 118, 391
   offset: 0, 0
   index: -1
 veteran-white
   rotate: false
-  xy: 122, 119
+  xy: 122, 118
   size: 118, 391
   orig: 118, 391
   offset: 0, 0
diff --git a/android/assets/data/hud.png b/android/assets/data/hud.png
index a63077d..2adc5a0 100644
--- a/android/assets/data/hud.png
+++ b/android/assets/data/hud.png
diff --git a/android/assets/icon.png b/android/assets/data/icon.png
index eab1073..eab1073 100644
--- a/android/assets/icon.png
+++ b/android/assets/data/icon.png
diff --git a/android/assets/data/unit-overlays.atlas b/android/assets/data/unit-overlays.atlas
index 62b9674..580baa7 100644
--- a/android/assets/data/unit-overlays.atlas
+++ b/android/assets/data/unit-overlays.atlas
@@ -1,5 +1,6 @@
 
 unit-overlays.png
+size: 512,256
 format: RGBA8888
 filter: Nearest,Nearest
 repeat: none
diff --git a/android/assets/data/unit-overlays.png b/android/assets/data/unit-overlays.png
index ece1ebf..5949dd1 100644
--- a/android/assets/data/unit-overlays.png
+++ b/android/assets/data/unit-overlays.png
diff --git a/android/assets/data/units.atlas b/android/assets/data/units.atlas
index 041ba6e..c544c65 100644
--- a/android/assets/data/units.atlas
+++ b/android/assets/data/units.atlas
@@ -1,5 +1,6 @@
 
 units.png
+size: 1024,512
 format: RGBA8888
 filter: Nearest,Nearest
 repeat: none
@@ -33,14 +34,14 @@ ge-kingtiger
   index: -1
 ge-panzer-iv
   rotate: false
-  xy: 128, 69
+  xy: 2, 2
   size: 124, 124
   orig: 124, 124
   offset: 0, 0
   index: -1
 ge-panzer-iv-hq
   rotate: false
-  xy: 2, 2
+  xy: 128, 69
   size: 124, 124
   orig: 124, 124
   offset: 0, 0
@@ -82,14 +83,14 @@ us-infantry
   index: -1
 us-pershing
   rotate: false
-  xy: 407, 221
+  xy: 281, 221
   size: 124, 124
   orig: 124, 124
   offset: 0, 0
   index: -1
 us-pershing-hq
   rotate: false
-  xy: 281, 221
+  xy: 407, 221
   size: 124, 124
   orig: 124, 124
   offset: 0, 0
diff --git a/android/assets/data/units.png b/android/assets/data/units.png
index 1d78fac..af1e625 100644
--- a/android/assets/data/units.png
+++ b/android/assets/data/units.png
diff --git a/assets/build.gradle b/assets/build.gradle
new file mode 100644
index 0000000..808ae80
--- /dev/null
+++ b/assets/build.gradle
@@ -0,0 +1,70 @@
+configurations {
+    texturePacker
+}
+
+dependencies {
+    texturePacker "com.badlogicgames.gdx:gdx-tools:$gdxVersion"
+}
+
+defaultTasks 'build'
+
+task clean(type: Delete) {
+    delete '../android/assets'
+    doFirst {
+        println "Delete android/assets"
+    }
+}
+
+task copySkin(type: Copy) {
+    from 'skin'
+    into '../android/assets/skin'
+}
+
+task copyImages(type: Copy) {
+    from 'images'
+    into '../android/assets/data'
+}
+
+task copySounds(type: Copy) {
+    from 'sounds'
+    into '../android/assets/sounds'
+}
+
+task packHud(type: JavaExec) {
+    main = 'com.badlogic.gdx.tools.texturepacker.TexturePacker'
+    classpath = configurations.texturePacker
+    args = ['../assets/hud', '../android/assets/data', 'hud']
+}
+
+task packUnits(type: JavaExec) {
+    main = 'com.badlogic.gdx.tools.texturepacker.TexturePacker'
+    classpath = configurations.texturePacker
+    args = ['../assets/units', '../android/assets/data', 'units']
+}
+
+task packUnitOverlays(type: JavaExec) {
+    main = 'com.badlogic.gdx.tools.texturepacker.TexturePacker'
+    classpath = configurations.texturePacker
+    args = ['../assets/unit-overlays', '../android/assets/data', 'unit-overlays']
+}
+
+task packHexOverlays(type: JavaExec) {
+    main = 'com.badlogic.gdx.tools.texturepacker.TexturePacker'
+    classpath = configurations.texturePacker
+    args = ['../assets/hex-overlays', '../android/assets/data', 'hex-overlays']
+}
+
+/* task buildUI(dependsOn: ["processXHDPI"]) { */
+task build(dependsOn: clean) {
+    description "Builds the skin at various DPIs"
+    doFirst {
+        println "Packing the textures..."
+    }
+    doLast {
+        println "Finished"
+    }
+}
+
+build.dependsOn {
+    tasks.findAll { task -> (task.name.startsWith('pack') || task.name.startsWith('copy')) }
+}
diff --git a/data/assets/hex-overlays/00_fog.png b/assets/hex-overlays/00_fog.png
index 7d85d98..7d85d98 100644
--- a/data/assets/hex-overlays/00_fog.png
+++ b/assets/hex-overlays/00_fog.png
diff --git a/data/assets/hex-overlays/01_select.png b/assets/hex-overlays/01_select.png
index f0b4320..f0b4320 100644
--- a/data/assets/hex-overlays/01_select.png
+++ b/assets/hex-overlays/01_select.png
diff --git a/data/assets/hex-overlays/02_area.png b/assets/hex-overlays/02_area.png
index 78b8f75..78b8f75 100644
--- a/data/assets/hex-overlays/02_area.png
+++ b/assets/hex-overlays/02_area.png
diff --git a/data/assets/hex-overlays/03_move.png b/assets/hex-overlays/03_move.png
index 17bafe9..17bafe9 100644
--- a/data/assets/hex-overlays/03_move.png
+++ b/assets/hex-overlays/03_move.png
diff --git a/data/assets/hex-overlays/04_directions.png b/assets/hex-overlays/04_directions.png
index 4d3ced9..4d3ced9 100644
--- a/data/assets/hex-overlays/04_directions.png
+++ b/assets/hex-overlays/04_directions.png
diff --git a/data/assets/hex-overlays/05_orientation.png b/assets/hex-overlays/05_orientation.png
index 2b1d06d..2b1d06d 100644
--- a/data/assets/hex-overlays/05_orientation.png
+++ b/assets/hex-overlays/05_orientation.png
diff --git a/data/assets/hex-overlays/06_objective.png b/assets/hex-overlays/06_objective.png
index 11e5178..11e5178 100644
--- a/data/assets/hex-overlays/06_objective.png
+++ b/assets/hex-overlays/06_objective.png
diff --git a/data/assets/hex-overlays/07_hold_objective.png b/assets/hex-overlays/07_hold_objective.png
index e076771..e076771 100644
--- a/data/assets/hex-overlays/07_hold_objective.png
+++ b/assets/hex-overlays/07_hold_objective.png
diff --git a/data/assets/hex-overlays/08_objective_ge.png b/assets/hex-overlays/08_objective_ge.png
index 076be81..076be81 100644
--- a/data/assets/hex-overlays/08_objective_ge.png
+++ b/assets/hex-overlays/08_objective_ge.png
diff --git a/data/assets/hex-overlays/09_objective_us.png b/assets/hex-overlays/09_objective_us.png
index 1f4b754..1f4b754 100644
--- a/data/assets/hex-overlays/09_objective_us.png
+++ b/assets/hex-overlays/09_objective_us.png
diff --git a/data/assets/hud/aps.png b/assets/hud/aps.png
index cff4123..cff4123 100644
--- a/data/assets/hud/aps.png
+++ b/assets/hud/aps.png
diff --git a/data/assets/hud/attack.png b/assets/hud/attack.png
index ca4766b..ca4766b 100644
--- a/data/assets/hud/attack.png
+++ b/assets/hud/attack.png
diff --git a/data/assets/hud/cancel.png b/assets/hud/cancel.png
index 910854d..910854d 100644
--- a/data/assets/hud/cancel.png
+++ b/assets/hud/cancel.png
diff --git a/data/assets/hud/defense.png b/assets/hud/defense.png
index cf6e580..cf6e580 100644
--- a/data/assets/hud/defense.png
+++ b/assets/hud/defense.png
diff --git a/data/assets/hud/disabled.png b/assets/hud/disabled.png
index 70cc80b..70cc80b 100644
--- a/data/assets/hud/disabled.png
+++ b/assets/hud/disabled.png
diff --git a/data/assets/hud/ge-flag.png b/assets/hud/ge-flag.png
index 1058b42..1058b42 100644
--- a/data/assets/hud/ge-flag.png
+++ b/assets/hud/ge-flag.png
diff --git a/data/assets/hud/ok.png b/assets/hud/ok.png
index 69f094a..69f094a 100644
--- a/data/assets/hud/ok.png
+++ b/assets/hud/ok.png
diff --git a/data/assets/hud/promote.png b/assets/hud/promote.png
index d030756..d030756 100644
--- a/data/assets/hud/promote.png
+++ b/assets/hud/promote.png
diff --git a/data/assets/hud/reinforcement-selected.png b/assets/hud/reinforcement-selected.png
index 07162df..07162df 100644
--- a/data/assets/hud/reinforcement-selected.png
+++ b/assets/hud/reinforcement-selected.png
diff --git a/data/assets/hud/reinforcement.png b/assets/hud/reinforcement.png
index 3b90e92..3b90e92 100644
--- a/data/assets/hud/reinforcement.png
+++ b/assets/hud/reinforcement.png
diff --git a/data/assets/hud/stars.png b/assets/hud/stars.png
index c0acafe..c0acafe 100644
--- a/data/assets/hud/stars.png
+++ b/assets/hud/stars.png
diff --git a/data/assets/hud/turns.png b/assets/hud/turns.png
index 261bfce..261bfce 100644
--- a/data/assets/hud/turns.png
+++ b/assets/hud/turns.png
diff --git a/data/assets/hud/us-flag.png b/assets/hud/us-flag.png
index 7731b7d..7731b7d 100644
--- a/data/assets/hud/us-flag.png
+++ b/assets/hud/us-flag.png
diff --git a/data/assets/hud/veteran-black.png b/assets/hud/veteran-black.png
index ea5fcbe..ea5fcbe 100644
--- a/data/assets/hud/veteran-black.png
+++ b/assets/hud/veteran-black.png
diff --git a/data/assets/hud/veteran-white.png b/assets/hud/veteran-white.png
index daa70d9..daa70d9 100644
--- a/data/assets/hud/veteran-white.png
+++ b/assets/hud/veteran-white.png
diff --git a/assets/images/dice.png b/assets/images/dice.png
new file mode 100644
index 0000000..6ca96ec
--- /dev/null
+++ b/assets/images/dice.png
diff --git a/assets/images/explosion.png b/assets/images/explosion.png
new file mode 100644
index 0000000..82c56cb
--- /dev/null
+++ b/assets/images/explosion.png
diff --git a/assets/images/explosions.png b/assets/images/explosions.png
new file mode 100644
index 0000000..ad8058d
--- /dev/null
+++ b/assets/images/explosions.png
diff --git a/assets/images/hex.png b/assets/images/hex.png
new file mode 100644
index 0000000..a3b28b2
--- /dev/null
+++ b/assets/images/hex.png
diff --git a/assets/images/icon.png b/assets/images/icon.png
new file mode 100644
index 0000000..eab1073
--- /dev/null
+++ b/assets/images/icon.png
diff --git a/assets/images/infantry_fire.png b/assets/images/infantry_fire.png
new file mode 100644
index 0000000..a0a026d
--- /dev/null
+++ b/assets/images/infantry_fire.png
diff --git a/assets/images/loading.png b/assets/images/loading.png
new file mode 100644
index 0000000..b2903dd
--- /dev/null
+++ b/assets/images/loading.png
diff --git a/assets/images/map_a.png b/assets/images/map_a.png
new file mode 100644
index 0000000..0417638
--- /dev/null
+++ b/assets/images/map_a.png
diff --git a/assets/images/map_b.png b/assets/images/map_b.png
new file mode 100644
index 0000000..88888c1
--- /dev/null
+++ b/assets/images/map_b.png
diff --git a/assets/images/tank_fire.png b/assets/images/tank_fire.png
new file mode 100644
index 0000000..ca544df
--- /dev/null
+++ b/assets/images/tank_fire.png
diff --git a/assets/images/unit.png b/assets/images/unit.png
new file mode 100644
index 0000000..d14df87
--- /dev/null
+++ b/assets/images/unit.png
diff --git a/data/misc/00_move.png b/assets/raw/00_move.png
index 73c92cb..73c92cb 100644
--- a/data/misc/00_move.png
+++ b/assets/raw/00_move.png
diff --git a/data/misc/03_move.png b/assets/raw/03_move.png
index 5303cce..5303cce 100644
--- a/data/misc/03_move.png
+++ b/assets/raw/03_move.png
diff --git a/data/misc/04_directions.png b/assets/raw/04_directions.png
index 6d483e1..6d483e1 100644
--- a/data/misc/04_directions.png
+++ b/assets/raw/04_directions.png
diff --git a/data/misc/ace.png b/assets/raw/ace.png
index f4f3240..f4f3240 100644
--- a/data/misc/ace.png
+++ b/assets/raw/ace.png
diff --git a/data/misc/aflfont.ttf b/assets/raw/aflfont.ttf
index 5b75dc7..5b75dc7 100644
--- a/data/misc/aflfont.ttf
+++ b/assets/raw/aflfont.ttf
diff --git a/data/misc/ap_spent.png b/assets/raw/ap_spent.png
index cb399d8..cb399d8 100644
--- a/data/misc/ap_spent.png
+++ b/assets/raw/ap_spent.png
diff --git a/data/misc/aps.png b/assets/raw/aps.png
index cff4123..cff4123 100644
--- a/data/misc/aps.png
+++ b/assets/raw/aps.png
diff --git a/data/misc/attack.mp3 b/assets/raw/attack.mp3
index 0a43bbd..0a43bbd 100644
--- a/data/misc/attack.mp3
+++ b/assets/raw/attack.mp3
diff --git a/data/misc/back.png b/assets/raw/back.png
index e7eb5ef..e7eb5ef 100644
--- a/data/misc/back.png
+++ b/assets/raw/back.png
diff --git a/data/misc/btn-cancel-down.png b/assets/raw/btn-cancel-down.png
index a658da9..a658da9 100644
--- a/data/misc/btn-cancel-down.png
+++ b/assets/raw/btn-cancel-down.png
diff --git a/data/misc/btn-cancel-on.png b/assets/raw/btn-cancel-on.png
index 05655f7..05655f7 100644
--- a/data/misc/btn-cancel-on.png
+++ b/assets/raw/btn-cancel-on.png
diff --git a/data/misc/btn-cancel-up.png b/assets/raw/btn-cancel-up.png
index 800c983..800c983 100644
--- a/data/misc/btn-cancel-up.png
+++ b/assets/raw/btn-cancel-up.png
diff --git a/data/misc/btn-cancel.png b/assets/raw/btn-cancel.png
index 910854d..910854d 100644
--- a/data/misc/btn-cancel.png
+++ b/assets/raw/btn-cancel.png
diff --git a/data/misc/btn-check-down.png b/assets/raw/btn-check-down.png
index adbe3ee..adbe3ee 100644
--- a/data/misc/btn-check-down.png
+++ b/assets/raw/btn-check-down.png
diff --git a/data/misc/btn-check-on.png b/assets/raw/btn-check-on.png
index 221a7ed..221a7ed 100644
--- a/data/misc/btn-check-on.png
+++ b/assets/raw/btn-check-on.png
diff --git a/data/misc/btn-check-up.png b/assets/raw/btn-check-up.png
index 4fb965b..4fb965b 100644
--- a/data/misc/btn-check-up.png
+++ b/assets/raw/btn-check-up.png
diff --git a/data/misc/btn-engage-down.png b/assets/raw/btn-engage-down.png
index 2298474..2298474 100644
--- a/data/misc/btn-engage-down.png
+++ b/assets/raw/btn-engage-down.png
diff --git a/data/misc/btn-engage-on.png b/assets/raw/btn-engage-on.png
index 55d2d16..55d2d16 100644
--- a/data/misc/btn-engage-on.png
+++ b/assets/raw/btn-engage-on.png
diff --git a/data/misc/btn-engage-up.png b/assets/raw/btn-engage-up.png
index 5a29edc..5a29edc 100644
--- a/data/misc/btn-engage-up.png
+++ b/assets/raw/btn-engage-up.png
diff --git a/data/misc/btn-move-down.png b/assets/raw/btn-move-down.png
index d663c10..d663c10 100644
--- a/data/misc/btn-move-down.png
+++ b/assets/raw/btn-move-down.png
diff --git a/data/misc/btn-move-on.png b/assets/raw/btn-move-on.png
index f5cc01a..f5cc01a 100644
--- a/data/misc/btn-move-on.png
+++ b/assets/raw/btn-move-on.png
diff --git a/data/misc/btn-move-up.png b/assets/raw/btn-move-up.png
index f637991..f637991 100644
--- a/data/misc/btn-move-up.png
+++ b/assets/raw/btn-move-up.png
diff --git a/data/misc/btn-ok.png b/assets/raw/btn-ok.png
index 69f094a..69f094a 100644
--- a/data/misc/btn-ok.png
+++ b/assets/raw/btn-ok.png
diff --git a/data/misc/btn-promote-down.png b/assets/raw/btn-promote-down.png
index 24d82c0..24d82c0 100644
--- a/data/misc/btn-promote-down.png
+++ b/assets/raw/btn-promote-down.png
diff --git a/data/misc/btn-promote-on.png b/assets/raw/btn-promote-on.png
index 36c3240..36c3240 100644
--- a/data/misc/btn-promote-on.png
+++ b/assets/raw/btn-promote-on.png
diff --git a/data/misc/btn-promote-up.png b/assets/raw/btn-promote-up.png
index 67d7cca..67d7cca 100644
--- a/data/misc/btn-promote-up.png
+++ b/assets/raw/btn-promote-up.png
diff --git a/data/misc/btn-rotate-down.png b/assets/raw/btn-rotate-down.png
index e642e3e..e642e3e 100644
--- a/data/misc/btn-rotate-down.png
+++ b/assets/raw/btn-rotate-down.png
diff --git a/data/misc/btn-rotate-on.png b/assets/raw/btn-rotate-on.png
index f9b1c7a..f9b1c7a 100644
--- a/data/misc/btn-rotate-on.png
+++ b/assets/raw/btn-rotate-on.png
diff --git a/data/misc/btn-rotate-up.png b/assets/raw/btn-rotate-up.png
index f5467b2..f5467b2 100644
--- a/data/misc/btn-rotate-up.png
+++ b/assets/raw/btn-rotate-up.png
diff --git a/data/misc/cancel.png b/assets/raw/cancel.png
index f534b6f..f534b6f 100644
--- a/data/misc/cancel.png
+++ b/assets/raw/cancel.png
diff --git a/data/misc/disabled.png b/assets/raw/disabled.png
index a5ad3d3..a5ad3d3 100644
--- a/data/misc/disabled.png
+++ b/assets/raw/disabled.png
diff --git a/data/misc/ge-black.png b/assets/raw/ge-black.png
index bf00d77..bf00d77 100644
--- a/data/misc/ge-black.png
+++ b/assets/raw/ge-black.png
diff --git a/data/misc/ge-blue.png b/assets/raw/ge-blue.png
index b516d7c..b516d7c 100644
--- a/data/misc/ge-blue.png
+++ b/assets/raw/ge-blue.png
diff --git a/data/misc/ge-flag.png b/assets/raw/ge-flag.png
index 1058b42..1058b42 100644
--- a/data/misc/ge-flag.png
+++ b/assets/raw/ge-flag.png
diff --git a/data/misc/ge-green.png b/assets/raw/ge-green.png
index 15721f5..15721f5 100644
--- a/data/misc/ge-green.png
+++ b/assets/raw/ge-green.png
diff --git a/data/misc/ge-head.png b/assets/raw/ge-head.png
index 7aa65c7..7aa65c7 100644
--- a/data/misc/ge-head.png
+++ b/assets/raw/ge-head.png
diff --git a/data/misc/ge-red.png b/assets/raw/ge-red.png
index cc71025..cc71025 100644
--- a/data/misc/ge-red.png
+++ b/assets/raw/ge-red.png
diff --git a/data/misc/hex.xcf b/assets/raw/hex.xcf
index 974f3d9..974f3d9 100644
--- a/data/misc/hex.xcf
+++ b/assets/raw/hex.xcf
diff --git a/data/misc/hiero.jar b/assets/raw/hiero.jar
index e8613b4..e8613b4 100644
--- a/data/misc/hiero.jar
+++ b/assets/raw/hiero.jar
diff --git a/data/misc/loading.xcf b/assets/raw/loading.xcf
index 752e0c0..752e0c0 100644
--- a/data/misc/loading.xcf
+++ b/assets/raw/loading.xcf
diff --git a/data/misc/move.png b/assets/raw/move.png
index b4d6409..b4d6409 100644
--- a/data/misc/move.png
+++ b/assets/raw/move.png
diff --git a/data/misc/ok.png b/assets/raw/ok.png
index 7b5afb2..7b5afb2 100644
--- a/data/misc/ok.png
+++ b/assets/raw/ok.png
diff --git a/data/misc/order.png b/assets/raw/order.png
index b810043..b810043 100644
--- a/data/misc/order.png
+++ b/assets/raw/order.png
diff --git a/data/misc/reinforcement-selected.png b/assets/raw/reinforcement-selected.png
index 07162df..07162df 100644
--- a/data/misc/reinforcement-selected.png
+++ b/assets/raw/reinforcement-selected.png
diff --git a/data/misc/reinforcement.png b/assets/raw/reinforcement.png
index 3b90e92..3b90e92 100644
--- a/data/misc/reinforcement.png
+++ b/assets/raw/reinforcement.png
diff --git a/data/misc/rotate.png b/assets/raw/rotate.png
index 0f5a366..0f5a366 100644
--- a/data/misc/rotate.png
+++ b/assets/raw/rotate.png
diff --git a/data/misc/shot.png b/assets/raw/shot.png
index 4f2d59e..4f2d59e 100644
--- a/data/misc/shot.png
+++ b/assets/raw/shot.png
diff --git a/data/misc/target.png b/assets/raw/target.png
index 310826d..310826d 100644
--- a/data/misc/target.png
+++ b/assets/raw/target.png
diff --git a/data/misc/turn_back.png b/assets/raw/turn_back.png
index 3f681d8..3f681d8 100644
--- a/data/misc/turn_back.png
+++ b/assets/raw/turn_back.png
diff --git a/data/misc/turn_front.png b/assets/raw/turn_front.png
index b08806b..b08806b 100644
--- a/data/misc/turn_front.png
+++ b/assets/raw/turn_front.png
diff --git a/data/misc/turns.png b/assets/raw/turns.png
index 261bfce..261bfce 100644
--- a/data/misc/turns.png
+++ b/assets/raw/turns.png
diff --git a/data/misc/us-black.png b/assets/raw/us-black.png
index 701dffd..701dffd 100644
--- a/data/misc/us-black.png
+++ b/assets/raw/us-black.png
diff --git a/data/misc/us-blue.png b/assets/raw/us-blue.png
index 45962de..45962de 100644
--- a/data/misc/us-blue.png
+++ b/assets/raw/us-blue.png
diff --git a/data/misc/us-flag.png b/assets/raw/us-flag.png
index 7731b7d..7731b7d 100644
--- a/data/misc/us-flag.png
+++ b/assets/raw/us-flag.png
diff --git a/data/misc/us-green.png b/assets/raw/us-green.png
index 90b1435..90b1435 100644
--- a/data/misc/us-green.png
+++ b/assets/raw/us-green.png
diff --git a/data/misc/us-head.png b/assets/raw/us-head.png
index 1affb71..1affb71 100644
--- a/data/misc/us-head.png
+++ b/assets/raw/us-head.png
diff --git a/data/misc/us-pawn.png b/assets/raw/us-pawn.png
index f75672c..f75672c 100644
--- a/data/misc/us-pawn.png
+++ b/assets/raw/us-pawn.png
diff --git a/data/misc/us-red.png b/assets/raw/us-red.png
index 4368c72..4368c72 100644
--- a/data/misc/us-red.png
+++ b/assets/raw/us-red.png
diff --git a/data/misc/us.png b/assets/raw/us.png
index b8c2c04..b8c2c04 100644
--- a/data/misc/us.png
+++ b/assets/raw/us.png
diff --git a/data/misc/veteran_typewriter.ttf b/assets/raw/veteran_typewriter.ttf
index 202e264..202e264 100644
--- a/data/misc/veteran_typewriter.ttf
+++ b/assets/raw/veteran_typewriter.ttf
diff --git a/assets/skin/default.fnt b/assets/skin/default.fnt
new file mode 100644
index 0000000..e0588b7
--- /dev/null
+++ b/assets/skin/default.fnt
@@ -0,0 +1,101 @@
+info face="Droid Sans" size=17 bold=0 italic=0 charset="" unicode=0 stretchH=100 smooth=1 aa=1 padding=0,0,0,0 spacing=1,1

+common lineHeight=20 base=18 scaleW=256 scaleH=128 pages=1 packed=0

+page id=0 file="uiskin.png"

+chars count=96

+char id=32   x=0     y=0     width=0     height=0     xoffset=0     yoffset=16    xadvance=4     page=0  chnl=0 

+char id=124   x=0     y=0     width=6     height=20     xoffset=1     yoffset=3    xadvance=9     page=0  chnl=0 

+char id=106   x=6     y=0     width=9     height=20     xoffset=-4     yoffset=3    xadvance=4     page=0  chnl=0 

+char id=81   x=15     y=0     width=15     height=19     xoffset=-2     yoffset=3    xadvance=12     page=0  chnl=0 

+char id=74   x=30     y=0     width=11     height=19     xoffset=-5     yoffset=3    xadvance=4     page=0  chnl=0 

+char id=125   x=41     y=0     width=10     height=18     xoffset=-3     yoffset=3    xadvance=6     page=0  chnl=0 

+char id=123   x=51     y=0     width=10     height=18     xoffset=-3     yoffset=3    xadvance=6     page=0  chnl=0 

+char id=93   x=61     y=0     width=8     height=18     xoffset=-3     yoffset=3    xadvance=5     page=0  chnl=0 

+char id=91   x=69     y=0     width=8     height=18     xoffset=-2     yoffset=3    xadvance=5     page=0  chnl=0 

+char id=41   x=77     y=0     width=9     height=18     xoffset=-3     yoffset=3    xadvance=5     page=0  chnl=0 

+char id=40   x=86     y=0     width=9     height=18     xoffset=-3     yoffset=3    xadvance=5     page=0  chnl=0 

+char id=64   x=95     y=0     width=18     height=17     xoffset=-3     yoffset=3    xadvance=14     page=0  chnl=0 

+char id=121   x=113     y=0     width=13     height=17     xoffset=-3     yoffset=6    xadvance=8     page=0  chnl=0 

+char id=113   x=126     y=0     width=13     height=17     xoffset=-3     yoffset=6    xadvance=9     page=0  chnl=0 

+char id=112   x=139     y=0     width=13     height=17     xoffset=-2     yoffset=6    xadvance=9     page=0  chnl=0 

+char id=103   x=152     y=0     width=13     height=17     xoffset=-3     yoffset=6    xadvance=8     page=0  chnl=0 

+char id=38   x=165     y=0     width=16     height=16     xoffset=-3     yoffset=3    xadvance=11     page=0  chnl=0 

+char id=37   x=181     y=0     width=18     height=16     xoffset=-3     yoffset=3    xadvance=14     page=0  chnl=0 

+char id=36   x=199     y=0     width=12     height=16     xoffset=-2     yoffset=3    xadvance=9     page=0  chnl=0 

+char id=63   x=211     y=0     width=11     height=16     xoffset=-3     yoffset=3    xadvance=7     page=0  chnl=0 

+char id=33   x=222     y=0     width=7     height=16     xoffset=-2     yoffset=3    xadvance=4     page=0  chnl=0 

+char id=48   x=229     y=0     width=13     height=16     xoffset=-3     yoffset=3    xadvance=9     page=0  chnl=0 

+char id=57   x=242     y=0     width=13     height=16     xoffset=-3     yoffset=3    xadvance=9     page=0  chnl=0 

+char id=56   x=0     y=20     width=13     height=16     xoffset=-3     yoffset=3    xadvance=9     page=0  chnl=0 

+char id=54   x=13     y=20     width=13     height=16     xoffset=-3     yoffset=3    xadvance=9     page=0  chnl=0 

+char id=53   x=26     y=20     width=12     height=16     xoffset=-2     yoffset=3    xadvance=9     page=0  chnl=0 

+char id=51   x=38     y=20     width=13     height=16     xoffset=-3     yoffset=3    xadvance=9     page=0  chnl=0 

+char id=100   x=51     y=20     width=13     height=16     xoffset=-3     yoffset=3    xadvance=9     page=0  chnl=0 

+char id=98   x=64     y=20     width=13     height=16     xoffset=-2     yoffset=3    xadvance=9     page=0  chnl=0 

+char id=85   x=77     y=20     width=14     height=16     xoffset=-2     yoffset=3    xadvance=11     page=0  chnl=0 

+char id=83   x=91     y=20     width=13     height=16     xoffset=-3     yoffset=3    xadvance=8     page=0  chnl=0 

+char id=79   x=104     y=20     width=15     height=16     xoffset=-2     yoffset=3    xadvance=12     page=0  chnl=0 

+char id=71   x=119     y=20     width=14     height=16     xoffset=-2     yoffset=3    xadvance=11     page=0  chnl=0 

+char id=67   x=133     y=20     width=13     height=16     xoffset=-2     yoffset=3    xadvance=10     page=0  chnl=0 

+char id=127   x=146     y=20     width=12     height=15     xoffset=-2     yoffset=3    xadvance=10     page=0  chnl=0 

+char id=35   x=158     y=20     width=15     height=15     xoffset=-3     yoffset=3    xadvance=10     page=0  chnl=0 

+char id=92   x=173     y=20     width=11     height=15     xoffset=-3     yoffset=3    xadvance=6     page=0  chnl=0 

+char id=47   x=184     y=20     width=11     height=15     xoffset=-3     yoffset=3    xadvance=6     page=0  chnl=0 

+char id=59   x=195     y=20     width=8     height=15     xoffset=-3     yoffset=6    xadvance=4     page=0  chnl=0 

+char id=55   x=203     y=20     width=13     height=15     xoffset=-3     yoffset=3    xadvance=9     page=0  chnl=0 

+char id=52   x=216     y=20     width=14     height=15     xoffset=-3     yoffset=3    xadvance=9     page=0  chnl=0 

+char id=50   x=230     y=20     width=13     height=15     xoffset=-3     yoffset=3    xadvance=9     page=0  chnl=0 

+char id=49   x=243     y=20     width=9     height=15     xoffset=-2     yoffset=3    xadvance=9     page=0  chnl=0 

+char id=116   x=0     y=36     width=10     height=15     xoffset=-3     yoffset=4    xadvance=5     page=0  chnl=0 

+char id=108   x=10     y=36     width=6     height=15     xoffset=-2     yoffset=3    xadvance=4     page=0  chnl=0 

+char id=107   x=16     y=36     width=12     height=15     xoffset=-2     yoffset=3    xadvance=8     page=0  chnl=0 

+char id=105   x=28     y=36     width=7     height=15     xoffset=-2     yoffset=3    xadvance=4     page=0  chnl=0 

+char id=104   x=35     y=36     width=12     height=15     xoffset=-2     yoffset=3    xadvance=10     page=0  chnl=0 

+char id=102   x=47     y=36     width=11     height=15     xoffset=-3     yoffset=3    xadvance=5     page=0  chnl=0 

+char id=90   x=58     y=36     width=13     height=15     xoffset=-3     yoffset=3    xadvance=9     page=0  chnl=0 

+char id=89   x=71     y=36     width=13     height=15     xoffset=-3     yoffset=3    xadvance=8     page=0  chnl=0 

+char id=88   x=84     y=36     width=14     height=15     xoffset=-3     yoffset=3    xadvance=9     page=0  chnl=0 

+char id=87   x=98     y=36     width=19     height=15     xoffset=-3     yoffset=3    xadvance=15     page=0  chnl=0 

+char id=86   x=117     y=36     width=14     height=15     xoffset=-3     yoffset=3    xadvance=9     page=0  chnl=0 

+char id=84   x=131     y=36     width=13     height=15     xoffset=-3     yoffset=3    xadvance=8     page=0  chnl=0 

+char id=82   x=144     y=36     width=13     height=15     xoffset=-2     yoffset=3    xadvance=10     page=0  chnl=0 

+char id=80   x=157     y=36     width=12     height=15     xoffset=-2     yoffset=3    xadvance=9     page=0  chnl=0 

+char id=78   x=169     y=36     width=14     height=15     xoffset=-2     yoffset=3    xadvance=12     page=0  chnl=0 

+char id=77   x=183     y=36     width=17     height=15     xoffset=-2     yoffset=3    xadvance=14     page=0  chnl=0 

+char id=76   x=200     y=36     width=11     height=15     xoffset=-2     yoffset=3    xadvance=8     page=0  chnl=0 

+char id=75   x=211     y=36     width=13     height=15     xoffset=-2     yoffset=3    xadvance=9     page=0  chnl=0 

+char id=73   x=224     y=36     width=10     height=15     xoffset=-3     yoffset=3    xadvance=5     page=0  chnl=0 

+char id=72   x=234     y=36     width=14     height=15     xoffset=-2     yoffset=3    xadvance=11     page=0  chnl=0 

+char id=70   x=0     y=51     width=11     height=15     xoffset=-2     yoffset=3    xadvance=8     page=0  chnl=0 

+char id=69   x=11     y=51     width=11     height=15     xoffset=-2     yoffset=3    xadvance=8     page=0  chnl=0 

+char id=68   x=22     y=51     width=14     height=15     xoffset=-2     yoffset=3    xadvance=11     page=0  chnl=0 

+char id=66   x=36     y=51     width=13     height=15     xoffset=-2     yoffset=3    xadvance=10     page=0  chnl=0 

+char id=65   x=49     y=51     width=15     height=15     xoffset=-3     yoffset=3    xadvance=10     page=0  chnl=0 

+char id=58   x=64     y=51     width=7     height=13     xoffset=-2     yoffset=6    xadvance=4     page=0  chnl=0 

+char id=117   x=71     y=51     width=12     height=13     xoffset=-2     yoffset=6    xadvance=10     page=0  chnl=0 

+char id=115   x=83     y=51     width=11     height=13     xoffset=-3     yoffset=6    xadvance=7     page=0  chnl=0 

+char id=111   x=94     y=51     width=13     height=13     xoffset=-3     yoffset=6    xadvance=9     page=0  chnl=0 

+char id=101   x=107     y=51     width=13     height=13     xoffset=-3     yoffset=6    xadvance=9     page=0  chnl=0 

+char id=99   x=120     y=51     width=12     height=13     xoffset=-3     yoffset=6    xadvance=7     page=0  chnl=0 

+char id=97   x=132     y=51     width=12     height=13     xoffset=-3     yoffset=6    xadvance=9     page=0  chnl=0 

+char id=60   x=144     y=51     width=13     height=12     xoffset=-3     yoffset=5    xadvance=9     page=0  chnl=0 

+char id=122   x=157     y=51     width=11     height=12     xoffset=-3     yoffset=6    xadvance=7     page=0  chnl=0 

+char id=120   x=168     y=51     width=13     height=12     xoffset=-3     yoffset=6    xadvance=8     page=0  chnl=0 

+char id=119   x=181     y=51     width=17     height=12     xoffset=-3     yoffset=6    xadvance=12     page=0  chnl=0 

+char id=118   x=198     y=51     width=13     height=12     xoffset=-3     yoffset=6    xadvance=8     page=0  chnl=0 

+char id=114   x=211     y=51     width=10     height=12     xoffset=-2     yoffset=6    xadvance=6     page=0  chnl=0 

+char id=110   x=221     y=51     width=12     height=12     xoffset=-2     yoffset=6    xadvance=10     page=0  chnl=0 

+char id=109   x=233     y=51     width=17     height=12     xoffset=-2     yoffset=6    xadvance=15     page=0  chnl=0 

+char id=94   x=0     y=66     width=13     height=11     xoffset=-3     yoffset=3    xadvance=9     page=0  chnl=0 

+char id=62   x=13     y=66     width=13     height=11     xoffset=-3     yoffset=5    xadvance=9     page=0  chnl=0 

+char id=42   x=26     y=66     width=13     height=10     xoffset=-3     yoffset=3    xadvance=9     page=0  chnl=0 

+char id=43   x=39     y=66     width=13     height=10     xoffset=-3     yoffset=6    xadvance=9     page=0  chnl=0 

+char id=61   x=52     y=66     width=13     height=8     xoffset=-3     yoffset=7    xadvance=9     page=0  chnl=0 

+char id=39   x=65     y=66     width=6     height=8     xoffset=-2     yoffset=3    xadvance=3     page=0  chnl=0 

+char id=34   x=71     y=66     width=9     height=8     xoffset=-2     yoffset=3    xadvance=6     page=0  chnl=0 

+char id=44   x=80     y=66     width=8     height=7     xoffset=-3     yoffset=14    xadvance=4     page=0  chnl=0 

+char id=126   x=88     y=66     width=13     height=6     xoffset=-3     yoffset=8    xadvance=9     page=0  chnl=0 

+char id=46   x=101     y=66     width=7     height=6     xoffset=-2     yoffset=13    xadvance=4     page=0  chnl=0 

+char id=96   x=108     y=66     width=8     height=6     xoffset=0     yoffset=2    xadvance=9     page=0  chnl=0 

+char id=45   x=116     y=66     width=9     height=5     xoffset=-3     yoffset=10    xadvance=5     page=0  chnl=0 

+char id=95   x=125     y=66     width=13     height=4     xoffset=-4     yoffset=17    xadvance=6     page=0  chnl=0 

+kernings count=-1

diff --git a/assets/skin/uiskin.atlas b/assets/skin/uiskin.atlas
new file mode 100644
index 0000000..c193581
--- /dev/null
+++ b/assets/skin/uiskin.atlas
@@ -0,0 +1,198 @@
+
+uiskin.png
+format: RGBA8888
+filter: Nearest,Nearest
+repeat: none
+default
+  rotate: false
+  xy: 1, 50
+  size: 254, 77
+  orig: 254, 77
+  offset: 0, 0
+  index: -1
+default-window
+  rotate: false
+  xy: 1, 20
+  size: 27, 29
+  split: 4, 3, 20, 3
+  orig: 27, 29
+  offset: 0, 0
+  index: -1
+default-select
+  rotate: false
+  xy: 29, 29
+  size: 27, 20
+  split: 4, 14, 4, 4
+  orig: 27, 20
+  offset: 0, 0
+  index: -1
+default-round-large
+  rotate: false
+  xy: 57, 29
+  size: 20, 20
+  split: 5, 5, 5, 4
+  orig: 20, 20
+  offset: 0, 0
+  index: -1
+default-scroll
+  rotate: false
+  xy: 78, 29
+  size: 20, 20
+  split: 2, 2, 2, 2
+  orig: 20, 20
+  offset: 0, 0
+  index: -1
+default-slider-knob
+  rotate: false
+  xy: 1, 1
+  size: 9, 18
+  orig: 9, 18
+  offset: 0, 0
+  index: -1
+default-round-down
+  rotate: false
+  xy: 99, 29
+  size: 12, 20
+  split: 5, 5, 5, 4
+  orig: 12, 20
+  offset: 0, 0
+  index: -1
+default-round
+  rotate: false
+  xy: 112, 29
+  size: 12, 20
+  split: 5, 5, 5, 4
+  pad: 4, 4, 1, 1
+  orig: 12, 20
+  offset: 0, 0
+  index: -1
+check-off
+  rotate: false
+  xy: 11, 5
+  size: 14, 14
+  orig: 14, 14
+  offset: 0, 0
+  index: -1
+textfield
+  rotate: false
+  xy: 11, 5
+  size: 14, 14
+  split: 3, 3, 3, 3
+  orig: 14, 14
+  offset: 0, 0
+  index: -1
+check-on
+  rotate: false
+  xy: 125, 35
+  size: 14, 14
+  orig: 14, 14
+  offset: 0, 0
+  index: -1
+tree-minus
+  rotate: false
+  xy: 140, 35
+  size: 14, 14
+  orig: 14, 14
+  offset: 0, 0
+  index: -1
+tree-plus
+  rotate: false
+  xy: 155, 35
+  size: 14, 14
+  orig: 14, 14
+  offset: 0, 0
+  index: -1
+default-slider
+  rotate: false
+  xy: 29, 20
+  size: 8, 8
+  split: 2, 2, 2, 2
+  orig: 8, 8
+  offset: 0, 0
+  index: -1
+default-pane
+  rotate: false
+  xy: 11, 1
+  size: 5, 3
+  split: 1, 1, 1, 1
+  orig: 5, 3
+  offset: 0, 0
+  index: -1
+default-rect-pad
+  rotate: false
+  xy: 11, 1
+  size: 5, 3
+  split: 1, 1, 1, 1
+  orig: 5, 3
+  offset: 0, 0
+  index: -1
+default-splitpane
+  rotate: false
+  xy: 17, 1
+  size: 5, 3
+  split: 0, 5, 0, 0
+  orig: 5, 3
+  offset: 0, 0
+  index: -1
+cursor
+  rotate: false
+  xy: 23, 1
+  size: 3, 3
+  split: 1, 1, 1, 1
+  orig: 3, 3
+  offset: 0, 0
+  index: -1
+default-splitpane-vertical
+  rotate: false
+  xy: 125, 29
+  size: 3, 5
+  split: 0, 0, 0, 5
+  orig: 3, 5
+  offset: 0, 0
+  index: -1
+default-rect-down
+  rotate: false
+  xy: 170, 46
+  size: 3, 3
+  split: 1, 1, 1, 1
+  orig: 3, 3
+  offset: 0, 0
+  index: -1
+default-rect
+  rotate: false
+  xy: 38, 25
+  size: 3, 3
+  split: 1, 1, 1, 1
+  orig: 3, 3
+  offset: 0, 0
+  index: -1
+default-select-selection
+  rotate: false
+  xy: 26, 16
+  size: 3, 3
+  split: 1, 1, 1, 1
+  orig: 3, 3
+  offset: 0, 0
+  index: -1
+default-pane-noborder
+  rotate: false
+  xy: 129, 33
+  size: 1, 1
+  split: 0, 0, 0, 0
+  orig: 1, 1
+  offset: 0, 0
+  index: -1
+selection
+  rotate: false
+  xy: 170, 44
+  size: 1, 1
+  orig: 1, 1
+  offset: 0, 0
+  index: -1
+white
+  rotate: false
+  xy: 174, 48
+  size: 1, 1
+  orig: 1, 1
+  offset: 0, 0
+  index: -1
diff --git a/assets/skin/uiskin.json b/assets/skin/uiskin.json
new file mode 100644
index 0000000..f14c6af
--- /dev/null
+++ b/assets/skin/uiskin.json
@@ -0,0 +1,64 @@
+{
+com.badlogic.gdx.graphics.g2d.BitmapFont: { default-font: { file: veteran.fnt } },
+com.badlogic.gdx.graphics.Color: {
+	green: { a: 1, b: 0, g: 1, r: 0 },
+	white: { a: 1, b: 1, g: 1, r: 1 },
+	red: { a: 1, b: 0, g: 0, r: 1 },
+	black: { a: 1, b: 0, g: 0, r: 0 }
+},
+com.badlogic.gdx.scenes.scene2d.ui.Skin$TintedDrawable: {
+	dialogDim: { name: white, color: { r: 0, g: 0, b: 0, a: 0.45 } }
+},
+com.badlogic.gdx.scenes.scene2d.ui.Button$ButtonStyle: {
+	default: { down: default-round-down, up: default-round },
+	toggle: { down: default-round-down, checked: default-round-down, up: default-round }
+},
+com.badlogic.gdx.scenes.scene2d.ui.TextButton$TextButtonStyle: {
+	default: { down: default-round-down, up: default-round, font: default-font, fontColor: white },
+	toggle: { down: default-round-down, up: default-round, checked: default-round-down, font: default-font, fontColor: white, downFontColor: red }
+},
+com.badlogic.gdx.scenes.scene2d.ui.ScrollPane$ScrollPaneStyle: {
+	default: { vScroll: default-scroll, hScrollKnob: default-round-large, background: default-rect, hScroll: default-scroll, vScrollKnob: default-round-large }
+},
+com.badlogic.gdx.scenes.scene2d.ui.SelectBox$SelectBoxStyle: {
+	default: {
+		font: default-font, fontColor: white, background: default-select,
+		scrollStyle: default,
+		listStyle: { font: default-font, selection: default-select-selection }
+	}
+},
+com.badlogic.gdx.scenes.scene2d.ui.SplitPane$SplitPaneStyle: {
+	default-vertical: { handle: default-splitpane-vertical },
+	default-horizontal: { handle: default-splitpane }
+},
+com.badlogic.gdx.scenes.scene2d.ui.Window$WindowStyle: {
+	default: { titleFont: default-font, background: default-window, titleFontColor: white },
+	dialog: { titleFont: default-font, background: default-window, titleFontColor: white, stageBackground: dialogDim }
+},
+com.badlogic.gdx.scenes.scene2d.ui.ProgressBar$ProgressBarStyle: {
+	default-horizontal: { background: default-slider, knob: default-slider-knob },
+	default-vertical: { background: default-slider, knob: default-round-large }
+},
+com.badlogic.gdx.scenes.scene2d.ui.Slider$SliderStyle: {
+	default-horizontal: { background: default-slider, knob: default-slider-knob },
+	default-vertical: { background: default-slider, knob: default-round-large }
+},
+com.badlogic.gdx.scenes.scene2d.ui.Label$LabelStyle: {
+	default: { font: default-font, fontColor: white }
+},
+com.badlogic.gdx.scenes.scene2d.ui.TextField$TextFieldStyle: {
+	default: { selection: selection, background: textfield, font: default-font, fontColor: white, cursor: cursor }
+},
+com.badlogic.gdx.scenes.scene2d.ui.CheckBox$CheckBoxStyle: {
+	default: { checkboxOn: check-on, checkboxOff: check-off, font: default-font, fontColor: white }
+},
+com.badlogic.gdx.scenes.scene2d.ui.List$ListStyle: {
+	default: { fontColorUnselected: white, selection: selection, fontColorSelected: white, font: default-font }
+},
+com.badlogic.gdx.scenes.scene2d.ui.Touchpad$TouchpadStyle: {
+	default: { background: default-pane, knob: default-round-large }
+},
+com.badlogic.gdx.scenes.scene2d.ui.Tree$TreeStyle: {
+	default: { minus: tree-minus, plus: tree-plus, selection: default-select-selection }
+}
+}
diff --git a/assets/skin/uiskin.png b/assets/skin/uiskin.png
new file mode 100644
index 0000000..f51c5bd
--- /dev/null
+++ b/assets/skin/uiskin.png
diff --git a/assets/skin/veteran-black.png b/assets/skin/veteran-black.png
new file mode 100644
index 0000000..ea5fcbe
--- /dev/null
+++ b/assets/skin/veteran-black.png
diff --git a/assets/skin/veteran-white.png b/assets/skin/veteran-white.png
new file mode 100644
index 0000000..daa70d9
--- /dev/null
+++ b/assets/skin/veteran-white.png
diff --git a/assets/skin/veteran.fnt b/assets/skin/veteran.fnt
new file mode 100644
index 0000000..b5e400f
--- /dev/null
+++ b/assets/skin/veteran.fnt
@@ -0,0 +1,100 @@
+info face=font size=22 bold=0 italic=0 charset= unicode= stretchH=100 smooth=1 aa=1 padding=2,2,2,2 spacing=0,0 outline=0
+common lineHeight=24 base=18 scaleW=118 scaleH=391 pages=1 packed=0
+page id=0 file="veteran-white.png"
+chars count=95
+char id=32 x=2 y=2 width=0 height=0 xoffset=0 yoffset=18 xadvance=8 page=0 chnl=15
+char id=33 x=2 y=4 width=4 height=16 xoffset=0 yoffset=2 xadvance=5 page=0 chnl=15
+char id=34 x=2 y=22 width=9 height=8 xoffset=0 yoffset=1 xadvance=10 page=0 chnl=15
+char id=35 x=8 y=2 width=15 height=16 xoffset=0 yoffset=3 xadvance=14 page=0 chnl=15
+char id=36 x=2 y=32 width=10 height=18 xoffset=0 yoffset=2 xadvance=11 page=0 chnl=15
+char id=37 x=2 y=52 width=12 height=17 xoffset=0 yoffset=1 xadvance=13 page=0 chnl=15
+char id=38 x=14 y=20 width=13 height=16 xoffset=0 yoffset=2 xadvance=14 page=0 chnl=15
+char id=39 x=14 y=38 width=4 height=7 xoffset=0 yoffset=0 xadvance=5 page=0 chnl=15
+char id=40 x=2 y=71 width=5 height=18 xoffset=0 yoffset=1 xadvance=5 page=0 chnl=15
+char id=41 x=2 y=91 width=5 height=19 xoffset=0 yoffset=1 xadvance=5 page=0 chnl=15
+char id=42 x=25 y=2 width=7 height=7 xoffset=0 yoffset=0 xadvance=8 page=0 chnl=15
+char id=43 x=2 y=112 width=8 height=8 xoffset=0 yoffset=6 xadvance=8 page=0 chnl=15
+char id=44 x=25 y=11 width=4 height=7 xoffset=0 yoffset=15 xadvance=5 page=0 chnl=15
+char id=45 x=14 y=47 width=8 height=2 xoffset=0 yoffset=9 xadvance=7 page=0 chnl=15
+char id=46 x=20 y=38 width=3 height=3 xoffset=0 yoffset=15 xadvance=4 page=0 chnl=15
+char id=47 x=9 y=71 width=10 height=17 xoffset=0 yoffset=2 xadvance=9 page=0 chnl=15
+char id=48 x=16 y=51 width=11 height=15 xoffset=0 yoffset=3 xadvance=12 page=0 chnl=15
+char id=49 x=9 y=90 width=10 height=16 xoffset=0 yoffset=3 xadvance=11 page=0 chnl=15
+char id=50 x=2 y=122 width=11 height=16 xoffset=0 yoffset=3 xadvance=11 page=0 chnl=15
+char id=51 x=2 y=140 width=10 height=15 xoffset=0 yoffset=3 xadvance=11 page=0 chnl=15
+char id=52 x=2 y=157 width=11 height=15 xoffset=0 yoffset=3 xadvance=12 page=0 chnl=15
+char id=53 x=2 y=174 width=10 height=16 xoffset=0 yoffset=3 xadvance=10 page=0 chnl=15
+char id=54 x=14 y=140 width=10 height=15 xoffset=0 yoffset=3 xadvance=10 page=0 chnl=15
+char id=55 x=15 y=108 width=9 height=16 xoffset=0 yoffset=2 xadvance=10 page=0 chnl=15
+char id=56 x=21 y=68 width=11 height=16 xoffset=0 yoffset=3 xadvance=11 page=0 chnl=15
+char id=57 x=21 y=86 width=10 height=15 xoffset=0 yoffset=3 xadvance=11 page=0 chnl=15
+char id=58 x=15 y=126 width=3 height=12 xoffset=0 yoffset=7 xadvance=4 page=0 chnl=15
+char id=59 x=29 y=20 width=4 height=15 xoffset=0 yoffset=8 xadvance=6 page=0 chnl=15
+char id=60 x=24 y=43 width=8 height=5 xoffset=0 yoffset=9 xadvance=8 page=0 chnl=15
+char id=61 x=31 y=11 width=8 height=5 xoffset=0 yoffset=8 xadvance=8 page=0 chnl=15
+char id=62 x=34 y=2 width=8 height=5 xoffset=0 yoffset=9 xadvance=8 page=0 chnl=15
+char id=63 x=29 y=50 width=9 height=16 xoffset=0 yoffset=2 xadvance=8 page=0 chnl=15
+char id=64 x=35 y=18 width=17 height=19 xoffset=0 yoffset=2 xadvance=18 page=0 chnl=15
+char id=65 x=2 y=192 width=13 height=16 xoffset=0 yoffset=3 xadvance=13 page=0 chnl=15
+char id=66 x=14 y=174 width=13 height=16 xoffset=0 yoffset=3 xadvance=13 page=0 chnl=15
+char id=67 x=26 y=103 width=10 height=16 xoffset=0 yoffset=3 xadvance=11 page=0 chnl=15
+char id=68 x=34 y=68 width=13 height=16 xoffset=0 yoffset=3 xadvance=13 page=0 chnl=15
+char id=69 x=40 y=39 width=13 height=16 xoffset=0 yoffset=3 xadvance=13 page=0 chnl=15
+char id=70 x=54 y=2 width=12 height=16 xoffset=0 yoffset=3 xadvance=13 page=0 chnl=15
+char id=71 x=54 y=20 width=12 height=16 xoffset=0 yoffset=2 xadvance=12 page=0 chnl=15
+char id=72 x=26 y=121 width=13 height=16 xoffset=0 yoffset=3 xadvance=13 page=0 chnl=15
+char id=73 x=38 y=86 width=10 height=16 xoffset=0 yoffset=3 xadvance=10 page=0 chnl=15
+char id=74 x=49 y=57 width=12 height=16 xoffset=0 yoffset=3 xadvance=12 page=0 chnl=15
+char id=75 x=55 y=38 width=13 height=16 xoffset=0 yoffset=2 xadvance=13 page=0 chnl=15
+char id=76 x=26 y=139 width=12 height=16 xoffset=0 yoffset=3 xadvance=13 page=0 chnl=15
+char id=77 x=68 y=2 width=13 height=16 xoffset=0 yoffset=3 xadvance=13 page=0 chnl=15
+char id=78 x=68 y=20 width=13 height=16 xoffset=0 yoffset=3 xadvance=13 page=0 chnl=15
+char id=79 x=2 y=210 width=11 height=16 xoffset=0 yoffset=3 xadvance=12 page=0 chnl=15
+char id=80 x=2 y=228 width=12 height=16 xoffset=0 yoffset=3 xadvance=13 page=0 chnl=15
+char id=81 x=2 y=246 width=11 height=20 xoffset=0 yoffset=3 xadvance=12 page=0 chnl=15
+char id=82 x=15 y=210 width=13 height=16 xoffset=0 yoffset=3 xadvance=14 page=0 chnl=15
+char id=83 x=17 y=192 width=10 height=16 xoffset=0 yoffset=3 xadvance=11 page=0 chnl=15
+char id=84 x=29 y=157 width=11 height=16 xoffset=0 yoffset=3 xadvance=12 page=0 chnl=15
+char id=85 x=40 y=139 width=13 height=16 xoffset=0 yoffset=3 xadvance=13 page=0 chnl=15
+char id=86 x=41 y=104 width=13 height=16 xoffset=0 yoffset=3 xadvance=13 page=0 chnl=15
+char id=87 x=50 y=75 width=13 height=16 xoffset=0 yoffset=3 xadvance=14 page=0 chnl=15
+char id=88 x=63 y=56 width=13 height=16 xoffset=0 yoffset=2 xadvance=13 page=0 chnl=15
+char id=89 x=70 y=38 width=13 height=16 xoffset=0 yoffset=3 xadvance=13 page=0 chnl=15
+char id=90 x=29 y=175 width=11 height=16 xoffset=0 yoffset=3 xadvance=12 page=0 chnl=15
+char id=91 x=83 y=2 width=4 height=17 xoffset=0 yoffset=3 xadvance=4 page=0 chnl=15
+char id=92 x=2 y=268 width=9 height=16 xoffset=0 yoffset=2 xadvance=9 page=0 chnl=15
+char id=93 x=2 y=286 width=4 height=19 xoffset=-1 yoffset=1 xadvance=4 page=0 chnl=15
+char id=94 x=41 y=9 width=5 height=6 xoffset=0 yoffset=3 xadvance=6 page=0 chnl=15
+char id=95 x=25 y=38 width=8 height=2 xoffset=0 yoffset=19 xadvance=8 page=0 chnl=15
+char id=96 x=35 y=39 width=3 height=4 xoffset=1 yoffset=3 xadvance=4 page=0 chnl=15
+char id=97 x=15 y=157 width=11 height=11 xoffset=0 yoffset=7 xadvance=12 page=0 chnl=15
+char id=98 x=83 y=21 width=12 height=15 xoffset=0 yoffset=3 xadvance=12 page=0 chnl=15
+char id=99 x=41 y=122 width=9 height=12 xoffset=0 yoffset=6 xadvance=10 page=0 chnl=15
+char id=100 x=89 y=2 width=12 height=16 xoffset=0 yoffset=3 xadvance=12 page=0 chnl=15
+char id=101 x=52 y=122 width=10 height=12 xoffset=0 yoffset=6 xadvance=11 page=0 chnl=15
+char id=102 x=56 y=93 width=11 height=16 xoffset=0 yoffset=3 xadvance=12 page=0 chnl=15
+char id=103 x=65 y=74 width=11 height=16 xoffset=0 yoffset=7 xadvance=12 page=0 chnl=15
+char id=104 x=29 y=193 width=13 height=15 xoffset=0 yoffset=3 xadvance=13 page=0 chnl=15
+char id=105 x=42 y=157 width=9 height=16 xoffset=0 yoffset=3 xadvance=9 page=0 chnl=15
+char id=106 x=2 y=307 width=8 height=19 xoffset=0 yoffset=3 xadvance=8 page=0 chnl=15
+char id=107 x=42 y=175 width=13 height=15 xoffset=0 yoffset=3 xadvance=13 page=0 chnl=15
+char id=108 x=53 y=157 width=11 height=16 xoffset=0 yoffset=3 xadvance=10 page=0 chnl=15
+char id=109 x=55 y=136 width=13 height=12 xoffset=0 yoffset=6 xadvance=14 page=0 chnl=15
+char id=110 x=8 y=286 width=12 height=12 xoffset=0 yoffset=6 xadvance=12 page=0 chnl=15
+char id=111 x=13 y=268 width=10 height=12 xoffset=0 yoffset=6 xadvance=11 page=0 chnl=15
+char id=112 x=15 y=246 width=12 height=16 xoffset=-1 yoffset=6 xadvance=12 page=0 chnl=15
+char id=113 x=16 y=228 width=12 height=16 xoffset=0 yoffset=6 xadvance=11 page=0 chnl=15
+char id=114 x=64 y=111 width=11 height=12 xoffset=0 yoffset=6 xadvance=11 page=0 chnl=15
+char id=115 x=69 y=92 width=9 height=12 xoffset=0 yoffset=7 xadvance=9 page=0 chnl=15
+char id=116 x=78 y=56 width=10 height=16 xoffset=0 yoffset=3 xadvance=11 page=0 chnl=15
+char id=117 x=85 y=38 width=13 height=12 xoffset=0 yoffset=6 xadvance=13 page=0 chnl=15
+char id=118 x=97 y=20 width=12 height=12 xoffset=0 yoffset=7 xadvance=13 page=0 chnl=15
+char id=119 x=103 y=2 width=13 height=12 xoffset=0 yoffset=7 xadvance=13 page=0 chnl=15
+char id=120 x=78 y=74 width=13 height=12 xoffset=0 yoffset=7 xadvance=13 page=0 chnl=15
+char id=121 x=90 y=52 width=12 height=15 xoffset=0 yoffset=7 xadvance=13 page=0 chnl=15
+char id=122 x=100 y=34 width=10 height=12 xoffset=0 yoffset=7 xadvance=11 page=0 chnl=15
+char id=123 x=2 y=328 width=6 height=19 xoffset=0 yoffset=1 xadvance=6 page=0 chnl=15
+char id=124 x=2 y=349 width=2 height=19 xoffset=0 yoffset=1 xadvance=3 page=0 chnl=15
+char id=125 x=2 y=370 width=6 height=19 xoffset=-1 yoffset=1 xadvance=6 page=0 chnl=15
+char id=126 x=44 y=2 width=8 height=3 xoffset=1 yoffset=10 xadvance=9 page=0 chnl=15
+char id=32 x=0 y=0 width=0 height=0 xoffset=1 yoffset=10 xadvance=8 page=0 chnl=15
diff --git a/assets/sounds/dice.mp3 b/assets/sounds/dice.mp3
new file mode 100644
index 0000000..0461430
--- /dev/null
+++ b/assets/sounds/dice.mp3
diff --git a/assets/sounds/explosion.mp3 b/assets/sounds/explosion.mp3
new file mode 100644
index 0000000..3e53a61
--- /dev/null
+++ b/assets/sounds/explosion.mp3
diff --git a/assets/sounds/explosion_short.mp3 b/assets/sounds/explosion_short.mp3
new file mode 100644
index 0000000..a19bfa5
--- /dev/null
+++ b/assets/sounds/explosion_short.mp3
diff --git a/assets/sounds/infantry_fire.mp3 b/assets/sounds/infantry_fire.mp3
new file mode 100644
index 0000000..df963ce
--- /dev/null
+++ b/assets/sounds/infantry_fire.mp3
diff --git a/assets/sounds/move.mp3 b/assets/sounds/move.mp3
new file mode 100644
index 0000000..9574d84
--- /dev/null
+++ b/assets/sounds/move.mp3
diff --git a/assets/sounds/promote.mp3 b/assets/sounds/promote.mp3
new file mode 100644
index 0000000..434ddec
--- /dev/null
+++ b/assets/sounds/promote.mp3
diff --git a/assets/sounds/tank_fire.mp3 b/assets/sounds/tank_fire.mp3
new file mode 100644
index 0000000..89406ad
--- /dev/null
+++ b/assets/sounds/tank_fire.mp3
diff --git a/assets/sounds/tank_fire_short.mp3 b/assets/sounds/tank_fire_short.mp3
new file mode 100644
index 0000000..d958286
--- /dev/null
+++ b/assets/sounds/tank_fire_short.mp3
diff --git a/data/assets/unit-overlays/00_move.png b/assets/unit-overlays/00_move.png
index 5303cce..5303cce 100644
--- a/data/assets/unit-overlays/00_move.png
+++ b/assets/unit-overlays/00_move.png
diff --git a/data/assets/unit-overlays/01_target.png b/assets/unit-overlays/01_target.png
index 953151d..953151d 100644
--- a/data/assets/unit-overlays/01_target.png
+++ b/assets/unit-overlays/01_target.png
diff --git a/data/assets/unit-overlays/02_fire.png b/assets/unit-overlays/02_fire.png
index 2344671..2344671 100644
--- a/data/assets/unit-overlays/02_fire.png
+++ b/assets/unit-overlays/02_fire.png
diff --git a/data/assets/unit-overlays/03_may_fire.png b/assets/unit-overlays/03_may_fire.png
index 52b29dd..52b29dd 100644
--- a/data/assets/unit-overlays/03_may_fire.png
+++ b/assets/unit-overlays/03_may_fire.png
diff --git a/data/assets/unit-overlays/04_ace.png b/assets/unit-overlays/04_ace.png
index 38d32b4..38d32b4 100644
--- a/data/assets/unit-overlays/04_ace.png
+++ b/assets/unit-overlays/04_ace.png
diff --git a/data/assets/unit-overlays/05_hq.png b/assets/unit-overlays/05_hq.png
index d1dd2d8..d1dd2d8 100644
--- a/data/assets/unit-overlays/05_hq.png
+++ b/assets/unit-overlays/05_hq.png
diff --git a/data/assets/units/ge-at-gun.png b/assets/units/ge-at-gun.png
index f81a4b1..f81a4b1 100644
--- a/data/assets/units/ge-at-gun.png
+++ b/assets/units/ge-at-gun.png
diff --git a/data/assets/units/ge-head.png b/assets/units/ge-head.png
index 2a540be..2a540be 100644
--- a/data/assets/units/ge-head.png
+++ b/assets/units/ge-head.png
diff --git a/data/assets/units/ge-infantry.png b/assets/units/ge-infantry.png
index ef4cee9..ef4cee9 100644
--- a/data/assets/units/ge-infantry.png
+++ b/assets/units/ge-infantry.png
diff --git a/data/assets/units/ge-kingtiger.png b/assets/units/ge-kingtiger.png
index e45171b..e45171b 100644
--- a/data/assets/units/ge-kingtiger.png
+++ b/assets/units/ge-kingtiger.png
diff --git a/data/assets/units/ge-panzer-iv-hq.png b/assets/units/ge-panzer-iv-hq.png
index 2785941..2785941 100644
--- a/data/assets/units/ge-panzer-iv-hq.png
+++ b/assets/units/ge-panzer-iv-hq.png
diff --git a/data/assets/units/ge-panzer-iv.png b/assets/units/ge-panzer-iv.png
index 35ab9c3..35ab9c3 100644
--- a/data/assets/units/ge-panzer-iv.png
+++ b/assets/units/ge-panzer-iv.png
diff --git a/data/assets/units/ge-tiger.png b/assets/units/ge-tiger.png
index 72e7b6c..72e7b6c 100644
--- a/data/assets/units/ge-tiger.png
+++ b/assets/units/ge-tiger.png
diff --git a/data/assets/units/ge-wespe.png b/assets/units/ge-wespe.png
index 566e5b3..566e5b3 100644
--- a/data/assets/units/ge-wespe.png
+++ b/assets/units/ge-wespe.png
diff --git a/data/assets/units/us-at-gun.png b/assets/units/us-at-gun.png
index 9991ecf..9991ecf 100644
--- a/data/assets/units/us-at-gun.png
+++ b/assets/units/us-at-gun.png
diff --git a/data/assets/units/us-head.png b/assets/units/us-head.png
index fceed7a..fceed7a 100644
--- a/data/assets/units/us-head.png
+++ b/assets/units/us-head.png
diff --git a/data/assets/units/us-infantry.png b/assets/units/us-infantry.png
index 9cea3c2..9cea3c2 100644
--- a/data/assets/units/us-infantry.png
+++ b/assets/units/us-infantry.png
diff --git a/data/assets/units/us-pershing-hq.png b/assets/units/us-pershing-hq.png
index 10b9364..10b9364 100644
--- a/data/assets/units/us-pershing-hq.png
+++ b/assets/units/us-pershing-hq.png
diff --git a/data/assets/units/us-pershing.png b/assets/units/us-pershing.png
index 605563f..605563f 100644
--- a/data/assets/units/us-pershing.png
+++ b/assets/units/us-pershing.png
diff --git a/data/assets/units/us-priest.png b/assets/units/us-priest.png
index 0dd6623..0dd6623 100644
--- a/data/assets/units/us-priest.png
+++ b/assets/units/us-priest.png
diff --git a/data/assets/units/us-sherman-head.png b/assets/units/us-sherman-head.png
index 62a390e..62a390e 100644
--- a/data/assets/units/us-sherman-head.png
+++ b/assets/units/us-sherman-head.png
diff --git a/data/assets/units/us-sherman-hq.png b/assets/units/us-sherman-hq.png
index bf54ea6..bf54ea6 100644
--- a/data/assets/units/us-sherman-hq.png
+++ b/assets/units/us-sherman-hq.png
diff --git a/data/assets/units/us-sherman.png b/assets/units/us-sherman.png
index 4d42c73..4d42c73 100644
--- a/data/assets/units/us-sherman.png
+++ b/assets/units/us-sherman.png
diff --git a/data/assets/units/us-wolverine.png b/assets/units/us-wolverine.png
index 9ce6dc3..9ce6dc3 100644
--- a/data/assets/units/us-wolverine.png
+++ b/assets/units/us-wolverine.png
diff --git a/build.gradle b/build.gradle
index 696cbb0..4d9d7cc 100644
--- a/build.gradle
+++ b/build.gradle
@@ -7,14 +7,12 @@ buildscript {
         classpath 'de.richsource.gradle.plugins:gwt-gradle-plugin:0.5'
         classpath 'com.android.tools.build:gradle:0.10+'
         classpath 'com.github.jtakakura:gradle-robovm-plugin:0.0.10'
-        classpath 'com.eowise:packer:0.5.0'
     }
 }
 
 allprojects {
     apply plugin: "eclipse"
     apply plugin: "idea"
-    apply plugin: 'packer'
 
     version = '1.0'
     ext {
@@ -33,17 +31,6 @@ allprojects {
             options.compilerArgs << "-Xlint:unchecked" << "-Xlint:deprecation"
         }
     }
-
-    task packs(type: com.eowise.packer.Packer) {
-        resourcesInputPath 'data/assets'
-        atlasesOutputPath 'android/assets/data/'
-        atlases {
-            add 'hud'
-            add 'units'
-            add 'unit-overlays'
-            add 'hex-overlays'
-        }
-    }
 }
 
 project(":desktop") {
@@ -107,6 +94,10 @@ project(":html") {
     }
 }
 
+project(":assets") {
+    configurations { texturePacker }
+}
+
 project(":core") {
     apply plugin: "java"
 
diff --git a/desktop/src/ch/asynk/tankontank/desktop/DesktopLauncher.java b/desktop/src/ch/asynk/tankontank/desktop/DesktopLauncher.java
index 873b65c..966cfce 100644
--- a/desktop/src/ch/asynk/tankontank/desktop/DesktopLauncher.java
+++ b/desktop/src/ch/asynk/tankontank/desktop/DesktopLauncher.java
@@ -11,7 +11,7 @@ public class DesktopLauncher {
         config.title = "Tank On Tank";
         config.width = 800;
         config.height = 682;
-        config.addIcon("icon.png", Files.FileType.Internal);
+        config.addIcon("data/icon.png", Files.FileType.Internal);
         new LwjglApplication(new TankOnTank(), config);
     }
 }
diff --git a/run b/run
index fd8754d..a8b32a2 100755
--- a/run
+++ b/run
@@ -11,7 +11,7 @@ function gradlew_do()
 case "$1" in
     "c")
         shift;
-        ARGS="clean packs $ARGS"
+        ARGS="clean assets:build $ARGS"
         gradlew_do
         ;;
     "a")
diff --git a/settings.gradle b/settings.gradle
index 965b6a3..4f7362c 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -1 +1 @@
-include 'desktop', 'android', 'ios', 'html', 'core'
\ No newline at end of file
+include 'desktop', 'android', 'ios', 'html', 'core', 'assets'