diff --git a/core/assets/bundles/bundle.properties b/core/assets/bundles/bundle.properties index 3c9df4a456..ccb520cafe 100644 --- a/core/assets/bundles/bundle.properties +++ b/core/assets/bundles/bundle.properties @@ -1073,7 +1073,7 @@ block.mass-conveyor.name = Mass Conveyor block.payload-router.name = Payload Router block.disassembler.name = Disassembler block.silicon-crucible.name = Silicon Crucible -block.large-overdrive-projector.name = Large Overdrive Projector +block.overdrive-dome.name = Overdrive Dome team.blue.name = blue team.crux.name = red team.sharded.name = orange diff --git a/core/assets/icons/icons.properties b/core/assets/icons/icons.properties index 191f61da38..dc1fc759ea 100755 --- a/core/assets/icons/icons.properties +++ b/core/assets/icons/icons.properties @@ -279,3 +279,4 @@ 63465=gamma|unit-gamma-medium 63464=block|unit-block-medium 63463=risso|unit-risso-medium +63462=overdrive-dome|block-overdrive-dome-medium diff --git a/core/assets/sprites/fallback/sprites.atlas b/core/assets/sprites/fallback/sprites.atlas index 39467740d2..44cb3d0565 100644 --- a/core/assets/sprites/fallback/sprites.atlas +++ b/core/assets/sprites/fallback/sprites.atlas @@ -467,7 +467,7 @@ data-processor-top index: -1 launch-pad rotate: false - xy: 1785, 849 + xy: 1589, 849 size: 96, 96 orig: 96, 96 offset: 0, 0 @@ -481,7 +481,7 @@ launch-pad-large index: -1 launch-pad-light rotate: false - xy: 1883, 849 + xy: 1687, 849 size: 96, 96 orig: 96, 96 offset: 0, 0 @@ -507,20 +507,6 @@ force-projector-top orig: 96, 96 offset: 0, 0 index: -1 -large-overdrive-projector - rotate: false - xy: 1197, 849 - size: 96, 96 - orig: 96, 96 - offset: 0, 0 - index: -1 -large-overdrive-projector-top - rotate: false - xy: 1295, 849 - size: 96, 96 - orig: 96, 96 - offset: 0, 0 - index: -1 mend-projector rotate: false xy: 397, 463 @@ -549,6 +535,20 @@ mender-top orig: 32, 32 offset: 0, 0 index: -1 +overdrive-dome + rotate: false + xy: 1279, 751 + size: 96, 96 + orig: 96, 96 + offset: 0, 0 + index: -1 +overdrive-dome-top + rotate: false + xy: 1377, 751 + size: 96, 96 + orig: 96, 96 + offset: 0, 0 + index: -1 overdrive-projector rotate: false xy: 1, 462 @@ -1083,35 +1083,35 @@ junction index: -1 mass-conveyor rotate: false - xy: 491, 837 + xy: 887, 845 size: 96, 96 orig: 96, 96 offset: 0, 0 index: -1 mass-conveyor-edge rotate: false - xy: 985, 833 + xy: 1, 840 size: 96, 96 orig: 96, 96 offset: 0, 0 index: -1 mass-conveyor-top rotate: false - xy: 1083, 833 + xy: 491, 837 size: 96, 96 orig: 96, 96 offset: 0, 0 index: -1 payload-router-top rotate: false - xy: 1083, 833 + xy: 491, 837 size: 96, 96 orig: 96, 96 offset: 0, 0 index: -1 mass-driver-base rotate: false - xy: 99, 759 + xy: 1083, 833 size: 96, 96 orig: 96, 96 offset: 0, 0 @@ -1230,28 +1230,28 @@ turbine-generator-liquid index: -1 laser-drill rotate: false - xy: 1393, 849 + xy: 1197, 849 size: 96, 96 orig: 96, 96 offset: 0, 0 index: -1 laser-drill-rim rotate: false - xy: 1491, 849 + xy: 1295, 849 size: 96, 96 orig: 96, 96 offset: 0, 0 index: -1 laser-drill-rotator rotate: false - xy: 1589, 849 + xy: 1393, 849 size: 96, 96 orig: 96, 96 offset: 0, 0 index: -1 laser-drill-top rotate: false - xy: 1687, 849 + xy: 1491, 849 size: 96, 96 orig: 96, 96 offset: 0, 0 @@ -1279,28 +1279,28 @@ mechanical-drill-top index: -1 oil-extractor rotate: false - xy: 393, 759 + xy: 197, 759 size: 96, 96 orig: 96, 96 offset: 0, 0 index: -1 oil-extractor-liquid rotate: false - xy: 1181, 751 + xy: 295, 759 size: 96, 96 orig: 96, 96 offset: 0, 0 index: -1 oil-extractor-rotator rotate: false - xy: 1279, 751 + xy: 393, 759 size: 96, 96 orig: 96, 96 offset: 0, 0 index: -1 oil-extractor-top rotate: false - xy: 1377, 751 + xy: 1181, 751 size: 96, 96 orig: 96, 96 offset: 0, 0 @@ -1559,21 +1559,21 @@ liquid-router-top index: -1 liquid-tank-bottom rotate: false - xy: 687, 845 + xy: 1785, 849 size: 96, 96 orig: 96, 96 offset: 0, 0 index: -1 liquid-tank-liquid rotate: false - xy: 887, 845 + xy: 1883, 849 size: 96, 96 orig: 96, 96 offset: 0, 0 index: -1 liquid-tank-top rotate: false - xy: 1, 840 + xy: 687, 845 size: 96, 96 orig: 96, 96 offset: 0, 0 @@ -2154,7 +2154,7 @@ melter index: -1 multi-press rotate: false - xy: 197, 759 + xy: 785, 767 size: 96, 96 orig: 96, 96 offset: 0, 0 @@ -2609,7 +2609,7 @@ multiplicative-reconstructor-top index: -1 naval-factory rotate: false - xy: 295, 759 + xy: 99, 759 size: 96, 96 orig: 96, 96 offset: 0, 0 @@ -4618,7 +4618,7 @@ mace-wreck2 index: -1 mass-driver rotate: false - xy: 785, 767 + xy: 985, 833 size: 96, 96 orig: 96, 96 offset: 0, 0 @@ -9442,23 +9442,16 @@ lancer-icon-editor orig: 64, 64 offset: 0, 0 index: -1 -large-overdrive-projector-icon-editor +laser-drill-icon-editor rotate: false xy: 1005, 791 size: 96, 96 orig: 96, 96 offset: 0, 0 index: -1 -laser-drill-icon-editor - rotate: false - xy: 1103, 791 - size: 96, 96 - orig: 96, 96 - offset: 0, 0 - index: -1 launch-pad-icon-editor rotate: false - xy: 1201, 791 + xy: 1103, 791 size: 96, 96 orig: 96, 96 offset: 0, 0 @@ -9493,7 +9486,7 @@ liquid-source-icon-editor index: -1 liquid-tank-icon-editor rotate: false - xy: 1299, 791 + xy: 1201, 791 size: 96, 96 orig: 96, 96 offset: 0, 0 @@ -9507,14 +9500,14 @@ liquid-void-icon-editor index: -1 mass-conveyor-icon-editor rotate: false - xy: 1397, 791 + xy: 1299, 791 size: 96, 96 orig: 96, 96 offset: 0, 0 index: -1 mass-driver-icon-editor rotate: false - xy: 453, 435 + xy: 1397, 791 size: 96, 96 orig: 96, 96 offset: 0, 0 @@ -9570,7 +9563,7 @@ message-icon-editor index: -1 multi-press-icon-editor rotate: false - xy: 1495, 791 + xy: 453, 435 size: 96, 96 orig: 96, 96 offset: 0, 0 @@ -9584,12 +9577,19 @@ multiplicative-reconstructor-icon-editor index: -1 naval-factory-icon-editor rotate: false - xy: 1593, 823 + xy: 1495, 791 size: 96, 96 orig: 96, 96 offset: 0, 0 index: -1 oil-extractor-icon-editor + rotate: false + xy: 1593, 823 + size: 96, 96 + orig: 96, 96 + offset: 0, 0 + index: -1 +overdrive-dome-icon-editor rotate: false xy: 1691, 823 size: 96, 96 @@ -12789,1225 +12789,1225 @@ block-lancer-xlarge orig: 48, 48 offset: 0, 0 index: -1 -block-large-overdrive-projector-large +block-laser-drill-large rotate: false xy: 737, 156 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 -block-large-overdrive-projector-medium +block-laser-drill-medium rotate: false xy: 1153, 545 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 -block-large-overdrive-projector-small +block-laser-drill-small rotate: false xy: 1693, 446 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 -block-large-overdrive-projector-tiny +block-laser-drill-tiny rotate: false xy: 1267, 193 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 -block-large-overdrive-projector-xlarge +block-laser-drill-xlarge rotate: false xy: 151, 508 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 -block-laser-drill-large +block-launch-pad-large rotate: false xy: 729, 106 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 -block-laser-drill-medium - rotate: false - xy: 1187, 545 - size: 32, 32 - orig: 32, 32 - offset: 0, 0 - index: -1 -block-laser-drill-small - rotate: false - xy: 1693, 420 - size: 24, 24 - orig: 24, 24 - offset: 0, 0 - index: -1 -block-laser-drill-tiny - rotate: false - xy: 1259, 175 - size: 16, 16 - orig: 16, 16 - offset: 0, 0 - index: -1 -block-laser-drill-xlarge - rotate: false - xy: 151, 458 - size: 48, 48 - orig: 48, 48 - offset: 0, 0 - index: -1 -block-launch-pad-large +block-launch-pad-large-large rotate: false xy: 729, 64 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 -block-launch-pad-large-large - rotate: false - xy: 729, 22 - size: 40, 40 - orig: 40, 40 - offset: 0, 0 - index: -1 block-launch-pad-large-medium rotate: false - xy: 1221, 545 + xy: 1187, 545 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-launch-pad-large-small rotate: false - xy: 1693, 394 + xy: 1693, 420 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 block-launch-pad-large-tiny rotate: false - xy: 1345, 255 + xy: 1259, 175 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 block-launch-pad-large-xlarge rotate: false - xy: 201, 508 + xy: 151, 458 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 block-launch-pad-medium rotate: false - xy: 1255, 545 + xy: 1221, 545 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-launch-pad-small rotate: false - xy: 1693, 368 + xy: 1693, 394 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 block-launch-pad-tiny rotate: false - xy: 1371, 279 + xy: 1345, 255 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 block-launch-pad-xlarge rotate: false - xy: 151, 408 + xy: 201, 508 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 block-liquid-junction-large rotate: false - xy: 779, 156 + xy: 729, 22 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 block-liquid-junction-medium rotate: false - xy: 1289, 545 + xy: 1255, 545 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-liquid-junction-small rotate: false - xy: 1693, 342 + xy: 1693, 368 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 block-liquid-junction-tiny rotate: false - xy: 1389, 279 + xy: 1371, 279 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 block-liquid-junction-xlarge rotate: false - xy: 201, 458 + xy: 151, 408 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 block-liquid-router-large rotate: false - xy: 771, 114 + xy: 779, 156 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 block-liquid-router-medium rotate: false - xy: 1323, 545 + xy: 1289, 545 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-liquid-router-small rotate: false - xy: 1693, 316 + xy: 1693, 342 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 block-liquid-router-tiny rotate: false - xy: 1407, 279 + xy: 1389, 279 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 block-liquid-router-xlarge rotate: false - xy: 151, 358 + xy: 201, 458 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 block-liquid-source-large rotate: false - xy: 771, 72 + xy: 771, 114 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 block-liquid-source-medium rotate: false - xy: 1357, 545 + xy: 1323, 545 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-liquid-source-small rotate: false - xy: 1693, 290 + xy: 1693, 316 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 block-liquid-source-tiny rotate: false - xy: 1319, 234 + xy: 1407, 279 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 block-liquid-source-xlarge rotate: false - xy: 201, 408 + xy: 151, 358 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 block-liquid-tank-large rotate: false - xy: 771, 30 + xy: 771, 72 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 block-liquid-tank-medium rotate: false - xy: 1391, 545 + xy: 1357, 545 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-liquid-tank-small rotate: false - xy: 1691, 768 + xy: 1693, 290 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 block-liquid-tank-tiny rotate: false - xy: 1337, 237 + xy: 1319, 234 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 block-liquid-tank-xlarge rotate: false - xy: 151, 308 + xy: 201, 408 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 block-liquid-void-large rotate: false - xy: 813, 114 + xy: 771, 30 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 block-liquid-void-medium rotate: false - xy: 1425, 545 + xy: 1391, 545 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-liquid-void-small rotate: false - xy: 1717, 768 + xy: 1691, 768 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 block-liquid-void-tiny rotate: false - xy: 1645, 690 + xy: 1337, 237 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 block-liquid-void-xlarge rotate: false - xy: 201, 358 + xy: 151, 308 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 block-magmarock-large rotate: false - xy: 813, 72 + xy: 813, 114 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 block-magmarock-medium rotate: false - xy: 1013, 511 + xy: 1425, 545 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-magmarock-small rotate: false - xy: 1743, 768 + xy: 1717, 768 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 block-magmarock-tiny rotate: false - xy: 1645, 672 + xy: 1645, 690 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 block-magmarock-xlarge rotate: false - xy: 151, 258 + xy: 201, 358 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 block-mass-conveyor-large rotate: false - xy: 813, 30 + xy: 813, 72 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 block-mass-conveyor-medium rotate: false - xy: 1013, 477 + xy: 1013, 511 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-mass-conveyor-small rotate: false - xy: 1769, 768 + xy: 1743, 768 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 block-mass-conveyor-tiny rotate: false - xy: 1645, 654 + xy: 1645, 672 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 block-mass-conveyor-xlarge rotate: false - xy: 201, 308 + xy: 151, 258 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 block-mass-driver-large rotate: false - xy: 821, 933 + xy: 813, 30 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 block-mass-driver-medium rotate: false - xy: 1047, 511 + xy: 1013, 477 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-mass-driver-small rotate: false - xy: 1795, 768 + xy: 1769, 768 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 block-mass-driver-tiny rotate: false - xy: 1645, 636 + xy: 1645, 654 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 block-mass-driver-xlarge rotate: false - xy: 151, 208 + xy: 201, 308 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 block-mechanical-drill-large rotate: false - xy: 863, 933 + xy: 821, 933 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 block-mechanical-drill-medium rotate: false - xy: 1013, 443 + xy: 1047, 511 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-mechanical-drill-small rotate: false - xy: 1687, 742 + xy: 1795, 768 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 block-mechanical-drill-tiny rotate: false - xy: 1645, 618 + xy: 1645, 636 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 block-mechanical-drill-xlarge rotate: false - xy: 201, 258 + xy: 151, 208 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 block-mechanical-pump-large rotate: false - xy: 905, 933 + xy: 863, 933 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 block-mechanical-pump-medium rotate: false - xy: 1047, 477 + xy: 1013, 443 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-mechanical-pump-small rotate: false - xy: 1713, 742 + xy: 1687, 742 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 block-mechanical-pump-tiny rotate: false - xy: 1645, 600 + xy: 1645, 618 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 block-mechanical-pump-xlarge rotate: false - xy: 151, 158 + xy: 201, 258 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 block-meltdown-large rotate: false - xy: 947, 933 + xy: 905, 933 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 block-meltdown-medium rotate: false - xy: 1081, 511 + xy: 1047, 477 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-meltdown-small rotate: false - xy: 1739, 742 + xy: 1713, 742 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 block-meltdown-tiny rotate: false - xy: 1433, 287 + xy: 1645, 600 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 block-meltdown-xlarge rotate: false - xy: 201, 208 + xy: 151, 158 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 block-melter-large rotate: false - xy: 989, 933 + xy: 947, 933 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 block-melter-medium rotate: false - xy: 1013, 409 + xy: 1081, 511 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-melter-small rotate: false - xy: 1765, 742 + xy: 1739, 742 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 block-melter-tiny rotate: false - xy: 1451, 287 + xy: 1433, 287 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 block-melter-xlarge rotate: false - xy: 151, 108 + xy: 201, 208 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 block-mend-projector-large rotate: false - xy: 1031, 933 + xy: 989, 933 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 block-mend-projector-medium rotate: false - xy: 1047, 443 + xy: 1013, 409 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-mend-projector-small rotate: false - xy: 1791, 742 + xy: 1765, 742 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 block-mend-projector-tiny rotate: false - xy: 1469, 287 + xy: 1451, 287 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 block-mend-projector-xlarge rotate: false - xy: 201, 158 + xy: 151, 108 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 block-mender-large rotate: false - xy: 1073, 933 + xy: 1031, 933 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 block-mender-medium rotate: false - xy: 1081, 477 + xy: 1047, 443 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-mender-small rotate: false - xy: 1821, 762 + xy: 1791, 742 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 block-mender-tiny rotate: false - xy: 1487, 284 + xy: 1469, 287 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 block-mender-xlarge rotate: false - xy: 151, 58 + xy: 201, 158 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 block-message-large rotate: false - xy: 1115, 933 + xy: 1073, 933 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 block-message-medium rotate: false - xy: 1115, 511 + xy: 1081, 477 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-message-small rotate: false - xy: 1847, 762 + xy: 1821, 762 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 block-message-tiny rotate: false - xy: 1505, 284 + xy: 1487, 284 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 block-message-xlarge rotate: false - xy: 201, 108 + xy: 151, 58 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 block-metal-floor-2-large rotate: false - xy: 1157, 933 + xy: 1115, 933 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 block-metal-floor-2-medium rotate: false - xy: 1013, 375 + xy: 1115, 511 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-metal-floor-2-small rotate: false - xy: 1873, 762 + xy: 1847, 762 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 block-metal-floor-2-tiny rotate: false - xy: 1523, 284 + xy: 1505, 284 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 block-metal-floor-2-xlarge rotate: false - xy: 201, 58 + xy: 201, 108 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 block-metal-floor-3-large rotate: false - xy: 1199, 933 + xy: 1157, 933 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 block-metal-floor-3-medium rotate: false - xy: 1047, 409 + xy: 1013, 375 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-metal-floor-3-small rotate: false - xy: 1817, 736 + xy: 1873, 762 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 block-metal-floor-3-tiny rotate: false - xy: 1541, 284 + xy: 1523, 284 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 block-metal-floor-3-xlarge rotate: false - xy: 251, 508 + xy: 201, 58 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 block-metal-floor-5-large rotate: false - xy: 1241, 933 + xy: 1199, 933 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 block-metal-floor-5-medium rotate: false - xy: 1081, 443 + xy: 1047, 409 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-metal-floor-5-small rotate: false - xy: 1843, 736 + xy: 1817, 736 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 block-metal-floor-5-tiny rotate: false - xy: 1559, 284 + xy: 1541, 284 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 block-metal-floor-5-xlarge rotate: false - xy: 251, 458 + xy: 251, 508 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 block-metal-floor-damaged-large rotate: false - xy: 1283, 933 + xy: 1241, 933 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 block-metal-floor-damaged-medium rotate: false - xy: 1115, 477 + xy: 1081, 443 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-metal-floor-damaged-small rotate: false - xy: 1869, 736 + xy: 1843, 736 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 block-metal-floor-damaged-tiny rotate: false - xy: 1577, 284 + xy: 1559, 284 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 block-metal-floor-damaged-xlarge rotate: false - xy: 251, 408 + xy: 251, 458 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 block-metal-floor-large rotate: false - xy: 1325, 933 + xy: 1283, 933 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 block-metal-floor-medium rotate: false - xy: 1149, 511 + xy: 1115, 477 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-metal-floor-small rotate: false - xy: 1649, 726 + xy: 1869, 736 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 block-metal-floor-tiny rotate: false - xy: 1595, 284 + xy: 1577, 284 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 block-metal-floor-xlarge rotate: false - xy: 251, 358 + xy: 251, 408 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 block-moss-large rotate: false - xy: 1367, 933 + xy: 1325, 933 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 block-moss-medium rotate: false - xy: 1047, 375 + xy: 1149, 511 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-moss-small rotate: false - xy: 1895, 736 + xy: 1649, 726 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 block-moss-tiny rotate: false - xy: 1173, 71 + xy: 1595, 284 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 block-moss-xlarge rotate: false - xy: 251, 308 + xy: 251, 358 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 block-multi-press-large rotate: false - xy: 1409, 933 + xy: 1367, 933 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 block-multi-press-medium rotate: false - xy: 1081, 409 + xy: 1047, 375 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-multi-press-small rotate: false - xy: 1921, 739 + xy: 1895, 736 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 block-multi-press-tiny rotate: false - xy: 1173, 53 + xy: 1173, 71 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 block-multi-press-xlarge rotate: false - xy: 251, 258 + xy: 251, 308 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 block-multiplicative-reconstructor-large rotate: false - xy: 1451, 933 + xy: 1409, 933 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 block-multiplicative-reconstructor-medium rotate: false - xy: 1115, 443 + xy: 1081, 409 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-multiplicative-reconstructor-small rotate: false - xy: 1947, 724 + xy: 1921, 739 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 block-multiplicative-reconstructor-tiny rotate: false - xy: 1173, 35 + xy: 1173, 53 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 block-multiplicative-reconstructor-xlarge rotate: false - xy: 251, 208 + xy: 251, 258 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 block-naval-factory-large rotate: false - xy: 1493, 933 + xy: 1451, 933 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 block-naval-factory-medium rotate: false - xy: 1149, 477 + xy: 1115, 443 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-naval-factory-small rotate: false - xy: 1921, 713 + xy: 1947, 724 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 block-naval-factory-tiny rotate: false - xy: 1155, 17 + xy: 1173, 35 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 block-naval-factory-xlarge rotate: false - xy: 251, 158 + xy: 251, 208 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 block-oil-extractor-large rotate: false - xy: 1535, 933 + xy: 1493, 933 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 block-oil-extractor-medium rotate: false - xy: 1183, 511 + xy: 1149, 477 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-oil-extractor-small rotate: false - xy: 1947, 698 + xy: 1921, 713 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 block-oil-extractor-tiny rotate: false - xy: 1173, 17 + xy: 1155, 17 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 block-oil-extractor-xlarge rotate: false - xy: 251, 108 + xy: 251, 158 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 block-ore-coal-large rotate: false - xy: 1577, 933 + xy: 1535, 933 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 block-ore-coal-medium rotate: false - xy: 1081, 375 + xy: 1183, 511 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-ore-coal-small rotate: false - xy: 1973, 701 + xy: 1947, 698 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 block-ore-coal-tiny rotate: false - xy: 1199, 97 + xy: 1173, 17 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 block-ore-coal-xlarge rotate: false - xy: 251, 58 + xy: 251, 108 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 block-ore-copper-large rotate: false - xy: 1619, 933 + xy: 1577, 933 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 block-ore-copper-medium rotate: false - xy: 1115, 409 + xy: 1081, 375 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-ore-copper-small rotate: false - xy: 1675, 716 + xy: 1973, 701 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 block-ore-copper-tiny rotate: false - xy: 1191, 79 + xy: 1199, 97 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 block-ore-copper-xlarge rotate: false - xy: 151, 8 + xy: 251, 58 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 block-ore-lead-large rotate: false - xy: 1661, 933 + xy: 1619, 933 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 block-ore-lead-medium rotate: false - xy: 1149, 443 + xy: 1115, 409 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-ore-lead-small rotate: false - xy: 1701, 716 + xy: 1675, 716 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 block-ore-lead-tiny rotate: false - xy: 1191, 61 + xy: 1191, 79 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 block-ore-lead-xlarge rotate: false - xy: 201, 8 + xy: 151, 8 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 block-ore-scrap-large rotate: false - xy: 1703, 933 + xy: 1661, 933 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 block-ore-scrap-medium rotate: false - xy: 1183, 477 + xy: 1149, 443 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-ore-scrap-small rotate: false - xy: 1727, 716 + xy: 1701, 716 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 block-ore-scrap-tiny rotate: false - xy: 1191, 43 + xy: 1191, 61 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 block-ore-scrap-xlarge rotate: false - xy: 251, 8 + xy: 201, 8 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 block-ore-thorium-large rotate: false - xy: 1745, 933 + xy: 1703, 933 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 block-ore-thorium-medium rotate: false - xy: 1217, 511 + xy: 1183, 477 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-ore-thorium-small rotate: false - xy: 1753, 716 + xy: 1727, 716 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 block-ore-thorium-tiny rotate: false - xy: 1191, 25 + xy: 1191, 43 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 block-ore-thorium-xlarge rotate: false - xy: 281, 619 + xy: 251, 8 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 block-ore-titanium-large rotate: false - xy: 1787, 933 + xy: 1745, 933 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 block-ore-titanium-medium rotate: false - xy: 1115, 375 + xy: 1217, 511 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-ore-titanium-small rotate: false - xy: 1779, 716 + xy: 1753, 716 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 block-ore-titanium-tiny rotate: false - xy: 1225, 123 + xy: 1191, 25 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 block-ore-titanium-xlarge + rotate: false + xy: 281, 619 + size: 48, 48 + orig: 48, 48 + offset: 0, 0 + index: -1 +block-overdrive-dome-large + rotate: false + xy: 1787, 933 + size: 40, 40 + orig: 40, 40 + offset: 0, 0 + index: -1 +block-overdrive-dome-medium + rotate: false + xy: 1115, 375 + size: 32, 32 + orig: 32, 32 + offset: 0, 0 + index: -1 +block-overdrive-dome-small + rotate: false + xy: 1779, 716 + size: 24, 24 + orig: 24, 24 + offset: 0, 0 + index: -1 +block-overdrive-dome-tiny + rotate: false + xy: 1225, 123 + size: 16, 16 + orig: 16, 16 + offset: 0, 0 + index: -1 +block-overdrive-dome-xlarge rotate: false xy: 281, 569 size: 48, 48 diff --git a/core/assets/sprites/fallback/sprites2.png b/core/assets/sprites/fallback/sprites2.png index 61ee24d7ef..6c54531d6d 100644 Binary files a/core/assets/sprites/fallback/sprites2.png and b/core/assets/sprites/fallback/sprites2.png differ diff --git a/core/assets/sprites/fallback/sprites4.png b/core/assets/sprites/fallback/sprites4.png index 183ebbdcca..12c6e236b4 100644 Binary files a/core/assets/sprites/fallback/sprites4.png and b/core/assets/sprites/fallback/sprites4.png differ diff --git a/core/assets/sprites/fallback/sprites6.png b/core/assets/sprites/fallback/sprites6.png index 1bb460f317..5b63fd03bc 100644 Binary files a/core/assets/sprites/fallback/sprites6.png and b/core/assets/sprites/fallback/sprites6.png differ diff --git a/core/assets/sprites/fallback/sprites7.png b/core/assets/sprites/fallback/sprites7.png index 19952fb37c..d562daa421 100644 Binary files a/core/assets/sprites/fallback/sprites7.png and b/core/assets/sprites/fallback/sprites7.png differ diff --git a/core/assets/sprites/sprites.atlas b/core/assets/sprites/sprites.atlas index 55d2670f76..b1afff4e6b 100644 --- a/core/assets/sprites/sprites.atlas +++ b/core/assets/sprites/sprites.atlas @@ -34,7 +34,7 @@ data-processor-top index: -1 launch-pad rotate: false - xy: 2529, 747 + xy: 2333, 685 size: 96, 96 orig: 96, 96 offset: 0, 0 @@ -48,7 +48,7 @@ launch-pad-large index: -1 launch-pad-light rotate: false - xy: 2627, 747 + xy: 2431, 747 size: 96, 96 orig: 96, 96 offset: 0, 0 @@ -74,20 +74,6 @@ force-projector-top orig: 96, 96 offset: 0, 0 index: -1 -large-overdrive-projector - rotate: false - xy: 2137, 648 - size: 96, 96 - orig: 96, 96 - offset: 0, 0 - index: -1 -large-overdrive-projector-top - rotate: false - xy: 2235, 783 - size: 96, 96 - orig: 96, 96 - offset: 0, 0 - index: -1 mend-projector rotate: false xy: 3757, 537 @@ -116,6 +102,20 @@ mender-top orig: 32, 32 offset: 0, 0 index: -1 +overdrive-dome + rotate: false + xy: 2627, 551 + size: 96, 96 + orig: 96, 96 + offset: 0, 0 + index: -1 +overdrive-dome-top + rotate: false + xy: 2725, 551 + size: 96, 96 + orig: 96, 96 + offset: 0, 0 + index: -1 overdrive-projector rotate: false xy: 3889, 537 @@ -671,35 +671,35 @@ junction index: -1 mass-conveyor rotate: false - xy: 2529, 649 + xy: 2823, 747 size: 96, 96 orig: 96, 96 offset: 0, 0 index: -1 mass-conveyor-edge rotate: false - xy: 2627, 649 + xy: 2431, 649 size: 96, 96 orig: 96, 96 offset: 0, 0 index: -1 mass-conveyor-top rotate: false - xy: 2725, 649 + xy: 2529, 649 size: 96, 96 orig: 96, 96 offset: 0, 0 index: -1 payload-router-top rotate: false - xy: 2725, 649 + xy: 2529, 649 size: 96, 96 orig: 96, 96 offset: 0, 0 index: -1 mass-driver-base rotate: false - xy: 2235, 587 + xy: 2725, 649 size: 96, 96 orig: 96, 96 offset: 0, 0 @@ -825,28 +825,28 @@ turbine-generator-liquid index: -1 laser-drill rotate: false - xy: 2235, 685 + xy: 2137, 648 size: 96, 96 orig: 96, 96 offset: 0, 0 index: -1 laser-drill-rim rotate: false - xy: 2333, 783 + xy: 2235, 783 size: 96, 96 orig: 96, 96 offset: 0, 0 index: -1 laser-drill-rotator rotate: false - xy: 2333, 685 + xy: 2235, 685 size: 96, 96 orig: 96, 96 offset: 0, 0 index: -1 laser-drill-top rotate: false - xy: 2431, 747 + xy: 2333, 783 size: 96, 96 orig: 96, 96 offset: 0, 0 @@ -874,28 +874,28 @@ mechanical-drill-top index: -1 oil-extractor rotate: false - xy: 2431, 551 + xy: 2333, 587 size: 96, 96 orig: 96, 96 offset: 0, 0 index: -1 oil-extractor-liquid rotate: false - xy: 2529, 551 + xy: 2137, 550 size: 96, 96 orig: 96, 96 offset: 0, 0 index: -1 oil-extractor-rotator rotate: false - xy: 2627, 551 + xy: 2431, 551 size: 96, 96 orig: 96, 96 offset: 0, 0 index: -1 oil-extractor-top rotate: false - xy: 2725, 551 + xy: 2529, 551 size: 96, 96 orig: 96, 96 offset: 0, 0 @@ -1154,21 +1154,21 @@ liquid-router-top index: -1 liquid-tank-bottom rotate: false - xy: 2725, 747 + xy: 2529, 747 size: 96, 96 orig: 96, 96 offset: 0, 0 index: -1 liquid-tank-liquid rotate: false - xy: 2823, 747 + xy: 2627, 747 size: 96, 96 orig: 96, 96 offset: 0, 0 index: -1 liquid-tank-top rotate: false - xy: 2431, 649 + xy: 2725, 747 size: 96, 96 orig: 96, 96 offset: 0, 0 @@ -1749,7 +1749,7 @@ melter index: -1 multi-press rotate: false - xy: 2333, 587 + xy: 2823, 649 size: 96, 96 orig: 96, 96 offset: 0, 0 @@ -2281,7 +2281,7 @@ multiplicative-reconstructor-top index: -1 naval-factory rotate: false - xy: 2137, 550 + xy: 2235, 587 size: 96, 96 orig: 96, 96 offset: 0, 0 @@ -4955,7 +4955,7 @@ mace-wreck2 index: -1 mass-driver rotate: false - xy: 2823, 649 + xy: 2627, 649 size: 96, 96 orig: 96, 96 offset: 0, 0 @@ -9430,23 +9430,16 @@ lancer-icon-editor orig: 64, 64 offset: 0, 0 index: -1 -large-overdrive-projector-icon-editor +laser-drill-icon-editor rotate: false xy: 3443, 389 size: 96, 96 orig: 96, 96 offset: 0, 0 index: -1 -laser-drill-icon-editor - rotate: false - xy: 3541, 389 - size: 96, 96 - orig: 96, 96 - offset: 0, 0 - index: -1 launch-pad-icon-editor rotate: false - xy: 3639, 389 + xy: 3541, 389 size: 96, 96 orig: 96, 96 offset: 0, 0 @@ -9481,7 +9474,7 @@ liquid-source-icon-editor index: -1 liquid-tank-icon-editor rotate: false - xy: 3737, 389 + xy: 3639, 389 size: 96, 96 orig: 96, 96 offset: 0, 0 @@ -9495,14 +9488,14 @@ liquid-void-icon-editor index: -1 mass-conveyor-icon-editor rotate: false - xy: 3835, 389 + xy: 3737, 389 size: 96, 96 orig: 96, 96 offset: 0, 0 index: -1 mass-driver-icon-editor rotate: false - xy: 3933, 389 + xy: 3835, 389 size: 96, 96 orig: 96, 96 offset: 0, 0 @@ -9558,7 +9551,7 @@ message-icon-editor index: -1 multi-press-icon-editor rotate: false - xy: 553, 67 + xy: 3933, 389 size: 96, 96 orig: 96, 96 offset: 0, 0 @@ -9572,12 +9565,19 @@ multiplicative-reconstructor-icon-editor index: -1 naval-factory-icon-editor rotate: false - xy: 651, 99 + xy: 553, 67 size: 96, 96 orig: 96, 96 offset: 0, 0 index: -1 oil-extractor-icon-editor + rotate: false + xy: 651, 99 + size: 96, 96 + orig: 96, 96 + offset: 0, 0 + index: -1 +overdrive-dome-icon-editor rotate: false xy: 749, 99 size: 96, 96 @@ -12777,1225 +12777,1225 @@ block-lancer-xlarge orig: 48, 48 offset: 0, 0 index: -1 -block-large-overdrive-projector-large +block-laser-drill-large rotate: false xy: 3785, 370 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 -block-large-overdrive-projector-medium +block-laser-drill-medium rotate: false xy: 1822, 168 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 -block-large-overdrive-projector-small +block-laser-drill-small rotate: false xy: 1724, 116 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 -block-large-overdrive-projector-tiny +block-laser-drill-tiny rotate: false xy: 1943, 72 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 -block-large-overdrive-projector-xlarge +block-laser-drill-xlarge rotate: false xy: 345, 353 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 -block-laser-drill-large +block-launch-pad-large rotate: false xy: 3827, 370 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 -block-laser-drill-medium - rotate: false - xy: 1856, 168 - size: 32, 32 - orig: 32, 32 - offset: 0, 0 - index: -1 -block-laser-drill-small - rotate: false - xy: 1750, 142 - size: 24, 24 - orig: 24, 24 - offset: 0, 0 - index: -1 -block-laser-drill-tiny - rotate: false - xy: 1943, 54 - size: 16, 16 - orig: 16, 16 - offset: 0, 0 - index: -1 -block-laser-drill-xlarge - rotate: false - xy: 395, 353 - size: 48, 48 - orig: 48, 48 - offset: 0, 0 - index: -1 -block-launch-pad-large +block-launch-pad-large-large rotate: false xy: 3869, 370 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 -block-launch-pad-large-large - rotate: false - xy: 3911, 370 - size: 40, 40 - orig: 40, 40 - offset: 0, 0 - index: -1 block-launch-pad-large-medium rotate: false - xy: 1890, 168 + xy: 1856, 168 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-launch-pad-large-small rotate: false - xy: 1750, 116 + xy: 1750, 142 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 block-launch-pad-large-tiny rotate: false - xy: 1961, 72 + xy: 1943, 54 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 block-launch-pad-large-xlarge rotate: false - xy: 445, 353 + xy: 395, 353 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 block-launch-pad-medium rotate: false - xy: 1924, 168 + xy: 1890, 168 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-launch-pad-small rotate: false - xy: 1776, 142 + xy: 1750, 116 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 block-launch-pad-tiny rotate: false - xy: 1961, 54 + xy: 1961, 72 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 block-launch-pad-xlarge rotate: false - xy: 495, 353 + xy: 445, 353 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 block-liquid-junction-large rotate: false - xy: 3953, 370 + xy: 3911, 370 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 block-liquid-junction-medium rotate: false - xy: 1958, 168 + xy: 1924, 168 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-liquid-junction-small rotate: false - xy: 1776, 116 + xy: 1776, 142 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 block-liquid-junction-tiny rotate: false - xy: 1979, 72 + xy: 1961, 54 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 block-liquid-junction-xlarge rotate: false - xy: 545, 353 + xy: 495, 353 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 block-liquid-router-large rotate: false - xy: 3995, 370 + xy: 3953, 370 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 block-liquid-router-medium rotate: false - xy: 1992, 168 + xy: 1958, 168 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-liquid-router-small rotate: false - xy: 1802, 142 + xy: 1776, 116 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 block-liquid-router-tiny rotate: false - xy: 1979, 54 + xy: 1979, 72 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 block-liquid-router-xlarge rotate: false - xy: 595, 353 + xy: 545, 353 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 block-liquid-source-large rotate: false - xy: 859, 328 + xy: 3995, 370 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 block-liquid-source-medium rotate: false - xy: 2026, 168 + xy: 1992, 168 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-liquid-source-small rotate: false - xy: 1802, 116 + xy: 1802, 142 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 block-liquid-source-tiny rotate: false - xy: 1997, 72 + xy: 1979, 54 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 block-liquid-source-xlarge rotate: false - xy: 645, 353 + xy: 595, 353 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 block-liquid-tank-large rotate: false - xy: 859, 286 + xy: 859, 328 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 block-liquid-tank-medium rotate: false - xy: 2060, 168 + xy: 2026, 168 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-liquid-tank-small rotate: false - xy: 1828, 142 + xy: 1802, 116 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 block-liquid-tank-tiny rotate: false - xy: 1997, 54 + xy: 1997, 72 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 block-liquid-tank-xlarge rotate: false - xy: 695, 353 + xy: 645, 353 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 block-liquid-void-large rotate: false - xy: 901, 328 + xy: 859, 286 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 block-liquid-void-medium rotate: false - xy: 2094, 168 + xy: 2060, 168 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-liquid-void-small rotate: false - xy: 1828, 116 + xy: 1828, 142 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 block-liquid-void-tiny rotate: false - xy: 2015, 72 + xy: 1997, 54 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 block-liquid-void-xlarge rotate: false - xy: 231, 95 + xy: 695, 353 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 block-magmarock-large rotate: false - xy: 859, 244 + xy: 901, 328 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 block-magmarock-medium rotate: false - xy: 2128, 168 + xy: 2094, 168 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-magmarock-small rotate: false - xy: 1854, 142 + xy: 1828, 116 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 block-magmarock-tiny rotate: false - xy: 2015, 54 + xy: 2015, 72 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 block-magmarock-xlarge rotate: false - xy: 231, 45 + xy: 231, 95 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 block-mass-conveyor-large rotate: false - xy: 901, 286 + xy: 859, 244 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 block-mass-conveyor-medium rotate: false - xy: 2162, 168 + xy: 2128, 168 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-mass-conveyor-small rotate: false - xy: 1854, 116 + xy: 1854, 142 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 block-mass-conveyor-tiny rotate: false - xy: 2033, 72 + xy: 2015, 54 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 block-mass-conveyor-xlarge rotate: false - xy: 745, 353 + xy: 231, 45 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 block-mass-driver-large rotate: false - xy: 943, 328 + xy: 901, 286 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 block-mass-driver-medium rotate: false - xy: 2196, 168 + xy: 2162, 168 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-mass-driver-small rotate: false - xy: 1880, 142 + xy: 1854, 116 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 block-mass-driver-tiny rotate: false - xy: 2033, 54 + xy: 2033, 72 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 block-mass-driver-xlarge rotate: false - xy: 281, 106 + xy: 745, 353 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 block-mechanical-drill-large rotate: false - xy: 859, 202 + xy: 943, 328 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 block-mechanical-drill-medium rotate: false - xy: 2230, 168 + xy: 2196, 168 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-mechanical-drill-small rotate: false - xy: 1880, 116 + xy: 1880, 142 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 block-mechanical-drill-tiny rotate: false - xy: 2051, 72 + xy: 2033, 54 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 block-mechanical-drill-xlarge rotate: false - xy: 281, 56 + xy: 281, 106 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 block-mechanical-pump-large rotate: false - xy: 901, 244 + xy: 859, 202 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 block-mechanical-pump-medium rotate: false - xy: 2264, 168 + xy: 2230, 168 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-mechanical-pump-small rotate: false - xy: 1906, 142 + xy: 1880, 116 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 block-mechanical-pump-tiny rotate: false - xy: 2051, 54 + xy: 2051, 72 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 block-mechanical-pump-xlarge rotate: false - xy: 795, 365 + xy: 281, 56 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 block-meltdown-large rotate: false - xy: 943, 286 + xy: 901, 244 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 block-meltdown-medium rotate: false - xy: 2298, 168 + xy: 2264, 168 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-meltdown-small rotate: false - xy: 1906, 116 + xy: 1906, 142 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 block-meltdown-tiny rotate: false - xy: 2069, 72 + xy: 2051, 54 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 block-meltdown-xlarge rotate: false - xy: 309, 303 + xy: 795, 365 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 block-melter-large rotate: false - xy: 985, 328 + xy: 943, 286 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 block-melter-medium rotate: false - xy: 2332, 168 + xy: 2298, 168 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-melter-small rotate: false - xy: 1932, 142 + xy: 1906, 116 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 block-melter-tiny rotate: false - xy: 2069, 54 + xy: 2069, 72 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 block-melter-xlarge rotate: false - xy: 309, 253 + xy: 309, 303 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 block-mend-projector-large rotate: false - xy: 901, 202 + xy: 985, 328 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 block-mend-projector-medium rotate: false - xy: 2797, 302 + xy: 2332, 168 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-mend-projector-small rotate: false - xy: 1932, 116 + xy: 1932, 142 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 block-mend-projector-tiny rotate: false - xy: 2087, 72 + xy: 2069, 54 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 block-mend-projector-xlarge rotate: false - xy: 359, 303 + xy: 309, 253 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 block-mender-large rotate: false - xy: 943, 244 + xy: 901, 202 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 block-mender-medium rotate: false - xy: 2831, 302 + xy: 2797, 302 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-mender-small rotate: false - xy: 1958, 142 + xy: 1932, 116 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 block-mender-tiny rotate: false - xy: 2087, 54 + xy: 2087, 72 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 block-mender-xlarge rotate: false - xy: 309, 203 + xy: 359, 303 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 block-message-large rotate: false - xy: 985, 286 + xy: 943, 244 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 block-message-medium rotate: false - xy: 2865, 302 + xy: 2831, 302 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-message-small rotate: false - xy: 1958, 116 + xy: 1958, 142 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 block-message-tiny rotate: false - xy: 2105, 72 + xy: 2087, 54 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 block-message-xlarge rotate: false - xy: 359, 253 + xy: 309, 203 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 block-metal-floor-2-large rotate: false - xy: 1027, 328 + xy: 985, 286 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 block-metal-floor-2-medium rotate: false - xy: 2899, 302 + xy: 2865, 302 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-metal-floor-2-small rotate: false - xy: 1984, 142 + xy: 1958, 116 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 block-metal-floor-2-tiny rotate: false - xy: 2105, 54 + xy: 2105, 72 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 block-metal-floor-2-xlarge rotate: false - xy: 409, 303 + xy: 359, 253 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 block-metal-floor-3-large rotate: false - xy: 943, 202 + xy: 1027, 328 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 block-metal-floor-3-medium rotate: false - xy: 2933, 302 + xy: 2899, 302 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-metal-floor-3-small rotate: false - xy: 1984, 116 + xy: 1984, 142 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 block-metal-floor-3-tiny rotate: false - xy: 2123, 72 + xy: 2105, 54 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 block-metal-floor-3-xlarge rotate: false - xy: 359, 203 + xy: 409, 303 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 block-metal-floor-5-large rotate: false - xy: 985, 244 + xy: 943, 202 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 block-metal-floor-5-medium rotate: false - xy: 2967, 302 + xy: 2933, 302 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-metal-floor-5-small rotate: false - xy: 2010, 142 + xy: 1984, 116 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 block-metal-floor-5-tiny rotate: false - xy: 2123, 54 + xy: 2123, 72 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 block-metal-floor-5-xlarge rotate: false - xy: 409, 253 + xy: 359, 203 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 block-metal-floor-damaged-large rotate: false - xy: 1027, 286 + xy: 985, 244 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 block-metal-floor-damaged-medium rotate: false - xy: 3001, 302 + xy: 2967, 302 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-metal-floor-damaged-small rotate: false - xy: 2010, 116 + xy: 2010, 142 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 block-metal-floor-damaged-tiny rotate: false - xy: 2141, 72 + xy: 2123, 54 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 block-metal-floor-damaged-xlarge rotate: false - xy: 459, 303 + xy: 409, 253 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 block-metal-floor-large rotate: false - xy: 1069, 328 + xy: 1027, 286 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 block-metal-floor-medium rotate: false - xy: 3035, 302 + xy: 3001, 302 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-metal-floor-small rotate: false - xy: 2036, 142 + xy: 2010, 116 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 block-metal-floor-tiny rotate: false - xy: 2141, 54 + xy: 2141, 72 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 block-metal-floor-xlarge rotate: false - xy: 409, 203 + xy: 459, 303 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 block-moss-large rotate: false - xy: 985, 202 + xy: 1069, 328 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 block-moss-medium rotate: false - xy: 3069, 302 + xy: 3035, 302 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-moss-small rotate: false - xy: 2036, 116 + xy: 2036, 142 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 block-moss-tiny rotate: false - xy: 2159, 72 + xy: 2141, 54 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 block-moss-xlarge rotate: false - xy: 459, 253 + xy: 409, 203 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 block-multi-press-large rotate: false - xy: 1027, 244 + xy: 985, 202 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 block-multi-press-medium rotate: false - xy: 3103, 302 + xy: 3069, 302 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-multi-press-small rotate: false - xy: 2062, 142 + xy: 2036, 116 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 block-multi-press-tiny rotate: false - xy: 2159, 54 + xy: 2159, 72 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 block-multi-press-xlarge rotate: false - xy: 509, 303 + xy: 459, 253 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 block-multiplicative-reconstructor-large rotate: false - xy: 1069, 286 + xy: 1027, 244 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 block-multiplicative-reconstructor-medium rotate: false - xy: 3137, 302 + xy: 3103, 302 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-multiplicative-reconstructor-small rotate: false - xy: 2062, 116 + xy: 2062, 142 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 block-multiplicative-reconstructor-tiny rotate: false - xy: 2177, 72 + xy: 2159, 54 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 block-multiplicative-reconstructor-xlarge rotate: false - xy: 459, 203 + xy: 509, 303 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 block-naval-factory-large rotate: false - xy: 1111, 328 + xy: 1069, 286 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 block-naval-factory-medium rotate: false - xy: 3171, 302 + xy: 3137, 302 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-naval-factory-small rotate: false - xy: 2088, 142 + xy: 2062, 116 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 block-naval-factory-tiny rotate: false - xy: 2177, 54 + xy: 2177, 72 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 block-naval-factory-xlarge rotate: false - xy: 509, 253 + xy: 459, 203 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 block-oil-extractor-large rotate: false - xy: 1027, 202 + xy: 1111, 328 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 block-oil-extractor-medium rotate: false - xy: 3205, 302 + xy: 3171, 302 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-oil-extractor-small rotate: false - xy: 2088, 116 + xy: 2088, 142 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 block-oil-extractor-tiny rotate: false - xy: 2195, 72 + xy: 2177, 54 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 block-oil-extractor-xlarge rotate: false - xy: 559, 303 + xy: 509, 253 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 block-ore-coal-large rotate: false - xy: 1069, 244 + xy: 1027, 202 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 block-ore-coal-medium rotate: false - xy: 3239, 302 + xy: 3205, 302 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-ore-coal-small rotate: false - xy: 2114, 142 + xy: 2088, 116 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 block-ore-coal-tiny rotate: false - xy: 2195, 54 + xy: 2195, 72 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 block-ore-coal-xlarge rotate: false - xy: 509, 203 + xy: 559, 303 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 block-ore-copper-large rotate: false - xy: 1111, 286 + xy: 1069, 244 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 block-ore-copper-medium rotate: false - xy: 3273, 302 + xy: 3239, 302 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-ore-copper-small rotate: false - xy: 2114, 116 + xy: 2114, 142 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 block-ore-copper-tiny rotate: false - xy: 2213, 72 + xy: 2195, 54 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 block-ore-copper-xlarge rotate: false - xy: 559, 253 + xy: 509, 203 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 block-ore-lead-large rotate: false - xy: 1153, 328 + xy: 1111, 286 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 block-ore-lead-medium rotate: false - xy: 3307, 302 + xy: 3273, 302 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-ore-lead-small rotate: false - xy: 2140, 142 + xy: 2114, 116 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 block-ore-lead-tiny rotate: false - xy: 2213, 54 + xy: 2213, 72 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 block-ore-lead-xlarge rotate: false - xy: 609, 303 + xy: 559, 253 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 block-ore-scrap-large rotate: false - xy: 1069, 202 + xy: 1153, 328 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 block-ore-scrap-medium rotate: false - xy: 3341, 302 + xy: 3307, 302 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-ore-scrap-small rotate: false - xy: 2140, 116 + xy: 2140, 142 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 block-ore-scrap-tiny rotate: false - xy: 2231, 72 + xy: 2213, 54 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 block-ore-scrap-xlarge rotate: false - xy: 559, 203 + xy: 609, 303 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 block-ore-thorium-large rotate: false - xy: 1111, 244 + xy: 1069, 202 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 block-ore-thorium-medium rotate: false - xy: 3375, 302 + xy: 3341, 302 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-ore-thorium-small rotate: false - xy: 2166, 142 + xy: 2140, 116 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 block-ore-thorium-tiny rotate: false - xy: 2231, 54 + xy: 2231, 72 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 block-ore-thorium-xlarge rotate: false - xy: 609, 253 + xy: 559, 203 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 block-ore-titanium-large rotate: false - xy: 1153, 286 + xy: 1111, 244 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 block-ore-titanium-medium rotate: false - xy: 3409, 302 + xy: 3375, 302 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-ore-titanium-small rotate: false - xy: 2166, 116 + xy: 2166, 142 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 block-ore-titanium-tiny rotate: false - xy: 2249, 72 + xy: 2231, 54 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 block-ore-titanium-xlarge + rotate: false + xy: 609, 253 + size: 48, 48 + orig: 48, 48 + offset: 0, 0 + index: -1 +block-overdrive-dome-large + rotate: false + xy: 1153, 286 + size: 40, 40 + orig: 40, 40 + offset: 0, 0 + index: -1 +block-overdrive-dome-medium + rotate: false + xy: 3409, 302 + size: 32, 32 + orig: 32, 32 + offset: 0, 0 + index: -1 +block-overdrive-dome-small + rotate: false + xy: 2166, 116 + size: 24, 24 + orig: 24, 24 + offset: 0, 0 + index: -1 +block-overdrive-dome-tiny + rotate: false + xy: 2249, 72 + size: 16, 16 + orig: 16, 16 + offset: 0, 0 + index: -1 +block-overdrive-dome-xlarge rotate: false xy: 659, 303 size: 48, 48 diff --git a/core/assets/sprites/sprites.png b/core/assets/sprites/sprites.png index a30341f1e4..b51a1238aa 100644 Binary files a/core/assets/sprites/sprites.png and b/core/assets/sprites/sprites.png differ diff --git a/core/assets/sprites/sprites2.png b/core/assets/sprites/sprites2.png index cbb6f5ebe6..65f9572463 100644 Binary files a/core/assets/sprites/sprites2.png and b/core/assets/sprites/sprites2.png differ diff --git a/core/assets/sprites/sprites4.png b/core/assets/sprites/sprites4.png index 002a279138..50efb1f4e5 100644 Binary files a/core/assets/sprites/sprites4.png and b/core/assets/sprites/sprites4.png differ diff --git a/core/assets/sprites/sprites5.png b/core/assets/sprites/sprites5.png index c2488b7ee3..1e8b8ec830 100644 Binary files a/core/assets/sprites/sprites5.png and b/core/assets/sprites/sprites5.png differ diff --git a/core/src/mindustry/content/Blocks.java b/core/src/mindustry/content/Blocks.java index 3ef0d97ffa..606448a5a1 100644 --- a/core/src/mindustry/content/Blocks.java +++ b/core/src/mindustry/content/Blocks.java @@ -52,7 +52,7 @@ public class Blocks implements ContentList{ //defense copperWall, copperWallLarge, titaniumWall, titaniumWallLarge, plastaniumWall, plastaniumWallLarge, thoriumWall, thoriumWallLarge, door, doorLarge, - phaseWall, phaseWallLarge, surgeWall, surgeWallLarge, mender, mendProjector, overdriveProjector, largeOverdriveProjector, forceProjector, shockMine, + phaseWall, phaseWallLarge, surgeWall, surgeWallLarge, mender, mendProjector, overdriveProjector, overdriveDome, forceProjector, shockMine, scrapWall, scrapWallLarge, scrapWallHuge, scrapWallGigantic, thruster, //ok, these names are getting ridiculous, but at least I don't have humongous walls yet //transport @@ -855,8 +855,7 @@ public class Blocks implements ContentList{ consumes.item(Items.phasefabric).boost(); }}; - //TODO better name - largeOverdriveProjector = new OverdriveProjector("large-overdrive-projector"){{ + overdriveDome = new OverdriveProjector("overdrive-dome"){{ requirements(Category.effect, with(Items.lead, 200, Items.titanium, 130, Items.silicon, 130, Items.plastanium, 80, Items.surgealloy, 120)); consumes.power(10f); size = 3; @@ -913,7 +912,6 @@ public class Blocks implements ContentList{ health = 75; speed = 3f / 60f; itemCapacity = 10; - displayedSpeed = 30f; }}; armoredConveyor = new ArmoredConveyor("armored-conveyor"){{ @@ -1485,6 +1483,21 @@ public class Blocks implements ContentList{ shootSound = Sounds.spark; }}; + parallax = new TractorBeamTurret("parallax"){{ + requirements(Category.turret, with(Items.silicon, 120, Items.titanium, 90, Items.graphite, 30)); + + hasPower = true; + size = 2; + force = 2.5f; + scaledForce = 5f; + range = 170f; + damage = 0.08f; + health = 160 * size * size; + rotateSpeed = 10; + + consumes.power(3f); + }}; + swarmer = new ItemTurret("swarmer"){{ requirements(Category.turret, with(Items.graphite, 35, Items.titanium, 35, Items.plastanium, 45, Items.silicon, 30)); ammo( @@ -1528,6 +1541,18 @@ public class Blocks implements ContentList{ shootSound = Sounds.shootBig; }}; + segment = new PointDefenseTurret("segment"){{ + requirements(Category.turret, with(Items.silicon, 130, Items.thorium, 80, Items.phasefabric, 50)); + + hasPower = true; + consumes.power(3f); + size = 2; + shootLength = 5f; + bulletDamage = 12f; + reloadTime = 25f; + health = 190 * size * size; + }}; + fuse = new ItemTurret("fuse"){{ requirements(Category.turret, with(Items.copper, 225, Items.graphite, 225, Items.thorium, 100)); @@ -1657,33 +1682,6 @@ public class Blocks implements ContentList{ consumes.add(new ConsumeLiquidFilter(liquid -> liquid.temperature <= 0.5f && liquid.flammability < 0.1f, 0.5f)).update(false); }}; - segment = new PointDefenseTurret("segment"){{ - requirements(Category.turret, with(Items.silicon, 80, Items.thorium, 80, Items.surgealloy, 50)); - - hasPower = true; - consumes.power(3f); - size = 2; - shootLength = 5f; - bulletDamage = 12f; - reloadTime = 25f; - health = 190 * size * size; - }}; - - parallax = new TractorBeamTurret("parallax"){{ - requirements(Category.turret, with(Items.silicon, 120, Items.titanium, 90)); - - hasPower = true; - size = 2; - force = 2.5f; - scaledForce = 5f; - range = 170f; - damage = 0.08f; - health = 160 * size * size; - rotateSpeed = 10; - - consumes.power(3f); - }}; - //endregion //region units @@ -1728,7 +1726,7 @@ public class Blocks implements ContentList{ constructTime = 60f * 10f; upgrades = new UnitType[][]{ - {UnitTypes.nova, UnitTypes.quasar}, + {UnitTypes.nova, UnitTypes.pulsar}, {UnitTypes.dagger, UnitTypes.mace}, {UnitTypes.crawler, UnitTypes.atrax}, {UnitTypes.flare, UnitTypes.horizon}, @@ -1751,7 +1749,7 @@ public class Blocks implements ContentList{ {UnitTypes.mace, UnitTypes.fortress}, {UnitTypes.poly, UnitTypes.mega}, {UnitTypes.minke, UnitTypes.bryde}, - {UnitTypes.quasar, UnitTypes.pulsar}, + {UnitTypes.pulsar, UnitTypes.quasar}, {UnitTypes.atrax, UnitTypes.spiroct}, }; }}; diff --git a/core/src/mindustry/content/TechTree.java b/core/src/mindustry/content/TechTree.java index e95785d9a8..61ab5b8e40 100644 --- a/core/src/mindustry/content/TechTree.java +++ b/core/src/mindustry/content/TechTree.java @@ -30,9 +30,6 @@ public class TechTree implements ContentList{ node(junction, () -> { node(router, () -> { node(launchPad, () -> { - node(launchPadLarge, () -> { - - }); }); node(distributor); @@ -58,12 +55,16 @@ public class TechTree implements ContentList{ }); }); - node(plastaniumConveyor, () -> { + node(payloadConveyor, () -> { + node(payloadRouter, () -> { + }); }); node(armoredConveyor, () -> { + node(plastaniumConveyor, () -> { + }); }); }); }); @@ -102,7 +103,11 @@ public class TechTree implements ContentList{ node(scorch, () -> { node(arc, () -> { node(wave, () -> { + node(parallax, () -> { + node(segment, () -> { + }); + }); }); node(lancer, () -> { @@ -207,11 +212,13 @@ public class TechTree implements ContentList{ node(sporePress, () -> { node(coalCentrifuge, () -> { + node(multiPress, () -> { + node(siliconCrucible, () -> { + }); + }); }); - node(multiPress, () -> { - }); node(plastaniumCompressor, () -> { node(phaseWeaver, () -> { @@ -229,7 +236,9 @@ public class TechTree implements ContentList{ node(separator, () -> { node(pulverizer, () -> { + node(disassembler, () -> { + }); }); }); @@ -262,7 +271,9 @@ public class TechTree implements ContentList{ node(mendProjector, () -> { node(forceProjector, () -> { node(overdriveProjector, () -> { + node(overdriveDome, () -> { + }); }); }); @@ -293,6 +304,23 @@ public class TechTree implements ContentList{ }); }); + + node(groundFactory, () -> { + node(airFactory, () -> { + node(navalFactory, () -> { + + }); + + node(additiveReconstructor, () -> { + node(multiplicativeReconstructor, () -> { + node(exponentialReconstructor, () -> { + node(tetrativeReconstructor, () -> { + }); + }); + }); + }); + }); + }); }); }); }); diff --git a/core/src/mindustry/world/blocks/defense/ForceProjector.java b/core/src/mindustry/world/blocks/defense/ForceProjector.java index 44243f9fb6..02a73f2234 100644 --- a/core/src/mindustry/world/blocks/defense/ForceProjector.java +++ b/core/src/mindustry/world/blocks/defense/ForceProjector.java @@ -33,7 +33,7 @@ public class ForceProjector extends Block{ private static ForceProjectorEntity paramEntity; private static final Cons shieldConsumer = trait -> { - if(trait.team() != paramEntity.team() && Intersector.isInsideHexagon(paramEntity.x, paramEntity.y, paramEntity.realRadius() * 2f, trait.x(), trait.y())){ + if(trait.team() != paramEntity.team && Intersector.isInsideHexagon(paramEntity.x, paramEntity.y, paramEntity.realRadius() * 2f, trait.x(), trait.y())){ trait.absorb(); Fx.absorb.at(trait); paramEntity.hit = 1f; diff --git a/core/src/mindustry/world/blocks/distribution/StackConveyor.java b/core/src/mindustry/world/blocks/distribution/StackConveyor.java index 4edca42bee..12ab26cda4 100644 --- a/core/src/mindustry/world/blocks/distribution/StackConveyor.java +++ b/core/src/mindustry/world/blocks/distribution/StackConveyor.java @@ -26,7 +26,6 @@ public class StackConveyor extends Block implements Autotiler{ public float speed = 0f; public boolean splitOut = true; - public float displayedSpeed = 30f; public float recharge = 2f; public StackConveyor(String name){