diff --git a/annotations/src/main/resources/classids.properties b/annotations/src/main/resources/classids.properties index ffdedc8374..54507de0bf 100644 --- a/annotations/src/main/resources/classids.properties +++ b/annotations/src/main/resources/classids.properties @@ -5,6 +5,7 @@ block=1 cix=2 draug=3 mace=4 +mega=28 mindustry.entities.comp.BuildingComp=22 mindustry.entities.comp.Buildingomp=11 mindustry.entities.comp.BulletComp=24 @@ -21,8 +22,13 @@ mindustry.type.Weather.WeatherComp=12 mindustry.type.Weather.WeatherStateComp=26 mindustry.world.blocks.campaign.CoreLauncher.LaunchCoreComp=13 mindustry.world.blocks.campaign.LaunchPad.LaunchPayloadComp=14 +mono=29 +nova=30 oculon=15 phantom=16 +poly=31 +quasar=32 +risse=33 spirit=27 tau=17 trident=18 diff --git a/core/assets-raw/sprites/units/beta-cell.png b/core/assets-raw/sprites/units/beta-cell.png new file mode 100644 index 0000000000..7b53cad13e Binary files /dev/null and b/core/assets-raw/sprites/units/beta-cell.png differ diff --git a/core/assets-raw/sprites/units/beta.png b/core/assets-raw/sprites/units/beta.png new file mode 100644 index 0000000000..b1bca129e6 Binary files /dev/null and b/core/assets-raw/sprites/units/beta.png differ diff --git a/core/assets-raw/sprites/units/glaive-cell.png b/core/assets-raw/sprites/units/gamma-cell.png similarity index 100% rename from core/assets-raw/sprites/units/glaive-cell.png rename to core/assets-raw/sprites/units/gamma-cell.png diff --git a/core/assets-raw/sprites/units/gamma.png b/core/assets-raw/sprites/units/gamma.png new file mode 100644 index 0000000000..bbc3c7a57a Binary files /dev/null and b/core/assets-raw/sprites/units/gamma.png differ diff --git a/core/assets-raw/sprites/units/glaive.png b/core/assets-raw/sprites/units/glaive.png deleted file mode 100644 index 4553066c91..0000000000 Binary files a/core/assets-raw/sprites/units/glaive.png and /dev/null differ diff --git a/core/assets-raw/sprites/units/trident-cell.png b/core/assets-raw/sprites/units/mega-cell.png similarity index 100% rename from core/assets-raw/sprites/units/trident-cell.png rename to core/assets-raw/sprites/units/mega-cell.png diff --git a/core/assets-raw/sprites/units/trident.png b/core/assets-raw/sprites/units/mega.png similarity index 100% rename from core/assets-raw/sprites/units/trident.png rename to core/assets-raw/sprites/units/mega.png diff --git a/core/assets-raw/sprites/units/spirit-cell.png b/core/assets-raw/sprites/units/mono-cell.png similarity index 100% rename from core/assets-raw/sprites/units/spirit-cell.png rename to core/assets-raw/sprites/units/mono-cell.png diff --git a/core/assets-raw/sprites/units/mono.png b/core/assets-raw/sprites/units/mono.png new file mode 100644 index 0000000000..573d2d0655 Binary files /dev/null and b/core/assets-raw/sprites/units/mono.png differ diff --git a/core/assets-raw/sprites/units/oculon-armor.png b/core/assets-raw/sprites/units/oculon-armor.png deleted file mode 100644 index 47d531379a..0000000000 Binary files a/core/assets-raw/sprites/units/oculon-armor.png and /dev/null differ diff --git a/core/assets-raw/sprites/units/phantom.png b/core/assets-raw/sprites/units/phantom.png deleted file mode 100644 index 33df9c8438..0000000000 Binary files a/core/assets-raw/sprites/units/phantom.png and /dev/null differ diff --git a/core/assets-raw/sprites/units/phantom-cell.png b/core/assets-raw/sprites/units/poly-cell.png similarity index 100% rename from core/assets-raw/sprites/units/phantom-cell.png rename to core/assets-raw/sprites/units/poly-cell.png diff --git a/core/assets-raw/sprites/units/poly.png b/core/assets-raw/sprites/units/poly.png new file mode 100644 index 0000000000..b6c57ac149 Binary files /dev/null and b/core/assets-raw/sprites/units/poly.png differ diff --git a/core/assets-raw/sprites/units/spirit.png b/core/assets-raw/sprites/units/spirit.png deleted file mode 100644 index 1f9a4e89ec..0000000000 Binary files a/core/assets-raw/sprites/units/spirit.png and /dev/null differ diff --git a/core/assets/sprites/fallback/sprites.atlas b/core/assets/sprites/fallback/sprites.atlas index f193607647..79c8f4aa9e 100644 --- a/core/assets/sprites/fallback/sprites.atlas +++ b/core/assets/sprites/fallback/sprites.atlas @@ -635,14 +635,14 @@ mend-projector-top index: -1 mender rotate: false - xy: 1443, 983 + xy: 1375, 925 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 mender-top rotate: false - xy: 1443, 949 + xy: 1341, 891 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -663,7 +663,7 @@ overdrive-projector-top index: -1 shock-mine rotate: false - xy: 1681, 859 + xy: 1817, 1207 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -684,112 +684,112 @@ block-unloader index: -1 bridge-arrow rotate: false - xy: 1709, 1029 + xy: 1769, 995 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 bridge-conveyor rotate: false - xy: 1709, 961 + xy: 763, 1041 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 bridge-conveyor-bridge rotate: false - xy: 1743, 961 + xy: 797, 1047 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 bridge-conveyor-end rotate: false - xy: 831, 987 + xy: 991, 1021 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 center rotate: false - xy: 797, 979 + xy: 1025, 1021 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 armored-conveyor-0-0 rotate: false - xy: 855, 1089 + xy: 243, 1 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-armored-conveyor-full rotate: false - xy: 855, 1089 + xy: 243, 1 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 armored-conveyor-0-1 rotate: false - xy: 293, 43 + xy: 277, 1 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 armored-conveyor-0-2 rotate: false - xy: 255, 5 + xy: 311, 1 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 armored-conveyor-0-3 rotate: false - xy: 327, 43 + xy: 345, 1 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 armored-conveyor-1-0 rotate: false - xy: 361, 43 + xy: 379, 1 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 armored-conveyor-1-1 rotate: false - xy: 395, 43 + xy: 1817, 1275 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 armored-conveyor-1-2 rotate: false - xy: 429, 43 + xy: 855, 1089 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 armored-conveyor-1-3 rotate: false - xy: 463, 43 + xy: 503, 43 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 armored-conveyor-2-0 rotate: false - xy: 497, 43 + xy: 465, 5 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 armored-conveyor-2-1 rotate: false - xy: 531, 43 + xy: 537, 43 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -845,336 +845,336 @@ armored-conveyor-4-0 index: -1 armored-conveyor-4-1 rotate: false - xy: 565, 43 + xy: 1851, 1259 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 armored-conveyor-4-2 rotate: false - xy: 599, 45 + xy: 1885, 1259 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 armored-conveyor-4-3 rotate: false - xy: 1851, 1259 + xy: 1919, 1259 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 conveyor-0-1 rotate: false - xy: 967, 953 + xy: 763, 1007 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 conveyor-0-2 rotate: false - xy: 1035, 987 + xy: 797, 1013 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 conveyor-0-3 rotate: false - xy: 1001, 953 + xy: 831, 1021 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 conveyor-1-0 rotate: false - xy: 1069, 987 + xy: 831, 987 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 conveyor-1-1 rotate: false - xy: 1035, 953 + xy: 797, 979 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 conveyor-1-2 rotate: false - xy: 1103, 987 + xy: 865, 1013 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 conveyor-1-3 rotate: false - xy: 1069, 953 + xy: 899, 1013 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 conveyor-2-0 rotate: false - xy: 1103, 953 + xy: 933, 1013 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 conveyor-2-1 rotate: false - xy: 1137, 987 + xy: 865, 979 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 conveyor-2-2 rotate: false - xy: 1137, 953 + xy: 899, 979 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 conveyor-2-3 rotate: false - xy: 1777, 1097 + xy: 933, 979 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 conveyor-3-0 rotate: false - xy: 1777, 1063 + xy: 831, 953 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 conveyor-3-1 rotate: false - xy: 1777, 1029 + xy: 865, 945 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 conveyor-3-2 rotate: false - xy: 1777, 995 + xy: 899, 945 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 conveyor-3-3 rotate: false - xy: 1777, 961 + xy: 933, 945 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 conveyor-4-0 rotate: false - xy: 967, 919 + xy: 967, 987 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 conveyor-4-1 rotate: false - xy: 1001, 919 + xy: 1001, 987 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 conveyor-4-2 rotate: false - xy: 1035, 919 + xy: 967, 953 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 conveyor-4-3 rotate: false - xy: 1069, 919 + xy: 1035, 987 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 plastanium-conveyor rotate: false - xy: 1511, 893 + xy: 1477, 961 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 plastanium-conveyor-0 rotate: false - xy: 1545, 961 + xy: 1545, 995 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 plastanium-conveyor-1 rotate: false - xy: 1545, 927 + xy: 1477, 927 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 plastanium-conveyor-2 rotate: false - xy: 1545, 893 + xy: 1477, 893 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 plastanium-conveyor-edge rotate: false - xy: 1579, 957 + xy: 1511, 961 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 plastanium-conveyor-stack rotate: false - xy: 1579, 923 + xy: 1511, 927 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 titanium-conveyor-0-1 rotate: false - xy: 1817, 1207 + xy: 1953, 1157 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 titanium-conveyor-0-2 rotate: false - xy: 1851, 1191 + xy: 1987, 1157 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 titanium-conveyor-0-3 rotate: false - xy: 1885, 1191 + xy: 1837, 1123 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 titanium-conveyor-1-0 rotate: false - xy: 1919, 1191 + xy: 1837, 1089 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 titanium-conveyor-1-1 rotate: false - xy: 1953, 1191 + xy: 1871, 1123 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 titanium-conveyor-1-2 rotate: false - xy: 1987, 1191 + xy: 1837, 1055 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 titanium-conveyor-1-3 rotate: false - xy: 1817, 1173 + xy: 1871, 1089 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 titanium-conveyor-2-0 rotate: false - xy: 1851, 1157 + xy: 1905, 1123 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 titanium-conveyor-2-1 rotate: false - xy: 1885, 1157 + xy: 1837, 1021 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 titanium-conveyor-2-2 rotate: false - xy: 1919, 1157 + xy: 1871, 1055 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 titanium-conveyor-2-3 rotate: false - xy: 1953, 1157 + xy: 1905, 1089 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 titanium-conveyor-3-0 rotate: false - xy: 1987, 1157 + xy: 1939, 1123 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 titanium-conveyor-3-1 rotate: false - xy: 1817, 1139 + xy: 1837, 987 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 titanium-conveyor-3-2 rotate: false - xy: 1811, 1105 + xy: 1871, 1021 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 titanium-conveyor-3-3 rotate: false - xy: 1811, 1071 + xy: 1905, 1055 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 titanium-conveyor-4-0 rotate: false - xy: 1811, 1037 + xy: 1939, 1089 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 titanium-conveyor-4-1 rotate: false - xy: 1811, 1003 + xy: 1973, 1123 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 titanium-conveyor-4-2 rotate: false - xy: 1811, 969 + xy: 1837, 953 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 titanium-conveyor-4-3 rotate: false - xy: 1817, 935 + xy: 1871, 987 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 cross rotate: false - xy: 713, 72 + xy: 1001, 919 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -1188,14 +1188,14 @@ distributor index: -1 inverted-sorter rotate: false - xy: 565, 9 + xy: 713, 140 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 junction rotate: false - xy: 1307, 1001 + xy: 721, 439 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -1237,7 +1237,7 @@ mass-driver-base index: -1 overflow-gate rotate: false - xy: 1409, 881 + xy: 1409, 983 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -1265,49 +1265,49 @@ payload-router-over index: -1 phase-conveyor rotate: false - xy: 1511, 995 + xy: 1443, 915 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 phase-conveyor-arrow rotate: false - xy: 1477, 893 + xy: 1409, 881 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 phase-conveyor-bridge rotate: false - xy: 1511, 961 + xy: 1443, 881 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 phase-conveyor-end rotate: false - xy: 1511, 927 + xy: 1477, 995 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 router rotate: false - xy: 1545, 825 + xy: 1647, 817 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 sorter rotate: false - xy: 1749, 927 + xy: 1885, 1191 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 underflow-gate rotate: false - xy: 1817, 833 + xy: 1973, 1089 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -1475,35 +1475,35 @@ water-extractor-top index: -1 block-border rotate: false - xy: 1817, 1241 + xy: 605, 45 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-middle rotate: false - xy: 1233, 1105 + xy: 1633, 1005 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-select rotate: false - xy: 1335, 1103 + xy: 1735, 1097 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 conduit-liquid rotate: false - xy: 831, 953 + xy: 1335, 1103 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 message rotate: false - xy: 1443, 915 + xy: 1375, 891 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -1517,161 +1517,161 @@ place-arrow index: -1 bridge-conduit rotate: false - xy: 1743, 1063 + xy: 1667, 953 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 bridge-conduit-arrow rotate: false - xy: 1709, 995 + xy: 1701, 953 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 bridge-conveyor-arrow rotate: false - xy: 1709, 995 + xy: 1701, 953 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 bridge-conduit-bridge rotate: false - xy: 1743, 1029 + xy: 1735, 961 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 bridge-conduit-end rotate: false - xy: 1743, 995 + xy: 1769, 961 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 conduit-bottom rotate: false - xy: 933, 1013 + xy: 1127, 1021 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 conduit-bottom-0 rotate: false - xy: 865, 979 + xy: 1233, 1071 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 conduit-bottom-1 rotate: false - xy: 899, 979 + xy: 1267, 1103 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 conduit-bottom-2 rotate: false - xy: 933, 979 + xy: 1301, 1103 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 conduit-bottom-3 rotate: false - xy: 933, 979 + xy: 1301, 1103 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 conduit-bottom-4 rotate: false - xy: 933, 979 + xy: 1301, 1103 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 conduit-top-0 rotate: false - xy: 865, 945 + xy: 1267, 1069 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 conduit-top-1 rotate: false - xy: 899, 945 + xy: 1301, 1069 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 conduit-top-2 rotate: false - xy: 933, 945 + xy: 1335, 1069 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 conduit-top-3 rotate: false - xy: 967, 987 + xy: 1735, 927 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 pulse-conduit-top-3 rotate: false - xy: 967, 987 + xy: 1735, 927 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 conduit-top-4 rotate: false - xy: 1001, 987 + xy: 1769, 927 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 liquid-junction rotate: false - xy: 1239, 899 + xy: 1239, 1001 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 liquid-overflow-gate rotate: false - xy: 1273, 899 + xy: 1307, 1001 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 liquid-overflow-gate-top rotate: false - xy: 1307, 933 + xy: 1239, 933 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 liquid-router-bottom rotate: false - xy: 1307, 899 + xy: 1273, 967 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 liquid-router-liquid rotate: false - xy: 1341, 993 + xy: 1239, 899 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 liquid-router-top rotate: false - xy: 1341, 959 + xy: 1273, 933 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -1699,126 +1699,126 @@ liquid-tank-top index: -1 mechanical-pump rotate: false - xy: 1409, 983 + xy: 1341, 959 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 mechanical-pump-liquid rotate: false - xy: 1409, 949 + xy: 1341, 925 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 rotary-pump-liquid rotate: false - xy: 1409, 949 + xy: 1341, 925 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 thermal-pump-liquid rotate: false - xy: 1409, 949 + xy: 1341, 925 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 phase-conduit rotate: false - xy: 1443, 881 + xy: 1409, 949 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 phase-conduit-arrow rotate: false - xy: 1477, 995 + xy: 1409, 915 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 phase-conduit-bridge rotate: false - xy: 1477, 961 + xy: 1443, 983 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 phase-conduit-end rotate: false - xy: 1477, 927 + xy: 1443, 949 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 plated-conduit-cap rotate: false - xy: 1613, 931 + xy: 1545, 961 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 plated-conduit-top-0 rotate: false - xy: 1613, 897 + xy: 1545, 927 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 plated-conduit-top-1 rotate: false - xy: 1477, 859 + xy: 1545, 893 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 plated-conduit-top-2 rotate: false - xy: 1511, 859 + xy: 1579, 965 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 plated-conduit-top-3 rotate: false - xy: 1545, 859 + xy: 1579, 931 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 plated-conduit-top-4 rotate: false - xy: 1579, 855 + xy: 1579, 897 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 pulse-conduit-top-0 rotate: false - xy: 1273, 865 + xy: 1681, 919 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 pulse-conduit-top-1 rotate: false - xy: 1307, 865 + xy: 1647, 885 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 pulse-conduit-top-2 rotate: false - xy: 1341, 857 + xy: 1681, 885 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 pulse-conduit-top-4 rotate: false - xy: 1375, 857 + xy: 1613, 869 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -1839,7 +1839,7 @@ thermal-pump index: -1 battery rotate: false - xy: 1885, 1259 + xy: 1953, 1259 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -1860,21 +1860,21 @@ battery-large-top index: -1 battery-top rotate: false - xy: 1919, 1259 + xy: 1987, 1259 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 combustion-generator rotate: false - xy: 865, 1013 + xy: 1059, 1021 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 combustion-generator-top rotate: false - xy: 899, 1013 + xy: 1093, 1021 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -1902,28 +1902,28 @@ differential-generator-top index: -1 diode rotate: false - xy: 713, 38 + xy: 1035, 919 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 diode-arrow rotate: false - xy: 293, 9 + xy: 1069, 919 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 illuminator rotate: false - xy: 463, 9 + xy: 713, 242 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 illuminator-top rotate: false - xy: 497, 9 + xy: 713, 208 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -1979,7 +1979,7 @@ impact-reactor-plasma-3 index: -1 power-node rotate: false - xy: 1613, 863 + xy: 1613, 937 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -1993,14 +1993,14 @@ power-node-large index: -1 power-source rotate: false - xy: 1613, 829 + xy: 1613, 903 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 power-void rotate: false - xy: 1239, 865 + xy: 1647, 919 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -2014,14 +2014,14 @@ rtg-generator index: -1 rtg-generator-top rotate: false - xy: 1579, 821 + xy: 1681, 817 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 solar-panel rotate: false - xy: 1715, 893 + xy: 1851, 1191 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -2210,21 +2210,21 @@ graphite-press index: -1 incinerator rotate: false - xy: 531, 9 + xy: 713, 174 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 item-source rotate: false - xy: 1171, 893 + xy: 1205, 995 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 item-void rotate: false - xy: 1239, 967 + xy: 721, 473 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -2252,21 +2252,21 @@ silicon-smelter-top index: -1 liquid-source rotate: false - xy: 1375, 959 + xy: 1307, 933 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 liquid-void rotate: false - xy: 1375, 925 + xy: 1307, 899 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 melter rotate: false - xy: 1409, 915 + xy: 1375, 959 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -2315,14 +2315,14 @@ plastanium-compressor-top index: -1 pulverizer rotate: false - xy: 1409, 847 + xy: 1579, 863 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 pulverizer-rotator rotate: false - xy: 1443, 847 + xy: 1647, 851 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -2434,28 +2434,28 @@ rock2 index: -1 sand-boulder1 rotate: false - xy: 1613, 795 + xy: 1715, 893 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 sand-boulder2 rotate: false - xy: 1647, 929 + xy: 1715, 859 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 shale-boulder1 rotate: false - xy: 1681, 893 + xy: 1783, 859 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 shale-boulder2 rotate: false - xy: 1715, 927 + xy: 1783, 825 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -2476,21 +2476,21 @@ snowrock2 index: -1 spore-cluster1 rotate: false - xy: 91, 6 + xy: 301, 35 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 spore-cluster2 rotate: false - xy: 133, 13 + xy: 343, 35 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 spore-cluster3 rotate: false - xy: 175, 35 + xy: 385, 35 size: 40, 40 orig: 40, 40 offset: 0, 0 @@ -2532,14 +2532,14 @@ core-shard-team index: -1 unloader rotate: false - xy: 1817, 799 + xy: 1871, 953 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 unloader-center rotate: false - xy: 1851, 1123 + xy: 1905, 987 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -2553,14 +2553,14 @@ vault index: -1 arc-heat rotate: false - xy: 1817, 1275 + xy: 209, 1 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-1 rotate: false - xy: 1953, 1259 + xy: 1817, 1241 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -2588,7 +2588,7 @@ block-4 index: -1 hail-heat rotate: false - xy: 1641, 1217 + xy: 1591, 1167 size: 40, 40 orig: 40, 40 offset: 0, 0 @@ -2637,7 +2637,7 @@ salvo-panel-right index: -1 scorch-heat rotate: false - xy: 1647, 861 + xy: 1715, 825 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -2721,7 +2721,7 @@ rally-point index: -1 repair-point-base rotate: false - xy: 1511, 825 + xy: 1613, 835 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -2735,7 +2735,7 @@ resupply-point index: -1 copper-wall rotate: false - xy: 1103, 919 + xy: 1001, 953 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -2749,7 +2749,7 @@ copper-wall-large index: -1 door rotate: false - xy: 327, 9 + xy: 1103, 919 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -2770,14 +2770,14 @@ door-large-open index: -1 door-open rotate: false - xy: 361, 9 + xy: 1137, 919 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 phase-wall rotate: false - xy: 1545, 995 + xy: 1511, 995 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -2791,7 +2791,7 @@ phase-wall-large index: -1 plastanium-wall rotate: false - xy: 1579, 889 + xy: 1511, 893 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -2854,35 +2854,35 @@ scrap-wall-large4 index: -1 scrap-wall2 rotate: false - xy: 1647, 827 + xy: 1749, 859 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 scrap-wall3 rotate: false - xy: 1647, 793 + xy: 1749, 825 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 scrap-wall4 rotate: false - xy: 1681, 927 + xy: 1783, 893 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 scrap-wall5 rotate: false - xy: 1681, 927 + xy: 1783, 893 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 surge-wall rotate: false - xy: 1783, 825 + xy: 1885, 1157 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -2896,7 +2896,7 @@ surge-wall-large index: -1 thorium-wall rotate: false - xy: 1783, 791 + xy: 1919, 1157 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -2917,7 +2917,7 @@ thruster index: -1 titanium-wall rotate: false - xy: 1817, 901 + xy: 1905, 1021 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -3008,7 +3008,7 @@ missile index: -1 missile-back rotate: false - xy: 217, 39 + xy: 427, 39 size: 36, 36 orig: 36, 36 offset: 0, 0 @@ -3029,7 +3029,7 @@ parallax-laser-end index: -1 particle rotate: false - xy: 133, 55 + xy: 259, 35 size: 40, 40 orig: 40, 40 offset: 0, 0 @@ -3043,28 +3043,28 @@ scale_marker index: -1 shell rotate: false - xy: 217, 1 + xy: 427, 1 size: 36, 36 orig: 36, 36 offset: 0, 0 index: -1 shell-back rotate: false - xy: 255, 39 + xy: 465, 39 size: 36, 36 orig: 36, 36 offset: 0, 0 index: -1 transfer rotate: false - xy: 1811, 1167 + xy: 905, 1739 size: 4, 48 orig: 4, 48 offset: 0, 0 index: -1 transfer-arrow rotate: false - xy: 1817, 867 + xy: 1939, 1055 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -3099,7 +3099,7 @@ block-air-factory-full index: -1 block-arc-full rotate: false - xy: 1987, 1259 + xy: 571, 43 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -3274,14 +3274,14 @@ block-ice-snow-full index: -1 block-icerocks-full rotate: false - xy: 1675, 1099 + xy: 1633, 1175 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-ignarock-full rotate: false - xy: 1675, 1065 + xy: 1633, 1141 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -3309,7 +3309,7 @@ block-laser-drill-full index: -1 block-liquid-router-full rotate: false - xy: 1675, 1031 + xy: 1633, 1107 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -3323,7 +3323,7 @@ block-liquid-tank-full index: -1 block-magmarock-full rotate: false - xy: 1675, 997 + xy: 1633, 1073 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -3365,14 +3365,14 @@ block-meltdown-full index: -1 block-metal-floor-damaged-full rotate: false - xy: 1675, 963 + xy: 1633, 1039 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-moss-full rotate: false - xy: 763, 1041 + xy: 1233, 1105 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -3393,42 +3393,42 @@ block-oil-extractor-full index: -1 block-ore-coal-full rotate: false - xy: 797, 1047 + xy: 1683, 1225 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-ore-copper-full rotate: false - xy: 991, 1021 + xy: 1717, 1233 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-ore-lead-full rotate: false - xy: 1025, 1021 + xy: 1751, 1233 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-ore-scrap-full rotate: false - xy: 1059, 1021 + xy: 1683, 1191 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-ore-thorium-full rotate: false - xy: 1093, 1021 + xy: 1717, 1199 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-ore-titanium-full rotate: false - xy: 1127, 1021 + xy: 1751, 1199 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -3456,7 +3456,7 @@ payload-router-icon index: -1 block-pebbles-full rotate: false - xy: 1683, 1225 + xy: 1667, 1157 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -3470,7 +3470,7 @@ block-phase-weaver-full index: -1 block-plated-conduit-full rotate: false - xy: 1683, 1191 + xy: 1667, 1123 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -3484,21 +3484,21 @@ block-pneumatic-drill-full index: -1 block-pulse-conduit-full rotate: false - xy: 1683, 1157 + xy: 1667, 1089 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-pulverizer-full rotate: false - xy: 1717, 1233 + xy: 1667, 1055 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-repair-point-full rotate: false - xy: 1751, 1233 + xy: 1667, 1021 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -3519,14 +3519,14 @@ block-rock-full index: -1 block-rocks-full rotate: false - xy: 1717, 1199 + xy: 1701, 1157 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-saltrocks-full rotate: false - xy: 1717, 1165 + xy: 1701, 1123 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -3540,21 +3540,21 @@ block-salvo-full index: -1 block-sand-boulder-full rotate: false - xy: 1751, 1199 + xy: 1701, 1089 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-sand-full rotate: false - xy: 1751, 1165 + xy: 1701, 1055 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-sandrocks-full rotate: false - xy: 1233, 1071 + xy: 1701, 1021 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -3568,21 +3568,21 @@ block-scatter-full index: -1 block-scorch-full rotate: false - xy: 1267, 1103 + xy: 1735, 1165 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-scrap-wall-full rotate: false - xy: 1301, 1103 + xy: 1735, 1131 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 scrap-wall1 rotate: false - xy: 1301, 1103 + xy: 1735, 1131 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -3617,35 +3617,35 @@ block-segment-full index: -1 block-shale-boulder-full rotate: false - xy: 1267, 1069 + xy: 1735, 1063 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-shale-full rotate: false - xy: 1301, 1069 + xy: 1735, 1029 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-shalerocks-full rotate: false - xy: 1335, 1069 + xy: 1667, 987 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-shrubs-full rotate: false - xy: 763, 1007 + xy: 1701, 987 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-snow-full rotate: false - xy: 797, 1013 + xy: 1735, 995 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -3659,7 +3659,7 @@ block-snowrock-full index: -1 block-snowrocks-full rotate: false - xy: 831, 1021 + xy: 1633, 971 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -3680,7 +3680,7 @@ block-spore-cluster-full index: -1 block-spore-moss-full rotate: false - xy: 1717, 1131 + xy: 1769, 1165 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -3694,14 +3694,14 @@ block-spore-press-full index: -1 block-sporerocks-full rotate: false - xy: 1751, 1131 + xy: 1769, 1131 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-stone-full rotate: false - xy: 1709, 1097 + xy: 1769, 1097 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -3715,21 +3715,21 @@ block-swarmer-full index: -1 block-tendrils-full rotate: false - xy: 1709, 1063 + xy: 1769, 1063 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-titanium-conveyor-full rotate: false - xy: 1743, 1097 + xy: 1769, 1029 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 titanium-conveyor-0-0 rotate: false - xy: 1743, 1097 + xy: 1769, 1029 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -3785,56 +3785,56 @@ core-shard-team-sharded index: -1 cracks-1-0 rotate: false - xy: 1137, 919 + xy: 1069, 987 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 cracks-1-1 rotate: false - xy: 715, 310 + xy: 1035, 953 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 cracks-1-2 rotate: false - xy: 715, 276 + xy: 1103, 987 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 cracks-1-3 rotate: false - xy: 713, 242 + xy: 1069, 953 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 cracks-1-4 rotate: false - xy: 713, 208 + xy: 1103, 953 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 cracks-1-5 rotate: false - xy: 713, 174 + xy: 1137, 987 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 cracks-1-6 rotate: false - xy: 713, 140 + xy: 1137, 953 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 cracks-1-7 rotate: false - xy: 713, 106 + xy: 967, 919 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -4016,7 +4016,7 @@ cyclone index: -1 duo rotate: false - xy: 395, 9 + xy: 715, 310 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -4030,21 +4030,21 @@ fuse index: -1 hail rotate: false - xy: 429, 9 + xy: 715, 276 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 item-blast-compound-large rotate: false - xy: 1691, 1267 + xy: 1641, 1217 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 item-blast-compound-medium rotate: false - xy: 633, 6 + xy: 713, 72 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -4072,14 +4072,14 @@ item-blast-compound-xlarge index: -1 item-coal-large rotate: false - xy: 1591, 1117 + xy: 1691, 1267 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 item-coal-medium rotate: false - xy: 701, 4 + xy: 503, 9 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -4093,7 +4093,7 @@ item-coal-small index: -1 item-coal-tiny rotate: false - xy: 499, 959 + xy: 1647, 953 size: 16, 16 orig: 16, 16 offset: 0, 0 @@ -4107,14 +4107,14 @@ item-coal-xlarge index: -1 item-copper-large rotate: false - xy: 1641, 1175 + xy: 1591, 1125 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 item-copper-medium rotate: false - xy: 1369, 1061 + xy: 571, 9 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -4128,7 +4128,7 @@ item-copper-small index: -1 item-copper-tiny rotate: false - xy: 201, 861 + xy: 499, 959 size: 16, 16 orig: 16, 16 offset: 0, 0 @@ -4149,7 +4149,7 @@ item-graphite-large index: -1 item-graphite-medium rotate: false - xy: 1161, 1063 + xy: 639, 6 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -4163,7 +4163,7 @@ item-graphite-small index: -1 item-graphite-tiny rotate: false - xy: 733, 1527 + xy: 201, 861 size: 16, 16 orig: 16, 16 offset: 0, 0 @@ -4177,14 +4177,14 @@ item-graphite-xlarge index: -1 item-lead-large rotate: false - xy: 1591, 1075 + xy: 1591, 1083 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 item-lead-medium rotate: false - xy: 1161, 1029 + xy: 707, 4 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -4198,7 +4198,7 @@ item-lead-small index: -1 item-lead-tiny rotate: false - xy: 887, 1771 + xy: 733, 1527 size: 16, 16 orig: 16, 16 offset: 0, 0 @@ -4219,7 +4219,7 @@ item-metaglass-large index: -1 item-metaglass-medium rotate: false - xy: 1229, 1037 + xy: 1369, 1061 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -4233,7 +4233,7 @@ item-metaglass-small index: -1 item-metaglass-tiny rotate: false - xy: 2025, 2031 + xy: 887, 1771 size: 16, 16 orig: 16, 16 offset: 0, 0 @@ -4247,28 +4247,28 @@ item-metaglass-xlarge index: -1 item-phase-fabric-large rotate: false - xy: 1591, 1033 + xy: 1591, 1041 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 item-phase-fabric-medium rotate: false - xy: 1297, 1035 + xy: 1161, 1063 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 item-phase-fabric-small rotate: false - xy: 721, 1007 + xy: 1785, 1241 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 item-phase-fabric-tiny rotate: false - xy: 1639, 1641 + xy: 2025, 2031 size: 16, 16 orig: 16, 16 offset: 0, 0 @@ -4289,21 +4289,21 @@ item-plastanium-large index: -1 item-plastanium-medium rotate: false - xy: 1171, 995 + xy: 1161, 1029 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 item-plastanium-small rotate: false - xy: 720, 345 + xy: 721, 1007 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 item-plastanium-tiny rotate: false - xy: 1521, 1597 + xy: 1639, 1641 size: 16, 16 orig: 16, 16 offset: 0, 0 @@ -4317,28 +4317,28 @@ item-plastanium-xlarge index: -1 item-pyratite-large rotate: false - xy: 1641, 1133 + xy: 1191, 1097 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 item-pyratite-medium rotate: false - xy: 1171, 927 + xy: 1229, 1037 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 item-pyratite-small rotate: false - xy: 1785, 1241 + xy: 720, 345 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 item-pyratite-tiny rotate: false - xy: 1587, 1575 + xy: 1521, 1597 size: 16, 16 orig: 16, 16 offset: 0, 0 @@ -4352,28 +4352,28 @@ item-pyratite-xlarge index: -1 item-sand-large rotate: false - xy: 1633, 1091 + xy: 1591, 999 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 item-sand-medium rotate: false - xy: 1205, 961 + xy: 1297, 1035 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 item-sand-small rotate: false - xy: 1885, 1131 + xy: 1939, 1029 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 item-sand-tiny rotate: false - xy: 571, 1339 + xy: 1587, 1575 size: 16, 16 orig: 16, 16 offset: 0, 0 @@ -4387,28 +4387,28 @@ item-sand-xlarge index: -1 item-scrap-large rotate: false - xy: 1633, 1049 + xy: 729, 1075 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 item-scrap-medium rotate: false - xy: 1365, 1027 + xy: 1171, 995 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 item-scrap-small rotate: false - xy: 363, 1087 + xy: 1973, 1063 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 item-scrap-tiny rotate: false - xy: 1491, 1283 + xy: 571, 1339 size: 16, 16 orig: 16, 16 offset: 0, 0 @@ -4422,28 +4422,28 @@ item-scrap-xlarge index: -1 item-silicon-large rotate: false - xy: 1633, 1007 + xy: 721, 1033 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 item-silicon-medium rotate: false - xy: 1433, 1017 + xy: 1171, 927 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 item-silicon-small rotate: false - xy: 1013, 1867 + xy: 1905, 961 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 item-silicon-tiny rotate: false - xy: 1567, 1311 + xy: 1491, 1283 size: 16, 16 orig: 16, 16 offset: 0, 0 @@ -4457,28 +4457,28 @@ item-silicon-xlarge index: -1 item-spore-pod-large rotate: false - xy: 1591, 991 + xy: 771, 1081 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 item-spore-pod-medium rotate: false - xy: 721, 507 + xy: 1205, 927 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 item-spore-pod-small rotate: false - xy: 2021, 1241 + xy: 363, 1087 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 item-spore-pod-tiny rotate: false - xy: 1, 6 + xy: 1567, 1311 size: 16, 16 orig: 16, 16 offset: 0, 0 @@ -4492,28 +4492,28 @@ item-spore-pod-xlarge index: -1 item-surge-alloy-large rotate: false - xy: 1633, 965 + xy: 813, 1081 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 item-surge-alloy-medium rotate: false - xy: 721, 439 + xy: 1399, 1027 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 item-surge-alloy-small rotate: false - xy: 1785, 1215 + xy: 1013, 1867 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 item-surge-alloy-tiny rotate: false - xy: 175, 79 + xy: 1, 6 size: 16, 16 orig: 16, 16 offset: 0, 0 @@ -4527,28 +4527,28 @@ item-surge-alloy-xlarge index: -1 item-thorium-large rotate: false - xy: 1191, 1097 + xy: 91, 48 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 item-thorium-medium rotate: false - xy: 720, 371 + xy: 1171, 893 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 item-thorium-small rotate: false - xy: 1911, 1131 + xy: 2021, 1241 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 item-thorium-tiny rotate: false - xy: 831, 1063 + xy: 175, 79 size: 16, 16 orig: 16, 16 offset: 0, 0 @@ -4562,28 +4562,28 @@ item-thorium-xlarge index: -1 item-titanium-large rotate: false - xy: 729, 1075 + xy: 133, 55 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 item-titanium-medium rotate: false - xy: 1273, 1001 + xy: 721, 507 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 item-titanium-small rotate: false - xy: 363, 1061 + xy: 1785, 1215 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 item-titanium-tiny rotate: false - xy: 1683, 1139 + xy: 831, 1063 size: 16, 16 orig: 16, 16 offset: 0, 0 @@ -4604,21 +4604,21 @@ lancer index: -1 liquid-cryofluid-large rotate: false - xy: 721, 1033 + xy: 91, 6 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 liquid-cryofluid-medium rotate: false - xy: 1273, 967 + xy: 720, 371 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 liquid-cryofluid-small rotate: false - xy: 1013, 1841 + xy: 1939, 1003 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -4639,28 +4639,28 @@ liquid-cryofluid-xlarge index: -1 liquid-oil-large rotate: false - xy: 771, 1081 + xy: 133, 13 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 liquid-oil-medium rotate: false - xy: 1307, 967 + xy: 1239, 967 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 liquid-oil-small rotate: false - xy: 2021, 1215 + xy: 363, 1061 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 liquid-oil-tiny rotate: false - xy: 633, 61 + xy: 1369, 1119 size: 16, 16 orig: 16, 16 offset: 0, 0 @@ -4674,28 +4674,28 @@ liquid-oil-xlarge index: -1 liquid-slag-large rotate: false - xy: 813, 1081 + xy: 175, 35 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 liquid-slag-medium rotate: false - xy: 1341, 925 + xy: 1273, 899 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 liquid-slag-small rotate: false - xy: 1785, 1189 + xy: 1013, 1841 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 liquid-slag-tiny rotate: false - xy: 1369, 1119 + xy: 1467, 1033 size: 16, 16 orig: 16, 16 offset: 0, 0 @@ -4709,28 +4709,28 @@ liquid-slag-xlarge index: -1 liquid-water-large rotate: false - xy: 91, 48 + xy: 217, 35 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 liquid-water-medium rotate: false - xy: 1375, 891 + xy: 1375, 993 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 liquid-water-small rotate: false - xy: 1937, 1131 + xy: 2021, 1215 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 liquid-water-tiny rotate: false - xy: 1467, 1033 + xy: 1613, 981 size: 16, 16 orig: 16, 16 offset: 0, 0 @@ -4765,7 +4765,7 @@ parallax index: -1 repair-point rotate: false - xy: 1477, 825 + xy: 1681, 851 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -4793,7 +4793,7 @@ scatter index: -1 scorch rotate: false - xy: 1647, 895 + xy: 1749, 893 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -4814,84 +4814,84 @@ spectre index: -1 splash-0 rotate: false - xy: 1681, 825 + xy: 1919, 1191 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 splash-1 rotate: false - xy: 1715, 859 + xy: 1953, 1191 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 splash-10 rotate: false - xy: 1783, 893 + xy: 1803, 935 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 splash-11 rotate: false - xy: 1783, 859 + xy: 1851, 1157 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 splash-2 rotate: false - xy: 1749, 893 + xy: 1987, 1191 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 splash-3 rotate: false - xy: 1715, 825 + xy: 1817, 1173 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 splash-4 rotate: false - xy: 1749, 859 + xy: 1803, 1139 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 splash-5 rotate: false - xy: 1749, 825 + xy: 1803, 1105 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 splash-6 rotate: false - xy: 1681, 791 + xy: 1803, 1071 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 splash-7 rotate: false - xy: 1715, 791 + xy: 1803, 1037 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 splash-8 rotate: false - xy: 1749, 791 + xy: 1803, 1003 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 splash-9 rotate: false - xy: 1783, 927 + xy: 1803, 969 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -4931,13 +4931,6 @@ unit-dagger-full orig: 48, 48 offset: 0, 0 index: -1 -unit-draug-full - rotate: false - xy: 1541, 1179 - size: 48, 48 - orig: 48, 48 - offset: 0, 0 - index: -1 unit-eruptor-full rotate: false xy: 1867, 1787 @@ -4989,7 +4982,7 @@ unit-revenant-full index: -1 unit-spirit-full rotate: false - xy: 1541, 1129 + xy: 1541, 1179 size: 48, 48 orig: 48, 48 offset: 0, 0 @@ -5010,14 +5003,14 @@ unit-trident-full index: -1 unit-vanguard-full rotate: false - xy: 1541, 1079 + xy: 1541, 1129 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 unit-wraith-full rotate: false - xy: 1541, 1029 + xy: 1541, 1079 size: 48, 48 orig: 48, 48 offset: 0, 0 @@ -5031,140 +5024,140 @@ wave index: -1 item-blast-compound rotate: false - xy: 599, 11 + xy: 713, 106 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 item-coal rotate: false - xy: 667, 6 + xy: 713, 38 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 item-copper rotate: false - xy: 735, 4 + xy: 537, 9 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 item-graphite rotate: false - xy: 1403, 1061 + xy: 605, 11 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 item-lead rotate: false - xy: 1195, 1063 + xy: 673, 6 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 item-metaglass rotate: false - xy: 1195, 1029 + xy: 741, 4 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 item-phase-fabric rotate: false - xy: 1263, 1035 + xy: 1403, 1061 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 item-plastanium rotate: false - xy: 1331, 1035 + xy: 1195, 1063 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 item-pyratite rotate: false - xy: 1171, 961 + xy: 1195, 1029 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 item-sand rotate: false - xy: 1205, 995 + xy: 1263, 1035 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 item-scrap rotate: false - xy: 1205, 927 + xy: 1331, 1035 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 item-silicon rotate: false - xy: 1399, 1027 + xy: 1171, 961 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 item-spore-pod rotate: false - xy: 1205, 893 + xy: 1205, 961 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 item-surge-alloy rotate: false - xy: 721, 473 + xy: 1365, 1027 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 item-thorium rotate: false - xy: 721, 405 + xy: 1433, 1017 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 item-titanium rotate: false - xy: 1239, 1001 + xy: 1205, 893 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 liquid-cryofluid rotate: false - xy: 1239, 933 + xy: 721, 405 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 liquid-oil rotate: false - xy: 1273, 933 + xy: 1273, 1001 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 liquid-slag rotate: false - xy: 1375, 993 + xy: 1307, 967 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 liquid-water rotate: false - xy: 1341, 891 + xy: 1341, 993 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -5640,14 +5633,14 @@ trident-cell index: -1 vanguard rotate: false - xy: 1591, 1259 + xy: 1541, 1029 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 vanguard-cell rotate: false - xy: 1591, 1209 + xy: 1591, 1259 size: 48, 48 orig: 48, 48 offset: 0, 0 @@ -5780,14 +5773,14 @@ small-weapon index: -1 weapon rotate: false - xy: 1641, 1259 + xy: 1591, 1209 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 wraith rotate: false - xy: 1591, 1159 + xy: 1641, 1259 size: 48, 48 orig: 48, 48 offset: 0, 0 diff --git a/core/assets/sprites/fallback/sprites2.png b/core/assets/sprites/fallback/sprites2.png index f7d1977b7d..7a7ab8c5bf 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 c6deba6985..544155140e 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 581f2da904..973579b56a 100644 --- a/core/assets/sprites/sprites.atlas +++ b/core/assets/sprites/sprites.atlas @@ -104,14 +104,14 @@ mend-projector-top index: -1 mender rotate: false - xy: 3655, 593 + xy: 3723, 593 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 mender-top rotate: false - xy: 3689, 593 + xy: 3757, 567 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -132,7 +132,7 @@ overdrive-projector-top index: -1 shock-mine rotate: false - xy: 4063, 567 + xy: 1290, 132 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -153,35 +153,35 @@ block-unloader index: -1 bridge-arrow rotate: false - xy: 2343, 1235 + xy: 2309, 1235 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 bridge-conveyor rotate: false - xy: 1018, 177 + xy: 1023, 211 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 bridge-conveyor-bridge rotate: false - xy: 1018, 143 + xy: 1057, 211 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 bridge-conveyor-end rotate: false - xy: 1052, 177 + xy: 1091, 211 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 center rotate: false - xy: 1018, 109 + xy: 1018, 177 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -202,42 +202,42 @@ block-armored-conveyor-full index: -1 armored-conveyor-0-1 rotate: false - xy: 1333, 237 + xy: 1585, 279 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 armored-conveyor-0-2 rotate: false - xy: 1367, 237 + xy: 1333, 237 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 armored-conveyor-0-3 rotate: false - xy: 1401, 237 + xy: 1619, 279 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 armored-conveyor-1-0 rotate: false - xy: 1435, 237 + xy: 1367, 237 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 armored-conveyor-1-1 rotate: false - xy: 1469, 237 + xy: 1401, 237 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 armored-conveyor-1-2 rotate: false - xy: 1503, 237 + xy: 1435, 237 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -335,315 +335,315 @@ armored-conveyor-4-3 index: -1 conveyor-0-1 rotate: false - xy: 1707, 263 + xy: 1086, 75 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 conveyor-0-2 rotate: false - xy: 1673, 229 + xy: 1086, 41 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 conveyor-0-3 rotate: false - xy: 1707, 229 + xy: 1125, 201 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 conveyor-1-0 rotate: false - xy: 1639, 211 + xy: 1120, 167 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 conveyor-1-1 rotate: false - xy: 1673, 195 + xy: 1120, 133 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 conveyor-1-2 rotate: false - xy: 1707, 195 + xy: 1120, 99 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 conveyor-1-3 rotate: false - xy: 4045, 761 + xy: 1120, 65 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 conveyor-2-0 rotate: false - xy: 1125, 201 + xy: 1120, 31 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 conveyor-2-1 rotate: false - xy: 1120, 167 + xy: 1159, 200 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 conveyor-2-2 rotate: false - xy: 1120, 133 + xy: 1193, 200 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 conveyor-2-3 rotate: false - xy: 1120, 99 + xy: 1227, 200 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 conveyor-3-0 rotate: false - xy: 1120, 65 + xy: 1154, 166 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 conveyor-3-1 rotate: false - xy: 1120, 31 + xy: 1154, 132 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 conveyor-3-2 rotate: false - xy: 1159, 200 + xy: 1188, 166 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 conveyor-3-3 rotate: false - xy: 1193, 200 + xy: 1154, 98 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 conveyor-4-0 rotate: false - xy: 1227, 200 + xy: 1188, 132 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 conveyor-4-1 rotate: false - xy: 1154, 166 + xy: 1222, 166 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 conveyor-4-2 rotate: false - xy: 1154, 132 + xy: 1154, 64 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 conveyor-4-3 rotate: false - xy: 1188, 166 + xy: 1188, 98 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 plastanium-conveyor rotate: false - xy: 3937, 669 + xy: 3963, 641 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 plastanium-conveyor-0 rotate: false - xy: 3971, 703 + xy: 3961, 607 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 plastanium-conveyor-1 rotate: false - xy: 3971, 669 + xy: 3961, 573 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 plastanium-conveyor-2 rotate: false - xy: 3937, 635 + xy: 3961, 539 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 plastanium-conveyor-edge rotate: false - xy: 3971, 635 + xy: 1810, 271 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 plastanium-conveyor-stack rotate: false - xy: 4005, 703 + xy: 1465, 819 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 titanium-conveyor-0-1 rotate: false - xy: 1256, 30 + xy: 1426, 135 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 titanium-conveyor-0-2 rotate: false - xy: 1261, 200 + xy: 1460, 169 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 titanium-conveyor-0-3 rotate: false - xy: 1295, 203 + xy: 1358, 33 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 titanium-conveyor-1-0 rotate: false - xy: 1329, 203 + xy: 1392, 67 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 titanium-conveyor-1-1 rotate: false - xy: 1363, 203 + xy: 1426, 101 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 titanium-conveyor-1-2 rotate: false - xy: 1397, 203 + xy: 1460, 135 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 titanium-conveyor-1-3 rotate: false - xy: 1431, 203 + xy: 1392, 33 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 titanium-conveyor-2-0 rotate: false - xy: 1465, 203 + xy: 1426, 67 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 titanium-conveyor-2-1 rotate: false - xy: 1499, 203 + xy: 1460, 101 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 titanium-conveyor-2-2 rotate: false - xy: 1533, 203 + xy: 1426, 33 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 titanium-conveyor-2-3 rotate: false - xy: 1290, 166 + xy: 1460, 67 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 titanium-conveyor-3-0 rotate: false - xy: 1290, 132 + xy: 1460, 33 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 titanium-conveyor-3-1 rotate: false - xy: 1290, 98 + xy: 1494, 169 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 titanium-conveyor-3-2 rotate: false - xy: 1290, 64 + xy: 1494, 135 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 titanium-conveyor-3-3 rotate: false - xy: 1290, 30 + xy: 1494, 101 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 titanium-conveyor-4-0 rotate: false - xy: 1324, 169 + xy: 1494, 67 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 titanium-conveyor-4-1 rotate: false - xy: 1324, 135 + xy: 1494, 33 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 titanium-conveyor-4-2 rotate: false - xy: 1358, 169 + xy: 1499, 203 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 titanium-conveyor-4-3 rotate: false - xy: 1324, 101 + xy: 1533, 207 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 cross rotate: false - xy: 1154, 30 + xy: 2837, 1303 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -657,14 +657,14 @@ distributor index: -1 inverted-sorter rotate: false - xy: 3007, 1303 + xy: 3143, 1294 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 junction rotate: false - xy: 3655, 627 + xy: 3825, 617 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -706,7 +706,7 @@ mass-driver-base index: -1 overflow-gate rotate: false - xy: 3757, 601 + xy: 3825, 549 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -734,49 +734,49 @@ payload-router-over index: -1 phase-conveyor rotate: false - xy: 3903, 709 + xy: 3893, 573 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 phase-conveyor-arrow rotate: false - xy: 3903, 675 + xy: 3927, 607 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 phase-conveyor-bridge rotate: false - xy: 3869, 659 + xy: 3927, 573 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 phase-conveyor-end rotate: false - xy: 3903, 641 + xy: 3893, 539 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 router rotate: false - xy: 3961, 533 + xy: 1256, 98 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 sorter rotate: false - xy: 4063, 533 + xy: 1290, 64 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 underflow-gate rotate: false - xy: 1324, 67 + xy: 1528, 101 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -958,28 +958,28 @@ block-border index: -1 block-middle rotate: false - xy: 1868, 327 + xy: 1693, 831 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-select rotate: false - xy: 2207, 1233 + xy: 2173, 1233 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 conduit-liquid rotate: false - xy: 1052, 75 + xy: 1052, 109 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 message rotate: false - xy: 3723, 593 + xy: 3791, 549 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -993,161 +993,161 @@ place-arrow index: -1 bridge-conduit rotate: false - xy: 2343, 1201 + xy: 2309, 1201 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 bridge-conduit-arrow rotate: false - xy: 1023, 211 + xy: 2343, 1269 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 bridge-conveyor-arrow rotate: false - xy: 1023, 211 + xy: 2343, 1269 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 bridge-conduit-bridge rotate: false - xy: 1057, 211 + xy: 2343, 1235 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 bridge-conduit-end rotate: false - xy: 1091, 211 + xy: 2343, 1201 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 conduit-bottom rotate: false - xy: 1018, 75 + xy: 1018, 109 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 conduit-bottom-0 rotate: false - xy: 1052, 109 + xy: 1052, 143 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 conduit-bottom-1 rotate: false - xy: 1086, 143 + xy: 1086, 177 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 conduit-bottom-2 rotate: false - xy: 1018, 41 + xy: 1018, 75 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 conduit-bottom-3 rotate: false - xy: 1018, 41 + xy: 1018, 75 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 conduit-bottom-4 rotate: false - xy: 1018, 41 + xy: 1018, 75 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 conduit-top-0 rotate: false - xy: 1086, 109 + xy: 1086, 143 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 conduit-top-1 rotate: false - xy: 1052, 41 + xy: 1018, 41 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 conduit-top-2 rotate: false - xy: 1086, 75 + xy: 1052, 75 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 conduit-top-3 rotate: false - xy: 1086, 41 + xy: 1086, 109 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 pulse-conduit-top-3 rotate: false - xy: 1086, 41 + xy: 1086, 109 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 conduit-top-4 rotate: false - xy: 1673, 263 + xy: 1052, 41 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 liquid-junction rotate: false - xy: 3757, 635 + xy: 3791, 583 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 liquid-overflow-gate rotate: false - xy: 3893, 743 + xy: 3911, 675 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 liquid-overflow-gate-top rotate: false - xy: 3927, 743 + xy: 3945, 675 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 liquid-router-bottom rotate: false - xy: 3961, 737 + xy: 3315, 593 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 liquid-router-liquid rotate: false - xy: 3995, 737 + xy: 3349, 593 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 liquid-router-top rotate: false - xy: 3315, 593 + xy: 3383, 593 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -1175,126 +1175,126 @@ liquid-tank-top index: -1 mechanical-pump rotate: false - xy: 3553, 593 + xy: 3621, 593 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 mechanical-pump-liquid rotate: false - xy: 3587, 593 + xy: 3655, 593 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 rotary-pump-liquid rotate: false - xy: 3587, 593 + xy: 3655, 593 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 thermal-pump-liquid rotate: false - xy: 3587, 593 + xy: 3655, 593 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 phase-conduit rotate: false - xy: 3791, 609 + xy: 3859, 549 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 phase-conduit-arrow rotate: false - xy: 3827, 643 + xy: 3895, 641 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 phase-conduit-bridge rotate: false - xy: 3825, 609 + xy: 3929, 641 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 phase-conduit-end rotate: false - xy: 3869, 693 + xy: 3893, 607 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 plated-conduit-cap rotate: false - xy: 4005, 635 + xy: 1533, 819 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 plated-conduit-top-0 rotate: false - xy: 3757, 567 + xy: 4045, 1303 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 plated-conduit-top-1 rotate: false - xy: 3791, 575 + xy: 4045, 1269 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 plated-conduit-top-2 rotate: false - xy: 3825, 575 + xy: 4045, 1235 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 plated-conduit-top-3 rotate: false - xy: 3861, 625 + xy: 4045, 1201 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 plated-conduit-top-4 rotate: false - xy: 3859, 591 + xy: 1469, 237 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 pulse-conduit-top-0 rotate: false - xy: 3929, 601 + xy: 1605, 245 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 pulse-conduit-top-1 rotate: false - xy: 3963, 601 + xy: 1639, 245 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 pulse-conduit-top-2 rotate: false - xy: 3997, 601 + xy: 1673, 263 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 pulse-conduit-top-4 rotate: false - xy: 3927, 567 + xy: 1707, 263 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -1343,14 +1343,14 @@ battery-top index: -1 combustion-generator rotate: false - xy: 1052, 143 + xy: 1018, 143 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 combustion-generator-top rotate: false - xy: 1086, 177 + xy: 1052, 177 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -1378,28 +1378,28 @@ differential-generator-top index: -1 diode rotate: false - xy: 1188, 30 + xy: 2871, 1303 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 diode-arrow rotate: false - xy: 1222, 30 + xy: 2905, 1303 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 illuminator rotate: false - xy: 2905, 1303 + xy: 3075, 1303 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 illuminator-top rotate: false - xy: 2939, 1303 + xy: 3109, 1317 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -1455,7 +1455,7 @@ impact-reactor-plasma-3 index: -1 power-node rotate: false - xy: 3859, 557 + xy: 1503, 241 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -1469,14 +1469,14 @@ power-node-large index: -1 power-source rotate: false - xy: 3895, 607 + xy: 1537, 241 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 power-void rotate: false - xy: 3893, 573 + xy: 1571, 245 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -1490,14 +1490,14 @@ rtg-generator index: -1 rtg-generator-top rotate: false - xy: 3995, 533 + xy: 1256, 64 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 solar-panel rotate: false - xy: 4029, 533 + xy: 1290, 98 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -1686,21 +1686,21 @@ graphite-press index: -1 incinerator rotate: false - xy: 2973, 1303 + xy: 3109, 1283 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 item-source rotate: false - xy: 3315, 627 + xy: 3485, 627 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 item-void rotate: false - xy: 3621, 627 + xy: 3791, 617 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -1728,21 +1728,21 @@ silicon-smelter-top index: -1 liquid-source rotate: false - xy: 3417, 593 + xy: 3485, 593 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 liquid-void rotate: false - xy: 3451, 593 + xy: 3519, 593 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 melter rotate: false - xy: 3621, 593 + xy: 3689, 593 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -1791,14 +1791,14 @@ plastanium-compressor-top index: -1 pulverizer rotate: false - xy: 3961, 567 + xy: 1673, 229 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 pulverizer-rotator rotate: false - xy: 3995, 567 + xy: 1707, 229 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -1910,28 +1910,28 @@ rock2 index: -1 sand-boulder1 rotate: false - xy: 3791, 541 + xy: 1256, 30 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 sand-boulder2 rotate: false - xy: 3825, 541 + xy: 1261, 200 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 shale-boulder1 rotate: false - xy: 4031, 601 + xy: 1465, 203 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 shale-boulder2 rotate: false - xy: 4029, 567 + xy: 1290, 166 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -1952,21 +1952,21 @@ snowrock2 index: -1 spore-cluster1 rotate: false - xy: 1433, 271 + xy: 1349, 271 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 spore-cluster2 rotate: false - xy: 1475, 271 + xy: 1391, 271 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 spore-cluster3 rotate: false - xy: 1517, 271 + xy: 1433, 271 size: 40, 40 orig: 40, 40 offset: 0, 0 @@ -2036,14 +2036,14 @@ core-shard-team index: -1 unloader rotate: false - xy: 1358, 101 + xy: 1528, 67 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 unloader-center rotate: false - xy: 1392, 135 + xy: 1528, 33 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -2057,7 +2057,7 @@ vault index: -1 arc-heat rotate: false - xy: 1635, 279 + xy: 1551, 279 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -2141,7 +2141,7 @@ salvo-panel-right index: -1 scorch-heat rotate: false - xy: 3893, 505 + xy: 1329, 203 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -2295,7 +2295,7 @@ rally-point index: -1 repair-point-base rotate: false - xy: 3927, 533 + xy: 1256, 132 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -2323,7 +2323,7 @@ tetrative-reconstructor-top index: -1 copper-wall rotate: false - xy: 1154, 98 + xy: 1222, 132 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -2337,7 +2337,7 @@ copper-wall-large index: -1 door rotate: false - xy: 1902, 327 + xy: 2939, 1303 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -2358,14 +2358,14 @@ door-large-open index: -1 door-open rotate: false - xy: 1902, 293 + xy: 2973, 1303 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 phase-wall rotate: false - xy: 3937, 703 + xy: 3927, 539 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -2379,7 +2379,7 @@ phase-wall-large index: -1 plastanium-wall rotate: false - xy: 4005, 669 + xy: 1499, 819 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -2442,35 +2442,35 @@ scrap-wall-large4 index: -1 scrap-wall2 rotate: false - xy: 3927, 499 + xy: 1363, 203 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 scrap-wall3 rotate: false - xy: 3961, 499 + xy: 1397, 203 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 scrap-wall4 rotate: false - xy: 3995, 499 + xy: 1431, 203 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 scrap-wall5 rotate: false - xy: 3995, 499 + xy: 1431, 203 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 surge-wall rotate: false - xy: 1256, 98 + xy: 1358, 67 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -2484,7 +2484,7 @@ surge-wall-large index: -1 thorium-wall rotate: false - xy: 1256, 64 + xy: 1392, 101 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -2505,7 +2505,7 @@ thruster index: -1 titanium-wall rotate: false - xy: 1358, 135 + xy: 1528, 169 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -2610,7 +2610,7 @@ missile-back index: -1 parallax-laser rotate: false - xy: 607, 1015 + xy: 639, 1355 size: 4, 48 orig: 4, 48 offset: 0, 0 @@ -2624,7 +2624,7 @@ parallax-laser-end index: -1 particle rotate: false - xy: 1391, 271 + xy: 1307, 271 size: 40, 40 orig: 40, 40 offset: 0, 0 @@ -2638,28 +2638,28 @@ scale_marker index: -1 shell rotate: false - xy: 1559, 275 + xy: 1475, 275 size: 36, 36 orig: 36, 36 offset: 0, 0 index: -1 shell-back rotate: false - xy: 1597, 275 + xy: 1513, 275 size: 36, 36 orig: 36, 36 offset: 0, 0 index: -1 transfer rotate: false - xy: 639, 1355 + xy: 607, 1015 size: 4, 48 orig: 4, 48 offset: 0, 0 index: -1 transfer-arrow rotate: false - xy: 1392, 169 + xy: 1528, 135 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -2876,21 +2876,21 @@ block-ice-full index: -1 block-ice-snow-full rotate: false - xy: 1537, 237 + xy: 1877, 395 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-icerocks-full rotate: false - xy: 1571, 241 + xy: 1877, 361 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-ignarock-full rotate: false - xy: 1605, 241 + xy: 1868, 327 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -2918,7 +2918,7 @@ block-laser-drill-full index: -1 block-liquid-router-full rotate: false - xy: 1639, 245 + xy: 1868, 293 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -2932,7 +2932,7 @@ block-liquid-tank-full index: -1 block-magmarock-full rotate: false - xy: 1877, 395 + xy: 1697, 899 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -2974,14 +2974,14 @@ block-meltdown-full index: -1 block-metal-floor-damaged-full rotate: false - xy: 1877, 361 + xy: 1693, 865 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-moss-full rotate: false - xy: 1868, 293 + xy: 858, 23 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -3009,42 +3009,42 @@ block-oil-extractor-full index: -1 block-ore-coal-full rotate: false - xy: 1697, 899 + xy: 892, 23 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-ore-copper-full rotate: false - xy: 1693, 865 + xy: 2391, 1319 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-ore-lead-full rotate: false - xy: 1693, 831 + xy: 3793, 651 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-ore-scrap-full rotate: false - xy: 858, 23 + xy: 3827, 651 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-ore-thorium-full rotate: false - xy: 892, 23 + xy: 3877, 735 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-ore-titanium-full rotate: false - xy: 2391, 1319 + xy: 3877, 701 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -3072,7 +3072,7 @@ payload-router-icon index: -1 block-pebbles-full rotate: false - xy: 3977, 771 + xy: 3911, 743 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -3086,7 +3086,7 @@ block-phase-weaver-full index: -1 block-plated-conduit-full rotate: false - xy: 4011, 771 + xy: 3911, 709 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -3100,21 +3100,21 @@ block-pneumatic-drill-full index: -1 block-pulse-conduit-full rotate: false - xy: 2171, 1301 + xy: 3945, 743 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-pulverizer-full rotate: false - xy: 2205, 1301 + xy: 3945, 709 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-repair-point-full rotate: false - xy: 2239, 1301 + xy: 3861, 651 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -3135,14 +3135,14 @@ block-rock-full index: -1 block-rocks-full rotate: false - xy: 2273, 1303 + xy: 2171, 1301 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-saltrocks-full rotate: false - xy: 2307, 1303 + xy: 2205, 1301 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -3156,21 +3156,21 @@ block-salvo-full index: -1 block-sand-boulder-full rotate: false - xy: 2341, 1303 + xy: 2239, 1301 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-sand-full rotate: false - xy: 2173, 1267 + xy: 2273, 1303 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-sandrocks-full rotate: false - xy: 2173, 1233 + xy: 2307, 1303 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -3184,21 +3184,21 @@ block-scatter-full index: -1 block-scorch-full rotate: false - xy: 2207, 1267 + xy: 2341, 1303 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-scrap-wall-full rotate: false - xy: 2173, 1199 + xy: 2173, 1267 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 scrap-wall1 rotate: false - xy: 2173, 1199 + xy: 2173, 1267 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -3233,35 +3233,35 @@ block-segment-full index: -1 block-shale-boulder-full rotate: false - xy: 2207, 1199 + xy: 2207, 1267 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-shale-full rotate: false - xy: 2241, 1267 + xy: 2173, 1199 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-shalerocks-full rotate: false - xy: 2241, 1233 + xy: 2207, 1233 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-shrubs-full rotate: false - xy: 2241, 1199 + xy: 2207, 1199 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-snow-full rotate: false - xy: 2275, 1269 + xy: 2241, 1267 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -3275,7 +3275,7 @@ block-snowrock-full index: -1 block-snowrocks-full rotate: false - xy: 2309, 1269 + xy: 2241, 1233 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -3296,7 +3296,7 @@ block-spore-cluster-full index: -1 block-spore-moss-full rotate: false - xy: 2275, 1235 + xy: 2241, 1199 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -3310,14 +3310,14 @@ block-spore-press-full index: -1 block-sporerocks-full rotate: false - xy: 2275, 1201 + xy: 2275, 1269 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-stone-full rotate: false - xy: 2309, 1235 + xy: 2309, 1269 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -3331,7 +3331,7 @@ block-swarmer-full index: -1 block-tendrils-full rotate: false - xy: 2309, 1201 + xy: 2275, 1235 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -3345,14 +3345,14 @@ block-tetrative-reconstructor-full index: -1 block-titanium-conveyor-full rotate: false - xy: 2343, 1269 + xy: 2275, 1201 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 titanium-conveyor-0-0 rotate: false - xy: 2343, 1269 + xy: 2275, 1201 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -3422,56 +3422,56 @@ core-shard-team-sharded index: -1 cracks-1-0 rotate: false - xy: 1188, 132 + xy: 1188, 64 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 cracks-1-1 rotate: false - xy: 1222, 166 + xy: 1222, 98 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 cracks-1-2 rotate: false - xy: 1154, 64 + xy: 1222, 64 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 cracks-1-3 rotate: false - xy: 1188, 98 + xy: 1154, 30 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 cracks-1-4 rotate: false - xy: 1222, 132 + xy: 1188, 30 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 cracks-1-5 rotate: false - xy: 1188, 64 + xy: 1222, 30 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 cracks-1-6 rotate: false - xy: 1222, 98 + xy: 1902, 327 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 cracks-1-7 rotate: false - xy: 1222, 64 + xy: 1902, 293 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -3933,7 +3933,7 @@ cyclone index: -1 duo rotate: false - xy: 2837, 1303 + xy: 3007, 1303 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -3947,7 +3947,7 @@ fuse index: -1 hail rotate: false - xy: 2871, 1303 + xy: 3041, 1303 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -3961,7 +3961,7 @@ item-blast-compound-large index: -1 item-blast-compound-medium rotate: false - xy: 3075, 1303 + xy: 3211, 1294 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -3996,7 +3996,7 @@ item-coal-large index: -1 item-coal-medium rotate: false - xy: 3109, 1283 + xy: 3279, 1294 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -4024,14 +4024,14 @@ item-coal-xlarge index: -1 item-copper-large rotate: false - xy: 3893, 777 + xy: 3793, 727 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 item-copper-medium rotate: false - xy: 3177, 1294 + xy: 3143, 1260 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -4045,7 +4045,7 @@ item-copper-small index: -1 item-copper-tiny rotate: false - xy: 4079, 777 + xy: 2149, 1179 size: 16, 16 orig: 16, 16 offset: 0, 0 @@ -4059,14 +4059,14 @@ item-copper-xlarge index: -1 item-graphite-large rotate: false - xy: 3793, 677 + xy: 3893, 777 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 item-graphite-medium rotate: false - xy: 3245, 1294 + xy: 3211, 1260 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -4080,7 +4080,7 @@ item-graphite-small index: -1 item-graphite-tiny rotate: false - xy: 2149, 1179 + xy: 1265, 324 size: 16, 16 orig: 16, 16 offset: 0, 0 @@ -4094,14 +4094,14 @@ item-graphite-xlarge index: -1 item-lead-large rotate: false - xy: 3843, 727 + xy: 1697, 933 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 item-lead-medium rotate: false - xy: 3313, 1294 + xy: 3279, 1260 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -4115,7 +4115,7 @@ item-lead-small index: -1 item-lead-tiny rotate: false - xy: 1265, 324 + xy: 204, 1 size: 16, 16 orig: 16, 16 offset: 0, 0 @@ -4129,14 +4129,14 @@ item-lead-xlarge index: -1 item-metaglass-large rotate: false - xy: 1697, 933 + xy: 1139, 277 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 item-metaglass-medium rotate: false - xy: 3177, 1260 + xy: 3043, 619 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -4150,7 +4150,7 @@ item-metaglass-small index: -1 item-metaglass-tiny rotate: false - xy: 4079, 759 + xy: 222, 1 size: 16, 16 orig: 16, 16 offset: 0, 0 @@ -4164,14 +4164,14 @@ item-metaglass-xlarge index: -1 item-phase-fabric-large rotate: false - xy: 1139, 277 + xy: 3793, 685 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 item-phase-fabric-medium rotate: false - xy: 3245, 1260 + xy: 3111, 619 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -4185,7 +4185,7 @@ item-phase-fabric-small index: -1 item-phase-fabric-tiny rotate: false - xy: 204, 1 + xy: 240, 1 size: 16, 16 orig: 16, 16 offset: 0, 0 @@ -4199,14 +4199,14 @@ item-phase-fabric-xlarge index: -1 item-plastanium-large rotate: false - xy: 3935, 777 + xy: 3835, 727 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 item-plastanium-medium rotate: false - xy: 3313, 1260 + xy: 3179, 619 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -4220,7 +4220,7 @@ item-plastanium-small index: -1 item-plastanium-tiny rotate: false - xy: 222, 1 + xy: 258, 1 size: 16, 16 orig: 16, 16 offset: 0, 0 @@ -4234,14 +4234,14 @@ item-plastanium-xlarge index: -1 item-pyratite-large rotate: false - xy: 1181, 318 + xy: 3935, 777 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 item-pyratite-medium rotate: false - xy: 3077, 619 + xy: 3247, 619 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -4255,7 +4255,7 @@ item-pyratite-small index: -1 item-pyratite-tiny rotate: false - xy: 240, 1 + xy: 276, 1 size: 16, 16 orig: 16, 16 offset: 0, 0 @@ -4269,14 +4269,14 @@ item-pyratite-xlarge index: -1 item-sand-large rotate: false - xy: 1223, 318 + xy: 3835, 685 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 item-sand-medium rotate: false - xy: 3145, 619 + xy: 3315, 627 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -4290,7 +4290,7 @@ item-sand-small index: -1 item-sand-tiny rotate: false - xy: 258, 1 + xy: 294, 1 size: 16, 16 orig: 16, 16 offset: 0, 0 @@ -4304,14 +4304,14 @@ item-sand-xlarge index: -1 item-scrap-large rotate: false - xy: 1181, 276 + xy: 1181, 318 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 item-scrap-medium rotate: false - xy: 3213, 619 + xy: 3383, 627 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -4325,7 +4325,7 @@ item-scrap-small index: -1 item-scrap-tiny rotate: false - xy: 276, 1 + xy: 312, 1 size: 16, 16 orig: 16, 16 offset: 0, 0 @@ -4339,14 +4339,14 @@ item-scrap-xlarge index: -1 item-silicon-large rotate: false - xy: 1223, 276 + xy: 1223, 318 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 item-silicon-medium rotate: false - xy: 3281, 619 + xy: 3451, 627 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -4360,7 +4360,7 @@ item-silicon-small index: -1 item-silicon-tiny rotate: false - xy: 294, 1 + xy: 330, 1 size: 16, 16 orig: 16, 16 offset: 0, 0 @@ -4374,14 +4374,14 @@ item-silicon-xlarge index: -1 item-spore-pod-large rotate: false - xy: 2131, 1239 + xy: 1181, 276 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 item-spore-pod-medium rotate: false - xy: 3383, 627 + xy: 3553, 627 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -4395,7 +4395,7 @@ item-spore-pod-small index: -1 item-spore-pod-tiny rotate: false - xy: 312, 1 + xy: 348, 1 size: 16, 16 orig: 16, 16 offset: 0, 0 @@ -4409,14 +4409,14 @@ item-spore-pod-xlarge index: -1 item-surge-alloy-large rotate: false - xy: 2131, 1197 + xy: 1223, 276 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 item-surge-alloy-medium rotate: false - xy: 3451, 627 + xy: 3621, 627 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -4430,7 +4430,7 @@ item-surge-alloy-small index: -1 item-surge-alloy-tiny rotate: false - xy: 330, 1 + xy: 366, 1 size: 16, 16 orig: 16, 16 offset: 0, 0 @@ -4444,14 +4444,14 @@ item-surge-alloy-xlarge index: -1 item-thorium-large rotate: false - xy: 1139, 235 + xy: 2131, 1239 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 item-thorium-medium rotate: false - xy: 3519, 627 + xy: 3689, 627 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -4465,7 +4465,7 @@ item-thorium-small index: -1 item-thorium-tiny rotate: false - xy: 348, 1 + xy: 4079, 1319 size: 16, 16 orig: 16, 16 offset: 0, 0 @@ -4479,14 +4479,14 @@ item-thorium-xlarge index: -1 item-titanium-large rotate: false - xy: 1181, 234 + xy: 2131, 1197 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 item-titanium-medium rotate: false - xy: 3587, 627 + xy: 3757, 635 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -4500,7 +4500,7 @@ item-titanium-small index: -1 item-titanium-tiny rotate: false - xy: 366, 1 + xy: 4079, 1301 size: 16, 16 orig: 16, 16 offset: 0, 0 @@ -4521,14 +4521,14 @@ lancer index: -1 liquid-cryofluid-large rotate: false - xy: 1223, 234 + xy: 1139, 235 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 liquid-cryofluid-medium rotate: false - xy: 3723, 627 + xy: 3757, 601 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -4542,7 +4542,7 @@ liquid-cryofluid-small index: -1 liquid-cryofluid-tiny rotate: false - xy: 4079, 1319 + xy: 4079, 1283 size: 16, 16 orig: 16, 16 offset: 0, 0 @@ -4556,14 +4556,14 @@ liquid-cryofluid-xlarge index: -1 liquid-oil-large rotate: false - xy: 1265, 271 + xy: 1181, 234 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 liquid-oil-medium rotate: false - xy: 3835, 685 + xy: 3859, 583 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -4577,7 +4577,7 @@ liquid-oil-small index: -1 liquid-oil-tiny rotate: false - xy: 4079, 1301 + xy: 4079, 1265 size: 16, 16 orig: 16, 16 offset: 0, 0 @@ -4591,14 +4591,14 @@ liquid-oil-xlarge index: -1 liquid-slag-large rotate: false - xy: 1307, 271 + xy: 1223, 234 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 liquid-slag-medium rotate: false - xy: 3383, 593 + xy: 3451, 593 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -4612,7 +4612,7 @@ liquid-slag-small index: -1 liquid-slag-tiny rotate: false - xy: 4079, 1283 + xy: 4079, 1247 size: 16, 16 orig: 16, 16 offset: 0, 0 @@ -4626,28 +4626,28 @@ liquid-slag-xlarge index: -1 liquid-water-large rotate: false - xy: 1349, 271 + xy: 1265, 271 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 liquid-water-medium rotate: false - xy: 3519, 593 + xy: 3587, 593 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 liquid-water-small rotate: false - xy: 1426, 177 + xy: 613, 1353 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 liquid-water-tiny rotate: false - xy: 4079, 1265 + xy: 4079, 1229 size: 16, 16 orig: 16, 16 offset: 0, 0 @@ -4682,7 +4682,7 @@ parallax index: -1 repair-point rotate: false - xy: 3893, 539 + xy: 1256, 166 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -4710,7 +4710,7 @@ scatter index: -1 scorch rotate: false - xy: 3859, 523 + xy: 1295, 203 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -4731,84 +4731,84 @@ spectre index: -1 splash-0 rotate: false - xy: 4029, 499 + xy: 1290, 30 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 splash-1 rotate: false - xy: 4063, 499 + xy: 1324, 169 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 splash-10 rotate: false - xy: 1256, 166 + xy: 1426, 169 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 splash-11 rotate: false - xy: 1256, 132 + xy: 1324, 33 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 splash-2 rotate: false - xy: 1810, 271 + xy: 1324, 135 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 splash-3 rotate: false - xy: 1465, 819 + xy: 1358, 169 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 splash-4 rotate: false - xy: 1499, 819 + xy: 1324, 101 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 splash-5 rotate: false - xy: 1533, 819 + xy: 1358, 135 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 splash-6 rotate: false - xy: 4045, 1303 + xy: 1392, 169 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 splash-7 rotate: false - xy: 4045, 1269 + xy: 1324, 67 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 splash-8 rotate: false - xy: 4045, 1235 + xy: 1358, 101 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 splash-9 rotate: false - xy: 4045, 1201 + xy: 1392, 135 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -4848,13 +4848,6 @@ unit-dagger-full orig: 48, 48 offset: 0, 0 index: -1 -unit-draug-full - rotate: false - xy: 3693, 711 - size: 48, 48 - orig: 48, 48 - offset: 0, 0 - index: -1 unit-eruptor-full rotate: false xy: 2703, 819 @@ -4920,7 +4913,7 @@ unit-revenant-full index: -1 unit-spirit-full rotate: false - xy: 3693, 661 + xy: 3693, 711 size: 48, 48 orig: 48, 48 offset: 0, 0 @@ -4941,14 +4934,14 @@ unit-trident-full index: -1 unit-vanguard-full rotate: false - xy: 3743, 769 + xy: 3693, 661 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 unit-wraith-full rotate: false - xy: 3793, 769 + xy: 3743, 769 size: 48, 48 orig: 48, 48 offset: 0, 0 @@ -4962,140 +4955,140 @@ wave index: -1 item-blast-compound rotate: false - xy: 3041, 1303 + xy: 3177, 1294 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 item-coal rotate: false - xy: 3109, 1317 + xy: 3245, 1294 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 item-copper rotate: false - xy: 3143, 1294 + xy: 3313, 1294 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 item-graphite rotate: false - xy: 3211, 1294 + xy: 3177, 1260 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 item-lead rotate: false - xy: 3279, 1294 + xy: 3245, 1260 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 item-metaglass rotate: false - xy: 3143, 1260 + xy: 3313, 1260 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 item-phase-fabric rotate: false - xy: 3211, 1260 + xy: 3077, 619 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 item-plastanium rotate: false - xy: 3279, 1260 + xy: 3145, 619 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 item-pyratite rotate: false - xy: 3043, 619 + xy: 3213, 619 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 item-sand rotate: false - xy: 3111, 619 + xy: 3281, 619 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 item-scrap rotate: false - xy: 3179, 619 + xy: 3349, 627 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 item-silicon rotate: false - xy: 3247, 619 + xy: 3417, 627 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 item-spore-pod rotate: false - xy: 3349, 627 + xy: 3519, 627 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 item-surge-alloy rotate: false - xy: 3417, 627 + xy: 3587, 627 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 item-thorium rotate: false - xy: 3485, 627 + xy: 3655, 627 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 item-titanium rotate: false - xy: 3553, 627 + xy: 3723, 627 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 liquid-cryofluid rotate: false - xy: 3689, 627 + xy: 3859, 617 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 liquid-oil rotate: false - xy: 3793, 643 + xy: 3825, 583 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 liquid-slag rotate: false - xy: 3349, 593 + xy: 3417, 593 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 liquid-water rotate: false - xy: 3485, 593 + xy: 3553, 593 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -5634,14 +5627,14 @@ trident-cell index: -1 vanguard rotate: false - xy: 3743, 719 + xy: 3793, 769 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 vanguard-cell rotate: false - xy: 3843, 769 + xy: 3743, 719 size: 48, 48 orig: 48, 48 offset: 0, 0 @@ -5774,14 +5767,14 @@ small-weapon index: -1 weapon rotate: false - xy: 3743, 669 + xy: 3843, 769 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 wraith rotate: false - xy: 3793, 719 + xy: 3743, 669 size: 48, 48 orig: 48, 48 offset: 0, 0 diff --git a/core/assets/sprites/sprites.png b/core/assets/sprites/sprites.png index 5fb7c7357c..027f1e1e4f 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 67f333a1de..01b036b445 100644 Binary files a/core/assets/sprites/sprites2.png and b/core/assets/sprites/sprites2.png differ diff --git a/core/src/mindustry/ai/BlockIndexer.java b/core/src/mindustry/ai/BlockIndexer.java index dacdd6e8cb..46261c1c5f 100644 --- a/core/src/mindustry/ai/BlockIndexer.java +++ b/core/src/mindustry/ai/BlockIndexer.java @@ -33,7 +33,7 @@ public class BlockIndexer{ /** Maps each team ID to a quarant. A quadrant is a grid of bits, where each bit is set if and only if there is a block of that team in that quadrant. */ private GridBits[] structQuadrants; /** Stores all damaged tile entities by team. */ - private TileArray[] damagedTiles = new TileArray[Team.all.length]; + private BuildingArray[] damagedTiles = new BuildingArray[Team.all.length]; /** All ores available on this map. */ private ObjectSet allOres = new ObjectSet<>(); /** Stores teams that are present here as tiles. */ @@ -48,6 +48,8 @@ public class BlockIndexer{ private TileArray emptySet = new TileArray(); /** Array used for returning and reusing. */ private Seq returnArray = new Seq<>(); + /** Array used for returning and reusing. */ + private Seq breturnArray = new Seq<>(); public BlockIndexer(){ Events.on(BuildinghangeEvent.class, event -> { @@ -68,7 +70,7 @@ public class BlockIndexer{ Events.on(WorldLoadEvent.class, event -> { scanOres.clear(); scanOres.addAll(Item.getAllOres()); - damagedTiles = new TileArray[Team.all.length]; + damagedTiles = new BuildingArray[Team.all.length]; flagMap = new TileArray[Team.all.length][BlockFlag.all.length]; unitCaps = new int[Team.all.length]; @@ -136,21 +138,21 @@ public class BlockIndexer{ } /** Returns all damaged tiles by team. */ - public TileArray getDamaged(Team team){ + public BuildingArray getDamaged(Team team){ returnArray.clear(); if(damagedTiles[team.id] == null){ - damagedTiles[team.id] = new TileArray(); + damagedTiles[team.id] = new BuildingArray(); } - TileArray set = damagedTiles[team.id]; - for(Tile tile : set){ - if((tile.build == null || tile.build.team() != team || !tile.build.damaged()) || tile.block() instanceof BuildBlock){ - returnArray.add(tile); + BuildingArray set = damagedTiles[team.id]; + for(Building build : set){ + if((!build.isValid() || build.team != team || !build.damaged()) || build.block instanceof BuildBlock){ + breturnArray.add(build); } } - for(Tile tile : returnArray){ + for(Building tile : breturnArray){ set.remove(tile); } @@ -211,11 +213,10 @@ public class BlockIndexer{ public void notifyTileDamaged(Building entity){ if(damagedTiles[entity.team().id] == null){ - damagedTiles[entity.team().id] = new TileArray(); + damagedTiles[entity.team().id] = new BuildingArray(); } - TileArray set = damagedTiles[entity.team().id]; - set.add(entity.tile()); + damagedTiles[entity.team().id].add(entity); } public Building findEnemyTile(Team team, float x, float y, float range, Boolf pred){ @@ -471,4 +472,35 @@ public class BlockIndexer{ return tiles.iterator(); } } + + //TODO copy-pasted code, generics would be nice here + public static class BuildingArray implements Iterable{ + private Seq tiles = new Seq<>(false, 16); + private IntSet contained = new IntSet(); + + public void add(Building tile){ + if(contained.add(tile.pos())){ + tiles.add(tile); + } + } + + public void remove(Building tile){ + if(contained.remove(tile.pos())){ + tiles.remove(tile); + } + } + + public int size(){ + return tiles.size; + } + + public Building first(){ + return tiles.first(); + } + + @Override + public Iterator iterator(){ + return tiles.iterator(); + } + } } diff --git a/core/src/mindustry/content/Blocks.java b/core/src/mindustry/content/Blocks.java index 5be0e99890..17f2131805 100644 --- a/core/src/mindustry/content/Blocks.java +++ b/core/src/mindustry/content/Blocks.java @@ -1268,6 +1268,7 @@ public class Blocks implements ContentList{ requirements(Category.effect, BuildVisibility.hidden, with(Items.copper, 1000, Items.lead, 1000)); alwaysUnlocked = true; + unitType = UnitTypes.alpha; health = 1100; itemCapacity = 4000; size = 3; @@ -1276,6 +1277,7 @@ public class Blocks implements ContentList{ coreFoundation = new CoreBlock("core-foundation"){{ requirements(Category.effect, with(Items.copper, 3000, Items.lead, 3000, Items.silicon, 2000)); + unitType = UnitTypes.beta; health = 2000; itemCapacity = 9000; size = 4; @@ -1284,6 +1286,7 @@ public class Blocks implements ContentList{ coreNucleus = new CoreBlock("core-nucleus"){{ requirements(Category.effect, with(Items.copper, 1000, Items.lead, 1000)); + unitType = UnitTypes.gamma; health = 4000; itemCapacity = 13000; size = 5; @@ -1678,7 +1681,7 @@ public class Blocks implements ContentList{ plans = new UnitPlan[]{ new UnitPlan(UnitTypes.dagger, 200f, with(Items.silicon, 10, Items.lead, 10)), new UnitPlan(UnitTypes.crawler, 200f, with(Items.silicon, 10, Items.blastCompound, 5)), - new UnitPlan(UnitTypes.tau, 200f, with(Items.silicon, 20, Items.lead, 10)), + new UnitPlan(UnitTypes.nova, 200f, with(Items.silicon, 20, Items.lead, 10)), }; size = 3; consumes.power(1.2f); @@ -1688,7 +1691,7 @@ public class Blocks implements ContentList{ requirements(Category.units, with(Items.copper, 30, Items.lead, 70)); plans = new UnitPlan[]{ new UnitPlan(UnitTypes.wraith, 200f, with(Items.silicon, 10)), - new UnitPlan(UnitTypes.spirit, 200f, with(Items.silicon, 10)), + new UnitPlan(UnitTypes.mono, 200f, with(Items.silicon, 10)), new UnitPlan(UnitTypes.phantom, 200f, with(Items.silicon, 10)), }; size = 3; @@ -1698,7 +1701,7 @@ public class Blocks implements ContentList{ navalFactory = new UnitFactory("naval-factory"){{ requirements(Category.units, with(Items.copper, 30, Items.lead, 70)); plans = new UnitPlan[]{ - new UnitPlan(UnitTypes.vanguard, 200f, with(Items.silicon, 10)), + new UnitPlan(UnitTypes.risse, 200f, with(Items.silicon, 10)), }; size = 3; requiresWater = true; @@ -1715,10 +1718,11 @@ public class Blocks implements ContentList{ constructTime = 60f * 5f; upgrades = new UnitType[][]{ - {UnitTypes.tau, UnitTypes.oculon}, + {UnitTypes.nova, UnitTypes.quasar}, {UnitTypes.dagger, UnitTypes.mace}, {UnitTypes.crawler, UnitTypes.eruptor}, {UnitTypes.wraith, UnitTypes.ghoul}, + {UnitTypes.mono, UnitTypes.poly}, }; }}; @@ -1734,6 +1738,7 @@ public class Blocks implements ContentList{ upgrades = new UnitType[][]{ {UnitTypes.ghoul, UnitTypes.revenant}, {UnitTypes.mace, UnitTypes.fortress}, + {UnitTypes.poly, UnitTypes.mega}, }; }}; diff --git a/core/src/mindustry/content/UnitTypes.java b/core/src/mindustry/content/UnitTypes.java index 34f664aecb..fda07e213d 100644 --- a/core/src/mindustry/content/UnitTypes.java +++ b/core/src/mindustry/content/UnitTypes.java @@ -16,10 +16,10 @@ public class UnitTypes implements ContentList{ public static @EntityDef({Unitc.class, Mechc.class}) UnitType mace, dagger, crawler, fortress, siegeArray, eradicator; //ground + builder - public static @EntityDef({Unitc.class, Mechc.class, Builderc.class}) UnitType tau; + public static @EntityDef({Unitc.class, Mechc.class, Builderc.class}) UnitType nova; //ground + builder + miner + commander - public static @EntityDef({Unitc.class, Mechc.class, Builderc.class, Minerc.class, Commanderc.class}) UnitType oculon; + public static @EntityDef({Unitc.class, Mechc.class, Builderc.class, Minerc.class, Commanderc.class}) UnitType quasar; //legs public static @EntityDef({Unitc.class, Legsc.class}) UnitType cix, eruptor; @@ -28,20 +28,22 @@ public class UnitTypes implements ContentList{ public static @EntityDef({Unitc.class}) UnitType wraith, reaper, ghoul, revenant, lich; //air + building - public static @EntityDef({Unitc.class, Builderc.class}) UnitType spirit; + public static @EntityDef({Unitc.class, Builderc.class}) UnitType mono; + + //air + building + mining + public static @EntityDef({Unitc.class, Builderc.class, Minerc.class}) UnitType poly; + + //air + building + mining + payload + public static @EntityDef({Unitc.class, Builderc.class, Minerc.class, Payloadc.class}) UnitType mega; //air + mining public static @EntityDef({Unitc.class, Minerc.class}) UnitType phantom; //air + building + mining - //TODO implement other starter drones public static @EntityDef({Unitc.class, Builderc.class, Minerc.class, Trailc.class}) UnitType alpha, beta, gamma; - //air + building + mining + payload - public static @EntityDef({Unitc.class, Builderc.class, Minerc.class, Payloadc.class}) UnitType trident; - //water - public static @EntityDef({Unitc.class, WaterMovec.class, Commanderc.class}) UnitType vanguard; + public static @EntityDef({Unitc.class, WaterMovec.class, Commanderc.class}) UnitType risse, minke, bryde; //special block unit type public static @EntityDef({Unitc.class, BlockUnitc.class}) UnitType block; @@ -93,7 +95,7 @@ public class UnitTypes implements ContentList{ }}); }}; - tau = new UnitType("tau"){{ + nova = new UnitType("nova"){{ itemCapacity = 60; canBoost = true; boostMultiplier = 1.5f; @@ -114,7 +116,7 @@ public class UnitTypes implements ContentList{ }}); }}; - oculon = new UnitType("oculon"){{ + quasar = new UnitType("quasar"){{ mineTier = 1; hitsize = 9f; boostMultiplier = 2f; @@ -388,7 +390,7 @@ public class UnitTypes implements ContentList{ }}); }}; - vanguard = new UnitType("vanguard"){{ + risse = new UnitType("risse"){{ speed = 1.3f; drag = 0.1f; hitsize = 8f; @@ -403,23 +405,33 @@ public class UnitTypes implements ContentList{ }}); }}; - spirit = new UnitType("spirit"){{ - flying = true; - drag = 0.05f; - accel = 0.2f; - speed = 2f; - range = 50f; - health = 100; - engineSize = 1.8f; - engineOffset = 5.7f; - weapons.add(new Weapon(){{ - y = 1.5f; - reload = 40f; - x = 0.5f; - ejectEffect = Fx.none; - recoil = 2f; - bullet = Bullets.healBulletBig; - shootSound = Sounds.pew; + minke = new UnitType("minke"){{ + speed = 1.3f; + drag = 0.1f; + hitsize = 8f; + health = 130; + immunities = ObjectSet.with(StatusEffects.wet); + weapons.add(new Weapon("mount-weapon"){{ + reload = 10f; + x = 1.25f; + rotate = true; + ejectEffect = Fx.shellEjectSmall; + bullet = Bullets.standardCopper; + }}); + }}; + + bryde = new UnitType("bryde"){{ + speed = 1.3f; + drag = 0.1f; + hitsize = 8f; + health = 130; + immunities = ObjectSet.with(StatusEffects.wet); + weapons.add(new Weapon("mount-weapon"){{ + reload = 10f; + x = 1.25f; + rotate = true; + ejectEffect = Fx.shellEjectSmall; + bullet = Bullets.standardCopper; }}); }}; @@ -458,7 +470,97 @@ public class UnitTypes implements ContentList{ }}); }}; - phantom = new UnitType("phantom"){{ + beta = new UnitType("beta"){{ + //TODO maybe these should be changed + defaultController = BuilderAI::new; + isCounted = false; + + flying = true; + mineSpeed = 2f; + mineTier = 1; + buildSpeed = 0.5f; + drag = 0.05f; + speed = 2.4f; + rotateSpeed = 15f; + accel = 0.1f; + range = 70f; + itemCapacity = 30; + health = 80f; + engineOffset = 6f; + hitsize = 8f; + + weapons.add(new Weapon("small-basic-weapon"){{ + reload = 15f; + x = 2.75f; + y = 1f; + + bullet = new BasicBulletType(2.5f, 9){{ + width = 7f; + height = 9f; + lifetime = 60f; + shootEffect = Fx.shootSmall; + smokeEffect = Fx.shootSmallSmoke; + tileDamageMultiplier = 0.1f; + }}; + }}); + }}; + + gamma = new UnitType("gamma"){{ + //TODO maybe these should be changed + defaultController = BuilderAI::new; + isCounted = false; + + flying = true; + mineSpeed = 2f; + mineTier = 1; + buildSpeed = 0.5f; + drag = 0.05f; + speed = 2.4f; + rotateSpeed = 15f; + accel = 0.1f; + range = 70f; + itemCapacity = 30; + health = 80f; + engineOffset = 6f; + hitsize = 8f; + + weapons.add(new Weapon("small-basic-weapon"){{ + reload = 15f; + x = 2.75f; + y = 1f; + + bullet = new BasicBulletType(2.5f, 9){{ + width = 7f; + height = 9f; + lifetime = 60f; + shootEffect = Fx.shootSmall; + smokeEffect = Fx.shootSmallSmoke; + tileDamageMultiplier = 0.1f; + }}; + }}); + }}; + + mono = new UnitType("mono"){{ + flying = true; + drag = 0.05f; + accel = 0.2f; + speed = 2f; + range = 50f; + health = 100; + engineSize = 1.8f; + engineOffset = 5.7f; + weapons.add(new Weapon(){{ + y = 1.5f; + reload = 40f; + x = 0.5f; + ejectEffect = Fx.none; + recoil = 2f; + bullet = Bullets.healBulletBig; + shootSound = Sounds.pew; + }}); + }}; + + poly = new UnitType("poly"){{ defaultController = BuilderAI::new; flying = true; @@ -474,7 +576,7 @@ public class UnitTypes implements ContentList{ hitsize = 8f; }}; - trident = new UnitType("trident"){{ + mega = new UnitType("mega"){{ health = 500; speed = 2f; @@ -484,7 +586,7 @@ public class UnitTypes implements ContentList{ flying = true; engineOffset = 10.5f; rotateShooting = false; - hitsize = 14f; + hitsize = 15f; engineSize = 3f; weapons.add( diff --git a/core/src/mindustry/entities/Units.java b/core/src/mindustry/entities/Units.java index 0248e33688..34c38b2f3b 100644 --- a/core/src/mindustry/entities/Units.java +++ b/core/src/mindustry/entities/Units.java @@ -92,8 +92,7 @@ public class Units{ /** Returns the neareset damaged tile. */ public static Building findDamagedTile(Team team, float x, float y){ - Tile tile = Geometry.findClosest(x, y, indexer.getDamaged(team)); - return tile == null ? null : tile.build; + return Geometry.findClosest(x, y, indexer.getDamaged(team)); } /** Returns the neareset ally tile in a range. */ diff --git a/core/src/mindustry/type/UnitType.java b/core/src/mindustry/type/UnitType.java index f160832acb..dd0ebfbd57 100644 --- a/core/src/mindustry/type/UnitType.java +++ b/core/src/mindustry/type/UnitType.java @@ -79,6 +79,7 @@ public class UnitType extends UnlockableContent{ super(name); constructor = EntityMapping.map(name); + if(constructor == null) throw new IllegalArgumentException("no unit for " + name); } public UnitController createController(){ diff --git a/core/src/mindustry/world/blocks/defense/turrets/Turret.java b/core/src/mindustry/world/blocks/defense/turrets/Turret.java index 0b23958886..728e91f11d 100644 --- a/core/src/mindustry/world/blocks/defense/turrets/Turret.java +++ b/core/src/mindustry/world/blocks/defense/turrets/Turret.java @@ -102,8 +102,7 @@ public abstract class Turret extends Block{ stats.add(BlockStat.shootRange, range / tilesize, StatUnit.blocks); stats.add(BlockStat.inaccuracy, (int)inaccuracy, StatUnit.degrees); - stats.add(BlockStat.reload, 60f / reloadTime, StatUnit.none); - stats.add(BlockStat.shots, shots, StatUnit.none); + stats.add(BlockStat.reload, 60f / reloadTime * shots, StatUnit.none); stats.add(BlockStat.targetsAir, targetAir); stats.add(BlockStat.targetsGround, targetGround); diff --git a/core/src/mindustry/world/blocks/distribution/Sorter.java b/core/src/mindustry/world/blocks/distribution/Sorter.java index 4a9e5a5590..8fa77bb230 100644 --- a/core/src/mindustry/world/blocks/distribution/Sorter.java +++ b/core/src/mindustry/world/blocks/distribution/Sorter.java @@ -87,7 +87,7 @@ public class Sorter extends Block{ } boolean isSame(Building other){ - //uncomment comment below to prevent sorter/gate chaining (hacky) + //uncomment code below to prevent sorter/gate chaining return other != null && (other.block() instanceof Sorter/* || other.block() instanceof OverflowGate */); } diff --git a/gradle.properties b/gradle.properties index 5b62b2b054..d58dbc028d 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,3 +1,3 @@ org.gradle.daemon=true org.gradle.jvmargs=-Xms256m -Xmx1024m -archash=5e12ee82715df10aa81012c6b9db0865d47ceb16 +archash=351143a87915cb3d0aa7840d0a8277145988edbb