diff --git a/core/assets-raw/sprites/enemies/blastenemy-t1.png b/core/assets-raw/sprites/enemies/blastenemy-t1.png deleted file mode 100644 index 54d3d77722..0000000000 Binary files a/core/assets-raw/sprites/enemies/blastenemy-t1.png and /dev/null differ diff --git a/core/assets-raw/sprites/enemies/blastenemy-t2.png b/core/assets-raw/sprites/enemies/blastenemy-t2.png deleted file mode 100644 index d48d5c3447..0000000000 Binary files a/core/assets-raw/sprites/enemies/blastenemy-t2.png and /dev/null differ diff --git a/core/assets-raw/sprites/enemies/blastenemy-t3.png b/core/assets-raw/sprites/enemies/blastenemy-t3.png deleted file mode 100644 index 18c2172c68..0000000000 Binary files a/core/assets-raw/sprites/enemies/blastenemy-t3.png and /dev/null differ diff --git a/core/assets-raw/sprites/enemies/empenemy-t1.png b/core/assets-raw/sprites/enemies/empenemy-t1.png deleted file mode 100644 index 0161483346..0000000000 Binary files a/core/assets-raw/sprites/enemies/empenemy-t1.png and /dev/null differ diff --git a/core/assets-raw/sprites/enemies/empenemy-t2.png b/core/assets-raw/sprites/enemies/empenemy-t2.png deleted file mode 100644 index 2779405f89..0000000000 Binary files a/core/assets-raw/sprites/enemies/empenemy-t2.png and /dev/null differ diff --git a/core/assets-raw/sprites/enemies/empenemy-t3.png b/core/assets-raw/sprites/enemies/empenemy-t3.png deleted file mode 100644 index c82d2e6943..0000000000 Binary files a/core/assets-raw/sprites/enemies/empenemy-t3.png and /dev/null differ diff --git a/core/assets-raw/sprites/enemies/fastenemy-t1.png b/core/assets-raw/sprites/enemies/fastenemy-t1.png deleted file mode 100644 index dd6eedee5a..0000000000 Binary files a/core/assets-raw/sprites/enemies/fastenemy-t1.png and /dev/null differ diff --git a/core/assets-raw/sprites/enemies/fastenemy-t2.png b/core/assets-raw/sprites/enemies/fastenemy-t2.png deleted file mode 100644 index 525fb577ea..0000000000 Binary files a/core/assets-raw/sprites/enemies/fastenemy-t2.png and /dev/null differ diff --git a/core/assets-raw/sprites/enemies/fastenemy-t3.png b/core/assets-raw/sprites/enemies/fastenemy-t3.png deleted file mode 100644 index fc447b6bd7..0000000000 Binary files a/core/assets-raw/sprites/enemies/fastenemy-t3.png and /dev/null differ diff --git a/core/assets-raw/sprites/enemies/flamerenemy-t1.png b/core/assets-raw/sprites/enemies/flamerenemy-t1.png deleted file mode 100644 index 4d13b33bea..0000000000 Binary files a/core/assets-raw/sprites/enemies/flamerenemy-t1.png and /dev/null differ diff --git a/core/assets-raw/sprites/enemies/flamerenemy-t2.png b/core/assets-raw/sprites/enemies/flamerenemy-t2.png deleted file mode 100644 index c4b331c34b..0000000000 Binary files a/core/assets-raw/sprites/enemies/flamerenemy-t2.png and /dev/null differ diff --git a/core/assets-raw/sprites/enemies/flamerenemy-t3.png b/core/assets-raw/sprites/enemies/flamerenemy-t3.png deleted file mode 100644 index 91bfb2c5d7..0000000000 Binary files a/core/assets-raw/sprites/enemies/flamerenemy-t3.png and /dev/null differ diff --git a/core/assets-raw/sprites/enemies/fortressenemy-t1.png b/core/assets-raw/sprites/enemies/fortressenemy-t1.png deleted file mode 100644 index 08af9a95b3..0000000000 Binary files a/core/assets-raw/sprites/enemies/fortressenemy-t1.png and /dev/null differ diff --git a/core/assets-raw/sprites/enemies/fortressenemy-t2.png b/core/assets-raw/sprites/enemies/fortressenemy-t2.png deleted file mode 100644 index 07eec2cd31..0000000000 Binary files a/core/assets-raw/sprites/enemies/fortressenemy-t2.png and /dev/null differ diff --git a/core/assets-raw/sprites/enemies/fortressenemy-t3.png b/core/assets-raw/sprites/enemies/fortressenemy-t3.png deleted file mode 100644 index 7beb99e5f7..0000000000 Binary files a/core/assets-raw/sprites/enemies/fortressenemy-t3.png and /dev/null differ diff --git a/core/assets-raw/sprites/enemies/healerenemy-t1.png b/core/assets-raw/sprites/enemies/healerenemy-t1.png deleted file mode 100644 index a2a019f515..0000000000 Binary files a/core/assets-raw/sprites/enemies/healerenemy-t1.png and /dev/null differ diff --git a/core/assets-raw/sprites/enemies/healerenemy-t2.png b/core/assets-raw/sprites/enemies/healerenemy-t2.png deleted file mode 100644 index c46199589e..0000000000 Binary files a/core/assets-raw/sprites/enemies/healerenemy-t2.png and /dev/null differ diff --git a/core/assets-raw/sprites/enemies/healerenemy-t3.png b/core/assets-raw/sprites/enemies/healerenemy-t3.png deleted file mode 100644 index 736533e97e..0000000000 Binary files a/core/assets-raw/sprites/enemies/healerenemy-t3.png and /dev/null differ diff --git a/core/assets-raw/sprites/enemies/mortarenemy-t1.png b/core/assets-raw/sprites/enemies/mortarenemy-t1.png deleted file mode 100644 index 71d6ace244..0000000000 Binary files a/core/assets-raw/sprites/enemies/mortarenemy-t1.png and /dev/null differ diff --git a/core/assets-raw/sprites/enemies/mortarenemy-t2.png b/core/assets-raw/sprites/enemies/mortarenemy-t2.png deleted file mode 100644 index 71072a08ea..0000000000 Binary files a/core/assets-raw/sprites/enemies/mortarenemy-t2.png and /dev/null differ diff --git a/core/assets-raw/sprites/enemies/mortarenemy-t3.png b/core/assets-raw/sprites/enemies/mortarenemy-t3.png deleted file mode 100644 index 74845b4a2b..0000000000 Binary files a/core/assets-raw/sprites/enemies/mortarenemy-t3.png and /dev/null differ diff --git a/core/assets-raw/sprites/enemies/rapidenemy-t1.png b/core/assets-raw/sprites/enemies/rapidenemy-t1.png deleted file mode 100644 index 4266c7839a..0000000000 Binary files a/core/assets-raw/sprites/enemies/rapidenemy-t1.png and /dev/null differ diff --git a/core/assets-raw/sprites/enemies/rapidenemy-t2.png b/core/assets-raw/sprites/enemies/rapidenemy-t2.png deleted file mode 100644 index d92b7a1e96..0000000000 Binary files a/core/assets-raw/sprites/enemies/rapidenemy-t2.png and /dev/null differ diff --git a/core/assets-raw/sprites/enemies/rapidenemy-t3.png b/core/assets-raw/sprites/enemies/rapidenemy-t3.png deleted file mode 100644 index e8fd4c0fe4..0000000000 Binary files a/core/assets-raw/sprites/enemies/rapidenemy-t3.png and /dev/null differ diff --git a/core/assets-raw/sprites/enemies/scout-base.png b/core/assets-raw/sprites/enemies/scout-base.png new file mode 100644 index 0000000000..50cd656428 Binary files /dev/null and b/core/assets-raw/sprites/enemies/scout-base.png differ diff --git a/core/assets-raw/sprites/enemies/scout-leg.png b/core/assets-raw/sprites/enemies/scout-leg.png new file mode 100644 index 0000000000..7204dda0a7 Binary files /dev/null and b/core/assets-raw/sprites/enemies/scout-leg.png differ diff --git a/core/assets-raw/sprites/enemies/scout.png b/core/assets-raw/sprites/enemies/scout.png new file mode 100644 index 0000000000..e883cf9080 Binary files /dev/null and b/core/assets-raw/sprites/enemies/scout.png differ diff --git a/core/assets-raw/sprites/enemies/standardenemy-t1.png b/core/assets-raw/sprites/enemies/standardenemy-t1.png deleted file mode 100644 index 72d033db76..0000000000 Binary files a/core/assets-raw/sprites/enemies/standardenemy-t1.png and /dev/null differ diff --git a/core/assets-raw/sprites/enemies/standardenemy-t2.png b/core/assets-raw/sprites/enemies/standardenemy-t2.png deleted file mode 100644 index 642d06cb6c..0000000000 Binary files a/core/assets-raw/sprites/enemies/standardenemy-t2.png and /dev/null differ diff --git a/core/assets-raw/sprites/enemies/standardenemy-t3.png b/core/assets-raw/sprites/enemies/standardenemy-t3.png deleted file mode 100644 index c02539e6c5..0000000000 Binary files a/core/assets-raw/sprites/enemies/standardenemy-t3.png and /dev/null differ diff --git a/core/assets-raw/sprites/enemies/tankenemy-t1.png b/core/assets-raw/sprites/enemies/tankenemy-t1.png deleted file mode 100644 index 059bc6e6c7..0000000000 Binary files a/core/assets-raw/sprites/enemies/tankenemy-t1.png and /dev/null differ diff --git a/core/assets-raw/sprites/enemies/tankenemy-t2.png b/core/assets-raw/sprites/enemies/tankenemy-t2.png deleted file mode 100644 index a959046fc9..0000000000 Binary files a/core/assets-raw/sprites/enemies/tankenemy-t2.png and /dev/null differ diff --git a/core/assets-raw/sprites/enemies/tankenemy-t3.png b/core/assets-raw/sprites/enemies/tankenemy-t3.png deleted file mode 100644 index 836275cdb3..0000000000 Binary files a/core/assets-raw/sprites/enemies/tankenemy-t3.png and /dev/null differ diff --git a/core/assets-raw/sprites/enemies/targetenemy-t1.png b/core/assets-raw/sprites/enemies/targetenemy-t1.png deleted file mode 100644 index 72d033db76..0000000000 Binary files a/core/assets-raw/sprites/enemies/targetenemy-t1.png and /dev/null differ diff --git a/core/assets-raw/sprites/enemies/titanenemy-t1.png b/core/assets-raw/sprites/enemies/titanenemy-t1.png deleted file mode 100644 index 204488c950..0000000000 Binary files a/core/assets-raw/sprites/enemies/titanenemy-t1.png and /dev/null differ diff --git a/core/assets-raw/sprites/enemies/titanenemy-t2.png b/core/assets-raw/sprites/enemies/titanenemy-t2.png deleted file mode 100644 index 9acc6a5181..0000000000 Binary files a/core/assets-raw/sprites/enemies/titanenemy-t2.png and /dev/null differ diff --git a/core/assets-raw/sprites/enemies/titanenemy-t3.png b/core/assets-raw/sprites/enemies/titanenemy-t3.png deleted file mode 100644 index 162a2c50bd..0000000000 Binary files a/core/assets-raw/sprites/enemies/titanenemy-t3.png and /dev/null differ diff --git a/core/assets/sprites/sprites.atlas b/core/assets/sprites/sprites.atlas index 37cc37e99f..8ebf391005 100644 --- a/core/assets/sprites/sprites.atlas +++ b/core/assets/sprites/sprites.atlas @@ -20,7 +20,7 @@ blackrock1 index: -1 blackrockshadow1 rotate: false - xy: 315, 29 + xy: 291, 29 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -34,7 +34,7 @@ blackstone1 index: -1 blackstone2 rotate: false - xy: 325, 29 + xy: 301, 29 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -48,7 +48,7 @@ blackstone3 index: -1 blackstoneblock1 rotate: false - xy: 335, 29 + xy: 311, 29 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -62,7 +62,7 @@ blackstoneblock2 index: -1 blackstoneblock3 rotate: false - xy: 345, 29 + xy: 321, 29 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -76,49 +76,49 @@ blackstoneedge index: -1 coal1 rotate: false - xy: 801, 438 + xy: 311, 19 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 coal2 rotate: false - xy: 555, 75 + xy: 361, 29 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 coal3 rotate: false - xy: 610, 209 + xy: 321, 19 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 deepwater rotate: false - xy: 690, 272 + xy: 441, 31 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 dirt1 rotate: false - xy: 677, 262 + xy: 401, 21 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 dirt2 rotate: false - xy: 677, 252 + xy: 451, 31 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 dirt3 rotate: false - xy: 687, 262 + xy: 411, 21 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -132,35 +132,35 @@ dirtedge index: -1 grass1 rotate: false - xy: 673, 222 + xy: 451, 21 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 grass2 rotate: false - xy: 683, 222 + xy: 461, 21 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 grass3 rotate: false - xy: 753, 351 + xy: 471, 21 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 grassblock1 rotate: false - xy: 763, 351 + xy: 481, 31 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 grassblock2 rotate: false - xy: 773, 352 + xy: 481, 21 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -174,21 +174,21 @@ grassedge index: -1 ice1 rotate: false - xy: 813, 442 + xy: 491, 33 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ice2 rotate: false - xy: 823, 442 + xy: 491, 23 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ice3 rotate: false - xy: 833, 442 + xy: 781, 434 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -202,70 +202,70 @@ iceedge index: -1 icerock1 rotate: false - xy: 843, 443 + xy: 545, 75 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 icerock2 rotate: false - xy: 853, 443 + xy: 538, 65 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 icerockshadow1 rotate: false - xy: 533, 65 + xy: 548, 65 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 rockshadow1 rotate: false - xy: 533, 65 + xy: 548, 65 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 icerockshadow2 rotate: false - xy: 543, 65 + xy: 555, 75 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 rockshadow2 rotate: false - xy: 543, 65 + xy: 555, 75 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 iron1 rotate: false - xy: 553, 65 + xy: 558, 65 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 iron2 rotate: false - xy: 301, 17 + xy: 791, 438 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 iron3 rotate: false - xy: 311, 19 + xy: 801, 438 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 lava rotate: false - xy: 660, 188 + xy: 677, 278 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -279,14 +279,14 @@ lavaedge index: -1 mossblock rotate: false - xy: 693, 222 + xy: 687, 262 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 oil rotate: false - xy: 693, 212 + xy: 687, 252 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -300,56 +300,56 @@ oiledge index: -1 rock1 rotate: false - xy: 415, 31 + xy: 811, 432 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 rock2 rotate: false - xy: 425, 31 + xy: 821, 432 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 sand1 rotate: false - xy: 465, 31 + xy: 522, 49 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 sand2 rotate: false - xy: 475, 31 + xy: 501, 39 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 sand3 rotate: false - xy: 811, 422 + xy: 501, 29 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 sandblock1 rotate: false - xy: 821, 422 + xy: 511, 39 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 sandblock2 rotate: false - xy: 831, 422 + xy: 511, 29 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 sandblock3 rotate: false - xy: 620, 173 + xy: 521, 39 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -363,196 +363,196 @@ sandedge index: -1 shrub rotate: false - xy: 690, 182 + xy: 511, 9 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 shrubshadow rotate: false - xy: 640, 168 + xy: 521, 9 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 snow1 rotate: false - xy: 680, 172 + xy: 628, 183 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 snow2 rotate: false - xy: 690, 172 + xy: 640, 188 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 snow3 rotate: false - xy: 766, 321 + xy: 650, 188 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 snowblock1 rotate: false - xy: 766, 311 + xy: 660, 188 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 snowblock2 rotate: false - xy: 770, 331 + xy: 670, 184 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 snowblock3 rotate: false - xy: 371, 19 + xy: 687, 232 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 snowedge rotate: false - xy: 241, 39 + xy: 283, 39 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 stone1 rotate: false - xy: 451, 21 + xy: 763, 341 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 stone2 rotate: false - xy: 461, 21 + xy: 773, 342 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 stone3 rotate: false - xy: 471, 21 + xy: 760, 331 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 stoneblock1 rotate: false - xy: 670, 162 + xy: 756, 321 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 stoneblock2 rotate: false - xy: 680, 162 + xy: 756, 311 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 stoneblock3 rotate: false - xy: 690, 162 + xy: 811, 422 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 stoneedge rotate: false - xy: 339, 39 + xy: 353, 39 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 titanium1 rotate: false - xy: 491, 21 + xy: 690, 202 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 titanium2 rotate: false - xy: 581, 133 + xy: 690, 192 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 titanium3 rotate: false - xy: 697, 262 + xy: 690, 182 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 uranium1 rotate: false - xy: 700, 182 + xy: 640, 168 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 uranium2 rotate: false - xy: 700, 172 + xy: 650, 168 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 uranium3 rotate: false - xy: 700, 162 + xy: 660, 168 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 water rotate: false - xy: 707, 242 + xy: 770, 331 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 wateredge rotate: false - xy: 353, 39 + xy: 367, 39 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 block-middle rotate: false - xy: 291, 17 + xy: 291, 19 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 pump-liquid rotate: false - xy: 291, 17 + xy: 291, 19 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 conduit-liquid rotate: false - xy: 660, 208 + xy: 411, 31 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 cross-1 rotate: false - xy: 680, 272 + xy: 391, 21 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -573,21 +573,21 @@ cross-3 index: -1 enemyspawn rotate: false - xy: 677, 232 + xy: 431, 21 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 playerspawn rotate: false - xy: 753, 341 + xy: 673, 214 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 shadow rotate: false - xy: 257, 27 + xy: 233, 27 size: 10, 10 orig: 10, 10 offset: 0, 0 @@ -601,35 +601,35 @@ alloysmelter index: -1 coaldrill rotate: false - xy: 610, 199 + xy: 371, 29 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 coalextractor rotate: false - xy: 620, 213 + xy: 381, 31 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 coalgenerator rotate: false - xy: 630, 213 + xy: 331, 19 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 coalgenerator-top rotate: false - xy: 620, 203 + xy: 391, 31 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 combustiongenerator rotate: false - xy: 630, 203 + xy: 341, 19 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -664,14 +664,14 @@ cultivator index: -1 fluxpump rotate: false - xy: 687, 232 + xy: 441, 21 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 irondrill rotate: false - xy: 321, 19 + xy: 538, 55 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -692,7 +692,7 @@ laserdrill index: -1 lavasmelter rotate: false - xy: 673, 212 + xy: 677, 268 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -734,35 +734,35 @@ oilextractor-liquid index: -1 oilrefinery rotate: false - xy: 690, 202 + xy: 687, 242 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 omnidrill rotate: false - xy: 690, 192 + xy: 673, 224 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 powerbooster rotate: false - xy: 750, 331 + xy: 670, 204 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 pulverizer rotate: false - xy: 395, 31 + xy: 791, 428 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 pump rotate: false - xy: 405, 31 + xy: 801, 428 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -776,91 +776,91 @@ quartzextractor index: -1 rtgenerator rotate: false - xy: 445, 31 + xy: 502, 49 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 rtgenerator-top rotate: false - xy: 455, 31 + xy: 512, 49 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 siliconextractor rotate: false - xy: 650, 168 + xy: 620, 193 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 smelter rotate: false - xy: 660, 168 + xy: 630, 193 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 smelter-middle rotate: false - xy: 670, 172 + xy: 618, 183 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 solarpanel rotate: false - xy: 381, 21 + xy: 683, 222 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 stonedrill rotate: false - xy: 776, 321 + xy: 821, 422 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 stoneformer rotate: false - xy: 776, 311 + xy: 831, 422 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 thermalgenerator rotate: false - xy: 485, 31 + xy: 693, 212 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 titaniumdrill rotate: false - xy: 697, 252 + xy: 620, 173 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 titaniumextractor rotate: false - xy: 697, 242 + xy: 630, 173 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 uraniumdrill rotate: false - xy: 720, 305 + xy: 670, 164 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 uraniumextractor rotate: false - xy: 730, 305 + xy: 680, 162 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -902,42 +902,42 @@ batterylarge-base index: -1 conduit-bottom rotate: false - xy: 650, 208 + xy: 351, 19 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 conduit-top rotate: false - xy: 640, 198 + xy: 361, 19 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 conduittunnel rotate: false - xy: 650, 198 + xy: 421, 31 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 conveyor rotate: false - xy: 660, 198 + xy: 371, 19 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 conveyormove rotate: false - xy: 681, 282 + xy: 381, 21 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 conveyortunnel rotate: false - xy: 691, 282 + xy: 431, 31 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -951,49 +951,49 @@ core index: -1 junction rotate: false - xy: 640, 188 + xy: 650, 198 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 laser-base rotate: false - xy: 650, 188 + xy: 660, 198 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 liquidjunction rotate: false - xy: 683, 212 + xy: 677, 258 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 liquidrouter rotate: false - xy: 670, 202 + xy: 677, 248 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 liquidrouter-bottom rotate: false - xy: 670, 192 + xy: 677, 238 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 liquidrouter-liquid rotate: false - xy: 680, 202 + xy: 687, 282 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 liquidrouter-top rotate: false - xy: 680, 192 + xy: 687, 272 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -1028,77 +1028,77 @@ multiplexer index: -1 poweredconveyor rotate: false - xy: 763, 341 + xy: 670, 194 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 poweredconveyormove rotate: false - xy: 773, 342 + xy: 753, 351 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 powerinfinite rotate: false - xy: 760, 331 + xy: 763, 351 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 powerlaser rotate: false - xy: 756, 321 + xy: 773, 352 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 powerlasercorner rotate: false - xy: 756, 311 + xy: 813, 442 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 powerlaserrouter rotate: false - xy: 361, 19 + xy: 823, 442 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 powervoid rotate: false - xy: 365, 29 + xy: 833, 442 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 pulseconduit-bottom rotate: false - xy: 375, 31 + xy: 843, 443 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 pulseconduit-top rotate: false - xy: 385, 31 + xy: 853, 443 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 router rotate: false - xy: 435, 31 + xy: 831, 432 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 shieldgenerator rotate: false - xy: 640, 178 + xy: 501, 19 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -1112,35 +1112,35 @@ shieldprojector index: -1 sortedunloader rotate: false - xy: 391, 21 + xy: 683, 212 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 sorter rotate: false - xy: 401, 21 + xy: 680, 202 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 splitter rotate: false - xy: 411, 21 + xy: 680, 192 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 steelconveyor rotate: false - xy: 421, 21 + xy: 680, 182 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 steelconveyormove rotate: false - xy: 431, 21 + xy: 753, 341 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -1161,7 +1161,7 @@ teleporter-top index: -1 unloader rotate: false - xy: 700, 192 + xy: 690, 172 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -1175,7 +1175,7 @@ vault index: -1 vault-icon rotate: false - xy: 740, 305 + xy: 690, 162 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -1189,7 +1189,7 @@ weaponfactory index: -1 block-1 rotate: false - xy: 281, 17 + xy: 331, 29 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -1252,7 +1252,7 @@ gatlingturret index: -1 laserturret rotate: false - xy: 609, 141 + xy: 502, 59 size: 10, 10 orig: 10, 10 offset: 0, 0 @@ -1280,35 +1280,35 @@ missileturret index: -1 plasmaturret rotate: false - xy: 221, 27 + xy: 514, 59 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 railgunturret rotate: false - xy: 233, 27 + xy: 526, 59 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 repairturret rotate: false - xy: 245, 27 + xy: 221, 27 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 shotgunturret rotate: false - xy: 269, 27 + xy: 245, 27 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 teslaturret rotate: false - xy: 281, 27 + xy: 257, 27 size: 10, 10 orig: 10, 10 offset: 0, 0 @@ -1322,21 +1322,21 @@ titancannon index: -1 turret rotate: false - xy: 293, 27 + xy: 269, 27 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 compositewall rotate: false - xy: 640, 208 + xy: 401, 31 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 door rotate: false - xy: 677, 242 + xy: 461, 31 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -1357,14 +1357,14 @@ door-large-open index: -1 door-open rotate: false - xy: 687, 252 + xy: 421, 21 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 duriumwall rotate: false - xy: 687, 242 + xy: 471, 31 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -1378,14 +1378,14 @@ duriumwall-large index: -1 ironwall rotate: false - xy: 331, 19 + xy: 548, 55 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 steelwall rotate: false - xy: 441, 21 + xy: 750, 331 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -1399,21 +1399,21 @@ steelwall-large index: -1 stonewall rotate: false - xy: 481, 21 + xy: 693, 222 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 titaniumshieldwall rotate: false - xy: 697, 232 + xy: 640, 178 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 titaniumwall rotate: false - xy: 700, 272 + xy: 650, 178 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -1434,7 +1434,7 @@ blank index: -1 bullet rotate: false - xy: 781, 434 + xy: 341, 29 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -1455,7 +1455,7 @@ enemyarrow index: -1 laser rotate: false - xy: 677, 274 + xy: 499, 55 size: 1, 12 orig: 1, 12 offset: 0, 0 @@ -1476,28 +1476,28 @@ laserfull index: -1 shell rotate: false - xy: 630, 173 + xy: 521, 29 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 shot rotate: false - xy: 670, 182 + xy: 491, 13 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 shot-long rotate: false - xy: 680, 182 + xy: 501, 9 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 titanshell rotate: false - xy: 703, 222 + xy: 660, 178 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -1686,14 +1686,14 @@ targetenemy-t1 index: -1 standardenemy-t2 rotate: false - xy: 311, 39 + xy: 325, 39 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 standardenemy-t3 rotate: false - xy: 325, 39 + xy: 339, 39 size: 12, 12 orig: 12, 12 offset: 0, 0 @@ -1740,84 +1740,14 @@ titanenemy-t3 orig: 16, 16 offset: 0, 0 index: -1 -item-biomatter +scout rotate: false - xy: 341, 19 - size: 8, 8 - orig: 8, 8 + xy: 241, 39 + size: 12, 12 + orig: 12, 12 offset: 0, 0 index: -1 -item-coal - rotate: false - xy: 351, 19 - size: 8, 8 - orig: 8, 8 - offset: 0, 0 - index: -1 -item-dirium - rotate: false - xy: 791, 428 - size: 8, 8 - orig: 8, 8 - offset: 0, 0 - index: -1 -item-glass - rotate: false - xy: 801, 428 - size: 8, 8 - orig: 8, 8 - offset: 0, 0 - index: -1 -item-iron - rotate: false - xy: 811, 432 - size: 8, 8 - orig: 8, 8 - offset: 0, 0 - index: -1 -item-quartz - rotate: false - xy: 821, 432 - size: 8, 8 - orig: 8, 8 - offset: 0, 0 - index: -1 -item-silicon - rotate: false - xy: 831, 432 - size: 8, 8 - orig: 8, 8 - offset: 0, 0 - index: -1 -item-steel - rotate: false - xy: 620, 193 - size: 8, 8 - orig: 8, 8 - offset: 0, 0 - index: -1 -item-stone - rotate: false - xy: 630, 193 - size: 8, 8 - orig: 8, 8 - offset: 0, 0 - index: -1 -item-titanium - rotate: false - xy: 618, 183 - size: 8, 8 - orig: 8, 8 - offset: 0, 0 - index: -1 -item-uranium - rotate: false - xy: 628, 183 - size: 8, 8 - orig: 8, 8 - offset: 0, 0 - index: -1 -standard-mech +scout-base rotate: false xy: 255, 39 size: 12, 12 @@ -1825,6 +1755,13 @@ standard-mech offset: 0, 0 index: -1 standard-mech-base + rotate: false + xy: 255, 39 + size: 12, 12 + orig: 12, 12 + offset: 0, 0 + index: -1 +scout-leg rotate: false xy: 269, 39 size: 12, 12 @@ -1833,14 +1770,98 @@ standard-mech-base index: -1 standard-mech-leg rotate: false - xy: 283, 39 + xy: 269, 39 + size: 12, 12 + orig: 12, 12 + offset: 0, 0 + index: -1 +item-biomatter + rotate: false + xy: 558, 55 + size: 8, 8 + orig: 8, 8 + offset: 0, 0 + index: -1 +item-coal + rotate: false + xy: 610, 209 + size: 8, 8 + orig: 8, 8 + offset: 0, 0 + index: -1 +item-dirium + rotate: false + xy: 610, 199 + size: 8, 8 + orig: 8, 8 + offset: 0, 0 + index: -1 +item-glass + rotate: false + xy: 620, 213 + size: 8, 8 + orig: 8, 8 + offset: 0, 0 + index: -1 +item-iron + rotate: false + xy: 630, 213 + size: 8, 8 + orig: 8, 8 + offset: 0, 0 + index: -1 +item-quartz + rotate: false + xy: 620, 203 + size: 8, 8 + orig: 8, 8 + offset: 0, 0 + index: -1 +item-silicon + rotate: false + xy: 630, 203 + size: 8, 8 + orig: 8, 8 + offset: 0, 0 + index: -1 +item-steel + rotate: false + xy: 640, 208 + size: 8, 8 + orig: 8, 8 + offset: 0, 0 + index: -1 +item-stone + rotate: false + xy: 650, 208 + size: 8, 8 + orig: 8, 8 + offset: 0, 0 + index: -1 +item-titanium + rotate: false + xy: 660, 208 + size: 8, 8 + orig: 8, 8 + offset: 0, 0 + index: -1 +item-uranium + rotate: false + xy: 640, 198 + size: 8, 8 + orig: 8, 8 + offset: 0, 0 + index: -1 +standard-mech + rotate: false + xy: 297, 39 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 standard-ship rotate: false - xy: 297, 39 + xy: 311, 39 size: 12, 12 orig: 12, 12 offset: 0, 0 @@ -2044,28 +2065,28 @@ icon-arrow index: -1 icon-arrow-down rotate: false - xy: 367, 41 + xy: 381, 41 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-arrow-left rotate: false - xy: 379, 41 + xy: 393, 41 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-arrow-right rotate: false - xy: 391, 41 + xy: 405, 41 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-arrow-up rotate: false - xy: 403, 41 + xy: 417, 41 size: 10, 10 orig: 10, 10 offset: 0, 0 @@ -2093,7 +2114,7 @@ icon-cancel index: -1 icon-chat rotate: false - xy: 415, 41 + xy: 429, 41 size: 10, 10 orig: 10, 10 offset: 0, 0 @@ -2128,21 +2149,21 @@ icon-close-over index: -1 icon-crafting rotate: false - xy: 427, 41 + xy: 441, 41 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-cursor rotate: false - xy: 439, 41 + xy: 453, 41 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-defense rotate: false - xy: 451, 41 + xy: 465, 41 size: 10, 10 orig: 10, 10 offset: 0, 0 @@ -2156,7 +2177,7 @@ icon-discord index: -1 icon-distribution rotate: false - xy: 463, 41 + xy: 708, 308 size: 10, 10 orig: 10, 10 offset: 0, 0 @@ -2226,14 +2247,14 @@ icon-grid index: -1 icon-hold rotate: false - xy: 475, 41 + xy: 209, 28 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-holdDelete rotate: false - xy: 487, 43 + xy: 209, 16 size: 10, 10 orig: 10, 10 offset: 0, 0 @@ -2254,7 +2275,7 @@ icon-host index: -1 icon-info rotate: false - xy: 708, 308 + xy: 477, 41 size: 10, 10 orig: 10, 10 offset: 0, 0 @@ -2268,7 +2289,7 @@ icon-line index: -1 icon-liquid rotate: false - xy: 209, 28 + xy: 489, 43 size: 10, 10 orig: 10, 10 offset: 0, 0 @@ -2303,28 +2324,28 @@ icon-loading index: -1 icon-logic rotate: false - xy: 209, 16 + xy: 965, 439 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-menu rotate: false - xy: 965, 439 + xy: 977, 439 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-none rotate: false - xy: 977, 439 + xy: 989, 439 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-pause rotate: false - xy: 989, 439 + xy: 1001, 439 size: 10, 10 orig: 10, 10 offset: 0, 0 @@ -2352,7 +2373,7 @@ icon-pick index: -1 icon-play rotate: false - xy: 1001, 439 + xy: 1013, 435 size: 10, 10 orig: 10, 10 offset: 0, 0 @@ -2366,21 +2387,21 @@ icon-play-2 index: -1 icon-players rotate: false - xy: 1013, 435 + xy: 533, 75 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-power rotate: false - xy: 533, 75 + xy: 549, 85 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-production rotate: false - xy: 549, 85 + xy: 596, 163 size: 10, 10 orig: 10, 10 offset: 0, 0 @@ -2471,7 +2492,7 @@ icon-save-map index: -1 icon-settings rotate: false - xy: 596, 163 + xy: 608, 165 size: 10, 10 orig: 10, 10 offset: 0, 0 @@ -2492,14 +2513,14 @@ icon-tools index: -1 icon-touch rotate: false - xy: 608, 165 + xy: 597, 151 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-touchDelete rotate: false - xy: 597, 151 + xy: 609, 153 size: 10, 10 orig: 10, 10 offset: 0, 0 @@ -2534,14 +2555,14 @@ icon-undo index: -1 icon-units rotate: false - xy: 609, 153 + xy: 597, 139 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-weapon rotate: false - xy: 597, 139 + xy: 609, 141 size: 10, 10 orig: 10, 10 offset: 0, 0 @@ -2735,7 +2756,7 @@ beam index: -1 beam-equip rotate: false - xy: 305, 29 + xy: 281, 29 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -2749,63 +2770,63 @@ blaster index: -1 blaster-equip rotate: false - xy: 355, 29 + xy: 281, 19 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 clustergun rotate: false - xy: 545, 75 + xy: 301, 19 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 clustergun-equip rotate: false - xy: 791, 438 + xy: 351, 29 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 shockgun rotate: false - xy: 650, 178 + xy: 511, 19 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 shockgun-equip rotate: false - xy: 660, 178 + xy: 521, 19 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 triblaster rotate: false - xy: 703, 212 + xy: 670, 174 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 triblaster-equip rotate: false - xy: 700, 202 + xy: 680, 172 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 vulcan rotate: false - xy: 707, 262 + xy: 766, 321 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 vulcan-equip rotate: false - xy: 707, 252 + xy: 766, 311 size: 8, 8 orig: 8, 8 offset: 0, 0 diff --git a/core/assets/sprites/sprites.png b/core/assets/sprites/sprites.png index 726c0c94f7..a2eee340f7 100644 Binary files a/core/assets/sprites/sprites.png and b/core/assets/sprites/sprites.png differ diff --git a/core/assets/version.properties b/core/assets/version.properties index d8097b4855..3d2e02b831 100644 --- a/core/assets/version.properties +++ b/core/assets/version.properties @@ -1,7 +1,7 @@ #Autogenerated file. Do not modify. -#Fri Mar 16 00:30:24 EDT 2018 +#Fri Mar 16 21:46:55 EDT 2018 version=release -androidBuildCode=525 +androidBuildCode=528 name=Mindustry code=3.4 build=custom build diff --git a/core/src/io/anuke/mindustry/core/Logic.java b/core/src/io/anuke/mindustry/core/Logic.java index 8507d3c423..3d642f33f0 100644 --- a/core/src/io/anuke/mindustry/core/Logic.java +++ b/core/src/io/anuke/mindustry/core/Logic.java @@ -122,7 +122,7 @@ public class Logic extends Module { Entities.update(Entities.defaultGroup()); Entities.update(bulletGroup); for(EntityGroup group : unitGroups){ - if(!group.isEmpty()) Entities.update(group); + Entities.update(group); } Entities.update(tileGroup); Entities.update(shieldGroup); diff --git a/core/src/io/anuke/mindustry/entities/units/BaseUnit.java b/core/src/io/anuke/mindustry/entities/units/BaseUnit.java index f26454b94d..8c916fa5c3 100644 --- a/core/src/io/anuke/mindustry/entities/units/BaseUnit.java +++ b/core/src/io/anuke/mindustry/entities/units/BaseUnit.java @@ -86,8 +86,12 @@ public class BaseUnit extends Unit { @Override public void added(){ + maxhealth = type.health; + hitbox.setSize(type.hitsize); hitboxTile.setSize(type.hitsizeTile); + + heal(); } @Override @@ -117,6 +121,7 @@ public class BaseUnit extends Unit { data.putFloat(x); data.putFloat(y); data.putShort((short)(rotation *2)); + data.putShort((short)(baseRotation *2)); data.putShort((short)health); } @@ -124,10 +129,11 @@ public class BaseUnit extends Unit { public void read(ByteBuffer data, long time) { float x = data.getFloat(); float y = data.getFloat(); - short angle = data.getShort(); + short rotation = data.getShort(); + short baserotation = data.getShort(); short health = data.getShort(); + interpolator.read(this.x, this.y, x, y, rotation/2f, baserotation/2f, time); this.health = health; - interpolator.read(this.x, this.y, x, y, angle/2f, time); } } diff --git a/core/src/io/anuke/mindustry/entities/units/UnitType.java b/core/src/io/anuke/mindustry/entities/units/UnitType.java index 87bd5d2b51..ecd129c781 100644 --- a/core/src/io/anuke/mindustry/entities/units/UnitType.java +++ b/core/src/io/anuke/mindustry/entities/units/UnitType.java @@ -77,11 +77,12 @@ public abstract class UnitType { if(Net.server()){ NetEvents.handleUnitDeath(unit); } + + unit.remove(); } public void onRemoteDeath(BaseUnit unit){ onDeath(unit); - unit.remove(); } public void removed(BaseUnit unit){ diff --git a/core/src/io/anuke/mindustry/entities/units/UnitTypes.java b/core/src/io/anuke/mindustry/entities/units/UnitTypes.java index f181f401b4..44c51584bf 100644 --- a/core/src/io/anuke/mindustry/entities/units/UnitTypes.java +++ b/core/src/io/anuke/mindustry/entities/units/UnitTypes.java @@ -1,5 +1,9 @@ package io.anuke.mindustry.entities.units; +import io.anuke.mindustry.entities.units.types.Scout; + public class UnitTypes { - //TODO list types here. + public static final UnitType + + scout = new Scout(); } diff --git a/core/src/io/anuke/mindustry/entities/units/types/Scout.java b/core/src/io/anuke/mindustry/entities/units/types/Scout.java new file mode 100644 index 0000000000..c5a2714596 --- /dev/null +++ b/core/src/io/anuke/mindustry/entities/units/types/Scout.java @@ -0,0 +1,10 @@ +package io.anuke.mindustry.entities.units.types; + +import io.anuke.mindustry.entities.units.GroundUnitType; + +public class Scout extends GroundUnitType { + + public Scout(){ + super("scout"); + } +} diff --git a/core/src/io/anuke/mindustry/io/MapIO.java b/core/src/io/anuke/mindustry/io/MapIO.java new file mode 100644 index 0000000000..bf04926d2b --- /dev/null +++ b/core/src/io/anuke/mindustry/io/MapIO.java @@ -0,0 +1,6 @@ +package io.anuke.mindustry.io; + +/**Reads and writes map files.*/ +public class MapIO { + //TODO implementation +} diff --git a/core/src/io/anuke/mindustry/ui/fragments/DebugFragment.java b/core/src/io/anuke/mindustry/ui/fragments/DebugFragment.java index 7b2b719d39..e6387daf09 100644 --- a/core/src/io/anuke/mindustry/ui/fragments/DebugFragment.java +++ b/core/src/io/anuke/mindustry/ui/fragments/DebugFragment.java @@ -3,6 +3,8 @@ package io.anuke.mindustry.ui.fragments; import com.badlogic.gdx.Gdx; import com.badlogic.gdx.files.FileHandle; import io.anuke.mindustry.entities.Player; +import io.anuke.mindustry.entities.units.BaseUnit; +import io.anuke.mindustry.entities.units.UnitTypes; import io.anuke.mindustry.net.Net; import io.anuke.ucore.core.Timers; import io.anuke.ucore.scene.builders.button; @@ -46,17 +48,13 @@ public class DebugFragment implements Fragment { row(); new button("noclip", "toggle", () -> noclip = !noclip); row(); - new button("hideplayer", "toggle", () -> showPlayer = !showPlayer); - row(); new button("blocks", "toggle", () -> showBlockDebug = !showBlockDebug); row(); new button("paths", "toggle", () -> showPaths = !showPaths); row(); new button("wave", () -> state.wavetime = 0f); row(); - new button("time 0", () -> Timers.resetTime(0f)); - row(); - new button("time max", () -> Timers.resetTime(1080000 - 60*10)); + new button("spawn", () -> new BaseUnit(UnitTypes.scout).set(player.x, player.y).add()); row(); }}.end();