regroup all images in 1 atlas data/assets.*

49 files changed, 75 insertions, 5 deletions

diff --git a/android/assets/data/pawns.atlas b/android/assets/data/assets.atlas
index 465dc19..5da3b9c 100644
--- a/android/assets/data/pawns.atlas
+++ b/android/assets/data/assets.atlas
@@ -1,5 +1,5 @@
 
-pawns.png
+assets.png
 format: RGBA8888
 filter: Nearest,Nearest
 repeat: none
@@ -52,6 +52,62 @@ ace
   orig: 124, 124
   offset: 0, 0
   index: -1
+act-cancel
+  rotate: false
+  xy: 962, 699
+  size: 60, 60
+  orig: 60, 60
+  offset: 0, 0
+  index: -1
+act-cancel-on
+  rotate: false
+  xy: 962, 761
+  size: 60, 60
+  orig: 60, 60
+  offset: 0, 0
+  index: -1
+act-move
+  rotate: false
+  xy: 698, 657
+  size: 60, 60
+  orig: 60, 60
+  offset: 0, 0
+  index: -1
+act-move-on
+  rotate: false
+  xy: 962, 637
+  size: 60, 60
+  orig: 60, 60
+  offset: 0, 0
+  index: -1
+act-rotate
+  rotate: false
+  xy: 698, 595
+  size: 60, 60
+  orig: 60, 60
+  offset: 0, 0
+  index: -1
+act-rotate-on
+  rotate: false
+  xy: 104, 39
+  size: 60, 60
+  orig: 60, 60
+  offset: 0, 0
+  index: -1
+act-target
+  rotate: false
+  xy: 698, 471
+  size: 60, 60
+  orig: 60, 60
+  offset: 0, 0
+  index: -1
+act-target-on
+  rotate: false
+  xy: 698, 533
+  size: 60, 60
+  orig: 60, 60
+  offset: 0, 0
+  index: -1
 ap1
   rotate: false
   xy: 194, 506
@@ -108,6 +164,13 @@ ge-at-gun
   orig: 124, 124
   offset: 0, 0
   index: -1
+ge-flag
+  rotate: false
+  xy: 2, 39
+  size: 100, 60
+  orig: 100, 60
+  offset: 0, 0
+  index: -1
 ge-infantry
   rotate: false
   xy: 446, 529
@@ -178,6 +241,13 @@ us-at-gun
   orig: 124, 124
   offset: 0, 0
   index: -1
+us-flag
+  rotate: false
+  xy: 698, 719
+  size: 100, 60
+  orig: 100, 60
+  offset: 0, 0
+  index: -1
 us-infantry
   rotate: false
   xy: 572, 277
diff --git a/android/assets/data/assets.png b/android/assets/data/assets.png
new file mode 100644
index 0000000..aef8022
--- /dev/null
+++ b/android/assets/data/assets.png
diff --git a/android/assets/data/pawns.png b/android/assets/data/pawns.png
deleted file mode 100644
index 5accec8..0000000
--- a/android/assets/data/pawns.png
+++ /dev/null
diff --git a/build.gradle b/build.gradle
index d59cbc7..80edebd 100644
--- a/build.gradle
+++ b/build.gradle
@@ -38,7 +38,7 @@ allprojects {
         resourcesInputPath 'data'
         atlasesOutputPath 'android/assets/data/'
         atlases {
-            add 'pawns'
+            add 'assets'
         }
     }
 }
diff --git a/core/src/ch/asynk/tankontank/TankOnTank.java b/core/src/ch/asynk/tankontank/TankOnTank.java
index a9933bb..3ab9c74 100644
--- a/core/src/ch/asynk/tankontank/TankOnTank.java
+++ b/core/src/ch/asynk/tankontank/TankOnTank.java
@@ -32,7 +32,7 @@ public class TankOnTank extends Game
         Gdx.app.debug("TankOnTank", "  load assets : " + (Gdx.app.getJavaHeap()/1024.0f) + "KB");
         manager.load("data/map_a.png", Texture.class);
         manager.load("data/map_b.png", Texture.class);
-        manager.load("data/pawns.atlas", TextureAtlas.class);
+        manager.load("data/assets.atlas", TextureAtlas.class);
     }
 
     public void unloadAssets()
@@ -41,7 +41,7 @@ public class TankOnTank extends Game
         Gdx.app.debug("TankOnTank", "diagnostics:\n" + manager.getDiagnostics() );
         manager.unload("data/map_a.png");
         manager.unload("data/map_b.png");
-        manager.unload("data/pawns.atlas");
+        manager.unload("data/assets.atlas");
         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 fbc81be..110cbda 100644
