diff --git a/core/assets-raw/sprites/blocks/units/repair-point.png b/core/assets-raw/sprites/blocks/units/repair-point.png index 8357f55dd6..41c5134409 100644 Binary files a/core/assets-raw/sprites/blocks/units/repair-point.png and b/core/assets-raw/sprites/blocks/units/repair-point.png differ diff --git a/core/assets-raw/sprites/blocks/walls/deflector-wall-large.png b/core/assets-raw/sprites/blocks/walls/deflector-wall-large.png deleted file mode 100644 index abbce58e93..0000000000 Binary files a/core/assets-raw/sprites/blocks/walls/deflector-wall-large.png and /dev/null differ diff --git a/core/assets-raw/sprites/blocks/walls/deflector-wall.png b/core/assets-raw/sprites/blocks/walls/deflector-wall.png deleted file mode 100644 index 4e234bd1d0..0000000000 Binary files a/core/assets-raw/sprites/blocks/walls/deflector-wall.png and /dev/null differ diff --git a/core/assets-raw/sprites/blocks/walls/dense-alloy-wall-large.png b/core/assets-raw/sprites/blocks/walls/dense-alloy-wall-large.png deleted file mode 100644 index 3db17bbac3..0000000000 Binary files a/core/assets-raw/sprites/blocks/walls/dense-alloy-wall-large.png and /dev/null differ diff --git a/core/assets-raw/sprites/blocks/walls/dense-alloy-wall.png b/core/assets-raw/sprites/blocks/walls/dense-alloy-wall.png deleted file mode 100644 index a725f20c37..0000000000 Binary files a/core/assets-raw/sprites/blocks/walls/dense-alloy-wall.png and /dev/null differ diff --git a/core/assets-raw/sprites/blocks/walls/titanium-wall-large.png b/core/assets-raw/sprites/blocks/walls/titanium-wall-large.png new file mode 100644 index 0000000000..996af7f52d Binary files /dev/null and b/core/assets-raw/sprites/blocks/walls/titanium-wall-large.png differ diff --git a/core/assets-raw/sprites/blocks/walls/titanium-wall.png b/core/assets-raw/sprites/blocks/walls/titanium-wall.png new file mode 100644 index 0000000000..f778c11fdb Binary files /dev/null and b/core/assets-raw/sprites/blocks/walls/titanium-wall.png differ diff --git a/core/assets/sprites/sprites.atlas b/core/assets/sprites/sprites.atlas index 0c952271e6..7d2bbdb790 100644 --- a/core/assets/sprites/sprites.atlas +++ b/core/assets/sprites/sprites.atlas @@ -20,350 +20,350 @@ force-projector-top index: -1 mend-projector rotate: false - xy: 785, 1777 + xy: 653, 1645 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 mend-projector-top rotate: false - xy: 719, 1645 + xy: 785, 1777 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 overdrive-projector rotate: false - xy: 785, 1711 + xy: 653, 1579 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 overdrive-projector-top rotate: false - xy: 653, 1513 + xy: 785, 1711 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 shock-mine rotate: false - xy: 1625, 1111 + xy: 1523, 1077 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 bridge-conveyor rotate: false - xy: 749, 626 + xy: 1343, 1349 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 bridge-conveyor-bridge rotate: false - xy: 271, 76 + xy: 1377, 1383 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 bridge-conveyor-end rotate: false - xy: 305, 77 + xy: 1411, 1417 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 conveyor-0-0 rotate: false - xy: 1377, 1349 + xy: 1751, 1417 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 conveyor-0-1 rotate: false - xy: 1411, 1383 + xy: 1717, 1349 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 conveyor-0-2 rotate: false - xy: 1445, 1417 + xy: 1751, 1383 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 conveyor-0-3 rotate: false - xy: 1411, 1349 + xy: 1785, 1417 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 conveyor-1-0 rotate: false - xy: 1445, 1383 + xy: 1751, 1349 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 conveyor-1-1 rotate: false - xy: 1479, 1417 + xy: 1785, 1383 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 conveyor-1-2 rotate: false - xy: 1445, 1349 + xy: 1819, 1417 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 conveyor-1-3 rotate: false - xy: 1479, 1383 + xy: 1785, 1349 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 conveyor-2-0 rotate: false - xy: 1513, 1417 + xy: 1819, 1383 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 conveyor-2-1 rotate: false - xy: 1479, 1349 + xy: 1853, 1417 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 conveyor-2-2 rotate: false - xy: 1513, 1383 + xy: 1819, 1349 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 conveyor-2-3 rotate: false - xy: 1547, 1417 + xy: 1853, 1383 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 conveyor-3-0 rotate: false - xy: 1513, 1349 + xy: 1887, 1417 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 conveyor-3-1 rotate: false - xy: 1547, 1383 + xy: 1853, 1349 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 conveyor-3-2 rotate: false - xy: 1581, 1417 + xy: 1887, 1383 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 conveyor-3-3 rotate: false - xy: 1547, 1349 + xy: 1921, 1417 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 conveyor-4-0 rotate: false - xy: 1581, 1383 + xy: 1887, 1349 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 conveyor-4-1 rotate: false - xy: 1615, 1417 + xy: 1921, 1383 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 conveyor-4-2 rotate: false - xy: 1581, 1349 + xy: 1955, 1417 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 conveyor-4-3 rotate: false - xy: 1615, 1383 + xy: 1921, 1349 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 titanium-conveyor-0-0 rotate: false - xy: 1455, 1043 + xy: 1217, 1005 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 titanium-conveyor-0-1 rotate: false - xy: 1489, 1043 + xy: 1251, 1009 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 titanium-conveyor-0-2 rotate: false - xy: 1523, 1043 + xy: 1217, 971 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 titanium-conveyor-0-3 rotate: false - xy: 1557, 1043 + xy: 1251, 975 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 titanium-conveyor-1-0 rotate: false - xy: 1591, 1043 + xy: 1285, 1009 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 titanium-conveyor-1-1 rotate: false - xy: 1625, 1043 + xy: 1285, 975 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 titanium-conveyor-1-2 rotate: false - xy: 1659, 1043 + xy: 1319, 1009 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 titanium-conveyor-1-3 rotate: false - xy: 1693, 1043 + xy: 1319, 975 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 titanium-conveyor-2-0 rotate: false - xy: 1727, 1043 + xy: 1353, 1009 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 titanium-conveyor-2-1 rotate: false - xy: 1761, 1043 + xy: 1353, 975 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 titanium-conveyor-2-2 rotate: false - xy: 1795, 1043 + xy: 1387, 1009 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 titanium-conveyor-2-3 rotate: false - xy: 1829, 1043 + xy: 1387, 975 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 titanium-conveyor-3-0 rotate: false - xy: 1863, 1043 + xy: 1421, 1009 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 titanium-conveyor-3-1 rotate: false - xy: 1897, 1043 + xy: 1421, 975 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 titanium-conveyor-3-2 rotate: false - xy: 1931, 1035 + xy: 1455, 1009 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 titanium-conveyor-3-3 rotate: false - xy: 1965, 1035 + xy: 1455, 975 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 titanium-conveyor-4-0 rotate: false - xy: 1999, 1035 + xy: 1489, 1009 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 titanium-conveyor-4-1 rotate: false - xy: 1115, 1027 + xy: 1489, 975 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 titanium-conveyor-4-2 rotate: false - xy: 1115, 993 + xy: 1523, 1009 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 titanium-conveyor-4-3 rotate: false - xy: 1149, 1025 + xy: 1523, 975 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 distributor rotate: false - xy: 990, 1843 + xy: 858, 1843 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 junction rotate: false - xy: 1275, 1315 + xy: 1709, 1281 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -384,49 +384,49 @@ mass-driver-turret index: -1 overflow-gate rotate: false - xy: 847, 119 + xy: 736, 7 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 phase-conveyor rotate: false - xy: 1183, 1195 + xy: 1115, 1163 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 phase-conveyor-arrow rotate: false - xy: 1217, 1179 + xy: 1149, 1141 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 phase-conveyor-bridge rotate: false - xy: 1251, 1179 + xy: 1183, 1141 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 phase-conveyor-end rotate: false - xy: 1285, 1179 + xy: 1217, 1141 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 router rotate: false - xy: 1829, 1145 + xy: 1761, 1111 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 sorter rotate: false - xy: 1217, 1077 + xy: 1115, 1061 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -475,42 +475,42 @@ blast-drill-top index: -1 laser-drill rotate: false - xy: 1848, 1851 + xy: 1716, 1851 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 laser-drill-rotator rotate: false - xy: 1980, 1851 + xy: 1848, 1851 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 laser-drill-top rotate: false - xy: 653, 1777 + xy: 1914, 1851 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 mechanical-drill rotate: false - xy: 653, 1711 + xy: 1980, 1851 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 mechanical-drill-rotator rotate: false - xy: 653, 1645 + xy: 653, 1711 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 mechanical-drill-top rotate: false - xy: 719, 1711 + xy: 719, 1777 size: 64, 64 orig: 64, 64 offset: 0, 0 @@ -573,21 +573,21 @@ plasma-drill-top index: -1 pneumatic-drill rotate: false - xy: 785, 1513 + xy: 653, 1381 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 pneumatic-drill-rotator rotate: false - xy: 917, 1645 + xy: 785, 1513 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 pneumatic-drill-top rotate: false - xy: 983, 1711 + xy: 851, 1579 size: 64, 64 orig: 64, 64 offset: 0, 0 @@ -622,28 +622,28 @@ water-extractor-top index: -1 blackrock1 rotate: false - xy: 779, 121 + xy: 1173, 1379 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 blackstone1 rotate: false - xy: 779, 53 + xy: 1207, 1417 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 blackstone2 rotate: false - xy: 843, 967 + xy: 1207, 1383 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 blackstone3 rotate: false - xy: 877, 967 + xy: 1241, 1417 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -657,84 +657,84 @@ blackstoneedge index: -1 coal1 rotate: false - xy: 373, 77 + xy: 1411, 1383 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 coal2 rotate: false - xy: 407, 77 + xy: 1445, 1417 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 coal3 rotate: false - xy: 441, 77 + xy: 1411, 1349 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 copper1 rotate: false - xy: 1615, 1349 + xy: 1989, 1417 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 copper2 rotate: false - xy: 1649, 1383 + xy: 1955, 1349 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 copper3 rotate: false - xy: 1683, 1417 + xy: 1989, 1383 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 deepwater rotate: false - xy: 1751, 1349 + xy: 1445, 1315 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 deepwater-icon-full rotate: false - xy: 1751, 1349 + xy: 1445, 1315 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 deepwater-icon-medium rotate: false - xy: 1751, 1349 + xy: 1445, 1315 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 dirt1 rotate: false - xy: 1819, 1383 + xy: 1513, 1315 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 dirt2 rotate: false - xy: 1853, 1417 + xy: 1547, 1315 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 dirt3 rotate: false - xy: 1819, 1349 + xy: 1581, 1315 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -748,49 +748,49 @@ dirtedge index: -1 generic-cliff-edge rotate: false - xy: 943, 1057 + xy: 1157, 1243 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 generic-cliff-edge-1 rotate: false - xy: 927, 1023 + xy: 1157, 1209 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 generic-cliff-edge-2 rotate: false - xy: 961, 1023 + xy: 779, 291 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 generic-cliff-side rotate: false - xy: 995, 1031 + xy: 779, 257 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 grass1 rotate: false - xy: 945, 955 + xy: 779, 155 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 grass2 rotate: false - xy: 979, 989 + xy: 779, 121 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 grass3 rotate: false - xy: 979, 955 + xy: 779, 87 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -804,21 +804,21 @@ grassedge index: -1 ice1 rotate: false - xy: 1047, 963 + xy: 909, 1083 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ice2 rotate: false - xy: 783, 867 + xy: 943, 1091 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ice3 rotate: false - xy: 783, 833 + xy: 977, 1099 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -832,21 +832,21 @@ iceedge index: -1 icerock1 rotate: false - xy: 783, 765 + xy: 1041, 1215 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 icerock2 rotate: false - xy: 783, 731 + xy: 271, 76 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 lava rotate: false - xy: 1445, 1315 + xy: 1879, 1281 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -860,63 +860,63 @@ lavaedge index: -1 lead1 rotate: false - xy: 1513, 1315 + xy: 1947, 1281 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 lead2 rotate: false - xy: 1547, 1315 + xy: 1981, 1281 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 lead3 rotate: false - xy: 1581, 1315 + xy: 2015, 1281 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 metalfloor1 rotate: false - xy: 1573, 1281 + xy: 1293, 1247 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 metalfloor2 rotate: false - xy: 1607, 1281 + xy: 1293, 1213 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 metalfloor3 rotate: false - xy: 1641, 1281 + xy: 1327, 1247 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 metalfloor4 rotate: false - xy: 1675, 1281 + xy: 1327, 1213 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 metalfloor5 rotate: false - xy: 1709, 1281 + xy: 1361, 1247 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 metalfloor6 rotate: false - xy: 1743, 1281 + xy: 1361, 1213 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -930,49 +930,49 @@ metalflooredge index: -1 rock1 rotate: false - xy: 1591, 1145 + xy: 1523, 1111 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 rock2 rotate: false - xy: 1625, 1145 + xy: 1557, 1111 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 rocks1 rotate: false - xy: 1693, 1145 + xy: 1625, 1111 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 rocks2 rotate: false - xy: 1727, 1145 + xy: 1659, 1111 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 sand1 rotate: false - xy: 1999, 1137 + xy: 1931, 1111 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 sand2 rotate: false - xy: 1115, 1129 + xy: 1965, 1111 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 sand3 rotate: false - xy: 1149, 1127 + xy: 1999, 1111 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -986,294 +986,294 @@ sandedge index: -1 scrap1 rotate: false - xy: 1353, 1111 + xy: 1251, 1077 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 scrap2 rotate: false - xy: 1387, 1111 + xy: 1285, 1077 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 scrap3 rotate: false - xy: 1421, 1111 + xy: 1319, 1077 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 shrub rotate: false - xy: 1727, 1111 + xy: 1625, 1077 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 snow1 rotate: false - xy: 1829, 1111 + xy: 1727, 1077 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 snow2 rotate: false - xy: 1863, 1111 + xy: 1761, 1077 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 snow3 rotate: false - xy: 1897, 1111 + xy: 1795, 1077 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 snowedge rotate: false - xy: 1581, 1451 + xy: 1831, 1751 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 space rotate: false - xy: 1285, 1077 + xy: 1183, 1039 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 space-icon-full rotate: false - xy: 1285, 1077 + xy: 1183, 1039 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 space-icon-medium rotate: false - xy: 1285, 1077 + xy: 1183, 1039 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 spaceedge rotate: false - xy: 1831, 1701 + xy: 1781, 1651 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 stone-cliff-edge rotate: false - xy: 1557, 1077 + xy: 1455, 1043 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 stone-cliff-edge-1 rotate: false - xy: 1591, 1077 + xy: 1489, 1043 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 stone-cliff-edge-2 rotate: false - xy: 1625, 1077 + xy: 1523, 1043 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 stone-cliff-side rotate: false - xy: 1659, 1077 + xy: 1557, 1043 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 stone1 rotate: false - xy: 1455, 1077 + xy: 1353, 1043 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 stone2 rotate: false - xy: 1489, 1077 + xy: 1387, 1043 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 stone3 rotate: false - xy: 1523, 1077 + xy: 1421, 1043 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 stoneedge rotate: false - xy: 1831, 1651 + xy: 1781, 1601 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 tar rotate: false - xy: 1863, 1077 + xy: 1761, 1043 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 tar-icon-full rotate: false - xy: 1863, 1077 + xy: 1761, 1043 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 tar-icon-medium rotate: false - xy: 1863, 1077 + xy: 1761, 1043 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 taredge rotate: false - xy: 1831, 1601 + xy: 1781, 1551 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 thorium1 rotate: false - xy: 1999, 1069 + xy: 1897, 1043 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 thorium2 rotate: false - xy: 1115, 1061 + xy: 1931, 1043 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 thorium3 rotate: false - xy: 1149, 1059 + xy: 1965, 1043 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 titanium1 rotate: false - xy: 1353, 1043 + xy: 1149, 971 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 titanium2 rotate: false - xy: 1387, 1043 + xy: 1183, 1005 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 titanium3 rotate: false - xy: 1421, 1043 + xy: 1183, 971 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 water rotate: false - xy: 1319, 1009 + xy: 1727, 1009 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 water-icon-full rotate: false - xy: 1319, 1009 + xy: 1727, 1009 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 water-icon-medium rotate: false - xy: 1319, 1009 + xy: 1727, 1009 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 water-cliff-edge rotate: false - xy: 1353, 1009 + xy: 1727, 975 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 water-cliff-edge-1 rotate: false - xy: 1387, 1009 + xy: 1761, 1009 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 water-cliff-edge-2 rotate: false - xy: 1421, 1009 + xy: 1761, 975 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 water-cliff-side rotate: false - xy: 1455, 1009 + xy: 1795, 1009 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 wateredge rotate: false - xy: 1931, 1501 + xy: 1981, 1551 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 block-border rotate: false - xy: 749, 864 + xy: 1309, 1417 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-middle rotate: false - xy: 749, 830 + xy: 1275, 1349 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 pump-liquid rotate: false - xy: 749, 830 + xy: 1275, 1349 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 conduit-liquid rotate: false - xy: 1275, 1349 + xy: 1649, 1417 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -1287,28 +1287,28 @@ place-arrow index: -1 rubble-1-0 rotate: false - xy: 719, 1315 + xy: 1115, 1777 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 rubble-1-1 rotate: false - xy: 785, 1381 + xy: 653, 1249 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 rubble-2-0 rotate: false - xy: 851, 1447 + xy: 719, 1315 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 rubble-2-1 rotate: false - xy: 917, 1513 + xy: 785, 1381 size: 64, 64 orig: 64, 64 offset: 0, 0 @@ -1329,175 +1329,175 @@ rubble-3-1 index: -1 spawn rotate: false - xy: 1319, 1077 + xy: 1217, 1039 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 bridge-conduit rotate: false - xy: 749, 796 + xy: 1309, 1383 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 bridge-conduit-arrow rotate: false - xy: 749, 762 + xy: 1343, 1417 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 bridge-conveyor-arrow rotate: false - xy: 749, 762 + xy: 1343, 1417 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 bridge-conduit-bridge rotate: false - xy: 749, 728 + xy: 1309, 1349 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 bridge-conduit-end rotate: false - xy: 749, 694 + xy: 1343, 1383 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 conduit-bottom rotate: false - xy: 1207, 1417 + xy: 1547, 1417 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 conduit-bottom-0 rotate: false - xy: 1207, 1383 + xy: 1513, 1349 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 conduit-bottom-1 rotate: false - xy: 1241, 1417 + xy: 1547, 1383 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 conduit-bottom-2 rotate: false - xy: 1207, 1349 + xy: 1581, 1417 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 conduit-bottom-3 rotate: false - xy: 1241, 1383 + xy: 1547, 1349 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 conduit-bottom-4 rotate: false - xy: 1275, 1417 + xy: 1581, 1383 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 conduit-bottom-5 rotate: false - xy: 1241, 1349 + xy: 1615, 1417 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 conduit-bottom-6 rotate: false - xy: 1275, 1383 + xy: 1581, 1349 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 conduit-top-0 rotate: false - xy: 1309, 1383 + xy: 1615, 1349 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 conduit-top-1 rotate: false - xy: 1343, 1417 + xy: 1649, 1383 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 conduit-top-2 rotate: false - xy: 1309, 1349 + xy: 1683, 1417 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 conduit-top-3 rotate: false - xy: 1343, 1383 + xy: 1649, 1349 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 conduit-top-4 rotate: false - xy: 1377, 1417 + xy: 1683, 1383 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 conduit-top-5 rotate: false - xy: 1343, 1349 + xy: 1717, 1417 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 conduit-top-6 rotate: false - xy: 1377, 1383 + xy: 1683, 1349 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 liquid-junction rotate: false - xy: 1649, 1315 + xy: 911, 967 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 liquid-router-bottom rotate: false - xy: 1751, 1315 + xy: 943, 1057 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 liquid-router-liquid rotate: false - xy: 1819, 1315 + xy: 961, 1023 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 liquid-router-top rotate: false - xy: 1853, 1315 + xy: 995, 1031 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -1525,98 +1525,98 @@ liquid-tank-top index: -1 mechanical-pump rotate: false - xy: 1369, 1281 + xy: 1047, 997 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 phase-conduit rotate: false - xy: 838, 17 + xy: 787, 864 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 phase-conduit-arrow rotate: false - xy: 872, 51 + xy: 1115, 1197 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 phase-conduit-bridge rotate: false - xy: 872, 17 + xy: 1149, 1175 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 phase-conduit-end rotate: false - xy: 1115, 1197 + xy: 1183, 1175 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 pulse-conduit-top-0 rotate: false - xy: 1931, 1171 + xy: 1863, 1145 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 pulse-conduit-top-1 rotate: false - xy: 1965, 1171 + xy: 1897, 1145 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 pulse-conduit-top-2 rotate: false - xy: 1999, 1171 + xy: 1931, 1145 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 pulse-conduit-top-3 rotate: false - xy: 1115, 1163 + xy: 1965, 1145 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 pulse-conduit-top-4 rotate: false - xy: 1149, 1161 + xy: 1999, 1145 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 pulse-conduit-top-5 rotate: false - xy: 1183, 1161 + xy: 1115, 1129 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 pulse-conduit-top-6 rotate: false - xy: 1217, 1145 + xy: 1149, 1107 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 rotary-pump rotate: false - xy: 983, 1645 + xy: 851, 1513 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 thermal-pump rotate: false - xy: 1115, 1579 + xy: 983, 1447 size: 64, 64 orig: 64, 64 offset: 0, 0 @@ -1637,7 +1637,7 @@ dart-ship-pad index: -1 delta-mech-pad rotate: false - xy: 792, 1843 + xy: 726, 1843 size: 64, 64 orig: 64, 64 offset: 0, 0 @@ -1651,7 +1651,7 @@ glaive-ship-pad index: -1 javelin-ship-pad rotate: false - xy: 1518, 1851 + xy: 1386, 1851 size: 64, 64 orig: 64, 64 offset: 0, 0 @@ -1665,7 +1665,7 @@ omega-mech-pad index: -1 tau-mech-pad rotate: false - xy: 851, 1315 + xy: 719, 1183 size: 64, 64 orig: 64, 64 offset: 0, 0 @@ -1679,7 +1679,7 @@ trident-ship-pad index: -1 battery rotate: false - xy: 779, 257 + xy: 749, 639 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -1693,14 +1693,14 @@ battery-large index: -1 combustion-generator rotate: false - xy: 475, 77 + xy: 1445, 1383 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 combustion-generator-top rotate: false - xy: 543, 77 + xy: 1445, 1349 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -1763,63 +1763,63 @@ fusion-reactor-top index: -1 power-node rotate: false - xy: 1591, 1179 + xy: 1523, 1145 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 power-node-large rotate: false - xy: 1049, 1777 + xy: 917, 1645 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 power-source rotate: false - xy: 1693, 1179 + xy: 1625, 1145 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 power-void rotate: false - xy: 1761, 1179 + xy: 1693, 1145 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 powerinfinite rotate: false - xy: 1829, 1179 + xy: 1761, 1145 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 powervoid rotate: false - xy: 1863, 1179 + xy: 1795, 1145 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 rtg-generator rotate: false - xy: 1115, 1777 + xy: 983, 1645 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 rtg-generator-top rotate: false - xy: 1931, 1137 + xy: 1863, 1111 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 solar-panel rotate: false - xy: 1965, 1103 + xy: 1863, 1077 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -1833,7 +1833,7 @@ solar-panel-large index: -1 thermal-generator rotate: false - xy: 983, 1447 + xy: 851, 1315 size: 64, 64 orig: 64, 64 offset: 0, 0 @@ -2015,140 +2015,140 @@ cultivator-top index: -1 incinerator rotate: false - xy: 783, 663 + xy: 339, 77 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 item-source rotate: false - xy: 707, 595 + xy: 1403, 1281 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 item-void rotate: false - xy: 821, 561 + xy: 1607, 1281 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 lavasmelter rotate: false - xy: 1479, 1315 + xy: 1913, 1281 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 liquid-source rotate: false - xy: 1921, 1315 + xy: 945, 989 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 melter rotate: false - xy: 1471, 1281 + xy: 1225, 1209 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 oilrefinery rotate: false - xy: 1845, 1281 + xy: 1429, 1247 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 phase-weaver rotate: false - xy: 719, 1513 + xy: 917, 1777 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 phase-weaver-bottom rotate: false - xy: 785, 1579 + xy: 653, 1447 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 phase-weaver-weave rotate: false - xy: 917, 1711 + xy: 785, 1579 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 plastanium-compressor rotate: false - xy: 983, 1777 + xy: 851, 1645 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 plastanium-compressor-top rotate: false - xy: 719, 1447 + xy: 983, 1777 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 pulverizer rotate: false - xy: 1251, 1145 + xy: 1183, 1107 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 pulverizer-rotator rotate: false - xy: 1319, 1145 + xy: 1251, 1111 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 pyratite-mixer rotate: false - xy: 719, 1381 + xy: 1049, 1777 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 separator rotate: false - xy: 1523, 1111 + xy: 1421, 1077 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 separator-liquid rotate: false - xy: 1591, 1111 + xy: 1489, 1077 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 silicon-smelter rotate: false - xy: 785, 1315 + xy: 653, 1183 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 smelter rotate: false - xy: 1795, 1111 + xy: 1693, 1077 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 solidifer rotate: false - xy: 1149, 1093 + xy: 1965, 1077 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -2190,14 +2190,14 @@ launch-pad index: -1 sortedunloader rotate: false - xy: 1183, 1093 + xy: 1999, 1077 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 unloader rotate: false - xy: 1217, 1009 + xy: 1659, 975 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -2211,14 +2211,14 @@ vault index: -1 block-1 rotate: false - xy: 1011, 1099 + xy: 1241, 1349 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-1-top rotate: false - xy: 1041, 1215 + xy: 1275, 1383 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -2267,14 +2267,14 @@ block-4-top index: -1 arc rotate: false - xy: 1165, 1263 + xy: 749, 741 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 arc-heat rotate: false - xy: 1157, 1229 + xy: 749, 707 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -2288,7 +2288,7 @@ cyclone index: -1 duo rotate: false - xy: 1921, 1383 + xy: 1819, 1315 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -2302,7 +2302,7 @@ fuse index: -1 hail rotate: false - xy: 1013, 963 + xy: 843, 967 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -2316,14 +2316,14 @@ hail-heat index: -1 lancer rotate: false - xy: 1650, 1851 + xy: 1518, 1851 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 lancer-heat rotate: false - xy: 1716, 1851 + xy: 1584, 1851 size: 64, 64 orig: 64, 64 offset: 0, 0 @@ -2358,49 +2358,49 @@ ripple-heat index: -1 salvo rotate: false - xy: 983, 1579 + xy: 851, 1447 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 salvo-heat rotate: false - xy: 1049, 1645 + xy: 917, 1513 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 salvo-panel-left rotate: false - xy: 653, 1183 + xy: 1049, 1645 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 salvo-panel-right rotate: false - xy: 719, 1249 + xy: 1115, 1711 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 scatter rotate: false - xy: 1217, 1111 + xy: 1149, 1073 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 scorch rotate: false - xy: 1251, 1111 + xy: 1183, 1073 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 scorch-shoot rotate: false - xy: 1319, 1111 + xy: 1217, 1073 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -2414,7 +2414,7 @@ spectre index: -1 swarmer rotate: false - xy: 719, 1183 + xy: 1115, 1645 size: 64, 64 orig: 64, 64 offset: 0, 0 @@ -2547,35 +2547,35 @@ ghoul-factory index: -1 phantom-factory-top rotate: false - xy: 785, 1645 + xy: 653, 1513 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 phantom-factory-top-open rotate: false - xy: 851, 1711 + xy: 719, 1579 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 reconstructor-open rotate: false - xy: 917, 1579 + xy: 785, 1447 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 repair-point rotate: false - xy: 1421, 1145 + xy: 1353, 1111 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 repair-point-turret rotate: false - xy: 1489, 1145 + xy: 1421, 1111 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -2603,14 +2603,14 @@ revenant-factory-top-open index: -1 spirit-factory-top rotate: false - xy: 983, 1513 + xy: 851, 1381 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 spirit-factory-top-open rotate: false - xy: 1049, 1579 + xy: 917, 1447 size: 64, 64 orig: 64, 64 offset: 0, 0 @@ -2638,7 +2638,7 @@ wraith-factory-top-open index: -1 copper-wall rotate: false - xy: 1649, 1349 + xy: 1989, 1349 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -2650,100 +2650,86 @@ copper-wall-large orig: 64, 64 offset: 0, 0 index: -1 -deflector-wall - rotate: false - xy: 1785, 1383 - size: 32, 32 - orig: 32, 32 - offset: 0, 0 - index: -1 -deflector-wall-large - rotate: false - xy: 726, 1843 - size: 64, 64 - orig: 64, 64 - offset: 0, 0 - index: -1 -dense-alloy-wall - rotate: false - xy: 1785, 1349 - size: 32, 32 - orig: 32, 32 - offset: 0, 0 - index: -1 -dense-alloy-wall-large - rotate: false - xy: 924, 1843 - size: 64, 64 - orig: 64, 64 - offset: 0, 0 - index: -1 door rotate: false - xy: 1853, 1349 + xy: 1683, 1315 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 door-large rotate: false - xy: 1122, 1843 + xy: 990, 1843 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 door-large-open rotate: false - xy: 1254, 1851 + xy: 1122, 1843 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 door-open rotate: false - xy: 1887, 1349 + xy: 1785, 1315 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 phase-wall rotate: false - xy: 1353, 1179 + xy: 1285, 1145 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 phase-wall-large rotate: false - xy: 917, 1777 + xy: 785, 1645 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 surge-wall rotate: false - xy: 1727, 1077 + xy: 1625, 1043 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 surge-wall-large rotate: false - xy: 1115, 1645 + xy: 983, 1513 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 thorium-wall rotate: false - xy: 1217, 1043 + xy: 1115, 1027 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 thorium-wall-large rotate: false - xy: 719, 1117 + xy: 1115, 1579 + size: 64, 64 + orig: 64, 64 + offset: 0, 0 + index: -1 +titanium-wall + rotate: false + xy: 1557, 975 + size: 32, 32 + orig: 32, 32 + offset: 0, 0 + index: -1 +titanium-wall-large + rotate: false + xy: 851, 1249 size: 64, 64 orig: 64, 64 offset: 0, 0 @@ -2778,42 +2764,42 @@ bullet-back index: -1 casing rotate: false - xy: 1091, 1187 + xy: 887, 140 size: 8, 16 orig: 8, 16 offset: 0, 0 index: -1 command-attack rotate: false - xy: 577, 77 + xy: 1479, 1383 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 command-idle rotate: false - xy: 1173, 1413 + xy: 1513, 1417 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 command-patrol rotate: false - xy: 1173, 1379 + xy: 1479, 1349 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 command-retreat rotate: false - xy: 1173, 1345 + xy: 1513, 1383 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 enemyarrow rotate: false - xy: 260, 4 + xy: 707, 575 size: 32, 28 orig: 32, 28 offset: 0, 0 @@ -2848,7 +2834,7 @@ laserfull index: -1 minelaser rotate: false - xy: 1141, 909 + xy: 2041, 1231 size: 4, 48 orig: 4, 48 offset: 0, 0 @@ -2862,14 +2848,14 @@ minelaser-end index: -1 missile rotate: false - xy: 711, 860 + xy: 711, 802 size: 36, 36 orig: 36, 36 offset: 0, 0 index: -1 missile-back rotate: false - xy: 711, 822 + xy: 711, 764 size: 36, 36 orig: 36, 36 offset: 0, 0 @@ -2883,70 +2869,70 @@ scale_marker index: -1 scorch1 rotate: false - xy: 817, 827 + xy: 813, 231 size: 28, 100 orig: 28, 100 offset: 0, 0 index: -1 scorch2 rotate: false - xy: 817, 725 + xy: 813, 129 size: 28, 100 orig: 28, 100 offset: 0, 0 index: -1 scorch3 rotate: false - xy: 847, 827 + xy: 817, 762 size: 28, 100 orig: 28, 100 offset: 0, 0 index: -1 scorch4 rotate: false - xy: 847, 725 + xy: 817, 660 size: 28, 100 orig: 28, 100 offset: 0, 0 index: -1 scorch5 rotate: false - xy: 877, 827 + xy: 821, 558 size: 28, 100 orig: 28, 100 offset: 0, 0 index: -1 shell rotate: false - xy: 711, 726 + xy: 711, 668 size: 36, 36 orig: 36, 36 offset: 0, 0 index: -1 shell-back rotate: false - xy: 711, 688 + xy: 711, 630 size: 36, 36 orig: 36, 36 offset: 0, 0 index: -1 shot rotate: false - xy: 1693, 1111 + xy: 1591, 1077 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 transfer rotate: false - xy: 2041, 1223 + xy: 2041, 1181 size: 4, 48 orig: 4, 48 offset: 0, 0 index: -1 transfer-arrow rotate: false - xy: 1115, 959 + xy: 1625, 1009 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -2974,14 +2960,14 @@ alloy-smelter-icon-large index: -1 alloy-smelter-icon-medium rotate: false - xy: 260, 34 + xy: 749, 809 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 alloy-smelter-icon-small rotate: false - xy: 2023, 1441 + xy: 2023, 1425 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -3002,28 +2988,28 @@ alpha-mech-pad-icon-large index: -1 alpha-mech-pad-icon-medium rotate: false - xy: 1165, 1297 + xy: 749, 775 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 alpha-mech-pad-icon-small rotate: false - xy: 2023, 1415 + xy: 2023, 1399 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 arc-icon-full rotate: false - xy: 779, 291 + xy: 749, 673 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 arc-icon-medium rotate: false - xy: 779, 291 + xy: 749, 673 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -3037,21 +3023,21 @@ arc-icon-large index: -1 arc-icon-small rotate: false - xy: 2023, 1389 + xy: 2023, 1373 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 battery-icon-full rotate: false - xy: 779, 223 + xy: 260, 34 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 battery-icon-medium rotate: false - xy: 779, 223 + xy: 260, 34 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -3065,7 +3051,7 @@ battery-icon-large index: -1 battery-icon-small rotate: false - xy: 2023, 1363 + xy: 2023, 1347 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -3086,14 +3072,14 @@ battery-large-icon-large index: -1 battery-large-icon-medium rotate: false - xy: 779, 189 + xy: 749, 605 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 battery-large-icon-small rotate: false - xy: 2023, 1337 + xy: 2023, 1321 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -3114,28 +3100,28 @@ biomattercompressor-icon-large index: -1 biomattercompressor-icon-medium rotate: false - xy: 779, 155 + xy: 1173, 1413 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 biomattercompressor-icon-small rotate: false - xy: 2023, 1311 + xy: 1863, 977 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 blackrock-icon-full rotate: false - xy: 779, 87 + xy: 1173, 1345 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 blackrock-icon-medium rotate: false - xy: 779, 87 + xy: 1173, 1345 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -3149,21 +3135,21 @@ blackrock-icon-large index: -1 blackrock-icon-small rotate: false - xy: 753, 532 + xy: 821, 532 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 blackstone-icon-full rotate: false - xy: 909, 1083 + xy: 1207, 1349 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 blackstone-icon-medium rotate: false - xy: 909, 1083 + xy: 1207, 1349 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -3177,7 +3163,7 @@ blackstone-icon-large index: -1 blackstone-icon-small rotate: false - xy: 787, 328 + xy: 1889, 977 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -3198,14 +3184,14 @@ blast-drill-icon-large index: -1 blast-drill-icon-medium rotate: false - xy: 943, 1091 + xy: 1241, 1383 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 blast-drill-icon-small rotate: false - xy: 1115, 933 + xy: 821, 506 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -3226,28 +3212,28 @@ blast-mixer-icon-large index: -1 blast-mixer-icon-medium rotate: false - xy: 977, 1099 + xy: 1275, 1417 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 blast-mixer-icon-small rotate: false - xy: 1149, 965 + xy: 821, 480 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 bridge-conduit-icon-full rotate: false - xy: 749, 660 + xy: 1377, 1417 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 bridge-conduit-icon-medium rotate: false - xy: 749, 660 + xy: 1377, 1417 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -3261,21 +3247,21 @@ bridge-conduit-icon-large index: -1 bridge-conduit-icon-small rotate: false - xy: 1743, 1017 + xy: 821, 454 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 bridge-conveyor-icon-full rotate: false - xy: 339, 77 + xy: 1377, 1349 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 bridge-conveyor-icon-medium rotate: false - xy: 339, 77 + xy: 1377, 1349 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -3289,21 +3275,21 @@ bridge-conveyor-icon-large index: -1 bridge-conveyor-icon-small rotate: false - xy: 877, 801 + xy: 821, 428 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 combustion-generator-icon-full rotate: false - xy: 509, 77 + xy: 1479, 1417 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 combustion-generator-icon-medium rotate: false - xy: 509, 77 + xy: 1479, 1417 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -3317,21 +3303,21 @@ combustion-generator-icon-large index: -1 combustion-generator-icon-small rotate: false - xy: 846, 699 + xy: 821, 376 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 conduit-icon-full rotate: false - xy: 1309, 1417 + xy: 1615, 1383 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 conduit-icon-medium rotate: false - xy: 1309, 1417 + xy: 1615, 1383 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -3345,7 +3331,7 @@ conduit-icon-large index: -1 conduit-icon-small rotate: false - xy: 1175, 965 + xy: 821, 350 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -3366,28 +3352,28 @@ container-icon-large index: -1 container-icon-medium rotate: false - xy: 1411, 1417 + xy: 1717, 1383 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 container-icon-small rotate: false - xy: 1769, 1017 + xy: 1075, 1231 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 conveyor-icon-full rotate: false - xy: 1649, 1417 + xy: 1955, 1383 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 conveyor-icon-medium rotate: false - xy: 1649, 1417 + xy: 1955, 1383 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -3401,21 +3387,21 @@ conveyor-icon-large index: -1 conveyor-icon-small rotate: false - xy: 877, 775 + xy: 260, 8 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 copper-wall-icon-full rotate: false - xy: 1683, 1383 + xy: 1173, 1311 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 copper-wall-icon-medium rotate: false - xy: 1683, 1383 + xy: 1173, 1311 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -3429,7 +3415,7 @@ copper-wall-icon-large index: -1 copper-wall-icon-small rotate: false - xy: 846, 673 + xy: 811, 967 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -3450,14 +3436,14 @@ copper-wall-large-icon-large index: -1 copper-wall-large-icon-medium rotate: false - xy: 1717, 1417 + xy: 1207, 1315 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 copper-wall-large-icon-small rotate: false - xy: 1795, 1017 + xy: 2015, 1017 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -3478,14 +3464,14 @@ core-icon-large index: -1 core-icon-medium rotate: false - xy: 1683, 1349 + xy: 1241, 1315 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 core-icon-small rotate: false - xy: 877, 749 + xy: 811, 941 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -3506,14 +3492,14 @@ cryofluidmixer-icon-large index: -1 cryofluidmixer-icon-medium rotate: false - xy: 1717, 1383 + xy: 1275, 1315 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 cryofluidmixer-icon-small rotate: false - xy: 1821, 1017 + xy: 837, 941 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -3534,14 +3520,14 @@ cultivator-icon-large index: -1 cultivator-icon-medium rotate: false - xy: 1751, 1417 + xy: 1309, 1315 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 cultivator-icon-small rotate: false - xy: 1847, 1017 + xy: 863, 941 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -3562,14 +3548,14 @@ cyclone-icon-large index: -1 cyclone-icon-medium rotate: false - xy: 1717, 1349 + xy: 1343, 1315 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 cyclone-icon-small rotate: false - xy: 1873, 1017 + xy: 889, 941 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -3590,14 +3576,14 @@ dagger-factory-icon-large index: -1 dagger-factory-icon-medium rotate: false - xy: 1751, 1383 + xy: 1377, 1315 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 dagger-factory-icon-small rotate: false - xy: 1899, 1017 + xy: 915, 941 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -3618,14 +3604,14 @@ dart-ship-pad-icon-large index: -1 dart-ship-pad-icon-medium rotate: false - xy: 1785, 1417 + xy: 1411, 1315 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 dart-ship-pad-icon-small rotate: false - xy: 877, 723 + xy: 1075, 1205 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -3639,14 +3625,14 @@ deepwater-icon-large index: -1 deepwater-icon-small rotate: false - xy: 872, 697 + xy: 1149, 945 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 delta-mech-pad-icon-full rotate: false - xy: 858, 1843 + xy: 792, 1843 size: 64, 64 orig: 64, 64 offset: 0, 0 @@ -3660,28 +3646,28 @@ delta-mech-pad-icon-large index: -1 delta-mech-pad-icon-medium rotate: false - xy: 1819, 1417 + xy: 1479, 1315 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 delta-mech-pad-icon-small rotate: false - xy: 872, 671 + xy: 1175, 945 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 dirt-icon-full rotate: false - xy: 1853, 1383 + xy: 1615, 1315 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 dirt-icon-medium rotate: false - xy: 1853, 1383 + xy: 1615, 1315 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -3695,14 +3681,14 @@ dirt-icon-large index: -1 dirt-icon-small rotate: false - xy: 1075, 1231 + xy: 1201, 945 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 distributor-icon-full rotate: false - xy: 1056, 1843 + xy: 924, 1843 size: 64, 64 orig: 64, 64 offset: 0, 0 @@ -3716,28 +3702,28 @@ distributor-icon-large index: -1 distributor-icon-medium rotate: false - xy: 1887, 1417 + xy: 1649, 1315 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 distributor-icon-small rotate: false - xy: 1217, 983 + xy: 1227, 945 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 door-icon-full rotate: false - xy: 1887, 1383 + xy: 1717, 1315 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 door-icon-medium rotate: false - xy: 1887, 1383 + xy: 1717, 1315 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -3751,14 +3737,14 @@ door-icon-large index: -1 door-icon-small rotate: false - xy: 1243, 983 + xy: 1253, 949 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 door-large-icon-full rotate: false - xy: 1188, 1851 + xy: 1056, 1843 size: 64, 64 orig: 64, 64 offset: 0, 0 @@ -3772,28 +3758,28 @@ door-large-icon-large index: -1 door-large-icon-medium rotate: false - xy: 1921, 1417 + xy: 1751, 1315 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 door-large-icon-small rotate: false - xy: 1269, 983 + xy: 1279, 949 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 duo-icon-full rotate: false - xy: 1921, 1349 + xy: 1853, 1315 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 duo-icon-medium rotate: false - xy: 1921, 1349 + xy: 1853, 1315 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -3807,7 +3793,7 @@ duo-icon-large index: -1 duo-icon-small rotate: false - xy: 1295, 983 + xy: 1305, 949 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -3828,14 +3814,14 @@ force-projector-icon-large index: -1 force-projector-icon-medium rotate: false - xy: 777, 951 + xy: 1921, 1315 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 force-projector-icon-small rotate: false - xy: 1321, 983 + xy: 1331, 949 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -3856,14 +3842,14 @@ fortress-factory-icon-large index: -1 fortress-factory-icon-medium rotate: false - xy: 911, 967 + xy: 1955, 1315 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 fortress-factory-icon-small rotate: false - xy: 1347, 983 + xy: 1357, 949 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -3884,14 +3870,14 @@ fuse-icon-large index: -1 fuse-icon-medium rotate: false - xy: 977, 1065 + xy: 1989, 1315 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 fuse-icon-small rotate: false - xy: 1373, 983 + xy: 1383, 949 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -3912,14 +3898,14 @@ fusion-reactor-icon-large index: -1 fusion-reactor-icon-medium rotate: false - xy: 1011, 1065 + xy: 1165, 1277 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 fusion-reactor-icon-small rotate: false - xy: 1399, 983 + xy: 1409, 949 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -3940,14 +3926,14 @@ ghoul-factory-icon-large index: -1 ghoul-factory-icon-medium rotate: false - xy: 1029, 1031 + xy: 779, 223 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ghoul-factory-icon-small rotate: false - xy: 1425, 983 + xy: 1435, 949 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -3968,28 +3954,28 @@ glaive-ship-pad-icon-large index: -1 glaive-ship-pad-icon-medium rotate: false - xy: 945, 989 + xy: 779, 189 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 glaive-ship-pad-icon-small rotate: false - xy: 1451, 983 + xy: 1461, 949 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 grass-icon-full rotate: false - xy: 1013, 997 + xy: 779, 53 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 grass-icon-medium rotate: false - xy: 1013, 997 + xy: 779, 53 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -4003,21 +3989,21 @@ grass-icon-large index: -1 grass-icon-small rotate: false - xy: 1477, 983 + xy: 1487, 949 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 hail-icon-full rotate: false - xy: 1047, 997 + xy: 877, 967 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 hail-icon-medium rotate: false - xy: 1047, 997 + xy: 877, 967 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -4031,21 +4017,21 @@ hail-icon-large index: -1 hail-icon-small rotate: false - xy: 1503, 983 + xy: 1513, 949 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 ice-icon-full rotate: false - xy: 783, 799 + xy: 1011, 1099 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ice-icon-medium rotate: false - xy: 783, 799 + xy: 1011, 1099 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -4059,21 +4045,21 @@ ice-icon-large index: -1 ice-icon-small rotate: false - xy: 1529, 983 + xy: 1539, 949 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 icerock-icon-full rotate: false - xy: 783, 697 + xy: 305, 77 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 icerock-icon-medium rotate: false - xy: 783, 697 + xy: 305, 77 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -4087,21 +4073,21 @@ icerock-icon-large index: -1 icerock-icon-small rotate: false - xy: 1555, 983 + xy: 1565, 949 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 incinerator-icon-full rotate: false - xy: 783, 629 + xy: 373, 77 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 incinerator-icon-medium rotate: false - xy: 783, 629 + xy: 373, 77 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -4115,21 +4101,21 @@ incinerator-icon-large index: -1 incinerator-icon-small rotate: false - xy: 811, 967 + xy: 1591, 949 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 item-source-icon-full rotate: false - xy: 741, 592 + xy: 1437, 1281 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 item-source-icon-medium rotate: false - xy: 741, 592 + xy: 1437, 1281 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -4143,21 +4129,21 @@ item-source-icon-large index: -1 item-source-icon-small rotate: false - xy: 1075, 1205 + xy: 1643, 949 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 item-void-icon-full rotate: false - xy: 1207, 1315 + xy: 1641, 1281 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 item-void-icon-medium rotate: false - xy: 1207, 1315 + xy: 1641, 1281 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -4171,14 +4157,14 @@ item-void-icon-large index: -1 item-void-icon-small rotate: false - xy: 811, 941 + xy: 1669, 949 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 javelin-ship-pad-icon-full rotate: false - xy: 1584, 1851 + xy: 1452, 1851 size: 64, 64 orig: 64, 64 offset: 0, 0 @@ -4192,28 +4178,28 @@ javelin-ship-pad-icon-large index: -1 javelin-ship-pad-icon-medium rotate: false - xy: 1241, 1315 + xy: 1675, 1281 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 javelin-ship-pad-icon-small rotate: false - xy: 837, 941 + xy: 1695, 949 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 junction-icon-full rotate: false - xy: 1309, 1315 + xy: 1743, 1281 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 junction-icon-medium rotate: false - xy: 1309, 1315 + xy: 1743, 1281 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -4227,14 +4213,14 @@ junction-icon-large index: -1 junction-icon-small rotate: false - xy: 863, 941 + xy: 1721, 949 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 lancer-icon-full rotate: false - xy: 1782, 1851 + xy: 1650, 1851 size: 64, 64 orig: 64, 64 offset: 0, 0 @@ -4248,21 +4234,21 @@ lancer-icon-large index: -1 lancer-icon-medium rotate: false - xy: 1343, 1315 + xy: 1777, 1281 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 lancer-icon-small rotate: false - xy: 889, 941 + xy: 1747, 949 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 laser-drill-icon-full rotate: false - xy: 1914, 1851 + xy: 1782, 1851 size: 64, 64 orig: 64, 64 offset: 0, 0 @@ -4276,14 +4262,14 @@ laser-drill-icon-large index: -1 laser-drill-icon-medium rotate: false - xy: 1377, 1315 + xy: 1811, 1281 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 laser-drill-icon-small rotate: false - xy: 915, 941 + xy: 1773, 949 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -4304,28 +4290,28 @@ launch-pad-icon-large index: -1 launch-pad-icon-medium rotate: false - xy: 1411, 1315 + xy: 1845, 1281 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 launch-pad-icon-small rotate: false - xy: 907, 915 + xy: 1799, 949 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 liquid-junction-icon-full rotate: false - xy: 1683, 1315 + xy: 977, 1065 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 liquid-junction-icon-medium rotate: false - xy: 1683, 1315 + xy: 977, 1065 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -4339,21 +4325,21 @@ liquid-junction-icon-large index: -1 liquid-junction-icon-small rotate: false - xy: 907, 889 + xy: 1825, 949 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 liquid-router-icon-full rotate: false - xy: 1785, 1315 + xy: 927, 1023 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 liquid-router-icon-medium rotate: false - xy: 1785, 1315 + xy: 927, 1023 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -4367,21 +4353,21 @@ liquid-router-icon-large index: -1 liquid-router-icon-small rotate: false - xy: 907, 863 + xy: 1145, 919 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 liquid-source-icon-full rotate: false - xy: 1199, 1281 + xy: 945, 955 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 liquid-source-icon-medium rotate: false - xy: 1199, 1281 + xy: 945, 955 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -4395,7 +4381,7 @@ liquid-source-icon-large index: -1 liquid-source-icon-small rotate: false - xy: 907, 837 + xy: 1171, 919 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -4416,14 +4402,14 @@ liquid-tank-icon-large index: -1 liquid-tank-icon-medium rotate: false - xy: 1233, 1281 + xy: 979, 989 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 liquid-tank-icon-small rotate: false - xy: 846, 647 + xy: 1197, 919 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -4444,14 +4430,14 @@ mass-driver-icon-large index: -1 mass-driver-icon-medium rotate: false - xy: 1301, 1281 + xy: 1013, 997 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 mass-driver-icon-small rotate: false - xy: 872, 645 + xy: 1223, 919 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -4514,7 +4500,7 @@ mech-icon-trident-ship index: -1 mechanical-drill-icon-full rotate: false - xy: 719, 1777 + xy: 653, 1777 size: 64, 64 orig: 64, 64 offset: 0, 0 @@ -4528,28 +4514,28 @@ mechanical-drill-icon-large index: -1 mechanical-drill-icon-medium rotate: false - xy: 1335, 1281 + xy: 1013, 963 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 mechanical-drill-icon-small rotate: false - xy: 898, 655 + xy: 1643, 923 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 mechanical-pump-icon-full rotate: false - xy: 1403, 1281 + xy: 1047, 963 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 mechanical-pump-icon-medium rotate: false - xy: 1403, 1281 + xy: 1047, 963 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -4563,7 +4549,7 @@ mechanical-pump-icon-large index: -1 mechanical-pump-icon-small rotate: false - xy: 843, 621 + xy: 1669, 923 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -4584,28 +4570,28 @@ meltdown-icon-large index: -1 meltdown-icon-medium rotate: false - xy: 1437, 1281 + xy: 1225, 1243 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 meltdown-icon-small rotate: false - xy: 843, 595 + xy: 1695, 923 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 melter-icon-full rotate: false - xy: 1505, 1281 + xy: 1259, 1247 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 melter-icon-medium rotate: false - xy: 1505, 1281 + xy: 1259, 1247 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -4619,14 +4605,14 @@ melter-icon-large index: -1 melter-icon-small rotate: false - xy: 869, 619 + xy: 1721, 923 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 mend-projector-icon-full rotate: false - xy: 653, 1579 + xy: 719, 1711 size: 64, 64 orig: 64, 64 offset: 0, 0 @@ -4640,28 +4626,28 @@ mend-projector-icon-large index: -1 mend-projector-icon-medium rotate: false - xy: 1539, 1281 + xy: 1259, 1213 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 mend-projector-icon-small rotate: false - xy: 869, 593 + xy: 1747, 923 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 metalfloor-icon-full rotate: false - xy: 1777, 1281 + xy: 1395, 1247 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 metalfloor-icon-medium rotate: false - xy: 1777, 1281 + xy: 1395, 1247 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -4675,7 +4661,7 @@ metalfloor-icon-large index: -1 metalfloor-icon-small rotate: false - xy: 1925, 1009 + xy: 1773, 923 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -4696,14 +4682,14 @@ oil-extractor-icon-large index: -1 oil-extractor-icon-medium rotate: false - xy: 1811, 1281 + xy: 1395, 1213 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 oil-extractor-icon-small rotate: false - xy: 1951, 1009 + xy: 1799, 923 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -4724,14 +4710,14 @@ omega-mech-pad-icon-large index: -1 omega-mech-pad-icon-medium rotate: false - xy: 1879, 1281 + xy: 1429, 1213 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 omega-mech-pad-icon-small rotate: false - xy: 1977, 1009 + xy: 1825, 923 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -4745,42 +4731,42 @@ ore-coal-blackstone-icon-large index: -1 ore-coal-blackstone-icon-small rotate: false - xy: 2003, 1009 + xy: 1851, 949 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 ore-coal-blackstone1 rotate: false - xy: 1913, 1281 + xy: 1463, 1247 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-coal-blackstone2 rotate: false - xy: 1955, 1307 + xy: 1463, 1213 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-coal-blackstone3 rotate: false - xy: 1989, 1307 + xy: 1497, 1247 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-coal-blackstone-icon-full rotate: false - xy: 1989, 1307 + xy: 1497, 1247 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-coal-blackstone-icon-medium rotate: false - xy: 1989, 1307 + xy: 1497, 1247 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -4794,42 +4780,42 @@ ore-coal-grass-icon-large index: -1 ore-coal-grass-icon-small rotate: false - xy: 855, 567 + xy: 1851, 923 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 ore-coal-grass1 rotate: false - xy: 1947, 1273 + xy: 1497, 1213 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-coal-grass2 rotate: false - xy: 1981, 1273 + xy: 1531, 1247 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-coal-grass3 rotate: false - xy: 2015, 1273 + xy: 1531, 1213 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-coal-grass-icon-full rotate: false - xy: 2015, 1273 + xy: 1531, 1213 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-coal-grass-icon-medium rotate: false - xy: 2015, 1273 + xy: 1531, 1213 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -4843,42 +4829,42 @@ ore-coal-ice-icon-large index: -1 ore-coal-ice-icon-small rotate: false - xy: 855, 541 + xy: 1877, 951 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 ore-coal-ice1 rotate: false - xy: 1225, 1247 + xy: 1565, 1247 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-coal-ice2 rotate: false - xy: 1259, 1247 + xy: 1565, 1213 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-coal-ice3 rotate: false - xy: 1293, 1247 + xy: 1599, 1247 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-coal-ice-icon-full rotate: false - xy: 1293, 1247 + xy: 1599, 1247 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-coal-ice-icon-medium rotate: false - xy: 1293, 1247 + xy: 1599, 1247 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -4892,42 +4878,42 @@ ore-coal-sand-icon-large index: -1 ore-coal-sand-icon-small rotate: false - xy: 855, 515 + xy: 1877, 925 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 ore-coal-sand1 rotate: false - xy: 1327, 1247 + xy: 1599, 1213 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-coal-sand2 rotate: false - xy: 1361, 1247 + xy: 1633, 1247 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-coal-sand3 rotate: false - xy: 1395, 1247 + xy: 1633, 1213 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-coal-sand-icon-full rotate: false - xy: 1395, 1247 + xy: 1633, 1213 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-coal-sand-icon-medium rotate: false - xy: 1395, 1247 + xy: 1633, 1213 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -4941,42 +4927,42 @@ ore-coal-snow-icon-large index: -1 ore-coal-snow-icon-small rotate: false - xy: 855, 489 + xy: 1903, 951 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 ore-coal-snow1 rotate: false - xy: 1429, 1247 + xy: 1667, 1247 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-coal-snow2 rotate: false - xy: 1463, 1247 + xy: 1667, 1213 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-coal-snow3 rotate: false - xy: 1497, 1247 + xy: 1701, 1247 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-coal-snow-icon-full rotate: false - xy: 1497, 1247 + xy: 1701, 1247 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-coal-snow-icon-medium rotate: false - xy: 1497, 1247 + xy: 1701, 1247 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -4990,42 +4976,42 @@ ore-coal-stone-icon-large index: -1 ore-coal-stone-icon-small rotate: false - xy: 855, 463 + xy: 1903, 925 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 ore-coal-stone1 rotate: false - xy: 1531, 1247 + xy: 1701, 1213 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-coal-stone2 rotate: false - xy: 1565, 1247 + xy: 1735, 1247 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-coal-stone3 rotate: false - xy: 1599, 1247 + xy: 1735, 1213 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-coal-stone-icon-full rotate: false - xy: 1599, 1247 + xy: 1735, 1213 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-coal-stone-icon-medium rotate: false - xy: 1599, 1247 + xy: 1735, 1213 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -5039,42 +5025,42 @@ ore-copper-blackstone-icon-large index: -1 ore-copper-blackstone-icon-small rotate: false - xy: 855, 437 + xy: 1915, 977 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 ore-copper-blackstone1 rotate: false - xy: 1633, 1247 + xy: 1769, 1247 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-copper-blackstone2 rotate: false - xy: 1667, 1247 + xy: 1769, 1213 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-copper-blackstone3 rotate: false - xy: 1701, 1247 + xy: 1803, 1247 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-copper-blackstone-icon-full rotate: false - xy: 1701, 1247 + xy: 1803, 1247 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-copper-blackstone-icon-medium rotate: false - xy: 1701, 1247 + xy: 1803, 1247 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -5088,42 +5074,42 @@ ore-copper-grass-icon-large index: -1 ore-copper-grass-icon-small rotate: false - xy: 855, 411 + xy: 1941, 983 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 ore-copper-grass1 rotate: false - xy: 1735, 1247 + xy: 1803, 1213 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-copper-grass2 rotate: false - xy: 1769, 1247 + xy: 1837, 1247 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-copper-grass3 rotate: false - xy: 1803, 1247 + xy: 1837, 1213 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-copper-grass-icon-full rotate: false - xy: 1803, 1247 + xy: 1837, 1213 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-copper-grass-icon-medium rotate: false - xy: 1803, 1247 + xy: 1837, 1213 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -5137,21 +5123,21 @@ ore-copper-ice-icon-large index: -1 ore-copper-ice-icon-small rotate: false - xy: 855, 385 + xy: 1967, 983 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 ore-copper-ice1 rotate: false - xy: 1837, 1247 + xy: 1871, 1247 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-copper-ice2 rotate: false - xy: 1871, 1247 + xy: 1871, 1213 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -5186,42 +5172,42 @@ ore-copper-sand-icon-large index: -1 ore-copper-sand-icon-small rotate: false - xy: 855, 359 + xy: 1993, 983 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 ore-copper-sand1 rotate: false - xy: 1225, 1213 + xy: 1905, 1213 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-copper-sand2 rotate: false - xy: 1259, 1213 + xy: 1939, 1247 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-copper-sand3 rotate: false - xy: 1293, 1213 + xy: 1939, 1213 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-copper-sand-icon-full rotate: false - xy: 1293, 1213 + xy: 1939, 1213 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-copper-sand-icon-medium rotate: false - xy: 1293, 1213 + xy: 1939, 1213 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -5235,42 +5221,42 @@ ore-copper-snow-icon-large index: -1 ore-copper-snow-icon-small rotate: false - xy: 855, 333 + xy: 2019, 991 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 ore-copper-snow1 rotate: false - xy: 1327, 1213 + xy: 1973, 1247 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-copper-snow2 rotate: false - xy: 1361, 1213 + xy: 1973, 1213 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-copper-snow3 rotate: false - xy: 1395, 1213 + xy: 2007, 1247 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-copper-snow-icon-full rotate: false - xy: 1395, 1213 + xy: 2007, 1247 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-copper-snow-icon-medium rotate: false - xy: 1395, 1213 + xy: 2007, 1247 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -5284,42 +5270,42 @@ ore-copper-stone-icon-large index: -1 ore-copper-stone-icon-small rotate: false - xy: 881, 567 + xy: 1929, 951 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 ore-copper-stone1 rotate: false - xy: 1429, 1213 + xy: 2007, 1213 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-copper-stone2 rotate: false - xy: 1463, 1213 + xy: 1013, 929 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-copper-stone3 rotate: false - xy: 1497, 1213 + xy: 1047, 929 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-copper-stone-icon-full rotate: false - xy: 1497, 1213 + xy: 1047, 929 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-copper-stone-icon-medium rotate: false - xy: 1497, 1213 + xy: 1047, 929 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -5333,42 +5319,42 @@ ore-lead-blackstone-icon-large index: -1 ore-lead-blackstone-icon-small rotate: false - xy: 881, 541 + xy: 1929, 925 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 ore-lead-blackstone1 rotate: false - xy: 1531, 1213 + xy: 1045, 1099 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-lead-blackstone2 rotate: false - xy: 1565, 1213 + xy: 1045, 1065 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-lead-blackstone3 rotate: false - xy: 1599, 1213 + xy: 1063, 1031 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-lead-blackstone-icon-full rotate: false - xy: 1599, 1213 + xy: 1063, 1031 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-lead-blackstone-icon-medium rotate: false - xy: 1599, 1213 + xy: 1063, 1031 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -5382,42 +5368,42 @@ ore-lead-grass-icon-large index: -1 ore-lead-grass-icon-small rotate: false - xy: 881, 515 + xy: 1955, 957 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 ore-lead-grass1 rotate: false - xy: 1633, 1213 + xy: 1081, 997 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-lead-grass2 rotate: false - xy: 1667, 1213 + xy: 1081, 963 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-lead-grass3 rotate: false - xy: 1701, 1213 + xy: 1081, 929 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-lead-grass-icon-full rotate: false - xy: 1701, 1213 + xy: 1081, 929 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-lead-grass-icon-medium rotate: false - xy: 1701, 1213 + xy: 1081, 929 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -5431,42 +5417,42 @@ ore-lead-ice-icon-large index: -1 ore-lead-ice-icon-small rotate: false - xy: 881, 489 + xy: 1955, 931 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 ore-lead-ice1 rotate: false - xy: 1735, 1213 + xy: 1259, 1179 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-lead-ice2 rotate: false - xy: 1769, 1213 + xy: 1293, 1179 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-lead-ice3 rotate: false - xy: 1803, 1213 + xy: 1327, 1179 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-lead-ice-icon-full rotate: false - xy: 1803, 1213 + xy: 1327, 1179 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-lead-ice-icon-medium rotate: false - xy: 1803, 1213 + xy: 1327, 1179 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -5480,42 +5466,42 @@ ore-lead-sand-icon-large index: -1 ore-lead-sand-icon-small rotate: false - xy: 881, 463 + xy: 1981, 957 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 ore-lead-sand1 rotate: false - xy: 1837, 1213 + xy: 1361, 1179 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-lead-sand2 rotate: false - xy: 1871, 1213 + xy: 1395, 1179 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-lead-sand3 rotate: false - xy: 1905, 1213 + xy: 1429, 1179 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-lead-sand-icon-full rotate: false - xy: 1905, 1213 + xy: 1429, 1179 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-lead-sand-icon-medium rotate: false - xy: 1905, 1213 + xy: 1429, 1179 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -5529,42 +5515,42 @@ ore-lead-snow-icon-large index: -1 ore-lead-snow-icon-small rotate: false - xy: 881, 437 + xy: 1981, 931 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 ore-lead-snow1 rotate: false - xy: 1939, 1239 + xy: 1463, 1179 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-lead-snow2 rotate: false - xy: 1973, 1239 + xy: 1497, 1179 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-lead-snow3 rotate: false - xy: 2007, 1239 + xy: 1531, 1179 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-lead-snow-icon-full rotate: false - xy: 2007, 1239 + xy: 1531, 1179 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-lead-snow-icon-medium rotate: false - xy: 2007, 1239 + xy: 1531, 1179 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -5578,42 +5564,42 @@ ore-lead-stone-icon-large index: -1 ore-lead-stone-icon-small rotate: false - xy: 881, 411 + xy: 2007, 957 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 ore-lead-stone1 rotate: false - xy: 1939, 1205 + xy: 1565, 1179 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-lead-stone2 rotate: false - xy: 1973, 1205 + xy: 1599, 1179 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-lead-stone3 rotate: false - xy: 2007, 1205 + xy: 1633, 1179 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-lead-stone-icon-full rotate: false - xy: 2007, 1205 + xy: 1633, 1179 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-lead-stone-icon-medium rotate: false - xy: 2007, 1205 + xy: 1633, 1179 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -5627,42 +5613,42 @@ ore-scrap-blackstone-icon-large index: -1 ore-scrap-blackstone-icon-small rotate: false - xy: 881, 385 + xy: 2007, 931 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 ore-scrap-blackstone1 rotate: false - xy: 294, 42 + xy: 1667, 1179 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-scrap-blackstone2 rotate: false - xy: 294, 8 + xy: 1701, 1179 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-scrap-blackstone3 rotate: false - xy: 328, 43 + xy: 1735, 1179 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-scrap-blackstone-icon-full rotate: false - xy: 328, 43 + xy: 1735, 1179 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-scrap-blackstone-icon-medium rotate: false - xy: 328, 43 + xy: 1735, 1179 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -5676,42 +5662,42 @@ ore-scrap-grass-icon-large index: -1 ore-scrap-grass-icon-small rotate: false - xy: 881, 359 + xy: 941, 929 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 ore-scrap-grass1 rotate: false - xy: 328, 9 + xy: 1769, 1179 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-scrap-grass2 rotate: false - xy: 362, 43 + xy: 1803, 1179 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-scrap-grass3 rotate: false - xy: 362, 9 + xy: 1837, 1179 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-scrap-grass-icon-full rotate: false - xy: 362, 9 + xy: 1837, 1179 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-scrap-grass-icon-medium rotate: false - xy: 362, 9 + xy: 1837, 1179 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -5725,42 +5711,42 @@ ore-scrap-ice-icon-large index: -1 ore-scrap-ice-icon-small rotate: false - xy: 881, 333 + xy: 967, 929 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 ore-scrap-ice1 rotate: false - xy: 396, 43 + xy: 1871, 1179 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-scrap-ice2 rotate: false - xy: 396, 9 + xy: 1905, 1179 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-scrap-ice3 rotate: false - xy: 430, 43 + xy: 1939, 1179 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-scrap-ice-icon-full rotate: false - xy: 430, 43 + xy: 1939, 1179 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-scrap-ice-icon-medium rotate: false - xy: 430, 43 + xy: 1939, 1179 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -5774,42 +5760,42 @@ ore-scrap-sand-icon-large index: -1 ore-scrap-sand-icon-small rotate: false - xy: 881, 307 + xy: 1051, 1136 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 ore-scrap-sand1 rotate: false - xy: 430, 9 + xy: 1973, 1179 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-scrap-sand2 rotate: false - xy: 464, 43 + xy: 2007, 1179 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-scrap-sand3 rotate: false - xy: 464, 9 + xy: 783, 809 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-scrap-sand-icon-full rotate: false - xy: 464, 9 + xy: 783, 809 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-scrap-sand-icon-medium rotate: false - xy: 464, 9 + xy: 783, 809 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -5823,42 +5809,42 @@ ore-scrap-snow-icon-large index: -1 ore-scrap-snow-icon-small rotate: false - xy: 881, 281 + xy: 1955, 905 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 ore-scrap-snow1 rotate: false - xy: 498, 43 + xy: 783, 775 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-scrap-snow2 rotate: false - xy: 498, 9 + xy: 783, 741 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-scrap-snow3 rotate: false - xy: 532, 43 + xy: 783, 707 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-scrap-snow-icon-full rotate: false - xy: 532, 43 + xy: 783, 707 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-scrap-snow-icon-medium rotate: false - xy: 532, 43 + xy: 783, 707 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -5872,42 +5858,42 @@ ore-scrap-stone-icon-large index: -1 ore-scrap-stone-icon-small rotate: false - xy: 881, 255 + xy: 1981, 905 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 ore-scrap-stone1 rotate: false - xy: 532, 9 + xy: 783, 673 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-scrap-stone2 rotate: false - xy: 566, 43 + xy: 783, 639 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-scrap-stone3 rotate: false - xy: 566, 9 + xy: 783, 605 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-scrap-stone-icon-full rotate: false - xy: 566, 9 + xy: 783, 605 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-scrap-stone-icon-medium rotate: false - xy: 566, 9 + xy: 783, 605 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -5921,42 +5907,42 @@ ore-thorium-blackstone-icon-large index: -1 ore-thorium-blackstone-icon-small rotate: false - xy: 881, 229 + xy: 2007, 905 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 ore-thorium-blackstone1 rotate: false - xy: 600, 41 + xy: 753, 571 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-thorium-blackstone2 rotate: false - xy: 634, 41 + xy: 753, 537 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-thorium-blackstone3 rotate: false - xy: 668, 41 + xy: 787, 571 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-thorium-blackstone-icon-full rotate: false - xy: 668, 41 + xy: 787, 571 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-thorium-blackstone-icon-medium rotate: false - xy: 668, 41 + xy: 787, 571 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -5970,42 +5956,42 @@ ore-thorium-grass-icon-large index: -1 ore-thorium-grass-icon-small rotate: false - xy: 881, 203 + xy: 847, 532 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 ore-thorium-grass1 rotate: false - xy: 702, 41 + xy: 787, 537 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-thorium-grass2 rotate: false - xy: 736, 41 + xy: 787, 503 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-thorium-grass3 rotate: false - xy: 600, 7 + xy: 787, 469 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-thorium-grass-icon-full rotate: false - xy: 600, 7 + xy: 787, 469 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-thorium-grass-icon-medium rotate: false - xy: 600, 7 + xy: 787, 469 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -6019,42 +6005,42 @@ ore-thorium-ice-icon-large index: -1 ore-thorium-ice-icon-small rotate: false - xy: 881, 177 + xy: 847, 506 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 ore-thorium-ice1 rotate: false - xy: 634, 7 + xy: 787, 435 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-thorium-ice2 rotate: false - xy: 668, 7 + xy: 787, 401 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-thorium-ice3 rotate: false - xy: 702, 7 + xy: 787, 367 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-thorium-ice-icon-full rotate: false - xy: 702, 7 + xy: 787, 367 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-thorium-ice-icon-medium rotate: false - xy: 702, 7 + xy: 787, 367 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -6068,42 +6054,42 @@ ore-thorium-sand-icon-large index: -1 ore-thorium-sand-icon-small rotate: false - xy: 881, 151 + xy: 847, 480 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 ore-thorium-sand1 rotate: false - xy: 736, 7 + xy: 787, 333 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-thorium-sand2 rotate: false - xy: 770, 19 + xy: 294, 42 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-thorium-sand3 rotate: false - xy: 804, 19 + xy: 328, 43 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-thorium-sand-icon-full rotate: false - xy: 804, 19 + xy: 328, 43 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-thorium-sand-icon-medium rotate: false - xy: 804, 19 + xy: 328, 43 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -6117,42 +6103,42 @@ ore-thorium-snow-icon-large index: -1 ore-thorium-snow-icon-small rotate: false - xy: 881, 125 + xy: 847, 454 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 ore-thorium-snow1 rotate: false - xy: 821, 527 + xy: 362, 43 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-thorium-snow2 rotate: false - xy: 787, 524 + xy: 396, 43 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-thorium-snow3 rotate: false - xy: 787, 490 + xy: 430, 43 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-thorium-snow-icon-full rotate: false - xy: 787, 490 + xy: 430, 43 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-thorium-snow-icon-medium rotate: false - xy: 787, 490 + xy: 430, 43 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -6166,42 +6152,42 @@ ore-thorium-stone-icon-large index: -1 ore-thorium-stone-icon-small rotate: false - xy: 881, 99 + xy: 847, 428 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 ore-thorium-stone1 rotate: false - xy: 821, 493 + xy: 464, 43 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-thorium-stone2 rotate: false - xy: 787, 456 + xy: 498, 43 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-thorium-stone3 rotate: false - xy: 821, 459 + xy: 532, 43 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-thorium-stone-icon-full rotate: false - xy: 821, 459 + xy: 532, 43 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-thorium-stone-icon-medium rotate: false - xy: 821, 459 + xy: 532, 43 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -6215,42 +6201,42 @@ ore-titanium-blackstone-icon-large index: -1 ore-titanium-blackstone-icon-small rotate: false - xy: 1581, 977 + xy: 847, 402 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 ore-titanium-blackstone1 rotate: false - xy: 787, 422 + xy: 566, 43 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-titanium-blackstone2 rotate: false - xy: 821, 425 + xy: 294, 8 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-titanium-blackstone3 rotate: false - xy: 787, 388 + xy: 328, 9 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-titanium-blackstone-icon-full rotate: false - xy: 787, 388 + xy: 328, 9 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-titanium-blackstone-icon-medium rotate: false - xy: 787, 388 + xy: 328, 9 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -6264,42 +6250,42 @@ ore-titanium-grass-icon-large index: -1 ore-titanium-grass-icon-small rotate: false - xy: 1607, 977 + xy: 847, 376 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 ore-titanium-grass1 rotate: false - xy: 821, 391 + xy: 362, 9 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-titanium-grass2 rotate: false - xy: 787, 354 + xy: 396, 9 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-titanium-grass3 rotate: false - xy: 821, 357 + xy: 430, 9 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-titanium-grass-icon-full rotate: false - xy: 821, 357 + xy: 430, 9 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-titanium-grass-icon-medium rotate: false - xy: 821, 357 + xy: 430, 9 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -6313,42 +6299,42 @@ ore-titanium-ice-icon-large index: -1 ore-titanium-ice-icon-small rotate: false - xy: 1633, 977 + xy: 847, 350 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 ore-titanium-ice1 rotate: false - xy: 821, 323 + xy: 464, 9 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-titanium-ice2 rotate: false - xy: 813, 289 + xy: 498, 9 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-titanium-ice3 rotate: false - xy: 813, 255 + xy: 532, 9 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-titanium-ice-icon-full rotate: false - xy: 813, 255 + xy: 532, 9 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-titanium-ice-icon-medium rotate: false - xy: 813, 255 + xy: 532, 9 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -6362,42 +6348,42 @@ ore-titanium-sand-icon-large index: -1 ore-titanium-sand-icon-small rotate: false - xy: 1659, 983 + xy: 843, 324 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 ore-titanium-sand1 rotate: false - xy: 813, 221 + xy: 566, 9 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-titanium-sand2 rotate: false - xy: 813, 187 + xy: 600, 41 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-titanium-sand3 rotate: false - xy: 813, 153 + xy: 634, 41 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-titanium-sand-icon-full rotate: false - xy: 813, 153 + xy: 634, 41 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-titanium-sand-icon-medium rotate: false - xy: 813, 153 + xy: 634, 41 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -6411,42 +6397,42 @@ ore-titanium-snow-icon-large index: -1 ore-titanium-snow-icon-small rotate: false - xy: 1685, 983 + xy: 843, 298 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 ore-titanium-snow1 rotate: false - xy: 813, 119 + xy: 668, 41 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-titanium-snow2 rotate: false - xy: 813, 85 + xy: 702, 41 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-titanium-snow3 rotate: false - xy: 847, 289 + xy: 736, 41 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-titanium-snow-icon-full rotate: false - xy: 847, 289 + xy: 736, 41 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-titanium-snow-icon-medium rotate: false - xy: 847, 289 + xy: 736, 41 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -6460,49 +6446,49 @@ ore-titanium-stone-icon-large index: -1 ore-titanium-stone-icon-small rotate: false - xy: 1711, 983 + xy: 843, 272 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 ore-titanium-stone1 rotate: false - xy: 847, 255 + xy: 600, 7 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-titanium-stone2 rotate: false - xy: 847, 221 + xy: 634, 7 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-titanium-stone3 rotate: false - xy: 847, 187 + xy: 668, 7 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-titanium-stone-icon-full rotate: false - xy: 847, 187 + xy: 668, 7 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-titanium-stone-icon-medium rotate: false - xy: 847, 187 + xy: 668, 7 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 overdrive-projector-icon-full rotate: false - xy: 851, 1777 + xy: 719, 1645 size: 64, 64 orig: 64, 64 offset: 0, 0 @@ -6516,28 +6502,28 @@ overdrive-projector-icon-large index: -1 overdrive-projector-icon-medium rotate: false - xy: 847, 153 + xy: 702, 7 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 overdrive-projector-icon-small rotate: false - xy: 941, 929 + xy: 843, 246 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 overflow-gate-icon-full rotate: false - xy: 847, 85 + xy: 770, 19 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 overflow-gate-icon-medium rotate: false - xy: 847, 85 + xy: 770, 19 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -6551,14 +6537,14 @@ overflow-gate-icon-large index: -1 overflow-gate-icon-small rotate: false - xy: 967, 929 + xy: 843, 220 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 phantom-factory-icon-full rotate: false - xy: 719, 1579 + xy: 851, 1777 size: 64, 64 orig: 64, 64 offset: 0, 0 @@ -6572,28 +6558,28 @@ phantom-factory-icon-large index: -1 phantom-factory-icon-medium rotate: false - xy: 838, 51 + xy: 804, 19 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 phantom-factory-icon-small rotate: false - xy: 933, 903 + xy: 843, 194 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 phase-conduit-icon-full rotate: false - xy: 1149, 1195 + xy: 1217, 1175 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 phase-conduit-icon-medium rotate: false - xy: 1149, 1195 + xy: 1217, 1175 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -6607,21 +6593,21 @@ phase-conduit-icon-large index: -1 phase-conduit-icon-small rotate: false - xy: 933, 877 + xy: 843, 168 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 phase-conveyor-icon-full rotate: false - xy: 1319, 1179 + xy: 1251, 1145 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 phase-conveyor-icon-medium rotate: false - xy: 1319, 1179 + xy: 1251, 1145 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -6635,21 +6621,21 @@ phase-conveyor-icon-large index: -1 phase-conveyor-icon-small rotate: false - xy: 959, 903 + xy: 843, 142 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 phase-wall-icon-full rotate: false - xy: 1387, 1179 + xy: 1319, 1145 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 phase-wall-icon-medium rotate: false - xy: 1387, 1179 + xy: 1319, 1145 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -6663,14 +6649,14 @@ phase-wall-icon-large index: -1 phase-wall-icon-small rotate: false - xy: 933, 851 + xy: 843, 116 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 phase-wall-large-icon-full rotate: false - xy: 653, 1447 + xy: 851, 1711 size: 64, 64 orig: 64, 64 offset: 0, 0 @@ -6684,21 +6670,21 @@ phase-wall-large-icon-large index: -1 phase-wall-large-icon-medium rotate: false - xy: 1421, 1179 + xy: 1353, 1145 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 phase-wall-large-icon-small rotate: false - xy: 959, 877 + xy: 842, 90 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 phase-weaver-icon-full rotate: false - xy: 851, 1645 + xy: 719, 1513 size: 64, 64 orig: 64, 64 offset: 0, 0 @@ -6712,14 +6698,14 @@ phase-weaver-icon-large index: -1 phase-weaver-icon-medium rotate: false - xy: 1455, 1179 + xy: 1387, 1145 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 phase-weaver-icon-small rotate: false - xy: 959, 851 + xy: 842, 64 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -6740,21 +6726,21 @@ plasma-drill-icon-large index: -1 plasma-drill-icon-medium rotate: false - xy: 1489, 1179 + xy: 1421, 1145 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 plasma-drill-icon-small rotate: false - xy: 933, 825 + xy: 838, 38 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 plastanium-compressor-icon-full rotate: false - xy: 653, 1381 + xy: 917, 1711 size: 64, 64 orig: 64, 64 offset: 0, 0 @@ -6768,21 +6754,21 @@ plastanium-compressor-icon-large index: -1 plastanium-compressor-icon-medium rotate: false - xy: 1523, 1179 + xy: 1455, 1145 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 plastanium-compressor-icon-small rotate: false - xy: 959, 825 + xy: 838, 12 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 pneumatic-drill-icon-full rotate: false - xy: 851, 1579 + xy: 719, 1447 size: 64, 64 orig: 64, 64 offset: 0, 0 @@ -6796,28 +6782,28 @@ pneumatic-drill-icon-large index: -1 pneumatic-drill-icon-medium rotate: false - xy: 1557, 1179 + xy: 1489, 1145 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 pneumatic-drill-icon-small rotate: false - xy: 907, 811 + xy: 1253, 923 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 power-node-icon-full rotate: false - xy: 1625, 1179 + xy: 1557, 1145 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 power-node-icon-medium rotate: false - xy: 1625, 1179 + xy: 1557, 1145 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -6831,14 +6817,14 @@ power-node-icon-large index: -1 power-node-icon-small rotate: false - xy: 903, 785 + xy: 1279, 923 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 power-node-large-icon-full rotate: false - xy: 653, 1315 + xy: 983, 1711 size: 64, 64 orig: 64, 64 offset: 0, 0 @@ -6852,28 +6838,28 @@ power-node-large-icon-large index: -1 power-node-large-icon-medium rotate: false - xy: 1659, 1179 + xy: 1591, 1145 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 power-node-large-icon-small rotate: false - xy: 903, 759 + xy: 1305, 923 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 power-source-icon-full rotate: false - xy: 1727, 1179 + xy: 1659, 1145 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 power-source-icon-medium rotate: false - xy: 1727, 1179 + xy: 1659, 1145 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -6887,21 +6873,21 @@ power-source-icon-large index: -1 power-source-icon-small rotate: false - xy: 903, 733 + xy: 1331, 923 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 power-void-icon-full rotate: false - xy: 1795, 1179 + xy: 1727, 1145 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 power-void-icon-medium rotate: false - xy: 1795, 1179 + xy: 1727, 1145 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -6915,21 +6901,21 @@ power-void-icon-large index: -1 power-void-icon-small rotate: false - xy: 933, 799 + xy: 1357, 923 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 pulse-conduit-icon-full rotate: false - xy: 1897, 1179 + xy: 1829, 1145 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 pulse-conduit-icon-medium rotate: false - xy: 1897, 1179 + xy: 1829, 1145 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -6943,21 +6929,21 @@ pulse-conduit-icon-large index: -1 pulse-conduit-icon-small rotate: false - xy: 959, 799 + xy: 1383, 923 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 pulverizer-icon-full rotate: false - xy: 1285, 1145 + xy: 1217, 1107 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 pulverizer-icon-medium rotate: false - xy: 1285, 1145 + xy: 1217, 1107 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -6971,14 +6957,14 @@ pulverizer-icon-large index: -1 pulverizer-icon-small rotate: false - xy: 929, 773 + xy: 1409, 923 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 pyratite-mixer-icon-full rotate: false - xy: 785, 1447 + xy: 653, 1315 size: 64, 64 orig: 64, 64 offset: 0, 0 @@ -6992,21 +6978,21 @@ pyratite-mixer-icon-large index: -1 pyratite-mixer-icon-medium rotate: false - xy: 1353, 1145 + xy: 1285, 1111 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 pyratite-mixer-icon-small rotate: false - xy: 929, 747 + xy: 1435, 923 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 reconstructor-icon-full rotate: false - xy: 851, 1513 + xy: 719, 1381 size: 64, 64 orig: 64, 64 offset: 0, 0 @@ -7020,28 +7006,28 @@ reconstructor-icon-large index: -1 reconstructor-icon-medium rotate: false - xy: 1387, 1145 + xy: 1319, 1111 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 reconstructor-icon-small rotate: false - xy: 955, 773 + xy: 1461, 923 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 repair-point-icon-full rotate: false - xy: 1455, 1145 + xy: 1387, 1111 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 repair-point-icon-medium rotate: false - xy: 1455, 1145 + xy: 1387, 1111 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -7055,7 +7041,7 @@ repair-point-icon-large index: -1 repair-point-icon-small rotate: false - xy: 955, 747 + xy: 1487, 923 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -7076,14 +7062,14 @@ revenant-factory-icon-large index: -1 revenant-factory-icon-medium rotate: false - xy: 1523, 1145 + xy: 1455, 1111 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 revenant-factory-icon-small rotate: false - xy: 929, 721 + xy: 1513, 923 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -7104,28 +7090,28 @@ ripple-icon-large index: -1 ripple-icon-medium rotate: false - xy: 1557, 1145 + xy: 1489, 1111 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ripple-icon-small rotate: false - xy: 955, 721 + xy: 1539, 923 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 rock-icon-full rotate: false - xy: 1659, 1145 + xy: 1591, 1111 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 rock-icon-medium rotate: false - xy: 1659, 1145 + xy: 1591, 1111 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -7139,21 +7125,21 @@ rock-icon-large index: -1 rock-icon-small rotate: false - xy: 924, 695 + xy: 1565, 923 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 rocks-icon-full rotate: false - xy: 1761, 1145 + xy: 1693, 1111 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 rocks-icon-medium rotate: false - xy: 1761, 1145 + xy: 1693, 1111 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -7167,14 +7153,14 @@ rocks-icon-large index: -1 rocks-icon-small rotate: false - xy: 924, 669 + xy: 1591, 923 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 rotary-pump-icon-full rotate: false - xy: 1049, 1711 + xy: 917, 1579 size: 64, 64 orig: 64, 64 offset: 0, 0 @@ -7188,28 +7174,28 @@ rotary-pump-icon-large index: -1 rotary-pump-icon-medium rotate: false - xy: 1795, 1145 + xy: 1727, 1111 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 rotary-pump-icon-small rotate: false - xy: 950, 695 + xy: 1617, 907 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 router-icon-full rotate: false - xy: 1863, 1145 + xy: 1795, 1111 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 router-icon-medium rotate: false - xy: 1863, 1145 + xy: 1795, 1111 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -7223,14 +7209,14 @@ router-icon-large index: -1 router-icon-small rotate: false - xy: 950, 669 + xy: 1643, 897 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 rtg-generator-icon-full rotate: false - xy: 653, 1249 + xy: 1049, 1711 size: 64, 64 orig: 64, 64 offset: 0, 0 @@ -7244,21 +7230,21 @@ rtg-generator-icon-large index: -1 rtg-generator-icon-medium rotate: false - xy: 1897, 1145 + xy: 1829, 1111 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 rtg-generator-icon-small rotate: false - xy: 924, 643 + xy: 1669, 897 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 salvo-icon-full rotate: false - xy: 1115, 1711 + xy: 983, 1579 size: 64, 64 orig: 64, 64 offset: 0, 0 @@ -7272,28 +7258,28 @@ salvo-icon-large index: -1 salvo-icon-medium rotate: false - xy: 1965, 1137 + xy: 1897, 1111 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 salvo-icon-small rotate: false - xy: 950, 643 + xy: 1695, 897 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 sand-icon-full rotate: false - xy: 1183, 1127 + xy: 1115, 1095 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 sand-icon-medium rotate: false - xy: 1183, 1127 + xy: 1115, 1095 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -7307,175 +7293,147 @@ sand-icon-large index: -1 sand-icon-small rotate: false - xy: 898, 629 - size: 24, 24 - orig: 24, 24 - offset: 0, 0 - index: -1 -scorch-icon-full - rotate: false - xy: 1285, 1111 - size: 32, 32 - orig: 32, 32 - offset: 0, 0 - index: -1 -scorch-icon-medium - rotate: false - xy: 1285, 1111 - size: 32, 32 - orig: 32, 32 - offset: 0, 0 - index: -1 -scorch-icon-large - rotate: false - xy: 1581, 1501 - size: 48, 48 - orig: 48, 48 - offset: 0, 0 - index: -1 -scorch-icon-small - rotate: false - xy: 895, 603 + xy: 1721, 897 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 separator-icon-full rotate: false - xy: 1557, 1111 + xy: 1455, 1077 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 separator-icon-medium rotate: false - xy: 1557, 1111 + xy: 1455, 1077 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 separator-icon-large rotate: false - xy: 1631, 1551 + xy: 1581, 1501 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 separator-icon-small rotate: false - xy: 985, 824 + xy: 1799, 897 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 shock-mine-icon-full rotate: false - xy: 1659, 1111 + xy: 1557, 1077 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 shock-mine-icon-medium rotate: false - xy: 1659, 1111 + xy: 1557, 1077 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 shock-mine-icon-large rotate: false - xy: 1681, 1601 + xy: 1631, 1551 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 shock-mine-icon-small rotate: false - xy: 985, 798 + xy: 1825, 897 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 silicon-smelter-icon-full rotate: false - xy: 851, 1381 + xy: 719, 1249 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 silicon-smelter-icon-large rotate: false - xy: 1781, 1701 + xy: 1731, 1651 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 silicon-smelter-icon-medium rotate: false - xy: 1761, 1111 + xy: 1659, 1077 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 silicon-smelter-icon-small rotate: false - xy: 1011, 903 + xy: 1851, 897 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 snow-icon-full rotate: false - xy: 1931, 1103 + xy: 1829, 1077 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 snow-icon-medium rotate: false - xy: 1931, 1103 + xy: 1829, 1077 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 snow-icon-large rotate: false - xy: 1831, 1751 + xy: 1781, 1701 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 snow-icon-small rotate: false - xy: 1011, 877 + xy: 1877, 899 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 solar-panel-icon-full rotate: false - xy: 1999, 1103 + xy: 1897, 1077 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 solar-panel-icon-medium rotate: false - xy: 1999, 1103 + xy: 1897, 1077 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 solar-panel-icon-large rotate: false - xy: 1631, 1501 + xy: 1581, 1451 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 solar-panel-icon-small rotate: false - xy: 1037, 903 + xy: 1903, 899 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -7489,91 +7447,91 @@ solar-panel-large-icon-full index: -1 solar-panel-large-icon-large rotate: false - xy: 1681, 1551 + xy: 1631, 1501 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 solar-panel-large-icon-medium rotate: false - xy: 1115, 1095 + xy: 1931, 1077 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 solar-panel-large-icon-small rotate: false - xy: 1011, 851 + xy: 1929, 899 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 sorter-icon-full rotate: false - xy: 1251, 1077 + xy: 1149, 1039 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 sorter-icon-medium rotate: false - xy: 1251, 1077 + xy: 1149, 1039 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 sorter-icon-large rotate: false - xy: 1731, 1601 + xy: 1681, 1551 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 sorter-icon-small rotate: false - xy: 1037, 877 + xy: 1799, 871 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 space-icon-large rotate: false - xy: 1781, 1651 + xy: 1731, 1601 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 space-icon-small rotate: false - xy: 1063, 903 + xy: 1825, 871 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 spawn-icon-full rotate: false - xy: 1353, 1077 + xy: 1251, 1043 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 spawn-icon-medium rotate: false - xy: 1353, 1077 + xy: 1251, 1043 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 spawn-icon-large rotate: false - xy: 1881, 1751 + xy: 1831, 1701 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 spawn-icon-small rotate: false - xy: 1011, 825 + xy: 1851, 871 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -7587,259 +7545,259 @@ spectre-icon-full index: -1 spectre-icon-large rotate: false - xy: 1631, 1451 + xy: 1881, 1751 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 spectre-icon-medium rotate: false - xy: 1387, 1077 + xy: 1285, 1043 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 spectre-icon-small rotate: false - xy: 1037, 851 + xy: 1877, 873 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 spirit-factory-icon-full rotate: false - xy: 917, 1447 + xy: 785, 1315 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 spirit-factory-icon-large rotate: false - xy: 1731, 1551 + xy: 1681, 1501 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 spirit-factory-icon-medium rotate: false - xy: 1421, 1077 + xy: 1319, 1043 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 spirit-factory-icon-small rotate: false - xy: 1063, 877 + xy: 1903, 873 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 stone-icon-full rotate: false - xy: 1693, 1077 + xy: 1591, 1043 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 stone-icon-medium rotate: false - xy: 1693, 1077 + xy: 1591, 1043 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 stone-icon-large rotate: false - xy: 1781, 1601 + xy: 1731, 1551 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 stone-icon-small rotate: false - xy: 1089, 903 + xy: 1929, 873 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 surge-wall-icon-full rotate: false - xy: 1761, 1077 + xy: 1659, 1043 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 surge-wall-icon-medium rotate: false - xy: 1761, 1077 + xy: 1659, 1043 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 surge-wall-icon-large rotate: false - xy: 1881, 1701 + xy: 1831, 1651 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 surge-wall-icon-small rotate: false - xy: 1115, 907 + xy: 1955, 879 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 surge-wall-large-icon-full rotate: false - xy: 653, 1117 + xy: 1049, 1579 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 surge-wall-large-icon-large rotate: false - xy: 1931, 1751 + xy: 1881, 1701 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 surge-wall-large-icon-medium rotate: false - xy: 1795, 1077 + xy: 1693, 1043 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 surge-wall-large-icon-small rotate: false - xy: 1011, 799 + xy: 1981, 879 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 swarmer-icon-full rotate: false - xy: 785, 1249 + xy: 653, 1117 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 swarmer-icon-large rotate: false - xy: 1731, 1501 + xy: 1681, 1451 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 swarmer-icon-medium rotate: false - xy: 1829, 1077 + xy: 1727, 1043 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 swarmer-icon-small rotate: false - xy: 1037, 825 + xy: 2007, 879 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 tar-icon-large rotate: false - xy: 1781, 1551 + xy: 1731, 1501 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 tar-icon-small rotate: false - xy: 1063, 851 + xy: 1773, 860 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 tau-mech-pad-icon-full rotate: false - xy: 917, 1381 + xy: 785, 1249 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 tau-mech-pad-icon-large rotate: false - xy: 1981, 1751 + xy: 1931, 1701 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 tau-mech-pad-icon-medium rotate: false - xy: 1897, 1077 + xy: 1795, 1043 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 tau-mech-pad-icon-small rotate: false - xy: 1089, 877 + xy: 1799, 845 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 thermal-generator-icon-full rotate: false - xy: 1049, 1513 + xy: 917, 1381 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 thermal-generator-icon-large rotate: false - xy: 1731, 1451 + xy: 1981, 1751 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 thermal-generator-icon-medium rotate: false - xy: 1931, 1069 + xy: 1829, 1043 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 thermal-generator-icon-small rotate: false - xy: 1115, 881 + xy: 1825, 845 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 thermal-pump-icon-full rotate: false - xy: 653, 1051 + xy: 1049, 1513 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 thermal-pump-icon-large rotate: false - xy: 1781, 1501 + xy: 1731, 1451 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 thermal-pump-icon-medium rotate: false - xy: 1965, 1069 + xy: 1863, 1043 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 thermal-pump-icon-small rotate: false - xy: 1037, 799 + xy: 1851, 845 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -7853,77 +7811,77 @@ thorium-reactor-icon-full index: -1 thorium-reactor-icon-large rotate: false - xy: 1831, 1551 + xy: 1781, 1501 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 thorium-reactor-icon-medium rotate: false - xy: 1183, 1059 + xy: 1999, 1043 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 thorium-reactor-icon-small rotate: false - xy: 1063, 825 + xy: 1877, 847 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 thorium-wall-icon-full rotate: false - xy: 1251, 1043 + xy: 1115, 993 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 thorium-wall-icon-medium rotate: false - xy: 1251, 1043 + xy: 1115, 993 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 thorium-wall-icon-large rotate: false - xy: 1881, 1601 + xy: 1831, 1551 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 thorium-wall-icon-small rotate: false - xy: 1089, 851 + xy: 1903, 847 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 thorium-wall-large-icon-full rotate: false - xy: 785, 1183 + xy: 653, 1051 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 thorium-wall-large-icon-large rotate: false - xy: 1931, 1651 + xy: 1881, 1601 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 thorium-wall-large-icon-medium rotate: false - xy: 1285, 1043 + xy: 1149, 1005 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 thorium-wall-large-icon-small rotate: false - xy: 1115, 855 + xy: 1929, 847 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -7937,49 +7895,105 @@ titan-factory-icon-full index: -1 titan-factory-icon-large rotate: false - xy: 1981, 1701 + xy: 1931, 1651 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 titan-factory-icon-medium rotate: false - xy: 1319, 1043 + xy: 1115, 959 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 titan-factory-icon-small rotate: false - xy: 1063, 799 + xy: 1955, 853 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 titanium-conveyor-icon-full rotate: false - xy: 1183, 1025 + xy: 1557, 1009 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 titanium-conveyor-icon-medium rotate: false - xy: 1183, 1025 + xy: 1557, 1009 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 titanium-conveyor-icon-large rotate: false - xy: 1781, 1451 + xy: 1981, 1701 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 titanium-conveyor-icon-small rotate: false - xy: 1089, 825 + xy: 1981, 853 + size: 24, 24 + orig: 24, 24 + offset: 0, 0 + index: -1 +titanium-wall-icon-full + rotate: false + xy: 1591, 1009 + size: 32, 32 + orig: 32, 32 + offset: 0, 0 + index: -1 +titanium-wall-icon-medium + rotate: false + xy: 1591, 1009 + size: 32, 32 + orig: 32, 32 + offset: 0, 0 + index: -1 +titanium-wall-icon-large + rotate: false + xy: 1781, 1451 + size: 48, 48 + orig: 48, 48 + offset: 0, 0 + index: -1 +titanium-wall-icon-small + rotate: false + xy: 2007, 853 + size: 24, 24 + orig: 24, 24 + offset: 0, 0 + index: -1 +titanium-wall-large-icon-full + rotate: false + xy: 917, 1315 + size: 64, 64 + orig: 64, 64 + offset: 0, 0 + index: -1 +titanium-wall-large-icon-large + rotate: false + xy: 1831, 1501 + size: 48, 48 + orig: 48, 48 + offset: 0, 0 + index: -1 +titanium-wall-large-icon-medium + rotate: false + xy: 1591, 975 + size: 32, 32 + orig: 32, 32 + offset: 0, 0 + index: -1 +titanium-wall-large-icon-small + rotate: false + xy: 1955, 827 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -7993,21 +8007,21 @@ trident-ship-pad-icon-full index: -1 trident-ship-pad-icon-large rotate: false - xy: 1831, 1501 + xy: 1881, 1551 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 trident-ship-pad-icon-medium rotate: false - xy: 1149, 991 + xy: 1625, 975 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 trident-ship-pad-icon-small rotate: false - xy: 1115, 829 + xy: 1981, 827 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -8021,28 +8035,28 @@ turbine-generator-icon-full index: -1 turbine-generator-icon-large rotate: false - xy: 1881, 1551 + xy: 1931, 1601 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 turbine-generator-icon-medium rotate: false - xy: 1183, 991 + xy: 1659, 1009 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 turbine-generator-icon-small rotate: false - xy: 1089, 799 + xy: 2007, 827 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 unit-icon-dagger rotate: false - xy: 1931, 1601 + xy: 1981, 1651 size: 48, 48 orig: 48, 48 offset: 0, 0 @@ -8077,7 +8091,7 @@ unit-icon-revenant index: -1 unit-icon-spirit rotate: false - xy: 1981, 1651 + xy: 1831, 1451 size: 48, 48 orig: 48, 48 offset: 0, 0 @@ -8091,35 +8105,35 @@ unit-icon-titan index: -1 unit-icon-wraith rotate: false - xy: 1831, 1451 + xy: 1881, 1501 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 unloader-icon-full rotate: false - xy: 1251, 1009 + xy: 1693, 1009 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 unloader-icon-medium rotate: false - xy: 1251, 1009 + xy: 1693, 1009 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 unloader-icon-large rotate: false - xy: 1881, 1501 + xy: 1931, 1551 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 unloader-icon-small rotate: false - xy: 1115, 803 + xy: 869, 324 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -8133,21 +8147,21 @@ vault-icon-full index: -1 vault-icon-large rotate: false - xy: 1931, 1551 + xy: 1981, 1601 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 vault-icon-medium rotate: false - xy: 1285, 1009 + xy: 1693, 975 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 vault-icon-small rotate: false - xy: 981, 772 + xy: 869, 298 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -8161,35 +8175,35 @@ water-extractor-icon-full index: -1 water-extractor-icon-large rotate: false - xy: 1981, 1601 + xy: 1881, 1451 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 water-extractor-icon-medium rotate: false - xy: 1489, 1009 + xy: 1795, 975 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 water-extractor-icon-small rotate: false - xy: 981, 746 + xy: 869, 272 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 water-icon-large rotate: false - xy: 1881, 1451 + xy: 1931, 1501 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 water-icon-small rotate: false - xy: 981, 720 + xy: 869, 246 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -8203,21 +8217,21 @@ wave-icon-full index: -1 wave-icon-large rotate: false - xy: 1981, 1551 + xy: 1931, 1451 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 wave-icon-medium rotate: false - xy: 1523, 1009 + xy: 1829, 1009 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 wave-icon-small rotate: false - xy: 976, 694 + xy: 869, 220 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -8231,175 +8245,175 @@ wraith-factory-icon-full index: -1 wraith-factory-icon-large rotate: false - xy: 1981, 1501 + xy: 1981, 1451 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 wraith-factory-icon-medium rotate: false - xy: 1557, 1009 + xy: 1829, 975 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 wraith-factory-icon-small rotate: false - xy: 976, 668 + xy: 869, 194 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 item-biomatter rotate: false - xy: 1955, 1409 + xy: 407, 77 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 item-blast-compound rotate: false - xy: 1955, 1375 + xy: 441, 77 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 item-coal rotate: false - xy: 1989, 1409 + xy: 475, 77 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 item-copper rotate: false - xy: 1989, 1375 + xy: 509, 77 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 item-dense-alloy rotate: false - xy: 1955, 1341 + xy: 543, 77 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 item-graphite rotate: false - xy: 1989, 1341 + xy: 577, 77 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 item-lead rotate: false - xy: 1013, 929 + xy: 1199, 1277 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 item-metaglass rotate: false - xy: 1047, 929 + xy: 1191, 1243 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 item-phase-fabric rotate: false - xy: 1045, 1099 + xy: 1191, 1209 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 item-plastanium rotate: false - xy: 1045, 1065 + xy: 1233, 1281 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 item-pyratite rotate: false - xy: 1063, 1031 + xy: 1267, 1281 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 item-sand rotate: false - xy: 1081, 997 + xy: 1301, 1281 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 item-scrap rotate: false - xy: 1081, 963 + xy: 1335, 1281 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 item-silicon rotate: false - xy: 1081, 929 + xy: 1369, 1281 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 item-stone rotate: false - xy: 775, 592 + xy: 1471, 1281 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 item-surge-alloy rotate: false - xy: 753, 558 + xy: 1505, 1281 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 item-thorium rotate: false - xy: 787, 558 + xy: 1539, 1281 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 item-titanium rotate: false - xy: 809, 595 + xy: 1573, 1281 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 liquid-cryofluid rotate: false - xy: 1615, 1315 + xy: 777, 951 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 liquid-oil rotate: false - xy: 1717, 1315 + xy: 1011, 1065 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 liquid-slag rotate: false - xy: 1887, 1315 + xy: 1029, 1031 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 liquid-water rotate: false - xy: 1267, 1281 + xy: 979, 955 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -8483,14 +8497,14 @@ tau-mech index: -1 tau-mech-base rotate: false - xy: 1881, 1651 + xy: 1831, 1601 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 tau-mech-leg rotate: false - xy: 1931, 1701 + xy: 1881, 1651 size: 48, 48 orig: 48, 48 offset: 0, 0 @@ -8546,7 +8560,7 @@ circle index: -1 clear rotate: false - xy: 783, 626 + xy: 786, 843 size: 1, 1 orig: 1, 1 offset: 0, 0 @@ -8560,7 +8574,7 @@ shape-3 index: -1 button rotate: false - xy: 1013, 1133 + xy: 711, 869 size: 36, 27 split: 12, 12, 12, 12 orig: 36, 27 @@ -8568,7 +8582,7 @@ button index: -1 button-down rotate: false - xy: 1981, 1472 + xy: 851, 1030 size: 36, 27 split: 12, 12, 12, 12 orig: 36, 27 @@ -8576,7 +8590,7 @@ button-down index: -1 button-edge-1 rotate: false - xy: 1981, 1443 + xy: 843, 1001 size: 36, 27 split: 12, 12, 12, 12 orig: 36, 27 @@ -8584,7 +8598,7 @@ button-edge-1 index: -1 button-edge-2 rotate: false - xy: 851, 1030 + xy: 889, 1030 size: 36, 27 split: 12, 12, 12, 12 orig: 36, 27 @@ -8592,7 +8606,7 @@ button-edge-2 index: -1 button-edge-3 rotate: false - xy: 843, 1001 + xy: 881, 1001 size: 36, 27 split: 12, 12, 12, 12 orig: 36, 27 @@ -8600,7 +8614,7 @@ button-edge-3 index: -1 button-edge-4 rotate: false - xy: 889, 1030 + xy: 983, 1162 size: 36, 27 split: 12, 12, 12, 12 orig: 36, 27 @@ -8608,7 +8622,7 @@ button-edge-4 index: -1 button-over rotate: false - xy: 881, 1001 + xy: 975, 1133 size: 36, 27 split: 12, 12, 12, 12 orig: 36, 27 @@ -8616,7 +8630,7 @@ button-over index: -1 button-right rotate: false - xy: 1021, 1162 + xy: 719, 898 size: 36, 27 split: 12, 12, 12, 12 orig: 36, 27 @@ -8624,7 +8638,7 @@ button-right index: -1 button-right-down rotate: false - xy: 983, 1162 + xy: 1021, 1162 size: 36, 27 split: 12, 12, 12, 12 orig: 36, 27 @@ -8632,7 +8646,7 @@ button-right-down index: -1 button-right-over rotate: false - xy: 975, 1133 + xy: 1013, 1133 size: 36, 27 split: 12, 12, 12, 12 orig: 36, 27 @@ -8640,7 +8654,7 @@ button-right-over index: -1 button-select rotate: false - xy: 817, 636 + xy: 821, 402 size: 24, 24 split: 4, 4, 4, 4 orig: 24, 24 @@ -8648,28 +8662,28 @@ button-select index: -1 check-off rotate: false - xy: 2019, 1467 + xy: 1925, 1009 size: 28, 32 orig: 28, 32 offset: 0, 0 index: -1 check-on rotate: false - xy: 1653, 1009 + xy: 1955, 1009 size: 28, 32 orig: 28, 32 offset: 0, 0 index: -1 check-on-over rotate: false - xy: 1683, 1009 + xy: 1985, 1009 size: 28, 32 orig: 28, 32 offset: 0, 0 index: -1 check-over rotate: false - xy: 1713, 1009 + xy: 1115, 925 size: 28, 32 orig: 28, 32 offset: 0, 0 @@ -8683,7 +8697,7 @@ clear index: -1 content-background rotate: false - xy: 719, 898 + xy: 711, 840 size: 36, 27 split: 12, 12, 12, 12 orig: 36, 27 @@ -8691,7 +8705,7 @@ content-background index: -1 cursor rotate: false - xy: 1653, 1003 + xy: 2023, 1315 size: 4, 4 orig: 4, 4 offset: 0, 0 @@ -8705,49 +8719,49 @@ discord-banner index: -1 empty-sector rotate: false - xy: 1191, 1229 + xy: 1887, 1315 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 icon-crafting rotate: false - xy: 2031, 1765 + xy: 2031, 1747 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-defense rotate: false - xy: 2031, 1747 + xy: 2031, 1729 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-distribution rotate: false - xy: 2031, 1729 + xy: 2031, 1711 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-effect rotate: false - xy: 2031, 1711 + xy: 2031, 1693 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-liquid rotate: false - xy: 2031, 1549 + xy: 2031, 1531 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-power rotate: false - xy: 777, 933 + xy: 1041, 1197 size: 16, 16 orig: 16, 16 offset: 0, 0 @@ -8761,28 +8775,28 @@ icon-production index: -1 icon-turret rotate: false - xy: 924, 625 + xy: 869, 140 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-units rotate: false - xy: 960, 625 + xy: 869, 122 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-upgrade rotate: false - xy: 939, 607 + xy: 919, 1005 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 controller-cursor rotate: false - xy: 1199, 1263 + xy: 611, 93 size: 16, 16 orig: 16, 16 offset: 0, 0 @@ -8810,28 +8824,28 @@ icon-admin index: -1 icon-admin-small rotate: false - xy: 1947, 1307 + xy: 660, 1994 size: 6, 6 orig: 6, 6 offset: 0, 0 index: -1 icon-areaDelete rotate: false - xy: 2031, 1501 + xy: 753, 525 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-arrow rotate: false - xy: 611, 93 + xy: 611, 75 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-arrow-16 rotate: false - xy: 611, 93 + xy: 611, 75 size: 16, 16 orig: 16, 16 offset: 0, 0 @@ -8845,14 +8859,14 @@ icon-arrow-down index: -1 icon-arrow-left rotate: false - xy: 741, 580 + xy: 582, 1978 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-arrow-right rotate: false - xy: 582, 1978 + xy: 765, 525 size: 10, 10 orig: 10, 10 offset: 0, 0 @@ -8866,7 +8880,7 @@ icon-arrow-up index: -1 icon-back rotate: false - xy: 611, 75 + xy: 770, 1 size: 16, 16 orig: 16, 16 offset: 0, 0 @@ -8880,161 +8894,161 @@ icon-ban index: -1 icon-break rotate: false - xy: 770, 1 + xy: 788, 1 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-cancel rotate: false - xy: 788, 1 + xy: 806, 1 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-chat rotate: false - xy: 594, 1832 + xy: 741, 593 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-check rotate: false - xy: 806, 1 + xy: 2031, 1783 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-copy rotate: false - xy: 2031, 1783 + xy: 2031, 1765 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-cursor rotate: false - xy: 1173, 1333 + xy: 741, 581 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-dev-builds rotate: false - xy: 1059, 1199 + xy: 795, 935 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-discord rotate: false - xy: 795, 935 + xy: 1059, 1199 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-donate rotate: false - xy: 2033, 1189 + xy: 2033, 1163 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-dots rotate: false - xy: 2033, 1173 + xy: 2033, 1147 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-editor rotate: false - xy: 2033, 1157 + xy: 2033, 1131 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-egg rotate: false - xy: 2033, 1141 + xy: 2033, 1115 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-elevation rotate: false - xy: 2031, 1693 + xy: 2031, 1675 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-eraser rotate: false - xy: 2031, 1675 + xy: 2031, 1657 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-exit rotate: false - xy: 2033, 1125 + xy: 2033, 1099 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-file rotate: false - xy: 2031, 1657 + xy: 2031, 1639 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-file-image rotate: false - xy: 2031, 1639 + xy: 2031, 1621 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-file-text rotate: false - xy: 2033, 1109 + xy: 2033, 1083 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-fill rotate: false - xy: 2031, 1621 + xy: 2031, 1603 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-floppy rotate: false - xy: 2033, 1093 + xy: 2033, 1067 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-floppy-16 rotate: false - xy: 2031, 1603 + xy: 2031, 1585 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-folder rotate: false - xy: 2033, 1077 + xy: 2033, 1051 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-folder-parent rotate: false - xy: 2033, 1061 + xy: 2033, 975 size: 14, 14 orig: 14, 14 offset: 0, 0 @@ -9048,168 +9062,168 @@ icon-generated index: -1 icon-github rotate: false - xy: 2033, 1045 + xy: 2033, 959 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-google-play rotate: false - xy: 2033, 1029 + xy: 2033, 943 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-grid rotate: false - xy: 2031, 1585 + xy: 2031, 1567 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-hold rotate: false - xy: 881, 87 + xy: 594, 1832 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-holdDelete rotate: false - xy: 813, 55 + xy: 813, 54 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-home rotate: false - xy: 1201, 975 + xy: 2033, 927 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-host rotate: false - xy: 725, 579 + xy: 2033, 911 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-info rotate: false - xy: 245, 560 + xy: 824, 7 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-itch.io rotate: false - xy: 824, 1 + xy: 2033, 895 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-item rotate: false - xy: 811, 929 + xy: 804, 852 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-items-none rotate: false - xy: 855, 323 + xy: 777, 527 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 icon-line rotate: false - xy: 2031, 1567 + xy: 2031, 1549 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-link rotate: false - xy: 840, 1 + xy: 2033, 879 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-liquid-small rotate: false - xy: 823, 929 + xy: 245, 560 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-load rotate: false - xy: 856, 1 + xy: 2033, 863 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-load-image rotate: false - xy: 2031, 1531 + xy: 2031, 1513 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-load-map rotate: false - xy: 2031, 1513 + xy: 2031, 1495 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-loading rotate: false - xy: 204, 1759 + xy: 2031, 1477 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-locked rotate: false - xy: 636, 1852 + xy: 2031, 1459 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-logic rotate: false - xy: 835, 929 + xy: 891, 913 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-map rotate: false - xy: 872, 1 + xy: 2033, 847 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-menu rotate: false - xy: 847, 929 + xy: 923, 929 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-menu-large rotate: false - xy: 909, 1065 + xy: 204, 1759 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-missing rotate: false - xy: 859, 929 + xy: 606, 1832 size: 10, 10 orig: 10, 10 offset: 0, 0 @@ -9223,126 +9237,126 @@ icon-mission-background index: -1 icon-mission-battle rotate: false - xy: 871, 929 + xy: 825, 54 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-mission-defense rotate: false - xy: 883, 929 + xy: 903, 913 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-mission-done rotate: false - xy: 895, 929 + xy: 618, 1832 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-none rotate: false - xy: 1361, 971 + xy: 210, 4 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-nullitem rotate: false - xy: 903, 723 + xy: 927, 1057 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 icon-paste rotate: false - xy: 707, 577 + xy: 636, 1852 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-pause rotate: false - xy: 606, 1832 + xy: 222, 4 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-pencil rotate: false - xy: 813, 67 + xy: 909, 1065 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-pencil-small rotate: false - xy: 888, 1 + xy: 2033, 831 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-pick rotate: false - xy: 1041, 1197 + xy: 777, 933 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-play rotate: false - xy: 1185, 1333 + xy: 234, 4 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-play-2 rotate: false - xy: 904, 1 + xy: 2033, 815 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-players rotate: false - xy: 893, 87 + xy: 246, 4 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-power-small rotate: false - xy: 1373, 971 + xy: 636, 1840 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-quit rotate: false - xy: 2029, 1013 + xy: 821, 334 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-redo rotate: false - xy: 976, 650 + xy: 869, 176 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-refresh rotate: false - xy: 1059, 1183 + xy: 795, 919 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-rename rotate: false - xy: 1075, 1189 + xy: 795, 903 size: 14, 14 orig: 14, 14 offset: 0, 0 @@ -9356,35 +9370,35 @@ icon-resize index: -1 icon-rotate rotate: false - xy: 1059, 1167 + xy: 811, 925 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-rotate-arrow rotate: false - xy: 1075, 1173 + xy: 827, 925 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-rotate-left rotate: false - xy: 1201, 959 + xy: 811, 909 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-rotate-right rotate: false - xy: 1217, 967 + xy: 843, 925 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-save rotate: false - xy: 1233, 967 + xy: 827, 909 size: 14, 14 orig: 14, 14 offset: 0, 0 @@ -9398,112 +9412,112 @@ icon-save-image index: -1 icon-save-map rotate: false - xy: 39, 3 + xy: 869, 158 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-settings rotate: false - xy: 618, 1832 + xy: 887, 182 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-terrain rotate: false - xy: 240, 1759 + xy: 39, 3 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-tools rotate: false - xy: 1249, 967 + xy: 859, 925 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-touch rotate: false - xy: 1385, 971 + xy: 887, 170 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-touchDelete rotate: false - xy: 1397, 971 + xy: 887, 158 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-trash rotate: false - xy: 1265, 967 + xy: 843, 909 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-trash-16 rotate: false - xy: 57, 3 + xy: 240, 1759 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-trello rotate: false - xy: 1281, 967 + xy: 875, 925 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-tutorial rotate: false - xy: 1297, 967 + xy: 859, 909 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-undo rotate: false - xy: 942, 625 + xy: 57, 3 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-unlocked rotate: false - xy: 921, 607 + xy: 786, 846 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-unlocks rotate: false - xy: 1313, 967 + xy: 891, 925 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-wiki rotate: false - xy: 1329, 967 + xy: 875, 909 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-zoom rotate: false - xy: 957, 607 + xy: 993, 919 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-zoom-small rotate: false - xy: 1345, 967 + xy: 907, 925 size: 14, 14 orig: 14, 14 offset: 0, 0 @@ -9517,7 +9531,7 @@ info-banner index: -1 inventory rotate: false - xy: 898, 681 + xy: 1617, 933 size: 24, 40 split: 10, 10, 10, 14 orig: 24, 40 @@ -9532,7 +9546,7 @@ logotext index: -1 pane rotate: false - xy: 711, 764 + xy: 711, 706 size: 36, 27 split: 12, 12, 12, 12 orig: 36, 27 @@ -9540,7 +9554,7 @@ pane index: -1 pane-2 rotate: false - xy: 711, 793 + xy: 711, 735 size: 36, 27 split: 12, 12, 12, 12 orig: 36, 27 @@ -9548,7 +9562,7 @@ pane-2 index: -1 scroll rotate: false - xy: 985, 850 + xy: 1773, 886 size: 24, 35 split: 10, 10, 6, 5 orig: 24, 35 @@ -9556,7 +9570,7 @@ scroll index: -1 scroll-horizontal rotate: false - xy: 757, 901 + xy: 749, 843 size: 35, 24 split: 6, 5, 10, 10 orig: 35, 24 @@ -9572,7 +9586,7 @@ scroll-knob-horizontal-black index: -1 scroll-knob-vertical-black rotate: false - xy: 985, 887 + xy: 1747, 881 size: 24, 40 split: 10, 10, 6, 10 orig: 24, 40 @@ -9580,63 +9594,63 @@ scroll-knob-vertical-black index: -1 sector-edge rotate: false - xy: 1455, 1111 + xy: 1353, 1077 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 sector-select rotate: false - xy: 1489, 1111 + xy: 1387, 1077 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 selection rotate: false - xy: 809, 592 + xy: 245, 557 size: 1, 1 orig: 1, 1 offset: 0, 0 index: -1 slider rotate: false - xy: 843, 652 + xy: 258, 1818 size: 1, 8 orig: 1, 8 offset: 0, 0 index: -1 slider-knob rotate: false - xy: 1591, 1003 + xy: 1863, 1003 size: 29, 38 orig: 29, 38 offset: 0, 0 index: -1 slider-knob-down rotate: false - xy: 1622, 1003 + xy: 1894, 1003 size: 29, 38 orig: 29, 38 offset: 0, 0 index: -1 slider-knob-over rotate: false - xy: 1622, 1003 + xy: 1894, 1003 size: 29, 38 orig: 29, 38 offset: 0, 0 index: -1 slider-vertical rotate: false - xy: 757, 898 + xy: 1051, 1133 size: 8, 1 orig: 8, 1 offset: 0, 0 index: -1 underline rotate: false - xy: 711, 630 + xy: 749, 869 size: 36, 27 split: 12, 12, 12, 12 orig: 36, 27 @@ -9644,7 +9658,7 @@ underline index: -1 underline-2 rotate: false - xy: 711, 659 + xy: 757, 898 size: 36, 27 split: 12, 12, 12, 12 orig: 36, 27 @@ -9659,7 +9673,7 @@ white index: -1 window-empty rotate: false - xy: 817, 662 + xy: 813, 66 size: 27, 61 split: 8, 8, 44, 11 orig: 27, 61 @@ -9695,28 +9709,28 @@ dagger-leg index: -1 fortress rotate: false - xy: 1320, 1851 + xy: 1188, 1851 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 fortress-base rotate: false - xy: 1386, 1851 + xy: 1254, 1851 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 titan-base rotate: false - xy: 1386, 1851 + xy: 1254, 1851 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 fortress-leg rotate: false - xy: 1452, 1851 + xy: 1320, 1851 size: 64, 64 orig: 64, 64 offset: 0, 0 @@ -9751,28 +9765,28 @@ revenant index: -1 spirit rotate: false - xy: 1681, 1501 + xy: 1631, 1451 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 titan rotate: false - xy: 851, 1249 + xy: 719, 1117 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 titan-leg rotate: false - xy: 917, 1315 + xy: 785, 1183 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 wraith rotate: false - xy: 1931, 1451 + xy: 1981, 1501 size: 48, 48 orig: 48, 48 offset: 0, 0 @@ -9835,14 +9849,14 @@ heal-blaster-equip index: -1 shockgun-equip rotate: false - xy: 1731, 1651 + xy: 1681, 1601 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 swarmer-equip rotate: false - xy: 1681, 1451 + xy: 1931, 1751 size: 48, 48 orig: 48, 48 offset: 0, 0 diff --git a/core/assets/sprites/sprites.png b/core/assets/sprites/sprites.png index c521821074..4796d59acb 100644 Binary files a/core/assets/sprites/sprites.png and b/core/assets/sprites/sprites.png differ diff --git a/core/src/io/anuke/mindustry/content/Blocks.java b/core/src/io/anuke/mindustry/content/Blocks.java index f33b645340..e260be12fb 100644 --- a/core/src/io/anuke/mindustry/content/Blocks.java +++ b/core/src/io/anuke/mindustry/content/Blocks.java @@ -61,7 +61,7 @@ public class Blocks implements ContentList{ core, vault, container, unloader, launchPad, //turrets - duo, scorch, hail, wave, lancer, arc, swarmer, salvo, fuse, ripple, cyclone, spectre, meltdown, + duo, hail, arc, wave, lancer, swarmer, salvo, fuse, ripple, cyclone, spectre, meltdown, //units spiritFactory, phantomFactory, wraithFactory, ghoulFactory, revenantFactory, daggerFactory, titanFactory, @@ -787,15 +787,6 @@ public class Blocks implements ContentList{ health = 120; }}; - scorch = new LiquidTurret("scorch"){{ - ammo(Liquids.oil, Bullets.basicFlame); - recoil = 0f; - reload = 4f; - shootCone = 50f; - ammoUseEffect = Fx.shellEjectSmall; - health = 160; - }}; - wave = new LiquidTurret("wave"){{ ammo( Liquids.water, Bullets.waterShot, diff --git a/core/src/io/anuke/mindustry/content/TechTree.java b/core/src/io/anuke/mindustry/content/TechTree.java index 25fe32a908..93dafb0cb6 100644 --- a/core/src/io/anuke/mindustry/content/TechTree.java +++ b/core/src/io/anuke/mindustry/content/TechTree.java @@ -1,7 +1,9 @@ package io.anuke.mindustry.content; +import io.anuke.arc.collection.Array; import io.anuke.mindustry.game.ContentList; import io.anuke.mindustry.type.ItemStack; +import io.anuke.mindustry.type.Recipe; import io.anuke.mindustry.world.Block; import static io.anuke.mindustry.type.ItemStack.with; @@ -11,43 +13,273 @@ public class TechTree implements ContentList{ @Override public void load(){ - root = new TechNode(null, with(), - new TechNode(Blocks.copperWall, with(Items.copper, 100), - new TechNode(Blocks.copperWallLarge, with(Items.copper, 100)) - ), + root = node(null, with(), () -> { - new TechNode(Blocks.conveyor, with(Items.copper, 10), - new TechNode(Blocks.router, with(Items.copper, 10), - new TechNode(Blocks.distributor, with(Items.copper, 10)), - new TechNode(Blocks.overflowGate, with(Items.copper, 10)), - new TechNode(Blocks.sorter, with(Items.copper, 10)) - ), - new TechNode(Blocks.junction, with(Items.copper, 10)), - new TechNode(Blocks.itemBridge, with(Items.copper, 10)) - ), + node(Blocks.conveyor, with(Items.copper, 100), () -> { + node(Blocks.launchPad, with(Items.copper, 100), () -> { - new TechNode(Blocks.conduit, with(Items.metaglass, 10), - new TechNode(Blocks.liquidJunction, with(Items.metaglass, 10)), - new TechNode(Blocks.liquidRouter, with(Items.metaglass, 10), - new TechNode(Blocks.liquidTank, with(Items.metaglass, 10)) - ) - ) - ); + }); + + node(Blocks.junction, with(Items.copper, 100), () -> { + node(Blocks.itemBridge, with(Items.copper, 100)); + node(Blocks.router, with(Items.copper, 100), () -> { + node(Blocks.distributor, with(Items.copper, 100)); + node(Blocks.overflowGate, with(Items.copper, 100)); + node(Blocks.sorter, with(Items.copper, 100)); + node(Blocks.container, with(Items.copper, 100), () -> { + node(Blocks.unloader, with(Items.copper, 100)); + node(Blocks.vault, with(Items.copper, 100), () -> { + + }); + }); + }); + node(Blocks.titaniumConveyor, with(Items.copper, 100), () -> { + node(Blocks.phaseConveyor, with(Items.copper, 100), () -> { + node(Blocks.massDriver, with(Items.copper, 100), () -> { + + }); + }); + }); + }); + }); + + node(Blocks.duo, with(Items.copper, 100), () -> { + node(Blocks.hail, with(Items.copper, 100), () -> { + + node(Blocks.salvo, with(Items.copper, 100), () -> { + node(Blocks.swarmer, with(Items.copper, 100), () -> { + node(Blocks.cyclone, with(Items.copper, 100), () -> { + node(Blocks.spectre, with(Items.copper, 100), () -> { + + }); + }); + }); + + node(Blocks.ripple, with(Items.copper, 100), () -> { + node(Blocks.fuse, with(Items.copper, 100), () -> { + + }); + }); + }); + }); + + node(Blocks.arc, with(Items.copper, 100), () -> { + node(Blocks.wave, with(Items.copper, 100), () -> { + + }); + + node(Blocks.lancer, with(Items.copper, 100), () -> { + node(Blocks.meltdown, with(Items.copper, 100), () -> { + + }); + + node(Blocks.shockMine, with(Items.metaglass, 100), () -> { + + }); + }); + }); + + node(Blocks.copperWall, with(Items.copper, 100), () -> { + node(Blocks.copperWallLarge, with(Items.copper, 100)); + node(Blocks.titaniumWall, with(Items.copper, 100), () -> { + node(Blocks.door, with(Items.copper, 100), () -> { + node(Blocks.doorLarge, with(Items.copper, 100)); + }); + node(Blocks.titaniumWallLarge, with(Items.copper, 100)); + node(Blocks.thoriumWall, with(Items.copper, 100), () -> { + node(Blocks.thoriumWallLarge, with(Items.copper, 100)); + node(Blocks.surgeWall, with(Items.copper, 100), () -> { + node(Blocks.surgeWallLarge, with(Items.copper, 100)); + node(Blocks.phaseWall, with(Items.copper, 100), () -> { + node(Blocks.phaseWallLarge, with(Items.copper, 100)); + }); + }); + }); + }); + }); + }); + + node(Blocks.mechanicalDrill, with(Items.copper, 100), () -> { + node(Blocks.pneumaticDrill, with(Items.copper, 100), () -> { + node(Blocks.cultivator, with(Items.copper, 100), () -> { + + }); + + node(Blocks.laserDrill, with(Items.copper, 100), () -> { + node(Blocks.blastDrill, with(Items.copper, 100), () -> { + + }); + + node(Blocks.waterExtractor, with(Items.copper, 100), () -> { + node(Blocks.oilExtractor, with(Items.copper, 100), () -> { + + }); + }); + }); + }); + + node(Blocks.siliconSmelter, with(Items.copper, 100), () -> { + + node(Blocks.pyratiteMixer, with(Items.copper, 100), () -> { + node(Blocks.blastMixer, with(Items.copper, 100), () -> { + + }); + }); + + node(Blocks.biomatterCompressor, with(Items.copper, 100), () -> { + node(Blocks.plastaniumCompressor, with(Items.copper, 100), () -> { + node(Blocks.phaseWeaver, with(Items.copper, 100), () -> { + + }); + }); + }); + + node(Blocks.incinerator, with(Items.copper, 100), () -> { + node(Blocks.melter, with(Items.copper, 100), () -> { + node(Blocks.surgeSmelter, with(Items.copper, 100), () -> { + + }); + + node(Blocks.separator, with(Items.copper, 100), () -> { + node(Blocks.pulverizer, with(Items.copper, 100), () -> { + + }); + }); + + node(Blocks.cryofluidMixer, with(Items.copper, 100), () -> { + + }); + }); + }); + }); + + node(Blocks.mechanicalPump, with(Items.metaglass, 100), () -> { + node(Blocks.conduit, with(Items.metaglass, 100), () -> { + node(Blocks.liquidJunction, with(Items.metaglass, 100), () -> { + node(Blocks.liquidRouter, with(Items.metaglass, 100), () -> { + node(Blocks.liquidTank, with(Items.metaglass, 100)); + + node(Blocks.pulseConduit, with(Items.metaglass, 100), () -> { + node(Blocks.phaseConduit, with(Items.metaglass, 100), () -> { + + }); + }); + + node(Blocks.rotaryPump, with(Items.metaglass, 100), () -> { + node(Blocks.thermalPump, with(Items.metaglass, 100), () -> { + + }); + }); + }); + node(Blocks.bridgeConduit, with(Items.metaglass, 100)); + }); + }); + }); + }); + + node(Blocks.powerNode, with(Items.copper, 100), () -> { + node(Blocks.combustionGenerator, with(Items.copper, 100), () -> { + node(Blocks.powerNodeLarge, with(Items.copper, 100), () -> { + node(Blocks.battery, with(Items.copper, 100), () -> { + node(Blocks.batteryLarge, with(Items.copper, 100), () -> { + + }); + }); + + node(Blocks.mendProjector, with(Items.copper, 100), () -> { + node(Blocks.forceProjector, with(Items.copper, 100), () -> { + node(Blocks.overdriveProjector, with(Items.copper, 100), () -> { + + }); + }); + + node(Blocks.repairPoint, with(Items.copper, 100), () -> { + + }); + }); + }); + + node(Blocks.turbineGenerator, with(Items.copper, 100), () -> { + node(Blocks.thermalGenerator, with(Items.copper, 100), () -> { + node(Blocks.rtgGenerator, with(Items.copper, 100), () -> { + node(Blocks.thoriumReactor, with(Items.copper, 100), () -> { + + }); + }); + }); + }); + + node(Blocks.solarPanel, with(Items.copper, 100), () -> { + node(Blocks.largeSolarPanel, with(Items.copper, 100), () -> { + + }); + }); + }); + + node(Blocks.alphaPad, with(Items.copper, 100), () -> { + node(Blocks.dartPad, with(Items.copper, 100)); + node(Blocks.deltaPad, with(Items.copper, 100), () -> { + node(Blocks.javelinPad, with(Items.copper, 100)); + node(Blocks.tauPad, with(Items.copper, 100), () -> { + node(Blocks.tridentPad, with(Items.copper, 100)); + node(Blocks.omegaPad, with(Items.copper, 100), () -> { + node(Blocks.glaivePad, with(Items.copper, 100)); + }); + }); + }); + + node(Blocks.spiritFactory, with(Items.copper, 100), () -> { + node(Blocks.daggerFactory, with(Items.copper, 100), () -> { + node(Blocks.daggerFactory, with(Items.copper, 100), () -> { + node(Blocks.titanFactory, with(Items.copper, 100), () -> { + node(Blocks.fortressFactory, with(Items.copper, 100)); + }); + node(Blocks.wraithFactory, with(Items.copper, 100), () -> { + node(Blocks.phantomFactory, with(Items.copper, 100)); + node(Blocks.ghoulFactory, with(Items.copper, 100), () -> { + node(Blocks.revenantFactory, with(Items.copper, 100)); + }); + }); + }); + }); + }); + }); + }); + }); + } + + private TechNode node(Block block, ItemStack[] requirements, Runnable children){ + return new TechNode(block, requirements, children); + } + + private TechNode node(Block block, ItemStack[] requirements){ + return new TechNode(block, requirements, () -> {}); + } + + private TechNode node(Block block){ + return new TechNode(block, with(), () -> {}); } public static class TechNode{ + static TechNode context; + public final Block block; public final ItemStack[] requirements; - public final TechNode[] children; - public TechNode parent; + public final Array children = new Array<>(); + + TechNode(Block block, ItemStack[] requirements, Runnable children){ + if(block != null && Recipe.getByResult(block) == null) throw new IllegalArgumentException("Block " + block + " does not have a recipe."); + if(context != null){ + context.children.add(this); + } - TechNode(Block block, ItemStack[] requirements, TechNode... children){ this.block = block; this.requirements = requirements; - this.children = children; - for(TechNode node : children){ - node.parent = this; - } + + TechNode last = context; + context = this; + children.run(); + context = last; } } } diff --git a/core/src/io/anuke/mindustry/ui/TreeLayout.java b/core/src/io/anuke/mindustry/ui/TreeLayout.java index 0531222f10..209e3a5110 100644 --- a/core/src/io/anuke/mindustry/ui/TreeLayout.java +++ b/core/src/io/anuke/mindustry/ui/TreeLayout.java @@ -68,7 +68,7 @@ public class TreeLayout{ } public Rectangle getBounds(){ - return new Rectangle(0, 0, boundsRight - boundsLeft, boundsBottom - boundsTop); + return new Rectangle(boundsLeft, boundsBottom, boundsRight - boundsLeft, boundsTop - boundsBottom); } private void calcSizeOfLevels(TreeNode node, int level){ diff --git a/core/src/io/anuke/mindustry/ui/dialogs/TechTreeDialog.java b/core/src/io/anuke/mindustry/ui/dialogs/TechTreeDialog.java index 0c0fb5a566..5264d1144b 100644 --- a/core/src/io/anuke/mindustry/ui/dialogs/TechTreeDialog.java +++ b/core/src/io/anuke/mindustry/ui/dialogs/TechTreeDialog.java @@ -1,6 +1,6 @@ package io.anuke.mindustry.ui.dialogs; -import io.anuke.arc.Core; +import io.anuke.arc.collection.Array; import io.anuke.arc.collection.ObjectSet; import io.anuke.arc.graphics.g2d.Draw; import io.anuke.arc.graphics.g2d.Lines; @@ -12,31 +12,46 @@ import io.anuke.arc.scene.Element; import io.anuke.arc.scene.event.InputEvent; import io.anuke.arc.scene.event.InputListener; import io.anuke.arc.util.Log; -import io.anuke.mindustry.Vars; +import io.anuke.arc.util.Structs; import io.anuke.mindustry.content.Blocks; import io.anuke.mindustry.content.TechTree; import io.anuke.mindustry.content.TechTree.TechNode; import io.anuke.mindustry.graphics.Palette; +import io.anuke.mindustry.type.Recipe; import io.anuke.mindustry.type.Recipe.RecipeVisibility; import io.anuke.mindustry.ui.TreeLayout; import io.anuke.mindustry.ui.TreeLayout.TreeNode; import io.anuke.mindustry.world.Block.Icon; +import static io.anuke.mindustry.Vars.content; + public class TechTreeDialog extends FloatingDialog{ - private TreeLayout layout; private ObjectSet nodes = new ObjectSet<>(); + private static final float nodeSize = 60f; public TechTreeDialog(){ super("$techtree"); - layout = new TreeLayout(); + TreeLayout layout = new TreeLayout(); layout.gapBetweenLevels = 60f; layout.gapBetweenNodes = 40f; layout.layout(new TechTreeNode(TechTree.root, null)); cont.add(new View()).grow(); - double total = Vars.content.recipes().count(r -> r.visibility == RecipeVisibility.all); - if(total > nodes.size) Log.err("Recipe tree coverage: {0}%", (int)(nodes.size / total * 100)); + { //debug code + ObjectSet used = new ObjectSet<>(); + for(TechTreeNode node : nodes){ + if(node.node.block != null) used.add(Recipe.getByResult(node.node.block)); + } + Array recipes = content.recipes().select(r -> r.visibility == RecipeVisibility.all && !used.contains(r)); + recipes.sort(Structs.comparing(r -> r.cost)); + + if(recipes.size > 0){ + Log.info("Recipe tree coverage: {0}%", (int)((float)nodes.size / content.recipes().select(r -> r.visibility == RecipeVisibility.all).size * 100)); + Log.info("Missing items: "); + recipes.forEach(r -> Log.info(" {0}", r)); + } + } addCloseButton(); } @@ -47,12 +62,12 @@ public class TechTreeDialog extends FloatingDialog{ public TechTreeNode(TechNode node, TreeNode parent){ this.node = node; this.parent = parent; - this.width = this.height = 60f; + this.width = this.height = nodeSize; nodes.add(this); if(node.children != null){ - children = new TechTreeNode[node.children.length]; + children = new TechTreeNode[node.children.size]; for(int i = 0; i < children.length; i++){ - children[i] = new TechTreeNode(node.children[i], this); + children[i] = new TechTreeNode(node.children.get(i), this); } } } @@ -64,15 +79,19 @@ public class TechTreeDialog extends FloatingDialog{ { addListener(new InputListener(){ + float lastX, lastY; @Override - public void touchDragged(InputEvent event, float x, float y, int pointer){ - super.touchDragged(event, x, y, pointer); - panX += Core.input.deltaX(pointer); - panY += Core.input.deltaY(pointer); + public void touchDragged(InputEvent event, float mx, float my, int pointer){ + panX -= lastX - mx; + panY -= lastY - my; + lastX = mx; + lastY = my; } @Override public boolean touchDown(InputEvent event, float x, float y, int pointer, KeyCode button){ + lastX = x; + lastY = y; return true; } }); @@ -97,7 +116,7 @@ public class TechTreeDialog extends FloatingDialog{ Draw.color(); for(TechTreeNode node : nodes){ - Draw.drawable("content-background", node.x + offsetX - node.width/2f, node.y + offsetY - node.height/2f, node.width, node.height); + Draw.drawable("content-background", node.x + offsetX - nodeSize/2f, node.y + offsetY - nodeSize/2f, nodeSize, nodeSize); TextureRegion region = node.node.block == null ? Blocks.core.icon(Icon.medium) : node.node.block.icon(Icon.medium); Draw.rect(region, node.x + offsetX, node.y + offsetY - 0.5f, region.getWidth(), region.getHeight()); diff --git a/core/src/io/anuke/mindustry/ui/fragments/MenuFragment.java b/core/src/io/anuke/mindustry/ui/fragments/MenuFragment.java index d925633ce6..fee1474081 100644 --- a/core/src/io/anuke/mindustry/ui/fragments/MenuFragment.java +++ b/core/src/io/anuke/mindustry/ui/fragments/MenuFragment.java @@ -19,6 +19,18 @@ public class MenuFragment extends Fragment{ @Override public void build(Group parent){ + + if(true){ + parent.fill(t -> { + t.add("do not play the bleeding edge").get().setFontScale(2f); + t.row(); + t.add("none of it is playable yet"); + t.row(); + t.add("something usable will be released 'soon' (TM)").get().setFontScale(0.5f); + }); + return; + } + parent.fill(c -> { container = c; container.visible(() -> state.is(State.menu));