From 498259468be4e9f73319c9a63fb1782e8bbe5088 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A9r=C3=A9my=20Zurcher?= Date: Sat, 22 Nov 2014 20:20:43 +0100 Subject: rename pawn tile atlases to unit hex --- android/assets/data/hex-overlays.atlas | 68 +++++++++++ android/assets/data/hex-overlays.png | Bin 0 -> 148404 bytes android/assets/data/pawn-overlays.atlas | 47 -------- android/assets/data/pawn-overlays.png | Bin 51572 -> 0 bytes android/assets/data/pawns.atlas | 131 --------------------- android/assets/data/pawns.png | Bin 504500 -> 0 bytes android/assets/data/tile-overlays.atlas | 68 ----------- android/assets/data/tile-overlays.png | Bin 148404 -> 0 bytes android/assets/data/unit-overlays.atlas | 47 ++++++++ android/assets/data/unit-overlays.png | Bin 0 -> 51572 bytes android/assets/data/units.atlas | 131 +++++++++++++++++++++ android/assets/data/units.png | Bin 0 -> 504500 bytes build.gradle | 6 +- core/src/ch/asynk/tankontank/TankOnTank.java | 12 +- .../ch/asynk/tankontank/game/battles/Factory.java | 6 +- data/assets/hex-overlays/00_fog.png | Bin 0 -> 10897 bytes data/assets/hex-overlays/01_select.png | Bin 0 -> 16313 bytes data/assets/hex-overlays/02_area.png | Bin 0 -> 10895 bytes data/assets/hex-overlays/03_move.png | Bin 0 -> 27747 bytes data/assets/hex-overlays/04_directions.png | Bin 0 -> 14071 bytes data/assets/hex-overlays/05_orientation.png | Bin 0 -> 691 bytes data/assets/hex-overlays/06_objective.png | Bin 0 -> 23747 bytes data/assets/hex-overlays/07_objective_ge.png | Bin 0 -> 21616 bytes data/assets/hex-overlays/08_objective_us.png | Bin 0 -> 28344 bytes data/assets/pawn-overlays/00_move.png | Bin 14933 -> 0 bytes data/assets/pawn-overlays/01_target.png | Bin 2869 -> 0 bytes data/assets/pawn-overlays/02_fire.png | Bin 8137 -> 0 bytes data/assets/pawn-overlays/03_may_fire.png | Bin 4550 -> 0 bytes data/assets/pawn-overlays/04_ace.png | Bin 8121 -> 0 bytes data/assets/pawn-overlays/05_hq.png | Bin 1994 -> 0 bytes data/assets/pawns/ge-at-gun.png | Bin 24241 -> 0 bytes data/assets/pawns/ge-head.png | Bin 265 -> 0 bytes data/assets/pawns/ge-infantry.png | Bin 24975 -> 0 bytes data/assets/pawns/ge-kingtiger.png | Bin 21611 -> 0 bytes data/assets/pawns/ge-panzer-iv-hq.png | Bin 24495 -> 0 bytes data/assets/pawns/ge-panzer-iv.png | Bin 23997 -> 0 bytes data/assets/pawns/ge-tiger.png | Bin 22277 -> 0 bytes data/assets/pawns/ge-wespe.png | Bin 23084 -> 0 bytes data/assets/pawns/us-at-gun.png | Bin 24693 -> 0 bytes data/assets/pawns/us-head.png | Bin 278 -> 0 bytes data/assets/pawns/us-infantry.png | Bin 26139 -> 0 bytes data/assets/pawns/us-pershing-hq.png | Bin 24763 -> 0 bytes data/assets/pawns/us-pershing.png | Bin 29109 -> 0 bytes data/assets/pawns/us-priest.png | Bin 24587 -> 0 bytes data/assets/pawns/us-sherman-head.png | Bin 24591 -> 0 bytes data/assets/pawns/us-sherman-hq.png | Bin 25383 -> 0 bytes data/assets/pawns/us-sherman.png | Bin 3923 -> 0 bytes data/assets/pawns/us-wolverine.png | Bin 25188 -> 0 bytes data/assets/tile-overlays/00_fog.png | Bin 10897 -> 0 bytes data/assets/tile-overlays/01_select.png | Bin 16313 -> 0 bytes data/assets/tile-overlays/02_area.png | Bin 10895 -> 0 bytes data/assets/tile-overlays/03_move.png | Bin 27747 -> 0 bytes data/assets/tile-overlays/04_directions.png | Bin 14071 -> 0 bytes data/assets/tile-overlays/05_orientation.png | Bin 691 -> 0 bytes data/assets/tile-overlays/06_objective.png | Bin 23747 -> 0 bytes data/assets/tile-overlays/07_objective_ge.png | Bin 21616 -> 0 bytes data/assets/tile-overlays/08_objective_us.png | Bin 28344 -> 0 bytes data/assets/unit-overlays/00_move.png | Bin 0 -> 14933 bytes data/assets/unit-overlays/01_target.png | Bin 0 -> 2869 bytes data/assets/unit-overlays/02_fire.png | Bin 0 -> 8137 bytes data/assets/unit-overlays/03_may_fire.png | Bin 0 -> 4550 bytes data/assets/unit-overlays/04_ace.png | Bin 0 -> 8121 bytes data/assets/unit-overlays/05_hq.png | Bin 0 -> 1994 bytes data/assets/units/ge-at-gun.png | Bin 0 -> 24241 bytes data/assets/units/ge-head.png | Bin 0 -> 265 bytes data/assets/units/ge-infantry.png | Bin 0 -> 24975 bytes data/assets/units/ge-kingtiger.png | Bin 0 -> 21611 bytes data/assets/units/ge-panzer-iv-hq.png | Bin 0 -> 24495 bytes data/assets/units/ge-panzer-iv.png | Bin 0 -> 23997 bytes data/assets/units/ge-tiger.png | Bin 0 -> 22277 bytes data/assets/units/ge-wespe.png | Bin 0 -> 23084 bytes data/assets/units/us-at-gun.png | Bin 0 -> 24693 bytes data/assets/units/us-head.png | Bin 0 -> 278 bytes data/assets/units/us-infantry.png | Bin 0 -> 26139 bytes data/assets/units/us-pershing-hq.png | Bin 0 -> 24763 bytes data/assets/units/us-pershing.png | Bin 0 -> 29109 bytes data/assets/units/us-priest.png | Bin 0 -> 24587 bytes data/assets/units/us-sherman-head.png | Bin 0 -> 24591 bytes data/assets/units/us-sherman-hq.png | Bin 0 -> 25383 bytes data/assets/units/us-sherman.png | Bin 0 -> 3923 bytes data/assets/units/us-wolverine.png | Bin 0 -> 25188 bytes 81 files changed, 258 insertions(+), 258 deletions(-) create mode 100644 android/assets/data/hex-overlays.atlas create mode 100644 android/assets/data/hex-overlays.png delete mode 100644 android/assets/data/pawn-overlays.atlas delete mode 100644 android/assets/data/pawn-overlays.png delete mode 100644 android/assets/data/pawns.atlas delete mode 100644 android/assets/data/pawns.png delete mode 100644 android/assets/data/tile-overlays.atlas delete mode 100644 android/assets/data/tile-overlays.png create mode 100644 android/assets/data/unit-overlays.atlas create mode 100644 android/assets/data/unit-overlays.png create mode 100644 android/assets/data/units.atlas create mode 100644 android/assets/data/units.png create mode 100644 data/assets/hex-overlays/00_fog.png create mode 100644 data/assets/hex-overlays/01_select.png create mode 100644 data/assets/hex-overlays/02_area.png create mode 100644 data/assets/hex-overlays/03_move.png create mode 100644 data/assets/hex-overlays/04_directions.png create mode 100644 data/assets/hex-overlays/05_orientation.png create mode 100644 data/assets/hex-overlays/06_objective.png create mode 100644 data/assets/hex-overlays/07_objective_ge.png create mode 100644 data/assets/hex-overlays/08_objective_us.png delete mode 100644 data/assets/pawn-overlays/00_move.png delete mode 100644 data/assets/pawn-overlays/01_target.png delete mode 100644 data/assets/pawn-overlays/02_fire.png delete mode 100644 data/assets/pawn-overlays/03_may_fire.png delete mode 100644 data/assets/pawn-overlays/04_ace.png delete mode 100644 data/assets/pawn-overlays/05_hq.png delete mode 100644 data/assets/pawns/ge-at-gun.png delete mode 100644 data/assets/pawns/ge-head.png delete mode 100644 data/assets/pawns/ge-infantry.png delete mode 100644 data/assets/pawns/ge-kingtiger.png delete mode 100644 data/assets/pawns/ge-panzer-iv-hq.png delete mode 100644 data/assets/pawns/ge-panzer-iv.png delete mode 100644 data/assets/pawns/ge-tiger.png delete mode 100644 data/assets/pawns/ge-wespe.png delete mode 100644 data/assets/pawns/us-at-gun.png delete mode 100644 data/assets/pawns/us-head.png delete mode 100644 data/assets/pawns/us-infantry.png delete mode 100644 data/assets/pawns/us-pershing-hq.png delete mode 100644 data/assets/pawns/us-pershing.png delete mode 100644 data/assets/pawns/us-priest.png delete mode 100644 data/assets/pawns/us-sherman-head.png delete mode 100644 data/assets/pawns/us-sherman-hq.png delete mode 100644 data/assets/pawns/us-sherman.png delete mode 100644 data/assets/pawns/us-wolverine.png delete mode 100644 data/assets/tile-overlays/00_fog.png delete mode 100644 data/assets/tile-overlays/01_select.png delete mode 100644 data/assets/tile-overlays/02_area.png delete mode 100644 data/assets/tile-overlays/03_move.png delete mode 100644 data/assets/tile-overlays/04_directions.png delete mode 100644 data/assets/tile-overlays/05_orientation.png delete mode 100644 data/assets/tile-overlays/06_objective.png delete mode 100644 data/assets/tile-overlays/07_objective_ge.png delete mode 100644 data/assets/tile-overlays/08_objective_us.png create mode 100644 data/assets/unit-overlays/00_move.png create mode 100644 data/assets/unit-overlays/01_target.png create mode 100644 data/assets/unit-overlays/02_fire.png create mode 100644 data/assets/unit-overlays/03_may_fire.png create mode 100644 data/assets/unit-overlays/04_ace.png create mode 100644 data/assets/unit-overlays/05_hq.png create mode 100644 data/assets/units/ge-at-gun.png create mode 100644 data/assets/units/ge-head.png create mode 100644 data/assets/units/ge-infantry.png create mode 100644 data/assets/units/ge-kingtiger.png create mode 100644 data/assets/units/ge-panzer-iv-hq.png create mode 100644 data/assets/units/ge-panzer-iv.png create mode 100644 data/assets/units/ge-tiger.png create mode 100644 data/assets/units/ge-wespe.png create mode 100644 data/assets/units/us-at-gun.png create mode 100644 data/assets/units/us-head.png create mode 100644 data/assets/units/us-infantry.png create mode 100644 data/assets/units/us-pershing-hq.png create mode 100644 data/assets/units/us-pershing.png create mode 100644 data/assets/units/us-priest.png create mode 100644 data/assets/units/us-sherman-head.png create mode 100644 data/assets/units/us-sherman-hq.png create mode 100644 data/assets/units/us-sherman.png create mode 100644 data/assets/units/us-wolverine.png diff --git a/android/assets/data/hex-overlays.atlas b/android/assets/data/hex-overlays.atlas new file mode 100644 index 0000000..cd34eb8 --- /dev/null +++ b/android/assets/data/hex-overlays.atlas @@ -0,0 +1,68 @@ + +hex-overlays.png +format: RGBA8888 +filter: Nearest,Nearest +repeat: none +00_fog + rotate: false + xy: 234, 267 + size: 190, 217 + orig: 190, 217 + offset: 0, 0 + index: -1 +01_select + rotate: false + xy: 234, 48 + size: 190, 217 + orig: 190, 217 + offset: 0, 0 + index: -1 +02_area + rotate: false + xy: 426, 267 + size: 190, 217 + orig: 190, 217 + offset: 0, 0 + index: -1 +03_move + rotate: false + xy: 426, 48 + size: 190, 217 + orig: 190, 217 + offset: 0, 0 + index: -1 +04_directions + rotate: false + xy: 2, 244 + size: 230, 240 + orig: 230, 240 + offset: 0, 0 + index: -1 +05_orientation + rotate: false + xy: 2, 2 + size: 230, 240 + orig: 230, 240 + offset: 0, 0 + index: -1 +06_objective + rotate: false + xy: 618, 267 + size: 190, 217 + orig: 190, 217 + offset: 0, 0 + index: -1 +07_objective_ge + rotate: false + xy: 618, 48 + size: 190, 217 + orig: 190, 217 + offset: 0, 0 + index: -1 +08_objective_us + rotate: false + xy: 810, 267 + size: 190, 217 + orig: 190, 217 + offset: 0, 0 + index: -1 diff --git a/android/assets/data/hex-overlays.png b/android/assets/data/hex-overlays.png new file mode 100644 index 0000000..843ac93 Binary files /dev/null and b/android/assets/data/hex-overlays.png differ diff --git a/android/assets/data/pawn-overlays.atlas b/android/assets/data/pawn-overlays.atlas deleted file mode 100644 index 42103cd..0000000 --- a/android/assets/data/pawn-overlays.atlas +++ /dev/null @@ -1,47 +0,0 @@ - -pawn-overlays.png -format: RGBA8888 -filter: Nearest,Nearest -repeat: none -00_move - rotate: false - xy: 2, 2 - size: 230, 240 - orig: 230, 240 - offset: 0, 0 - index: -1 -01_target - rotate: false - xy: 537, 152 - size: 90, 90 - orig: 90, 90 - offset: 0, 0 - index: -1 -02_fire - rotate: false - xy: 234, 92 - size: 100, 150 - orig: 100, 150 - offset: 0, 0 - index: -1 -03_may_fire - rotate: false - xy: 336, 92 - size: 100, 150 - orig: 100, 150 - offset: 0, 0 - index: -1 -04_ace - rotate: false - xy: 500, 38 - size: 35, 204 - orig: 35, 204 - offset: 0, 0 - index: -1 -05_hq - rotate: false - xy: 438, 70 - size: 60, 172 - orig: 60, 172 - offset: 0, 0 - index: -1 diff --git a/android/assets/data/pawn-overlays.png b/android/assets/data/pawn-overlays.png deleted file mode 100644 index 0b49cc9..0000000 Binary files a/android/assets/data/pawn-overlays.png and /dev/null differ diff --git a/android/assets/data/pawns.atlas b/android/assets/data/pawns.atlas deleted file mode 100644 index 4b39859..0000000 --- a/android/assets/data/pawns.atlas +++ /dev/null @@ -1,131 +0,0 @@ - -pawns.png -format: RGBA8888 -filter: Nearest,Nearest -repeat: none -ge-at-gun - rotate: false - xy: 386, 315 - size: 124, 124 - orig: 124, 124 - offset: 0, 0 - index: -1 -ge-head - rotate: false - xy: 2, 35 - size: 104, 185 - orig: 104, 185 - offset: 0, 0 - index: -1 -ge-infantry - rotate: false - xy: 512, 315 - size: 124, 124 - orig: 124, 124 - offset: 0, 0 - index: -1 -ge-kingtiger - rotate: false - xy: 638, 315 - size: 124, 124 - orig: 124, 124 - offset: 0, 0 - index: -1 -ge-panzer-iv - rotate: false - xy: 890, 315 - size: 124, 124 - orig: 124, 124 - offset: 0, 0 - index: -1 -ge-panzer-iv-hq - rotate: false - xy: 764, 315 - size: 124, 124 - orig: 124, 124 - offset: 0, 0 - index: -1 -ge-tiger - rotate: false - xy: 128, 163 - size: 124, 124 - orig: 124, 124 - offset: 0, 0 - index: -1 -ge-wespe - rotate: false - xy: 108, 37 - size: 124, 124 - orig: 124, 124 - offset: 0, 0 - index: -1 -us-at-gun - rotate: false - xy: 254, 128 - size: 124, 124 - orig: 124, 124 - offset: 0, 0 - index: -1 -us-head - rotate: false - xy: 280, 254 - size: 104, 185 - orig: 104, 185 - offset: 0, 0 - index: -1 -us-infantry - rotate: false - xy: 234, 2 - size: 124, 124 - orig: 124, 124 - offset: 0, 0 - index: -1 -us-pershing - rotate: false - xy: 512, 189 - size: 124, 124 - orig: 124, 124 - offset: 0, 0 - index: -1 -us-pershing-hq - rotate: false - xy: 386, 189 - size: 124, 124 - orig: 124, 124 - offset: 0, 0 - index: -1 -us-priest - rotate: false - xy: 638, 189 - size: 124, 124 - orig: 124, 124 - offset: 0, 0 - index: -1 -us-sherman - rotate: false - xy: 2, 222 - size: 124, 217 - orig: 124, 217 - offset: 0, 0 - index: -1 -us-sherman-head - rotate: false - xy: 128, 289 - size: 150, 150 - orig: 150, 150 - offset: 0, 0 - index: -1 -us-sherman-hq - rotate: false - xy: 764, 189 - size: 124, 124 - orig: 124, 124 - offset: 0, 0 - index: -1 -us-wolverine - rotate: false - xy: 890, 189 - size: 124, 124 - orig: 124, 124 - offset: 0, 0 - index: -1 diff --git a/android/assets/data/pawns.png b/android/assets/data/pawns.png deleted file mode 100644 index a9a4a1c..0000000 Binary files a/android/assets/data/pawns.png and /dev/null differ diff --git a/android/assets/data/tile-overlays.atlas b/android/assets/data/tile-overlays.atlas deleted file mode 100644 index b466065..0000000 --- a/android/assets/data/tile-overlays.atlas +++ /dev/null @@ -1,68 +0,0 @@ - -tile-overlays.png -format: RGBA8888 -filter: Nearest,Nearest -repeat: none -00_fog - rotate: false - xy: 234, 267 - size: 190, 217 - orig: 190, 217 - offset: 0, 0 - index: -1 -01_select - rotate: false - xy: 234, 48 - size: 190, 217 - orig: 190, 217 - offset: 0, 0 - index: -1 -02_area - rotate: false - xy: 426, 267 - size: 190, 217 - orig: 190, 217 - offset: 0, 0 - index: -1 -03_move - rotate: false - xy: 426, 48 - size: 190, 217 - orig: 190, 217 - offset: 0, 0 - index: -1 -04_directions - rotate: false - xy: 2, 244 - size: 230, 240 - orig: 230, 240 - offset: 0, 0 - index: -1 -05_orientation - rotate: false - xy: 2, 2 - size: 230, 240 - orig: 230, 240 - offset: 0, 0 - index: -1 -06_objective - rotate: false - xy: 618, 267 - size: 190, 217 - orig: 190, 217 - offset: 0, 0 - index: -1 -07_objective_ge - rotate: false - xy: 618, 48 - size: 190, 217 - orig: 190, 217 - offset: 0, 0 - index: -1 -08_objective_us - rotate: false - xy: 810, 267 - size: 190, 217 - orig: 190, 217 - offset: 0, 0 - index: -1 diff --git a/android/assets/data/tile-overlays.png b/android/assets/data/tile-overlays.png deleted file mode 100644 index 843ac93..0000000 Binary files a/android/assets/data/tile-overlays.png and /dev/null differ diff --git a/android/assets/data/unit-overlays.atlas b/android/assets/data/unit-overlays.atlas new file mode 100644 index 0000000..70fd752 --- /dev/null +++ b/android/assets/data/unit-overlays.atlas @@ -0,0 +1,47 @@ + +unit-overlays.png +format: RGBA8888 +filter: Nearest,Nearest +repeat: none +00_move + rotate: false + xy: 2, 2 + size: 230, 240 + orig: 230, 240 + offset: 0, 0 + index: -1 +01_target + rotate: false + xy: 537, 152 + size: 90, 90 + orig: 90, 90 + offset: 0, 0 + index: -1 +02_fire + rotate: false + xy: 234, 92 + size: 100, 150 + orig: 100, 150 + offset: 0, 0 + index: -1 +03_may_fire + rotate: false + xy: 336, 92 + size: 100, 150 + orig: 100, 150 + offset: 0, 0 + index: -1 +04_ace + rotate: false + xy: 500, 38 + size: 35, 204 + orig: 35, 204 + offset: 0, 0 + index: -1 +05_hq + rotate: false + xy: 438, 70 + size: 60, 172 + orig: 60, 172 + offset: 0, 0 + index: -1 diff --git a/android/assets/data/unit-overlays.png b/android/assets/data/unit-overlays.png new file mode 100644 index 0000000..0b49cc9 Binary files /dev/null and b/android/assets/data/unit-overlays.png differ diff --git a/android/assets/data/units.atlas b/android/assets/data/units.atlas new file mode 100644 index 0000000..21e737a --- /dev/null +++ b/android/assets/data/units.atlas @@ -0,0 +1,131 @@ + +units.png +format: RGBA8888 +filter: Nearest,Nearest +repeat: none +ge-at-gun + rotate: false + xy: 386, 315 + size: 124, 124 + orig: 124, 124 + offset: 0, 0 + index: -1 +ge-head + rotate: false + xy: 2, 35 + size: 104, 185 + orig: 104, 185 + offset: 0, 0 + index: -1 +ge-infantry + rotate: false + xy: 512, 315 + size: 124, 124 + orig: 124, 124 + offset: 0, 0 + index: -1 +ge-kingtiger + rotate: false + xy: 638, 315 + size: 124, 124 + orig: 124, 124 + offset: 0, 0 + index: -1 +ge-panzer-iv + rotate: false + xy: 890, 315 + size: 124, 124 + orig: 124, 124 + offset: 0, 0 + index: -1 +ge-panzer-iv-hq + rotate: false + xy: 764, 315 + size: 124, 124 + orig: 124, 124 + offset: 0, 0 + index: -1 +ge-tiger + rotate: false + xy: 128, 163 + size: 124, 124 + orig: 124, 124 + offset: 0, 0 + index: -1 +ge-wespe + rotate: false + xy: 108, 37 + size: 124, 124 + orig: 124, 124 + offset: 0, 0 + index: -1 +us-at-gun + rotate: false + xy: 254, 128 + size: 124, 124 + orig: 124, 124 + offset: 0, 0 + index: -1 +us-head + rotate: false + xy: 280, 254 + size: 104, 185 + orig: 104, 185 + offset: 0, 0 + index: -1 +us-infantry + rotate: false + xy: 234, 2 + size: 124, 124 + orig: 124, 124 + offset: 0, 0 + index: -1 +us-pershing + rotate: false + xy: 512, 189 + size: 124, 124 + orig: 124, 124 + offset: 0, 0 + index: -1 +us-pershing-hq + rotate: false + xy: 386, 189 + size: 124, 124 + orig: 124, 124 + offset: 0, 0 + index: -1 +us-priest + rotate: false + xy: 638, 189 + size: 124, 124 + orig: 124, 124 + offset: 0, 0 + index: -1 +us-sherman + rotate: false + xy: 2, 222 + size: 124, 217 + orig: 124, 217 + offset: 0, 0 + index: -1 +us-sherman-head + rotate: false + xy: 128, 289 + size: 150, 150 + orig: 150, 150 + offset: 0, 0 + index: -1 +us-sherman-hq + rotate: false + xy: 764, 189 + size: 124, 124 + orig: 124, 124 + offset: 0, 0 + index: -1 +us-wolverine + rotate: false + xy: 890, 189 + size: 124, 124 + orig: 124, 124 + offset: 0, 0 + index: -1 diff --git a/android/assets/data/units.png b/android/assets/data/units.png new file mode 100644 index 0000000..a9a4a1c Binary files /dev/null and b/android/assets/data/units.png differ 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/hex-overlays/00_fog.png b/data/assets/hex-overlays/00_fog.png new file mode 100644 index 0000000..7d85d98 Binary files /dev/null and b/data/assets/hex-overlays/00_fog.png differ diff --git a/data/assets/hex-overlays/01_select.png b/data/assets/hex-overlays/01_select.png new file mode 100644 index 0000000..f0b4320 Binary files /dev/null and b/data/assets/hex-overlays/01_select.png differ diff --git a/data/assets/hex-overlays/02_area.png b/data/assets/hex-overlays/02_area.png new file mode 100644 index 0000000..78b8f75 Binary files /dev/null and b/data/assets/hex-overlays/02_area.png differ diff --git a/data/assets/hex-overlays/03_move.png b/data/assets/hex-overlays/03_move.png new file mode 100644 index 0000000..5303cce Binary files /dev/null and b/data/assets/hex-overlays/03_move.png differ diff --git a/data/assets/hex-overlays/04_directions.png b/data/assets/hex-overlays/04_directions.png new file mode 100644 index 0000000..6d483e1 Binary files /dev/null and b/data/assets/hex-overlays/04_directions.png differ diff --git a/data/assets/hex-overlays/05_orientation.png b/data/assets/hex-overlays/05_orientation.png new file mode 100644 index 0000000..2b1d06d Binary files /dev/null and b/data/assets/hex-overlays/05_orientation.png differ diff --git a/data/assets/hex-overlays/06_objective.png b/data/assets/hex-overlays/06_objective.png new file mode 100644 index 0000000..e076771 Binary files /dev/null and b/data/assets/hex-overlays/06_objective.png differ diff --git a/data/assets/hex-overlays/07_objective_ge.png b/data/assets/hex-overlays/07_objective_ge.png new file mode 100644 index 0000000..a88a08e Binary files /dev/null and b/data/assets/hex-overlays/07_objective_ge.png differ diff --git a/data/assets/hex-overlays/08_objective_us.png b/data/assets/hex-overlays/08_objective_us.png new file mode 100644 index 0000000..156964d Binary files /dev/null and b/data/assets/hex-overlays/08_objective_us.png differ diff --git a/data/assets/pawn-overlays/00_move.png b/data/assets/pawn-overlays/00_move.png deleted file mode 100644 index 73c92cb..0000000 Binary files a/data/assets/pawn-overlays/00_move.png and /dev/null differ diff --git a/data/assets/pawn-overlays/01_target.png b/data/assets/pawn-overlays/01_target.png deleted file mode 100644 index 953151d..0000000 Binary files a/data/assets/pawn-overlays/01_target.png and /dev/null differ diff --git a/data/assets/pawn-overlays/02_fire.png b/data/assets/pawn-overlays/02_fire.png deleted file mode 100644 index 2344671..0000000 Binary files a/data/assets/pawn-overlays/02_fire.png and /dev/null differ diff --git a/data/assets/pawn-overlays/03_may_fire.png b/data/assets/pawn-overlays/03_may_fire.png deleted file mode 100644 index 52b29dd..0000000 Binary files a/data/assets/pawn-overlays/03_may_fire.png and /dev/null differ diff --git a/data/assets/pawn-overlays/04_ace.png b/data/assets/pawn-overlays/04_ace.png deleted file mode 100644 index 38d32b4..0000000 Binary files a/data/assets/pawn-overlays/04_ace.png and /dev/null differ diff --git a/data/assets/pawn-overlays/05_hq.png b/data/assets/pawn-overlays/05_hq.png deleted file mode 100644 index d1dd2d8..0000000 Binary files a/data/assets/pawn-overlays/05_hq.png and /dev/null differ diff --git a/data/assets/pawns/ge-at-gun.png b/data/assets/pawns/ge-at-gun.png deleted file mode 100644 index f81a4b1..0000000 Binary files a/data/assets/pawns/ge-at-gun.png and /dev/null differ diff --git a/data/assets/pawns/ge-head.png b/data/assets/pawns/ge-head.png deleted file mode 100644 index 7aa65c7..0000000 Binary files a/data/assets/pawns/ge-head.png and /dev/null differ diff --git a/data/assets/pawns/ge-infantry.png b/data/assets/pawns/ge-infantry.png deleted file mode 100644 index ef4cee9..0000000 Binary files a/data/assets/pawns/ge-infantry.png and /dev/null differ diff --git a/data/assets/pawns/ge-kingtiger.png b/data/assets/pawns/ge-kingtiger.png deleted file mode 100644 index e45171b..0000000 Binary files a/data/assets/pawns/ge-kingtiger.png and /dev/null differ diff --git a/data/assets/pawns/ge-panzer-iv-hq.png b/data/assets/pawns/ge-panzer-iv-hq.png deleted file mode 100644 index 2785941..0000000 Binary files a/data/assets/pawns/ge-panzer-iv-hq.png and /dev/null differ diff --git a/data/assets/pawns/ge-panzer-iv.png b/data/assets/pawns/ge-panzer-iv.png deleted file mode 100644 index 35ab9c3..0000000 Binary files a/data/assets/pawns/ge-panzer-iv.png and /dev/null differ diff --git a/data/assets/pawns/ge-tiger.png b/data/assets/pawns/ge-tiger.png deleted file mode 100644 index 72e7b6c..0000000 Binary files a/data/assets/pawns/ge-tiger.png and /dev/null differ diff --git a/data/assets/pawns/ge-wespe.png b/data/assets/pawns/ge-wespe.png deleted file mode 100644 index 566e5b3..0000000 Binary files a/data/assets/pawns/ge-wespe.png and /dev/null differ diff --git a/data/assets/pawns/us-at-gun.png b/data/assets/pawns/us-at-gun.png deleted file mode 100644 index 9991ecf..0000000 Binary files a/data/assets/pawns/us-at-gun.png and /dev/null differ diff --git a/data/assets/pawns/us-head.png b/data/assets/pawns/us-head.png deleted file mode 100644 index 1affb71..0000000 Binary files a/data/assets/pawns/us-head.png and /dev/null differ diff --git a/data/assets/pawns/us-infantry.png b/data/assets/pawns/us-infantry.png deleted file mode 100644 index 9cea3c2..0000000 Binary files a/data/assets/pawns/us-infantry.png and /dev/null differ diff --git a/data/assets/pawns/us-pershing-hq.png b/data/assets/pawns/us-pershing-hq.png deleted file mode 100644 index 10b9364..0000000 Binary files a/data/assets/pawns/us-pershing-hq.png and /dev/null differ diff --git a/data/assets/pawns/us-pershing.png b/data/assets/pawns/us-pershing.png deleted file mode 100644 index 605563f..0000000 Binary files a/data/assets/pawns/us-pershing.png and /dev/null differ diff --git a/data/assets/pawns/us-priest.png b/data/assets/pawns/us-priest.png deleted file mode 100644 index 0dd6623..0000000 Binary files a/data/assets/pawns/us-priest.png and /dev/null differ diff --git a/data/assets/pawns/us-sherman-head.png b/data/assets/pawns/us-sherman-head.png deleted file mode 100644 index 62a390e..0000000 Binary files a/data/assets/pawns/us-sherman-head.png and /dev/null differ diff --git a/data/assets/pawns/us-sherman-hq.png b/data/assets/pawns/us-sherman-hq.png deleted file mode 100644 index bf54ea6..0000000 Binary files a/data/assets/pawns/us-sherman-hq.png and /dev/null differ diff --git a/data/assets/pawns/us-sherman.png b/data/assets/pawns/us-sherman.png deleted file mode 100644 index 4d42c73..0000000 Binary files a/data/assets/pawns/us-sherman.png and /dev/null differ diff --git a/data/assets/pawns/us-wolverine.png b/data/assets/pawns/us-wolverine.png deleted file mode 100644 index 9ce6dc3..0000000 Binary files a/data/assets/pawns/us-wolverine.png and /dev/null differ diff --git a/data/assets/tile-overlays/00_fog.png b/data/assets/tile-overlays/00_fog.png deleted file mode 100644 index 7d85d98..0000000 Binary files a/data/assets/tile-overlays/00_fog.png and /dev/null differ diff --git a/data/assets/tile-overlays/01_select.png b/data/assets/tile-overlays/01_select.png deleted file mode 100644 index f0b4320..0000000 Binary files a/data/assets/tile-overlays/01_select.png and /dev/null differ diff --git a/data/assets/tile-overlays/02_area.png b/data/assets/tile-overlays/02_area.png deleted file mode 100644 index 78b8f75..0000000 Binary files a/data/assets/tile-overlays/02_area.png and /dev/null differ diff --git a/data/assets/tile-overlays/03_move.png b/data/assets/tile-overlays/03_move.png deleted file mode 100644 index 5303cce..0000000 Binary files a/data/assets/tile-overlays/03_move.png and /dev/null differ diff --git a/data/assets/tile-overlays/04_directions.png b/data/assets/tile-overlays/04_directions.png deleted file mode 100644 index 6d483e1..0000000 Binary files a/data/assets/tile-overlays/04_directions.png and /dev/null differ diff --git a/data/assets/tile-overlays/05_orientation.png b/data/assets/tile-overlays/05_orientation.png deleted file mode 100644 index 2b1d06d..0000000 Binary files a/data/assets/tile-overlays/05_orientation.png and /dev/null differ diff --git a/data/assets/tile-overlays/06_objective.png b/data/assets/tile-overlays/06_objective.png deleted file mode 100644 index e076771..0000000 Binary files a/data/assets/tile-overlays/06_objective.png and /dev/null differ diff --git a/data/assets/tile-overlays/07_objective_ge.png b/data/assets/tile-overlays/07_objective_ge.png deleted file mode 100644 index a88a08e..0000000 Binary files a/data/assets/tile-overlays/07_objective_ge.png and /dev/null differ diff --git a/data/assets/tile-overlays/08_objective_us.png b/data/assets/tile-overlays/08_objective_us.png deleted file mode 100644 index 156964d..0000000 Binary files a/data/assets/tile-overlays/08_objective_us.png and /dev/null differ diff --git a/data/assets/unit-overlays/00_move.png b/data/assets/unit-overlays/00_move.png new file mode 100644 index 0000000..73c92cb Binary files /dev/null and b/data/assets/unit-overlays/00_move.png differ diff --git a/data/assets/unit-overlays/01_target.png b/data/assets/unit-overlays/01_target.png new file mode 100644 index 0000000..953151d Binary files /dev/null and b/data/assets/unit-overlays/01_target.png differ diff --git a/data/assets/unit-overlays/02_fire.png b/data/assets/unit-overlays/02_fire.png new file mode 100644 index 0000000..2344671 Binary files /dev/null and b/data/assets/unit-overlays/02_fire.png differ diff --git a/data/assets/unit-overlays/03_may_fire.png b/data/assets/unit-overlays/03_may_fire.png new file mode 100644 index 0000000..52b29dd Binary files /dev/null and b/data/assets/unit-overlays/03_may_fire.png differ diff --git a/data/assets/unit-overlays/04_ace.png b/data/assets/unit-overlays/04_ace.png new file mode 100644 index 0000000..38d32b4 Binary files /dev/null and b/data/assets/unit-overlays/04_ace.png differ diff --git a/data/assets/unit-overlays/05_hq.png b/data/assets/unit-overlays/05_hq.png new file mode 100644 index 0000000..d1dd2d8 Binary files /dev/null and b/data/assets/unit-overlays/05_hq.png differ diff --git a/data/assets/units/ge-at-gun.png b/data/assets/units/ge-at-gun.png new file mode 100644 index 0000000..f81a4b1 Binary files /dev/null and b/data/assets/units/ge-at-gun.png differ diff --git a/data/assets/units/ge-head.png b/data/assets/units/ge-head.png new file mode 100644 index 0000000..7aa65c7 Binary files /dev/null and b/data/assets/units/ge-head.png differ diff --git a/data/assets/units/ge-infantry.png b/data/assets/units/ge-infantry.png new file mode 100644 index 0000000..ef4cee9 Binary files /dev/null and b/data/assets/units/ge-infantry.png differ diff --git a/data/assets/units/ge-kingtiger.png b/data/assets/units/ge-kingtiger.png new file mode 100644 index 0000000..e45171b Binary files /dev/null and b/data/assets/units/ge-kingtiger.png differ diff --git a/data/assets/units/ge-panzer-iv-hq.png b/data/assets/units/ge-panzer-iv-hq.png new file mode 100644 index 0000000..2785941 Binary files /dev/null and b/data/assets/units/ge-panzer-iv-hq.png differ diff --git a/data/assets/units/ge-panzer-iv.png b/data/assets/units/ge-panzer-iv.png new file mode 100644 index 0000000..35ab9c3 Binary files /dev/null and b/data/assets/units/ge-panzer-iv.png differ diff --git a/data/assets/units/ge-tiger.png b/data/assets/units/ge-tiger.png new file mode 100644 index 0000000..72e7b6c Binary files /dev/null and b/data/assets/units/ge-tiger.png differ diff --git a/data/assets/units/ge-wespe.png b/data/assets/units/ge-wespe.png new file mode 100644 index 0000000..566e5b3 Binary files /dev/null and b/data/assets/units/ge-wespe.png differ diff --git a/data/assets/units/us-at-gun.png b/data/assets/units/us-at-gun.png new file mode 100644 index 0000000..9991ecf Binary files /dev/null and b/data/assets/units/us-at-gun.png differ diff --git a/data/assets/units/us-head.png b/data/assets/units/us-head.png new file mode 100644 index 0000000..1affb71 Binary files /dev/null and b/data/assets/units/us-head.png differ diff --git a/data/assets/units/us-infantry.png b/data/assets/units/us-infantry.png new file mode 100644 index 0000000..9cea3c2 Binary files /dev/null and b/data/assets/units/us-infantry.png differ diff --git a/data/assets/units/us-pershing-hq.png b/data/assets/units/us-pershing-hq.png new file mode 100644 index 0000000..10b9364 Binary files /dev/null and b/data/assets/units/us-pershing-hq.png differ diff --git a/data/assets/units/us-pershing.png b/data/assets/units/us-pershing.png new file mode 100644 index 0000000..605563f Binary files /dev/null and b/data/assets/units/us-pershing.png differ diff --git a/data/assets/units/us-priest.png b/data/assets/units/us-priest.png new file mode 100644 index 0000000..0dd6623 Binary files /dev/null and b/data/assets/units/us-priest.png differ diff --git a/data/assets/units/us-sherman-head.png b/data/assets/units/us-sherman-head.png new file mode 100644 index 0000000..62a390e Binary files /dev/null and b/data/assets/units/us-sherman-head.png differ diff --git a/data/assets/units/us-sherman-hq.png b/data/assets/units/us-sherman-hq.png new file mode 100644 index 0000000..bf54ea6 Binary files /dev/null and b/data/assets/units/us-sherman-hq.png differ diff --git a/data/assets/units/us-sherman.png b/data/assets/units/us-sherman.png new file mode 100644 index 0000000..4d42c73 Binary files /dev/null and b/data/assets/units/us-sherman.png differ diff --git a/data/assets/units/us-wolverine.png b/data/assets/units/us-wolverine.png new file mode 100644 index 0000000..9ce6dc3 Binary files /dev/null and b/data/assets/units/us-wolverine.png differ -- cgit v1.1-2-g2b99