From 88a0900bc5486da860580a108c2d13519573e85a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A9r=C3=A9my=20Zurcher?= Date: Sun, 8 Feb 2015 23:41:44 +0100 Subject: Support 2 sets of pawns depending of Config.graphics --- android/assets/data/unit-overlays.atlas | 62 --------- android/assets/data/unit-overlays.png | Bin 71361 -> 0 bytes android/assets/data/unit-overlays0.atlas | 62 +++++++++ android/assets/data/unit-overlays0.png | Bin 0 -> 61409 bytes android/assets/data/unit-overlays1.atlas | 62 +++++++++ android/assets/data/unit-overlays1.png | Bin 0 -> 71361 bytes android/assets/data/units.atlas | 139 --------------------- android/assets/data/units.png | Bin 547895 -> 0 bytes android/assets/data/units0.atlas | 104 +++++++++++++++ android/assets/data/units0.png | Bin 0 -> 211475 bytes android/assets/data/units1.atlas | 125 ++++++++++++++++++ android/assets/data/units1.png | Bin 0 -> 537971 bytes assets/build.gradle | 21 +++- assets/raw/us-sherman-head.png | Bin 0 -> 24591 bytes assets/raw/us-sherman-values.png | Bin 0 -> 3923 bytes assets/unit-overlays/00_move.png | Bin 27747 -> 0 bytes assets/unit-overlays/01_target.png | Bin 2869 -> 0 bytes assets/unit-overlays/02_fire.png | Bin 8137 -> 0 bytes assets/unit-overlays/03_may_fire.png | Bin 4550 -> 0 bytes assets/unit-overlays/04_ace.png | Bin 8121 -> 0 bytes assets/unit-overlays/05_hq.png | Bin 1994 -> 0 bytes assets/unit-overlays/06_fired.png | Bin 361 -> 0 bytes assets/unit-overlays/07_moved.png | Bin 353 -> 0 bytes assets/unit-overlays0/00_move.png | Bin 0 -> 27747 bytes assets/unit-overlays0/01_target.png | Bin 0 -> 2869 bytes assets/unit-overlays0/02_fire.png | Bin 0 -> 8137 bytes assets/unit-overlays0/03_may_fire.png | Bin 0 -> 4550 bytes assets/unit-overlays0/04_ace.png | Bin 0 -> 837 bytes assets/unit-overlays0/05_hq.png | Bin 0 -> 1886 bytes assets/unit-overlays0/06_fired.png | Bin 0 -> 245 bytes assets/unit-overlays0/07_moved.png | Bin 0 -> 234 bytes assets/unit-overlays1/00_move.png | Bin 0 -> 27747 bytes assets/unit-overlays1/01_target.png | Bin 0 -> 2869 bytes assets/unit-overlays1/02_fire.png | Bin 0 -> 8137 bytes assets/unit-overlays1/03_may_fire.png | Bin 0 -> 4550 bytes assets/unit-overlays1/04_ace.png | Bin 0 -> 8121 bytes assets/unit-overlays1/05_hq.png | Bin 0 -> 1994 bytes assets/unit-overlays1/06_fired.png | Bin 0 -> 361 bytes assets/unit-overlays1/07_moved.png | Bin 0 -> 353 bytes assets/units/ge-at-gun.png | Bin 24241 -> 0 bytes assets/units/ge-head.png | Bin 847 -> 0 bytes assets/units/ge-infantry.png | Bin 24975 -> 0 bytes assets/units/ge-kingtiger.png | Bin 21611 -> 0 bytes assets/units/ge-panzer-iv-hq.png | Bin 24495 -> 0 bytes assets/units/ge-panzer-iv.png | Bin 23997 -> 0 bytes assets/units/ge-tiger.png | Bin 22277 -> 0 bytes assets/units/ge-wespe.png | Bin 23084 -> 0 bytes assets/units/us-at-gun.png | Bin 24693 -> 0 bytes assets/units/us-head.png | Bin 1074 -> 0 bytes assets/units/us-infantry.png | Bin 26139 -> 0 bytes assets/units/us-pershing-hq.png | Bin 24763 -> 0 bytes assets/units/us-pershing.png | Bin 29109 -> 0 bytes assets/units/us-priest.png | Bin 24587 -> 0 bytes assets/units/us-sherman-head.png | Bin 24591 -> 0 bytes assets/units/us-sherman-hq.png | Bin 25383 -> 0 bytes assets/units/us-sherman-values.png | Bin 3923 -> 0 bytes assets/units/us-sherman.png | Bin 25072 -> 0 bytes assets/units/us-wolverine.png | Bin 25188 -> 0 bytes assets/units0/ge-at-gun.png | Bin 0 -> 14865 bytes assets/units0/ge-head.png | Bin 0 -> 847 bytes assets/units0/ge-infantry.png | Bin 0 -> 14905 bytes assets/units0/ge-kingtiger.png | Bin 0 -> 21611 bytes assets/units0/ge-panzer-iv.png | Bin 0 -> 21859 bytes assets/units0/ge-tiger.png | Bin 0 -> 17073 bytes assets/units0/ge-wespe.png | Bin 0 -> 22552 bytes assets/units0/us-at-gun.png | Bin 0 -> 13016 bytes assets/units0/us-head.png | Bin 0 -> 1074 bytes assets/units0/us-infantry.png | Bin 0 -> 15621 bytes assets/units0/us-pershing.png | Bin 0 -> 19173 bytes assets/units0/us-priest.png | Bin 0 -> 18705 bytes assets/units0/us-sherman.png | Bin 0 -> 19272 bytes assets/units0/us-wolverine.png | Bin 0 -> 20044 bytes assets/units1/ge-at-gun.png | Bin 0 -> 24241 bytes assets/units1/ge-head.png | Bin 0 -> 847 bytes assets/units1/ge-infantry.png | Bin 0 -> 24975 bytes assets/units1/ge-kingtiger.png | Bin 0 -> 21611 bytes assets/units1/ge-panzer-iv-hq.png | Bin 0 -> 24495 bytes assets/units1/ge-panzer-iv.png | Bin 0 -> 23997 bytes assets/units1/ge-tiger.png | Bin 0 -> 22277 bytes assets/units1/ge-wespe.png | Bin 0 -> 23084 bytes assets/units1/us-at-gun.png | Bin 0 -> 24693 bytes assets/units1/us-head.png | Bin 0 -> 1074 bytes assets/units1/us-infantry.png | Bin 0 -> 26139 bytes assets/units1/us-pershing-hq.png | Bin 0 -> 24763 bytes assets/units1/us-pershing.png | Bin 0 -> 29109 bytes assets/units1/us-priest.png | Bin 0 -> 24587 bytes assets/units1/us-sherman-hq.png | Bin 0 -> 25383 bytes assets/units1/us-sherman.png | Bin 0 -> 25072 bytes assets/units1/us-wolverine.png | Bin 0 -> 25188 bytes core/src/ch/asynk/tankontank/TankOnTank.java | 24 +++- .../ch/asynk/tankontank/game/battles/Factory.java | 22 ++-- 91 files changed, 403 insertions(+), 218 deletions(-) delete mode 100644 android/assets/data/unit-overlays.atlas delete mode 100644 android/assets/data/unit-overlays.png create mode 100644 android/assets/data/unit-overlays0.atlas create mode 100644 android/assets/data/unit-overlays0.png create mode 100644 android/assets/data/unit-overlays1.atlas create mode 100644 android/assets/data/unit-overlays1.png delete mode 100644 android/assets/data/units.atlas delete mode 100644 android/assets/data/units.png create mode 100644 android/assets/data/units0.atlas create mode 100644 android/assets/data/units0.png create mode 100644 android/assets/data/units1.atlas create mode 100644 android/assets/data/units1.png create mode 100644 assets/raw/us-sherman-head.png create mode 100644 assets/raw/us-sherman-values.png delete mode 100644 assets/unit-overlays/00_move.png delete mode 100644 assets/unit-overlays/01_target.png delete mode 100644 assets/unit-overlays/02_fire.png delete mode 100644 assets/unit-overlays/03_may_fire.png delete mode 100644 assets/unit-overlays/04_ace.png delete mode 100644 assets/unit-overlays/05_hq.png delete mode 100644 assets/unit-overlays/06_fired.png delete mode 100644 assets/unit-overlays/07_moved.png create mode 100644 assets/unit-overlays0/00_move.png create mode 100644 assets/unit-overlays0/01_target.png create mode 100644 assets/unit-overlays0/02_fire.png create mode 100644 assets/unit-overlays0/03_may_fire.png create mode 100644 assets/unit-overlays0/04_ace.png create mode 100644 assets/unit-overlays0/05_hq.png create mode 100644 assets/unit-overlays0/06_fired.png create mode 100644 assets/unit-overlays0/07_moved.png create mode 100644 assets/unit-overlays1/00_move.png create mode 100644 assets/unit-overlays1/01_target.png create mode 100644 assets/unit-overlays1/02_fire.png create mode 100644 assets/unit-overlays1/03_may_fire.png create mode 100644 assets/unit-overlays1/04_ace.png create mode 100644 assets/unit-overlays1/05_hq.png create mode 100644 assets/unit-overlays1/06_fired.png create mode 100644 assets/unit-overlays1/07_moved.png delete mode 100644 assets/units/ge-at-gun.png delete mode 100644 assets/units/ge-head.png delete mode 100644 assets/units/ge-infantry.png delete mode 100644 assets/units/ge-kingtiger.png delete mode 100644 assets/units/ge-panzer-iv-hq.png delete mode 100644 assets/units/ge-panzer-iv.png delete mode 100644 assets/units/ge-tiger.png delete mode 100644 assets/units/ge-wespe.png delete mode 100644 assets/units/us-at-gun.png delete mode 100644 assets/units/us-head.png delete mode 100644 assets/units/us-infantry.png delete mode 100644 assets/units/us-pershing-hq.png delete mode 100644 assets/units/us-pershing.png delete mode 100644 assets/units/us-priest.png delete mode 100644 assets/units/us-sherman-head.png delete mode 100644 assets/units/us-sherman-hq.png delete mode 100644 assets/units/us-sherman-values.png delete mode 100644 assets/units/us-sherman.png delete mode 100644 assets/units/us-wolverine.png create mode 100644 assets/units0/ge-at-gun.png create mode 100644 assets/units0/ge-head.png create mode 100644 assets/units0/ge-infantry.png create mode 100644 assets/units0/ge-kingtiger.png create mode 100644 assets/units0/ge-panzer-iv.png create mode 100644 assets/units0/ge-tiger.png create mode 100644 assets/units0/ge-wespe.png create mode 100644 assets/units0/us-at-gun.png create mode 100644 assets/units0/us-head.png create mode 100644 assets/units0/us-infantry.png create mode 100644 assets/units0/us-pershing.png create mode 100644 assets/units0/us-priest.png create mode 100644 assets/units0/us-sherman.png create mode 100644 assets/units0/us-wolverine.png create mode 100644 assets/units1/ge-at-gun.png create mode 100644 assets/units1/ge-head.png create mode 100644 assets/units1/ge-infantry.png create mode 100644 assets/units1/ge-kingtiger.png create mode 100644 assets/units1/ge-panzer-iv-hq.png create mode 100644 assets/units1/ge-panzer-iv.png create mode 100644 assets/units1/ge-tiger.png create mode 100644 assets/units1/ge-wespe.png create mode 100644 assets/units1/us-at-gun.png create mode 100644 assets/units1/us-head.png create mode 100644 assets/units1/us-infantry.png create mode 100644 assets/units1/us-pershing-hq.png create mode 100644 assets/units1/us-pershing.png create mode 100644 assets/units1/us-priest.png create mode 100644 assets/units1/us-sherman-hq.png create mode 100644 assets/units1/us-sherman.png create mode 100644 assets/units1/us-wolverine.png diff --git a/android/assets/data/unit-overlays.atlas b/android/assets/data/unit-overlays.atlas deleted file mode 100644 index fe8f966..0000000 --- a/android/assets/data/unit-overlays.atlas +++ /dev/null @@ -1,62 +0,0 @@ - -unit-overlays.png -size: 1024,256 -format: RGBA8888 -filter: Nearest,Nearest -repeat: none -00_move - rotate: false - xy: 2, 2 - size: 190, 217 - orig: 190, 217 - offset: 0, 0 - index: -1 -01_target - rotate: false - xy: 749, 129 - size: 90, 90 - orig: 90, 90 - offset: 0, 0 - index: -1 -02_fire - rotate: false - xy: 194, 69 - size: 100, 150 - orig: 100, 150 - offset: 0, 0 - index: -1 -03_may_fire - rotate: false - xy: 296, 69 - size: 100, 150 - orig: 100, 150 - offset: 0, 0 - index: -1 -04_ace - rotate: false - xy: 712, 15 - size: 35, 204 - orig: 35, 204 - offset: 0, 0 - index: -1 -05_hq - rotate: false - xy: 650, 47 - size: 60, 172 - orig: 60, 172 - offset: 0, 0 - index: -1 -06_fired - rotate: false - xy: 398, 95 - size: 124, 124 - orig: 124, 124 - offset: 0, 0 - index: -1 -07_moved - rotate: false - xy: 524, 95 - size: 124, 124 - orig: 124, 124 - offset: 0, 0 - index: -1 diff --git a/android/assets/data/unit-overlays.png b/android/assets/data/unit-overlays.png deleted file mode 100644 index e581b78..0000000 Binary files a/android/assets/data/unit-overlays.png and /dev/null differ diff --git a/android/assets/data/unit-overlays0.atlas b/android/assets/data/unit-overlays0.atlas new file mode 100644 index 0000000..6eb726b --- /dev/null +++ b/android/assets/data/unit-overlays0.atlas @@ -0,0 +1,62 @@ + +unit-overlays0.png +size: 1024,256 +format: RGBA8888 +filter: Nearest,Nearest +repeat: none +00_move + rotate: false + xy: 2, 24 + size: 190, 217 + orig: 190, 217 + offset: 0, 0 + index: -1 +01_target + rotate: false + xy: 608, 151 + size: 90, 90 + orig: 90, 90 + offset: 0, 0 + index: -1 +02_fire + rotate: false + xy: 194, 91 + size: 100, 150 + orig: 100, 150 + offset: 0, 0 + index: -1 +03_may_fire + rotate: false + xy: 296, 91 + size: 100, 150 + orig: 100, 150 + offset: 0, 0 + index: -1 +04_ace + rotate: false + xy: 700, 106 + size: 29, 135 + orig: 29, 135 + offset: 0, 0 + index: -1 +05_hq + rotate: false + xy: 2, 2 + size: 60, 20 + orig: 60, 20 + offset: 0, 0 + index: -1 +06_fired + rotate: false + xy: 398, 120 + size: 112, 121 + orig: 112, 121 + offset: 0, 0 + index: -1 +07_moved + rotate: false + xy: 512, 122 + size: 94, 119 + orig: 94, 119 + offset: 0, 0 + index: -1 diff --git a/android/assets/data/unit-overlays0.png b/android/assets/data/unit-overlays0.png new file mode 100644 index 0000000..305012d Binary files /dev/null and b/android/assets/data/unit-overlays0.png differ diff --git a/android/assets/data/unit-overlays1.atlas b/android/assets/data/unit-overlays1.atlas new file mode 100644 index 0000000..b74fa43 --- /dev/null +++ b/android/assets/data/unit-overlays1.atlas @@ -0,0 +1,62 @@ + +unit-overlays1.png +size: 1024,256 +format: RGBA8888 +filter: Nearest,Nearest +repeat: none +00_move + rotate: false + xy: 2, 2 + size: 190, 217 + orig: 190, 217 + offset: 0, 0 + index: -1 +01_target + rotate: false + xy: 749, 129 + size: 90, 90 + orig: 90, 90 + offset: 0, 0 + index: -1 +02_fire + rotate: false + xy: 194, 69 + size: 100, 150 + orig: 100, 150 + offset: 0, 0 + index: -1 +03_may_fire + rotate: false + xy: 296, 69 + size: 100, 150 + orig: 100, 150 + offset: 0, 0 + index: -1 +04_ace + rotate: false + xy: 712, 15 + size: 35, 204 + orig: 35, 204 + offset: 0, 0 + index: -1 +05_hq + rotate: false + xy: 650, 47 + size: 60, 172 + orig: 60, 172 + offset: 0, 0 + index: -1 +06_fired + rotate: false + xy: 398, 95 + size: 124, 124 + orig: 124, 124 + offset: 0, 0 + index: -1 +07_moved + rotate: false + xy: 524, 95 + size: 124, 124 + orig: 124, 124 + offset: 0, 0 + index: -1 diff --git a/android/assets/data/unit-overlays1.png b/android/assets/data/unit-overlays1.png new file mode 100644 index 0000000..e581b78 Binary files /dev/null and b/android/assets/data/unit-overlays1.png differ diff --git a/android/assets/data/units.atlas b/android/assets/data/units.atlas deleted file mode 100644 index 3f540e7..0000000 --- a/android/assets/data/units.atlas +++ /dev/null @@ -1,139 +0,0 @@ - -units.png -size: 1024,512 -format: RGBA8888 -filter: Nearest,Nearest -repeat: none -ge-at-gun - rotate: false - xy: 2, 128 - size: 124, 124 - orig: 124, 124 - offset: 0, 0 - index: -1 -ge-head - rotate: false - xy: 254, 113 - size: 25, 206 - orig: 25, 206 - offset: 0, 0 - index: -1 -ge-infantry - rotate: false - xy: 128, 195 - size: 124, 124 - orig: 124, 124 - offset: 0, 0 - index: -1 -ge-kingtiger - rotate: false - xy: 280, 347 - size: 124, 124 - orig: 124, 124 - offset: 0, 0 - index: -1 -ge-panzer-iv - rotate: false - xy: 2, 2 - size: 124, 124 - orig: 124, 124 - offset: 0, 0 - index: -1 -ge-panzer-iv-hq - rotate: false - xy: 128, 69 - size: 124, 124 - orig: 124, 124 - offset: 0, 0 - index: -1 -ge-tiger - rotate: false - xy: 406, 347 - size: 124, 124 - orig: 124, 124 - offset: 0, 0 - index: -1 -ge-wespe - rotate: false - xy: 532, 347 - size: 124, 124 - orig: 124, 124 - offset: 0, 0 - index: -1 -us-at-gun - rotate: false - xy: 658, 347 - size: 124, 124 - orig: 124, 124 - offset: 0, 0 - index: -1 -us-head - rotate: false - xy: 407, 13 - size: 25, 206 - orig: 25, 206 - offset: 0, 0 - index: -1 -us-infantry - rotate: false - xy: 784, 347 - size: 124, 124 - orig: 124, 124 - offset: 0, 0 - index: -1 -us-pershing - rotate: false - xy: 281, 221 - size: 124, 124 - orig: 124, 124 - offset: 0, 0 - index: -1 -us-pershing-hq - rotate: false - xy: 407, 221 - size: 124, 124 - orig: 124, 124 - offset: 0, 0 - index: -1 -us-priest - rotate: false - xy: 533, 221 - size: 124, 124 - orig: 124, 124 - offset: 0, 0 - index: -1 -us-sherman - rotate: false - xy: 659, 221 - size: 124, 124 - orig: 124, 124 - offset: 0, 0 - index: -1 -us-sherman-head - rotate: false - xy: 128, 321 - size: 150, 150 - orig: 150, 150 - offset: 0, 0 - index: -1 -us-sherman-hq - rotate: false - xy: 785, 221 - size: 124, 124 - orig: 124, 124 - offset: 0, 0 - index: -1 -us-sherman-values - rotate: false - xy: 2, 254 - size: 124, 217 - orig: 124, 217 - offset: 0, 0 - index: -1 -us-wolverine - rotate: false - xy: 281, 95 - 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 deleted file mode 100644 index 35ddcb0..0000000 Binary files a/android/assets/data/units.png and /dev/null differ diff --git a/android/assets/data/units0.atlas b/android/assets/data/units0.atlas new file mode 100644 index 0000000..d2fef02 --- /dev/null +++ b/android/assets/data/units0.atlas @@ -0,0 +1,104 @@ + +units0.png +size: 1024,512 +format: RGBA8888 +filter: Nearest,Nearest +repeat: none +ge-at-gun + rotate: false + xy: 2, 272 + size: 133, 133 + orig: 133, 133 + offset: 0, 0 + index: -1 +ge-head + rotate: false + xy: 542, 73 + size: 25, 206 + orig: 25, 206 + offset: 0, 0 + index: -1 +ge-infantry + rotate: false + xy: 2, 137 + size: 133, 133 + orig: 133, 133 + offset: 0, 0 + index: -1 +ge-kingtiger + rotate: false + xy: 542, 281 + size: 124, 124 + orig: 124, 124 + offset: 0, 0 + index: -1 +ge-panzer-iv + rotate: false + xy: 137, 272 + size: 133, 133 + orig: 133, 133 + offset: 0, 0 + index: -1 +ge-tiger + rotate: false + xy: 2, 2 + size: 133, 133 + orig: 133, 133 + offset: 0, 0 + index: -1 +ge-wespe + rotate: false + xy: 137, 137 + size: 133, 133 + orig: 133, 133 + offset: 0, 0 + index: -1 +us-at-gun + rotate: false + xy: 272, 272 + size: 133, 133 + orig: 133, 133 + offset: 0, 0 + index: -1 +us-head + rotate: false + xy: 569, 73 + size: 25, 206 + orig: 25, 206 + offset: 0, 0 + index: -1 +us-infantry + rotate: false + xy: 137, 2 + size: 133, 133 + orig: 133, 133 + offset: 0, 0 + index: -1 +us-pershing + rotate: false + xy: 272, 137 + size: 133, 133 + orig: 133, 133 + offset: 0, 0 + index: -1 +us-priest + rotate: false + xy: 407, 272 + size: 133, 133 + orig: 133, 133 + offset: 0, 0 + index: -1 +us-sherman + rotate: false + xy: 272, 2 + size: 133, 133 + orig: 133, 133 + offset: 0, 0 + index: -1 +us-wolverine + rotate: false + xy: 407, 137 + size: 133, 133 + orig: 133, 133 + offset: 0, 0 + index: -1 diff --git a/android/assets/data/units0.png b/android/assets/data/units0.png new file mode 100644 index 0000000..37b74f1 Binary files /dev/null and b/android/assets/data/units0.png differ diff --git a/android/assets/data/units1.atlas b/android/assets/data/units1.atlas new file mode 100644 index 0000000..3bb8239 --- /dev/null +++ b/android/assets/data/units1.atlas @@ -0,0 +1,125 @@ + +units1.png +size: 1024,512 +format: RGBA8888 +filter: Nearest,Nearest +repeat: none +ge-at-gun + rotate: false + xy: 2, 380 + size: 124, 124 + orig: 124, 124 + offset: 0, 0 + index: -1 +ge-head + rotate: false + xy: 380, 46 + size: 25, 206 + orig: 25, 206 + offset: 0, 0 + index: -1 +ge-infantry + rotate: false + xy: 2, 254 + size: 124, 124 + orig: 124, 124 + offset: 0, 0 + index: -1 +ge-kingtiger + rotate: false + xy: 128, 380 + size: 124, 124 + orig: 124, 124 + offset: 0, 0 + index: -1 +ge-panzer-iv + rotate: false + xy: 2, 128 + size: 124, 124 + orig: 124, 124 + offset: 0, 0 + index: -1 +ge-panzer-iv-hq + rotate: false + xy: 128, 254 + size: 124, 124 + orig: 124, 124 + offset: 0, 0 + index: -1 +ge-tiger + rotate: false + xy: 254, 380 + size: 124, 124 + orig: 124, 124 + offset: 0, 0 + index: -1 +ge-wespe + rotate: false + xy: 2, 2 + size: 124, 124 + orig: 124, 124 + offset: 0, 0 + index: -1 +us-at-gun + rotate: false + xy: 128, 128 + size: 124, 124 + orig: 124, 124 + offset: 0, 0 + index: -1 +us-head + rotate: false + xy: 407, 46 + size: 25, 206 + orig: 25, 206 + offset: 0, 0 + index: -1 +us-infantry + rotate: false + xy: 254, 254 + size: 124, 124 + orig: 124, 124 + offset: 0, 0 + index: -1 +us-pershing + rotate: false + xy: 380, 380 + size: 124, 124 + orig: 124, 124 + offset: 0, 0 + index: -1 +us-pershing-hq + rotate: false + xy: 128, 2 + size: 124, 124 + orig: 124, 124 + offset: 0, 0 + index: -1 +us-priest + rotate: false + xy: 254, 128 + size: 124, 124 + orig: 124, 124 + offset: 0, 0 + index: -1 +us-sherman + rotate: false + xy: 380, 254 + size: 124, 124 + orig: 124, 124 + offset: 0, 0 + index: -1 +us-sherman-hq + rotate: false + xy: 506, 380 + size: 124, 124 + orig: 124, 124 + offset: 0, 0 + index: -1 +us-wolverine + rotate: false + xy: 254, 2 + size: 124, 124 + orig: 124, 124 + offset: 0, 0 + index: -1 diff --git a/android/assets/data/units1.png b/android/assets/data/units1.png new file mode 100644 index 0000000..3210322 Binary files /dev/null and b/android/assets/data/units1.png differ diff --git a/assets/build.gradle b/assets/build.gradle index 674c38a..58843cf 100644 --- a/assets/build.gradle +++ b/assets/build.gradle @@ -48,16 +48,29 @@ task packHud(type: JavaExec) { args = ['../assets/hud', '../android/assets/data', 'hud'] } -task packUnits(type: JavaExec) { +task packUnits0(type: JavaExec) { + + main = 'com.badlogic.gdx.tools.texturepacker.TexturePacker' + classpath = configurations.texturePacker + args = ['../assets/units0', '../android/assets/data', 'units0'] +} + +task packUnits1(type: JavaExec) { + main = 'com.badlogic.gdx.tools.texturepacker.TexturePacker' + classpath = configurations.texturePacker + args = ['../assets/units1', '../android/assets/data', 'units1'] +} + +task packUnitOverlays0(type: JavaExec) { main = 'com.badlogic.gdx.tools.texturepacker.TexturePacker' classpath = configurations.texturePacker - args = ['../assets/units', '../android/assets/data', 'units'] + args = ['../assets/unit-overlays0', '../android/assets/data', 'unit-overlays0'] } -task packUnitOverlays(type: JavaExec) { +task packUnitOverlays1(type: JavaExec) { main = 'com.badlogic.gdx.tools.texturepacker.TexturePacker' classpath = configurations.texturePacker - args = ['../assets/unit-overlays', '../android/assets/data', 'unit-overlays'] + args = ['../assets/unit-overlays1', '../android/assets/data', 'unit-overlays1'] } task packHexOverlays(type: JavaExec) { diff --git a/assets/raw/us-sherman-head.png b/assets/raw/us-sherman-head.png new file mode 100644 index 0000000..62a390e Binary files /dev/null and b/assets/raw/us-sherman-head.png differ diff --git a/assets/raw/us-sherman-values.png b/assets/raw/us-sherman-values.png new file mode 100644 index 0000000..4d42c73 Binary files /dev/null and b/assets/raw/us-sherman-values.png differ diff --git a/assets/unit-overlays/00_move.png b/assets/unit-overlays/00_move.png deleted file mode 100644 index 5303cce..0000000 Binary files a/assets/unit-overlays/00_move.png and /dev/null differ diff --git a/assets/unit-overlays/01_target.png b/assets/unit-overlays/01_target.png deleted file mode 100644 index 953151d..0000000 Binary files a/assets/unit-overlays/01_target.png and /dev/null differ diff --git a/assets/unit-overlays/02_fire.png b/assets/unit-overlays/02_fire.png deleted file mode 100644 index 2344671..0000000 Binary files a/assets/unit-overlays/02_fire.png and /dev/null differ diff --git a/assets/unit-overlays/03_may_fire.png b/assets/unit-overlays/03_may_fire.png deleted file mode 100644 index 52b29dd..0000000 Binary files a/assets/unit-overlays/03_may_fire.png and /dev/null differ diff --git a/assets/unit-overlays/04_ace.png b/assets/unit-overlays/04_ace.png deleted file mode 100644 index 38d32b4..0000000 Binary files a/assets/unit-overlays/04_ace.png and /dev/null differ diff --git a/assets/unit-overlays/05_hq.png b/assets/unit-overlays/05_hq.png deleted file mode 100644 index d1dd2d8..0000000 Binary files a/assets/unit-overlays/05_hq.png and /dev/null differ diff --git a/assets/unit-overlays/06_fired.png b/assets/unit-overlays/06_fired.png deleted file mode 100644 index b03d25e..0000000 Binary files a/assets/unit-overlays/06_fired.png and /dev/null differ diff --git a/assets/unit-overlays/07_moved.png b/assets/unit-overlays/07_moved.png deleted file mode 100644 index bc01362..0000000 Binary files a/assets/unit-overlays/07_moved.png and /dev/null differ diff --git a/assets/unit-overlays0/00_move.png b/assets/unit-overlays0/00_move.png new file mode 100644 index 0000000..5303cce Binary files /dev/null and b/assets/unit-overlays0/00_move.png differ diff --git a/assets/unit-overlays0/01_target.png b/assets/unit-overlays0/01_target.png new file mode 100644 index 0000000..953151d Binary files /dev/null and b/assets/unit-overlays0/01_target.png differ diff --git a/assets/unit-overlays0/02_fire.png b/assets/unit-overlays0/02_fire.png new file mode 100644 index 0000000..2344671 Binary files /dev/null and b/assets/unit-overlays0/02_fire.png differ diff --git a/assets/unit-overlays0/03_may_fire.png b/assets/unit-overlays0/03_may_fire.png new file mode 100644 index 0000000..52b29dd Binary files /dev/null and b/assets/unit-overlays0/03_may_fire.png differ diff --git a/assets/unit-overlays0/04_ace.png b/assets/unit-overlays0/04_ace.png new file mode 100644 index 0000000..a94d504 Binary files /dev/null and b/assets/unit-overlays0/04_ace.png differ diff --git a/assets/unit-overlays0/05_hq.png b/assets/unit-overlays0/05_hq.png new file mode 100644 index 0000000..308a5f7 Binary files /dev/null and b/assets/unit-overlays0/05_hq.png differ diff --git a/assets/unit-overlays0/06_fired.png b/assets/unit-overlays0/06_fired.png new file mode 100644 index 0000000..9107707 Binary files /dev/null and b/assets/unit-overlays0/06_fired.png differ diff --git a/assets/unit-overlays0/07_moved.png b/assets/unit-overlays0/07_moved.png new file mode 100644 index 0000000..7bd96e5 Binary files /dev/null and b/assets/unit-overlays0/07_moved.png differ diff --git a/assets/unit-overlays1/00_move.png b/assets/unit-overlays1/00_move.png new file mode 100644 index 0000000..5303cce Binary files /dev/null and b/assets/unit-overlays1/00_move.png differ diff --git a/assets/unit-overlays1/01_target.png b/assets/unit-overlays1/01_target.png new file mode 100644 index 0000000..953151d Binary files /dev/null and b/assets/unit-overlays1/01_target.png differ diff --git a/assets/unit-overlays1/02_fire.png b/assets/unit-overlays1/02_fire.png new file mode 100644 index 0000000..2344671 Binary files /dev/null and b/assets/unit-overlays1/02_fire.png differ diff --git a/assets/unit-overlays1/03_may_fire.png b/assets/unit-overlays1/03_may_fire.png new file mode 100644 index 0000000..52b29dd Binary files /dev/null and b/assets/unit-overlays1/03_may_fire.png differ diff --git a/assets/unit-overlays1/04_ace.png b/assets/unit-overlays1/04_ace.png new file mode 100644 index 0000000..38d32b4 Binary files /dev/null and b/assets/unit-overlays1/04_ace.png differ diff --git a/assets/unit-overlays1/05_hq.png b/assets/unit-overlays1/05_hq.png new file mode 100644 index 0000000..d1dd2d8 Binary files /dev/null and b/assets/unit-overlays1/05_hq.png differ diff --git a/assets/unit-overlays1/06_fired.png b/assets/unit-overlays1/06_fired.png new file mode 100644 index 0000000..b03d25e Binary files /dev/null and b/assets/unit-overlays1/06_fired.png differ diff --git a/assets/unit-overlays1/07_moved.png b/assets/unit-overlays1/07_moved.png new file mode 100644 index 0000000..bc01362 Binary files /dev/null and b/assets/unit-overlays1/07_moved.png differ diff --git a/assets/units/ge-at-gun.png b/assets/units/ge-at-gun.png deleted file mode 100644 index f81a4b1..0000000 Binary files a/assets/units/ge-at-gun.png and /dev/null differ diff --git a/assets/units/ge-head.png b/assets/units/ge-head.png deleted file mode 100644 index 2a540be..0000000 Binary files a/assets/units/ge-head.png and /dev/null differ diff --git a/assets/units/ge-infantry.png b/assets/units/ge-infantry.png deleted file mode 100644 index ef4cee9..0000000 Binary files a/assets/units/ge-infantry.png and /dev/null differ diff --git a/assets/units/ge-kingtiger.png b/assets/units/ge-kingtiger.png deleted file mode 100644 index e45171b..0000000 Binary files a/assets/units/ge-kingtiger.png and /dev/null differ diff --git a/assets/units/ge-panzer-iv-hq.png b/assets/units/ge-panzer-iv-hq.png deleted file mode 100644 index 2785941..0000000 Binary files a/assets/units/ge-panzer-iv-hq.png and /dev/null differ diff --git a/assets/units/ge-panzer-iv.png b/assets/units/ge-panzer-iv.png deleted file mode 100644 index 35ab9c3..0000000 Binary files a/assets/units/ge-panzer-iv.png and /dev/null differ diff --git a/assets/units/ge-tiger.png b/assets/units/ge-tiger.png deleted file mode 100644 index 72e7b6c..0000000 Binary files a/assets/units/ge-tiger.png and /dev/null differ diff --git a/assets/units/ge-wespe.png b/assets/units/ge-wespe.png deleted file mode 100644 index 566e5b3..0000000 Binary files a/assets/units/ge-wespe.png and /dev/null differ diff --git a/assets/units/us-at-gun.png b/assets/units/us-at-gun.png deleted file mode 100644 index 9991ecf..0000000 Binary files a/assets/units/us-at-gun.png and /dev/null differ diff --git a/assets/units/us-head.png b/assets/units/us-head.png deleted file mode 100644 index fceed7a..0000000 Binary files a/assets/units/us-head.png and /dev/null differ diff --git a/assets/units/us-infantry.png b/assets/units/us-infantry.png deleted file mode 100644 index 9cea3c2..0000000 Binary files a/assets/units/us-infantry.png and /dev/null differ diff --git a/assets/units/us-pershing-hq.png b/assets/units/us-pershing-hq.png deleted file mode 100644 index 10b9364..0000000 Binary files a/assets/units/us-pershing-hq.png and /dev/null differ diff --git a/assets/units/us-pershing.png b/assets/units/us-pershing.png deleted file mode 100644 index 605563f..0000000 Binary files a/assets/units/us-pershing.png and /dev/null differ diff --git a/assets/units/us-priest.png b/assets/units/us-priest.png deleted file mode 100644 index 0dd6623..0000000 Binary files a/assets/units/us-priest.png and /dev/null differ diff --git a/assets/units/us-sherman-head.png b/assets/units/us-sherman-head.png deleted file mode 100644 index 62a390e..0000000 Binary files a/assets/units/us-sherman-head.png and /dev/null differ diff --git a/assets/units/us-sherman-hq.png b/assets/units/us-sherman-hq.png deleted file mode 100644 index bf54ea6..0000000 Binary files a/assets/units/us-sherman-hq.png and /dev/null differ diff --git a/assets/units/us-sherman-values.png b/assets/units/us-sherman-values.png deleted file mode 100644 index 4d42c73..0000000 Binary files a/assets/units/us-sherman-values.png and /dev/null differ diff --git a/assets/units/us-sherman.png b/assets/units/us-sherman.png deleted file mode 100644 index 03306d8..0000000 Binary files a/assets/units/us-sherman.png and /dev/null differ diff --git a/assets/units/us-wolverine.png b/assets/units/us-wolverine.png deleted file mode 100644 index 9ce6dc3..0000000 Binary files a/assets/units/us-wolverine.png and /dev/null differ diff --git a/assets/units0/ge-at-gun.png b/assets/units0/ge-at-gun.png new file mode 100644 index 0000000..90eee00 Binary files /dev/null and b/assets/units0/ge-at-gun.png differ diff --git a/assets/units0/ge-head.png b/assets/units0/ge-head.png new file mode 100644 index 0000000..2a540be Binary files /dev/null and b/assets/units0/ge-head.png differ diff --git a/assets/units0/ge-infantry.png b/assets/units0/ge-infantry.png new file mode 100644 index 0000000..f03b508 Binary files /dev/null and b/assets/units0/ge-infantry.png differ diff --git a/assets/units0/ge-kingtiger.png b/assets/units0/ge-kingtiger.png new file mode 100644 index 0000000..e45171b Binary files /dev/null and b/assets/units0/ge-kingtiger.png differ diff --git a/assets/units0/ge-panzer-iv.png b/assets/units0/ge-panzer-iv.png new file mode 100644 index 0000000..2e466b7 Binary files /dev/null and b/assets/units0/ge-panzer-iv.png differ diff --git a/assets/units0/ge-tiger.png b/assets/units0/ge-tiger.png new file mode 100644 index 0000000..3338d39 Binary files /dev/null and b/assets/units0/ge-tiger.png differ diff --git a/assets/units0/ge-wespe.png b/assets/units0/ge-wespe.png new file mode 100644 index 0000000..b429c1c Binary files /dev/null and b/assets/units0/ge-wespe.png differ diff --git a/assets/units0/us-at-gun.png b/assets/units0/us-at-gun.png new file mode 100644 index 0000000..f227228 Binary files /dev/null and b/assets/units0/us-at-gun.png differ diff --git a/assets/units0/us-head.png b/assets/units0/us-head.png new file mode 100644 index 0000000..fceed7a Binary files /dev/null and b/assets/units0/us-head.png differ diff --git a/assets/units0/us-infantry.png b/assets/units0/us-infantry.png new file mode 100644 index 0000000..77896cd Binary files /dev/null and b/assets/units0/us-infantry.png differ diff --git a/assets/units0/us-pershing.png b/assets/units0/us-pershing.png new file mode 100644 index 0000000..196e8bc Binary files /dev/null and b/assets/units0/us-pershing.png differ diff --git a/assets/units0/us-priest.png b/assets/units0/us-priest.png new file mode 100644 index 0000000..de175c3 Binary files /dev/null and b/assets/units0/us-priest.png differ diff --git a/assets/units0/us-sherman.png b/assets/units0/us-sherman.png new file mode 100644 index 0000000..78f3baa Binary files /dev/null and b/assets/units0/us-sherman.png differ diff --git a/assets/units0/us-wolverine.png b/assets/units0/us-wolverine.png new file mode 100644 index 0000000..fe42d7b Binary files /dev/null and b/assets/units0/us-wolverine.png differ diff --git a/assets/units1/ge-at-gun.png b/assets/units1/ge-at-gun.png new file mode 100644 index 0000000..f81a4b1 Binary files /dev/null and b/assets/units1/ge-at-gun.png differ diff --git a/assets/units1/ge-head.png b/assets/units1/ge-head.png new file mode 100644 index 0000000..2a540be Binary files /dev/null and b/assets/units1/ge-head.png differ diff --git a/assets/units1/ge-infantry.png b/assets/units1/ge-infantry.png new file mode 100644 index 0000000..ef4cee9 Binary files /dev/null and b/assets/units1/ge-infantry.png differ diff --git a/assets/units1/ge-kingtiger.png b/assets/units1/ge-kingtiger.png new file mode 100644 index 0000000..e45171b Binary files /dev/null and b/assets/units1/ge-kingtiger.png differ diff --git a/assets/units1/ge-panzer-iv-hq.png b/assets/units1/ge-panzer-iv-hq.png new file mode 100644 index 0000000..2785941 Binary files /dev/null and b/assets/units1/ge-panzer-iv-hq.png differ diff --git a/assets/units1/ge-panzer-iv.png b/assets/units1/ge-panzer-iv.png new file mode 100644 index 0000000..35ab9c3 Binary files /dev/null and b/assets/units1/ge-panzer-iv.png differ diff --git a/assets/units1/ge-tiger.png b/assets/units1/ge-tiger.png new file mode 100644 index 0000000..72e7b6c Binary files /dev/null and b/assets/units1/ge-tiger.png differ diff --git a/assets/units1/ge-wespe.png b/assets/units1/ge-wespe.png new file mode 100644 index 0000000..566e5b3 Binary files /dev/null and b/assets/units1/ge-wespe.png differ diff --git a/assets/units1/us-at-gun.png b/assets/units1/us-at-gun.png new file mode 100644 index 0000000..9991ecf Binary files /dev/null and b/assets/units1/us-at-gun.png differ diff --git a/assets/units1/us-head.png b/assets/units1/us-head.png new file mode 100644 index 0000000..fceed7a Binary files /dev/null and b/assets/units1/us-head.png differ diff --git a/assets/units1/us-infantry.png b/assets/units1/us-infantry.png new file mode 100644 index 0000000..9cea3c2 Binary files /dev/null and b/assets/units1/us-infantry.png differ diff --git a/assets/units1/us-pershing-hq.png b/assets/units1/us-pershing-hq.png new file mode 100644 index 0000000..10b9364 Binary files /dev/null and b/assets/units1/us-pershing-hq.png differ diff --git a/assets/units1/us-pershing.png b/assets/units1/us-pershing.png new file mode 100644 index 0000000..605563f Binary files /dev/null and b/assets/units1/us-pershing.png differ diff --git a/assets/units1/us-priest.png b/assets/units1/us-priest.png new file mode 100644 index 0000000..0dd6623 Binary files /dev/null and b/assets/units1/us-priest.png differ diff --git a/assets/units1/us-sherman-hq.png b/assets/units1/us-sherman-hq.png new file mode 100644 index 0000000..bf54ea6 Binary files /dev/null and b/assets/units1/us-sherman-hq.png differ diff --git a/assets/units1/us-sherman.png b/assets/units1/us-sherman.png new file mode 100644 index 0000000..03306d8 Binary files /dev/null and b/assets/units1/us-sherman.png differ diff --git a/assets/units1/us-wolverine.png b/assets/units1/us-wolverine.png new file mode 100644 index 0000000..9ce6dc3 Binary files /dev/null and b/assets/units1/us-wolverine.png differ diff --git a/core/src/ch/asynk/tankontank/TankOnTank.java b/core/src/ch/asynk/tankontank/TankOnTank.java index ac3e5ce..40e4240 100644 --- a/core/src/ch/asynk/tankontank/TankOnTank.java +++ b/core/src/ch/asynk/tankontank/TankOnTank.java @@ -87,10 +87,18 @@ public class TankOnTank extends Game manager.load("data/map_a.png", Texture.class); if (config.battle.getMapType() == Factory.MapType.MAP_B) manager.load("data/map_b.png", Texture.class); + switch (config.graphics) { + case MINE: + manager.load("data/units0.atlas", TextureAtlas.class); + manager.load("data/unit-overlays0.atlas", TextureAtlas.class); + break; + case ORIGINAL: + manager.load("data/units1.atlas", TextureAtlas.class); + manager.load("data/unit-overlays1.atlas", TextureAtlas.class); + break; + } manager.load("data/hex.png", Texture.class); manager.load("data/hud.atlas", TextureAtlas.class); - manager.load("data/units.atlas", TextureAtlas.class); - manager.load("data/unit-overlays.atlas", TextureAtlas.class); manager.load("data/hex-overlays.atlas", TextureAtlas.class); manager.load("data/dice.png", Texture.class); manager.load("data/infantry_fire.png", Texture.class); @@ -115,10 +123,18 @@ public class TankOnTank extends Game manager.unload("data/map_a.png"); if (config.battle.getMapType() == Factory.MapType.MAP_B) manager.unload("data/map_b.png"); + switch (config.graphics) { + case MINE: + manager.unload("data/units0.atlas"); + manager.unload("data/unit-overlays0.atlas"); + break; + case ORIGINAL: + manager.unload("data/units1.atlas"); + manager.unload("data/unit-overlays1.atlas"); + break; + } manager.unload("data/hex.png"); manager.unload("data/hud.atlas"); - manager.unload("data/units.atlas"); - manager.unload("data/unit-overlays.atlas"); manager.unload("data/hex-overlays.atlas"); manager.unload("data/dice.png"); manager.unload("data/infantry_fire.png"); diff --git a/core/src/ch/asynk/tankontank/game/battles/Factory.java b/core/src/ch/asynk/tankontank/game/battles/Factory.java index db81537..57328ad 100644 --- a/core/src/ch/asynk/tankontank/game/battles/Factory.java +++ b/core/src/ch/asynk/tankontank/game/battles/Factory.java @@ -61,9 +61,17 @@ public class Factory implements Board.TileBuilder, Disposable { if (assetsLoaded) return; this.hudAtlas = game.manager.get("data/hud.atlas", TextureAtlas.class); - this.pawnsAtlas = game.manager.get("data/units.atlas", TextureAtlas.class); - this.pawnOverlaysAtlas = game.manager.get("data/unit-overlays.atlas", TextureAtlas.class); this.tileOverlaysAtlas = game.manager.get("data/hex-overlays.atlas", TextureAtlas.class); + switch (game.config.graphics) { + case MINE: + this.pawnsAtlas = game.manager.get("data/units0.atlas", TextureAtlas.class); + this.pawnOverlaysAtlas = game.manager.get("data/unit-overlays0.atlas", TextureAtlas.class); + break; + case ORIGINAL: + this.pawnsAtlas = game.manager.get("data/units1.atlas", TextureAtlas.class); + this.pawnOverlaysAtlas = game.manager.get("data/unit-overlays1.atlas", TextureAtlas.class); + break; + } this.assetsLoaded = true; } @@ -122,7 +130,6 @@ public class Factory implements Board.TileBuilder, Disposable public Unit getUnit(UnitId id) { - boolean regular = game.config.regularPawns; Unit u = null; UnitType ut = UnitType.HARD_TARGET; UnitType utHq = UnitType.HARD_TARGET_HQ; @@ -142,7 +149,7 @@ public class Factory implements Board.TileBuilder, Disposable u = new Unit(Army.GE, id, ut, 2, 9, 2, "ge-panzer-iv", "ge-head", pawnsAtlas, pawnOverlaysAtlas); break; case GE_PANZER_IV_HQ: - u = new Unit(Army.GE, id, utHq, 2, 9, 2, "ge-panzer-iv-hq", "ge-head", pawnsAtlas, pawnOverlaysAtlas); + u = new Unit(Army.GE, id, utHq, 2, 9, 2, "ge-panzer-iv", "ge-head", pawnsAtlas, pawnOverlaysAtlas); break; case GE_TIGER: u = new Unit(Army.GE, id, ut, 3, 11, 1, "ge-tiger", "ge-head", pawnsAtlas, pawnOverlaysAtlas); @@ -163,20 +170,17 @@ public class Factory implements Board.TileBuilder, Disposable u = new Unit(Army.US, id, ut, 3, 10, 2, "us-pershing", "us-head", pawnsAtlas, pawnOverlaysAtlas); break; case US_PERSHING_HQ: - u = new Unit(Army.US, id, utHq, 3, 10, 2, "us-pershing-hq", "us-head", pawnsAtlas, pawnOverlaysAtlas); + u = new Unit(Army.US, id, utHq, 3, 10, 2, "us-pershing", "us-head", pawnsAtlas, pawnOverlaysAtlas); break; case US_PRIEST: ut = UnitType.ARTILLERY; u = new Unit(Army.US, id, ut, 5, 8, 1, "us-priest", "us-head", pawnsAtlas, pawnOverlaysAtlas); break; case US_SHERMAN: - if (regular) u = new Unit(Army.US, id, ut, 2, 9, 2, "us-sherman", "us-head", pawnsAtlas, pawnOverlaysAtlas); - else - u = new Unit(Army.US, id, ut, 2, 9, 2, "us-sherman-values", "us-sherman-head", pawnsAtlas, pawnOverlaysAtlas); break; case US_SHERMAN_HQ: - u = new Unit(Army.US, id, utHq, 2, 9, 2, "us-sherman-hq", "us-head", pawnsAtlas, pawnOverlaysAtlas); + u = new Unit(Army.US, id, utHq, 2, 9, 2, "us-sherman", "us-head", pawnsAtlas, pawnOverlaysAtlas); break; case US_WOLVERINE: u = new Unit(Army.US, id, ut, 3, 8, 3, "us-wolverine", "us-head", pawnsAtlas, pawnOverlaysAtlas); -- cgit v1.1-2-g2b99