--- a/core/src/ch/asynk/tankontank/game/GameFactory.java
+++ b/core/src/ch/asynk/tankontank/game/GameFactory.java
@@ -17,7 +17,7 @@ public class GameFactory implements Board.TileBuilder, Disposable
 
     public GameFactory(AssetManager manager)
     {
-        pawnAtlas = manager.get("data/pawns.atlas", TextureAtlas.class);
+        pawnAtlas = manager.get("data/assets.atlas", TextureAtlas.class);
     }
 
     @Override
diff --git a/data/pawns/01_fog.png b/data/assets/01_fog.png
index 7d85d98..7d85d98 100644
--- a/data/pawns/01_fog.png
+++ b/data/assets/01_fog.png
diff --git a/data/pawns/02_blue.png b/data/assets/02_blue.png
index 12fcba8..12fcba8 100644
--- a/data/pawns/02_blue.png
+++ b/data/assets/02_blue.png
diff --git a/data/pawns/03_green.png b/data/assets/03_green.png
index 78b8f75..78b8f75 100644
--- a/data/pawns/03_green.png
+++ b/data/assets/03_green.png
diff --git a/data/pawns/04_red.png b/data/assets/04_red.png
index 1320f4a..1320f4a 100644
--- a/data/pawns/04_red.png
+++ b/data/assets/04_red.png
diff --git a/data/pawns/05_move.png b/data/assets/05_move.png
index e0204a9..e0204a9 100644
--- a/data/pawns/05_move.png
+++ b/data/assets/05_move.png
diff --git a/data/pawns/06_rose.png b/data/assets/06_rose.png
index fd9c7b7..fd9c7b7 100644
--- a/data/pawns/06_rose.png
+++ b/data/assets/06_rose.png
diff --git a/data/pawns/ace.png b/data/assets/ace.png
index f4f3240..f4f3240 100644
--- a/data/pawns/ace.png
+++ b/data/assets/ace.png
diff --git a/data/assets/act-cancel-on.png b/data/assets/act-cancel-on.png
new file mode 100644
index 0000000..a8519aa
--- /dev/null
+++ b/data/assets/act-cancel-on.png
diff --git a/data/assets/act-cancel.png b/data/assets/act-cancel.png
new file mode 100644
index 0000000..47d9762
--- /dev/null
+++ b/data/assets/act-cancel.png
diff --git a/data/assets/act-move-on.png b/data/assets/act-move-on.png
new file mode 100644
index 0000000..98011af
--- /dev/null
+++ b/data/assets/act-move-on.png
diff --git a/data/assets/act-move.png b/data/assets/act-move.png
new file mode 100644
index 0000000..ffc3112
--- /dev/null
+++ b/data/assets/act-move.png
diff --git a/data/assets/act-rotate-on.png b/data/assets/act-rotate-on.png
new file mode 100644
index 0000000..0f42d25
--- /dev/null
+++ b/data/assets/act-rotate-on.png
diff --git a/data/assets/act-rotate.png b/data/assets/act-rotate.png
new file mode 100644
index 0000000..3a3720f
--- /dev/null
+++ b/data/assets/act-rotate.png
diff --git a/data/assets/act-target-on.png b/data/assets/act-target-on.png
new file mode 100644
index 0000000..e7432cd
--- /dev/null
+++ b/data/assets/act-target-on.png
diff --git a/data/assets/act-target.png b/data/assets/act-target.png
new file mode 100644
index 0000000..1e2bf26
--- /dev/null
+++ b/data/assets/act-target.png
diff --git a/data/pawns/ap1.png b/data/assets/ap1.png
index c47d15e..c47d15e 100644
--- a/data/pawns/ap1.png
+++ b/data/assets/ap1.png
diff --git a/data/pawns/ap2.png b/data/assets/ap2.png
index e89956a..e89956a 100644
--- a/data/pawns/ap2.png
+++ b/data/assets/ap2.png
diff --git a/data/pawns/ap3.png b/data/assets/ap3.png
index 7d1b11f..7d1b11f 100644
--- a/data/pawns/ap3.png
+++ b/data/assets/ap3.png
diff --git a/data/pawns/ap4.png b/data/assets/ap4.png
index e897628..e897628 100644
--- a/data/pawns/ap4.png
+++ b/data/assets/ap4.png
diff --git a/data/pawns/ap_spent.png b/data/assets/ap_spent.png
index cb399d8..cb399d8 100644
--- a/data/pawns/ap_spent.png
+++ b/data/assets/ap_spent.png
diff --git a/data/pawns/back.png b/data/assets/back.png
index e7eb5ef..e7eb5ef 100644
--- a/data/pawns/back.png
+++ b/data/assets/back.png
diff --git a/data/pawns/disabled.png b/data/assets/disabled.png
index a5ad3d3..a5ad3d3 100644
--- a/data/pawns/disabled.png
+++ b/data/assets/disabled.png
diff --git a/data/pawns/ge-at-gun.png b/data/assets/ge-at-gun.png
index f81a4b1..f81a4b1 100644
--- a/data/pawns/ge-at-gun.png
+++ b/data/assets/ge-at-gun.png
diff --git a/data/assets/ge-flag.png b/data/assets/ge-flag.png
new file mode 100644
index 0000000..53ab5aa
--- /dev/null
+++ b/data/assets/ge-flag.png
diff --git a/data/pawns/ge-infantry.png b/data/assets/ge-infantry.png
index ef4cee9..ef4cee9 100644
--- a/data/pawns/ge-infantry.png
+++ b/data/assets/ge-infantry.png
diff --git a/data/pawns/ge-kingtiger.png b/data/assets/ge-kingtiger.png
index e45171b..e45171b 100644
--- a/data/pawns/ge-kingtiger.png
+++ b/data/assets/ge-kingtiger.png
diff --git a/data/pawns/ge-panzer-iv-hq.png b/data/assets/ge-panzer-iv-hq.png
index 2785941..2785941 100644
--- a/data/pawns/ge-panzer-iv-hq.png
+++ b/data/assets/ge-panzer-iv-hq.png
diff --git a/data/pawns/ge-panzer-iv.png b/data/assets/ge-panzer-iv.png
index 35ab9c3..35ab9c3 100644
--- a/data/pawns/ge-panzer-iv.png
+++ b/data/assets/ge-panzer-iv.png
diff --git a/data/pawns/ge-tiger.png b/data/assets/ge-tiger.png
index 72e7b6c..72e7b6c 100644
--- a/data/pawns/ge-tiger.png
+++ b/data/assets/ge-tiger.png
diff --git a/data/pawns/ge-wespe.png b/data/assets/ge-wespe.png
index 566e5b3..566e5b3 100644
--- a/data/pawns/ge-wespe.png
+++ b/data/assets/ge-wespe.png
diff --git a/data/pawns/head.png b/data/assets/head.png
index a79a840..a79a840 100644
--- a/data/pawns/head.png
+++ b/data/assets/head.png
diff --git a/data/pawns/turn_back.png b/data/assets/turn_back.png
index 3f681d8..3f681d8 100644
--- a/data/pawns/turn_back.png
+++ b/data/assets/turn_back.png
diff --git a/data/pawns/turn_front.png b/data/assets/turn_front.png
index b08806b..b08806b 100644
--- a/data/pawns/turn_front.png
+++ b/data/assets/turn_front.png
diff --git a/data/pawns/us-at-gun.png b/data/assets/us-at-gun.png
index 9991ecf..9991ecf 100644
--- a/data/pawns/us-at-gun.png
+++ b/data/assets/us-at-gun.png
diff --git a/data/assets/us-flag.png b/data/assets/us-flag.png
new file mode 100644
index 0000000..5dc6c76
--- /dev/null
+++ b/data/assets/us-flag.png
diff --git a/data/pawns/us-infantry.png b/data/assets/us-infantry.png
index 9cea3c2..9cea3c2 100644
--- a/data/pawns/us-infantry.png
+++ b/data/assets/us-infantry.png
diff --git a/data/pawns/us-pershing-hq.png b/data/assets/us-pershing-hq.png
index 10b9364..10b9364 100644
--- a/data/pawns/us-pershing-hq.png
+++ b/data/assets/us-pershing-hq.png
diff --git a/data/pawns/us-pershing.png b/data/assets/us-pershing.png
index 605563f..605563f 100644
--- a/data/pawns/us-pershing.png
+++ b/data/assets/us-pershing.png
diff --git a/data/pawns/us-priest.png b/data/assets/us-priest.png
index 0dd6623..0dd6623 100644
--- a/data/pawns/us-priest.png
+++ b/data/assets/us-priest.png
diff --git a/data/pawns/us-sherman-head.png b/data/assets/us-sherman-head.png
index 62a390e..62a390e 100644
--- a/data/pawns/us-sherman-head.png
+++ b/data/assets/us-sherman-head.png
diff --git a/data/pawns/us-sherman-hq.png b/data/assets/us-sherman-hq.png
index bf54ea6..bf54ea6 100644
--- a/data/pawns/us-sherman-hq.png
+++ b/data/assets/us-sherman-hq.png
diff --git a/data/pawns/us-sherman.png b/data/assets/us-sherman.png
index cd5cc8f..cd5cc8f 100644
--- a/data/pawns/us-sherman.png
+++ b/data/assets/us-sherman.png
diff --git a/data/pawns/us-wolverine.png b/data/assets/us-wolverine.png
index 9ce6dc3..9ce6dc3 100644
--- a/data/pawns/us-wolverine.png
+++ b/data/assets/us-wolverine.png