diff --git a/core/assets/bundles/bundle.properties b/core/assets/bundles/bundle.properties index 59fe3d9361..ee2d1b0ebe 100644 --- a/core/assets/bundles/bundle.properties +++ b/core/assets/bundles/bundle.properties @@ -792,6 +792,7 @@ rules.buildspeedmultiplier = Build Speed Multiplier rules.deconstructrefundmultiplier = Deconstruct Refund Multiplier rules.waitForWaveToEnd = Waves Wait for Enemies rules.dropzoneradius = Drop Zone Radius:[lightgray] (tiles) +rules.unitammo = Units Require Ammo rules.title.waves = Waves rules.title.resourcesbuilding = Resources & Building rules.title.enemy = Enemies diff --git a/core/assets/sprites/fallback/sprites.atlas b/core/assets/sprites/fallback/sprites.atlas index ba80239df3..b84367aab8 100644 --- a/core/assets/sprites/fallback/sprites.atlas +++ b/core/assets/sprites/fallback/sprites.atlas @@ -628,14 +628,14 @@ mend-projector-top index: -1 mender rotate: false - xy: 1043, 1173 + xy: 1085, 497 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 mender-top rotate: false - xy: 1067, 1139 + xy: 1119, 497 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -656,7 +656,7 @@ overdrive-projector-top index: -1 shock-mine rotate: false - xy: 1063, 1287 + xy: 933, 1483 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -677,497 +677,497 @@ block-unloader index: -1 bridge-arrow rotate: false - xy: 1369, 1509 + xy: 1301, 1483 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 bridge-conveyor rotate: false - xy: 1403, 1475 + xy: 859, 81 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 bridge-conveyor-bridge rotate: false - xy: 859, 115 + xy: 859, 47 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 bridge-conveyor-end rotate: false - xy: 859, 81 + xy: 1051, 677 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 center rotate: false - xy: 859, 47 + xy: 1051, 643 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 armored-conveyor-0-0 rotate: false - xy: 1043, 479 + xy: 1153, 1661 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-armored-conveyor-full rotate: false - xy: 1043, 479 + xy: 1153, 1661 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 armored-conveyor-0-1 rotate: false - xy: 1043, 445 + xy: 1187, 1661 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 armored-conveyor-0-2 rotate: false - xy: 1153, 1661 + xy: 1015, 1627 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 armored-conveyor-0-3 rotate: false - xy: 1187, 1661 + xy: 1015, 1661 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 armored-conveyor-1-0 rotate: false - xy: 1015, 1627 + xy: 1049, 1661 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 armored-conveyor-1-1 rotate: false - xy: 1015, 1661 + xy: 1049, 1627 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 armored-conveyor-1-2 rotate: false - xy: 1049, 1661 + xy: 1029, 1593 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 armored-conveyor-1-3 rotate: false - xy: 1049, 1627 + xy: 1063, 1593 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 armored-conveyor-2-0 rotate: false - xy: 1029, 1593 + xy: 1083, 1653 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 armored-conveyor-2-1 rotate: false - xy: 1063, 1593 + xy: 1117, 1653 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 armored-conveyor-2-2 rotate: false - xy: 1083, 1653 + xy: 1453, 1619 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 armored-conveyor-2-3 rotate: false - xy: 1117, 1653 + xy: 1487, 1619 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 armored-conveyor-3-0 rotate: false - xy: 1453, 1619 + xy: 1521, 1619 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 armored-conveyor-3-1 rotate: false - xy: 1487, 1619 + xy: 1555, 1619 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 armored-conveyor-3-2 rotate: false - xy: 1521, 1619 + xy: 1589, 1619 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 armored-conveyor-3-3 rotate: false - xy: 1555, 1619 + xy: 1623, 1619 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 armored-conveyor-4-0 rotate: false - xy: 1589, 1619 + xy: 1657, 1619 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 armored-conveyor-4-1 rotate: false - xy: 1623, 1619 + xy: 1691, 1619 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 armored-conveyor-4-2 rotate: false - xy: 1657, 1619 + xy: 1725, 1619 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 armored-conveyor-4-3 rotate: false - xy: 1691, 1619 + xy: 1759, 1619 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 conveyor-0-1 rotate: false - xy: 1029, 251 + xy: 1081, 246 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 conveyor-0-2 rotate: false - xy: 1029, 217 + xy: 1047, 212 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 conveyor-0-3 rotate: false - xy: 1071, 285 + xy: 1081, 212 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 conveyor-1-0 rotate: false - xy: 1063, 251 + xy: 945, 1551 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 conveyor-1-1 rotate: false - xy: 1063, 217 + xy: 979, 1551 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 conveyor-1-2 rotate: false - xy: 1097, 251 + xy: 931, 1517 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 conveyor-1-3 rotate: false - xy: 1097, 217 + xy: 965, 1517 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 conveyor-2-0 rotate: false - xy: 1131, 1517 + xy: 999, 1517 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 conveyor-2-1 rotate: false - xy: 1165, 1491 + xy: 1033, 1525 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 conveyor-2-2 rotate: false - xy: 1199, 1491 + xy: 1033, 1491 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 conveyor-2-3 rotate: false - xy: 1131, 1483 + xy: 1067, 1517 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 conveyor-3-0 rotate: false - xy: 1233, 1479 + xy: 1101, 1517 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 conveyor-3-1 rotate: false - xy: 1267, 1479 + xy: 1067, 1483 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 conveyor-3-2 rotate: false - xy: 1301, 1449 + xy: 1101, 1483 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 conveyor-3-3 rotate: false - xy: 1335, 1441 + xy: 1033, 1457 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 conveyor-4-0 rotate: false - xy: 1369, 1441 + xy: 1067, 1449 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 conveyor-4-1 rotate: false - xy: 1403, 1441 + xy: 1101, 1449 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 conveyor-4-2 rotate: false - xy: 1165, 1457 + xy: 1033, 1423 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 conveyor-4-3 rotate: false - xy: 1199, 1457 + xy: 1067, 1415 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 plastanium-conveyor rotate: false - xy: 1029, 1525 + xy: 1129, 327 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 plastanium-conveyor-0 rotate: false - xy: 1063, 1525 + xy: 1129, 293 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 plastanium-conveyor-1 rotate: false - xy: 1097, 1517 + xy: 1115, 259 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 plastanium-conveyor-2 rotate: false - xy: 995, 1517 + xy: 1115, 225 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 plastanium-conveyor-edge rotate: false - xy: 1029, 1491 + xy: 1149, 259 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 plastanium-conveyor-stack rotate: false - xy: 1063, 1491 + xy: 1149, 225 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 titanium-conveyor-0-1 rotate: false - xy: 927, 115 + xy: 1169, 1355 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 titanium-conveyor-0-2 rotate: false - xy: 927, 81 + xy: 1135, 1287 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 titanium-conveyor-0-3 rotate: false - xy: 927, 47 + xy: 1169, 1321 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 titanium-conveyor-1-0 rotate: false - xy: 931, 149 + xy: 1135, 1253 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 titanium-conveyor-1-1 rotate: false - xy: 953, 13 + xy: 1169, 1287 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 titanium-conveyor-1-2 rotate: false - xy: 961, 115 + xy: 1135, 1219 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 titanium-conveyor-1-3 rotate: false - xy: 961, 81 + xy: 1169, 1253 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 titanium-conveyor-2-0 rotate: false - xy: 961, 47 + xy: 1135, 1185 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 titanium-conveyor-2-1 rotate: false - xy: 995, 180 + xy: 1169, 1219 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 titanium-conveyor-2-2 rotate: false - xy: 987, 13 + xy: 1135, 1151 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 titanium-conveyor-2-3 rotate: false - xy: 1029, 149 + xy: 1169, 1185 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 titanium-conveyor-3-0 rotate: false - xy: 1063, 149 + xy: 1135, 1117 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 titanium-conveyor-3-1 rotate: false - xy: 995, 146 + xy: 1169, 1151 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 titanium-conveyor-3-2 rotate: false - xy: 1097, 149 + xy: 1169, 1117 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 titanium-conveyor-3-3 rotate: false - xy: 995, 112 + xy: 1157, 1083 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 titanium-conveyor-4-0 rotate: false - xy: 1029, 115 + xy: 1157, 1049 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 titanium-conveyor-4-1 rotate: false - xy: 995, 78 + xy: 1157, 1015 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 titanium-conveyor-4-2 rotate: false - xy: 1029, 81 + xy: 1157, 981 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 titanium-conveyor-4-3 rotate: false - xy: 1063, 115 + xy: 1157, 947 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 cross rotate: false - xy: 1131, 1415 + xy: 1067, 1313 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -1181,14 +1181,14 @@ distributor index: -1 inverted-sorter rotate: false - xy: 1131, 1381 + xy: 1101, 1211 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 junction rotate: false - xy: 1199, 1253 + xy: 1123, 973 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -1230,7 +1230,7 @@ mass-driver-base index: -1 overflow-gate rotate: false - xy: 1111, 1177 + xy: 1118, 463 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -1258,49 +1258,49 @@ payload-router-over index: -1 phase-conveyor rotate: false - xy: 1169, 1143 + xy: 1069, 361 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 phase-conveyor-arrow rotate: false - xy: 961, 1321 + xy: 1103, 361 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 phase-conveyor-bridge rotate: false - xy: 995, 1551 + xy: 1095, 327 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 phase-conveyor-end rotate: false - xy: 961, 1287 + xy: 1095, 293 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 router rotate: false - xy: 995, 1253 + xy: 1205, 361 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 sorter rotate: false - xy: 1063, 1253 + xy: 933, 1449 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 underflow-gate rotate: false - xy: 1097, 81 + xy: 1157, 845 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -1419,63 +1419,63 @@ pneumatic-drill-top index: -1 water-extractor rotate: false - xy: 853, 381 + xy: 919, 447 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 water-extractor-liquid rotate: false - xy: 919, 447 + xy: 985, 513 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 water-extractor-rotator rotate: false - xy: 985, 513 + xy: 721, 183 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 water-extractor-top rotate: false - xy: 721, 183 + xy: 787, 249 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 block-border rotate: false - xy: 1861, 1619 + xy: 1929, 1619 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-middle rotate: false - xy: 1165, 1593 + xy: 1199, 1593 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-select rotate: false - xy: 1301, 1551 + xy: 1337, 1611 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 conduit-liquid rotate: false - xy: 1018, 387 + xy: 979, 272 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 message rotate: false - xy: 1077, 1173 + xy: 1084, 463 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -1489,161 +1489,161 @@ place-arrow index: -1 bridge-conduit rotate: false - xy: 1403, 1509 + xy: 1335, 1475 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 bridge-conduit-arrow rotate: false - xy: 1301, 1483 + xy: 1369, 1475 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 bridge-conveyor-arrow rotate: false - xy: 1301, 1483 + xy: 1369, 1475 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 bridge-conduit-bridge rotate: false - xy: 1335, 1475 + xy: 1403, 1475 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 bridge-conduit-end rotate: false - xy: 1369, 1475 + xy: 859, 115 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 conduit-bottom rotate: false - xy: 1051, 609 + xy: 1051, 541 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 conduit-bottom-0 rotate: false - xy: 1051, 575 + xy: 1051, 507 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 conduit-bottom-1 rotate: false - xy: 1051, 541 + xy: 1050, 473 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 conduit-bottom-2 rotate: false - xy: 1011, 353 + xy: 945, 272 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 conduit-bottom-3 rotate: false - xy: 1011, 353 + xy: 945, 272 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 conduit-bottom-4 rotate: false - xy: 1011, 353 + xy: 945, 272 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 conduit-top-0 rotate: false - xy: 1045, 353 + xy: 1013, 272 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 conduit-top-1 rotate: false - xy: 1011, 319 + xy: 945, 238 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 conduit-top-2 rotate: false - xy: 1045, 319 + xy: 979, 238 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 conduit-top-3 rotate: false - xy: 1003, 285 + xy: 1013, 238 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 pulse-conduit-top-3 rotate: false - xy: 1003, 285 + xy: 1013, 238 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 conduit-top-4 rotate: false - xy: 1037, 285 + xy: 1047, 246 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 liquid-junction rotate: false - xy: 1267, 1241 + xy: 1123, 871 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 liquid-overflow-gate rotate: false - xy: 1369, 1203 + xy: 1123, 769 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 liquid-overflow-gate-top rotate: false - xy: 1403, 1203 + xy: 1123, 735 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 liquid-router-bottom rotate: false - xy: 1165, 1219 + xy: 1085, 701 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 liquid-router-liquid rotate: false - xy: 1199, 1219 + xy: 1085, 667 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 liquid-router-top rotate: false - xy: 1131, 1211 + xy: 1119, 701 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -1671,133 +1671,133 @@ liquid-tank-top index: -1 mechanical-pump rotate: false - xy: 1369, 1169 + xy: 1085, 531 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 mechanical-pump-liquid rotate: false - xy: 1403, 1169 + xy: 1119, 565 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 rotary-pump-liquid rotate: false - xy: 1403, 1169 + xy: 1119, 565 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 thermal-pump-liquid rotate: false - xy: 1403, 1169 + xy: 1119, 565 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 phase-conduit rotate: false - xy: 1145, 1177 + xy: 1077, 429 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 phase-conduit-arrow rotate: false - xy: 1179, 1185 + xy: 1111, 429 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 phase-conduit-bridge rotate: false - xy: 1101, 1139 + xy: 1077, 395 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 phase-conduit-end rotate: false - xy: 1135, 1143 + xy: 1111, 395 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 plated-conduit-cap rotate: false - xy: 995, 1483 + xy: 1149, 191 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 plated-conduit-top-0 rotate: false - xy: 1029, 1457 + xy: 1163, 327 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 plated-conduit-top-1 rotate: false - xy: 1063, 1457 + xy: 1163, 293 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 plated-conduit-top-2 rotate: false - xy: 1097, 1449 + xy: 1183, 259 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 plated-conduit-top-3 rotate: false - xy: 995, 1449 + xy: 1183, 225 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 plated-conduit-top-4 rotate: false - xy: 1029, 1423 + xy: 1183, 191 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 pulse-conduit-top-0 rotate: false - xy: 995, 1415 + xy: 1152, 463 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 pulse-conduit-top-1 rotate: false - xy: 1029, 1389 + xy: 1197, 327 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 pulse-conduit-top-2 rotate: false - xy: 1063, 1389 + xy: 1197, 293 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 pulse-conduit-top-4 rotate: false - xy: 1097, 1381 + xy: 1217, 259 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 rotary-pump rotate: false - xy: 923, 711 + xy: 989, 711 size: 64, 64 orig: 64, 64 offset: 0, 0 @@ -1811,7 +1811,7 @@ thermal-pump index: -1 battery rotate: false - xy: 1725, 1619 + xy: 1793, 1619 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -1832,21 +1832,21 @@ battery-large-top index: -1 battery-top rotate: false - xy: 1759, 1619 + xy: 1827, 1619 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 combustion-generator rotate: false - xy: 1051, 677 + xy: 1051, 609 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 combustion-generator-top rotate: false - xy: 1051, 643 + xy: 1051, 575 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -1874,28 +1874,28 @@ differential-generator-top index: -1 diode rotate: false - xy: 1233, 1411 + xy: 1101, 1313 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 diode-arrow rotate: false - xy: 1267, 1411 + xy: 1033, 1287 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 illuminator rotate: false - xy: 1165, 1389 + xy: 1101, 1245 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 illuminator-top rotate: false - xy: 1199, 1389 + xy: 1033, 1219 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -1951,7 +1951,7 @@ impact-reactor-plasma-3 index: -1 power-node rotate: false - xy: 1063, 1423 + xy: 1145, 429 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -1965,35 +1965,35 @@ power-node-large index: -1 power-source rotate: false - xy: 1097, 1415 + xy: 1145, 395 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 power-void rotate: false - xy: 933, 1389 + xy: 1171, 361 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 rtg-generator rotate: false - xy: 989, 711 + xy: 655, 665 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 rtg-generator-top rotate: false - xy: 1001, 1355 + xy: 1231, 327 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 solar-panel rotate: false - xy: 1097, 1279 + xy: 967, 1483 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -2007,14 +2007,14 @@ solar-panel-large index: -1 surge-tower rotate: false - xy: 721, 381 + xy: 787, 447 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 thermal-generator rotate: false - xy: 919, 579 + xy: 985, 645 size: 64, 64 orig: 64, 64 offset: 0, 0 @@ -2042,35 +2042,35 @@ thorium-reactor-top index: -1 turbine-generator rotate: false - xy: 787, 381 + xy: 853, 447 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 turbine-generator-cap rotate: false - xy: 853, 447 + xy: 919, 513 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 turbine-generator-top rotate: false - xy: 919, 513 + xy: 985, 579 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 turbine-generator-turbine0 rotate: false - xy: 985, 579 + xy: 721, 249 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 turbine-generator-turbine1 rotate: false - xy: 721, 249 + xy: 787, 315 size: 64, 64 orig: 64, 64 offset: 0, 0 @@ -2182,21 +2182,21 @@ graphite-press index: -1 incinerator rotate: false - xy: 933, 1355 + xy: 1067, 1211 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 item-source rotate: false - xy: 1165, 1287 + xy: 1055, 803 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 item-void rotate: false - xy: 1165, 1253 + xy: 1123, 1007 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -2224,21 +2224,21 @@ silicon-smelter-top index: -1 liquid-source rotate: false - xy: 975, 1173 + xy: 1085, 599 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 liquid-void rotate: false - xy: 1009, 1173 + xy: 1119, 633 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 melter rotate: false - xy: 1033, 1139 + xy: 1119, 531 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -2287,14 +2287,14 @@ plastanium-compressor-top index: -1 pulverizer rotate: false - xy: 967, 1355 + xy: 1217, 225 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 pulverizer-rotator rotate: false - xy: 975, 1219 + xy: 1217, 191 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -2308,21 +2308,21 @@ pyratite-mixer index: -1 separator rotate: false - xy: 721, 645 + xy: 721, 579 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 separator-liquid rotate: false - xy: 721, 579 + xy: 787, 645 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 separator-spinner rotate: false - xy: 787, 645 + xy: 721, 513 size: 64, 64 orig: 64, 64 offset: 0, 0 @@ -2343,49 +2343,49 @@ silicon-crucible-top index: -1 silicon-smelter rotate: false - xy: 721, 513 + xy: 787, 579 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 spore-press rotate: false - xy: 787, 579 + xy: 853, 645 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 spore-press-frame0 rotate: false - xy: 853, 645 + xy: 721, 447 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 spore-press-frame1 rotate: false - xy: 721, 447 + xy: 787, 513 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 spore-press-frame2 rotate: false - xy: 787, 513 + xy: 853, 579 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 spore-press-liquid rotate: false - xy: 853, 579 + xy: 919, 645 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 spore-press-top rotate: false - xy: 919, 645 + xy: 721, 381 size: 64, 64 orig: 64, 64 offset: 0, 0 @@ -2406,28 +2406,28 @@ rock2 index: -1 sand-boulder1 rotate: false - xy: 1035, 1355 + xy: 1231, 293 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 sand-boulder2 rotate: false - xy: 1029, 1321 + xy: 1251, 259 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 shale-boulder1 rotate: false - xy: 1097, 1347 + xy: 975, 1219 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 shale-boulder2 rotate: false - xy: 1097, 1313 + xy: 975, 1185 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -2490,14 +2490,14 @@ core-shard index: -1 unloader rotate: false - xy: 1029, 47 + xy: 1157, 811 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 unloader-center rotate: false - xy: 1063, 47 + xy: 1157, 777 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -2518,7 +2518,7 @@ arc-heat index: -1 block-1 rotate: false - xy: 1793, 1619 + xy: 1861, 1619 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -2567,35 +2567,35 @@ ripple-heat index: -1 salvo-heat rotate: false - xy: 655, 599 + xy: 655, 533 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 salvo-panel-left rotate: false - xy: 655, 533 + xy: 655, 467 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 salvo-panel-right rotate: false - xy: 655, 467 + xy: 655, 401 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 scorch-heat rotate: false - xy: 1029, 1253 + xy: 1251, 191 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 wave-liquid rotate: false - xy: 853, 315 + xy: 919, 381 size: 64, 64 orig: 64, 64 offset: 0, 0 @@ -2672,14 +2672,21 @@ rally-point index: -1 repair-point-base rotate: false - xy: 995, 1287 + xy: 1179, 395 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 +resupply-point + rotate: false + xy: 923, 711 + size: 64, 64 + orig: 64, 64 + offset: 0, 0 + index: -1 copper-wall rotate: false - xy: 1131, 1449 + xy: 1101, 1415 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -2693,7 +2700,7 @@ copper-wall-large index: -1 door rotate: false - xy: 1301, 1381 + xy: 1067, 1279 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -2714,14 +2721,14 @@ door-large-open index: -1 door-open rotate: false - xy: 1335, 1373 + xy: 1101, 1279 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 phase-wall rotate: false - xy: 961, 1253 + xy: 1137, 361 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -2735,7 +2742,7 @@ phase-wall-large index: -1 plastanium-wall rotate: false - xy: 1097, 1483 + xy: 1115, 191 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -2770,84 +2777,84 @@ scrap-wall-huge3 index: -1 scrap-wall-large1 rotate: false - xy: 655, 335 + xy: 655, 269 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 scrap-wall-large2 rotate: false - xy: 655, 269 + xy: 655, 203 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 scrap-wall-large3 rotate: false - xy: 655, 203 + xy: 655, 137 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 scrap-wall-large4 rotate: false - xy: 655, 137 + xy: 655, 71 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 scrap-wall2 rotate: false - xy: 1009, 1219 + xy: 961, 1321 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 scrap-wall3 rotate: false - xy: 1043, 1219 + xy: 961, 1287 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 scrap-wall4 rotate: false - xy: 1063, 1321 + xy: 961, 1253 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 scrap-wall5 rotate: false - xy: 1063, 1321 + xy: 961, 1253 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 surge-wall rotate: false - xy: 885, 13 + xy: 1169, 1389 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 surge-wall-large rotate: false - xy: 787, 447 + xy: 853, 513 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 thorium-wall rotate: false - xy: 919, 13 + xy: 1135, 1321 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 thorium-wall-large rotate: false - xy: 985, 645 + xy: 721, 315 size: 64, 64 orig: 64, 64 offset: 0, 0 @@ -2861,14 +2868,14 @@ thruster index: -1 titanium-wall rotate: false - xy: 1063, 81 + xy: 1157, 913 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 titanium-wall-large rotate: false - xy: 721, 315 + xy: 787, 381 size: 64, 64 orig: 64, 64 offset: 0, 0 @@ -2903,7 +2910,7 @@ circle-end index: -1 circle-mid rotate: false - xy: 1437, 1410 + xy: 1153, 534 size: 1, 199 orig: 1, 199 offset: 0, 0 @@ -2994,14 +3001,14 @@ transfer index: -1 transfer-arrow rotate: false - xy: 1097, 115 + xy: 1157, 879 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 white rotate: false - xy: 984, 382 + xy: 635, 1654 size: 3, 3 orig: 3, 3 offset: 0, 0 @@ -3029,49 +3036,49 @@ block-air-factory-full index: -1 block-arc-full rotate: false - xy: 1827, 1619 + xy: 1895, 1619 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-char-full rotate: false - xy: 1895, 1619 + xy: 1963, 1619 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-cliffs-full rotate: false - xy: 1929, 1619 + xy: 1997, 1635 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-conduit-full rotate: false - xy: 1963, 1619 + xy: 1997, 1601 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-conveyor-full rotate: false - xy: 1997, 1635 + xy: 911, 281 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 conveyor-0-0 rotate: false - xy: 1997, 1635 + xy: 911, 281 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-craters-full rotate: false - xy: 1997, 1601 + xy: 911, 247 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -3099,28 +3106,28 @@ block-cyclone-full index: -1 block-dark-metal-full rotate: false - xy: 995, 248 + xy: 1061, 314 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-darksand-full rotate: false - xy: 845, 215 + xy: 705, 11 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-dunerocks-full rotate: false - xy: 705, 11 + xy: 739, 11 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-duo-full rotate: false - xy: 739, 11 + xy: 1029, 1559 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -3134,7 +3141,7 @@ block-fuse-full index: -1 block-grass-full rotate: false - xy: 985, 421 + xy: 1063, 1559 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -3148,49 +3155,49 @@ block-ground-factory-full index: -1 block-hail-full rotate: false - xy: 984, 387 + xy: 1097, 1619 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-holostone-full rotate: false - xy: 1029, 1559 + xy: 1097, 1585 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-hotrock-full rotate: false - xy: 1063, 1559 + xy: 1097, 1551 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-ice-full rotate: false - xy: 1097, 1619 + xy: 1131, 1619 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-ice-snow-full rotate: false - xy: 1097, 1585 + xy: 1131, 1585 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-icerocks-full rotate: false - xy: 1097, 1551 + xy: 1131, 1551 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-ignarock-full rotate: false - xy: 1131, 1619 + xy: 1165, 1627 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -3218,7 +3225,7 @@ block-laser-drill-full index: -1 block-liquid-router-full rotate: false - xy: 1131, 1585 + xy: 1165, 1593 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -3232,7 +3239,7 @@ block-liquid-tank-full index: -1 block-magmarock-full rotate: false - xy: 1131, 1551 + xy: 1165, 1559 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -3274,14 +3281,14 @@ block-meltdown-full index: -1 block-metal-floor-damaged-full rotate: false - xy: 1165, 1627 + xy: 1199, 1627 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-moss-full rotate: false - xy: 1165, 1559 + xy: 1199, 1559 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -3302,42 +3309,42 @@ block-oil-extractor-full index: -1 block-ore-coal-full rotate: false - xy: 1199, 1627 + xy: 1233, 1615 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-ore-copper-full rotate: false - xy: 1199, 1593 + xy: 1267, 1615 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-ore-lead-full rotate: false - xy: 1199, 1559 + xy: 1233, 1581 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-ore-scrap-full rotate: false - xy: 1233, 1615 + xy: 1267, 1581 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-ore-thorium-full rotate: false - xy: 1267, 1615 + xy: 1233, 1547 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-ore-titanium-full rotate: false - xy: 1233, 1581 + xy: 1267, 1547 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -3358,7 +3365,7 @@ payload-router-icon index: -1 block-pebbles-full rotate: false - xy: 1267, 1581 + xy: 845, 215 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -3372,7 +3379,7 @@ block-phase-weaver-full index: -1 block-plated-conduit-full rotate: false - xy: 1233, 1547 + xy: 1061, 280 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -3386,21 +3393,21 @@ block-pneumatic-drill-full index: -1 block-pulse-conduit-full rotate: false - xy: 1267, 1547 + xy: 1165, 1525 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-pulverizer-full rotate: false - xy: 995, 214 + xy: 1199, 1525 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-repair-point-full rotate: false - xy: 1165, 1525 + xy: 1233, 1513 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -3421,14 +3428,14 @@ block-rock-full index: -1 block-rocks-full rotate: false - xy: 1199, 1525 + xy: 1267, 1513 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-saltrocks-full rotate: false - xy: 1233, 1513 + xy: 1043, 414 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -3442,21 +3449,21 @@ block-salvo-full index: -1 block-sand-boulder-full rotate: false - xy: 1267, 1513 + xy: 927, 1321 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-sand-full rotate: false - xy: 977, 348 + xy: 1303, 1619 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-sandrocks-full rotate: false - xy: 927, 1321 + xy: 1301, 1585 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -3470,21 +3477,21 @@ block-scatter-full index: -1 block-scorch-full rotate: false - xy: 1303, 1619 + xy: 1301, 1551 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-scrap-wall-full rotate: false - xy: 1301, 1585 + xy: 1301, 1517 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 scrap-wall1 rotate: false - xy: 1301, 1585 + xy: 1301, 1517 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -3519,35 +3526,35 @@ block-segment-full index: -1 block-shale-boulder-full rotate: false - xy: 1301, 1517 + xy: 1371, 1611 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-shale-full rotate: false - xy: 1337, 1611 + xy: 1405, 1611 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-shalerocks-full rotate: false - xy: 1371, 1611 + xy: 1335, 1577 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-shrubs-full rotate: false - xy: 1405, 1611 + xy: 1335, 1543 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-snow-full rotate: false - xy: 1335, 1577 + xy: 1369, 1577 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -3561,7 +3568,7 @@ block-snowrock-full index: -1 block-snowrocks-full rotate: false - xy: 1335, 1543 + xy: 1369, 1543 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -3582,7 +3589,7 @@ block-spore-cluster-full index: -1 block-spore-moss-full rotate: false - xy: 1369, 1577 + xy: 1403, 1577 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -3596,14 +3603,14 @@ block-spore-press-full index: -1 block-sporerocks-full rotate: false - xy: 1369, 1543 + xy: 1403, 1543 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-stone-full rotate: false - xy: 1403, 1577 + xy: 1335, 1509 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -3617,21 +3624,21 @@ block-swarmer-full index: -1 block-tendrils-full rotate: false - xy: 1403, 1543 + xy: 1369, 1509 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-titanium-conveyor-full rotate: false - xy: 1335, 1509 + xy: 1403, 1509 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 titanium-conveyor-0-0 rotate: false - xy: 1335, 1509 + xy: 1403, 1509 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -3659,56 +3666,56 @@ block-wave-full index: -1 cracks-1-0 rotate: false - xy: 1233, 1445 + xy: 1033, 1389 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 cracks-1-1 rotate: false - xy: 1267, 1445 + xy: 933, 1355 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 cracks-1-2 rotate: false - xy: 1301, 1415 + xy: 1067, 1381 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 cracks-1-3 rotate: false - xy: 1335, 1407 + xy: 1101, 1381 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 cracks-1-4 rotate: false - xy: 1369, 1407 + xy: 1033, 1355 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 cracks-1-5 rotate: false - xy: 1403, 1407 + xy: 1067, 1347 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 cracks-1-6 rotate: false - xy: 1165, 1423 + xy: 1101, 1347 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 cracks-1-7 rotate: false - xy: 1199, 1423 + xy: 1033, 1321 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -3890,7 +3897,7 @@ cyclone index: -1 duo rotate: false - xy: 1369, 1373 + xy: 1033, 1253 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -3904,7 +3911,7 @@ fuse index: -1 hail rotate: false - xy: 1403, 1373 + xy: 1067, 1245 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -3918,7 +3925,7 @@ item-blast-compound-large index: -1 item-blast-compound-medium rotate: false - xy: 1267, 1377 + xy: 1067, 1177 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -3953,7 +3960,7 @@ item-coal-large index: -1 item-coal-medium rotate: false - xy: 1335, 1339 + xy: 1033, 1151 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -3988,7 +3995,7 @@ item-copper-large index: -1 item-copper-medium rotate: false - xy: 1403, 1339 + xy: 1067, 1143 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -4023,14 +4030,14 @@ item-graphite-large index: -1 item-graphite-medium rotate: false - xy: 1199, 1355 + xy: 1067, 1109 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 item-graphite-small rotate: false - xy: 553, 1007 + xy: 933, 1389 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -4058,14 +4065,14 @@ item-lead-large index: -1 item-lead-medium rotate: false - xy: 1233, 1343 + xy: 1055, 1075 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 item-lead-small rotate: false - xy: 197, 1 + xy: 967, 1355 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -4093,14 +4100,14 @@ item-metaglass-large index: -1 item-metaglass-medium rotate: false - xy: 1301, 1313 + xy: 1089, 1075 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 item-metaglass-small rotate: false - xy: 223, 1 + xy: 1135, 1525 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -4121,21 +4128,21 @@ item-metaglass-xlarge index: -1 item-phase-fabric-large rotate: false - xy: 919, 282 + xy: 985, 348 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 item-phase-fabric-medium rotate: false - xy: 1369, 1305 + xy: 1089, 1041 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 item-phase-fabric-small rotate: false - xy: 249, 1 + xy: 553, 1007 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -4156,21 +4163,21 @@ item-phase-fabric-xlarge index: -1 item-plastanium-large rotate: false - xy: 911, 240 + xy: 977, 306 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 item-plastanium-medium rotate: false - xy: 1165, 1321 + xy: 1089, 1007 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 item-plastanium-small rotate: false - xy: 275, 1 + xy: 197, 1 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -4191,21 +4198,21 @@ item-plastanium-xlarge index: -1 item-pyratite-large rotate: false - xy: 961, 282 + xy: 1027, 348 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 item-pyratite-medium rotate: false - xy: 1131, 1313 + xy: 1089, 973 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 item-pyratite-small rotate: false - xy: 301, 1 + xy: 223, 1 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -4226,21 +4233,21 @@ item-pyratite-xlarge index: -1 item-sand-large rotate: false - xy: 953, 240 + xy: 1019, 306 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 item-sand-medium rotate: false - xy: 1267, 1309 + xy: 1089, 939 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 item-sand-small rotate: false - xy: 327, 1 + xy: 249, 1 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -4268,14 +4275,14 @@ item-scrap-large index: -1 item-scrap-medium rotate: false - xy: 1335, 1271 + xy: 1089, 905 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 item-scrap-small rotate: false - xy: 353, 1 + xy: 275, 1 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -4303,21 +4310,21 @@ item-silicon-large index: -1 item-silicon-medium rotate: false - xy: 1403, 1271 + xy: 1089, 871 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 item-silicon-small rotate: false - xy: 379, 1 + xy: 301, 1 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 item-silicon-tiny rotate: false - xy: 883, 1901 + xy: 767, 1443 size: 16, 16 orig: 16, 16 offset: 0, 0 @@ -4338,21 +4345,21 @@ item-spore-pod-large index: -1 item-spore-pod-medium rotate: false - xy: 1131, 1279 + xy: 1055, 769 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 item-spore-pod-small rotate: false - xy: 405, 1 + xy: 327, 1 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 item-spore-pod-tiny rotate: false - xy: 725, 1109 + xy: 883, 1901 size: 16, 16 orig: 16, 16 offset: 0, 0 @@ -4373,21 +4380,21 @@ item-surge-alloy-large index: -1 item-surge-alloy-medium rotate: false - xy: 1267, 1275 + xy: 1055, 735 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 item-surge-alloy-small rotate: false - xy: 431, 1 + xy: 353, 1 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 item-surge-alloy-tiny rotate: false - xy: 879, 1753 + xy: 725, 1109 size: 16, 16 orig: 16, 16 offset: 0, 0 @@ -4408,21 +4415,21 @@ item-thorium-large index: -1 item-thorium-medium rotate: false - xy: 1335, 1237 + xy: 1089, 735 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 item-thorium-small rotate: false - xy: 457, 1 + xy: 379, 1 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 item-thorium-tiny rotate: false - xy: 1221, 1677 + xy: 879, 1753 size: 16, 16 orig: 16, 16 offset: 0, 0 @@ -4443,21 +4450,21 @@ item-titanium-large index: -1 item-titanium-medium rotate: false - xy: 1403, 1237 + xy: 1123, 1041 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 item-titanium-small rotate: false - xy: 483, 1 + xy: 405, 1 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 item-titanium-tiny rotate: false - xy: 845, 197 + xy: 1221, 1677 size: 16, 16 orig: 16, 16 offset: 0, 0 @@ -4485,21 +4492,21 @@ liquid-cryofluid-large index: -1 liquid-cryofluid-medium rotate: false - xy: 1233, 1241 + xy: 1123, 905 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 liquid-cryofluid-small rotate: false - xy: 509, 1 + xy: 431, 1 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 liquid-cryofluid-tiny rotate: false - xy: 1051, 523 + xy: 845, 197 size: 16, 16 orig: 16, 16 offset: 0, 0 @@ -4520,21 +4527,21 @@ liquid-oil-large index: -1 liquid-oil-medium rotate: false - xy: 1335, 1203 + xy: 1123, 803 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 liquid-oil-small rotate: false - xy: 535, 1 + xy: 457, 1 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 liquid-oil-tiny rotate: false - xy: 1019, 437 + xy: 903, 1565 size: 16, 16 orig: 16, 16 offset: 0, 0 @@ -4555,21 +4562,21 @@ liquid-slag-large index: -1 liquid-slag-medium rotate: false - xy: 1267, 1207 + xy: 1119, 667 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 liquid-slag-small rotate: false - xy: 561, 1 + xy: 483, 1 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 liquid-slag-tiny rotate: false - xy: 977, 330 + xy: 1055, 717 size: 16, 16 orig: 16, 16 offset: 0, 0 @@ -4590,21 +4597,21 @@ liquid-water-large index: -1 liquid-water-medium rotate: false - xy: 1335, 1169 + xy: 1119, 599 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 liquid-water-small rotate: false - xy: 767, 1427 + xy: 509, 1 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 liquid-water-tiny rotate: false - xy: 1213, 1201 + xy: 1050, 455 size: 16, 16 orig: 16, 16 offset: 0, 0 @@ -4632,7 +4639,7 @@ meltdown index: -1 repair-point rotate: false - xy: 995, 1321 + xy: 1179, 429 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -4646,28 +4653,28 @@ ripple index: -1 salvo rotate: false - xy: 655, 665 + xy: 655, 599 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 scatter rotate: false - xy: 655, 401 + xy: 655, 335 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 scorch rotate: false - xy: 1029, 1287 + xy: 1251, 225 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 segment rotate: false - xy: 655, 71 + xy: 721, 645 size: 64, 64 orig: 64, 64 offset: 0, 0 @@ -4681,91 +4688,91 @@ spectre index: -1 splash-0 rotate: false - xy: 1097, 1245 + xy: 967, 1449 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 splash-1 rotate: false - xy: 1077, 1211 + xy: 933, 1415 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 splash-10 rotate: false - xy: 893, 47 + xy: 1169, 1423 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 splash-11 rotate: false - xy: 897, 149 + xy: 1135, 1355 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 splash-2 rotate: false - xy: 1135, 1109 + xy: 967, 1415 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 splash-3 rotate: false - xy: 1169, 1109 + xy: 967, 1381 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 splash-4 rotate: false - xy: 1029, 183 + xy: 1135, 1491 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 splash-5 rotate: false - xy: 1063, 183 + xy: 1135, 1457 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 splash-6 rotate: false - xy: 1097, 183 + xy: 1169, 1491 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 splash-7 rotate: false - xy: 863, 149 + xy: 1135, 1423 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 splash-8 rotate: false - xy: 893, 115 + xy: 1169, 1457 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 splash-9 rotate: false - xy: 893, 81 + xy: 1135, 1389 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 swarmer rotate: false - xy: 853, 513 + xy: 919, 579 size: 64, 64 orig: 64, 64 offset: 0, 0 @@ -4828,7 +4835,7 @@ unit-ghoul-full index: -1 unit-mace-full rotate: false - xy: 787, 315 + xy: 853, 381 size: 64, 64 orig: 64, 64 offset: 0, 0 @@ -4891,161 +4898,161 @@ unit-wraith-full index: -1 wave rotate: false - xy: 787, 249 + xy: 853, 315 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 item-blast-compound rotate: false - xy: 1233, 1377 + xy: 1033, 1185 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 item-coal rotate: false - xy: 1301, 1347 + xy: 1101, 1177 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 item-copper rotate: false - xy: 1369, 1339 + xy: 1033, 1117 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 item-graphite rotate: false - xy: 1165, 1355 + xy: 1101, 1143 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 item-lead rotate: false - xy: 1131, 1347 + xy: 1101, 1109 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 item-metaglass rotate: false - xy: 1267, 1343 + xy: 1055, 1041 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 item-phase-fabric rotate: false - xy: 1335, 1305 + xy: 1055, 1007 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 item-plastanium rotate: false - xy: 1403, 1305 + xy: 1055, 973 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 item-pyratite rotate: false - xy: 1199, 1321 + xy: 1055, 939 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 item-sand rotate: false - xy: 1233, 1309 + xy: 1055, 905 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 item-scrap rotate: false - xy: 1301, 1279 + xy: 1055, 871 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 item-silicon rotate: false - xy: 1369, 1271 + xy: 1055, 837 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 item-spore-pod rotate: false - xy: 1199, 1287 + xy: 1089, 837 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 item-surge-alloy rotate: false - xy: 1233, 1275 + xy: 1089, 803 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 item-thorium rotate: false - xy: 1301, 1245 + xy: 1089, 769 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 item-titanium rotate: false - xy: 1369, 1237 + xy: 1123, 1075 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 liquid-cryofluid rotate: false - xy: 1131, 1245 + xy: 1123, 939 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 liquid-oil rotate: false - xy: 1301, 1211 + xy: 1123, 837 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 liquid-slag rotate: false - xy: 1233, 1207 + xy: 1085, 633 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 liquid-water rotate: false - xy: 1301, 1177 + xy: 1085, 565 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 blank rotate: false - xy: 1003, 282 + xy: 1009, 1964 size: 1, 1 orig: 1, 1 offset: 0, 0 index: -1 shape-3 rotate: false - xy: 919, 382 + xy: 985, 448 size: 63, 63 orig: 63, 63 offset: 0, 0 @@ -5311,14 +5318,14 @@ ghoul-cell index: -1 glaive rotate: false - xy: 985, 455 + xy: 787, 191 size: 56, 56 orig: 56, 56 offset: 0, 0 index: -1 glaive-cell rotate: false - xy: 787, 191 + xy: 853, 257 size: 56, 56 orig: 56, 56 offset: 0, 0 @@ -5416,14 +5423,14 @@ oculon-old index: -1 phantom rotate: false - xy: 853, 257 + xy: 919, 323 size: 56, 56 orig: 56, 56 offset: 0, 0 index: -1 phantom-cell rotate: false - xy: 919, 324 + xy: 985, 390 size: 56, 56 orig: 56, 56 offset: 0, 0 diff --git a/core/assets/sprites/fallback/sprites2.png b/core/assets/sprites/fallback/sprites2.png index 7a1629e158..c3848e4240 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/sprites3.png b/core/assets/sprites/fallback/sprites3.png index 31d0afbeaa..a253cd2428 100644 Binary files a/core/assets/sprites/fallback/sprites3.png and b/core/assets/sprites/fallback/sprites3.png differ diff --git a/core/assets/sprites/sprites.atlas b/core/assets/sprites/sprites.atlas index b280159163..8872266205 100644 --- a/core/assets/sprites/sprites.atlas +++ b/core/assets/sprites/sprites.atlas @@ -90,14 +90,14 @@ mend-projector-top index: -1 mender rotate: false - xy: 2897, 879 + xy: 3627, 1205 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 mender-top rotate: false - xy: 3543, 1061 + xy: 3661, 1239 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -118,7 +118,7 @@ overdrive-projector-top index: -1 shock-mine rotate: false - xy: 3679, 865 + xy: 3713, 1137 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -139,497 +139,497 @@ block-unloader index: -1 bridge-arrow rotate: false - xy: 3271, 924 + xy: 2294, 219 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 bridge-conveyor rotate: false - xy: 3449, 1139 + xy: 2362, 219 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 bridge-conveyor-bridge rotate: false - xy: 3127, 890 + xy: 2396, 219 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 bridge-conveyor-end rotate: false - xy: 3161, 890 + xy: 2430, 253 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 center rotate: false - xy: 3195, 890 + xy: 2430, 219 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 armored-conveyor-0-0 rotate: false - xy: 1350, 21 + xy: 3493, 1401 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-armored-conveyor-full rotate: false - xy: 1350, 21 + xy: 3493, 1401 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 armored-conveyor-0-1 rotate: false - xy: 2257, 613 + xy: 856, 5 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 armored-conveyor-0-2 rotate: false - xy: 2525, 941 + xy: 3493, 1367 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 armored-conveyor-0-3 rotate: false - xy: 3101, 1101 + xy: 890, 5 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 armored-conveyor-1-0 rotate: false - xy: 856, 5 + xy: 3493, 1333 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 armored-conveyor-1-1 rotate: false - xy: 3493, 1367 + xy: 924, 5 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 armored-conveyor-1-2 rotate: false - xy: 3101, 1067 + xy: 958, 5 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 armored-conveyor-1-3 rotate: false - xy: 890, 5 + xy: 992, 5 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 armored-conveyor-2-0 rotate: false - xy: 3493, 1333 + xy: 1026, 5 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 armored-conveyor-2-1 rotate: false - xy: 3101, 1033 + xy: 1060, 5 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 armored-conveyor-2-2 rotate: false - xy: 924, 5 + xy: 3493, 1299 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 armored-conveyor-2-3 rotate: false - xy: 3101, 999 + xy: 3491, 1265 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 armored-conveyor-3-0 rotate: false - xy: 958, 5 + xy: 3491, 1231 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 armored-conveyor-3-1 rotate: false - xy: 3101, 965 + xy: 3491, 1197 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 armored-conveyor-3-2 rotate: false - xy: 992, 5 + xy: 3527, 1307 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 armored-conveyor-3-3 rotate: false - xy: 1026, 5 + xy: 3561, 1307 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 armored-conveyor-4-0 rotate: false - xy: 1060, 5 + xy: 3595, 1307 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 armored-conveyor-4-1 rotate: false - xy: 3493, 1299 + xy: 3629, 1307 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 armored-conveyor-4-2 rotate: false - xy: 3491, 1265 + xy: 3663, 1307 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 armored-conveyor-4-3 rotate: false - xy: 3491, 1231 + xy: 3697, 1307 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 conveyor-0-1 rotate: false - xy: 3339, 1003 + xy: 2352, 49 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 conveyor-0-2 rotate: false - xy: 3373, 1037 + xy: 2352, 15 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 conveyor-0-3 rotate: false - xy: 3407, 1071 + xy: 2386, 49 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 conveyor-1-0 rotate: false - xy: 3339, 969 + xy: 2386, 15 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 conveyor-1-1 rotate: false - xy: 3373, 1003 + xy: 2442, 185 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 conveyor-1-2 rotate: false - xy: 3407, 1037 + xy: 2442, 151 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 conveyor-1-3 rotate: false - xy: 3441, 1071 + xy: 2442, 117 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 conveyor-2-0 rotate: false - xy: 3339, 935 + xy: 2442, 83 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 conveyor-2-1 rotate: false - xy: 3373, 969 + xy: 2420, 49 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 conveyor-2-2 rotate: false - xy: 3407, 1003 + xy: 2420, 15 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 conveyor-2-3 rotate: false - xy: 3441, 1037 + xy: 2454, 49 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 conveyor-3-0 rotate: false - xy: 3373, 935 + xy: 2454, 15 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 conveyor-3-1 rotate: false - xy: 3407, 969 + xy: 2453, 559 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 conveyor-3-2 rotate: false - xy: 3441, 1003 + xy: 2455, 525 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 conveyor-3-3 rotate: false - xy: 3407, 935 + xy: 2455, 491 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 conveyor-4-0 rotate: false - xy: 3441, 969 + xy: 2455, 457 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 conveyor-4-1 rotate: false - xy: 3441, 935 + xy: 2455, 423 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 conveyor-4-2 rotate: false - xy: 3483, 1095 + xy: 2459, 389 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 conveyor-4-3 rotate: false - xy: 3475, 1061 + xy: 2459, 355 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 plastanium-conveyor rotate: false - xy: 3577, 967 + xy: 2845, 979 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 plastanium-conveyor-0 rotate: false - xy: 3611, 1001 + xy: 2879, 979 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 plastanium-conveyor-1 rotate: false - xy: 3645, 1035 + xy: 2913, 979 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 plastanium-conveyor-2 rotate: false - xy: 3679, 1069 + xy: 2947, 979 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 plastanium-conveyor-edge rotate: false - xy: 3577, 933 + xy: 2981, 979 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 plastanium-conveyor-stack rotate: false - xy: 3611, 967 + xy: 3015, 987 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 titanium-conveyor-0-1 rotate: false - xy: 3969, 1303 + xy: 3713, 1001 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 titanium-conveyor-0-2 rotate: false - xy: 4003, 1303 + xy: 3747, 1001 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 titanium-conveyor-0-3 rotate: false - xy: 3765, 1269 + xy: 3015, 953 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 titanium-conveyor-1-0 rotate: false - xy: 3799, 1269 + xy: 3049, 953 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 titanium-conveyor-1-1 rotate: false - xy: 3833, 1269 + xy: 3083, 985 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 titanium-conveyor-1-2 rotate: false - xy: 3867, 1269 + xy: 3117, 985 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 titanium-conveyor-1-3 rotate: false - xy: 3901, 1269 + xy: 3083, 951 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 titanium-conveyor-2-0 rotate: false - xy: 3935, 1269 + xy: 3117, 951 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 titanium-conveyor-2-1 rotate: false - xy: 3969, 1269 + xy: 3151, 962 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 titanium-conveyor-2-2 rotate: false - xy: 4003, 1269 + xy: 3151, 928 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 titanium-conveyor-2-3 rotate: false - xy: 3763, 1235 + xy: 3185, 936 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 titanium-conveyor-3-0 rotate: false - xy: 3763, 1201 + xy: 3219, 936 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 titanium-conveyor-3-1 rotate: false - xy: 3797, 1235 + xy: 3253, 936 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 titanium-conveyor-3-2 rotate: false - xy: 3831, 1235 + xy: 3287, 936 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 titanium-conveyor-3-3 rotate: false - xy: 3797, 1201 + xy: 3321, 936 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 titanium-conveyor-4-0 rotate: false - xy: 3865, 1235 + xy: 3185, 902 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 titanium-conveyor-4-1 rotate: false - xy: 3831, 1201 + xy: 3219, 902 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 titanium-conveyor-4-2 rotate: false - xy: 3899, 1235 + xy: 3253, 902 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 titanium-conveyor-4-3 rotate: false - xy: 3865, 1201 + xy: 3287, 902 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 cross rotate: false - xy: 2659, 905 + xy: 2488, 15 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -643,14 +643,14 @@ distributor index: -1 inverted-sorter rotate: false - xy: 3595, 1273 + xy: 2498, 257 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 junction rotate: false - xy: 3551, 1103 + xy: 3015, 1021 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -692,7 +692,7 @@ mass-driver-base index: -1 overflow-gate rotate: false - xy: 3543, 993 + xy: 3695, 1239 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -720,49 +720,49 @@ payload-router-over index: -1 phase-conveyor rotate: false - xy: 3577, 1035 + xy: 4054, 1411 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 phase-conveyor-arrow rotate: false - xy: 3611, 1069 + xy: 4054, 1377 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 phase-conveyor-bridge rotate: false - xy: 3577, 1001 + xy: 4054, 1343 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 phase-conveyor-end rotate: false - xy: 3611, 1035 + xy: 2777, 979 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 router rotate: false - xy: 3755, 1137 + xy: 3543, 1035 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 sorter rotate: false - xy: 3747, 865 + xy: 3679, 1069 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 underflow-gate rotate: false - xy: 3967, 1235 + xy: 2551, 963 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -909,63 +909,63 @@ pneumatic-drill-top index: -1 water-extractor rotate: false - xy: 2361, 1183 + xy: 2493, 1249 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 water-extractor-liquid rotate: false - xy: 2493, 1249 + xy: 2427, 1183 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 water-extractor-rotator rotate: false - xy: 2427, 1183 + xy: 2493, 1183 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 water-extractor-top rotate: false - xy: 2493, 1183 + xy: 2559, 1189 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 block-border rotate: false - xy: 3629, 1307 + xy: 4056, 1479 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-middle rotate: false - xy: 3169, 1094 + xy: 2319, 457 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-select rotate: false - xy: 3271, 1026 + xy: 2323, 321 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 conduit-liquid rotate: false - xy: 3381, 1105 + xy: 2340, 83 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 message rotate: false - xy: 3543, 1027 + xy: 3661, 1205 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -979,161 +979,161 @@ place-arrow index: -1 bridge-conduit rotate: false - xy: 3305, 924 + xy: 2328, 253 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 bridge-conduit-arrow rotate: false - xy: 3347, 1139 + xy: 2362, 253 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 bridge-conveyor-arrow rotate: false - xy: 3347, 1139 + xy: 2362, 253 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 bridge-conduit-bridge rotate: false - xy: 3381, 1139 + xy: 2328, 219 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 bridge-conduit-end rotate: false - xy: 3415, 1139 + xy: 2396, 253 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 conduit-bottom rotate: false - xy: 3297, 890 + xy: 2374, 185 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 conduit-bottom-0 rotate: false - xy: 3483, 1129 + xy: 2340, 117 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 conduit-bottom-1 rotate: false - xy: 4056, 1479 + xy: 2374, 151 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 conduit-bottom-2 rotate: false - xy: 3347, 1105 + xy: 2408, 185 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 conduit-bottom-3 rotate: false - xy: 3347, 1105 + xy: 2408, 185 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 conduit-bottom-4 rotate: false - xy: 3347, 1105 + xy: 2408, 185 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 conduit-top-0 rotate: false - xy: 3415, 1105 + xy: 2374, 117 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 conduit-top-1 rotate: false - xy: 3449, 1105 + xy: 2408, 151 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 conduit-top-2 rotate: false - xy: 3339, 1071 + xy: 2374, 83 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 conduit-top-3 rotate: false - xy: 3339, 1037 + xy: 2408, 117 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 pulse-conduit-top-3 rotate: false - xy: 3339, 1037 + xy: 2408, 117 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 conduit-top-4 rotate: false - xy: 3373, 1071 + xy: 2408, 83 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 liquid-junction rotate: false - xy: 3619, 1137 + xy: 3243, 970 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 liquid-overflow-gate rotate: false - xy: 3653, 1103 + xy: 3527, 1273 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 liquid-overflow-gate-top rotate: false - xy: 3687, 1137 + xy: 3561, 1273 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 liquid-router-bottom rotate: false - xy: 3687, 1103 + xy: 3595, 1273 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 liquid-router-liquid rotate: false - xy: 3721, 1137 + xy: 3629, 1273 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 liquid-router-top rotate: false - xy: 3721, 1103 + xy: 3663, 1273 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -1161,133 +1161,133 @@ liquid-tank-top index: -1 mechanical-pump rotate: false - xy: 2795, 879 + xy: 3593, 1239 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 mechanical-pump-liquid rotate: false - xy: 2829, 879 + xy: 3593, 1205 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 rotary-pump-liquid rotate: false - xy: 2829, 879 + xy: 3593, 1205 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 thermal-pump-liquid rotate: false - xy: 2829, 879 + xy: 3593, 1205 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 phase-conduit rotate: false - xy: 3543, 959 + xy: 3695, 1205 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 phase-conduit-arrow rotate: false - xy: 3543, 925 + xy: 3729, 1239 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 phase-conduit-bridge rotate: false - xy: 3543, 891 + xy: 3729, 1205 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 phase-conduit-end rotate: false - xy: 3577, 1069 + xy: 4056, 1445 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 plated-conduit-cap rotate: false - xy: 3679, 1035 + xy: 3525, 1171 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 plated-conduit-top-0 rotate: false - xy: 3713, 1069 + xy: 3559, 1171 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 plated-conduit-top-1 rotate: false - xy: 3577, 899 + xy: 3593, 1171 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 plated-conduit-top-2 rotate: false - xy: 3611, 933 + xy: 3627, 1171 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 plated-conduit-top-3 rotate: false - xy: 3645, 967 + xy: 3661, 1171 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 plated-conduit-top-4 rotate: false - xy: 3679, 1001 + xy: 3695, 1171 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 pulse-conduit-top-0 rotate: false - xy: 3679, 967 + xy: 3543, 1137 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 pulse-conduit-top-1 rotate: false - xy: 3713, 1001 + xy: 3509, 1069 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 pulse-conduit-top-2 rotate: false - xy: 3645, 899 + xy: 3543, 1103 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 pulse-conduit-top-4 rotate: false - xy: 3679, 933 + xy: 3577, 1137 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 rotary-pump rotate: false - xy: 2157, 277 + xy: 2223, 277 size: 64, 64 orig: 64, 64 offset: 0, 0 @@ -1301,7 +1301,7 @@ thermal-pump index: -1 battery rotate: false - xy: 3491, 1197 + xy: 3731, 1307 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -1322,21 +1322,21 @@ battery-large-top index: -1 battery-top rotate: false - xy: 3527, 1307 + xy: 2601, 997 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 combustion-generator rotate: false - xy: 3229, 890 + xy: 2340, 185 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 combustion-generator-top rotate: false - xy: 3263, 890 + xy: 2340, 151 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -1364,28 +1364,28 @@ differential-generator-top index: -1 diode rotate: false - xy: 2693, 905 + xy: 2487, 563 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 diode-arrow rotate: false - xy: 2727, 913 + xy: 2489, 529 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 illuminator rotate: false - xy: 2897, 913 + xy: 2493, 359 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 illuminator-top rotate: false - xy: 3527, 1273 + xy: 2493, 325 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -1441,7 +1441,7 @@ impact-reactor-plasma-3 index: -1 power-node rotate: false - xy: 3713, 1035 + xy: 3729, 1171 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -1455,35 +1455,35 @@ power-node-large index: -1 power-source rotate: false - xy: 3611, 899 + xy: 3509, 1137 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 power-void rotate: false - xy: 3645, 933 + xy: 3509, 1103 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 rtg-generator rotate: false - xy: 2223, 277 + xy: 2030, 211 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 rtg-generator-top rotate: false - xy: 3755, 1103 + xy: 3577, 1069 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 solar-panel rotate: false - xy: 3713, 865 + xy: 3645, 1035 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -1497,14 +1497,14 @@ solar-panel-large index: -1 surge-tower rotate: false - xy: 2831, 1255 + xy: 2897, 1255 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 thermal-generator rotate: false - xy: 3029, 1255 + xy: 3095, 1219 size: 64, 64 orig: 64, 64 offset: 0, 0 @@ -1532,35 +1532,35 @@ thorium-reactor-top index: -1 turbine-generator rotate: false - xy: 3227, 1196 + xy: 3293, 1196 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 turbine-generator-cap rotate: false - xy: 3293, 1196 + xy: 3359, 1173 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 turbine-generator-top rotate: false - xy: 3359, 1173 + xy: 3425, 1173 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 turbine-generator-turbine0 rotate: false - xy: 3425, 1173 + xy: 2361, 1249 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 turbine-generator-turbine1 rotate: false - xy: 2361, 1249 + xy: 2427, 1249 size: 64, 64 orig: 64, 64 offset: 0, 0 @@ -1672,21 +1672,21 @@ graphite-press index: -1 incinerator rotate: false - xy: 3561, 1273 + xy: 2493, 291 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 item-source rotate: false - xy: 3729, 1171 + xy: 2556, 19 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 item-void rotate: false - xy: 3551, 1137 + xy: 2981, 1013 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -1714,21 +1714,21 @@ silicon-smelter-top index: -1 liquid-source rotate: false - xy: 4054, 1377 + xy: 3525, 1239 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 liquid-void rotate: false - xy: 4054, 1343 + xy: 3525, 1205 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 melter rotate: false - xy: 2863, 879 + xy: 3627, 1239 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -1777,14 +1777,14 @@ plastanium-compressor-top index: -1 pulverizer rotate: false - xy: 3713, 967 + xy: 3509, 1035 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 pulverizer-rotator rotate: false - xy: 3679, 899 + xy: 3543, 1069 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -1798,21 +1798,21 @@ pyratite-mixer index: -1 separator rotate: false - xy: 2088, 13 + xy: 2154, 13 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 separator-liquid rotate: false - xy: 2154, 13 + xy: 2220, 13 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 separator-spinner rotate: false - xy: 2220, 13 + xy: 2274, 145 size: 64, 64 orig: 64, 64 offset: 0, 0 @@ -1833,126 +1833,126 @@ silicon-crucible-top index: -1 silicon-smelter rotate: false - xy: 2274, 145 + xy: 2274, 79 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 spore-press rotate: false - xy: 2274, 79 + xy: 2286, 13 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 spore-press-frame0 rotate: false - xy: 2286, 13 + xy: 2567, 1255 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 spore-press-frame1 rotate: false - xy: 2567, 1255 + xy: 2633, 1255 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 spore-press-frame2 rotate: false - xy: 2633, 1255 + xy: 2699, 1255 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 spore-press-liquid rotate: false - xy: 2699, 1255 + xy: 2765, 1255 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 spore-press-top rotate: false - xy: 2765, 1255 + xy: 2831, 1255 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 rock1 rotate: false - xy: 2809, 947 + xy: 3159, 1096 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 rock2 rotate: false - xy: 2859, 947 + xy: 3259, 1146 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 sand-boulder1 rotate: false - xy: 3747, 1069 + xy: 3611, 1103 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 sand-boulder2 rotate: false - xy: 3747, 1035 + xy: 3645, 1137 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 shale-boulder1 rotate: false - xy: 3611, 865 + xy: 3645, 1069 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 shale-boulder2 rotate: false - xy: 3645, 865 + xy: 3679, 1103 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 snowrock1 rotate: false - xy: 2407, 619 + xy: 3259, 1096 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 snowrock2 rotate: false - xy: 2909, 1147 + xy: 3309, 1096 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 spore-cluster1 rotate: false - xy: 3051, 903 + xy: 2509, 983 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 spore-cluster2 rotate: false - xy: 3101, 1177 + xy: 2467, 631 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 spore-cluster3 rotate: false - xy: 3101, 1135 + xy: 2559, 997 size: 40, 40 orig: 40, 40 offset: 0, 0 @@ -2001,14 +2001,14 @@ core-shard index: -1 unloader rotate: false - xy: 3933, 1201 + xy: 2585, 963 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 unloader-center rotate: false - xy: 4001, 1235 + xy: 2619, 963 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -2022,14 +2022,14 @@ vault index: -1 arc-heat rotate: false - xy: 3493, 1401 + xy: 1350, 21 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-1 rotate: false - xy: 3561, 1307 + xy: 2635, 997 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -2085,35 +2085,35 @@ ripple-heat index: -1 salvo-heat rotate: false - xy: 2096, 211 + xy: 2162, 211 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 salvo-panel-left rotate: false - xy: 2162, 211 + xy: 2228, 211 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 salvo-panel-right rotate: false - xy: 2228, 211 + xy: 2076, 145 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 scorch-heat rotate: false - xy: 3747, 967 + xy: 3611, 1069 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 wave-liquid rotate: false - xy: 2625, 1189 + xy: 2691, 1189 size: 64, 64 orig: 64, 64 offset: 0, 0 @@ -2260,11 +2260,18 @@ rally-point index: -1 repair-point-base rotate: false - xy: 3713, 899 + xy: 3611, 1137 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 +resupply-point + rotate: false + xy: 2157, 277 + size: 64, 64 + orig: 64, 64 + offset: 0, 0 + index: -1 tetrative-reconstructor rotate: false xy: 1515, 1469 @@ -2281,7 +2288,7 @@ tetrative-reconstructor-top index: -1 copper-wall rotate: false - xy: 3475, 1027 + xy: 2459, 321 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -2295,7 +2302,7 @@ copper-wall-large index: -1 door rotate: false - xy: 2761, 913 + xy: 2489, 495 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -2316,14 +2323,14 @@ door-large-open index: -1 door-open rotate: false - xy: 2795, 913 + xy: 2489, 461 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 phase-wall rotate: false - xy: 3645, 1069 + xy: 2811, 979 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -2337,7 +2344,7 @@ phase-wall-large index: -1 plastanium-wall rotate: false - xy: 3645, 1001 + xy: 3049, 987 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -2372,84 +2379,84 @@ scrap-wall-huge3 index: -1 scrap-wall-large1 rotate: false - xy: 2076, 79 + xy: 2142, 145 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 scrap-wall-large2 rotate: false - xy: 2142, 145 + xy: 2142, 79 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 scrap-wall-large3 rotate: false - xy: 2142, 79 + xy: 2208, 145 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 scrap-wall-large4 rotate: false - xy: 2208, 145 + xy: 2208, 79 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 scrap-wall2 rotate: false - xy: 3747, 933 + xy: 3645, 1103 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 scrap-wall3 rotate: false - xy: 3747, 899 + xy: 3679, 1137 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 scrap-wall4 rotate: false - xy: 3577, 865 + xy: 3611, 1035 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 scrap-wall5 rotate: false - xy: 3577, 865 + xy: 3611, 1035 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 surge-wall rotate: false - xy: 3901, 1303 + xy: 3645, 1001 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 surge-wall-large rotate: false - xy: 2897, 1255 + xy: 2963, 1255 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 thorium-wall rotate: false - xy: 3935, 1303 + xy: 3679, 1001 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 thorium-wall-large rotate: false - xy: 3095, 1219 + xy: 3161, 1196 size: 64, 64 orig: 64, 64 offset: 0, 0 @@ -2463,14 +2470,14 @@ thruster index: -1 titanium-wall rotate: false - xy: 3933, 1235 + xy: 3321, 902 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 titanium-wall-large rotate: false - xy: 3161, 1196 + xy: 3227, 1196 size: 64, 64 orig: 64, 64 offset: 0, 0 @@ -2505,7 +2512,7 @@ circle-end index: -1 circle-mid rotate: false - xy: 2529, 678 + xy: 2487, 701 size: 1, 199 orig: 1, 199 offset: 0, 0 @@ -2519,7 +2526,7 @@ circle-shadow index: -1 error rotate: false - xy: 2609, 1089 + xy: 2559, 1039 size: 48, 48 orig: 48, 48 offset: 0, 0 @@ -2568,7 +2575,7 @@ missile-back index: -1 particle rotate: false - xy: 3059, 945 + xy: 2425, 627 size: 40, 40 orig: 40, 40 offset: 0, 0 @@ -2603,14 +2610,14 @@ transfer index: -1 transfer-arrow rotate: false - xy: 3899, 1201 + xy: 4054, 1309 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 white rotate: false - xy: 3143, 1196 + xy: 2289, 282 size: 3, 3 orig: 3, 3 offset: 0, 0 @@ -2638,7 +2645,7 @@ block-air-factory-full index: -1 block-arc-full rotate: false - xy: 3595, 1307 + xy: 2669, 997 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -2652,42 +2659,42 @@ block-blast-drill-full index: -1 block-char-full rotate: false - xy: 3663, 1307 + xy: 2299, 593 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-cliffs-full rotate: false - xy: 3697, 1307 + xy: 2333, 593 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-conduit-full rotate: false - xy: 3731, 1307 + xy: 2367, 593 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-conveyor-full rotate: false - xy: 3491, 1163 + xy: 2401, 593 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 conveyor-0-0 rotate: false - xy: 3491, 1163 + xy: 2401, 593 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-craters-full rotate: false - xy: 3101, 931 + xy: 2435, 593 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -2715,28 +2722,28 @@ block-cyclone-full index: -1 block-dark-metal-full rotate: false - xy: 3093, 897 + xy: 2469, 597 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-darksand-full rotate: false - xy: 3143, 1162 + xy: 2283, 559 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-dunerocks-full rotate: false - xy: 3177, 1162 + xy: 2317, 559 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-duo-full rotate: false - xy: 3211, 1162 + xy: 2351, 559 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -2757,7 +2764,7 @@ block-fuse-full index: -1 block-grass-full rotate: false - xy: 3245, 1162 + xy: 2385, 559 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -2771,49 +2778,49 @@ block-ground-factory-full index: -1 block-hail-full rotate: false - xy: 3279, 1162 + xy: 2419, 559 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-holostone-full rotate: false - xy: 3313, 1162 + xy: 2285, 525 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-hotrock-full rotate: false - xy: 3143, 1128 + xy: 2285, 491 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-ice-full rotate: false - xy: 3177, 1128 + xy: 2319, 525 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-ice-snow-full rotate: false - xy: 3211, 1128 + xy: 2285, 457 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-icerocks-full rotate: false - xy: 3245, 1128 + xy: 2353, 525 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-ignarock-full rotate: false - xy: 3279, 1128 + xy: 2319, 491 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -2841,7 +2848,7 @@ block-laser-drill-full index: -1 block-liquid-router-full rotate: false - xy: 3313, 1128 + xy: 2285, 423 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -2855,7 +2862,7 @@ block-liquid-tank-full index: -1 block-magmarock-full rotate: false - xy: 3135, 1094 + xy: 2387, 525 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -2897,14 +2904,14 @@ block-meltdown-full index: -1 block-metal-floor-damaged-full rotate: false - xy: 3135, 1060 + xy: 2353, 491 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-moss-full rotate: false - xy: 3135, 1026 + xy: 2387, 491 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -2932,42 +2939,42 @@ block-oil-extractor-full index: -1 block-ore-coal-full rotate: false - xy: 3169, 1060 + xy: 2353, 457 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-ore-copper-full rotate: false - xy: 3203, 1094 + xy: 2319, 423 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-ore-lead-full rotate: false - xy: 3135, 992 + xy: 2387, 457 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-ore-scrap-full rotate: false - xy: 3169, 1026 + xy: 2353, 423 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-ore-thorium-full rotate: false - xy: 3203, 1060 + xy: 2387, 423 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-ore-titanium-full rotate: false - xy: 3237, 1094 + xy: 2421, 525 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -2988,7 +2995,7 @@ payload-router-icon index: -1 block-pebbles-full rotate: false - xy: 3135, 958 + xy: 2421, 491 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -3002,7 +3009,7 @@ block-phase-weaver-full index: -1 block-plated-conduit-full rotate: false - xy: 3169, 992 + xy: 2421, 457 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -3016,21 +3023,21 @@ block-pneumatic-drill-full index: -1 block-pulse-conduit-full rotate: false - xy: 3203, 1026 + xy: 2421, 423 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-pulverizer-full rotate: false - xy: 3237, 1060 + xy: 2289, 389 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-repair-point-full rotate: false - xy: 3271, 1094 + xy: 2289, 355 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -3051,14 +3058,14 @@ block-rock-full index: -1 block-rocks-full rotate: false - xy: 3169, 958 + xy: 2323, 389 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-saltrocks-full rotate: false - xy: 3203, 992 + xy: 2289, 321 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -3072,21 +3079,21 @@ block-salvo-full index: -1 block-sand-boulder-full rotate: false - xy: 3237, 1026 + xy: 2357, 389 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-sand-full rotate: false - xy: 3271, 1060 + xy: 2323, 355 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-sandrocks-full rotate: false - xy: 3305, 1094 + xy: 2289, 287 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -3100,21 +3107,21 @@ block-scatter-full index: -1 block-scorch-full rotate: false - xy: 3203, 958 + xy: 2391, 389 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-scrap-wall-full rotate: false - xy: 3237, 992 + xy: 2357, 355 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 scrap-wall1 rotate: false - xy: 3237, 992 + xy: 2357, 355 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -3149,35 +3156,35 @@ block-segment-full index: -1 block-shale-boulder-full rotate: false - xy: 3305, 1060 + xy: 2391, 355 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-shale-full rotate: false - xy: 3237, 958 + xy: 2357, 321 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-shalerocks-full rotate: false - xy: 3271, 992 + xy: 2323, 287 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-shrubs-full rotate: false - xy: 3305, 1026 + xy: 2391, 321 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-snow-full rotate: false - xy: 3271, 958 + xy: 2357, 287 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -3191,7 +3198,7 @@ block-snowrock-full index: -1 block-snowrocks-full rotate: false - xy: 3305, 992 + xy: 2391, 287 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -3212,7 +3219,7 @@ block-spore-cluster-full index: -1 block-spore-moss-full rotate: false - xy: 3305, 958 + xy: 2425, 389 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -3226,14 +3233,14 @@ block-spore-press-full index: -1 block-sporerocks-full rotate: false - xy: 3135, 924 + xy: 2425, 355 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-stone-full rotate: false - xy: 3169, 924 + xy: 2425, 321 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -3247,7 +3254,7 @@ block-swarmer-full index: -1 block-tendrils-full rotate: false - xy: 3203, 924 + xy: 2425, 287 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -3261,14 +3268,14 @@ block-tetrative-reconstructor-full index: -1 block-titanium-conveyor-full rotate: false - xy: 3237, 924 + xy: 2294, 253 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 titanium-conveyor-0-0 rotate: false - xy: 3237, 924 + xy: 2294, 253 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -3296,56 +3303,56 @@ block-wave-full index: -1 cracks-1-0 rotate: false - xy: 3475, 993 + xy: 2459, 287 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 cracks-1-1 rotate: false - xy: 3475, 959 + xy: 2464, 253 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 cracks-1-2 rotate: false - xy: 3475, 925 + xy: 2464, 219 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 cracks-1-3 rotate: false - xy: 3339, 901 + xy: 2476, 185 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 cracks-1-4 rotate: false - xy: 3373, 901 + xy: 2476, 151 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 cracks-1-5 rotate: false - xy: 3407, 901 + xy: 2476, 117 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 cracks-1-6 rotate: false - xy: 3441, 901 + xy: 2476, 83 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 cracks-1-7 rotate: false - xy: 3475, 891 + xy: 2488, 49 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -3807,7 +3814,7 @@ cyclone index: -1 duo rotate: false - xy: 2829, 913 + xy: 2489, 427 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -3821,7 +3828,7 @@ fuse index: -1 hail rotate: false - xy: 2863, 913 + xy: 2493, 393 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -3835,14 +3842,14 @@ item-blast-compound-large index: -1 item-blast-compound-medium rotate: false - xy: 3663, 1273 + xy: 2503, 597 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 item-blast-compound-small rotate: false - xy: 613, 1379 + xy: 3083, 1029 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -3856,42 +3863,42 @@ item-blast-compound-tiny index: -1 item-blast-compound-xlarge rotate: false - xy: 2659, 1089 + xy: 2709, 1089 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 item-coal-large rotate: false - xy: 3009, 905 + xy: 3209, 1004 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 item-coal-medium rotate: false - xy: 3731, 1273 + xy: 2510, 155 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 item-coal-small rotate: false - xy: 2095, 1765 + xy: 613, 1379 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 item-coal-tiny rotate: false - xy: 3143, 1201 + xy: 2113, 1303 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 item-coal-xlarge rotate: false - xy: 2659, 1039 + xy: 2609, 1031 size: 48, 48 orig: 48, 48 offset: 0, 0 @@ -3905,126 +3912,126 @@ item-copper-large index: -1 item-copper-medium rotate: false - xy: 3525, 1205 + xy: 2510, 87 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 item-copper-small rotate: false - xy: 1775, 1443 + xy: 2095, 1765 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 item-copper-tiny rotate: false - xy: 2113, 1303 + xy: 2113, 1285 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 item-copper-xlarge rotate: false - xy: 2709, 1147 + xy: 2659, 1031 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 item-graphite-large rotate: false - xy: 2441, 867 + xy: 3251, 1004 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 item-graphite-medium rotate: false - xy: 3525, 1171 + xy: 2523, 529 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 item-graphite-small rotate: false - xy: 323, 1089 + xy: 1775, 1443 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 item-graphite-tiny rotate: false - xy: 2113, 1285 + xy: 204, 1 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 item-graphite-xlarge rotate: false - xy: 2759, 1147 + xy: 2709, 1039 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 item-lead-large rotate: false - xy: 1973, 599 + xy: 3293, 1004 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 item-lead-medium rotate: false - xy: 3593, 1239 + xy: 2523, 461 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 item-lead-small rotate: false - xy: 1647, 763 + xy: 323, 1089 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 item-lead-tiny rotate: false - xy: 204, 1 + xy: 222, 1 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 item-lead-xlarge rotate: false - xy: 2709, 1097 + xy: 2759, 1147 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 item-metaglass-large rotate: false - xy: 2445, 825 + xy: 1973, 599 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 item-metaglass-medium rotate: false - xy: 3593, 1205 + xy: 2527, 393 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 item-metaglass-small rotate: false - xy: 1905, 1023 + xy: 1647, 763 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 item-metaglass-tiny rotate: false - xy: 222, 1 + xy: 240, 1 size: 16, 16 orig: 16, 16 offset: 0, 0 @@ -4038,203 +4045,203 @@ item-metaglass-xlarge index: -1 item-phase-fabric-large rotate: false - xy: 2445, 783 + xy: 909, 471 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 item-phase-fabric-medium rotate: false - xy: 3593, 1171 + xy: 2527, 325 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 item-phase-fabric-small rotate: false - xy: 1683, 665 + xy: 1905, 1023 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 item-phase-fabric-tiny rotate: false - xy: 240, 1 + xy: 258, 1 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 item-phase-fabric-xlarge rotate: false - xy: 2709, 1047 + xy: 2759, 1097 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 item-plastanium-large rotate: false - xy: 2445, 741 + xy: 2451, 967 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 item-plastanium-medium rotate: false - xy: 3661, 1239 + xy: 2532, 257 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 item-plastanium-small rotate: false - xy: 1777, 567 + xy: 1683, 665 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 item-plastanium-tiny rotate: false - xy: 258, 1 + xy: 276, 1 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 item-plastanium-xlarge rotate: false - xy: 2759, 1097 + xy: 2859, 1147 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 item-pyratite-large rotate: false - xy: 2445, 699 + xy: 2447, 925 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 item-pyratite-medium rotate: false - xy: 3661, 1205 + xy: 2544, 189 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 item-pyratite-small rotate: false - xy: 1941, 795 + xy: 1777, 567 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 item-pyratite-tiny rotate: false - xy: 276, 1 + xy: 294, 1 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 item-pyratite-xlarge rotate: false - xy: 2859, 1147 + xy: 2759, 1047 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 item-sand-large rotate: false - xy: 909, 471 + xy: 2441, 883 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 item-sand-medium rotate: false - xy: 3661, 1171 + xy: 2544, 121 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 item-sand-small rotate: false - xy: 2063, 1507 + xy: 1941, 795 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 item-sand-tiny rotate: false - xy: 294, 1 + xy: 312, 1 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 item-sand-xlarge rotate: false - xy: 2759, 1047 + xy: 2809, 1097 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 item-scrap-large rotate: false - xy: 2483, 867 + xy: 2445, 841 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 item-scrap-medium rotate: false - xy: 3729, 1239 + xy: 2522, 53 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 item-scrap-small rotate: false - xy: 2193, 1343 + xy: 2063, 1507 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 item-scrap-tiny rotate: false - xy: 312, 1 + xy: 330, 1 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 item-scrap-xlarge rotate: false - xy: 2809, 1097 + xy: 2909, 1147 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 item-silicon-large rotate: false - xy: 2487, 825 + xy: 2445, 799 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 item-silicon-medium rotate: false - xy: 3729, 1205 + xy: 2556, 53 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 item-silicon-small rotate: false - xy: 1839, 469 + xy: 2193, 1343 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 item-silicon-tiny rotate: false - xy: 330, 1 + xy: 348, 1 size: 16, 16 orig: 16, 16 offset: 0, 0 @@ -4248,28 +4255,28 @@ item-silicon-xlarge index: -1 item-spore-pod-large rotate: false - xy: 2487, 783 + xy: 2445, 757 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 item-spore-pod-medium rotate: false - xy: 3517, 1095 + xy: 2743, 1005 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 item-spore-pod-small rotate: false - xy: 2207, 713 + xy: 1839, 469 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 item-spore-pod-tiny rotate: false - xy: 348, 1 + xy: 366, 1 size: 16, 16 orig: 16, 16 offset: 0, 0 @@ -4283,28 +4290,28 @@ item-spore-pod-xlarge index: -1 item-surge-alloy-large rotate: false - xy: 2487, 741 + xy: 2445, 715 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 item-surge-alloy-medium rotate: false - xy: 3509, 1027 + xy: 2811, 1013 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 item-surge-alloy-small rotate: false - xy: 1455, 40 + xy: 2207, 713 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 item-surge-alloy-tiny rotate: false - xy: 366, 1 + xy: 2522, 1 size: 16, 16 orig: 16, 16 offset: 0, 0 @@ -4318,70 +4325,70 @@ item-surge-alloy-xlarge index: -1 item-thorium-large rotate: false - xy: 2487, 699 + xy: 2445, 673 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 item-thorium-medium rotate: false - xy: 3509, 959 + xy: 2879, 1013 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 item-thorium-small rotate: false - xy: 2361, 1157 + xy: 1455, 40 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 item-thorium-tiny rotate: false - xy: 583, 845 + xy: 2540, 1 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 item-thorium-xlarge rotate: false - xy: 2257, 647 + xy: 2909, 1097 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 item-titanium-large rotate: false - xy: 3059, 1155 + xy: 2257, 655 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 item-titanium-medium rotate: false - xy: 3509, 891 + xy: 2947, 1013 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 item-titanium-small rotate: false - xy: 2361, 1131 + xy: 2361, 1157 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 item-titanium-tiny rotate: false - xy: 2239, 1113 + xy: 2558, 1 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 item-titanium-xlarge rotate: false - xy: 2451, 959 + xy: 2909, 1047 size: 48, 48 orig: 48, 48 offset: 0, 0 @@ -4395,140 +4402,140 @@ lancer index: -1 liquid-cryofluid-large rotate: false - xy: 3059, 1113 + xy: 2257, 613 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 liquid-cryofluid-medium rotate: false - xy: 3585, 1103 + xy: 3209, 970 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 liquid-cryofluid-small rotate: false - xy: 633, 239 + xy: 2361, 1131 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 liquid-cryofluid-tiny rotate: false - xy: 2001, 295 + xy: 2576, 1 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 liquid-cryofluid-xlarge rotate: false - xy: 2609, 981 + xy: 2959, 1047 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 liquid-oil-large rotate: false - xy: 3059, 1071 + xy: 2299, 627 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 liquid-oil-medium rotate: false - xy: 3653, 1137 + xy: 3311, 970 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 liquid-oil-small rotate: false - xy: 659, 239 + xy: 633, 239 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 liquid-oil-tiny rotate: false - xy: 909, 453 + xy: 583, 845 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 liquid-oil-xlarge rotate: false - xy: 2659, 989 + xy: 3009, 1155 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 liquid-slag-large rotate: false - xy: 3059, 1029 + xy: 2341, 627 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 liquid-slag-medium rotate: false - xy: 4054, 1411 + xy: 3731, 1273 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 liquid-slag-small rotate: false - xy: 2445, 673 + xy: 659, 239 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 liquid-slag-tiny rotate: false - xy: 3073, 1237 + xy: 2239, 1113 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 liquid-slag-xlarge rotate: false - xy: 2709, 997 + xy: 3009, 1105 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 liquid-water-large rotate: false - xy: 3059, 987 + xy: 2383, 627 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 liquid-water-medium rotate: false - xy: 2761, 879 + xy: 3559, 1205 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 liquid-water-small rotate: false - xy: 2931, 921 + xy: 3765, 1315 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 liquid-water-tiny rotate: false - xy: 3763, 1183 + xy: 2001, 295 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 liquid-water-xlarge rotate: false - xy: 2759, 997 + xy: 3009, 1055 size: 48, 48 orig: 48, 48 offset: 0, 0 @@ -4549,7 +4556,7 @@ meltdown index: -1 repair-point rotate: false - xy: 3713, 933 + xy: 3577, 1103 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -4563,28 +4570,28 @@ ripple index: -1 salvo rotate: false - xy: 2030, 211 + xy: 2096, 211 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 scatter rotate: false - xy: 2076, 145 + xy: 2076, 79 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 scorch rotate: false - xy: 3747, 1001 + xy: 3577, 1035 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 segment rotate: false - xy: 2208, 79 + xy: 2088, 13 size: 64, 64 orig: 64, 64 offset: 0, 0 @@ -4598,98 +4605,98 @@ spectre index: -1 splash-0 rotate: false - xy: 3781, 1069 + xy: 3713, 1103 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 splash-1 rotate: false - xy: 3781, 1035 + xy: 3679, 1035 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 splash-10 rotate: false - xy: 3833, 1303 + xy: 3577, 1001 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 splash-11 rotate: false - xy: 3867, 1303 + xy: 3611, 1001 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 splash-2 rotate: false - xy: 3781, 1001 + xy: 3713, 1069 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 splash-3 rotate: false - xy: 3781, 967 + xy: 3713, 1035 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 splash-4 rotate: false - xy: 3781, 933 + xy: 3747, 1137 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 splash-5 rotate: false - xy: 3781, 899 + xy: 3747, 1103 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 splash-6 rotate: false - xy: 3781, 865 + xy: 3747, 1069 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 splash-7 rotate: false - xy: 4054, 1309 + xy: 3747, 1035 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 splash-8 rotate: false - xy: 3765, 1303 + xy: 3509, 1001 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 splash-9 rotate: false - xy: 3799, 1303 + xy: 3543, 1001 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 swarmer rotate: false - xy: 2963, 1255 + xy: 3029, 1255 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 unit-alpha-full rotate: false - xy: 2959, 1155 + xy: 3209, 1046 size: 48, 48 orig: 48, 48 offset: 0, 0 @@ -4703,21 +4710,21 @@ unit-cix-full index: -1 unit-crawler-full rotate: false - xy: 2959, 1105 + xy: 3259, 1046 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 unit-dagger-full rotate: false - xy: 2959, 1055 + xy: 3309, 1046 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 unit-draug-full rotate: false - xy: 2959, 1005 + xy: 3359, 1073 size: 48, 48 orig: 48, 48 offset: 0, 0 @@ -4752,7 +4759,7 @@ unit-lich-full index: -1 unit-mace-full rotate: false - xy: 2427, 1249 + xy: 2361, 1183 size: 64, 64 orig: 64, 64 offset: 0, 0 @@ -4787,14 +4794,14 @@ unit-revenant-full index: -1 unit-spirit-full rotate: false - xy: 2959, 955 + xy: 3409, 1073 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 unit-tau-full rotate: false - xy: 2865, 1197 + xy: 2931, 1197 size: 56, 56 orig: 56, 56 offset: 0, 0 @@ -4808,161 +4815,161 @@ unit-trident-full index: -1 unit-vanguard-full rotate: false - xy: 3009, 1147 + xy: 3459, 1073 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 unit-wraith-full rotate: false - xy: 3009, 1097 + xy: 3109, 1019 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 wave rotate: false - xy: 2559, 1189 + xy: 2625, 1189 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 item-blast-compound rotate: false - xy: 3629, 1273 + xy: 2498, 223 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 item-coal rotate: false - xy: 3697, 1273 + xy: 2510, 189 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 item-copper rotate: false - xy: 3525, 1239 + xy: 2510, 121 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 item-graphite rotate: false - xy: 3559, 1239 + xy: 2521, 563 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 item-lead rotate: false - xy: 3559, 1205 + xy: 2523, 495 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 item-metaglass rotate: false - xy: 3559, 1171 + xy: 2523, 427 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 item-phase-fabric rotate: false - xy: 3627, 1239 + xy: 2527, 359 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 item-plastanium rotate: false - xy: 3627, 1205 + xy: 2527, 291 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 item-pyratite rotate: false - xy: 3627, 1171 + xy: 2532, 223 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 item-sand rotate: false - xy: 3695, 1239 + xy: 2544, 155 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 item-scrap rotate: false - xy: 3695, 1205 + xy: 2544, 87 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 item-silicon rotate: false - xy: 3695, 1171 + xy: 2522, 19 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 item-spore-pod rotate: false - xy: 3517, 1129 + xy: 2709, 1005 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 item-surge-alloy rotate: false - xy: 3509, 1061 + xy: 2777, 1013 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 item-thorium rotate: false - xy: 3509, 993 + xy: 2845, 1013 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 item-titanium rotate: false - xy: 3509, 925 + xy: 2913, 1013 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 liquid-cryofluid rotate: false - xy: 3585, 1137 + xy: 3049, 1021 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 liquid-oil rotate: false - xy: 3619, 1103 + xy: 3277, 970 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 liquid-slag rotate: false - xy: 4056, 1445 + xy: 3697, 1273 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 liquid-water rotate: false - xy: 2727, 879 + xy: 3559, 1239 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -5088,7 +5095,7 @@ crawler index: -1 crawler-base rotate: false - xy: 2923, 1205 + xy: 2989, 1205 size: 48, 48 orig: 48, 48 offset: 0, 0 @@ -5130,7 +5137,7 @@ dagger-leg index: -1 delta rotate: false - xy: 2973, 1205 + xy: 3039, 1205 size: 48, 48 orig: 48, 48 offset: 0, 0 @@ -5151,7 +5158,7 @@ draug index: -1 draug-cell rotate: false - xy: 2559, 1039 + xy: 2659, 1139 size: 48, 48 orig: 48, 48 offset: 0, 0 @@ -5354,7 +5361,7 @@ oculon-base index: -1 oculon-base-old rotate: false - xy: 2559, 939 + xy: 3109, 1169 size: 48, 48 orig: 48, 48 offset: 0, 0 @@ -5368,7 +5375,7 @@ oculon-cell index: -1 oculon-cell-old rotate: false - xy: 2609, 931 + xy: 3109, 1119 size: 48, 48 orig: 48, 48 offset: 0, 0 @@ -5382,7 +5389,7 @@ oculon-leg index: -1 oculon-leg-old rotate: false - xy: 2659, 939 + xy: 3109, 1069 size: 48, 48 orig: 48, 48 offset: 0, 0 @@ -5396,7 +5403,7 @@ oculon-old index: -1 phantom rotate: false - xy: 2691, 1197 + xy: 2757, 1197 size: 56, 56 orig: 56, 56 offset: 0, 0 @@ -5445,28 +5452,28 @@ revenant-cell index: -1 spirit rotate: false - xy: 2909, 1097 + xy: 3359, 1123 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 spirit-cell rotate: false - xy: 2909, 1047 + xy: 3409, 1123 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 tau rotate: false - xy: 2749, 1197 + xy: 2815, 1197 size: 56, 56 orig: 56, 56 offset: 0, 0 index: -1 tau-base rotate: false - xy: 2909, 997 + xy: 3459, 1123 size: 48, 48 orig: 48, 48 offset: 0, 0 @@ -5480,7 +5487,7 @@ tau-cell index: -1 tau-leg rotate: false - xy: 2909, 947 + xy: 3159, 1046 size: 48, 48 orig: 48, 48 offset: 0, 0 @@ -5494,21 +5501,21 @@ trident index: -1 trident-cell rotate: false - xy: 2807, 1197 + xy: 2873, 1197 size: 56, 56 orig: 56, 56 offset: 0, 0 index: -1 vanguard rotate: false - xy: 3009, 1047 + xy: 3359, 1023 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 vanguard-cell rotate: false - xy: 3009, 997 + xy: 3409, 1023 size: 48, 48 orig: 48, 48 offset: 0, 0 @@ -5536,7 +5543,7 @@ eradication index: -1 eruption rotate: false - xy: 3023, 1197 + xy: 2609, 1081 size: 48, 56 orig: 48, 56 offset: 0, 0 @@ -5550,7 +5557,7 @@ flakgun index: -1 flamethrower rotate: false - xy: 2609, 1031 + xy: 2659, 1081 size: 48, 56 orig: 48, 56 offset: 0, 0 @@ -5564,84 +5571,84 @@ heal-weapon index: -1 heal-weapon-mount rotate: false - xy: 2659, 1139 + xy: 2709, 1139 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 large-weapon rotate: false - xy: 2559, 989 + xy: 2959, 1147 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 lich-missiles rotate: false - xy: 2509, 975 + xy: 2959, 1097 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 missiles rotate: false - xy: 2809, 997 + xy: 3059, 1155 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 missiles-mount rotate: false - xy: 2859, 997 + xy: 3059, 1105 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 mount-weapon rotate: false - xy: 2447, 909 + xy: 3059, 1055 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 reaper-weapon rotate: false - xy: 2709, 947 + xy: 3159, 1146 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 revenant-missiles rotate: false - xy: 2759, 947 + xy: 3209, 1146 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 small-basic-weapon rotate: false - xy: 2307, 619 + xy: 3309, 1146 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 small-weapon rotate: false - xy: 2357, 619 + xy: 3209, 1096 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 weapon rotate: false - xy: 3009, 947 + xy: 3459, 1023 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 wraith rotate: false - xy: 2959, 905 + xy: 3159, 996 size: 48, 48 orig: 48, 48 offset: 0, 0 diff --git a/core/assets/sprites/sprites.png b/core/assets/sprites/sprites.png index beb6cf667d..7a63bd4a30 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 a2a5d46889..bfa77084c0 100644 Binary files a/core/assets/sprites/sprites2.png and b/core/assets/sprites/sprites2.png differ diff --git a/core/src/mindustry/content/Blocks.java b/core/src/mindustry/content/Blocks.java index f558d46d57..aec4371c3e 100644 --- a/core/src/mindustry/content/Blocks.java +++ b/core/src/mindustry/content/Blocks.java @@ -79,7 +79,7 @@ public class Blocks implements ContentList{ //units groundFactory, airFactory, navalFactory, additiveReconstructor, multiplicativeReconstructor, exponentialReconstructor, tetrativeReconstructor, - repairPoint, + repairPoint, resupplyPoint, //campaign launchPad, launchPadLarge, coreSilo, dataProcessor, @@ -1754,6 +1754,15 @@ public class Blocks implements ContentList{ powerUse = 1f; }}; + resupplyPoint = new ResupplyPoint("resupply-point"){{ + requirements(Category.units, BuildVisibility.ammoOnly, ItemStack.with(Items.lead, 20, Items.copper, 15, Items.silicon, 15)); + + size = 2; + range = 80f; + + consumes.item(Items.copper, 1); + }}; + //endregion //region sandbox diff --git a/core/src/mindustry/core/Logic.java b/core/src/mindustry/core/Logic.java index e1096d726f..6657251783 100644 --- a/core/src/mindustry/core/Logic.java +++ b/core/src/mindustry/core/Logic.java @@ -98,6 +98,9 @@ public class Logic implements ApplicationListener{ SectorDamage.apply(state.rules.sector.getTurnsPassed()); state.rules.sector.setTurnsPassed(0); } + + //enable infinite ammo for wave team by default + state.rules.waveTeam.rules().infiniteAmmo = true; }); //TODO dying takes up a turn (?) diff --git a/core/src/mindustry/entities/comp/WeaponsComp.java b/core/src/mindustry/entities/comp/WeaponsComp.java index 68ed127fb2..9eebad693f 100644 --- a/core/src/mindustry/entities/comp/WeaponsComp.java +++ b/core/src/mindustry/entities/comp/WeaponsComp.java @@ -97,7 +97,7 @@ abstract class WeaponsComp implements Teamc, Posc, Rotc{ mount.targetRotation = angleTo(mount.aimX, mount.aimY); } - if(mount.shoot && (ammo > 0 || !state.rules.unitAmmo)){ + if(mount.shoot && (ammo > 0 || !state.rules.unitAmmo || team().rules().infiniteAmmo)){ float rotation = this.rotation - 90; //shoot if applicable @@ -118,10 +118,10 @@ abstract class WeaponsComp implements Teamc, Posc, Rotc{ if(mount.weapon.mirror) mount.side = !mount.side; mount.reload = weapon.reload; - } - ammo --; - if(ammo < 0) ammo = 0; + ammo --; + if(ammo < 0) ammo = 0; + } } } } diff --git a/core/src/mindustry/game/Rules.java b/core/src/mindustry/game/Rules.java index 915dd8d450..0c47e1dea0 100644 --- a/core/src/mindustry/game/Rules.java +++ b/core/src/mindustry/game/Rules.java @@ -105,6 +105,8 @@ public class Rules{ public boolean cheat; /** If true, resources are not consumed when building. */ public boolean infiniteResources; + /** If true, this team has infinite unit ammo. */ + public boolean infiniteAmmo; } /** Copies this ruleset exactly. Not efficient at all, do not use often. */ diff --git a/core/src/mindustry/type/UnitType.java b/core/src/mindustry/type/UnitType.java index 7c49d21234..473671f227 100644 --- a/core/src/mindustry/type/UnitType.java +++ b/core/src/mindustry/type/UnitType.java @@ -52,7 +52,7 @@ public class UnitType extends UnlockableContent{ public boolean flipBackLegs = true; public int itemCapacity = 30; - public int ammoCapacity = 100; + public int ammoCapacity = 220; public int drillTier = -1; public float buildSpeed = 1f, mineSpeed = 1f; diff --git a/core/src/mindustry/ui/dialogs/CustomRulesDialog.java b/core/src/mindustry/ui/dialogs/CustomRulesDialog.java index 7f522aa189..2dfba3a9aa 100644 --- a/core/src/mindustry/ui/dialogs/CustomRulesDialog.java +++ b/core/src/mindustry/ui/dialogs/CustomRulesDialog.java @@ -155,6 +155,7 @@ public class CustomRulesDialog extends BaseDialog{ main.row(); title("$rules.title.unit"); + check("$rules.unitammo", b -> rules.unitAmmo = b, () -> rules.unitAmmo); number("$rules.unithealthmultiplier", f -> rules.unitHealthMultiplier = f, () -> rules.unitHealthMultiplier); number("$rules.unitdamagemultiplier", f -> rules.unitDamageMultiplier = f, () -> rules.unitDamageMultiplier); number("$rules.unitbuildspeedmultiplier", f -> rules.unitBuildSpeedMultiplier = f, () -> rules.unitBuildSpeedMultiplier); diff --git a/core/src/mindustry/world/blocks/Autotiler.java b/core/src/mindustry/world/blocks/Autotiler.java index 375f2d318c..a1c7cd7e5c 100644 --- a/core/src/mindustry/world/blocks/Autotiler.java +++ b/core/src/mindustry/world/blocks/Autotiler.java @@ -163,10 +163,17 @@ public interface Autotiler{ /** @return whether this tile is looking at the other tile, or the other tile is looking at this one. * If the other tile does not rotate, it is always considered to be facing this one. */ - default boolean lookingAt(Tile tile, int rotation, int otherx, int othery, int otherrot, Block otherblock){ + default boolean lookingAtEither(Tile tile, int rotation, int otherx, int othery, int otherrot, Block otherblock){ return (Point2.equals(tile.x + Geometry.d4(rotation).x, tile.y + Geometry.d4(rotation).y, otherx, othery) || (!otherblock.rotatedOutput(otherx, othery) || Point2.equals(otherx + Geometry.d4(otherrot).x, othery + Geometry.d4(otherrot).y, tile.x, tile.y))); } + /** @return whether this tile is looking at the other tile. */ + default boolean lookingAt(Tile tile, int rotation, int otherx, int othery, Block otherblock){ + Tile facing = Edges.getFacingEdge(otherblock, otherx, othery, tile); + return facing != null && + Point2.equals(tile.x + Geometry.d4(rotation).x, tile.y + Geometry.d4(rotation).y, facing.x, facing.y); + } + boolean blends(Tile tile, int rotation, int otherx, int othery, int otherrot, Block otherblock); } diff --git a/core/src/mindustry/world/blocks/distribution/Conveyor.java b/core/src/mindustry/world/blocks/distribution/Conveyor.java index 194877294b..44fb57910f 100644 --- a/core/src/mindustry/world/blocks/distribution/Conveyor.java +++ b/core/src/mindustry/world/blocks/distribution/Conveyor.java @@ -67,7 +67,8 @@ public class Conveyor extends Block implements Autotiler{ @Override public boolean blends(Tile tile, int rotation, int otherx, int othery, int otherrot, Block otherblock){ - return otherblock.outputsItems() && lookingAt(tile, rotation, otherx, othery, otherrot, otherblock); + return (otherblock.outputsItems() || lookingAt(tile, rotation, otherx, othery, otherblock)) + && lookingAtEither(tile, rotation, otherx, othery, otherrot, otherblock); } @Override diff --git a/core/src/mindustry/world/blocks/distribution/StackConveyor.java b/core/src/mindustry/world/blocks/distribution/StackConveyor.java index d219391b49..1b70f40a0a 100644 --- a/core/src/mindustry/world/blocks/distribution/StackConveyor.java +++ b/core/src/mindustry/world/blocks/distribution/StackConveyor.java @@ -55,7 +55,7 @@ public class StackConveyor extends Block implements Autotiler{ if(tile.entity instanceof StackConveyorEntity){ int state = ((StackConveyorEntity)tile.entity).state; if(state == stateLoad){ //standard conveyor mode - return otherblock.outputsItems() && lookingAt(tile, rotation, otherx, othery, otherrot, otherblock); + return otherblock.outputsItems() && lookingAtEither(tile, rotation, otherx, othery, otherrot, otherblock); }else if(state == stateUnload){ //router mode return (otherblock.hasItems || otherblock.outputsItems() || otherblock.acceptsItems) && (notLookingAt(tile, rotation, otherx, othery, otherrot, otherblock) || diff --git a/core/src/mindustry/world/blocks/liquid/Conduit.java b/core/src/mindustry/world/blocks/liquid/Conduit.java index 292c22d7be..9150dafed3 100644 --- a/core/src/mindustry/world/blocks/liquid/Conduit.java +++ b/core/src/mindustry/world/blocks/liquid/Conduit.java @@ -64,7 +64,7 @@ public class Conduit extends LiquidBlock implements Autotiler{ @Override public boolean blends(Tile tile, int rotation, int otherx, int othery, int otherrot, Block otherblock){ - return otherblock.hasLiquids && otherblock.outputsLiquid && lookingAt(tile, rotation, otherx, othery, otherrot, otherblock); + return otherblock.hasLiquids && otherblock.outputsLiquid && lookingAtEither(tile, rotation, otherx, othery, otherrot, otherblock); } @Override diff --git a/core/src/mindustry/world/blocks/production/LiquidConverter.java b/core/src/mindustry/world/blocks/production/LiquidConverter.java index 1b63548e62..16ab9751f4 100644 --- a/core/src/mindustry/world/blocks/production/LiquidConverter.java +++ b/core/src/mindustry/world/blocks/production/LiquidConverter.java @@ -43,14 +43,14 @@ public class LiquidConverter extends GenericCrafter{ ConsumeLiquidBase cl = consumes.get(ConsumeType.liquid); if(cons.valid()){ - float use = Math.min(cl.amount * delta(), liquidCapacity - liquids.get(outputLiquid.liquid)) * efficiency(); + float use = Math.min(cl.amount * edelta(), liquidCapacity - liquids.get(outputLiquid.liquid)); useContent(outputLiquid.liquid); - progress += use / cl.amount / craftTime; + progress += use / cl.amount; liquids.add(outputLiquid.liquid, use); - if(progress >= 1f){ + if(progress >= craftTime){ consume(); - progress = 0f; + progress %= craftTime; } } diff --git a/core/src/mindustry/world/blocks/storage/CoreBlock.java b/core/src/mindustry/world/blocks/storage/CoreBlock.java index 5950be05c6..64c9b30d07 100644 --- a/core/src/mindustry/world/blocks/storage/CoreBlock.java +++ b/core/src/mindustry/world/blocks/storage/CoreBlock.java @@ -17,6 +17,7 @@ import mindustry.type.*; import mindustry.ui.*; import mindustry.world.*; import mindustry.world.blocks.*; +import mindustry.world.blocks.units.*; import mindustry.world.meta.*; import mindustry.world.modules.*; @@ -25,6 +26,13 @@ import static mindustry.Vars.*; public class CoreBlock extends StorageBlock{ public UnitType unitType = UnitTypes.alpha; + public final int timerResupply = timers++; + + public int ammoAmount = 5; + public float resupplyRate = 10f; + public float resupplyRange = 60f; + public Item resupplyItem = Items.copper; + public CoreBlock(String name){ super(name); @@ -101,6 +109,15 @@ public class CoreBlock extends StorageBlock{ Call.onPlayerSpawn(tile, player); } + @Override + public void updateTile(){ + + //resupply nearby units + if(items.has(resupplyItem) && timer(timerResupply, resupplyRate) && ResupplyPoint.resupply(this, resupplyRange, ammoAmount, resupplyItem.color)){ + items.remove(resupplyItem, 1); + } + } + @Override public void drawLight(){ Drawf.light(team, x, y, 30f * size, Pal.accent, 0.5f + Mathf.absin(20f, 0.1f)); diff --git a/core/src/mindustry/world/blocks/units/ResupplyPoint.java b/core/src/mindustry/world/blocks/units/ResupplyPoint.java new file mode 100644 index 0000000000..c12a8d49e3 --- /dev/null +++ b/core/src/mindustry/world/blocks/units/ResupplyPoint.java @@ -0,0 +1,65 @@ +package mindustry.world.blocks.units; + +import arc.graphics.*; +import mindustry.content.*; +import mindustry.entities.*; +import mindustry.gen.*; +import mindustry.graphics.*; +import mindustry.world.*; + +import static mindustry.Vars.*; + +public class ResupplyPoint extends Block{ + public final int timerResupply = timers++; + + public int ammoAmount = 10; + public float resupplyRate = 5f; + public float range = 60f; + public Color ammoColor = Items.copper.color; + + public ResupplyPoint(String name){ + super(name); + solid = update = true; + hasItems = true; + } + + @Override + public boolean outputsItems(){ + return false; + } + + @Override + public void drawPlace(int x, int y, int rotation, boolean valid){ + Drawf.dashCircle(x * tilesize + offset(), y * tilesize + offset(), range, Pal.placing); + } + + public class ResupplyPointEntity extends TileEntity{ + + @Override + public void drawSelect(){ + Drawf.dashCircle(x, y, range, team.color); + } + + @Override + public void updateTile(){ + if(consValid() && timer(timerResupply, resupplyRate / timeScale) && resupply(this, range, ammoAmount, ammoColor)){ + consume(); + } + } + } + + /** Tries to resupply nearby units. + * @return whether resupplying was successful. If unit ammo is disabled, always returns false. */ + public static boolean resupply(TileEntity tile, float range, int ammoAmount, Color ammoColor){ + if(!state.rules.unitAmmo) return false; + + Unitc unit = Units.closest(tile.team, tile.x, tile.y, range, u -> u.ammo() <= u.type().ammoCapacity - ammoAmount); + if(unit != null){ + Fx.itemTransfer.at(tile.x, tile.y, ammoAmount / 2f, ammoColor, unit); + unit.ammo(Math.min(unit.ammo() + ammoAmount, unit.type().ammoCapacity)); + return true; + } + + return false; + } +} diff --git a/core/src/mindustry/world/meta/BuildVisibility.java b/core/src/mindustry/world/meta/BuildVisibility.java index ccf9ccaa72..a25e8ff749 100644 --- a/core/src/mindustry/world/meta/BuildVisibility.java +++ b/core/src/mindustry/world/meta/BuildVisibility.java @@ -9,7 +9,8 @@ public enum BuildVisibility{ debugOnly(() -> false), sandboxOnly(() -> Vars.state.rules.infiniteResources), campaignOnly(() -> Vars.state.isCampaign()), - lightingOnly(() -> Vars.state.rules.lighting); + lightingOnly(() -> Vars.state.rules.lighting), + ammoOnly(() -> Vars.state.rules.unitAmmo); private final Boolp visible; diff --git a/gradle.properties b/gradle.properties index 22c4b51c85..0e60468f69 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,3 +1,3 @@ org.gradle.daemon=true org.gradle.jvmargs=-Xms256m -Xmx1024m -archash=06c938d6dced0d9bf9f8ec98d4767b38f633f8fa +archash=f76b0c94953c07ef2ac40858b3b615a34911bdf7