diff --git a/build.gradle b/build.gradle index 6fd627a388..dfcc9007b1 100644 --- a/build.gradle +++ b/build.gradle @@ -27,7 +27,7 @@ allprojects { appName = 'Mindustry' gdxVersion = '1.9.8' roboVMVersion = '2.3.0' - uCoreVersion = '74dc653bbd66d1e8b10e22efb4f1206195674dd5' + uCoreVersion = 'cf9553e76e6226650b86921a73208e360049ba44' getVersionString = { String buildVersion = getBuildVersion() diff --git a/core/assets-raw/sprites/blocks/turrets/turrets/meltdown-heat.png b/core/assets-raw/sprites/blocks/turrets/turrets/meltdown-heat.png new file mode 100644 index 0000000000..15fdf42e1f Binary files /dev/null and b/core/assets-raw/sprites/blocks/turrets/turrets/meltdown-heat.png differ diff --git a/core/assets-raw/sprites/blocks/turrets/turrets/meltdown.png b/core/assets-raw/sprites/blocks/turrets/turrets/meltdown.png index e67d0b7dbd..81a8c456e2 100644 Binary files a/core/assets-raw/sprites/blocks/turrets/turrets/meltdown.png and b/core/assets-raw/sprites/blocks/turrets/turrets/meltdown.png differ diff --git a/core/assets-raw/sprites/blocks/walls/composite-wall-large.png b/core/assets-raw/sprites/blocks/walls/dense-alloy-wall-large.png similarity index 100% rename from core/assets-raw/sprites/blocks/walls/composite-wall-large.png rename to core/assets-raw/sprites/blocks/walls/dense-alloy-wall-large.png diff --git a/core/assets-raw/sprites/blocks/walls/composite-wall.png b/core/assets-raw/sprites/blocks/walls/dense-alloy-wall.png similarity index 100% rename from core/assets-raw/sprites/blocks/walls/composite-wall.png rename to core/assets-raw/sprites/blocks/walls/dense-alloy-wall.png diff --git a/core/assets/bundles/bundle.properties b/core/assets/bundles/bundle.properties index 447bdb7cf3..66955c6d72 100644 --- a/core/assets/bundles/bundle.properties +++ b/core/assets/bundles/bundle.properties @@ -512,8 +512,8 @@ block.blackrock.name=blackrock block.icerock.name=icerock block.copper-wall.name=Copper Wall block.copper-wall-large.name=Large Copper Wall -block.composite-wall.name=Composite Wall -block.composite-wall-large.name=Large Composite Wall +block.dense-alloy-wall.name=Dense Alloy Wall +block.dense-alloy-wall-large.name=Large Dense Alloy Wall block.phase-wall.name=Phase Wall block.phase-wall-large.name=Large Phase Wall block.thorium-wall.name=Thorium Wall @@ -628,6 +628,8 @@ block.overdrive-projector.name=Overdrive Projector block.force-projector.name=Force Projector block.arc.name=Arc block.rtg-generator.name=RTG Generator +block.spectre.name=Spectre +block.meltdown.name=Meltdown unit.alpha-drone.name=Alpha Drone unit.drone.name=Drone diff --git a/core/assets/bundles/bundle_de.properties b/core/assets/bundles/bundle_de.properties index dca630643e..a9a09bff8b 100644 --- a/core/assets/bundles/bundle_de.properties +++ b/core/assets/bundles/bundle_de.properties @@ -610,3 +610,5 @@ content.unit.name=Units block.force-projector.name=Force Projector block.arc.name=Arc block.rtg-generator.name=RTG Generator +block.spectre.name=Spectre +block.meltdown.name=Meltdown diff --git a/core/assets/bundles/bundle_es.properties b/core/assets/bundles/bundle_es.properties index a3df62fc54..d120ac53b6 100644 --- a/core/assets/bundles/bundle_es.properties +++ b/core/assets/bundles/bundle_es.properties @@ -610,3 +610,5 @@ content.unit.name=Units block.force-projector.name=Force Projector block.arc.name=Arc block.rtg-generator.name=RTG Generator +block.spectre.name=Spectre +block.meltdown.name=Meltdown diff --git a/core/assets/bundles/bundle_fr.properties b/core/assets/bundles/bundle_fr.properties index becf9c6f55..5c372885f0 100644 --- a/core/assets/bundles/bundle_fr.properties +++ b/core/assets/bundles/bundle_fr.properties @@ -610,3 +610,5 @@ content.unit.name=Units block.force-projector.name=Force Projector block.arc.name=Arc block.rtg-generator.name=RTG Generator +block.spectre.name=Spectre +block.meltdown.name=Meltdown diff --git a/core/assets/bundles/bundle_in_ID.properties b/core/assets/bundles/bundle_in_ID.properties index 0d2c8b2191..c57c861c43 100644 --- a/core/assets/bundles/bundle_in_ID.properties +++ b/core/assets/bundles/bundle_in_ID.properties @@ -610,3 +610,5 @@ content.unit.name=Units block.force-projector.name=Force Projector block.arc.name=Arc block.rtg-generator.name=RTG Generator +block.spectre.name=Spectre +block.meltdown.name=Meltdown diff --git a/core/assets/bundles/bundle_ita.properties b/core/assets/bundles/bundle_ita.properties index b6257392bd..152318747e 100644 --- a/core/assets/bundles/bundle_ita.properties +++ b/core/assets/bundles/bundle_ita.properties @@ -610,3 +610,5 @@ content.unit.name=Units block.force-projector.name=Force Projector block.arc.name=Arc block.rtg-generator.name=RTG Generator +block.spectre.name=Spectre +block.meltdown.name=Meltdown diff --git a/core/assets/bundles/bundle_ko.properties b/core/assets/bundles/bundle_ko.properties index 37c3cbf3fb..207f5ebdcd 100644 --- a/core/assets/bundles/bundle_ko.properties +++ b/core/assets/bundles/bundle_ko.properties @@ -610,3 +610,5 @@ content.unit.name=Units block.force-projector.name=Force Projector block.arc.name=Arc block.rtg-generator.name=RTG Generator +block.spectre.name=Spectre +block.meltdown.name=Meltdown diff --git a/core/assets/bundles/bundle_pl.properties b/core/assets/bundles/bundle_pl.properties index 1c2a111bd7..8e325dd992 100644 --- a/core/assets/bundles/bundle_pl.properties +++ b/core/assets/bundles/bundle_pl.properties @@ -610,3 +610,5 @@ content.unit.name=Units block.force-projector.name=Force Projector block.arc.name=Arc block.rtg-generator.name=RTG Generator +block.spectre.name=Spectre +block.meltdown.name=Meltdown diff --git a/core/assets/bundles/bundle_pt_BR.properties b/core/assets/bundles/bundle_pt_BR.properties index 293467a764..211c39583f 100644 --- a/core/assets/bundles/bundle_pt_BR.properties +++ b/core/assets/bundles/bundle_pt_BR.properties @@ -610,3 +610,5 @@ content.unit.name=Units block.force-projector.name=Force Projector block.arc.name=Arc block.rtg-generator.name=RTG Generator +block.spectre.name=Spectre +block.meltdown.name=Meltdown diff --git a/core/assets/bundles/bundle_ru.properties b/core/assets/bundles/bundle_ru.properties index 74bf83ea14..2bdfb15b71 100644 --- a/core/assets/bundles/bundle_ru.properties +++ b/core/assets/bundles/bundle_ru.properties @@ -640,3 +640,5 @@ content.unit.name=Units block.force-projector.name=Force Projector block.arc.name=Arc block.rtg-generator.name=RTG Generator +block.spectre.name=Spectre +block.meltdown.name=Meltdown diff --git a/core/assets/bundles/bundle_tk.properties b/core/assets/bundles/bundle_tk.properties index a00af8b6f0..158c2debdb 100644 --- a/core/assets/bundles/bundle_tk.properties +++ b/core/assets/bundles/bundle_tk.properties @@ -610,3 +610,5 @@ content.unit.name=Units block.force-projector.name=Force Projector block.arc.name=Arc block.rtg-generator.name=RTG Generator +block.spectre.name=Spectre +block.meltdown.name=Meltdown diff --git a/core/assets/bundles/bundle_tr.properties b/core/assets/bundles/bundle_tr.properties index 1b4f2887a4..c493ffd431 100644 --- a/core/assets/bundles/bundle_tr.properties +++ b/core/assets/bundles/bundle_tr.properties @@ -610,3 +610,5 @@ content.unit.name=Units block.force-projector.name=Force Projector block.arc.name=Arc block.rtg-generator.name=RTG Generator +block.spectre.name=Spectre +block.meltdown.name=Meltdown diff --git a/core/assets/bundles/bundle_uk_UA.properties b/core/assets/bundles/bundle_uk_UA.properties index cca94cc81b..d9f71cfa91 100644 --- a/core/assets/bundles/bundle_uk_UA.properties +++ b/core/assets/bundles/bundle_uk_UA.properties @@ -640,3 +640,5 @@ unit.interceptor.name=Винищувач-перехполювач unit.interceptor.description=Швидка, ударна бойова одиниця, котра використовує набіг з відскоком mode.custom.warning=Note that blocks cannot be used in custom games until they are unlocked in sectors.\n\n[LIGHT_GRAY]If you have not unlocked any blocks, none will appear. content.unit.name=Units +block.spectre.name=Spectre +block.meltdown.name=Meltdown diff --git a/core/assets/bundles/bundle_zh_CN.properties b/core/assets/bundles/bundle_zh_CN.properties index 6de2f10c86..7508f54e8f 100644 --- a/core/assets/bundles/bundle_zh_CN.properties +++ b/core/assets/bundles/bundle_zh_CN.properties @@ -610,3 +610,5 @@ content.unit.name=Units block.force-projector.name=Force Projector block.arc.name=Arc block.rtg-generator.name=RTG Generator +block.spectre.name=Spectre +block.meltdown.name=Meltdown diff --git a/core/assets/bundles/bundle_zh_TW.properties b/core/assets/bundles/bundle_zh_TW.properties index b4cd3c7779..cadd7c497b 100644 --- a/core/assets/bundles/bundle_zh_TW.properties +++ b/core/assets/bundles/bundle_zh_TW.properties @@ -610,3 +610,5 @@ content.unit.name=Units block.force-projector.name=Force Projector block.arc.name=Arc block.rtg-generator.name=RTG Generator +block.spectre.name=Spectre +block.meltdown.name=Meltdown diff --git a/core/assets/sprites/sprites.atlas b/core/assets/sprites/sprites.atlas index 1c180ea23a..044a3d9fc3 100644 --- a/core/assets/sprites/sprites.atlas +++ b/core/assets/sprites/sprites.atlas @@ -13,336 +13,336 @@ force-projector-top index: -1 mend-projector-top rotate: false - xy: 511, 305 + xy: 123, 40 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 overdrive-projector-top rotate: false - xy: 529, 305 + xy: 89, 7 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 bridge-conveyor-arrow rotate: false - xy: 699, 411 + xy: 395, 232 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 bridge-conveyor-bridge rotate: false - xy: 689, 401 + xy: 385, 224 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 bridge-conveyor-end rotate: false - xy: 679, 391 + xy: 375, 222 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 conveyor-0-1 rotate: false - xy: 689, 381 + xy: 192, 138 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 conveyor-0-2 rotate: false - xy: 679, 371 + xy: 192, 128 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 conveyor-0-3 rotate: false - xy: 669, 361 + xy: 192, 118 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 conveyor-1-0 rotate: false - xy: 659, 351 + xy: 192, 108 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 conveyor-1-1 rotate: false - xy: 649, 341 + xy: 192, 98 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 conveyor-1-2 rotate: false - xy: 639, 331 + xy: 193, 88 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 conveyor-1-3 rotate: false - xy: 629, 321 + xy: 193, 78 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 conveyor-2-0 rotate: false - xy: 619, 301 + xy: 193, 68 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 conveyor-2-1 rotate: false - xy: 749, 431 + xy: 193, 58 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 conveyor-2-2 rotate: false - xy: 739, 421 + xy: 193, 48 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 conveyor-2-3 rotate: false - xy: 729, 411 + xy: 193, 38 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 conveyor-3-0 rotate: false - xy: 719, 401 + xy: 193, 28 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 conveyor-3-1 rotate: false - xy: 709, 391 + xy: 201, 2 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 conveyor-3-2 rotate: false - xy: 699, 381 + xy: 637, 397 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 conveyor-3-3 rotate: false - xy: 689, 371 + xy: 647, 397 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 conveyor-4-0 rotate: false - xy: 679, 361 + xy: 657, 397 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 conveyor-4-1 rotate: false - xy: 669, 351 + xy: 667, 397 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 conveyor-4-2 rotate: false - xy: 659, 341 + xy: 677, 397 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 conveyor-4-3 rotate: false - xy: 649, 331 + xy: 687, 397 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 titanium-conveyor-0-1 rotate: false - xy: 819, 351 + xy: 947, 387 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 titanium-conveyor-0-2 rotate: false - xy: 809, 341 + xy: 957, 387 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 titanium-conveyor-0-3 rotate: false - xy: 799, 331 + xy: 967, 387 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 titanium-conveyor-1-0 rotate: false - xy: 789, 321 + xy: 977, 387 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 titanium-conveyor-1-1 rotate: false - xy: 779, 311 + xy: 987, 387 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 titanium-conveyor-1-2 rotate: false - xy: 769, 301 + xy: 997, 387 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 titanium-conveyor-1-3 rotate: false - xy: 759, 291 + xy: 1007, 384 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 titanium-conveyor-2-0 rotate: false - xy: 919, 433 + xy: 577, 385 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 titanium-conveyor-2-1 rotate: false - xy: 909, 423 + xy: 587, 385 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 titanium-conveyor-2-2 rotate: false - xy: 899, 413 + xy: 597, 385 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 titanium-conveyor-2-3 rotate: false - xy: 889, 403 + xy: 607, 385 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 titanium-conveyor-3-0 rotate: false - xy: 879, 393 + xy: 617, 385 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 titanium-conveyor-3-1 rotate: false - xy: 869, 383 + xy: 627, 385 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 titanium-conveyor-3-2 rotate: false - xy: 859, 373 + xy: 575, 375 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 titanium-conveyor-3-3 rotate: false - xy: 839, 361 + xy: 585, 375 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 titanium-conveyor-4-0 rotate: false - xy: 849, 363 + xy: 595, 375 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 titanium-conveyor-4-1 rotate: false - xy: 829, 351 + xy: 605, 375 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 titanium-conveyor-4-2 rotate: false - xy: 819, 341 + xy: 615, 375 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 titanium-conveyor-4-3 rotate: false - xy: 809, 331 + xy: 625, 375 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 mass-driver-turret rotate: false - xy: 338, 326 + xy: 292, 320 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 phase-conveyor-arrow rotate: false - xy: 849, 403 + xy: 548, 293 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 phase-conveyor-bridge rotate: false - xy: 829, 391 + xy: 558, 303 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 phase-conveyor-end rotate: false - xy: 819, 381 + xy: 538, 273 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 warp-gate-top rotate: false - xy: 264, 268 + xy: 421, 370 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -377,63 +377,63 @@ blast-drill-top index: -1 laser-drill rotate: false - xy: 457, 327 + xy: 87, 41 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 laser-drill-rotator rotate: false - xy: 475, 327 + xy: 105, 76 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 laser-drill-top rotate: false - xy: 421, 322 + xy: 105, 58 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 mechanical-drill rotate: false - xy: 420, 304 + xy: 123, 76 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 mechanical-drill-rotator rotate: false - xy: 420, 286 + xy: 123, 58 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 mechanical-drill-top rotate: false - xy: 493, 315 + xy: 105, 40 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 oil-extractor rotate: false - xy: 316, 290 + xy: 338, 326 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 oil-extractor-liquid rotate: false - xy: 342, 300 + xy: 364, 326 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 oil-extractor-rotator rotate: false - xy: 368, 300 + xy: 310, 290 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -447,693 +447,693 @@ oil-extractor-top index: -1 plasma-drill rotate: false - xy: 754, 479 + xy: 788, 479 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 plasma-drill-rim rotate: false - xy: 788, 479 + xy: 822, 479 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 plasma-drill-rotator rotate: false - xy: 822, 479 + xy: 856, 479 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 plasma-drill-top rotate: false - xy: 856, 479 + xy: 890, 479 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 pneumatic-drill rotate: false - xy: 430, 268 + xy: 139, 174 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 pneumatic-drill-rotator rotate: false - xy: 439, 309 + xy: 157, 212 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 pneumatic-drill-top rotate: false - xy: 457, 309 + xy: 157, 194 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 water-extractor rotate: false - xy: 601, 289 + xy: 283, 204 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 water-extractor-liquid rotate: false - xy: 484, 273 + xy: 247, 191 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 water-extractor-rotator rotate: false - xy: 448, 255 + xy: 265, 192 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 water-extractor-top rotate: false - xy: 466, 255 + xy: 283, 186 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 blackrock1 rotate: false - xy: 438, 230 + xy: 597, 405 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-icon-blackrock rotate: false - xy: 438, 230 + xy: 597, 405 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blackrockshadow1 rotate: false - xy: 133, 36 + xy: 607, 405 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blackstone1 rotate: false - xy: 849, 443 + xy: 617, 405 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-icon-blackstone rotate: false - xy: 849, 443 + xy: 617, 405 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blackstone2 rotate: false - xy: 859, 443 + xy: 627, 405 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blackstone3 rotate: false - xy: 869, 443 + xy: 637, 407 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blackstoneedge rotate: false - xy: 328, 262 + xy: 367, 252 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 coal1 rotate: false - xy: 669, 381 + xy: 395, 222 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 coal2 rotate: false - xy: 659, 371 + xy: 405, 226 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 coal3 rotate: false - xy: 649, 361 + xy: 415, 226 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 copper1 rotate: false - xy: 639, 321 + xy: 697, 397 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 copper2 rotate: false - xy: 629, 311 + xy: 707, 397 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 copper3 rotate: false - xy: 619, 291 + xy: 717, 397 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 dirt2 rotate: false - xy: 699, 371 + xy: 787, 397 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 dirt3 rotate: false - xy: 689, 361 + xy: 797, 397 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 dirtedge rotate: false - xy: 193, 263 + xy: 165, 2 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 generic-cliff-edge rotate: false - xy: 759, 421 + xy: 877, 397 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ice-cliff-edge rotate: false - xy: 759, 421 + xy: 877, 397 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 generic-cliff-edge-1 rotate: false - xy: 749, 411 + xy: 887, 397 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ice-cliff-edge-1 rotate: false - xy: 749, 411 + xy: 887, 397 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 generic-cliff-edge-2 rotate: false - xy: 739, 401 + xy: 897, 397 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ice-cliff-edge-2 rotate: false - xy: 739, 401 + xy: 897, 397 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 generic-cliff-side rotate: false - xy: 729, 391 + xy: 907, 397 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ice-cliff-side rotate: false - xy: 729, 391 + xy: 907, 397 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 grass-cliff-edge rotate: false - xy: 699, 361 + xy: 937, 397 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 grass-cliff-edge-1 rotate: false - xy: 689, 351 + xy: 947, 397 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 grass-cliff-edge-2 rotate: false - xy: 679, 341 + xy: 957, 397 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 grass-cliff-side rotate: false - xy: 669, 331 + xy: 967, 397 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 grass2 rotate: false - xy: 719, 381 + xy: 917, 397 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 grass3 rotate: false - xy: 709, 371 + xy: 927, 397 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 grassedge rotate: false - xy: 205, 235 + xy: 450, 303 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 ice2 rotate: false - xy: 649, 311 + xy: 987, 397 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ice3 rotate: false - xy: 639, 301 + xy: 997, 397 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 iceedge rotate: false - xy: 193, 207 + xy: 450, 275 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 icerock2 rotate: false - xy: 629, 291 + xy: 311, 166 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 icerockshadow1 rotate: false - xy: 779, 431 + xy: 311, 156 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 rockshadow1 rotate: false - xy: 779, 431 + xy: 311, 156 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 icerockshadow2 rotate: false - xy: 769, 421 + xy: 321, 166 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 rockshadow2 rotate: false - xy: 769, 421 + xy: 321, 166 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 lavaedge rotate: false - xy: 207, 207 + xy: 464, 303 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 lead1 rotate: false - xy: 699, 341 + xy: 445, 191 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 lead2 rotate: false - xy: 689, 331 + xy: 455, 191 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 lead3 rotate: false - xy: 679, 321 + xy: 465, 191 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 metalfloor2 rotate: false - xy: 749, 381 + xy: 547, 403 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 metalfloor3 rotate: false - xy: 739, 371 + xy: 557, 403 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 metalfloor4 rotate: false - xy: 729, 361 + xy: 567, 403 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 metalfloor5 rotate: false - xy: 719, 351 + xy: 497, 393 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 metalfloor6 rotate: false - xy: 709, 341 + xy: 507, 393 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 metalflooredge rotate: false - xy: 219, 243 + xy: 411, 264 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 oiledge rotate: false - xy: 221, 229 + xy: 397, 256 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 rock2 rotate: false - xy: 859, 403 + xy: 528, 263 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 sand2 rotate: false - xy: 849, 393 + xy: 548, 263 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 sand3 rotate: false - xy: 829, 381 + xy: 558, 263 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 sandedge rotate: false - xy: 221, 215 + xy: 383, 254 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 shrubshadow rotate: false - xy: 889, 423 + xy: 707, 387 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 snow2 rotate: false - xy: 879, 413 + xy: 717, 387 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 snow3 rotate: false - xy: 869, 403 + xy: 727, 387 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 snowedge rotate: false - xy: 221, 187 + xy: 397, 242 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 spaceedge rotate: false - xy: 221, 173 + xy: 411, 236 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 stone-cliff-edge rotate: false - xy: 749, 291 + xy: 847, 387 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 stone-cliff-edge-1 rotate: false - xy: 909, 433 + xy: 857, 387 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 stone-cliff-edge-2 rotate: false - xy: 899, 423 + xy: 867, 387 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 stone-cliff-side rotate: false - xy: 889, 413 + xy: 877, 387 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 stone2 rotate: false - xy: 769, 311 + xy: 827, 387 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 stone3 rotate: false - xy: 759, 301 + xy: 837, 387 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 stoneedge rotate: false - xy: 233, 243 + xy: 425, 254 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 thorium1 rotate: false - xy: 879, 403 + xy: 887, 387 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 thorium2 rotate: false - xy: 869, 393 + xy: 897, 387 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 thorium3 rotate: false - xy: 859, 383 + xy: 907, 387 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 titanium1 rotate: false - xy: 839, 371 + xy: 917, 387 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 titanium2 rotate: false - xy: 849, 373 + xy: 927, 387 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 titanium3 rotate: false - xy: 829, 361 + xy: 937, 387 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 water-cliff-edge rotate: false - xy: 789, 311 + xy: 579, 355 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 water-cliff-edge-1 rotate: false - xy: 779, 301 + xy: 589, 365 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 water-cliff-edge-2 rotate: false - xy: 769, 291 + xy: 579, 345 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 water-cliff-side rotate: false - xy: 929, 433 + xy: 589, 355 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 wateredge rotate: false - xy: 235, 201 + xy: 425, 226 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 block-border rotate: false - xy: 939, 443 + xy: 707, 407 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-elevation rotate: false - xy: 949, 443 + xy: 717, 407 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 combustion-generator-top rotate: false - xy: 949, 443 + xy: 717, 407 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-middle rotate: false - xy: 649, 371 + xy: 365, 240 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 pump-liquid rotate: false - xy: 649, 371 + xy: 365, 240 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-slope rotate: false - xy: 639, 361 + xy: 375, 242 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 border rotate: false - xy: 629, 351 + xy: 385, 244 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 conduit-liquid rotate: false - xy: 639, 341 + xy: 465, 201 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 cross-1 rotate: false - xy: 759, 431 + xy: 727, 397 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 cross-2 rotate: false - xy: 601, 433 + xy: 595, 415 size: 16, 16 orig: 16, 16 offset: 0, 0 @@ -1154,7 +1154,7 @@ cross-4 index: -1 enemyspawn rotate: false - xy: 769, 431 + xy: 867, 397 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -1168,77 +1168,77 @@ nuclearreactor-shadow index: -1 place-arrow rotate: false - xy: 809, 371 + xy: 548, 283 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 playerspawn rotate: false - xy: 799, 361 + xy: 558, 293 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ripples rotate: false - xy: 801, 441 + xy: 169, 24 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 rubble-1-0 rotate: false - xy: 438, 291 + xy: 157, 176 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 rubble-1-1 rotate: false - xy: 456, 291 + xy: 175, 194 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 rubble-2-0 rotate: false - xy: 474, 291 + xy: 175, 176 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 rubble-2-1 rotate: false - xy: 493, 297 + xy: 193, 196 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 rubble-3-0 rotate: false - xy: 368, 274 + xy: 390, 310 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 rubble-3-1 rotate: false - xy: 368, 274 + xy: 390, 310 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 shadow-1 rotate: false - xy: 813, 441 + xy: 181, 24 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 shadow-2 rotate: false - xy: 90, 127 + xy: 421, 350 size: 18, 18 orig: 18, 18 offset: 0, 0 @@ -1273,21 +1273,21 @@ shadow-6 index: -1 shadow-corner rotate: false - xy: 825, 441 + xy: 179, 12 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 shadow-round-1 rotate: false - xy: 837, 441 + xy: 191, 12 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 shadow-round-2 rotate: false - xy: 90, 107 + xy: 447, 433 size: 18, 18 orig: 18, 18 offset: 0, 0 @@ -1301,266 +1301,266 @@ shadow-round-3 index: -1 shadow-rounded-2 rotate: false - xy: 110, 146 + xy: 447, 413 size: 18, 18 orig: 18, 18 offset: 0, 0 index: -1 shadow-shock-mine rotate: false - xy: 739, 291 + xy: 687, 387 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 bridge-conduit-arrow rotate: false - xy: 619, 331 + xy: 365, 230 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 bridge-conduit-bridge rotate: false - xy: 719, 431 + xy: 375, 232 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 bridge-conduit-end rotate: false - xy: 709, 421 + xy: 385, 234 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 conduit-bottom rotate: false - xy: 719, 421 + xy: 395, 212 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 conduit-bottom-0 rotate: false - xy: 709, 411 + xy: 405, 206 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 conduit-bottom-1 rotate: false - xy: 699, 401 + xy: 415, 206 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 conduit-bottom-2 rotate: false - xy: 689, 391 + xy: 425, 206 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 conduit-bottom-3 rotate: false - xy: 679, 381 + xy: 435, 209 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 conduit-bottom-4 rotate: false - xy: 669, 371 + xy: 435, 199 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 conduit-bottom-5 rotate: false - xy: 659, 361 + xy: 445, 201 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 conduit-bottom-6 rotate: false - xy: 649, 351 + xy: 455, 201 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 conduit-top-0 rotate: false - xy: 629, 331 + xy: 475, 201 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 conduit-top-1 rotate: false - xy: 619, 311 + xy: 487, 225 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 conduit-top-2 rotate: false - xy: 739, 431 + xy: 487, 215 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 conduit-top-3 rotate: false - xy: 729, 421 + xy: 487, 205 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 conduit-top-4 rotate: false - xy: 719, 411 + xy: 193, 168 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 conduit-top-5 rotate: false - xy: 709, 401 + xy: 192, 158 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 conduit-top-6 rotate: false - xy: 699, 391 + xy: 192, 148 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 liquid-router-bottom rotate: false - xy: 779, 411 + xy: 517, 403 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 liquid-router-liquid rotate: false - xy: 769, 401 + xy: 527, 403 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 liquid-router-top rotate: false - xy: 759, 391 + xy: 537, 403 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 liquid-tank-bottom rotate: false - xy: 292, 320 + xy: 266, 346 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 liquid-tank-liquid rotate: false - xy: 264, 294 + xy: 292, 346 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 liquid-tank-top rotate: false - xy: 290, 294 + xy: 266, 320 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 phase-conduit-arrow rotate: false - xy: 869, 423 + xy: 548, 303 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 phase-conduit-bridge rotate: false - xy: 859, 413 + xy: 528, 273 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 phase-conduit-end rotate: false - xy: 839, 401 + xy: 538, 283 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 pulse-conduit-top-0 rotate: false - xy: 789, 351 + xy: 568, 303 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 pulse-conduit-top-1 rotate: false - xy: 779, 341 + xy: 548, 273 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 pulse-conduit-top-2 rotate: false - xy: 769, 331 + xy: 558, 283 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 pulse-conduit-top-3 rotate: false - xy: 759, 321 + xy: 568, 293 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 pulse-conduit-top-4 rotate: false - xy: 749, 311 + xy: 558, 273 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 pulse-conduit-top-5 rotate: false - xy: 739, 301 + xy: 568, 283 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 pulse-conduit-top-6 rotate: false - xy: 729, 291 + xy: 568, 273 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 battery rotate: false - xy: 123, 36 + xy: 587, 405 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-icon-battery rotate: false - xy: 123, 36 + xy: 587, 405 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -1637,28 +1637,28 @@ fusion-reactor-top index: -1 rtg-generator-top rotate: false - xy: 839, 391 + xy: 538, 263 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 thorium-reactor-center rotate: false - xy: 394, 284 + xy: 390, 284 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 thorium-reactor-lights rotate: false - xy: 196, 277 + xy: 421, 422 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 turbine-generator-top rotate: false - xy: 565, 289 + xy: 247, 209 size: 16, 16 orig: 16, 16 offset: 0, 0 @@ -1672,217 +1672,217 @@ alloy-fuser index: -1 alloy-smelter rotate: false - xy: 110, 108 + xy: 487, 435 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 block-icon-alloy-smelter rotate: false - xy: 110, 108 + xy: 487, 435 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 alloy-smelter-top rotate: false - xy: 87, 89 + xy: 447, 395 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 arc-smelter rotate: false - xy: 87, 71 + xy: 467, 415 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 block-icon-arc-smelter rotate: false - xy: 87, 71 + xy: 467, 415 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 arc-smelter-top rotate: false - xy: 87, 53 + xy: 447, 377 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 silicon-smelter-top rotate: false - xy: 87, 53 + xy: 447, 377 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 biomattercompressor rotate: false - xy: 87, 35 + xy: 265, 282 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 biomattercompressor-frame0 rotate: false - xy: 85, 17 + xy: 265, 264 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 biomattercompressor-frame1 rotate: false - xy: 103, 17 + xy: 265, 246 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 biomattercompressor-frame2 rotate: false - xy: 394, 266 + xy: 283, 276 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 biomattercompressor-liquid rotate: false - xy: 310, 272 + xy: 283, 258 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 biomattercompressor-top rotate: false - xy: 130, 148 + xy: 310, 272 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 blast-mixer rotate: false - xy: 130, 130 + xy: 421, 332 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 block-icon-blast-mixer rotate: false - xy: 130, 130 + xy: 421, 332 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 centrifuge-liquid rotate: false - xy: 565, 397 + xy: 577, 415 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 cryofluidmixer-bottom rotate: false - xy: 529, 359 + xy: 613, 433 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 cryofluidmixer-liquid rotate: false - xy: 547, 377 + xy: 613, 415 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 cryofluidmixer-top rotate: false - xy: 565, 379 + xy: 631, 435 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 cultivator rotate: false - xy: 583, 397 + xy: 649, 435 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 cultivator-middle rotate: false - xy: 601, 415 + xy: 631, 417 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 cultivator-top rotate: false - xy: 547, 359 + xy: 667, 435 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 lavasmelter rotate: false - xy: 709, 351 + xy: 349, 186 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 oilrefinery rotate: false - xy: 779, 401 + xy: 597, 395 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 phase-weaver rotate: false - xy: 547, 305 + xy: 120, 22 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 phase-weaver-bottom rotate: false - xy: 565, 307 + xy: 119, 4 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 phase-weaver-weave rotate: false - xy: 583, 307 + xy: 139, 210 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 plastanium-compressor-top rotate: false - xy: 601, 307 + xy: 139, 192 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 pulverizer rotate: false - xy: 889, 433 + xy: 498, 263 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 pulverizer-rotator rotate: false - xy: 879, 423 + xy: 508, 263 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 separator-liquid rotate: false - xy: 749, 301 + xy: 677, 387 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -1903,35 +1903,35 @@ core-top index: -1 sortedunloader rotate: false - xy: 819, 361 + xy: 777, 387 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-1 rotate: false - xy: 919, 443 + xy: 687, 407 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-1-top rotate: false - xy: 929, 443 + xy: 697, 407 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-2 rotate: false - xy: 421, 430 + xy: 505, 431 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 block-2-top rotate: false - xy: 421, 412 + xy: 523, 431 size: 16, 16 orig: 16, 16 offset: 0, 0 @@ -1973,7 +1973,7 @@ arc index: -1 arc-heat rotate: false - xy: 438, 240 + xy: 577, 405 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -1987,21 +1987,21 @@ cyclone index: -1 duo rotate: false - xy: 629, 301 + xy: 857, 397 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 fuse rotate: false - xy: 266, 320 + xy: 239, 245 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 hail rotate: false - xy: 659, 321 + xy: 977, 397 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -2015,14 +2015,14 @@ hail-heat index: -1 lancer rotate: false - xy: 121, 17 + xy: 87, 77 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 lancer-heat rotate: false - xy: 439, 327 + xy: 87, 59 size: 16, 16 orig: 16, 16 offset: 0, 0 @@ -2034,135 +2034,142 @@ meltdown orig: 32, 32 offset: 0, 0 index: -1 +meltdown-heat + rotate: false + xy: 754, 479 + size: 32, 32 + orig: 32, 32 + offset: 0, 0 + index: -1 ripple rotate: false - xy: 394, 310 + xy: 338, 300 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 ripple-heat rotate: false - xy: 342, 274 + xy: 364, 300 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 salvo rotate: false - xy: 448, 273 + xy: 193, 178 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 salvo-heat rotate: false - xy: 466, 273 + xy: 211, 203 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 salvo-panel-left rotate: false - xy: 511, 287 + xy: 211, 185 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 salvo-panel-right rotate: false - xy: 529, 287 + xy: 229, 209 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 scatter rotate: false - xy: 779, 331 + xy: 647, 387 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 scorch rotate: false - xy: 769, 321 + xy: 657, 387 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 scorch-shoot rotate: false - xy: 759, 311 + xy: 667, 387 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 spectre rotate: false - xy: 890, 479 + xy: 924, 479 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 swarmer rotate: false - xy: 547, 287 + xy: 229, 191 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 wave rotate: false - xy: 484, 255 + xy: 301, 195 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 wave-liquid rotate: false - xy: 430, 250 + xy: 301, 177 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 dagger-pad-top rotate: false - xy: 565, 361 + xy: 649, 417 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 dagger-pad-top-open rotate: false - xy: 583, 379 + xy: 685, 435 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 drone-pad-top rotate: false - xy: 601, 379 + xy: 685, 417 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 drone-pad-top-open rotate: false - xy: 601, 361 + xy: 721, 435 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 fabricator-pad-top rotate: false - xy: 412, 266 + xy: 703, 417 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 fabricator-pad-top-open rotate: false - xy: 511, 341 + xy: 739, 435 size: 16, 16 orig: 16, 16 offset: 0, 0 @@ -2176,252 +2183,252 @@ fortress-pad index: -1 fortress-pad-top rotate: false - xy: 266, 346 + xy: 213, 257 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 monsoon-pad-top rotate: false - xy: 266, 346 + xy: 213, 257 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 titan-pad-top rotate: false - xy: 266, 346 + xy: 213, 257 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 fortress-pad-top-open rotate: false - xy: 292, 346 + xy: 239, 271 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 monsoon-pad-top-open rotate: false - xy: 292, 346 + xy: 239, 271 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 titan-pad-top-open rotate: false - xy: 292, 346 + xy: 239, 271 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 interceptor-pad-top rotate: false - xy: 105, 53 + xy: 108, 94 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 interceptor-pad-top-open rotate: false - xy: 105, 35 + xy: 126, 94 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 monsoon-pad rotate: false - xy: 364, 326 + xy: 284, 294 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 reconstructor-open rotate: false - xy: 475, 309 + xy: 175, 212 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 repair-point-turret rotate: false - xy: 869, 413 + xy: 518, 263 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 titan-pad rotate: false - xy: 238, 272 + xy: 421, 396 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 deflector-wall rotate: false - xy: 709, 381 + xy: 777, 397 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 deflector-wall-large rotate: false - xy: 601, 397 + xy: 667, 417 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 door-large-open rotate: false - xy: 583, 361 + xy: 703, 435 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 door-open rotate: false - xy: 639, 311 + xy: 847, 397 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 beam rotate: false - xy: 390, 338 + xy: 138, 26 size: 1, 12 orig: 1, 12 offset: 0, 0 index: -1 beam-end rotate: false - xy: 84, 181 + xy: 213, 283 size: 18, 18 orig: 18, 18 offset: 0, 0 index: -1 blank rotate: false - xy: 279, 425 + xy: 87, 95 size: 1, 1 orig: 1, 1 offset: 0, 0 index: -1 bullet rotate: false - xy: 123, 61 + xy: 105, 25 size: 13, 13 orig: 13, 13 offset: 0, 0 index: -1 bullet-back rotate: false - xy: 123, 46 + xy: 335, 219 size: 13, 13 orig: 13, 13 offset: 0, 0 index: -1 casing rotate: false - xy: 338, 320 + xy: 137, 16 size: 2, 4 orig: 2, 4 offset: 0, 0 index: -1 clear rotate: false - xy: 27, 110 + xy: 279, 425 size: 1, 1 orig: 1, 1 offset: 0, 0 index: -1 command-attack rotate: false - xy: 639, 351 + xy: 405, 216 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 command-idle rotate: false - xy: 629, 341 + xy: 415, 216 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 command-patrol rotate: false - xy: 619, 321 + xy: 425, 216 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 command-retreat rotate: false - xy: 729, 431 + xy: 385, 214 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 enemyarrow rotate: false - xy: 919, 424 + xy: 1007, 394 size: 8, 7 orig: 8, 7 offset: 0, 0 index: -1 error rotate: false - xy: 191, 249 + xy: 455, 345 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 laser rotate: false - xy: 187, 269 + xy: 233, 289 size: 1, 12 orig: 1, 12 offset: 0, 0 index: -1 laser-end rotate: false - xy: 318, 336 + xy: 84, 181 size: 18, 18 orig: 18, 18 offset: 0, 0 index: -1 laserfull rotate: false - xy: 318, 316 + xy: 264, 300 size: 18, 18 orig: 18, 18 offset: 0, 0 index: -1 minelaser rotate: false - xy: 422, 252 + xy: 236, 283 size: 1, 12 orig: 1, 12 offset: 0, 0 index: -1 minelaser-end rotate: false - xy: 290, 274 + xy: 318, 336 size: 18, 18 orig: 18, 18 offset: 0, 0 index: -1 missile rotate: false - xy: 1014, 502 + xy: 266, 372 size: 9, 9 orig: 9, 9 offset: 0, 0 index: -1 missile-back rotate: false - xy: 1014, 491 + xy: 439, 257 size: 9, 9 orig: 9, 9 offset: 0, 0 @@ -2456,91 +2463,91 @@ scorch4 index: -1 scorch5 rotate: false - xy: 187, 283 + xy: 301, 267 size: 7, 25 orig: 7, 25 offset: 0, 0 index: -1 shell rotate: false - xy: 1014, 480 + xy: 179, 1 size: 9, 9 orig: 9, 9 offset: 0, 0 index: -1 shell-back rotate: false - xy: 266, 372 + xy: 190, 1 size: 9, 9 orig: 9, 9 offset: 0, 0 index: -1 shot rotate: false - xy: 899, 433 + xy: 697, 387 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 transfer rotate: false - xy: 190, 269 + xy: 390, 338 size: 1, 12 orig: 1, 12 offset: 0, 0 index: -1 transfer-arrow rotate: false - xy: 799, 321 + xy: 579, 365 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 transfer-end rotate: false - xy: 110, 126 + xy: 467, 433 size: 18, 18 orig: 18, 18 offset: 0, 0 index: -1 blackstone-cliff-edge rotate: false - xy: 879, 443 + xy: 647, 407 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blackstone-cliff-edge-1 rotate: false - xy: 889, 443 + xy: 657, 407 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blackstone-cliff-edge-2 rotate: false - xy: 899, 443 + xy: 667, 407 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blackstone-cliff-side rotate: false - xy: 909, 443 + xy: 677, 407 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-icon-arc rotate: false - xy: 959, 443 + xy: 727, 407 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-icon-biomattercompressor rotate: false - xy: 421, 394 + xy: 541, 431 size: 16, 16 orig: 16, 16 offset: 0, 0 @@ -2554,147 +2561,119 @@ block-icon-blast-drill index: -1 block-icon-bridge-conduit rotate: false - xy: 969, 443 + xy: 737, 407 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 bridge-conduit rotate: false - xy: 969, 443 + xy: 737, 407 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-icon-bridge-conveyor rotate: false - xy: 979, 443 + xy: 747, 407 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 bridge-conveyor rotate: false - xy: 979, 443 + xy: 747, 407 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-icon-centrifuge rotate: false - xy: 421, 376 + xy: 416, 314 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 centrifuge rotate: false - xy: 421, 376 + xy: 416, 314 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 block-icon-combustion-generator rotate: false - xy: 989, 443 + xy: 757, 407 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 combustion-generator rotate: false - xy: 989, 443 + xy: 757, 407 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-icon-command-center rotate: false - xy: 421, 358 + xy: 416, 296 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 command-center rotate: false - xy: 421, 358 - size: 16, 16 - orig: 16, 16 - offset: 0, 0 - index: -1 -block-icon-composite-wall - rotate: false - xy: 999, 443 - size: 8, 8 - orig: 8, 8 - offset: 0, 0 - index: -1 -composite-wall - rotate: false - xy: 999, 443 - size: 8, 8 - orig: 8, 8 - offset: 0, 0 - index: -1 -block-icon-composite-wall-large - rotate: false - xy: 421, 340 - size: 16, 16 - orig: 16, 16 - offset: 0, 0 - index: -1 -composite-wall-large - rotate: false - xy: 421, 340 + xy: 416, 296 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 block-icon-conduit rotate: false - xy: 619, 431 + xy: 767, 407 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-icon-conveyor rotate: false - xy: 619, 421 + xy: 777, 407 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 conveyor-0-0 rotate: false - xy: 619, 421 + xy: 777, 407 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-icon-copper-wall rotate: false - xy: 629, 431 + xy: 787, 407 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 copper-wall rotate: false - xy: 629, 431 + xy: 787, 407 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-icon-copper-wall-large rotate: false - xy: 439, 435 + xy: 90, 149 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 copper-wall-large rotate: false - xy: 439, 435 + xy: 90, 149 size: 16, 16 orig: 16, 16 offset: 0, 0 @@ -2715,14 +2694,14 @@ core index: -1 block-icon-cryofluidmixer rotate: false - xy: 439, 417 + xy: 90, 131 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 block-icon-cultivator rotate: false - xy: 457, 435 + xy: 90, 113 size: 16, 16 orig: 16, 16 offset: 0, 0 @@ -2736,126 +2715,154 @@ block-icon-cyclone index: -1 block-icon-dagger-pad rotate: false - xy: 439, 399 + xy: 108, 148 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 block-icon-dart-ship-factory rotate: false - xy: 457, 417 + xy: 108, 130 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 dart-ship-factory rotate: false - xy: 457, 417 + xy: 108, 130 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 block-icon-deepwater rotate: false - xy: 619, 411 + xy: 797, 407 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 deepwater rotate: false - xy: 619, 411 + xy: 797, 407 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-icon-delta-mech-factory rotate: false - xy: 475, 435 + xy: 108, 112 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 delta-mech-factory rotate: false - xy: 475, 435 + xy: 108, 112 + size: 16, 16 + orig: 16, 16 + offset: 0, 0 + index: -1 +block-icon-dense-alloy-wall + rotate: false + xy: 807, 407 + size: 8, 8 + orig: 8, 8 + offset: 0, 0 + index: -1 +dense-alloy-wall + rotate: false + xy: 807, 407 + size: 8, 8 + orig: 8, 8 + offset: 0, 0 + index: -1 +block-icon-dense-alloy-wall-large + rotate: false + xy: 126, 148 + size: 16, 16 + orig: 16, 16 + offset: 0, 0 + index: -1 +dense-alloy-wall-large + rotate: false + xy: 126, 148 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 block-icon-dirt rotate: false - xy: 639, 431 + xy: 817, 407 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 dirt1 rotate: false - xy: 639, 431 + xy: 817, 407 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-icon-distributor rotate: false - xy: 439, 381 + xy: 126, 130 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 distributor rotate: false - xy: 439, 381 + xy: 126, 130 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 block-icon-door rotate: false - xy: 629, 421 + xy: 827, 407 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 door rotate: false - xy: 629, 421 + xy: 827, 407 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-icon-door-large rotate: false - xy: 457, 399 + xy: 126, 112 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 door-large rotate: false - xy: 457, 399 + xy: 126, 112 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 block-icon-drone-pad rotate: false - xy: 475, 417 + xy: 283, 240 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 block-icon-duo rotate: false - xy: 619, 401 + xy: 837, 407 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-icon-fabricator-pad rotate: false - xy: 439, 363 + xy: 416, 278 size: 16, 16 orig: 16, 16 offset: 0, 0 @@ -2904,175 +2911,175 @@ glaive-ship-factory index: -1 block-icon-grass rotate: false - xy: 649, 431 + xy: 847, 407 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 grass1 rotate: false - xy: 649, 431 + xy: 847, 407 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-icon-hail rotate: false - xy: 639, 421 + xy: 857, 407 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-icon-ice rotate: false - xy: 629, 411 + xy: 867, 407 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ice1 rotate: false - xy: 629, 411 + xy: 867, 407 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-icon-icerock rotate: false - xy: 619, 391 + xy: 877, 407 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 icerock1 rotate: false - xy: 619, 391 + xy: 877, 407 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-icon-incinerator rotate: false - xy: 659, 431 + xy: 887, 407 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 incinerator rotate: false - xy: 659, 431 + xy: 887, 407 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-icon-interceptor-pad rotate: false - xy: 457, 381 + xy: 301, 249 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 block-icon-itemsource rotate: false - xy: 649, 421 + xy: 897, 407 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 itemsource rotate: false - xy: 649, 421 + xy: 897, 407 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-icon-itemvoid rotate: false - xy: 639, 411 + xy: 907, 407 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 itemvoid rotate: false - xy: 639, 411 + xy: 907, 407 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-icon-javelin-ship-factory rotate: false - xy: 475, 399 + xy: 301, 231 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 javelin-ship-factory rotate: false - xy: 475, 399 + xy: 301, 231 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 block-icon-junction rotate: false - xy: 629, 401 + xy: 917, 407 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 junction rotate: false - xy: 629, 401 + xy: 917, 407 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-icon-lancer rotate: false - xy: 439, 345 + xy: 336, 282 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 block-icon-laser-drill rotate: false - xy: 457, 363 + xy: 354, 282 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 block-icon-lava rotate: false - xy: 619, 381 + xy: 927, 407 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 lava rotate: false - xy: 619, 381 + xy: 927, 407 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-icon-liquid-junction rotate: false - xy: 669, 431 + xy: 937, 407 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 liquid-junction rotate: false - xy: 669, 431 + xy: 937, 407 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-icon-liquid-router rotate: false - xy: 659, 421 + xy: 947, 407 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -3086,14 +3093,14 @@ block-icon-liquid-tank index: -1 block-icon-liquidsource rotate: false - xy: 649, 411 + xy: 957, 407 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 liquidsource rotate: false - xy: 649, 411 + xy: 957, 407 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -3114,21 +3121,21 @@ mass-driver index: -1 block-icon-mechanical-drill rotate: false - xy: 475, 381 + xy: 372, 282 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 block-icon-mechanical-pump rotate: false - xy: 639, 401 + xy: 967, 407 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 mechanical-pump rotate: false - xy: 639, 401 + xy: 967, 407 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -3142,42 +3149,42 @@ block-icon-meltdown index: -1 block-icon-melter rotate: false - xy: 629, 391 + xy: 977, 407 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 melter rotate: false - xy: 629, 391 + xy: 977, 407 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-icon-mend-projector rotate: false - xy: 457, 345 + xy: 447, 359 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 mend-projector rotate: false - xy: 457, 345 + xy: 447, 359 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 block-icon-metalfloor rotate: false - xy: 619, 371 + xy: 987, 407 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 metalfloor1 rotate: false - xy: 619, 371 + xy: 987, 407 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -3191,14 +3198,14 @@ block-icon-monsoon-pad index: -1 block-icon-oil rotate: false - xy: 679, 431 + xy: 997, 407 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 oil rotate: false - xy: 679, 431 + xy: 997, 407 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -3226,91 +3233,91 @@ omega-mech-factory index: -1 block-icon-overdrive-projector rotate: false - xy: 475, 363 + xy: 265, 228 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 overdrive-projector rotate: false - xy: 475, 363 + xy: 265, 228 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 block-icon-overflow-gate rotate: false - xy: 669, 421 + xy: 291, 160 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 overflow-gate rotate: false - xy: 669, 421 + xy: 291, 160 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-icon-phase-conduit rotate: false - xy: 659, 411 + xy: 291, 150 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 phase-conduit rotate: false - xy: 659, 411 + xy: 291, 150 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-icon-phase-conveyor rotate: false - xy: 649, 401 + xy: 301, 167 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 phase-conveyor rotate: false - xy: 649, 401 + xy: 301, 167 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-icon-phase-wall rotate: false - xy: 639, 391 + xy: 301, 157 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 phase-wall rotate: false - xy: 639, 391 + xy: 301, 157 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-icon-phase-wall-large rotate: false - xy: 475, 345 + xy: 283, 222 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 phase-wall-large rotate: false - xy: 475, 345 + xy: 283, 222 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 block-icon-phase-weaver rotate: false - xy: 493, 423 + xy: 301, 213 size: 16, 16 orig: 16, 16 offset: 0, 0 @@ -3324,161 +3331,161 @@ block-icon-plasma-drill index: -1 block-icon-plastanium-compressor rotate: false - xy: 493, 405 + xy: 137, 246 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 plastanium-compressor rotate: false - xy: 493, 405 + xy: 137, 246 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 block-icon-pneumatic-drill rotate: false - xy: 493, 387 + xy: 137, 228 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 block-icon-power-node rotate: false - xy: 629, 381 + xy: 301, 147 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 power-node rotate: false - xy: 629, 381 + xy: 301, 147 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-icon-power-node-large rotate: false - xy: 493, 369 + xy: 155, 248 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 power-node-large rotate: false - xy: 493, 369 + xy: 155, 248 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 block-icon-powerinfinite rotate: false - xy: 619, 361 + xy: 467, 405 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 powerinfinite rotate: false - xy: 619, 361 + xy: 467, 405 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-icon-powervoid rotate: false - xy: 689, 431 + xy: 465, 395 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 powervoid rotate: false - xy: 689, 431 + xy: 465, 395 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-icon-pulse-conduit rotate: false - xy: 679, 421 + xy: 465, 385 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-icon-pulverizer rotate: false - xy: 669, 411 + xy: 465, 375 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-icon-pyratite-mixer rotate: false - xy: 493, 351 + xy: 173, 248 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 pyratite-mixer rotate: false - xy: 493, 351 + xy: 173, 248 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 block-icon-reconstructor rotate: false - xy: 511, 431 + xy: 155, 230 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 dagger-pad rotate: false - xy: 511, 431 + xy: 155, 230 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 drone-pad rotate: false - xy: 511, 431 + xy: 155, 230 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 fabricator-pad rotate: false - xy: 511, 431 + xy: 155, 230 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 interceptor-pad rotate: false - xy: 511, 431 + xy: 155, 230 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 reconstructor rotate: false - xy: 511, 431 + xy: 155, 230 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 block-icon-repair-point rotate: false - xy: 659, 401 + xy: 465, 365 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 repair-point rotate: false - xy: 659, 401 + xy: 465, 365 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -3492,182 +3499,182 @@ block-icon-ripple index: -1 block-icon-rock rotate: false - xy: 649, 391 + xy: 477, 405 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 rock1 rotate: false - xy: 649, 391 + xy: 477, 405 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-icon-rotary-pump rotate: false - xy: 511, 413 + xy: 191, 248 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 rotary-pump rotate: false - xy: 511, 413 + xy: 191, 248 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 block-icon-router rotate: false - xy: 639, 381 + xy: 475, 395 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 router rotate: false - xy: 639, 381 + xy: 475, 395 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-icon-rtg-generator rotate: false - xy: 529, 431 + xy: 173, 230 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 rtg-generator rotate: false - xy: 529, 431 + xy: 173, 230 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 block-icon-salvo rotate: false - xy: 511, 395 + xy: 191, 230 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 block-icon-sand rotate: false - xy: 629, 371 + xy: 475, 385 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 sand1 rotate: false - xy: 629, 371 + xy: 475, 385 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-icon-scorch rotate: false - xy: 619, 351 + xy: 475, 375 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-icon-separator rotate: false - xy: 699, 431 + xy: 475, 365 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 separator rotate: false - xy: 699, 431 + xy: 475, 365 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-icon-shock-mine rotate: false - xy: 689, 421 + xy: 487, 407 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 shock-mine rotate: false - xy: 689, 421 + xy: 487, 407 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-icon-shrub rotate: false - xy: 679, 411 + xy: 469, 355 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 shrub rotate: false - xy: 679, 411 + xy: 469, 355 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-icon-silicon-smelter rotate: false - xy: 529, 413 + xy: 209, 239 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 silicon-smelter rotate: false - xy: 529, 413 + xy: 209, 239 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 block-icon-smelter rotate: false - xy: 669, 401 + xy: 469, 345 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 smelter rotate: false - xy: 669, 401 + xy: 469, 345 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-icon-snow rotate: false - xy: 659, 391 + xy: 479, 355 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 snow1 rotate: false - xy: 659, 391 + xy: 479, 355 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-icon-solar-panel rotate: false - xy: 649, 381 + xy: 479, 345 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 solar-panel rotate: false - xy: 649, 381 + xy: 479, 345 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -3688,42 +3695,42 @@ solar-panel-large index: -1 block-icon-solidifer rotate: false - xy: 639, 371 + xy: 479, 335 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 solidifer rotate: false - xy: 639, 371 + xy: 479, 335 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-icon-sorter rotate: false - xy: 629, 361 + xy: 479, 325 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 sorter rotate: false - xy: 629, 361 + xy: 479, 325 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-icon-space rotate: false - xy: 619, 341 + xy: 478, 315 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 space rotate: false - xy: 619, 341 + xy: 478, 315 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -3737,91 +3744,91 @@ block-icon-spectre index: -1 block-icon-stone rotate: false - xy: 709, 431 + xy: 478, 305 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 stone1 rotate: false - xy: 709, 431 + xy: 478, 305 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-icon-surge-wall rotate: false - xy: 699, 421 + xy: 478, 295 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 surge-wall rotate: false - xy: 699, 421 + xy: 478, 295 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-icon-surge-wall-large rotate: false - xy: 547, 431 + xy: 209, 221 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 surge-wall-large rotate: false - xy: 547, 431 + xy: 209, 221 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 block-icon-swarmer rotate: false - xy: 565, 433 + xy: 227, 227 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 block-icon-tau-mech-factory rotate: false - xy: 511, 377 + xy: 245, 227 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 tau-mech-factory rotate: false - xy: 511, 377 + xy: 245, 227 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 block-icon-thermal-generator rotate: false - xy: 529, 395 + xy: 487, 417 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 thermal-generator rotate: false - xy: 529, 395 + xy: 487, 417 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 block-icon-thermal-pump rotate: false - xy: 547, 413 + xy: 505, 413 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 thermal-pump rotate: false - xy: 547, 413 + xy: 505, 413 size: 16, 16 orig: 16, 16 offset: 0, 0 @@ -3842,28 +3849,28 @@ thorium-reactor index: -1 block-icon-thorium-wall rotate: false - xy: 689, 411 + xy: 478, 285 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 thorium-wall rotate: false - xy: 689, 411 + xy: 478, 285 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-icon-thorium-wall-large rotate: false - xy: 565, 415 + xy: 523, 413 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 thorium-wall-large rotate: false - xy: 565, 415 + xy: 523, 413 size: 16, 16 orig: 16, 16 offset: 0, 0 @@ -3877,56 +3884,56 @@ block-icon-titan-pad index: -1 block-icon-titanium-conveyor rotate: false - xy: 679, 401 + xy: 478, 275 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 titanium-conveyor-0-0 rotate: false - xy: 679, 401 + xy: 478, 275 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-icon-trident-ship-factory rotate: false - xy: 583, 433 + xy: 541, 413 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 trident-ship-factory rotate: false - xy: 583, 433 + xy: 541, 413 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 block-icon-turbine-generator rotate: false - xy: 511, 359 + xy: 559, 431 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 turbine-generator rotate: false - xy: 511, 359 + xy: 559, 431 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 block-icon-unloader rotate: false - xy: 669, 391 + xy: 478, 265 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 unloader rotate: false - xy: 669, 391 + xy: 478, 265 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -3961,1092 +3968,1092 @@ warp-gate index: -1 block-icon-water rotate: false - xy: 659, 381 + xy: 481, 255 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 water rotate: false - xy: 659, 381 + xy: 481, 255 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-icon-water-extractor rotate: false - xy: 529, 377 + xy: 559, 413 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 block-icon-wave rotate: false - xy: 547, 395 + xy: 577, 433 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 deepwater-cliff-edge rotate: false - xy: 749, 421 + xy: 737, 397 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 deepwater-cliff-edge-1 rotate: false - xy: 739, 411 + xy: 747, 397 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 deepwater-cliff-edge-2 rotate: false - xy: 729, 401 + xy: 757, 397 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 deepwater-cliff-side rotate: false - xy: 719, 391 + xy: 767, 397 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 dirt-cliff-edge rotate: false - xy: 679, 351 + xy: 807, 397 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 dirt-cliff-edge-1 rotate: false - xy: 669, 341 + xy: 817, 397 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 dirt-cliff-edge-2 rotate: false - xy: 659, 331 + xy: 827, 397 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 dirt-cliff-side rotate: false - xy: 649, 321 + xy: 837, 397 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 lava-cliff-edge rotate: false - xy: 749, 391 + xy: 351, 226 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 lava-cliff-edge-1 rotate: false - xy: 739, 381 + xy: 350, 216 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 lava-cliff-edge-2 rotate: false - xy: 729, 371 + xy: 349, 206 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 lava-cliff-side rotate: false - xy: 719, 361 + xy: 349, 196 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 liquid-icon-cryofluid rotate: false - xy: 659, 301 + xy: 485, 195 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 liquid-icon-lava rotate: false - xy: 649, 291 + xy: 485, 185 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 liquid-icon-oil rotate: false - xy: 799, 431 + xy: 497, 403 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 liquid-icon-water rotate: false - xy: 789, 421 + xy: 507, 403 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 mech-icon-alpha-mech rotate: false - xy: 207, 193 + xy: 464, 289 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 mech-icon-dart-ship rotate: false - xy: 207, 179 + xy: 464, 275 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 mech-icon-delta-mech rotate: false - xy: 221, 257 + xy: 464, 261 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 mech-icon-omega-mech rotate: false - xy: 374, 242 + xy: 319, 208 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 mech-icon-tau-mech rotate: false - xy: 390, 250 + xy: 319, 192 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 mech-icon-trident-ship rotate: false - xy: 406, 250 + xy: 319, 176 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 trident-ship rotate: false - xy: 406, 250 + xy: 319, 176 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 metalfloor-cliff-edge rotate: false - xy: 699, 331 + xy: 517, 393 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 metalfloor-cliff-edge-1 rotate: false - xy: 689, 321 + xy: 527, 393 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 metalfloor-cliff-edge-2 rotate: false - xy: 679, 311 + xy: 537, 393 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 metalfloor-cliff-side rotate: false - xy: 669, 301 + xy: 547, 393 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 oil-cliff-edge rotate: false - xy: 659, 291 + xy: 557, 393 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 oil-cliff-edge-1 rotate: false - xy: 809, 431 + xy: 567, 393 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 oil-cliff-edge-2 rotate: false - xy: 799, 421 + xy: 577, 395 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 oil-cliff-side rotate: false - xy: 789, 411 + xy: 587, 395 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-coal-blackstone1 rotate: false - xy: 769, 391 + xy: 607, 395 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-coal-blackstone2 rotate: false - xy: 759, 381 + xy: 617, 395 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-coal-blackstone3 rotate: false - xy: 749, 371 + xy: 627, 395 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-coal-grass1 rotate: false - xy: 739, 361 + xy: 495, 383 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-coal-grass2 rotate: false - xy: 729, 351 + xy: 505, 383 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-coal-grass3 rotate: false - xy: 719, 341 + xy: 495, 373 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-coal-ice1 rotate: false - xy: 709, 331 + xy: 515, 383 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-coal-ice2 rotate: false - xy: 699, 321 + xy: 505, 373 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-coal-ice3 rotate: false - xy: 689, 311 + xy: 525, 383 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-coal-sand1 rotate: false - xy: 679, 301 + xy: 515, 373 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-coal-sand2 rotate: false - xy: 669, 291 + xy: 535, 383 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-coal-sand3 rotate: false - xy: 819, 431 + xy: 525, 373 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-coal-snow1 rotate: false - xy: 809, 421 + xy: 545, 383 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-coal-snow2 rotate: false - xy: 799, 411 + xy: 535, 373 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-coal-snow3 rotate: false - xy: 789, 401 + xy: 555, 383 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-coal-stone1 rotate: false - xy: 779, 391 + xy: 545, 373 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-coal-stone2 rotate: false - xy: 769, 381 + xy: 565, 383 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-coal-stone3 rotate: false - xy: 759, 371 + xy: 555, 373 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-copper-blackstone1 rotate: false - xy: 749, 361 + xy: 565, 373 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-copper-blackstone2 rotate: false - xy: 739, 351 + xy: 499, 363 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-copper-blackstone3 rotate: false - xy: 729, 341 + xy: 499, 353 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-copper-grass1 rotate: false - xy: 719, 331 + xy: 509, 363 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-copper-grass2 rotate: false - xy: 709, 321 + xy: 499, 343 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-copper-grass3 rotate: false - xy: 699, 311 + xy: 509, 353 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-copper-ice1 rotate: false - xy: 689, 301 + xy: 519, 363 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-copper-ice2 rotate: false - xy: 679, 291 + xy: 499, 333 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-copper-ice3 rotate: false - xy: 829, 431 + xy: 509, 343 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-copper-sand1 rotate: false - xy: 819, 421 + xy: 519, 353 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-copper-sand2 rotate: false - xy: 809, 411 + xy: 529, 363 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-copper-sand3 rotate: false - xy: 799, 401 + xy: 509, 333 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-copper-snow1 rotate: false - xy: 789, 391 + xy: 519, 343 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-copper-snow2 rotate: false - xy: 779, 381 + xy: 529, 353 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-copper-snow3 rotate: false - xy: 769, 371 + xy: 539, 363 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-copper-stone1 rotate: false - xy: 759, 361 + xy: 519, 333 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-copper-stone2 rotate: false - xy: 749, 351 + xy: 529, 343 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-copper-stone3 rotate: false - xy: 739, 341 + xy: 539, 353 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-lead-blackstone1 rotate: false - xy: 729, 331 + xy: 549, 363 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-lead-blackstone2 rotate: false - xy: 719, 321 + xy: 529, 333 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-lead-blackstone3 rotate: false - xy: 709, 311 + xy: 539, 343 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-lead-grass1 rotate: false - xy: 699, 301 + xy: 549, 353 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-lead-grass2 rotate: false - xy: 689, 291 + xy: 559, 363 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-lead-grass3 rotate: false - xy: 839, 431 + xy: 539, 333 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-lead-ice1 rotate: false - xy: 849, 433 + xy: 549, 343 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-lead-ice2 rotate: false - xy: 829, 421 + xy: 559, 353 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-lead-ice3 rotate: false - xy: 819, 411 + xy: 549, 333 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-lead-sand1 rotate: false - xy: 809, 401 + xy: 559, 343 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-lead-sand2 rotate: false - xy: 799, 391 + xy: 559, 333 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-lead-sand3 rotate: false - xy: 789, 381 + xy: 499, 323 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-lead-snow1 rotate: false - xy: 779, 371 + xy: 509, 323 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-lead-snow2 rotate: false - xy: 769, 361 + xy: 519, 323 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-lead-snow3 rotate: false - xy: 759, 351 + xy: 529, 323 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-lead-stone1 rotate: false - xy: 749, 341 + xy: 539, 323 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-lead-stone2 rotate: false - xy: 739, 331 + xy: 549, 323 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-lead-stone3 rotate: false - xy: 729, 321 + xy: 559, 323 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-thorium-blackstone1 rotate: false - xy: 719, 311 + xy: 569, 363 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-thorium-blackstone2 rotate: false - xy: 709, 301 + xy: 569, 353 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-thorium-blackstone3 rotate: false - xy: 699, 291 + xy: 569, 343 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-thorium-grass1 rotate: false - xy: 859, 433 + xy: 569, 333 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-thorium-grass2 rotate: false - xy: 839, 421 + xy: 569, 323 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-thorium-grass3 rotate: false - xy: 849, 423 + xy: 489, 317 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-thorium-ice1 rotate: false - xy: 829, 411 + xy: 488, 307 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-thorium-ice2 rotate: false - xy: 819, 401 + xy: 488, 297 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-thorium-ice3 rotate: false - xy: 809, 391 + xy: 488, 287 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-thorium-sand1 rotate: false - xy: 799, 381 + xy: 488, 277 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-thorium-sand2 rotate: false - xy: 789, 371 + xy: 488, 267 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-thorium-sand3 rotate: false - xy: 779, 361 + xy: 499, 313 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-thorium-snow1 rotate: false - xy: 769, 351 + xy: 509, 313 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-thorium-snow2 rotate: false - xy: 759, 341 + xy: 519, 313 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-thorium-snow3 rotate: false - xy: 749, 331 + xy: 529, 313 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-thorium-stone1 rotate: false - xy: 739, 321 + xy: 539, 313 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-thorium-stone2 rotate: false - xy: 729, 311 + xy: 549, 313 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-thorium-stone3 rotate: false - xy: 719, 301 + xy: 559, 313 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-titanium-blackstone1 rotate: false - xy: 709, 291 + xy: 569, 313 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-titanium-blackstone2 rotate: false - xy: 869, 433 + xy: 498, 303 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-titanium-blackstone3 rotate: false - xy: 859, 423 + xy: 498, 293 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-titanium-grass1 rotate: false - xy: 839, 411 + xy: 508, 303 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-titanium-grass2 rotate: false - xy: 849, 413 + xy: 498, 283 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-titanium-grass3 rotate: false - xy: 829, 401 + xy: 508, 293 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-titanium-ice1 rotate: false - xy: 819, 391 + xy: 518, 303 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-titanium-ice2 rotate: false - xy: 809, 381 + xy: 498, 273 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-titanium-ice3 rotate: false - xy: 799, 371 + xy: 508, 283 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-titanium-sand1 rotate: false - xy: 789, 361 + xy: 518, 293 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-titanium-sand2 rotate: false - xy: 779, 351 + xy: 528, 303 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-titanium-sand3 rotate: false - xy: 769, 341 + xy: 508, 273 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-titanium-snow1 rotate: false - xy: 759, 331 + xy: 518, 283 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-titanium-snow2 rotate: false - xy: 749, 321 + xy: 528, 293 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-titanium-snow3 rotate: false - xy: 739, 311 + xy: 538, 303 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-titanium-stone1 rotate: false - xy: 729, 301 + xy: 518, 273 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-titanium-stone2 rotate: false - xy: 719, 291 + xy: 528, 283 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-titanium-stone3 rotate: false - xy: 879, 433 + xy: 538, 293 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 sand-cliff-edge rotate: false - xy: 819, 371 + xy: 568, 263 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 sand-cliff-edge-1 rotate: false - xy: 809, 361 + xy: 495, 195 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 sand-cliff-edge-2 rotate: false - xy: 799, 351 + xy: 495, 185 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 sand-cliff-side rotate: false - xy: 789, 341 + xy: 637, 387 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 snow-cliff-edge rotate: false - xy: 859, 393 + xy: 737, 387 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 snow-cliff-edge-1 rotate: false - xy: 839, 381 + xy: 747, 387 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 snow-cliff-edge-2 rotate: false - xy: 849, 383 + xy: 757, 387 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 snow-cliff-side rotate: false - xy: 829, 371 + xy: 767, 387 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 space-cliff-edge rotate: false - xy: 809, 351 + xy: 787, 387 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 space-cliff-edge-1 rotate: false - xy: 799, 341 + xy: 797, 387 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 space-cliff-edge-2 rotate: false - xy: 789, 331 + xy: 807, 387 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 space-cliff-side rotate: false - xy: 779, 321 + xy: 817, 387 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 unit-icon-dagger rotate: false - xy: 235, 215 + xy: 467, 247 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 unit-icon-fortress rotate: false - xy: 583, 289 + xy: 265, 210 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 unit-icon-titan rotate: false - xy: 583, 289 + xy: 265, 210 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 item-biomatter rotate: false - xy: 739, 391 + xy: 321, 146 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 item-blast-compound rotate: false - xy: 729, 381 + xy: 331, 166 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 item-coal rotate: false - xy: 719, 371 + xy: 331, 156 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 item-copper rotate: false - xy: 709, 361 + xy: 331, 146 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 item-dense-alloy rotate: false - xy: 699, 351 + xy: 341, 167 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 item-lead rotate: false - xy: 689, 341 + xy: 341, 157 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 item-phase-matter rotate: false - xy: 679, 331 + xy: 341, 147 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 item-plastanium rotate: false - xy: 669, 321 + xy: 487, 397 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 item-pyratite rotate: false - xy: 659, 311 + xy: 485, 387 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 item-sand rotate: false - xy: 649, 301 + xy: 485, 377 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 item-silicon rotate: false - xy: 639, 291 + xy: 485, 367 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 item-stone rotate: false - xy: 789, 431 + xy: 489, 357 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 item-surge-alloy rotate: false - xy: 779, 421 + xy: 489, 347 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 item-thorium rotate: false - xy: 769, 411 + xy: 489, 337 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 item-titanium rotate: false - xy: 759, 401 + xy: 489, 327 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 liquid-icon rotate: false - xy: 669, 311 + xy: 475, 191 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -5067,77 +5074,77 @@ alpha-mech-base index: -1 alpha-mech-leg rotate: false - xy: 328, 276 + xy: 351, 236 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 delta-mech rotate: false - xy: 546, 225 + xy: 151, 2 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 delta-mech-leg rotate: false - xy: 560, 225 + xy: 155, 16 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 omega-mech rotate: false - xy: 390, 234 + xy: 335, 266 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 omega-mech-armor rotate: false - xy: 406, 234 + xy: 351, 266 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 omega-mech-base rotate: false - xy: 422, 234 + xy: 335, 250 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 omega-mech-leg rotate: false - xy: 130, 114 + xy: 367, 266 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 tau-mech rotate: false - xy: 123, 76 + xy: 351, 250 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 tau-mech-base rotate: false - xy: 249, 258 + xy: 439, 243 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 tau-mech-leg rotate: false - xy: 235, 229 + xy: 453, 247 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 dart-ship rotate: false - xy: 532, 225 + xy: 137, 2 size: 12, 12 orig: 12, 12 offset: 0, 0 @@ -5158,21 +5165,21 @@ mech-icon-glaive-ship index: -1 javelin-ship rotate: false - xy: 193, 179 + xy: 465, 331 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 mech-icon-javelin-ship rotate: false - xy: 193, 179 + xy: 465, 331 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 javelin-ship-shield rotate: false - xy: 207, 221 + xy: 464, 317 size: 12, 12 orig: 12, 12 offset: 0, 0 @@ -5265,42 +5272,42 @@ button-select index: -1 check-off rotate: false - xy: 924, 479 + xy: 958, 479 size: 28, 32 orig: 28, 32 offset: 0, 0 index: -1 check-on rotate: false - xy: 954, 479 + xy: 988, 479 size: 28, 32 orig: 28, 32 offset: 0, 0 index: -1 check-on-over rotate: false - xy: 984, 479 + xy: 29, 6 size: 28, 32 orig: 28, 32 offset: 0, 0 index: -1 check-over rotate: false - xy: 29, 6 + xy: 59, 6 size: 28, 32 orig: 28, 32 offset: 0, 0 index: -1 clear rotate: false - xy: 493, 441 + xy: 227, 245 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 cursor rotate: false - xy: 505, 443 + xy: 277, 186 size: 4, 4 orig: 4, 4 offset: 0, 0 @@ -5321,28 +5328,28 @@ discord-banner-over index: -1 controller-cursor rotate: false - xy: 583, 415 + xy: 595, 433 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-about rotate: false - xy: 222, 287 + xy: 1009, 435 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-add rotate: false - xy: 222, 271 + xy: 1009, 419 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-admin rotate: false - xy: 85, 1 + xy: 1009, 403 size: 14, 14 orig: 14, 14 offset: 0, 0 @@ -5356,238 +5363,238 @@ icon-admin-small index: -1 icon-areaDelete rotate: false - xy: 235, 189 + xy: 107, 13 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-arrow rotate: false - xy: 583, 343 + xy: 775, 435 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-arrow-16 rotate: false - xy: 583, 343 + xy: 775, 435 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-arrow-down rotate: false - xy: 235, 177 + xy: 107, 1 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-arrow-left rotate: false - xy: 263, 256 + xy: 439, 333 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-arrow-right rotate: false - xy: 275, 256 + xy: 439, 231 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-arrow-up rotate: false - xy: 235, 165 + xy: 439, 219 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-back rotate: false - xy: 601, 343 + xy: 757, 417 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-ban rotate: false - xy: 101, 1 + xy: 89, 25 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-break rotate: false - xy: 493, 333 + xy: 793, 435 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-cancel rotate: false - xy: 511, 323 + xy: 775, 417 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-chat rotate: false - xy: 193, 167 + xy: 453, 235 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-check rotate: false - xy: 529, 323 + xy: 811, 435 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-crafting rotate: false - xy: 205, 167 + xy: 465, 235 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-cursor rotate: false - xy: 139, 24 + xy: 451, 223 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-defense rotate: false - xy: 576, 229 + xy: 463, 223 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-dev-builds rotate: false - xy: 117, 1 + xy: 193, 214 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-discord rotate: false - xy: 133, 1 + xy: 211, 169 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-distribution rotate: false - xy: 588, 229 + xy: 477, 235 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-donate rotate: false - xy: 502, 271 + xy: 229, 175 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-dots rotate: false - xy: 502, 255 + xy: 245, 175 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-editor rotate: false - xy: 518, 271 + xy: 434, 316 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-egg rotate: false - xy: 518, 255 + xy: 434, 300 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-elevation rotate: false - xy: 547, 323 + xy: 793, 417 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-eraser rotate: false - xy: 565, 325 + xy: 829, 435 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-exit rotate: false - xy: 534, 271 + xy: 434, 284 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-file rotate: false - xy: 583, 325 + xy: 811, 417 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-file-image rotate: false - xy: 601, 325 + xy: 847, 435 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-file-text rotate: false - xy: 534, 255 + xy: 434, 268 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-fill rotate: false - xy: 137, 246 + xy: 829, 417 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-floppy rotate: false - xy: 550, 271 + xy: 144, 158 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-floppy-16 rotate: false - xy: 137, 228 + xy: 865, 435 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-folder rotate: false - xy: 550, 255 + xy: 144, 142 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-folder-parent rotate: false - xy: 566, 273 + xy: 144, 126 size: 14, 14 orig: 14, 14 offset: 0, 0 @@ -5601,441 +5608,441 @@ icon-generated index: -1 icon-github rotate: false - xy: 566, 257 + xy: 144, 110 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-google-play rotate: false - xy: 582, 273 + xy: 144, 94 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-grid rotate: false - xy: 155, 248 + xy: 847, 417 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-hold rotate: false - xy: 600, 229 + xy: 475, 223 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-holdDelete rotate: false - xy: 612, 229 + xy: 451, 211 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-home rotate: false - xy: 582, 257 + xy: 141, 78 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-host rotate: false - xy: 598, 273 + xy: 141, 62 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-info rotate: false - xy: 624, 229 + xy: 463, 211 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-itch.io rotate: false - xy: 598, 257 + xy: 141, 46 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-item rotate: false - xy: 636, 229 + xy: 475, 211 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-items-none rotate: false - xy: 759, 411 + xy: 321, 156 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 icon-line rotate: false - xy: 155, 230 + xy: 883, 435 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-link rotate: false - xy: 448, 239 + xy: 160, 160 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-liquid rotate: false - xy: 621, 441 + xy: 157, 82 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-load rotate: false - xy: 464, 239 + xy: 160, 144 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-load-image rotate: false - xy: 173, 248 + xy: 865, 417 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-load-map rotate: false - xy: 173, 230 + xy: 901, 435 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-loading rotate: false - xy: 290, 256 + xy: 883, 417 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-locked rotate: false - xy: 308, 254 + xy: 919, 435 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-logic rotate: false - xy: 633, 441 + xy: 157, 70 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-map rotate: false - xy: 480, 239 + xy: 176, 160 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-menu rotate: false - xy: 645, 441 + xy: 157, 58 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-menu-large rotate: false - xy: 139, 210 + xy: 901, 417 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-missing rotate: false - xy: 657, 441 + xy: 157, 46 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-none rotate: false - xy: 669, 441 + xy: 157, 34 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-nullitem rotate: false - xy: 749, 401 + xy: 311, 146 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 icon-pause rotate: false - xy: 681, 441 + xy: 169, 84 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-pencil rotate: false - xy: 139, 192 + xy: 937, 435 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-pencil-small rotate: false - xy: 496, 239 + xy: 160, 128 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-pick rotate: false - xy: 139, 174 + xy: 919, 417 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-play rotate: false - xy: 693, 441 + xy: 169, 72 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-play-2 rotate: false - xy: 512, 239 + xy: 176, 144 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-players rotate: false - xy: 705, 441 + xy: 169, 60 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-power rotate: false - xy: 717, 441 + xy: 169, 48 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-production rotate: false - xy: 729, 441 + xy: 169, 36 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-quit rotate: false - xy: 528, 239 + xy: 160, 112 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-redo rotate: false - xy: 157, 212 + xy: 955, 435 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-refresh rotate: false - xy: 544, 239 + xy: 176, 128 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-rename rotate: false - xy: 560, 239 + xy: 160, 96 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-resize rotate: false - xy: 157, 194 + xy: 937, 417 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-rotate rotate: false - xy: 576, 241 + xy: 176, 112 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-rotate-arrow rotate: false - xy: 592, 241 + xy: 176, 96 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-rotate-left rotate: false - xy: 608, 241 + xy: 141, 30 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-rotate-right rotate: false - xy: 614, 273 + xy: 227, 159 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-save rotate: false - xy: 614, 257 + xy: 243, 159 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-save-image rotate: false - xy: 157, 176 + xy: 973, 435 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-save-map rotate: false - xy: 175, 212 + xy: 955, 417 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-settings rotate: false - xy: 741, 441 + xy: 181, 84 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-terrain rotate: false - xy: 175, 194 + xy: 991, 435 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-tools rotate: false - xy: 624, 241 + xy: 261, 175 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-touch rotate: false - xy: 753, 441 + xy: 181, 72 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-touchDelete rotate: false - xy: 765, 441 + xy: 181, 60 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-trash rotate: false - xy: 342, 258 + xy: 259, 159 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-trash-16 rotate: false - xy: 175, 176 + xy: 973, 417 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-trello rotate: false - xy: 358, 258 + xy: 277, 170 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-tutorial rotate: false - xy: 374, 258 + xy: 275, 154 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-undo rotate: false - xy: 105, 89 + xy: 991, 417 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-units rotate: false - xy: 777, 441 + xy: 181, 48 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-unlocks rotate: false - xy: 326, 246 + xy: 319, 256 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-weapon rotate: false - xy: 789, 441 + xy: 181, 36 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-wiki rotate: false - xy: 342, 242 + xy: 319, 240 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-zoom rotate: false - xy: 105, 71 + xy: 90, 95 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-zoom-small rotate: false - xy: 358, 242 + xy: 319, 224 size: 14, 14 orig: 14, 14 offset: 0, 0 @@ -6064,7 +6071,7 @@ logotext index: -1 pane rotate: false - xy: 240, 335 + xy: 238, 297 size: 24, 36 split: 10, 10, 5, 5 orig: 24, 36 @@ -6072,7 +6079,7 @@ pane index: -1 pane-button rotate: false - xy: 59, 2 + xy: 240, 335 size: 24, 36 split: 10, 10, 5, 5 orig: 24, 36 @@ -6080,7 +6087,7 @@ pane-button index: -1 scroll rotate: false - xy: 238, 298 + xy: 187, 266 size: 24, 35 split: 10, 10, 6, 5 orig: 24, 35 @@ -6121,14 +6128,14 @@ scroll-knob-vertical-black index: -1 selection rotate: false - xy: 513, 484 + xy: 27, 110 size: 1, 1 orig: 1, 1 offset: 0, 0 index: -1 slider rotate: false - xy: 287, 258 + xy: 87, 98 size: 1, 8 orig: 1, 8 offset: 0, 0 @@ -6200,7 +6207,7 @@ textfield-over index: -1 white rotate: false - xy: 29, 1 + xy: 437, 448 size: 3, 3 orig: 3, 3 offset: 0, 0 @@ -6237,42 +6244,42 @@ unit-icon-alpha-drone index: -1 dagger rotate: false - xy: 490, 225 + xy: 383, 268 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 dagger-base rotate: false - xy: 504, 225 + xy: 397, 270 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 delta-mech-base rotate: false - xy: 504, 225 + xy: 397, 270 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 dagger-leg rotate: false - xy: 518, 225 + xy: 141, 16 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 drone rotate: false - xy: 207, 263 + xy: 441, 345 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 unit-icon-drone rotate: false - xy: 207, 263 + xy: 441, 345 size: 12, 12 orig: 12, 12 offset: 0, 0 @@ -6293,140 +6300,140 @@ unit-icon-fabricator index: -1 fortress rotate: false - xy: 529, 341 + xy: 721, 417 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 titan rotate: false - xy: 529, 341 + xy: 721, 417 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 fortress-base rotate: false - xy: 547, 341 + xy: 757, 435 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 titan-base rotate: false - xy: 547, 341 + xy: 757, 435 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 fortress-leg rotate: false - xy: 565, 343 + xy: 739, 417 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 titan-leg rotate: false - xy: 565, 343 + xy: 739, 417 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 interceptor rotate: false - xy: 193, 193 + xy: 450, 261 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 unit-icon-interceptor rotate: false - xy: 193, 193 + xy: 450, 261 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 monsoon rotate: false - xy: 90, 147 + xy: 318, 316 size: 18, 18 orig: 18, 18 offset: 0, 0 index: -1 unit-icon-monsoon rotate: false - xy: 90, 147 + xy: 318, 316 size: 18, 18 orig: 18, 18 offset: 0, 0 index: -1 power-cell rotate: false - xy: 123, 92 + xy: 335, 234 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 blaster-equip rotate: false - xy: 448, 225 + xy: 335, 205 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 bomber-equip rotate: false - xy: 462, 225 + xy: 335, 191 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 missiles-equip rotate: false - xy: 462, 225 + xy: 335, 191 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 chain-blaster-equip rotate: false - xy: 476, 225 + xy: 335, 177 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 flakgun-equip rotate: false - xy: 191, 235 + xy: 451, 331 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 flamethrower-equip rotate: false - xy: 205, 249 + xy: 450, 317 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 heal-blaster-equip rotate: false - xy: 193, 221 + xy: 450, 289 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 shockgun-equip rotate: false - xy: 221, 201 + xy: 411, 250 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 swarmer-equip rotate: false - xy: 235, 257 + xy: 425, 240 size: 12, 12 orig: 12, 12 offset: 0, 0 diff --git a/core/assets/sprites/sprites.png b/core/assets/sprites/sprites.png index 3d718905d4..f033f01ac6 100644 Binary files a/core/assets/sprites/sprites.png and b/core/assets/sprites/sprites.png differ diff --git a/core/src/io/anuke/mindustry/content/AmmoTypes.java b/core/src/io/anuke/mindustry/content/AmmoTypes.java index e3c4f6baa5..719d71c014 100644 --- a/core/src/io/anuke/mindustry/content/AmmoTypes.java +++ b/core/src/io/anuke/mindustry/content/AmmoTypes.java @@ -217,7 +217,7 @@ public class AmmoTypes implements ContentList{ spectreLaser = new AmmoType(TurretBullets.lancerLaser); - meltdownLaser = new AmmoType(TurretBullets.lancerLaser); + meltdownLaser = new AmmoType(TurretBullets.meltdownLaser); fuseShotgun = new AmmoType(Items.densealloy, TurretBullets.fuseShot, 1f){{ shootEffect = Fx.none; diff --git a/core/src/io/anuke/mindustry/content/Recipes.java b/core/src/io/anuke/mindustry/content/Recipes.java index d72209ad1a..8352554e88 100644 --- a/core/src/io/anuke/mindustry/content/Recipes.java +++ b/core/src/io/anuke/mindustry/content/Recipes.java @@ -19,8 +19,8 @@ public class Recipes implements ContentList{ new Recipe(defense, DefenseBlocks.copperWall, new ItemStack(Items.copper, 12)); new Recipe(defense, DefenseBlocks.copperWallLarge, new ItemStack(Items.copper, 12 * 4)); - new Recipe(defense, DefenseBlocks.compositeWall, new ItemStack(Items.densealloy, 12)); - new Recipe(defense, DefenseBlocks.compositeWallLarge, new ItemStack(Items.densealloy, 12 * 4)); + new Recipe(defense, DefenseBlocks.denseAlloyWall, new ItemStack(Items.densealloy, 12)); + new Recipe(defense, DefenseBlocks.denseAlloyWallLarge, new ItemStack(Items.densealloy, 12 * 4)); new Recipe(defense, DefenseBlocks.door, new ItemStack(Items.densealloy, 12), new ItemStack(Items.silicon, 8)); new Recipe(defense, DefenseBlocks.doorLarge, new ItemStack(Items.densealloy, 12 * 4), new ItemStack(Items.silicon, 8 * 4)); @@ -35,7 +35,7 @@ public class Recipes implements ContentList{ new Recipe(defense, DefenseBlocks.surgeWallLarge, new ItemStack(Items.surgealloy, 12 * 4)); //projectors - new Recipe(defense, DefenseBlocks.mendProjector, new ItemStack(Items.lead, 200), new ItemStack(Items.densealloy, 150), new ItemStack(Items.titanium, 150), new ItemStack(Items.silicon, 250)); + new Recipe(defense, DefenseBlocks.mendProjector, new ItemStack(Items.lead, 200), new ItemStack(Items.densealloy, 150), new ItemStack(Items.titanium, 50), new ItemStack(Items.silicon, 250)); new Recipe(defense, DefenseBlocks.overdriveProjector, new ItemStack(Items.lead, 200), new ItemStack(Items.densealloy, 150), new ItemStack(Items.titanium, 150), new ItemStack(Items.silicon, 250)); new Recipe(defense, DefenseBlocks.forceProjector, new ItemStack(Items.lead, 200), new ItemStack(Items.densealloy, 150), new ItemStack(Items.titanium, 150), new ItemStack(Items.silicon, 250)); diff --git a/core/src/io/anuke/mindustry/content/blocks/CraftingBlocks.java b/core/src/io/anuke/mindustry/content/blocks/CraftingBlocks.java index ad48d3e678..b2bb8fc7a8 100644 --- a/core/src/io/anuke/mindustry/content/blocks/CraftingBlocks.java +++ b/core/src/io/anuke/mindustry/content/blocks/CraftingBlocks.java @@ -57,7 +57,7 @@ public class CraftingBlocks extends BlockList implements ContentList{ plastaniumCompressor = new PlastaniumCompressor("plastanium-compressor"){{ hasItems = true; liquidCapacity = 60f; - craftTime = 80f; + craftTime = 60f; output = Items.plastanium; itemCapacity = 30; size = 2; @@ -67,7 +67,7 @@ public class CraftingBlocks extends BlockList implements ContentList{ updateEffect = BlockFx.plasticburn; consumes.liquid(Liquids.oil, 0.25f); - consumes.power(0.25f); + consumes.power(0.3f); consumes.item(Items.titanium, 2); }}; diff --git a/core/src/io/anuke/mindustry/content/blocks/DebugBlocks.java b/core/src/io/anuke/mindustry/content/blocks/DebugBlocks.java index d459561901..a6f335bedb 100644 --- a/core/src/io/anuke/mindustry/content/blocks/DebugBlocks.java +++ b/core/src/io/anuke/mindustry/content/blocks/DebugBlocks.java @@ -114,10 +114,9 @@ public class DebugBlocks extends BlockList implements ContentList{ for(int i = 0; i < items.size; i++){ if(i == 0) continue; final int f = i; - ImageButton button = cont.addImageButton("white", "toggle", 24, () -> { + ImageButton button = cont.addImageButton("liquid-icon-" + items.get(i).name, "toggle", 24, () -> { Call.setLiquidSourceLiquid(null, tile, items.get(f)); }).size(38, 42).padBottom(-5.1f).group(group).get(); - button.getStyle().imageUpColor = items.get(i).color; button.setChecked(entity.source.id == f); if(i % 4 == 3){ diff --git a/core/src/io/anuke/mindustry/content/blocks/DefenseBlocks.java b/core/src/io/anuke/mindustry/content/blocks/DefenseBlocks.java index 001ab1d461..5c94f5ca00 100644 --- a/core/src/io/anuke/mindustry/content/blocks/DefenseBlocks.java +++ b/core/src/io/anuke/mindustry/content/blocks/DefenseBlocks.java @@ -7,7 +7,7 @@ import io.anuke.mindustry.world.Block; import io.anuke.mindustry.world.blocks.defense.*; public class DefenseBlocks extends BlockList implements ContentList{ - public static Block copperWall, copperWallLarge, compositeWall, compositeWallLarge, thoriumWall, thoriumWallLarge, door, doorLarge, + public static Block copperWall, copperWallLarge, denseAlloyWall, denseAlloyWallLarge, thoriumWall, thoriumWallLarge, door, doorLarge, phaseWall, phaseWallLarge, surgeWall, surgeWallLarge, mendProjector, overdriveProjector, forceProjector, shockMine; @Override @@ -23,11 +23,11 @@ public class DefenseBlocks extends BlockList implements ContentList{ size = 2; }}; - compositeWall = new Wall("composite-wall"){{ + denseAlloyWall = new Wall("dense-alloy-wall"){{ health = 110 * wallHealthMultiplier; }}; - compositeWallLarge = new Wall("composite-wall-large"){{ + denseAlloyWallLarge = new Wall("dense-alloy-wall-large"){{ health = 110 * wallHealthMultiplier * 4; size = 2; }}; diff --git a/core/src/io/anuke/mindustry/content/blocks/LiquidBlocks.java b/core/src/io/anuke/mindustry/content/blocks/LiquidBlocks.java index f1250f97a5..4333317e7a 100644 --- a/core/src/io/anuke/mindustry/content/blocks/LiquidBlocks.java +++ b/core/src/io/anuke/mindustry/content/blocks/LiquidBlocks.java @@ -19,7 +19,7 @@ public class LiquidBlocks extends BlockList implements ContentList{ rotaryPump = new Pump("rotary-pump"){{ shadow = "shadow-rounded-2"; - pumpAmount = 0.25f; + pumpAmount = 0.2f; consumes.power(0.015f); liquidCapacity = 30f; powerCapacity = 20f; @@ -30,7 +30,7 @@ public class LiquidBlocks extends BlockList implements ContentList{ thermalPump = new Pump("thermal-pump"){{ shadow = "shadow-rounded-2"; - pumpAmount = 0.55f; + pumpAmount = 0.3f; consumes.power(0.03f); liquidCapacity = 40f; hasPower = true; diff --git a/core/src/io/anuke/mindustry/content/blocks/PowerBlocks.java b/core/src/io/anuke/mindustry/content/blocks/PowerBlocks.java index 2f05e92717..6a193ef9ef 100644 --- a/core/src/io/anuke/mindustry/content/blocks/PowerBlocks.java +++ b/core/src/io/anuke/mindustry/content/blocks/PowerBlocks.java @@ -22,7 +22,7 @@ public class PowerBlocks extends BlockList implements ContentList{ thermalGenerator = new LiquidHeatGenerator("thermal-generator"){{ maxLiquidGenerate = 0.5f; powerCapacity = 40f; - powerPerLiquid = 1.5f; + powerPerLiquid = 1f; generateEffect = BlockFx.redgeneratespark; size = 2; }}; diff --git a/core/src/io/anuke/mindustry/content/blocks/TurretBlocks.java b/core/src/io/anuke/mindustry/content/blocks/TurretBlocks.java index e759fdb96e..6e226dcf5e 100644 --- a/core/src/io/anuke/mindustry/content/blocks/TurretBlocks.java +++ b/core/src/io/anuke/mindustry/content/blocks/TurretBlocks.java @@ -82,7 +82,7 @@ public class TurretBlocks extends BlockList implements ContentList{ }; }}; - lancer = new LaserTurret("lancer"){{ + lancer = new ChargeTurret("lancer"){{ range = 90f; chargeTime = 60f; chargeMaxDelay = 30f; @@ -105,7 +105,7 @@ public class TurretBlocks extends BlockList implements ContentList{ arc = new PowerTurret("arc"){{ shootType = AmmoTypes.arc; - reload = 30f; + reload = 40f; shootShake = 1f; powerUsed = 5f; powerCapacity = 30f; @@ -216,10 +216,13 @@ public class TurretBlocks extends BlockList implements ContentList{ spectre = new DoubleTurret("spectre"){{ ammoTypes = new AmmoType[]{AmmoTypes.bulletDenseBig, AmmoTypes.bulletPyratiteBig, AmmoTypes.bulletThoriumBig}; - reload = 4f; - restitution = 0.03f; - ammoUseEffect = ShootFx.shellEjectMedium; + reload = 6f; + coolantMultiplier = 0.5f; + maxCoolantUsed = 1.5f; + restitution = 0.1f; + ammoUseEffect = ShootFx.shellEjectBig; range = 200f; + inaccuracy = 3f; recoil = 3f; xRand = 3f; shotWidth = 4f; @@ -231,9 +234,19 @@ public class TurretBlocks extends BlockList implements ContentList{ health = 155 * size * size; }}; - meltdown = new PowerTurret("meltdown"){{ + meltdown = new LaserTurret("meltdown"){{ shootType = AmmoTypes.meltdownLaser; + shootEffect = ShootFx.shootBigSmoke2; + shootCone = 40f; + recoil = 4f; size = 4; + shootShake = 2f; + powerUsed = 10f; + range = 160f; + reload = 130f; + firingMoveFract = 0.25f; + shootDuration = 180f; + powerCapacity = 50f; }}; } } diff --git a/core/src/io/anuke/mindustry/content/bullets/TurretBullets.java b/core/src/io/anuke/mindustry/content/bullets/TurretBullets.java index 4c04f62e30..cc3d403eee 100644 --- a/core/src/io/anuke/mindustry/content/bullets/TurretBullets.java +++ b/core/src/io/anuke/mindustry/content/bullets/TurretBullets.java @@ -20,10 +20,7 @@ import io.anuke.mindustry.world.Tile; import io.anuke.mindustry.world.blocks.distribution.MassDriver.DriverBulletData; import io.anuke.ucore.core.Effects; import io.anuke.ucore.core.Timers; -import io.anuke.ucore.graphics.Draw; -import io.anuke.ucore.graphics.Fill; -import io.anuke.ucore.graphics.Lines; -import io.anuke.ucore.graphics.Shapes; +import io.anuke.ucore.graphics.*; import io.anuke.ucore.util.Angles; import io.anuke.ucore.util.Mathf; @@ -31,7 +28,7 @@ import static io.anuke.mindustry.Vars.content; import static io.anuke.mindustry.Vars.world; public class TurretBullets extends BulletList implements ContentList{ - public static BulletType fireball, basicFlame, lancerLaser, fuseShot, waterShot, cryoShot, lavaShot, oilShot, lightning, driverBolt, healBullet, arc; + public static BulletType fireball, basicFlame, lancerLaser, meltdownLaser, fuseShot, waterShot, cryoShot, lavaShot, oilShot, lightning, driverBolt, healBullet, arc; @Override public void load(){ @@ -161,6 +158,55 @@ public class TurretBullets extends BulletList implements ContentList{ } }; + meltdownLaser = new BulletType(0.001f, 20){ + Color tmpColor = new Color(); + Color[] colors = {Color.valueOf("ec745855"), Color.valueOf("ec7458aa"), Color.valueOf("ff9c5a"), Color.WHITE}; + float[] tscales = {1f, 0.7f, 0.5f, 0.2f}; + float[] strokes = {2f, 1.5f, 1f, 0.3f}; + float[] lenscales = {1f, 1.12f, 1.15f, 1.17f}; + float length = 200f; + + { + hiteffect = BulletFx.hitMeltdown; + despawneffect = Fx.none; + hitsize = 4; + lifetime = 16f; + pierce = true; + } + + @Override + public void update(Bullet b){ + if(b.timer.get(1, 5f)){ + Damage.collideLine(b, b.getTeam(), hiteffect, b.x, b.y, b.angle(), length); + } + Effects.shake(1f, 1f, b.x, b.y); + } + + @Override + public void hit(Bullet b, float hitx, float hity){ + Effects.effect(hiteffect, colors[2], hitx, hity); + if(Mathf.chance(0.4)){ + Fire.create(world.tileWorld(hitx, hity)); + } + } + + @Override + public void draw(Bullet b){ + float baseLen = (length) * b.fout(); + + Lines.lineAngle(b.x, b.y, b.angle(), baseLen); + for(int s = 0; s < colors.length; s++){ + Draw.color(tmpColor.set(colors[s]).mul(1f + Mathf.absin(Timers.time(), 1f, 0.1f))); + for(int i = 0; i < tscales.length; i++){ + vector.trns(b.angle() + 180f, (lenscales[i] - 1f) * 35f); + Lines.stroke((9f + Mathf.absin(Timers.time(), 0.8f, 1.5f)) * b.fout() * strokes[s] * tscales[i]); + Lines.lineAngle(b.x + vector.x, b.y + vector.y, b.angle(), baseLen * lenscales[i], CapStyle.none); + } + } + Draw.reset(); + } + }; + fuseShot = new BulletType(0.01f, 70){ int rays = 3; float raySpace = 2f; diff --git a/core/src/io/anuke/mindustry/content/fx/BulletFx.java b/core/src/io/anuke/mindustry/content/fx/BulletFx.java index 7be0b2c412..5bcfb50a7f 100644 --- a/core/src/io/anuke/mindustry/content/fx/BulletFx.java +++ b/core/src/io/anuke/mindustry/content/fx/BulletFx.java @@ -11,7 +11,7 @@ import io.anuke.ucore.util.Angles; import io.anuke.ucore.util.Mathf; public class BulletFx extends FxList implements ContentList{ - public static Effect hitBulletSmall, hitFuse, hitBulletBig, hitFlameSmall, hitLiquid, hitLaser, hitLancer, despawn, flakExplosion, blastExplosion, plasticExplosion, + public static Effect hitBulletSmall, hitFuse, hitBulletBig, hitFlameSmall, hitLiquid, hitLaser, hitLancer, hitMeltdown, despawn, flakExplosion, blastExplosion, plasticExplosion, artilleryTrail, incendTrail, missileTrail, absorb, flakExplosionBig, plasticExplosionFlak; @Override @@ -101,6 +101,18 @@ public class BulletFx extends FxList implements ContentList{ Draw.reset(); }); + hitMeltdown = new Effect(12, e -> { + Draw.color(Palette.meltdownHit); + Lines.stroke(e.fout() * 2f); + + Angles.randLenVectors(e.id, 6, e.finpow() * 18f, e.rotation, 360f, (x, y) -> { + float ang = Mathf.atan2(x, y); + Lines.lineAngle(e.x + x, e.y + y, ang, e.fout() * 4 + 1f); + }); + + Draw.reset(); + }); + hitLaser = new Effect(8, e -> { Draw.color(Color.WHITE, Palette.heal, e.fin()); Lines.stroke(0.5f + e.fout()); diff --git a/core/src/io/anuke/mindustry/entities/Player.java b/core/src/io/anuke/mindustry/entities/Player.java index 7daea8e4d8..97d92672e3 100644 --- a/core/src/io/anuke/mindustry/entities/Player.java +++ b/core/src/io/anuke/mindustry/entities/Player.java @@ -102,6 +102,11 @@ public class Player extends Unit implements BuilderTrait, CarryTrait, ShooterTra player.onDeath(); } + @Override + public float getDrag(){ + return mech.drag; + } + @Override public Timer getTimer(){ return timer; @@ -431,6 +436,8 @@ public class Player extends Unit implements BuilderTrait, CarryTrait, ShooterTra //region update methods + float lastx, lasty; + @Override public void update(){ hitTime -= Timers.delta(); diff --git a/core/src/io/anuke/mindustry/entities/Predict.java b/core/src/io/anuke/mindustry/entities/Predict.java index 06f86b540c..09d589bffd 100644 --- a/core/src/io/anuke/mindustry/entities/Predict.java +++ b/core/src/io/anuke/mindustry/entities/Predict.java @@ -53,7 +53,9 @@ public class Predict{ * See {@link #intercept(float, float, float, float, float, float, float)}. */ public static Vector2 intercept(TargetTrait src, TargetTrait dst, float v){ - return intercept(src.getX(), src.getY(), dst.getX(), dst.getY(), dst.getVelocity().x - src.getVelocity().x, dst.getVelocity().x - src.getVelocity().y, v); + return intercept(src.getX(), src.getY(), dst.getX(), dst.getY(), + dst.getTargetVelocityX() - src.getTargetVelocityX(), + dst.getTargetVelocityY() - src.getTargetVelocityY(), v); } private static Vector2 quad(float a, float b, float c){ diff --git a/core/src/io/anuke/mindustry/entities/Unit.java b/core/src/io/anuke/mindustry/entities/Unit.java index c8e33d4327..345bb34f75 100644 --- a/core/src/io/anuke/mindustry/entities/Unit.java +++ b/core/src/io/anuke/mindustry/entities/Unit.java @@ -207,13 +207,15 @@ public abstract class Unit extends DestructibleEntity implements SaveTrait, Targ /**Updates velocity and status effects.*/ public void updateVelocityStatus(float drag, float maxVelocity){ + Floor floor = getFloorOn(); + + if(isCarried()){ //carried units do not take into account velocity normally set(carrier.getX(), carrier.getY()); velocity.set(carrier.getVelocity()); return; } - Floor floor = getFloorOn(); Tile tile = world.tileWorld(x, y); status.update(this); diff --git a/core/src/io/anuke/mindustry/entities/bullet/Bullet.java b/core/src/io/anuke/mindustry/entities/bullet/Bullet.java index 96989cd5d1..d7142d6e8a 100644 --- a/core/src/io/anuke/mindustry/entities/bullet/Bullet.java +++ b/core/src/io/anuke/mindustry/entities/bullet/Bullet.java @@ -37,23 +37,23 @@ public class Bullet extends BulletEntity implements TeamTrait, SyncT public Bullet(){ } - public static void create(BulletType type, TeamTrait owner, float x, float y, float angle){ - create(type, owner, owner.getTeam(), x, y, angle); + public static Bullet create(BulletType type, TeamTrait owner, float x, float y, float angle){ + return create(type, owner, owner.getTeam(), x, y, angle); } - public static void create(BulletType type, Entity owner, Team team, float x, float y, float angle){ - create(type, owner, team, x, y, angle, 1f); + public static Bullet create(BulletType type, Entity owner, Team team, float x, float y, float angle){ + return create(type, owner, team, x, y, angle, 1f); } - public static void create(BulletType type, Entity owner, Team team, float x, float y, float angle, float velocityScl){ - create(type, owner, team, x, y, angle, velocityScl, 1f, null); + public static Bullet create(BulletType type, Entity owner, Team team, float x, float y, float angle, float velocityScl){ + return create(type, owner, team, x, y, angle, velocityScl, 1f, null); } - public static void create(BulletType type, Entity owner, Team team, float x, float y, float angle, float velocityScl, float lifetimeScl){ - create(type, owner, team, x, y, angle, velocityScl, lifetimeScl, null); + public static Bullet create(BulletType type, Entity owner, Team team, float x, float y, float angle, float velocityScl, float lifetimeScl){ + return create(type, owner, team, x, y, angle, velocityScl, lifetimeScl, null); } - public static void create(BulletType type, Entity owner, Team team, float x, float y, float angle, float velocityScl, float lifetimeScl, Object data){ + public static Bullet create(BulletType type, Entity owner, Team team, float x, float y, float angle, float velocityScl, float lifetimeScl, Object data){ Bullet bullet = Pooling.obtain(Bullet.class, Bullet::new); bullet.type = type; bullet.owner = owner; @@ -78,14 +78,15 @@ public class Bullet extends BulletEntity implements TeamTrait, SyncT bullet.set(x, y); bullet.add(); + return bullet; } - public static void create(BulletType type, Bullet parent, float x, float y, float angle){ - create(type, parent.owner, parent.team, x, y, angle); + public static Bullet create(BulletType type, Bullet parent, float x, float y, float angle){ + return create(type, parent.owner, parent.team, x, y, angle); } - public static void create(BulletType type, Bullet parent, float x, float y, float angle, float velocityScl){ - create(type, parent.owner, parent.team, x, y, angle, velocityScl); + public static Bullet create(BulletType type, Bullet parent, float x, float y, float angle, float velocityScl){ + return create(type, parent.owner, parent.team, x, y, angle, velocityScl); } @Remote(called = Loc.server) diff --git a/core/src/io/anuke/mindustry/entities/traits/BuilderTrait.java b/core/src/io/anuke/mindustry/entities/traits/BuilderTrait.java index ad1e47af88..74086d14fb 100644 --- a/core/src/io/anuke/mindustry/entities/traits/BuilderTrait.java +++ b/core/src/io/anuke/mindustry/entities/traits/BuilderTrait.java @@ -238,19 +238,20 @@ public interface BuilderTrait extends Entity{ /**Do not call directly.*/ default void updateMining(Unit unit){ Tile tile = getMineTile(); + TileEntity core = unit.getClosestCore(); - if(tile.block() != Blocks.air || unit.distanceTo(tile.worldx(), tile.worldy()) > mineDistance || !unit.inventory.canAcceptItem(tile.floor().drops.item)){ + if(core == null || tile.block() != Blocks.air || unit.distanceTo(tile.worldx(), tile.worldy()) > mineDistance || !unit.inventory.canAcceptItem(tile.floor().drops.item)){ setMineTile(null); }else{ Item item = tile.floor().drops.item; unit.rotation = Mathf.slerpDelta(unit.rotation, unit.angleTo(tile.worldx(), tile.worldy()), 0.4f); - if(unit.inventory.canAcceptItem(item) && + if(core.items.get(item) < core.tile.block().getMaximumAccepted(core.tile, item) && Mathf.chance(Timers.delta() * (0.06 - item.hardness * 0.01) * getMinePower())){ - Call.transferItemToUnit(item, - tile.worldx() + Mathf.range(tilesize / 2f), - tile.worldy() + Mathf.range(tilesize / 2f), - unit); + + Call.transferItemTo(item, 1, + tile.worldx() + Mathf.range(tilesize / 2f), + tile.worldy() + Mathf.range(tilesize / 2f), core.tile); } if(Mathf.chance(0.06 * Timers.delta())){ diff --git a/core/src/io/anuke/mindustry/entities/traits/TargetTrait.java b/core/src/io/anuke/mindustry/entities/traits/TargetTrait.java index f63cca760f..df50f23a1c 100644 --- a/core/src/io/anuke/mindustry/entities/traits/TargetTrait.java +++ b/core/src/io/anuke/mindustry/entities/traits/TargetTrait.java @@ -2,6 +2,7 @@ package io.anuke.mindustry.entities.traits; import io.anuke.mindustry.game.Team; import io.anuke.ucore.entities.trait.PosTrait; +import io.anuke.ucore.entities.trait.SolidTrait; import io.anuke.ucore.entities.trait.VelocityTrait; /** @@ -13,6 +14,22 @@ public interface TargetTrait extends PosTrait, VelocityTrait{ Team getTeam(); + default float getTargetVelocityX(){ + if(this instanceof SolidTrait){ + return getX() - ((SolidTrait) this).lastPosition().x; + }else{ + return getVelocity().x; + } + } + + default float getTargetVelocityY(){ + if(this instanceof SolidTrait){ + return getY() - ((SolidTrait) this).lastPosition().y; + }else{ + return getVelocity().y; + } + } + /** * Whether this entity is a valid target. */ diff --git a/core/src/io/anuke/mindustry/entities/units/BaseUnit.java b/core/src/io/anuke/mindustry/entities/units/BaseUnit.java index 88001cdcaa..cbe63c5118 100644 --- a/core/src/io/anuke/mindustry/entities/units/BaseUnit.java +++ b/core/src/io/anuke/mindustry/entities/units/BaseUnit.java @@ -82,6 +82,11 @@ public abstract class BaseUnit extends Unit implements ShooterTrait{ threads.runDelay(unit::remove); } + @Override + public float getDrag(){ + return type.drag; + } + /**Called when a command is recieved from the command center.*/ public abstract void onCommand(UnitCommand command); diff --git a/core/src/io/anuke/mindustry/entities/units/UnitDrops.java b/core/src/io/anuke/mindustry/entities/units/UnitDrops.java index f5ee1996de..4965979f8e 100644 --- a/core/src/io/anuke/mindustry/entities/units/UnitDrops.java +++ b/core/src/io/anuke/mindustry/entities/units/UnitDrops.java @@ -1,17 +1,14 @@ package io.anuke.mindustry.entities.units; -import io.anuke.mindustry.Vars; -import io.anuke.mindustry.content.Items; -import io.anuke.mindustry.entities.effect.ItemDrop; -import io.anuke.mindustry.game.Team; import io.anuke.mindustry.type.Item; -import io.anuke.ucore.util.Mathf; public class UnitDrops{ private static final int maxItems = 200; private static Item[] dropTable; public static void dropItems(BaseUnit unit){ + //just don't drop anything for now + /* if(Vars.itemGroup.size() > maxItems || unit.getTeam() != Team.red){ return; } @@ -28,6 +25,6 @@ public class UnitDrops{ unit.getVelocity().x + Mathf.range(3f), unit.getVelocity().y + Mathf.range(3f)); } } - } + }*/ } } diff --git a/core/src/io/anuke/mindustry/graphics/Palette.java b/core/src/io/anuke/mindustry/graphics/Palette.java index cca2e5bbd4..517351e315 100644 --- a/core/src/io/anuke/mindustry/graphics/Palette.java +++ b/core/src/io/anuke/mindustry/graphics/Palette.java @@ -13,6 +13,8 @@ public class Palette{ missileYellow = Color.valueOf("ffd2ae"), missileYellowBack = Color.valueOf("e58956"), + meltdownHit = Color.valueOf("ffb98b"), + plastaniumBack = Color.valueOf("d8d97f"), plastaniumFront = Color.valueOf("fffac6"), diff --git a/core/src/io/anuke/mindustry/world/blocks/defense/turrets/ChargeTurret.java b/core/src/io/anuke/mindustry/world/blocks/defense/turrets/ChargeTurret.java new file mode 100644 index 0000000000..9b6a6a4563 --- /dev/null +++ b/core/src/io/anuke/mindustry/world/blocks/defense/turrets/ChargeTurret.java @@ -0,0 +1,70 @@ +package io.anuke.mindustry.world.blocks.defense.turrets; + +import io.anuke.mindustry.content.fx.Fx; +import io.anuke.mindustry.entities.TileEntity; +import io.anuke.mindustry.type.AmmoType; +import io.anuke.mindustry.world.Tile; +import io.anuke.ucore.core.Effects; +import io.anuke.ucore.core.Effects.Effect; +import io.anuke.ucore.core.Timers; +import io.anuke.ucore.util.Mathf; + +import static io.anuke.mindustry.Vars.tilesize; + +public class ChargeTurret extends PowerTurret{ + + protected float chargeTime = 30f; + protected int chargeEffects = 5; + protected float chargeMaxDelay = 10f; + protected Effect chargeEffect = Fx.none; + protected Effect chargeBeginEffect = Fx.none; + + public ChargeTurret(String name){ + super(name); + } + + @Override + public void shoot(Tile tile, AmmoType ammo){ + LaserTurretEntity entity = tile.entity(); + + useAmmo(tile); + + tr.trns(entity.rotation, size * tilesize / 2); + Effects.effect(chargeBeginEffect, tile.drawx() + tr.x, tile.drawy() + tr.y, entity.rotation); + + for(int i = 0; i < chargeEffects; i++){ + Timers.run(Mathf.random(chargeMaxDelay), () -> { + if(!isTurret(tile)) return; + tr.trns(entity.rotation, size * tilesize / 2); + Effects.effect(chargeEffect, tile.drawx() + tr.x, tile.drawy() + tr.y, entity.rotation); + }); + } + + entity.shooting = true; + + Timers.run(chargeTime, () -> { + if(!isTurret(tile)) return; + tr.trns(entity.rotation, size * tilesize / 2); + entity.recoil = recoil; + entity.heat = 1f; + bullet(tile, ammo.bullet, entity.rotation + Mathf.range(inaccuracy)); + effects(tile); + entity.shooting = false; + }); + } + + @Override + public boolean shouldTurn(Tile tile){ + LaserTurretEntity entity = tile.entity(); + return !entity.shooting; + } + + @Override + public TileEntity getEntity(){ + return new LaserTurretEntity(); + } + + public class LaserTurretEntity extends TurretEntity{ + public boolean shooting; + } +} diff --git a/core/src/io/anuke/mindustry/world/blocks/defense/turrets/CooledTurret.java b/core/src/io/anuke/mindustry/world/blocks/defense/turrets/CooledTurret.java index 62c832f6ac..8aee521de2 100644 --- a/core/src/io/anuke/mindustry/world/blocks/defense/turrets/CooledTurret.java +++ b/core/src/io/anuke/mindustry/world/blocks/defense/turrets/CooledTurret.java @@ -1,7 +1,6 @@ package io.anuke.mindustry.world.blocks.defense.turrets; import io.anuke.mindustry.content.fx.BlockFx; -import io.anuke.mindustry.entities.effect.Fire; import io.anuke.mindustry.type.Liquid; import io.anuke.mindustry.world.Tile; import io.anuke.mindustry.world.consumers.ConsumeLiquidFilter; @@ -13,14 +12,10 @@ import io.anuke.ucore.util.Mathf; import static io.anuke.mindustry.Vars.tilesize; public class CooledTurret extends Turret{ - /** - * How much reload is lowered by for each unit of liquid of heat capacity 1. - */ + /**How much reload is lowered by for each unit of liquid of heat capacity 1.*/ protected float coolantMultiplier = 1f; - /** - * Max coolant used per tick. - */ - protected float maxUsed = 1f; + /**Max coolant used per tick.*/ + protected float maxCoolantUsed = 1f; protected Effect coolEffect = BlockFx.fuelburn; public CooledTurret(String name){ @@ -28,7 +23,7 @@ public class CooledTurret extends Turret{ hasLiquids = true; liquidCapacity = 20f; - consumes.add(new ConsumeLiquidFilter(liquid -> liquid.temperature <= 0.5f, 0.01f)).update(false).optional(true); + consumes.add(new ConsumeLiquidFilter(liquid -> liquid.temperature <= 0.5f && liquid.flammability < 0.1f, 0.01f)).update(false).optional(true); } @Override @@ -38,18 +33,13 @@ public class CooledTurret extends Turret{ TurretEntity entity = tile.entity(); Liquid liquid = entity.liquids.current(); - float used = Math.min(Math.min(entity.liquids.get(liquid), maxUsed * Timers.delta()), Math.max(0, ((reload - entity.reload) / coolantMultiplier) / liquid.heatCapacity)); + float used = Math.min(Math.min(entity.liquids.get(liquid), maxCoolantUsed * Timers.delta()), Math.max(0, ((reload - entity.reload) / coolantMultiplier) / liquid.heatCapacity)); entity.reload += (used * liquid.heatCapacity) / liquid.heatCapacity; entity.liquids.remove(liquid, used); if(Mathf.chance(0.04 * used)){ Effects.effect(coolEffect, tile.drawx() + Mathf.range(size * tilesize / 2f), tile.drawy() + Mathf.range(size * tilesize / 2f)); } - - //don't use oil as coolant, thanks - if(Mathf.chance(liquid.flammability / 10f * used)){ - Fire.create(tile); - } } @Override diff --git a/core/src/io/anuke/mindustry/world/blocks/defense/turrets/LaserTurret.java b/core/src/io/anuke/mindustry/world/blocks/defense/turrets/LaserTurret.java index 36e2dcebfe..6c191a1ea0 100644 --- a/core/src/io/anuke/mindustry/world/blocks/defense/turrets/LaserTurret.java +++ b/core/src/io/anuke/mindustry/world/blocks/defense/turrets/LaserTurret.java @@ -1,62 +1,65 @@ package io.anuke.mindustry.world.blocks.defense.turrets; -import io.anuke.mindustry.content.fx.Fx; import io.anuke.mindustry.entities.TileEntity; +import io.anuke.mindustry.entities.bullet.Bullet; +import io.anuke.mindustry.entities.bullet.BulletType; import io.anuke.mindustry.type.AmmoType; import io.anuke.mindustry.world.Tile; -import io.anuke.ucore.core.Effects; -import io.anuke.ucore.core.Effects.Effect; import io.anuke.ucore.core.Timers; -import io.anuke.ucore.util.Mathf; +import io.anuke.ucore.util.Angles; import static io.anuke.mindustry.Vars.tilesize; public class LaserTurret extends PowerTurret{ - - protected float chargeTime = 30f; - protected int chargeEffects = 5; - protected float chargeMaxDelay = 10f; - protected Effect chargeEffect = Fx.none; - protected Effect chargeBeginEffect = Fx.none; + protected float firingMoveFract = 0.25f; + protected float shootDuration = 100f; public LaserTurret(String name){ super(name); } @Override - public void shoot(Tile tile, AmmoType ammo){ + protected void updateShooting(Tile tile){ LaserTurretEntity entity = tile.entity(); - useAmmo(tile); - - tr.trns(entity.rotation, size * tilesize / 2); - Effects.effect(chargeBeginEffect, tile.drawx() + tr.x, tile.drawy() + tr.y, entity.rotation); - - for(int i = 0; i < chargeEffects; i++){ - Timers.run(Mathf.random(chargeMaxDelay), () -> { - if(!isTurret(tile)) return; - tr.trns(entity.rotation, size * tilesize / 2); - Effects.effect(chargeEffect, tile.drawx() + tr.x, tile.drawy() + tr.y, entity.rotation); - }); + if(entity.bulletLife > 0 && entity.bullet != null){ + tr.trns(entity.rotation, size * tilesize / 2, 0f); + entity.bullet.setRotation(entity.rotation); + entity.bullet.set(tile.drawx() + tr.x, tile.drawy() + tr.y); + entity.bullet.time(0f); + entity.heat = 1f; + entity.recoil = recoil; + entity.bulletLife -= Timers.delta(); + if(entity.bulletLife <= 0f){ + entity.bullet = null; + } + return; } - entity.shooting = true; + if(entity.reload >= reload){ + AmmoType type = peekAmmo(tile); - Timers.run(chargeTime, () -> { - if(!isTurret(tile)) return; - tr.trns(entity.rotation, size * tilesize / 2); - entity.recoil = recoil; - entity.heat = 1f; - bullet(tile, ammo.bullet, entity.rotation + Mathf.range(inaccuracy)); - effects(tile); - entity.shooting = false; - }); + shoot(tile, type); + + entity.reload = 0f; + }else{ + entity.reload += tile.entity.delta() * peekAmmo(tile).reloadMultiplier; + } } @Override - public boolean shouldTurn(Tile tile){ + protected void turnToTarget(Tile tile, float targetRot){ LaserTurretEntity entity = tile.entity(); - return !entity.shooting; + + entity.rotation = Angles.moveToward(entity.rotation, targetRot, rotatespeed * entity.delta() * (entity.bulletLife > 0f ? firingMoveFract : 1f)); + } + + @Override + protected void bullet(Tile tile, BulletType type, float angle){ + LaserTurretEntity entity = tile.entity(); + + entity.bullet = Bullet.create(type, tile.entity, tile.getTeam(), tile.drawx() + tr.x, tile.drawy() + tr.y, angle); + entity.bulletLife = shootDuration; } @Override @@ -64,7 +67,8 @@ public class LaserTurret extends PowerTurret{ return new LaserTurretEntity(); } - public class LaserTurretEntity extends TurretEntity{ - public boolean shooting; + class LaserTurretEntity extends TurretEntity{ + Bullet bullet; + float bulletLife; } } diff --git a/core/src/io/anuke/mindustry/world/blocks/defense/turrets/Turret.java b/core/src/io/anuke/mindustry/world/blocks/defense/turrets/Turret.java index 6b85975397..528cbf6a74 100644 --- a/core/src/io/anuke/mindustry/world/blocks/defense/turrets/Turret.java +++ b/core/src/io/anuke/mindustry/world/blocks/defense/turrets/Turret.java @@ -213,7 +213,7 @@ public abstract class Turret extends Block{ } if(shouldTurn(tile)){ - entity.rotation = Angles.moveToward(entity.rotation, targetRot, rotatespeed * entity.delta()); + turnToTarget(tile, targetRot); } if(Angles.angleDist(entity.rotation, targetRot) < shootCone){ @@ -235,6 +235,12 @@ public abstract class Turret extends Block{ tile.drawx(), tile.drawy(), range, e -> !e.isDead() && (!e.isFlying() || targetAir)); } + protected void turnToTarget(Tile tile, float targetRot){ + TurretEntity entity = tile.entity(); + + entity.rotation = Angles.moveToward(entity.rotation, targetRot, rotatespeed * entity.delta()); + } + public boolean shouldTurn(Tile tile){ return true; }