42 files changed, 15 insertions, 15 deletions

diff --git a/android/assets/data/tile-overlays.atlas b/android/assets/data/hex-overlays.atlas
index b466065..cd34eb8 100644
--- a/android/assets/data/tile-overlays.atlas
+++ b/android/assets/data/hex-overlays.atlas
@@ -1,5 +1,5 @@
 
-tile-overlays.png
+hex-overlays.png
 format: RGBA8888
 filter: Nearest,Nearest
 repeat: none
diff --git a/android/assets/data/tile-overlays.png b/android/assets/data/hex-overlays.png
index 843ac93..843ac93 100644
--- a/android/assets/data/tile-overlays.png
+++ b/android/assets/data/hex-overlays.png
diff --git a/android/assets/data/pawn-overlays.atlas b/android/assets/data/unit-overlays.atlas
index 42103cd..70fd752 100644
--- a/android/assets/data/pawn-overlays.atlas
+++ b/android/assets/data/unit-overlays.atlas
@@ -1,5 +1,5 @@
 
-pawn-overlays.png
+unit-overlays.png
 format: RGBA8888
 filter: Nearest,Nearest
 repeat: none
diff --git a/android/assets/data/pawn-overlays.png b/android/assets/data/unit-overlays.png
index 0b49cc9..0b49cc9 100644
--- a/android/assets/data/pawn-overlays.png
+++ b/android/assets/data/unit-overlays.png
diff --git a/android/assets/data/pawns.atlas b/android/assets/data/units.atlas
index 4b39859..21e737a 100644
--- a/android/assets/data/pawns.atlas
+++ b/android/assets/data/units.atlas
@@ -1,5 +1,5 @@
 
-pawns.png
+units.png
 format: RGBA8888
 filter: Nearest,Nearest
 repeat: none
diff --git a/android/assets/data/pawns.png b/android/assets/data/units.png
index a9a4a1c..a9a4a1c 100644
--- a/android/assets/data/pawns.png
+++ b/android/assets/data/units.png
diff --git a/build.gradle b/build.gradle
index 7ed1afe..696cbb0 100644
--- a/build.gradle
+++ b/build.gradle
@@ -39,9 +39,9 @@ allprojects {
         atlasesOutputPath 'android/assets/data/'
         atlases {
             add 'hud'
-            add 'pawns'
-            add 'pawn-overlays'
-            add 'tile-overlays'
+            add 'units'
+            add 'unit-overlays'
+            add 'hex-overlays'
         }
     }
 }
diff --git a/core/src/ch/asynk/tankontank/TankOnTank.java b/core/src/ch/asynk/tankontank/TankOnTank.java
index dff4df2..a80325d 100644
--- a/core/src/ch/asynk/tankontank/TankOnTank.java
+++ b/core/src/ch/asynk/tankontank/TankOnTank.java
@@ -51,9 +51,9 @@ public class TankOnTank extends Game
         manager.load("data/map_a.png", Texture.class);
         manager.load("data/map_b.png", Texture.class);
         manager.load("data/hud.atlas", TextureAtlas.class);
-        manager.load("data/pawns.atlas", TextureAtlas.class);
-        manager.load("data/pawn-overlays.atlas", TextureAtlas.class);
-        manager.load("data/tile-overlays.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/explosion.png", Texture.class);
         manager.load("data/explosions.png", Texture.class);
         manager.load("sounds/move.mp3", Sound.class);
@@ -67,9 +67,9 @@ public class TankOnTank extends Game
         manager.unload("data/map_a.png");
         manager.unload("data/map_b.png");
         manager.unload("data/hud.atlas");
-        manager.unload("data/pawns.atlas");
-        manager.unload("data/pawn-overlays.atlas");
-        manager.unload("data/tile-overlays.atlas");
+        manager.unload("data/units.atlas");
+        manager.unload("data/unit-overlays.atlas");
+        manager.unload("data/hex-overlays.atlas");
         manager.unload("data/explosion.png");
         manager.unload("data/explosions.png");
         manager.unload("sounds/move.mp3");
diff --git a/core/src/ch/asynk/tankontank/game/battles/Factory.java b/core/src/ch/asynk/tankontank/game/battles/Factory.java
index f93a58f..b0020fb 100644
--- a/core/src/ch/asynk/tankontank/game/battles/Factory.java
+++ b/core/src/ch/asynk/tankontank/game/battles/Factory.java
@@ -56,9 +56,9 @@ public class Factory implements Board.TileBuilder, Disposable
     public void assetsLoaded()
     {
         this.hudAtlas = game.manager.get("data/hud.atlas", TextureAtlas.class);
-        this.pawnsAtlas = game.manager.get("data/pawns.atlas", TextureAtlas.class);
-        this.pawnOverlaysAtlas = game.manager.get("data/pawn-overlays.atlas", TextureAtlas.class);
-        this.tileOverlaysAtlas = game.manager.get("data/tile-overlays.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);
     }
 
     @Override
diff --git a/data/assets/tile-overlays/00_fog.png b/data/assets/hex-overlays/00_fog.png
index 7d85d98..7d85d98 100644
--- a/data/assets/tile-overlays/00_fog.png
+++ b/data/assets/hex-overlays/00_fog.png
diff --git a/data/assets/tile-overlays/01_select.png b/data/assets/hex-overlays/01_select.png
index f0b4320..f0b4320 100644
--- a/data/assets/tile-overlays/01_select.png
+++ b/data/assets/hex-overlays/01_select.png
diff --git a/data/assets/tile-overlays/02_area.png b/data/assets/hex-overlays/02_area.png
index 78b8f75..78b8f75 100644
--- a/data/assets/tile-overlays/02_area.png
+++ b/data/assets/hex-overlays/02_area.png
diff --git a/data/assets/tile-overlays/03_move.png b/data/assets/hex-overlays/03_move.png
index 5303cce..5303cce 100644
--- a/data/assets/tile-overlays/03_move.png
+++ b/data/assets/hex-overlays/03_move.png
diff --git a/data/assets/tile-overlays/04_directions.png b/data/assets/hex-overlays/04_directions.png
index 6d483e1..6d483e1 100644
--- a/data/assets/tile-overlays/04_directions.png
+++ b/data/assets/hex-overlays/04_directions.png
diff --git a/data/assets/tile-overlays/05_orientation.png b/data/assets/hex-overlays/05_orientation.png
index 2b1d06d..2b1d06d 100644
--- a/data/assets/tile-overlays/05_orientation.png
+++ b/data/assets/hex-overlays/05_orientation.png
diff --git a/data/assets/tile-overlays/06_objective.png b/data/assets/hex-overlays/06_objective.png
index e076771..e076771 100644
--- a/data/assets/tile-overlays/06_objective.png
+++ b/data/assets/hex-overlays/06_objective.png
diff --git a/data/assets/tile-overlays/07_objective_ge.png b/data/assets/hex-overlays/07_objective_ge.png
index a88a08e..a88a08e 100644
--- a/data/assets/tile-overlays/07_objective_ge.png
+++ b/data/assets/hex-overlays/07_objective_ge.png
diff --git a/data/assets/tile-overlays/08_objective_us.png b/data/assets/hex-overlays/08_objective_us.png
index 156964d..156964d 100644
--- a/data/assets/tile-overlays/08_objective_us.png
+++ b/data/assets/hex-overlays/08_objective_us.png
diff --git a/data/assets/pawn-overlays/00_move.png b/data/assets/unit-overlays/00_move.png
index 73c92cb..73c92cb 100644
--- a/data/assets/pawn-overlays/00_move.png
+++ b/data/assets/unit-overlays/00_move.png
diff --git a/data/assets/pawn-overlays/01_target.png b/data/assets/unit-overlays/01_target.png
index 953151d..953151d 100644
--- a/data/assets/pawn-overlays/01_target.png
+++ b/data/assets/unit-overlays/01_target.png
diff --git a/data/assets/pawn-overlays/02_fire.png b/data/assets/unit-overlays/02_fire.png
index 2344671..2344671 100644
--- a/data/assets/pawn-overlays/02_fire.png
+++ b/data/assets/unit-overlays/02_fire.png
diff --git a/data/assets/pawn-overlays/03_may_fire.png b/data/assets/unit-overlays/03_may_fire.png
index 52b29dd..52b29dd 100644
--- a/data/assets/pawn-overlays/03_may_fire.png
+++ b/data/assets/unit-overlays/03_may_fire.png
diff --git a/data/assets/pawn-overlays/04_ace.png b/data/assets/unit-overlays/04_ace.png
index 38d32b4..38d32b4 100644
--- a/data/assets/pawn-overlays/04_ace.png
+++ b/data/assets/unit-overlays/04_ace.png
diff --git a/data/assets/pawn-overlays/05_hq.png b/data/assets/unit-overlays/05_hq.png
index d1dd2d8..d1dd2d8 100644
--- a/data/assets/pawn-overlays/05_hq.png
+++ b/data/assets/unit-overlays/05_hq.png
diff --git a/data/assets/pawns/ge-at-gun.png b/data/assets/units/ge-at-gun.png
index f81a4b1..f81a4b1 100644
--- a/data/assets/pawns/ge-at-gun.png
+++ b/data/assets/units/ge-at-gun.png
diff --git a/data/assets/pawns/ge-head.png b/data/assets/units/ge-head.png
index 7aa65c7..7aa65c7 100644
--- a/data/assets/pawns/ge-head.png
+++ b/data/assets/units/ge-head.png
diff --git a/data/assets/pawns/ge-infantry.png b/data/assets/units/ge-infantry.png
index ef4cee9..ef4cee9 100644
--- a/data/assets/pawns/ge-infantry.png
+++ b/data/assets/units/ge-infantry.png
diff --git a/data/assets/pawns/ge-kingtiger.png b/data/assets/units/ge-kingtiger.png
index e45171b..e45171b 100644
--- a/data/assets/pawns/ge-kingtiger.png
+++ b/data/assets/units/ge-kingtiger.png
diff --git a/data/assets/pawns/ge-panzer-iv-hq.png b/data/assets/units/ge-panzer-iv-hq.png
index 2785941..2785941 100644
--- a/data/assets/pawns/ge-panzer-iv-hq.png
+++ b/data/assets/units/ge-panzer-iv-hq.png
diff --git a/data/assets/pawns/ge-panzer-iv.png b/data/assets/units/ge-panzer-iv.png
index 35ab9c3..35ab9c3 100644
--- a/data/assets/pawns/ge-panzer-iv.png
+++ b/data/assets/units/ge-panzer-iv.png
diff --git a/data/assets/pawns/ge-tiger.png b/data/assets/units/ge-tiger.png
index 72e7b6c..72e7b6c 100644
--- a/data/assets/pawns/ge-tiger.png
+++ b/data/assets/units/ge-tiger.png
diff --git a/data/assets/pawns/ge-wespe.png b/data/assets/units/ge-wespe.png
index 566e5b3..566e5b3 100644
--- a/data/assets/pawns/ge-wespe.png
+++ b/data/assets/units/ge-wespe.png
diff --git a/data/assets/pawns/us-at-gun.png b/data/assets/units/us-at-gun.png
index 9991ecf..9991ecf 100644
--- a/data/assets/pawns/us-at-gun.png
+++ b/data/assets/units/us-at-gun.png
diff --git a/data/assets/pawns/us-head.png b/data/assets/units/us-head.png
index 1affb71..1affb71 100644
--- a/data/assets/pawns/us-head.png
+++ b/data/assets/units/us-head.png
diff --git a/data/assets/pawns/us-infantry.png b/data/assets/units/us-infantry.png
index 9cea3c2..9cea3c2 100644
--- a/data/assets/pawns/us-infantry.png
+++ b/data/assets/units/us-infantry.png
diff --git a/data/assets/pawns/us-pershing-hq.png b/data/assets/units/us-pershing-hq.png
index 10b9364..10b9364 100644
--- a/data/assets/pawns/us-pershing-hq.png
+++ b/data/assets/units/us-pershing-hq.png
diff --git a/data/assets/pawns/us-pershing.png b/data/assets/units/us-pershing.png
index 605563f..605563f 100644
--- a/data/assets/pawns/us-pershing.png
+++ b/data/assets/units/us-pershing.png
diff --git a/data/assets/pawns/us-priest.png b/data/assets/units/us-priest.png
index 0dd6623..0dd6623 100644
--- a/data/assets/pawns/us-priest.png
+++ b/data/assets/units/us-priest.png
diff --git a/data/assets/pawns/us-sherman-head.png b/data/assets/units/us-sherman-head.png
index 62a390e..62a390e 100644
--- a/data/assets/pawns/us-sherman-head.png
+++ b/data/assets/units/us-sherman-head.png
diff --git a/data/assets/pawns/us-sherman-hq.png b/data/assets/units/us-sherman-hq.png
index bf54ea6..bf54ea6 100644
--- a/data/assets/pawns/us-sherman-hq.png
+++ b/data/assets/units/us-sherman-hq.png
diff --git a/data/assets/pawns/us-sherman.png b/data/assets/units/us-sherman.png
index 4d42c73..4d42c73 100644
--- a/data/assets/pawns/us-sherman.png
+++ b/data/assets/units/us-sherman.png
diff --git a/data/assets/pawns/us-wolverine.png b/data/assets/units/us-wolverine.png
index 9ce6dc3..9ce6dc3 100644
--- a/data/assets/pawns/us-wolverine.png
+++ b/data/assets/units/us-wolverine.png