diff --git a/core/assets-raw/sprites/items/item-dense-alloy.png b/core/assets-raw/sprites/items/item-dense-alloy.png deleted file mode 100644 index 84831fe96c..0000000000 Binary files a/core/assets-raw/sprites/items/item-dense-alloy.png and /dev/null differ diff --git a/core/assets-raw/sprites/ui/content-background-locked.9.png b/core/assets-raw/sprites/ui/content-background-locked.9.png new file mode 100644 index 0000000000..8b3ac94f48 Binary files /dev/null and b/core/assets-raw/sprites/ui/content-background-locked.9.png differ diff --git a/core/assets-raw/sprites/ui/content-background-over.9.png b/core/assets-raw/sprites/ui/content-background-over.9.png index 2b5f1c3306..8993b24afa 100644 Binary files a/core/assets-raw/sprites/ui/content-background-over.9.png and b/core/assets-raw/sprites/ui/content-background-over.9.png differ diff --git a/core/assets-raw/sprites/ui/content-background.9.png b/core/assets-raw/sprites/ui/content-background.9.png index 1ddbf727fa..4f2012fce3 100644 Binary files a/core/assets-raw/sprites/ui/content-background.9.png and b/core/assets-raw/sprites/ui/content-background.9.png differ diff --git a/core/assets-raw/sprites/ui/icons/icon-info.png b/core/assets-raw/sprites/ui/icons/icon-info.png index d3af92f26d..ac482f4194 100644 Binary files a/core/assets-raw/sprites/ui/icons/icon-info.png and b/core/assets-raw/sprites/ui/icons/icon-info.png differ diff --git a/core/assets-raw/sprites/ui/icons/icon-nullitem.png b/core/assets-raw/sprites/ui/icons/icon-nullitem.png deleted file mode 100644 index 1897820730..0000000000 Binary files a/core/assets-raw/sprites/ui/icons/icon-nullitem.png and /dev/null differ diff --git a/core/assets-raw/sprites/ui/icons/icon-tree-locked.png b/core/assets-raw/sprites/ui/icons/icon-tree-locked.png new file mode 100644 index 0000000000..d6a6462d1c Binary files /dev/null and b/core/assets-raw/sprites/ui/icons/icon-tree-locked.png differ diff --git a/core/assets/bundles/bundle.properties b/core/assets/bundles/bundle.properties index 3aeb9a7f77..59c7a938af 100644 --- a/core/assets/bundles/bundle.properties +++ b/core/assets/bundles/bundle.properties @@ -51,6 +51,9 @@ name = Name: noname = Pick a[accent] player name[] first. filename = File Name: unlocked = New content unlocked! +completed = [accent]Completed +research = Research +researched = [LIGHT_GRAY]{0} researched. players = {0} players online players.single = {0} player online server.closing = [accent]Closing server... diff --git a/core/assets/sprites/sprites.atlas b/core/assets/sprites/sprites.atlas index 7aa7115ae1..c6df5e5165 100644 --- a/core/assets/sprites/sprites.atlas +++ b/core/assets/sprites/sprites.atlas @@ -48,308 +48,308 @@ overdrive-projector-top index: -1 shock-mine rotate: false - xy: 915, 107 + xy: 1625, 1077 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 bridge-conveyor rotate: false - xy: 1343, 1349 + xy: 1343, 1383 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 bridge-conveyor-bridge rotate: false - xy: 1377, 1383 + xy: 1377, 1417 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 bridge-conveyor-end rotate: false - xy: 1411, 1417 + xy: 1343, 1349 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 conveyor-0-0 rotate: false - xy: 1751, 1417 + xy: 1683, 1349 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 conveyor-0-1 rotate: false - xy: 1717, 1349 + xy: 1717, 1383 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 conveyor-0-2 rotate: false - xy: 1751, 1383 + xy: 1751, 1417 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 conveyor-0-3 rotate: false - xy: 1785, 1417 + xy: 1717, 1349 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 conveyor-1-0 rotate: false - xy: 1751, 1349 + xy: 1751, 1383 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 conveyor-1-1 rotate: false - xy: 1785, 1383 + xy: 1785, 1417 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 conveyor-1-2 rotate: false - xy: 1819, 1417 + xy: 1751, 1349 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 conveyor-1-3 rotate: false - xy: 1785, 1349 + xy: 1785, 1383 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 conveyor-2-0 rotate: false - xy: 1819, 1383 + xy: 1819, 1417 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 conveyor-2-1 rotate: false - xy: 1853, 1417 + xy: 1785, 1349 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 conveyor-2-2 rotate: false - xy: 1819, 1349 + xy: 1819, 1383 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 conveyor-2-3 rotate: false - xy: 1853, 1383 + xy: 1853, 1417 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 conveyor-3-0 rotate: false - xy: 1887, 1417 + xy: 1819, 1349 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 conveyor-3-1 rotate: false - xy: 1853, 1349 + xy: 1853, 1383 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 conveyor-3-2 rotate: false - xy: 1887, 1383 + xy: 1887, 1417 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 conveyor-3-3 rotate: false - xy: 1921, 1417 + xy: 1853, 1349 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 conveyor-4-0 rotate: false - xy: 1887, 1349 + xy: 1887, 1383 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 conveyor-4-1 rotate: false - xy: 1921, 1383 + xy: 1921, 1417 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 conveyor-4-2 rotate: false - xy: 1955, 1417 + xy: 1887, 1349 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 conveyor-4-3 rotate: false - xy: 1921, 1349 + xy: 1921, 1383 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 titanium-conveyor-0-0 rotate: false - xy: 1591, 1111 + xy: 1251, 975 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 titanium-conveyor-0-1 rotate: false - xy: 1625, 1111 + xy: 1285, 1009 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 titanium-conveyor-0-2 rotate: false - xy: 1659, 1111 + xy: 1285, 975 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 titanium-conveyor-0-3 rotate: false - xy: 1693, 1111 + xy: 1319, 1009 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 titanium-conveyor-1-0 rotate: false - xy: 1727, 1111 + xy: 1319, 975 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 titanium-conveyor-1-1 rotate: false - xy: 1761, 1111 + xy: 1353, 1009 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 titanium-conveyor-1-2 rotate: false - xy: 1795, 1111 + xy: 1353, 975 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 titanium-conveyor-1-3 rotate: false - xy: 1829, 1111 + xy: 1387, 1009 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 titanium-conveyor-2-0 rotate: false - xy: 1863, 1111 + xy: 1387, 975 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 titanium-conveyor-2-1 rotate: false - xy: 1897, 1111 + xy: 1421, 1009 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 titanium-conveyor-2-2 rotate: false - xy: 1931, 1111 + xy: 1421, 975 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 titanium-conveyor-2-3 rotate: false - xy: 1965, 1111 + xy: 1455, 1009 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 titanium-conveyor-3-0 rotate: false - xy: 1999, 1111 + xy: 1455, 975 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 titanium-conveyor-3-1 rotate: false - xy: 1115, 1095 + xy: 1489, 1009 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 titanium-conveyor-3-2 rotate: false - xy: 1149, 1073 + xy: 1489, 975 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 titanium-conveyor-3-3 rotate: false - xy: 1183, 1073 + xy: 1523, 1009 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 titanium-conveyor-4-0 rotate: false - xy: 1217, 1073 + xy: 1523, 975 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 titanium-conveyor-4-1 rotate: false - xy: 1251, 1077 + xy: 1557, 1009 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 titanium-conveyor-4-2 rotate: false - xy: 1285, 1077 + xy: 1557, 975 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 titanium-conveyor-4-3 rotate: false - xy: 1319, 1077 + xy: 1591, 1009 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -363,7 +363,7 @@ distributor index: -1 junction rotate: false - xy: 1709, 1281 + xy: 1505, 1281 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -384,49 +384,49 @@ mass-driver-turret index: -1 overflow-gate rotate: false - xy: 817, 617 + xy: 787, 855 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 phase-conveyor rotate: false - xy: 881, 583 + xy: 1217, 1141 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 phase-conveyor-arrow rotate: false - xy: 753, 549 + xy: 1251, 1145 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 phase-conveyor-bridge rotate: false - xy: 787, 549 + xy: 1285, 1145 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 phase-conveyor-end rotate: false - xy: 821, 549 + xy: 1319, 1145 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 router rotate: false - xy: 847, 141 + xy: 1863, 1111 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 sorter rotate: false - xy: 1353, 1145 + xy: 1217, 1039 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -622,28 +622,28 @@ water-extractor-top index: -1 blackrock1 rotate: false - xy: 1173, 1379 + xy: 753, 528 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 blackstone1 rotate: false - xy: 1207, 1417 + xy: 1173, 1379 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 blackstone2 rotate: false - xy: 1207, 1383 + xy: 1173, 1345 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 blackstone3 rotate: false - xy: 1241, 1417 + xy: 1207, 1417 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -657,84 +657,84 @@ blackstoneedge index: -1 coal1 rotate: false - xy: 1411, 1383 + xy: 1411, 1417 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 coal2 rotate: false - xy: 1445, 1417 + xy: 1377, 1349 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 coal3 rotate: false - xy: 1411, 1349 + xy: 1411, 1383 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 copper1 rotate: false - xy: 1989, 1417 + xy: 1921, 1349 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 copper2 rotate: false - xy: 1955, 1349 + xy: 1955, 1383 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 copper3 rotate: false - xy: 1989, 1383 + xy: 1989, 1417 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 deepwater rotate: false - xy: 1445, 1315 + xy: 1377, 1315 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 deepwater-icon-full rotate: false - xy: 1445, 1315 + xy: 1377, 1315 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 deepwater-icon-medium rotate: false - xy: 1445, 1315 + xy: 1377, 1315 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 dirt1 rotate: false - xy: 1513, 1315 + xy: 1445, 1315 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 dirt2 rotate: false - xy: 1547, 1315 + xy: 1479, 1315 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 dirt3 rotate: false - xy: 1581, 1315 + xy: 1513, 1315 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -748,49 +748,49 @@ dirtedge index: -1 generic-cliff-edge rotate: false - xy: 1157, 1243 + xy: 1165, 1277 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 generic-cliff-edge-1 rotate: false - xy: 1157, 1209 + xy: 1157, 1243 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 generic-cliff-edge-2 rotate: false - xy: 779, 291 + xy: 1157, 1209 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 generic-cliff-side rotate: false - xy: 779, 257 + xy: 779, 291 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 grass1 rotate: false - xy: 779, 155 + xy: 779, 189 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 grass2 rotate: false - xy: 779, 121 + xy: 779, 155 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 grass3 rotate: false - xy: 779, 87 + xy: 779, 121 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -804,21 +804,21 @@ grassedge index: -1 ice1 rotate: false - xy: 909, 1083 + xy: 877, 967 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ice2 rotate: false - xy: 943, 1091 + xy: 909, 1083 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ice3 rotate: false - xy: 977, 1099 + xy: 943, 1091 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -832,21 +832,21 @@ iceedge index: -1 icerock1 rotate: false - xy: 1041, 1215 + xy: 1011, 1099 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 icerock2 rotate: false - xy: 271, 76 + xy: 1041, 1215 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 lava rotate: false - xy: 1879, 1281 + xy: 1675, 1281 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -860,63 +860,63 @@ lavaedge index: -1 lead1 rotate: false - xy: 1947, 1281 + xy: 1743, 1281 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 lead2 rotate: false - xy: 1981, 1281 + xy: 1777, 1281 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 lead3 rotate: false - xy: 2015, 1281 + xy: 1811, 1281 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 metalfloor1 rotate: false - xy: 979, 955 + xy: 1293, 1247 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 metalfloor2 rotate: false - xy: 1013, 997 + xy: 1293, 1213 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 metalfloor3 rotate: false - xy: 1013, 963 + xy: 1327, 1247 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 metalfloor4 rotate: false - xy: 1047, 997 + xy: 1327, 1213 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 metalfloor5 rotate: false - xy: 1047, 963 + xy: 1361, 1247 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 metalfloor6 rotate: false - xy: 1225, 1243 + xy: 1361, 1213 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -930,49 +930,49 @@ metalflooredge index: -1 rock1 rotate: false - xy: 813, 175 + xy: 1625, 1111 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 rock2 rotate: false - xy: 847, 209 + xy: 1659, 1111 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 rocks1 rotate: false - xy: 813, 141 + xy: 1727, 1111 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 rocks2 rotate: false - xy: 847, 175 + xy: 1761, 1111 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 sand1 rotate: false - xy: 847, 73 + xy: 1115, 1095 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 sand2 rotate: false - xy: 881, 107 + xy: 1149, 1073 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 sand3 rotate: false - xy: 881, 73 + xy: 1183, 1073 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -986,49 +986,49 @@ sandedge index: -1 scrap1 rotate: false - xy: 906, 39 + xy: 1353, 1077 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 scrap2 rotate: false - xy: 906, 5 + xy: 1387, 1077 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 scrap3 rotate: false - xy: 915, 311 + xy: 1421, 1077 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 shrub rotate: false - xy: 940, 5 + xy: 1727, 1077 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 snow1 rotate: false - xy: 1183, 1175 + xy: 1829, 1077 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 snow2 rotate: false - xy: 1217, 1175 + xy: 1863, 1077 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 snow3 rotate: false - xy: 1115, 1163 + xy: 1897, 1077 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -1042,21 +1042,21 @@ snowedge index: -1 space rotate: false - xy: 1421, 1145 + xy: 1285, 1043 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 space-icon-full rotate: false - xy: 1421, 1145 + xy: 1285, 1043 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 space-icon-medium rotate: false - xy: 1421, 1145 + xy: 1285, 1043 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -1070,49 +1070,49 @@ spaceedge index: -1 stone-cliff-edge rotate: false - xy: 1693, 1145 + xy: 1557, 1043 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 stone-cliff-edge-1 rotate: false - xy: 1727, 1145 + xy: 1591, 1043 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 stone-cliff-edge-2 rotate: false - xy: 1761, 1145 + xy: 1625, 1043 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 stone-cliff-side rotate: false - xy: 1795, 1145 + xy: 1659, 1043 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 stone1 rotate: false - xy: 1591, 1145 + xy: 1455, 1043 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 stone2 rotate: false - xy: 1625, 1145 + xy: 1489, 1043 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 stone3 rotate: false - xy: 1659, 1145 + xy: 1523, 1043 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -1126,21 +1126,21 @@ stoneedge index: -1 tar rotate: false - xy: 1999, 1145 + xy: 1863, 1043 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 tar-icon-full rotate: false - xy: 1999, 1145 + xy: 1863, 1043 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 tar-icon-medium rotate: false - xy: 1999, 1145 + xy: 1863, 1043 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -1154,91 +1154,91 @@ taredge index: -1 thorium1 rotate: false - xy: 1217, 1107 + xy: 1999, 1043 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 thorium2 rotate: false - xy: 1251, 1111 + xy: 1115, 1027 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 thorium3 rotate: false - xy: 1285, 1111 + xy: 1115, 993 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 titanium1 rotate: false - xy: 1489, 1111 + xy: 1217, 1005 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 titanium2 rotate: false - xy: 1523, 1111 + xy: 1251, 1009 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 titanium3 rotate: false - xy: 1557, 1111 + xy: 1217, 971 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 water rotate: false - xy: 1693, 1077 + xy: 1761, 975 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 water-icon-full rotate: false - xy: 1693, 1077 + xy: 1761, 975 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 water-icon-medium rotate: false - xy: 1693, 1077 + xy: 1761, 975 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 water-cliff-edge rotate: false - xy: 1727, 1077 + xy: 1795, 1009 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 water-cliff-edge-1 rotate: false - xy: 1761, 1077 + xy: 1795, 975 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 water-cliff-edge-2 rotate: false - xy: 1795, 1077 + xy: 1829, 1009 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 water-cliff-side rotate: false - xy: 1829, 1077 + xy: 1829, 975 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -1252,28 +1252,28 @@ wateredge index: -1 block-border rotate: false - xy: 1309, 1417 + xy: 1241, 1349 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-middle rotate: false - xy: 1275, 1349 + xy: 1275, 1383 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 pump-liquid rotate: false - xy: 1275, 1349 + xy: 1275, 1383 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 conduit-liquid rotate: false - xy: 1649, 1417 + xy: 1581, 1349 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -1329,175 +1329,175 @@ rubble-3-1 index: -1 spawn rotate: false - xy: 1455, 1145 + xy: 1319, 1043 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 bridge-conduit rotate: false - xy: 1309, 1383 + xy: 1309, 1417 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 bridge-conduit-arrow rotate: false - xy: 1343, 1417 + xy: 1275, 1349 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 bridge-conveyor-arrow rotate: false - xy: 1343, 1417 + xy: 1275, 1349 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 bridge-conduit-bridge rotate: false - xy: 1309, 1349 + xy: 1309, 1383 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 bridge-conduit-end rotate: false - xy: 1343, 1383 + xy: 1343, 1417 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 conduit-bottom rotate: false - xy: 1547, 1417 + xy: 1479, 1349 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 conduit-bottom-0 rotate: false - xy: 1513, 1349 + xy: 1513, 1383 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 conduit-bottom-1 rotate: false - xy: 1547, 1383 + xy: 1547, 1417 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 conduit-bottom-2 rotate: false - xy: 1581, 1417 + xy: 1513, 1349 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 conduit-bottom-3 rotate: false - xy: 1547, 1349 + xy: 1547, 1383 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 conduit-bottom-4 rotate: false - xy: 1581, 1383 + xy: 1581, 1417 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 conduit-bottom-5 rotate: false - xy: 1615, 1417 + xy: 1547, 1349 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 conduit-bottom-6 rotate: false - xy: 1581, 1349 + xy: 1581, 1383 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 conduit-top-0 rotate: false - xy: 1615, 1349 + xy: 1615, 1383 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 conduit-top-1 rotate: false - xy: 1649, 1383 + xy: 1649, 1417 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 conduit-top-2 rotate: false - xy: 1683, 1417 + xy: 1615, 1349 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 conduit-top-3 rotate: false - xy: 1649, 1349 + xy: 1649, 1383 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 conduit-top-4 rotate: false - xy: 1683, 1383 + xy: 1683, 1417 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 conduit-top-5 rotate: false - xy: 1717, 1417 + xy: 1649, 1349 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 conduit-top-6 rotate: false - xy: 1683, 1349 + xy: 1683, 1383 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 liquid-junction rotate: false - xy: 787, 821 + xy: 911, 967 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 liquid-router-bottom rotate: false - xy: 783, 719 + xy: 943, 1057 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 liquid-router-liquid rotate: false - xy: 783, 651 + xy: 961, 1023 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 liquid-router-top rotate: false - xy: 783, 617 + xy: 995, 1031 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -1525,84 +1525,84 @@ liquid-tank-top index: -1 mechanical-pump rotate: false - xy: 961, 1023 + xy: 1047, 997 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 phase-conduit rotate: false - xy: 851, 753 + xy: 1183, 1175 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 phase-conduit-arrow rotate: false - xy: 851, 719 + xy: 1217, 1175 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 phase-conduit-bridge rotate: false - xy: 851, 685 + xy: 1115, 1163 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 phase-conduit-end rotate: false - xy: 851, 651 + xy: 1149, 1141 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 pulse-conduit-top-0 rotate: false - xy: 855, 413 + xy: 1965, 1145 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 pulse-conduit-top-1 rotate: false - xy: 821, 379 + xy: 1999, 1145 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 pulse-conduit-top-2 rotate: false - xy: 889, 413 + xy: 1115, 1129 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 pulse-conduit-top-3 rotate: false - xy: 855, 379 + xy: 1149, 1107 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 pulse-conduit-top-4 rotate: false - xy: 821, 345 + xy: 1183, 1107 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 pulse-conduit-top-5 rotate: false - xy: 889, 379 + xy: 1217, 1107 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 pulse-conduit-top-6 rotate: false - xy: 855, 345 + xy: 1251, 1111 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -1679,7 +1679,7 @@ trident-ship-pad index: -1 battery rotate: false - xy: 711, 605 + xy: 749, 630 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -1693,14 +1693,14 @@ battery-large index: -1 combustion-generator rotate: false - xy: 1445, 1383 + xy: 1445, 1417 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 combustion-generator-top rotate: false - xy: 1445, 1349 + xy: 1445, 1383 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -1763,7 +1763,7 @@ fusion-reactor-top index: -1 power-node rotate: false - xy: 787, 413 + xy: 1625, 1145 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -1777,28 +1777,28 @@ power-node-large index: -1 power-source rotate: false - xy: 821, 447 + xy: 1727, 1145 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 power-void rotate: false - xy: 889, 481 + xy: 1795, 1145 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 powerinfinite rotate: false - xy: 821, 413 + xy: 1863, 1145 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 powervoid rotate: false - xy: 787, 345 + xy: 1897, 1145 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -1812,14 +1812,14 @@ rtg-generator index: -1 rtg-generator-top rotate: false - xy: 847, 107 + xy: 1965, 1111 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 solar-panel rotate: false - xy: 1183, 1141 + xy: 1965, 1077 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -2022,42 +2022,42 @@ incinerator index: -1 item-source rotate: false - xy: 1403, 1281 + xy: 1199, 1277 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 item-void rotate: false - xy: 1607, 1281 + xy: 1403, 1281 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 lavasmelter rotate: false - xy: 1913, 1281 + xy: 1709, 1281 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 liquid-source rotate: false - xy: 777, 951 + xy: 945, 989 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 melter rotate: false - xy: 945, 989 + xy: 1225, 1209 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 oilrefinery rotate: false - xy: 1259, 1213 + xy: 1429, 1247 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -2099,14 +2099,14 @@ plastanium-compressor-top index: -1 pulverizer rotate: false - xy: 889, 345 + xy: 1285, 1111 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 pulverizer-rotator rotate: false - xy: 813, 277 + xy: 1353, 1111 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -2120,14 +2120,14 @@ pyratite-mixer index: -1 separator rotate: false - xy: 915, 209 + xy: 1523, 1077 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 separator-liquid rotate: false - xy: 915, 141 + xy: 1591, 1077 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -2141,14 +2141,14 @@ silicon-smelter index: -1 smelter rotate: false - xy: 1149, 1175 + xy: 1795, 1077 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 solidifer rotate: false - xy: 1285, 1145 + xy: 1149, 1039 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -2190,14 +2190,14 @@ launch-pad index: -1 sortedunloader rotate: false - xy: 1319, 1145 + xy: 1183, 1039 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 unloader rotate: false - xy: 1591, 1077 + xy: 1727, 1009 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -2211,14 +2211,14 @@ vault index: -1 block-1 rotate: false - xy: 1241, 1349 + xy: 1241, 1383 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-1-top rotate: false - xy: 1275, 1383 + xy: 1275, 1417 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -2267,14 +2267,14 @@ block-4-top index: -1 arc rotate: false - xy: 749, 703 + xy: 749, 732 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 arc-heat rotate: false - xy: 749, 669 + xy: 749, 698 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -2288,7 +2288,7 @@ cyclone index: -1 duo rotate: false - xy: 1819, 1315 + xy: 1751, 1315 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -2302,7 +2302,7 @@ fuse index: -1 hail rotate: false - xy: 843, 967 + xy: 779, 53 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -2386,21 +2386,21 @@ salvo-panel-right index: -1 scatter rotate: false - xy: 872, 39 + xy: 1251, 1077 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 scorch rotate: false - xy: 838, 5 + xy: 1285, 1077 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 scorch-shoot rotate: false - xy: 872, 5 + xy: 1319, 1077 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -2568,14 +2568,14 @@ reconstructor-open index: -1 repair-point rotate: false - xy: 847, 277 + xy: 1455, 1111 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 repair-point-turret rotate: false - xy: 813, 209 + xy: 1523, 1111 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -2638,7 +2638,7 @@ wraith-factory-top-open index: -1 copper-wall rotate: false - xy: 1989, 1349 + xy: 1955, 1349 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -2652,7 +2652,7 @@ copper-wall-large index: -1 door rotate: false - xy: 1683, 1315 + xy: 1615, 1315 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -2673,14 +2673,14 @@ door-large-open index: -1 door-open rotate: false - xy: 1785, 1315 + xy: 1717, 1315 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 phase-wall rotate: false - xy: 889, 549 + xy: 1387, 1145 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -2694,7 +2694,7 @@ phase-wall-large index: -1 surge-wall rotate: false - xy: 1863, 1145 + xy: 1727, 1043 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -2708,7 +2708,7 @@ surge-wall-large index: -1 thorium-wall rotate: false - xy: 1353, 1111 + xy: 1115, 959 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -2722,7 +2722,7 @@ thorium-wall-large index: -1 titanium-wall rotate: false - xy: 1387, 1077 + xy: 1625, 1009 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -2736,7 +2736,7 @@ titanium-wall-large index: -1 beam rotate: false - xy: 2027, 1061 + xy: 1101, 1207 size: 4, 48 orig: 4, 48 offset: 0, 0 @@ -2764,42 +2764,42 @@ bullet-back index: -1 casing rotate: false - xy: 2038, 1833 + xy: 1135, 907 size: 8, 16 orig: 8, 16 offset: 0, 0 index: -1 command-attack rotate: false - xy: 1479, 1383 + xy: 1479, 1417 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 command-idle rotate: false - xy: 1513, 1417 + xy: 1445, 1349 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 command-patrol rotate: false - xy: 1479, 1349 + xy: 1479, 1383 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 command-retreat rotate: false - xy: 1513, 1383 + xy: 1513, 1417 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 enemyarrow rotate: false - xy: 707, 575 + xy: 1853, 1319 size: 32, 28 orig: 32, 28 offset: 0, 0 @@ -2813,7 +2813,7 @@ error index: -1 laser rotate: false - xy: 2041, 1231 + xy: 2038, 1801 size: 4, 48 orig: 4, 48 offset: 0, 0 @@ -2834,7 +2834,7 @@ laserfull index: -1 minelaser rotate: false - xy: 2041, 1181 + xy: 2041, 1233 size: 4, 48 orig: 4, 48 offset: 0, 0 @@ -2848,63 +2848,63 @@ minelaser-end index: -1 missile rotate: false - xy: 711, 773 + xy: 711, 744 size: 36, 36 orig: 36, 36 offset: 0, 0 index: -1 missile-back rotate: false - xy: 711, 735 + xy: 711, 706 size: 36, 36 orig: 36, 36 offset: 0, 0 index: -1 scale_marker rotate: false - xy: 777, 927 + xy: 837, 987 size: 4, 4 orig: 4, 4 offset: 0, 0 index: -1 scorch1 rotate: false - xy: 1115, 993 + xy: 817, 753 size: 28, 100 orig: 28, 100 offset: 0, 0 index: -1 scorch2 rotate: false - xy: 1145, 971 + xy: 817, 651 size: 28, 100 orig: 28, 100 offset: 0, 0 index: -1 scorch3 rotate: false - xy: 1175, 971 + xy: 813, 256 size: 28, 100 orig: 28, 100 offset: 0, 0 index: -1 scorch4 rotate: false - xy: 1205, 971 + xy: 813, 154 size: 28, 100 orig: 28, 100 offset: 0, 0 index: -1 scorch5 rotate: false - xy: 1235, 971 + xy: 821, 549 size: 28, 100 orig: 28, 100 offset: 0, 0 index: -1 shell rotate: false - xy: 711, 639 + xy: 711, 610 size: 36, 36 orig: 36, 36 offset: 0, 0 @@ -2918,21 +2918,21 @@ shell-back index: -1 shot rotate: false - xy: 940, 39 + xy: 1693, 1077 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 transfer rotate: false - xy: 1957, 991 + xy: 2041, 1183 size: 4, 48 orig: 4, 48 offset: 0, 0 index: -1 transfer-arrow rotate: false - xy: 1489, 1077 + xy: 1659, 975 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -2960,14 +2960,14 @@ alloy-smelter-icon-large index: -1 alloy-smelter-icon-medium rotate: false - xy: 749, 771 + xy: 749, 800 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 alloy-smelter-icon-small rotate: false - xy: 2023, 1425 + xy: 787, 332 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -2988,28 +2988,28 @@ alpha-mech-pad-icon-large index: -1 alpha-mech-pad-icon-medium rotate: false - xy: 749, 737 + xy: 749, 766 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 alpha-mech-pad-icon-small rotate: false - xy: 2023, 1399 + xy: 2023, 1425 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 arc-icon-full rotate: false - xy: 749, 635 + xy: 749, 664 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 arc-icon-medium rotate: false - xy: 749, 635 + xy: 749, 664 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -3023,21 +3023,21 @@ arc-icon-large index: -1 arc-icon-small rotate: false - xy: 2023, 1373 + xy: 2023, 1399 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 battery-icon-full rotate: false - xy: 745, 601 + xy: 749, 596 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 battery-icon-medium rotate: false - xy: 745, 601 + xy: 749, 596 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -3051,7 +3051,7 @@ battery-icon-large index: -1 battery-icon-small rotate: false - xy: 2023, 1347 + xy: 2023, 1373 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -3079,7 +3079,7 @@ battery-large-icon-medium index: -1 battery-large-icon-small rotate: false - xy: 2023, 1321 + xy: 2023, 1347 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -3100,28 +3100,28 @@ biomattercompressor-icon-large index: -1 biomattercompressor-icon-medium rotate: false - xy: 1173, 1413 + xy: 753, 562 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 biomattercompressor-icon-small rotate: false - xy: 1144, 945 + xy: 2023, 1321 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 blackrock-icon-full rotate: false - xy: 1173, 1345 + xy: 1173, 1413 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 blackrock-icon-medium rotate: false - xy: 1173, 1345 + xy: 1173, 1413 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -3135,21 +3135,21 @@ blackrock-icon-large index: -1 blackrock-icon-small rotate: false - xy: 1170, 945 + xy: 2023, 1295 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 blackstone-icon-full rotate: false - xy: 1207, 1349 + xy: 1207, 1383 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 blackstone-icon-medium rotate: false - xy: 1207, 1349 + xy: 1207, 1383 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -3163,7 +3163,7 @@ blackstone-icon-large index: -1 blackstone-icon-small rotate: false - xy: 1196, 945 + xy: 821, 523 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -3184,14 +3184,14 @@ blast-drill-icon-large index: -1 blast-drill-icon-medium rotate: false - xy: 1241, 1383 + xy: 1241, 1417 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 blast-drill-icon-small rotate: false - xy: 1222, 945 + xy: 813, 65 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -3212,28 +3212,28 @@ blast-mixer-icon-large index: -1 blast-mixer-icon-medium rotate: false - xy: 1275, 1417 + xy: 1207, 1349 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 blast-mixer-icon-small rotate: false - xy: 945, 929 + xy: 821, 497 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 bridge-conduit-icon-full rotate: false - xy: 1377, 1417 + xy: 1309, 1349 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 bridge-conduit-icon-medium rotate: false - xy: 1377, 1417 + xy: 1309, 1349 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -3247,21 +3247,21 @@ bridge-conduit-icon-large index: -1 bridge-conduit-icon-small rotate: false - xy: 971, 929 + xy: 821, 471 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 bridge-conveyor-icon-full rotate: false - xy: 1377, 1349 + xy: 1377, 1383 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 bridge-conveyor-icon-medium rotate: false - xy: 1377, 1349 + xy: 1377, 1383 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -3275,21 +3275,21 @@ bridge-conveyor-icon-large index: -1 bridge-conveyor-icon-small rotate: false - xy: 1265, 1051 + xy: 821, 445 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 combustion-generator-icon-full rotate: false - xy: 1479, 1417 + xy: 1411, 1349 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 combustion-generator-icon-medium rotate: false - xy: 1479, 1417 + xy: 1411, 1349 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -3303,21 +3303,21 @@ combustion-generator-icon-large index: -1 combustion-generator-icon-small rotate: false - xy: 1265, 1025 + xy: 821, 393 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 conduit-icon-full rotate: false - xy: 1615, 1383 + xy: 1615, 1417 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 conduit-icon-medium rotate: false - xy: 1615, 1383 + xy: 1615, 1417 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -3331,7 +3331,7 @@ conduit-icon-large index: -1 conduit-icon-small rotate: false - xy: 1317, 1051 + xy: 821, 367 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -3352,28 +3352,28 @@ container-icon-large index: -1 container-icon-medium rotate: false - xy: 1717, 1383 + xy: 1717, 1417 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 container-icon-small rotate: false - xy: 1265, 999 + xy: 1075, 1231 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 conveyor-icon-full rotate: false - xy: 1955, 1383 + xy: 1955, 1417 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 conveyor-icon-medium rotate: false - xy: 1955, 1383 + xy: 1955, 1417 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -3387,21 +3387,21 @@ conveyor-icon-large index: -1 conveyor-icon-small rotate: false - xy: 1291, 1025 + xy: 260, 8 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 copper-wall-icon-full rotate: false - xy: 1173, 1311 + xy: 1989, 1383 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 copper-wall-icon-medium rotate: false - xy: 1173, 1311 + xy: 1989, 1383 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -3415,7 +3415,7 @@ copper-wall-icon-large index: -1 copper-wall-icon-small rotate: false - xy: 1343, 1051 + xy: 811, 967 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -3436,14 +3436,14 @@ copper-wall-large-icon-large index: -1 copper-wall-large-icon-medium rotate: false - xy: 1207, 1315 + xy: 1989, 1349 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 copper-wall-large-icon-small rotate: false - xy: 1265, 973 + xy: 811, 941 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -3464,14 +3464,14 @@ core-icon-large index: -1 core-icon-medium rotate: false - xy: 1241, 1315 + xy: 1173, 1311 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 core-icon-small rotate: false - xy: 1291, 999 + xy: 837, 941 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -3492,14 +3492,14 @@ cryofluidmixer-icon-large index: -1 cryofluidmixer-icon-medium rotate: false - xy: 1275, 1315 + xy: 1207, 1315 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 cryofluidmixer-icon-small rotate: false - xy: 1317, 1025 + xy: 863, 941 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -3520,14 +3520,14 @@ cultivator-icon-large index: -1 cultivator-icon-medium rotate: false - xy: 1309, 1315 + xy: 1241, 1315 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 cultivator-icon-small rotate: false - xy: 1369, 1051 + xy: 889, 941 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -3548,14 +3548,14 @@ cyclone-icon-large index: -1 cyclone-icon-medium rotate: false - xy: 1343, 1315 + xy: 1275, 1315 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 cyclone-icon-small rotate: false - xy: 1291, 973 + xy: 915, 941 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -3576,14 +3576,14 @@ dagger-factory-icon-large index: -1 dagger-factory-icon-medium rotate: false - xy: 1377, 1315 + xy: 1309, 1315 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 dagger-factory-icon-small rotate: false - xy: 1317, 999 + xy: 1075, 1205 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -3604,14 +3604,14 @@ dart-ship-pad-icon-large index: -1 dart-ship-pad-icon-medium rotate: false - xy: 1411, 1315 + xy: 1343, 1315 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 dart-ship-pad-icon-small rotate: false - xy: 1343, 1025 + xy: 1149, 945 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -3625,7 +3625,7 @@ deepwater-icon-large index: -1 deepwater-icon-small rotate: false - xy: 1395, 1051 + xy: 1175, 945 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -3646,28 +3646,28 @@ delta-mech-pad-icon-large index: -1 delta-mech-pad-icon-medium rotate: false - xy: 1479, 1315 + xy: 1411, 1315 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 delta-mech-pad-icon-small rotate: false - xy: 1317, 973 + xy: 1201, 945 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 dirt-icon-full rotate: false - xy: 1615, 1315 + xy: 1547, 1315 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 dirt-icon-medium rotate: false - xy: 1615, 1315 + xy: 1547, 1315 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -3681,7 +3681,7 @@ dirt-icon-large index: -1 dirt-icon-small rotate: false - xy: 1343, 999 + xy: 1227, 945 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -3702,28 +3702,28 @@ distributor-icon-large index: -1 distributor-icon-medium rotate: false - xy: 1649, 1315 + xy: 1581, 1315 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 distributor-icon-small rotate: false - xy: 1369, 1025 + xy: 1253, 949 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 door-icon-full rotate: false - xy: 1717, 1315 + xy: 1649, 1315 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 door-icon-medium rotate: false - xy: 1717, 1315 + xy: 1649, 1315 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -3737,7 +3737,7 @@ door-icon-large index: -1 door-icon-small rotate: false - xy: 1421, 1051 + xy: 1279, 949 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -3758,28 +3758,28 @@ door-large-icon-large index: -1 door-large-icon-medium rotate: false - xy: 1751, 1315 + xy: 1683, 1315 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 door-large-icon-small rotate: false - xy: 1343, 973 + xy: 1305, 949 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 duo-icon-full rotate: false - xy: 1853, 1315 + xy: 1785, 1315 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 duo-icon-medium rotate: false - xy: 1853, 1315 + xy: 1785, 1315 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -3793,7 +3793,7 @@ duo-icon-large index: -1 duo-icon-small rotate: false - xy: 1369, 999 + xy: 1331, 949 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -3814,14 +3814,14 @@ force-projector-icon-large index: -1 force-projector-icon-medium rotate: false - xy: 1921, 1315 + xy: 1887, 1315 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 force-projector-icon-small rotate: false - xy: 1395, 1025 + xy: 1357, 949 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -3842,14 +3842,14 @@ fortress-factory-icon-large index: -1 fortress-factory-icon-medium rotate: false - xy: 1955, 1315 + xy: 1921, 1315 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 fortress-factory-icon-small rotate: false - xy: 1447, 1051 + xy: 1383, 949 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -3870,14 +3870,14 @@ fuse-icon-large index: -1 fuse-icon-medium rotate: false - xy: 1989, 1315 + xy: 1955, 1315 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 fuse-icon-small rotate: false - xy: 1369, 973 + xy: 1409, 949 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -3898,14 +3898,14 @@ fusion-reactor-icon-large index: -1 fusion-reactor-icon-medium rotate: false - xy: 1165, 1277 + xy: 1989, 1315 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 fusion-reactor-icon-small rotate: false - xy: 1395, 999 + xy: 1435, 949 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -3926,14 +3926,14 @@ ghoul-factory-icon-large index: -1 ghoul-factory-icon-medium rotate: false - xy: 779, 223 + xy: 779, 257 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ghoul-factory-icon-small rotate: false - xy: 1421, 1025 + xy: 1461, 949 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -3954,28 +3954,28 @@ glaive-ship-pad-icon-large index: -1 glaive-ship-pad-icon-medium rotate: false - xy: 779, 189 + xy: 779, 223 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 glaive-ship-pad-icon-small rotate: false - xy: 1473, 1051 + xy: 1487, 949 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 grass-icon-full rotate: false - xy: 779, 53 + xy: 779, 87 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 grass-icon-medium rotate: false - xy: 779, 53 + xy: 779, 87 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -3989,21 +3989,21 @@ grass-icon-large index: -1 grass-icon-small rotate: false - xy: 1395, 973 + xy: 1513, 949 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 hail-icon-full rotate: false - xy: 877, 967 + xy: 843, 967 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 hail-icon-medium rotate: false - xy: 877, 967 + xy: 843, 967 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -4017,21 +4017,21 @@ hail-icon-large index: -1 hail-icon-small rotate: false - xy: 1421, 999 + xy: 1539, 949 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 ice-icon-full rotate: false - xy: 1011, 1099 + xy: 977, 1099 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ice-icon-medium rotate: false - xy: 1011, 1099 + xy: 977, 1099 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -4045,21 +4045,21 @@ ice-icon-large index: -1 ice-icon-small rotate: false - xy: 1447, 1025 + xy: 1565, 949 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 icerock-icon-full rotate: false - xy: 305, 77 + xy: 271, 76 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 icerock-icon-medium rotate: false - xy: 305, 77 + xy: 271, 76 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -4073,7 +4073,7 @@ icerock-icon-large index: -1 icerock-icon-small rotate: false - xy: 1499, 1051 + xy: 1591, 949 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -4101,21 +4101,21 @@ incinerator-icon-large index: -1 incinerator-icon-small rotate: false - xy: 1421, 973 + xy: 1617, 949 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 item-source-icon-full rotate: false - xy: 1437, 1281 + xy: 1233, 1281 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 item-source-icon-medium rotate: false - xy: 1437, 1281 + xy: 1233, 1281 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -4129,21 +4129,21 @@ item-source-icon-large index: -1 item-source-icon-small rotate: false - xy: 1473, 1025 + xy: 1669, 949 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 item-void-icon-full rotate: false - xy: 1641, 1281 + xy: 1437, 1281 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 item-void-icon-medium rotate: false - xy: 1641, 1281 + xy: 1437, 1281 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -4157,7 +4157,7 @@ item-void-icon-large index: -1 item-void-icon-small rotate: false - xy: 1525, 1051 + xy: 1695, 949 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -4178,28 +4178,28 @@ javelin-ship-pad-icon-large index: -1 javelin-ship-pad-icon-medium rotate: false - xy: 1675, 1281 + xy: 1471, 1281 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 javelin-ship-pad-icon-small rotate: false - xy: 1473, 999 + xy: 1721, 949 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 junction-icon-full rotate: false - xy: 1743, 1281 + xy: 1539, 1281 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 junction-icon-medium rotate: false - xy: 1743, 1281 + xy: 1539, 1281 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -4213,7 +4213,7 @@ junction-icon-large index: -1 junction-icon-small rotate: false - xy: 1499, 1025 + xy: 1747, 949 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -4234,14 +4234,14 @@ lancer-icon-large index: -1 lancer-icon-medium rotate: false - xy: 1777, 1281 + xy: 1573, 1281 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 lancer-icon-small rotate: false - xy: 1551, 1051 + xy: 1773, 949 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -4262,14 +4262,14 @@ laser-drill-icon-large index: -1 laser-drill-icon-medium rotate: false - xy: 1811, 1281 + xy: 1607, 1281 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 laser-drill-icon-small rotate: false - xy: 1499, 999 + xy: 1799, 949 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -4290,28 +4290,28 @@ launch-pad-icon-large index: -1 launch-pad-icon-medium rotate: false - xy: 1845, 1281 + xy: 1641, 1281 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 launch-pad-icon-small rotate: false - xy: 1525, 1025 + xy: 1825, 949 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 liquid-junction-icon-full rotate: false - xy: 786, 787 + xy: 977, 1065 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 liquid-junction-icon-medium rotate: false - xy: 786, 787 + xy: 977, 1065 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -4325,21 +4325,21 @@ liquid-junction-icon-large index: -1 liquid-junction-icon-small rotate: false - xy: 1577, 1051 + xy: 1851, 949 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 liquid-router-icon-full rotate: false - xy: 783, 685 + xy: 927, 1023 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 liquid-router-icon-medium rotate: false - xy: 783, 685 + xy: 927, 1023 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -4353,21 +4353,21 @@ liquid-router-icon-large index: -1 liquid-router-icon-small rotate: false - xy: 1525, 999 + xy: 1145, 919 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 liquid-source-icon-full rotate: false - xy: 911, 967 + xy: 945, 955 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 liquid-source-icon-medium rotate: false - xy: 911, 967 + xy: 945, 955 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -4381,7 +4381,7 @@ liquid-source-icon-large index: -1 liquid-source-icon-small rotate: false - xy: 1551, 1025 + xy: 1171, 919 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -4402,14 +4402,14 @@ liquid-tank-icon-large index: -1 liquid-tank-icon-medium rotate: false - xy: 977, 1065 + xy: 979, 989 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 liquid-tank-icon-small rotate: false - xy: 1603, 1051 + xy: 1197, 919 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -4430,14 +4430,14 @@ mass-driver-icon-large index: -1 mass-driver-icon-medium rotate: false - xy: 943, 1057 + xy: 1013, 997 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 mass-driver-icon-small rotate: false - xy: 1551, 999 + xy: 1223, 919 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -4514,28 +4514,28 @@ mechanical-drill-icon-large index: -1 mechanical-drill-icon-medium rotate: false - xy: 927, 1023 + xy: 1013, 963 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 mechanical-drill-icon-small rotate: false - xy: 1577, 1025 + xy: 1669, 923 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 mechanical-pump-icon-full rotate: false - xy: 995, 1031 + xy: 1047, 963 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 mechanical-pump-icon-medium rotate: false - xy: 995, 1031 + xy: 1047, 963 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -4549,7 +4549,7 @@ mechanical-pump-icon-large index: -1 mechanical-pump-icon-small rotate: false - xy: 1629, 1051 + xy: 1695, 923 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -4570,28 +4570,28 @@ meltdown-icon-large index: -1 meltdown-icon-medium rotate: false - xy: 1029, 1031 + xy: 1225, 1243 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 meltdown-icon-small rotate: false - xy: 1577, 999 + xy: 1721, 923 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 melter-icon-full rotate: false - xy: 945, 955 + xy: 1259, 1247 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 melter-icon-medium rotate: false - xy: 945, 955 + xy: 1259, 1247 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -4605,7 +4605,7 @@ melter-icon-large index: -1 melter-icon-small rotate: false - xy: 1603, 1025 + xy: 1747, 923 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -4626,28 +4626,28 @@ mend-projector-icon-large index: -1 mend-projector-icon-medium rotate: false - xy: 979, 989 + xy: 1259, 1213 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 mend-projector-icon-small rotate: false - xy: 1655, 1051 + xy: 1773, 923 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 metalfloor-icon-full rotate: false - xy: 1225, 1209 + xy: 1395, 1247 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 metalfloor-icon-medium rotate: false - xy: 1225, 1209 + xy: 1395, 1247 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -4661,7 +4661,7 @@ metalfloor-icon-large index: -1 metalfloor-icon-small rotate: false - xy: 1603, 999 + xy: 1799, 923 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -4682,14 +4682,14 @@ oil-extractor-icon-large index: -1 oil-extractor-icon-medium rotate: false - xy: 1259, 1247 + xy: 1395, 1213 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 oil-extractor-icon-small rotate: false - xy: 1629, 1025 + xy: 1825, 923 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -4710,14 +4710,14 @@ omega-mech-pad-icon-large index: -1 omega-mech-pad-icon-medium rotate: false - xy: 1293, 1247 + xy: 1429, 1213 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 omega-mech-pad-icon-small rotate: false - xy: 1681, 1051 + xy: 1851, 923 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -4731,42 +4731,42 @@ ore-coal-blackstone-icon-large index: -1 ore-coal-blackstone-icon-small rotate: false - xy: 1629, 999 + xy: 2022, 1017 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 ore-coal-blackstone1 rotate: false - xy: 1293, 1213 + xy: 1463, 1247 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-coal-blackstone2 rotate: false - xy: 1327, 1247 + xy: 1463, 1213 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-coal-blackstone3 rotate: false - xy: 1327, 1213 + xy: 1497, 1247 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-coal-blackstone-icon-full rotate: false - xy: 1327, 1213 + xy: 1497, 1247 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-coal-blackstone-icon-medium rotate: false - xy: 1327, 1213 + xy: 1497, 1247 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -4780,42 +4780,42 @@ ore-coal-grass-icon-large index: -1 ore-coal-grass-icon-small rotate: false - xy: 1655, 1025 + xy: 941, 929 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 ore-coal-grass1 rotate: false - xy: 1361, 1247 + xy: 1497, 1213 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-coal-grass2 rotate: false - xy: 1361, 1213 + xy: 1531, 1247 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-coal-grass3 rotate: false - xy: 1395, 1247 + xy: 1531, 1213 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-coal-grass-icon-full rotate: false - xy: 1395, 1247 + xy: 1531, 1213 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-coal-grass-icon-medium rotate: false - xy: 1395, 1247 + xy: 1531, 1213 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -4829,42 +4829,42 @@ ore-coal-ice-icon-large index: -1 ore-coal-ice-icon-small rotate: false - xy: 1707, 1051 + xy: 967, 929 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 ore-coal-ice1 rotate: false - xy: 1395, 1213 + xy: 1565, 1247 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-coal-ice2 rotate: false - xy: 1429, 1247 + xy: 1565, 1213 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-coal-ice3 rotate: false - xy: 1429, 1213 + xy: 1599, 1247 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-coal-ice-icon-full rotate: false - xy: 1429, 1213 + xy: 1599, 1247 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-coal-ice-icon-medium rotate: false - xy: 1429, 1213 + xy: 1599, 1247 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -4878,42 +4878,42 @@ ore-coal-sand-icon-large index: -1 ore-coal-sand-icon-small rotate: false - xy: 1655, 999 + xy: 1051, 1136 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 ore-coal-sand1 rotate: false - xy: 1463, 1247 + xy: 1599, 1213 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-coal-sand2 rotate: false - xy: 1463, 1213 + xy: 1633, 1247 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-coal-sand3 rotate: false - xy: 1497, 1247 + xy: 1633, 1213 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-coal-sand-icon-full rotate: false - xy: 1497, 1247 + xy: 1633, 1213 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-coal-sand-icon-medium rotate: false - xy: 1497, 1247 + xy: 1633, 1213 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -4927,42 +4927,42 @@ ore-coal-snow-icon-large index: -1 ore-coal-snow-icon-small rotate: false - xy: 1681, 1025 + xy: 2022, 991 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 ore-coal-snow1 rotate: false - xy: 1497, 1213 + xy: 1667, 1247 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-coal-snow2 rotate: false - xy: 1531, 1247 + xy: 1667, 1213 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-coal-snow3 rotate: false - xy: 1531, 1213 + xy: 1701, 1247 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-coal-snow-icon-full rotate: false - xy: 1531, 1213 + xy: 1701, 1247 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-coal-snow-icon-medium rotate: false - xy: 1531, 1213 + xy: 1701, 1247 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -4976,42 +4976,42 @@ ore-coal-stone-icon-large index: -1 ore-coal-stone-icon-small rotate: false - xy: 1733, 1051 + xy: 1877, 943 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 ore-coal-stone1 rotate: false - xy: 1565, 1247 + xy: 1701, 1213 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-coal-stone2 rotate: false - xy: 1565, 1213 + 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 @@ -5025,42 +5025,42 @@ ore-copper-blackstone-icon-large index: -1 ore-copper-blackstone-icon-small rotate: false - xy: 1681, 999 + xy: 1903, 943 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 ore-copper-blackstone1 rotate: false - xy: 1599, 1213 + xy: 1769, 1247 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-copper-blackstone2 rotate: false - xy: 1633, 1247 + xy: 1769, 1213 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-copper-blackstone3 rotate: false - xy: 1633, 1213 + xy: 1803, 1247 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-copper-blackstone-icon-full rotate: false - xy: 1633, 1213 + xy: 1803, 1247 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-copper-blackstone-icon-medium rotate: false - xy: 1633, 1213 + xy: 1803, 1247 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -5074,42 +5074,42 @@ ore-copper-grass-icon-large index: -1 ore-copper-grass-icon-small rotate: false - xy: 1707, 1025 + xy: 1929, 943 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 ore-copper-grass1 rotate: false - xy: 1667, 1247 + xy: 1803, 1213 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-copper-grass2 rotate: false - xy: 1667, 1213 + xy: 1013, 929 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-copper-grass3 rotate: false - xy: 1701, 1247 + xy: 1047, 929 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-copper-grass-icon-full rotate: false - xy: 1701, 1247 + xy: 1047, 929 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-copper-grass-icon-medium rotate: false - xy: 1701, 1247 + xy: 1047, 929 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -5123,42 +5123,42 @@ ore-copper-ice-icon-large index: -1 ore-copper-ice-icon-small rotate: false - xy: 1759, 1051 + xy: 1877, 917 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 ore-copper-ice1 rotate: false - xy: 1701, 1213 + xy: 1837, 1247 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-copper-ice2 rotate: false - xy: 1735, 1247 + xy: 1837, 1213 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-copper-ice3 rotate: false - xy: 1735, 1213 + xy: 1871, 1247 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-copper-ice-icon-full rotate: false - xy: 1735, 1213 + xy: 1871, 1247 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-copper-ice-icon-medium rotate: false - xy: 1735, 1213 + xy: 1871, 1247 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -5172,42 +5172,42 @@ ore-copper-sand-icon-large index: -1 ore-copper-sand-icon-small rotate: false - xy: 1707, 999 + xy: 1903, 917 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 ore-copper-sand1 rotate: false - xy: 1769, 1247 + xy: 1871, 1213 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-copper-sand2 rotate: false - xy: 1769, 1213 + xy: 1905, 1247 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-copper-sand3 rotate: false - xy: 1803, 1247 + xy: 1905, 1213 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-copper-sand-icon-full rotate: false - xy: 1803, 1247 + xy: 1905, 1213 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-copper-sand-icon-medium rotate: false - xy: 1803, 1247 + xy: 1905, 1213 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -5221,42 +5221,42 @@ ore-copper-snow-icon-large index: -1 ore-copper-snow-icon-small rotate: false - xy: 1733, 1025 + xy: 1929, 917 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 ore-copper-snow1 rotate: false - xy: 1803, 1213 + xy: 1939, 1247 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-copper-snow2 rotate: false - xy: 1837, 1247 + xy: 1939, 1213 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-copper-snow3 rotate: false - xy: 1837, 1213 + xy: 1973, 1247 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-copper-snow-icon-full rotate: false - xy: 1837, 1213 + xy: 1973, 1247 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-copper-snow-icon-medium rotate: false - xy: 1837, 1213 + xy: 1973, 1247 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -5270,42 +5270,42 @@ ore-copper-stone-icon-large index: -1 ore-copper-stone-icon-small rotate: false - xy: 1785, 1051 + xy: 1962, 983 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 ore-copper-stone1 rotate: false - xy: 1871, 1247 + xy: 1973, 1213 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-copper-stone2 rotate: false - xy: 1871, 1213 + xy: 2007, 1247 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-copper-stone3 rotate: false - xy: 1905, 1247 + xy: 2007, 1213 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-copper-stone-icon-full rotate: false - xy: 1905, 1247 + xy: 2007, 1213 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-copper-stone-icon-medium rotate: false - xy: 1905, 1247 + xy: 2007, 1213 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -5319,42 +5319,42 @@ ore-lead-blackstone-icon-large index: -1 ore-lead-blackstone-icon-small rotate: false - xy: 1733, 999 + xy: 1988, 983 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 ore-lead-blackstone1 rotate: false - xy: 1905, 1213 + xy: 1045, 1099 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-lead-blackstone2 rotate: false - xy: 1939, 1247 + xy: 1045, 1065 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-lead-blackstone3 rotate: false - xy: 1939, 1213 + xy: 1063, 1031 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-lead-blackstone-icon-full rotate: false - xy: 1939, 1213 + xy: 1063, 1031 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-lead-blackstone-icon-medium rotate: false - xy: 1939, 1213 + xy: 1063, 1031 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -5368,42 +5368,42 @@ ore-lead-grass-icon-large index: -1 ore-lead-grass-icon-small rotate: false - xy: 1759, 1025 + xy: 1958, 957 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 ore-lead-grass1 rotate: false - xy: 1973, 1247 + xy: 1081, 997 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-lead-grass2 rotate: false - xy: 1973, 1213 + xy: 1081, 963 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-lead-grass3 rotate: false - xy: 2007, 1247 + xy: 1081, 929 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-lead-grass-icon-full rotate: false - xy: 2007, 1247 + xy: 1081, 929 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-lead-grass-icon-medium rotate: false - xy: 2007, 1247 + xy: 1081, 929 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -5417,42 +5417,42 @@ ore-lead-ice-icon-large index: -1 ore-lead-ice-icon-small rotate: false - xy: 1811, 1051 + xy: 1984, 957 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 ore-lead-ice1 rotate: false - xy: 2007, 1213 + xy: 1259, 1179 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-lead-ice2 rotate: false - xy: 1013, 929 + xy: 1293, 1179 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-lead-ice3 rotate: false - xy: 1047, 929 + xy: 1327, 1179 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-lead-ice-icon-full rotate: false - xy: 1047, 929 + xy: 1327, 1179 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-lead-ice-icon-medium rotate: false - xy: 1047, 929 + xy: 1327, 1179 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -5466,42 +5466,42 @@ ore-lead-sand-icon-large index: -1 ore-lead-sand-icon-small rotate: false - xy: 1759, 999 + xy: 1955, 931 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 ore-lead-sand1 rotate: false - xy: 1045, 1099 + xy: 1361, 1179 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-lead-sand2 rotate: false - xy: 1045, 1065 + xy: 1395, 1179 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-lead-sand3 rotate: false - xy: 1063, 1031 + xy: 1429, 1179 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-lead-sand-icon-full rotate: false - xy: 1063, 1031 + xy: 1429, 1179 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-lead-sand-icon-medium rotate: false - xy: 1063, 1031 + xy: 1429, 1179 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -5515,42 +5515,42 @@ ore-lead-snow-icon-large index: -1 ore-lead-snow-icon-small rotate: false - xy: 1785, 1025 + xy: 1981, 931 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 ore-lead-snow1 rotate: false - xy: 1081, 997 + xy: 1463, 1179 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-lead-snow2 rotate: false - xy: 1081, 963 + xy: 1497, 1179 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-lead-snow3 rotate: false - xy: 1081, 929 + xy: 1531, 1179 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-lead-snow-icon-full rotate: false - xy: 1081, 929 + xy: 1531, 1179 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-lead-snow-icon-medium rotate: false - xy: 1081, 929 + xy: 1531, 1179 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -5564,42 +5564,42 @@ ore-lead-stone-icon-large index: -1 ore-lead-stone-icon-small rotate: false - xy: 1837, 1051 + xy: 1955, 905 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 ore-lead-stone1 rotate: false - xy: 813, 583 + xy: 1565, 1179 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-lead-stone2 rotate: false - xy: 1259, 1179 + xy: 1599, 1179 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-lead-stone3 rotate: false - xy: 1293, 1179 + xy: 1633, 1179 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-lead-stone-icon-full rotate: false - xy: 1293, 1179 + xy: 1633, 1179 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-lead-stone-icon-medium rotate: false - xy: 1293, 1179 + xy: 1633, 1179 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -5613,42 +5613,42 @@ ore-scrap-blackstone-icon-large index: -1 ore-scrap-blackstone-icon-small rotate: false - xy: 1785, 999 + xy: 1981, 905 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 ore-scrap-blackstone1 rotate: false - xy: 1327, 1179 + xy: 1667, 1179 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-scrap-blackstone2 rotate: false - xy: 1361, 1179 + xy: 1701, 1179 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-scrap-blackstone3 rotate: false - xy: 1395, 1179 + xy: 1735, 1179 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-scrap-blackstone-icon-full rotate: false - xy: 1395, 1179 + xy: 1735, 1179 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-scrap-blackstone-icon-medium rotate: false - xy: 1395, 1179 + xy: 1735, 1179 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -5662,42 +5662,42 @@ ore-scrap-grass-icon-large index: -1 ore-scrap-grass-icon-small rotate: false - xy: 1811, 1025 + xy: 847, 523 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 ore-scrap-grass1 rotate: false - xy: 1429, 1179 + xy: 1769, 1179 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-scrap-grass2 rotate: false - xy: 1463, 1179 + xy: 1803, 1179 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-scrap-grass3 rotate: false - xy: 1497, 1179 + xy: 1837, 1179 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-scrap-grass-icon-full rotate: false - xy: 1497, 1179 + xy: 1837, 1179 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-scrap-grass-icon-medium rotate: false - xy: 1497, 1179 + xy: 1837, 1179 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -5711,42 +5711,42 @@ ore-scrap-ice-icon-large index: -1 ore-scrap-ice-icon-small rotate: false - xy: 1863, 1051 + xy: 847, 497 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 ore-scrap-ice1 rotate: false - xy: 1531, 1179 + xy: 1871, 1179 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-scrap-ice2 rotate: false - xy: 1565, 1179 + xy: 1905, 1179 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-scrap-ice3 rotate: false - xy: 1599, 1179 + xy: 1939, 1179 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-scrap-ice-icon-full rotate: false - xy: 1599, 1179 + xy: 1939, 1179 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-scrap-ice-icon-medium rotate: false - xy: 1599, 1179 + xy: 1939, 1179 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -5760,42 +5760,42 @@ ore-scrap-sand-icon-large index: -1 ore-scrap-sand-icon-small rotate: false - xy: 1811, 999 + xy: 847, 471 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 ore-scrap-sand1 rotate: false - xy: 1633, 1179 + xy: 1973, 1179 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-scrap-sand2 rotate: false - xy: 1667, 1179 + xy: 2007, 1179 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-scrap-sand3 rotate: false - xy: 1701, 1179 + xy: 783, 800 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-scrap-sand-icon-full rotate: false - xy: 1701, 1179 + xy: 783, 800 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-scrap-sand-icon-medium rotate: false - xy: 1701, 1179 + xy: 783, 800 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -5809,42 +5809,42 @@ ore-scrap-snow-icon-large index: -1 ore-scrap-snow-icon-small rotate: false - xy: 1837, 1025 + xy: 847, 445 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 ore-scrap-snow1 rotate: false - xy: 1735, 1179 + xy: 783, 766 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-scrap-snow2 rotate: false - xy: 1769, 1179 + xy: 783, 732 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-scrap-snow3 rotate: false - xy: 1803, 1179 + xy: 783, 698 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-scrap-snow-icon-full rotate: false - xy: 1803, 1179 + xy: 783, 698 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-scrap-snow-icon-medium rotate: false - xy: 1803, 1179 + xy: 783, 698 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -5858,42 +5858,42 @@ ore-scrap-stone-icon-large index: -1 ore-scrap-stone-icon-small rotate: false - xy: 1889, 1051 + xy: 847, 419 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 ore-scrap-stone1 rotate: false - xy: 1837, 1179 + xy: 783, 664 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-scrap-stone2 rotate: false - xy: 1871, 1179 + xy: 783, 630 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-scrap-stone3 rotate: false - xy: 1905, 1179 + xy: 783, 596 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-scrap-stone-icon-full rotate: false - xy: 1905, 1179 + xy: 783, 596 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-scrap-stone-icon-medium rotate: false - xy: 1905, 1179 + xy: 783, 596 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -5907,42 +5907,42 @@ ore-thorium-blackstone-icon-large index: -1 ore-thorium-blackstone-icon-small rotate: false - xy: 1837, 999 + xy: 847, 393 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 ore-thorium-blackstone1 rotate: false - xy: 1939, 1179 + xy: 787, 562 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-thorium-blackstone2 rotate: false - xy: 1973, 1179 + xy: 787, 528 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-thorium-blackstone3 rotate: false - xy: 2007, 1179 + xy: 787, 494 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-thorium-blackstone-icon-full rotate: false - xy: 2007, 1179 + xy: 787, 494 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-thorium-blackstone-icon-medium rotate: false - xy: 2007, 1179 + xy: 787, 494 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -5956,42 +5956,42 @@ ore-thorium-grass-icon-large index: -1 ore-thorium-grass-icon-small rotate: false - xy: 1863, 1025 + xy: 847, 367 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 ore-thorium-grass1 rotate: false - xy: 294, 42 + xy: 787, 460 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-thorium-grass2 rotate: false - xy: 328, 43 + xy: 787, 426 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-thorium-grass3 rotate: false - xy: 362, 43 + xy: 787, 392 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-thorium-grass-icon-full rotate: false - xy: 362, 43 + xy: 787, 392 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-thorium-grass-icon-medium rotate: false - xy: 362, 43 + xy: 787, 392 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -6005,42 +6005,42 @@ ore-thorium-ice-icon-large index: -1 ore-thorium-ice-icon-small rotate: false - xy: 1915, 1051 + xy: 843, 341 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 ore-thorium-ice1 rotate: false - xy: 396, 43 + xy: 787, 358 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-thorium-ice2 rotate: false - xy: 430, 43 + xy: 294, 42 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-thorium-ice3 rotate: false - xy: 464, 43 + xy: 328, 43 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-thorium-ice-icon-full rotate: false - xy: 464, 43 + xy: 328, 43 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-thorium-ice-icon-medium rotate: false - xy: 464, 43 + xy: 328, 43 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -6054,42 +6054,42 @@ ore-thorium-sand-icon-large index: -1 ore-thorium-sand-icon-small rotate: false - xy: 1863, 999 + xy: 843, 315 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 ore-thorium-sand1 rotate: false - xy: 498, 43 + xy: 362, 43 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-thorium-sand2 rotate: false - xy: 532, 43 + xy: 396, 43 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-thorium-sand3 rotate: false - xy: 566, 43 + xy: 430, 43 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-thorium-sand-icon-full rotate: false - xy: 566, 43 + xy: 430, 43 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-thorium-sand-icon-medium rotate: false - xy: 566, 43 + xy: 430, 43 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -6103,42 +6103,42 @@ ore-thorium-snow-icon-large index: -1 ore-thorium-snow-icon-small rotate: false - xy: 1889, 1025 + xy: 843, 289 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 ore-thorium-snow1 rotate: false - xy: 294, 8 + xy: 464, 43 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-thorium-snow2 rotate: false - xy: 328, 9 + xy: 498, 43 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-thorium-snow3 rotate: false - xy: 362, 9 + xy: 532, 43 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-thorium-snow-icon-full rotate: false - xy: 362, 9 + xy: 532, 43 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-thorium-snow-icon-medium rotate: false - xy: 362, 9 + xy: 532, 43 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -6152,42 +6152,42 @@ ore-thorium-stone-icon-large index: -1 ore-thorium-stone-icon-small rotate: false - xy: 1889, 999 + xy: 843, 263 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 ore-thorium-stone1 rotate: false - xy: 396, 9 + xy: 566, 43 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-thorium-stone2 rotate: false - xy: 430, 9 + xy: 294, 8 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-thorium-stone3 rotate: false - xy: 464, 9 + xy: 328, 9 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-thorium-stone-icon-full rotate: false - xy: 464, 9 + xy: 328, 9 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-thorium-stone-icon-medium rotate: false - xy: 464, 9 + xy: 328, 9 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -6201,42 +6201,42 @@ ore-titanium-blackstone-icon-large index: -1 ore-titanium-blackstone-icon-small rotate: false - xy: 1915, 1025 + xy: 843, 237 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 ore-titanium-blackstone1 rotate: false - xy: 498, 9 + xy: 362, 9 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-titanium-blackstone2 rotate: false - xy: 532, 9 + xy: 396, 9 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-titanium-blackstone3 rotate: false - xy: 566, 9 + xy: 430, 9 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-titanium-blackstone-icon-full rotate: false - xy: 566, 9 + xy: 430, 9 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-titanium-blackstone-icon-medium rotate: false - xy: 566, 9 + xy: 430, 9 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -6250,42 +6250,42 @@ ore-titanium-grass-icon-large index: -1 ore-titanium-grass-icon-small rotate: false - xy: 1915, 999 + xy: 843, 211 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 ore-titanium-grass1 rotate: false - xy: 600, 41 + xy: 464, 9 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-titanium-grass2 rotate: false - xy: 634, 41 + xy: 498, 9 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-titanium-grass3 rotate: false - xy: 668, 41 + xy: 532, 9 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-titanium-grass-icon-full rotate: false - xy: 668, 41 + xy: 532, 9 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-titanium-grass-icon-medium rotate: false - xy: 668, 41 + xy: 532, 9 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -6299,42 +6299,42 @@ ore-titanium-ice-icon-large index: -1 ore-titanium-ice-icon-small rotate: false - xy: 260, 8 + xy: 843, 185 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 ore-titanium-ice1 rotate: false - xy: 702, 41 + xy: 566, 9 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-titanium-ice2 rotate: false - xy: 736, 41 + xy: 600, 41 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-titanium-ice3 rotate: false - xy: 600, 7 + xy: 634, 41 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-titanium-ice-icon-full rotate: false - xy: 600, 7 + xy: 634, 41 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-titanium-ice-icon-medium rotate: false - xy: 600, 7 + xy: 634, 41 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -6348,42 +6348,42 @@ ore-titanium-sand-icon-large index: -1 ore-titanium-sand-icon-small rotate: false - xy: 1248, 945 + xy: 843, 159 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 ore-titanium-sand1 rotate: false - xy: 634, 7 + xy: 668, 41 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-titanium-sand2 rotate: false - xy: 668, 7 + xy: 702, 41 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-titanium-sand3 rotate: false - xy: 702, 7 + xy: 736, 41 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-titanium-sand-icon-full rotate: false - xy: 702, 7 + xy: 736, 41 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-titanium-sand-icon-medium rotate: false - xy: 702, 7 + xy: 736, 41 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -6397,42 +6397,42 @@ ore-titanium-snow-icon-large index: -1 ore-titanium-snow-icon-small rotate: false - xy: 1274, 947 + xy: 843, 133 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 ore-titanium-snow1 rotate: false - xy: 736, 7 + xy: 600, 7 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-titanium-snow2 rotate: false - xy: 770, 19 + xy: 634, 7 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-titanium-snow3 rotate: false - xy: 804, 19 + xy: 668, 7 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-titanium-snow-icon-full rotate: false - xy: 804, 19 + xy: 668, 7 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-titanium-snow-icon-medium rotate: false - xy: 804, 19 + xy: 668, 7 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -6446,42 +6446,42 @@ ore-titanium-stone-icon-large index: -1 ore-titanium-stone-icon-small rotate: false - xy: 1300, 947 + xy: 842, 107 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 ore-titanium-stone1 rotate: false - xy: 817, 753 + xy: 702, 7 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-titanium-stone2 rotate: false - xy: 817, 719 + xy: 736, 7 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-titanium-stone3 rotate: false - xy: 817, 685 + xy: 770, 19 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-titanium-stone-icon-full rotate: false - xy: 817, 685 + xy: 770, 19 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-titanium-stone-icon-medium rotate: false - xy: 817, 685 + xy: 770, 19 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -6502,28 +6502,28 @@ overdrive-projector-icon-large index: -1 overdrive-projector-icon-medium rotate: false - xy: 817, 651 + xy: 804, 19 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 overdrive-projector-icon-small rotate: false - xy: 1326, 947 + xy: 842, 81 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 overflow-gate-icon-full rotate: false - xy: 820, 787 + xy: 1115, 1197 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 overflow-gate-icon-medium rotate: false - xy: 820, 787 + xy: 1115, 1197 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -6537,7 +6537,7 @@ overflow-gate-icon-large index: -1 overflow-gate-icon-small rotate: false - xy: 1352, 947 + xy: 839, 55 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -6558,28 +6558,28 @@ phantom-factory-icon-large index: -1 phantom-factory-icon-medium rotate: false - xy: 847, 583 + xy: 1149, 1175 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 phantom-factory-icon-small rotate: false - xy: 1378, 947 + xy: 838, 29 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 phase-conduit-icon-full rotate: false - xy: 851, 617 + xy: 1183, 1141 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 phase-conduit-icon-medium rotate: false - xy: 851, 617 + xy: 1183, 1141 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -6593,21 +6593,21 @@ phase-conduit-icon-large index: -1 phase-conduit-icon-small rotate: false - xy: 1404, 947 + xy: 838, 3 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 phase-conveyor-icon-full rotate: false - xy: 855, 549 + xy: 1353, 1145 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 phase-conveyor-icon-medium rotate: false - xy: 855, 549 + xy: 1353, 1145 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -6621,21 +6621,21 @@ phase-conveyor-icon-large index: -1 phase-conveyor-icon-small rotate: false - xy: 1430, 947 + xy: 1253, 923 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 phase-wall-icon-full rotate: false - xy: 787, 515 + xy: 1421, 1145 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 phase-wall-icon-medium rotate: false - xy: 787, 515 + xy: 1421, 1145 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -6649,7 +6649,7 @@ phase-wall-icon-large index: -1 phase-wall-icon-small rotate: false - xy: 1473, 973 + xy: 1279, 923 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -6670,14 +6670,14 @@ phase-wall-large-icon-large index: -1 phase-wall-large-icon-medium rotate: false - xy: 787, 481 + xy: 1455, 1145 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 phase-wall-large-icon-small rotate: false - xy: 1499, 973 + xy: 1305, 923 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -6698,14 +6698,14 @@ phase-weaver-icon-large index: -1 phase-weaver-icon-medium rotate: false - xy: 821, 515 + xy: 1489, 1145 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 phase-weaver-icon-small rotate: false - xy: 1525, 973 + xy: 1331, 923 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -6726,14 +6726,14 @@ plasma-drill-icon-large index: -1 plasma-drill-icon-medium rotate: false - xy: 787, 447 + xy: 1523, 1145 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 plasma-drill-icon-small rotate: false - xy: 1551, 973 + xy: 1357, 923 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -6754,14 +6754,14 @@ plastanium-compressor-icon-large index: -1 plastanium-compressor-icon-medium rotate: false - xy: 855, 515 + xy: 1557, 1145 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 plastanium-compressor-icon-small rotate: false - xy: 1577, 973 + xy: 1383, 923 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -6782,28 +6782,28 @@ pneumatic-drill-icon-large index: -1 pneumatic-drill-icon-medium rotate: false - xy: 821, 481 + xy: 1591, 1145 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 pneumatic-drill-icon-small rotate: false - xy: 1603, 973 + xy: 1409, 923 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 power-node-icon-full rotate: false - xy: 889, 515 + xy: 1659, 1145 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 power-node-icon-medium rotate: false - xy: 889, 515 + xy: 1659, 1145 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -6817,7 +6817,7 @@ power-node-icon-large index: -1 power-node-icon-small rotate: false - xy: 1629, 973 + xy: 1435, 923 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -6838,28 +6838,28 @@ power-node-large-icon-large index: -1 power-node-large-icon-medium rotate: false - xy: 855, 481 + xy: 1693, 1145 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 power-node-large-icon-small rotate: false - xy: 1655, 973 + xy: 1461, 923 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 power-source-icon-full rotate: false - xy: 787, 379 + xy: 1761, 1145 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 power-source-icon-medium rotate: false - xy: 787, 379 + xy: 1761, 1145 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -6873,21 +6873,21 @@ power-source-icon-large index: -1 power-source-icon-small rotate: false - xy: 1681, 973 + xy: 1487, 923 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 power-void-icon-full rotate: false - xy: 855, 447 + xy: 1829, 1145 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 power-void-icon-medium rotate: false - xy: 855, 447 + xy: 1829, 1145 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -6901,21 +6901,21 @@ power-void-icon-large index: -1 power-void-icon-small rotate: false - xy: 1707, 973 + xy: 1513, 923 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 pulse-conduit-icon-full rotate: false - xy: 889, 447 + xy: 1931, 1145 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 pulse-conduit-icon-medium rotate: false - xy: 889, 447 + xy: 1931, 1145 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -6929,21 +6929,21 @@ pulse-conduit-icon-large index: -1 pulse-conduit-icon-small rotate: false - xy: 1733, 973 + xy: 1539, 923 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 pulverizer-icon-full rotate: false - xy: 813, 311 + xy: 1319, 1111 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 pulverizer-icon-medium rotate: false - xy: 813, 311 + xy: 1319, 1111 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -6957,7 +6957,7 @@ pulverizer-icon-large index: -1 pulverizer-icon-small rotate: false - xy: 1759, 973 + xy: 1565, 923 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -6978,14 +6978,14 @@ pyratite-mixer-icon-large index: -1 pyratite-mixer-icon-medium rotate: false - xy: 847, 311 + xy: 1387, 1111 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 pyratite-mixer-icon-small rotate: false - xy: 1785, 973 + xy: 1591, 923 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -7006,28 +7006,28 @@ reconstructor-icon-large index: -1 reconstructor-icon-medium rotate: false - xy: 813, 243 + xy: 1421, 1111 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 reconstructor-icon-small rotate: false - xy: 1811, 973 + xy: 1617, 923 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 repair-point-icon-full rotate: false - xy: 881, 311 + xy: 1489, 1111 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 repair-point-icon-medium rotate: false - xy: 881, 311 + xy: 1489, 1111 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -7041,7 +7041,7 @@ repair-point-icon-large index: -1 repair-point-icon-small rotate: false - xy: 1837, 973 + xy: 1643, 907 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -7062,14 +7062,14 @@ revenant-factory-icon-large index: -1 revenant-factory-icon-medium rotate: false - xy: 847, 243 + xy: 1557, 1111 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 revenant-factory-icon-small rotate: false - xy: 1863, 973 + xy: 1669, 897 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -7090,28 +7090,28 @@ ripple-icon-large index: -1 ripple-icon-medium rotate: false - xy: 881, 277 + xy: 1591, 1111 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ripple-icon-small rotate: false - xy: 1889, 973 + xy: 1695, 897 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 rock-icon-full rotate: false - xy: 881, 243 + xy: 1693, 1111 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 rock-icon-medium rotate: false - xy: 881, 243 + xy: 1693, 1111 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -7125,21 +7125,21 @@ rock-icon-large index: -1 rock-icon-small rotate: false - xy: 1915, 973 + xy: 1721, 897 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 rocks-icon-full rotate: false - xy: 881, 209 + xy: 1795, 1111 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 rocks-icon-medium rotate: false - xy: 881, 209 + xy: 1795, 1111 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -7153,7 +7153,7 @@ rocks-icon-large index: -1 rocks-icon-small rotate: false - xy: 1144, 919 + xy: 1747, 897 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -7174,28 +7174,28 @@ rotary-pump-icon-large index: -1 rotary-pump-icon-medium rotate: false - xy: 813, 107 + xy: 1829, 1111 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 rotary-pump-icon-small rotate: false - xy: 1170, 919 + xy: 1773, 897 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 router-icon-full rotate: false - xy: 881, 175 + xy: 1897, 1111 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 router-icon-medium rotate: false - xy: 881, 175 + xy: 1897, 1111 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -7209,7 +7209,7 @@ router-icon-large index: -1 router-icon-small rotate: false - xy: 1196, 919 + xy: 1799, 897 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -7230,14 +7230,14 @@ rtg-generator-icon-large index: -1 rtg-generator-icon-medium rotate: false - xy: 813, 73 + xy: 1931, 1111 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 rtg-generator-icon-small rotate: false - xy: 1222, 919 + xy: 1825, 897 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -7258,28 +7258,28 @@ salvo-icon-large index: -1 salvo-icon-medium rotate: false - xy: 881, 141 + xy: 1999, 1111 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 salvo-icon-small rotate: false - xy: 1248, 919 + xy: 1851, 897 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 sand-icon-full rotate: false - xy: 838, 39 + xy: 1217, 1073 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 sand-icon-medium rotate: false - xy: 838, 39 + xy: 1217, 1073 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -7293,21 +7293,21 @@ sand-icon-large index: -1 sand-icon-small rotate: false - xy: 1274, 921 + xy: 1877, 891 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 separator-icon-full rotate: false - xy: 915, 175 + xy: 1557, 1077 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 separator-icon-medium rotate: false - xy: 915, 175 + xy: 1557, 1077 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -7321,21 +7321,21 @@ separator-icon-large index: -1 separator-icon-small rotate: false - xy: 1352, 921 + xy: 1929, 891 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 shock-mine-icon-full rotate: false - xy: 915, 73 + xy: 1659, 1077 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 shock-mine-icon-medium rotate: false - xy: 915, 73 + xy: 1659, 1077 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -7349,7 +7349,7 @@ shock-mine-icon-large index: -1 shock-mine-icon-small rotate: false - xy: 1378, 921 + xy: 1955, 879 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -7370,28 +7370,28 @@ silicon-smelter-icon-large index: -1 silicon-smelter-icon-medium rotate: false - xy: 1115, 1197 + xy: 1761, 1077 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 silicon-smelter-icon-small rotate: false - xy: 1404, 921 + xy: 1981, 879 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 snow-icon-full rotate: false - xy: 1149, 1141 + xy: 1931, 1077 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 snow-icon-medium rotate: false - xy: 1149, 1141 + xy: 1931, 1077 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -7405,21 +7405,21 @@ snow-icon-large index: -1 snow-icon-small rotate: false - xy: 1430, 921 + xy: 1929, 865 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 solar-panel-icon-full rotate: false - xy: 1217, 1141 + xy: 1999, 1077 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 solar-panel-icon-medium rotate: false - xy: 1217, 1141 + xy: 1999, 1077 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -7433,7 +7433,7 @@ solar-panel-icon-large index: -1 solar-panel-icon-small rotate: false - xy: 1274, 895 + xy: 1955, 853 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -7454,28 +7454,28 @@ solar-panel-large-icon-large index: -1 solar-panel-large-icon-medium rotate: false - xy: 1251, 1145 + xy: 1115, 1061 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 solar-panel-large-icon-small rotate: false - xy: 1352, 895 + xy: 1981, 853 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 sorter-icon-full rotate: false - xy: 1387, 1145 + xy: 1251, 1043 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 sorter-icon-medium rotate: false - xy: 1387, 1145 + xy: 1251, 1043 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -7489,7 +7489,7 @@ sorter-icon-large index: -1 sorter-icon-small rotate: false - xy: 1378, 895 + xy: 2010, 957 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -7503,21 +7503,21 @@ space-icon-large index: -1 space-icon-small rotate: false - xy: 1404, 895 + xy: 2007, 931 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 spawn-icon-full rotate: false - xy: 1489, 1145 + xy: 1353, 1043 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 spawn-icon-medium rotate: false - xy: 1489, 1145 + xy: 1353, 1043 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -7531,7 +7531,7 @@ spawn-icon-large index: -1 spawn-icon-small rotate: false - xy: 1430, 895 + xy: 2007, 905 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -7552,14 +7552,14 @@ spectre-icon-large index: -1 spectre-icon-medium rotate: false - xy: 1523, 1145 + xy: 1387, 1043 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 spectre-icon-small rotate: false - xy: 1326, 884 + xy: 2007, 879 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -7580,28 +7580,28 @@ spirit-factory-icon-large index: -1 spirit-factory-icon-medium rotate: false - xy: 1557, 1145 + xy: 1421, 1043 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 spirit-factory-icon-small rotate: false - xy: 1300, 879 + xy: 2007, 853 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 stone-icon-full rotate: false - xy: 1829, 1145 + xy: 1693, 1043 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 stone-icon-medium rotate: false - xy: 1829, 1145 + xy: 1693, 1043 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -7615,21 +7615,21 @@ stone-icon-large index: -1 stone-icon-small rotate: false - xy: 1352, 869 + xy: 869, 341 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 surge-wall-icon-full rotate: false - xy: 1897, 1145 + xy: 1761, 1043 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 surge-wall-icon-medium rotate: false - xy: 1897, 1145 + xy: 1761, 1043 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -7643,7 +7643,7 @@ surge-wall-icon-large index: -1 surge-wall-icon-small rotate: false - xy: 1378, 869 + xy: 869, 315 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -7664,14 +7664,14 @@ surge-wall-large-icon-large index: -1 surge-wall-large-icon-medium rotate: false - xy: 1931, 1145 + xy: 1795, 1043 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 surge-wall-large-icon-small rotate: false - xy: 1404, 869 + xy: 869, 289 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -7692,14 +7692,14 @@ swarmer-icon-large index: -1 swarmer-icon-medium rotate: false - xy: 1965, 1145 + xy: 1829, 1043 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 swarmer-icon-small rotate: false - xy: 1430, 869 + xy: 869, 263 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -7713,7 +7713,7 @@ tar-icon-large index: -1 tar-icon-small rotate: false - xy: 1326, 858 + xy: 869, 237 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -7734,14 +7734,14 @@ tau-mech-pad-icon-large index: -1 tau-mech-pad-icon-medium rotate: false - xy: 1115, 1129 + xy: 1897, 1043 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 tau-mech-pad-icon-small rotate: false - xy: 1352, 843 + xy: 869, 211 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -7762,14 +7762,14 @@ thermal-generator-icon-large index: -1 thermal-generator-icon-medium rotate: false - xy: 1149, 1107 + xy: 1931, 1043 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 thermal-generator-icon-small rotate: false - xy: 1378, 843 + xy: 869, 185 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -7790,14 +7790,14 @@ thermal-pump-icon-large index: -1 thermal-pump-icon-medium rotate: false - xy: 1183, 1107 + xy: 1965, 1043 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 thermal-pump-icon-small rotate: false - xy: 1404, 843 + xy: 869, 159 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -7818,28 +7818,28 @@ thorium-reactor-icon-large index: -1 thorium-reactor-icon-medium rotate: false - xy: 1319, 1111 + xy: 1149, 1005 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 thorium-reactor-icon-small rotate: false - xy: 1430, 843 + xy: 869, 133 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 thorium-wall-icon-full rotate: false - xy: 1387, 1111 + xy: 1149, 971 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 thorium-wall-icon-medium rotate: false - xy: 1387, 1111 + xy: 1149, 971 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -7853,7 +7853,7 @@ thorium-wall-icon-large index: -1 thorium-wall-icon-small rotate: false - xy: 1456, 947 + xy: 868, 107 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -7874,14 +7874,14 @@ thorium-wall-large-icon-large index: -1 thorium-wall-large-icon-medium rotate: false - xy: 1421, 1111 + xy: 1183, 1005 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 thorium-wall-large-icon-small rotate: false - xy: 1456, 921 + xy: 868, 81 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -7902,28 +7902,28 @@ titan-factory-icon-large index: -1 titan-factory-icon-medium rotate: false - xy: 1455, 1111 + xy: 1183, 971 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 titan-factory-icon-small rotate: false - xy: 1482, 947 + xy: 865, 55 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 titanium-conveyor-icon-full rotate: false - xy: 1353, 1077 + xy: 1591, 975 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 titanium-conveyor-icon-medium rotate: false - xy: 1353, 1077 + xy: 1591, 975 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -7937,21 +7937,21 @@ titanium-conveyor-icon-large index: -1 titanium-conveyor-icon-small rotate: false - xy: 1456, 895 + xy: 864, 29 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 titanium-wall-icon-full rotate: false - xy: 1421, 1077 + xy: 1625, 975 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 titanium-wall-icon-medium rotate: false - xy: 1421, 1077 + xy: 1625, 975 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -7965,7 +7965,7 @@ titanium-wall-icon-large index: -1 titanium-wall-icon-small rotate: false - xy: 1482, 921 + xy: 864, 3 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -7986,14 +7986,14 @@ titanium-wall-large-icon-large index: -1 titanium-wall-large-icon-medium rotate: false - xy: 1455, 1077 + xy: 1659, 1009 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 titanium-wall-large-icon-small rotate: false - xy: 1508, 947 + xy: 891, 55 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -8014,14 +8014,14 @@ trident-ship-pad-icon-large index: -1 trident-ship-pad-icon-medium rotate: false - xy: 1523, 1077 + xy: 1693, 1009 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 trident-ship-pad-icon-small rotate: false - xy: 1456, 869 + xy: 890, 29 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -8042,14 +8042,14 @@ turbine-generator-icon-large index: -1 turbine-generator-icon-medium rotate: false - xy: 1557, 1077 + xy: 1693, 975 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 turbine-generator-icon-small rotate: false - xy: 1482, 895 + xy: 890, 3 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -8112,14 +8112,14 @@ unit-icon-wraith index: -1 unloader-icon-full rotate: false - xy: 1625, 1077 + xy: 1727, 975 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 unloader-icon-medium rotate: false - xy: 1625, 1077 + xy: 1727, 975 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -8133,7 +8133,7 @@ unloader-icon-large index: -1 unloader-icon-small rotate: false - xy: 1508, 921 + xy: 894, 107 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -8154,14 +8154,14 @@ vault-icon-large index: -1 vault-icon-medium rotate: false - xy: 1659, 1077 + xy: 1761, 1009 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 vault-icon-small rotate: false - xy: 1534, 947 + xy: 894, 81 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -8182,14 +8182,14 @@ water-extractor-icon-large index: -1 water-extractor-icon-medium rotate: false - xy: 1863, 1077 + xy: 1863, 1009 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 water-extractor-icon-small rotate: false - xy: 1456, 843 + xy: 917, 55 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -8203,7 +8203,7 @@ water-icon-large index: -1 water-icon-small rotate: false - xy: 1482, 869 + xy: 916, 29 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -8224,14 +8224,14 @@ wave-icon-large index: -1 wave-icon-medium rotate: false - xy: 1897, 1077 + xy: 1863, 975 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 wave-icon-small rotate: false - xy: 1508, 895 + xy: 916, 3 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -8252,14 +8252,14 @@ wraith-factory-icon-large index: -1 wraith-factory-icon-medium rotate: false - xy: 1931, 1077 + xy: 1897, 1009 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 wraith-factory-icon-small rotate: false - xy: 1534, 921 + xy: 942, 29 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -8292,128 +8292,121 @@ item-copper orig: 32, 32 offset: 0, 0 index: -1 -item-dense-alloy +item-graphite rotate: false xy: 543, 77 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 -item-graphite +item-lead rotate: false xy: 577, 77 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 -item-lead - rotate: false - xy: 1199, 1277 - size: 32, 32 - orig: 32, 32 - offset: 0, 0 - index: -1 item-metaglass rotate: false - xy: 1191, 1243 + xy: 1853, 1285 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 item-phase-fabric rotate: false - xy: 1191, 1209 + xy: 1887, 1281 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 item-plastanium rotate: false - xy: 1233, 1281 + xy: 1921, 1281 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 item-pyratite rotate: false - xy: 1267, 1281 + xy: 1955, 1281 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 item-sand rotate: false - xy: 1301, 1281 + xy: 1989, 1281 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 item-scrap rotate: false - xy: 1335, 1281 + xy: 1191, 1243 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 item-silicon rotate: false - xy: 1369, 1281 + xy: 1191, 1209 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 item-stone rotate: false - xy: 1471, 1281 + xy: 1267, 1281 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 item-surge-alloy rotate: false - xy: 1505, 1281 + xy: 1301, 1281 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 item-thorium rotate: false - xy: 1539, 1281 + xy: 1335, 1281 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 item-titanium rotate: false - xy: 1573, 1281 + xy: 1369, 1281 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 liquid-cryofluid rotate: false - xy: 787, 855 + xy: 777, 951 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 liquid-oil rotate: false - xy: 783, 753 + xy: 1011, 1065 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 liquid-slag rotate: false - xy: 779, 583 + xy: 1029, 1031 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 liquid-water rotate: false - xy: 1011, 1065 + xy: 979, 955 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -8560,7 +8553,7 @@ circle index: -1 clear rotate: false - xy: 783, 802 + xy: 1928, 1006 size: 1, 1 orig: 1, 1 offset: 0, 0 @@ -8654,7 +8647,7 @@ button-right-over index: -1 button-select rotate: false - xy: 1291, 1051 + xy: 821, 419 size: 24, 24 split: 4, 4, 4, 4 orig: 24, 24 @@ -8662,28 +8655,28 @@ button-select index: -1 check-off rotate: false - xy: 811, 959 + xy: 1962, 1009 size: 28, 32 orig: 28, 32 offset: 0, 0 index: -1 check-on rotate: false - xy: 1075, 1223 + xy: 1992, 1009 size: 28, 32 orig: 28, 32 offset: 0, 0 index: -1 check-on-over rotate: false - xy: 915, 933 + xy: 1928, 969 size: 28, 32 orig: 28, 32 offset: 0, 0 index: -1 check-over rotate: false - xy: 885, 933 + xy: 1115, 925 size: 28, 32 orig: 28, 32 offset: 0, 0 @@ -8697,13 +8690,13 @@ clear index: -1 content-background rotate: false - xy: 711, 811 + xy: 711, 782 size: 36, 27 split: 12, 12, 12, 12 orig: 36, 27 offset: 0, 0 index: -1 -content-background-over +content-background-locked rotate: false xy: 711, 840 size: 36, 27 @@ -8711,9 +8704,17 @@ content-background-over orig: 36, 27 offset: 0, 0 index: -1 +content-background-over + rotate: false + xy: 711, 811 + size: 36, 27 + split: 12, 12, 12, 12 + orig: 36, 27 + offset: 0, 0 + index: -1 cursor rotate: false - xy: 2023, 1315 + xy: 707, 575 size: 4, 4 orig: 4, 4 offset: 0, 0 @@ -8727,7 +8728,7 @@ discord-banner index: -1 empty-sector rotate: false - xy: 1887, 1315 + xy: 1819, 1315 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -8769,35 +8770,35 @@ icon-liquid index: -1 icon-power rotate: false - xy: 909, 1065 + xy: 1041, 1197 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-production rotate: false - xy: 753, 531 + xy: 993, 937 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-turret rotate: false - xy: 1482, 851 + xy: 786, 837 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-units rotate: false - xy: 1534, 903 + xy: 993, 919 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-upgrade rotate: false - xy: 222, 1759 + xy: 1011, 911 size: 16, 16 orig: 16, 16 offset: 0, 0 @@ -8839,7 +8840,7 @@ icon-admin-small index: -1 icon-areaDelete rotate: false - xy: 582, 1978 + xy: 813, 53 size: 10, 10 orig: 10, 10 offset: 0, 0 @@ -8860,28 +8861,28 @@ icon-arrow-16 index: -1 icon-arrow-down rotate: false - xy: 582, 1966 + xy: 75, 9 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-arrow-left rotate: false - xy: 594, 1832 + xy: 582, 1978 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-arrow-right rotate: false - xy: 824, 7 + xy: 825, 53 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-arrow-up rotate: false - xy: 245, 560 + xy: 582, 1966 size: 10, 10 orig: 10, 10 offset: 0, 0 @@ -8916,7 +8917,7 @@ icon-cancel index: -1 icon-chat rotate: false - xy: 1091, 1211 + xy: 594, 1832 size: 10, 10 orig: 10, 10 offset: 0, 0 @@ -8937,21 +8938,21 @@ icon-copy index: -1 icon-cursor rotate: false - xy: 1103, 1211 + xy: 2023, 1283 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-dev-builds rotate: false - xy: 997, 939 + xy: 795, 935 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-discord rotate: false - xy: 771, 533 + xy: 1059, 1199 size: 14, 14 orig: 14, 14 offset: 0, 0 @@ -9000,7 +9001,7 @@ icon-eraser index: -1 icon-exit rotate: false - xy: 997, 923 + xy: 2033, 1099 size: 14, 14 orig: 14, 14 offset: 0, 0 @@ -9021,7 +9022,7 @@ icon-file-image index: -1 icon-file-text rotate: false - xy: 2033, 1099 + xy: 2033, 1083 size: 14, 14 orig: 14, 14 offset: 0, 0 @@ -9035,7 +9036,7 @@ icon-fill index: -1 icon-floppy rotate: false - xy: 1059, 1199 + xy: 2033, 1067 size: 14, 14 orig: 14, 14 offset: 0, 0 @@ -9049,14 +9050,14 @@ icon-floppy-16 index: -1 icon-folder rotate: false - xy: 1075, 1207 + xy: 2033, 1051 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-folder-parent rotate: false - xy: 795, 935 + xy: 2033, 941 size: 14, 14 orig: 14, 14 offset: 0, 0 @@ -9070,14 +9071,14 @@ icon-generated index: -1 icon-github rotate: false - xy: 811, 943 + xy: 2033, 925 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-google-play rotate: false - xy: 1560, 939 + xy: 2033, 909 size: 14, 14 orig: 14, 14 offset: 0, 0 @@ -9091,56 +9092,56 @@ icon-grid index: -1 icon-hold rotate: false - xy: 827, 947 + xy: 824, 7 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-holdDelete rotate: false - xy: 1802, 961 + xy: 804, 843 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-home rotate: false - xy: 1578, 957 + xy: 2033, 893 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-host rotate: false - xy: 39, 5 + xy: 2033, 877 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-info rotate: false - xy: 606, 1832 - size: 10, 10 - orig: 10, 10 + xy: 2033, 861 + size: 14, 14 + orig: 14, 14 offset: 0, 0 index: -1 icon-itch.io rotate: false - xy: 240, 1761 + xy: 2033, 845 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-item rotate: false - xy: 1814, 961 + xy: 245, 560 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-items-none rotate: false - xy: 1447, 973 + xy: 942, 1 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -9154,21 +9155,21 @@ icon-line index: -1 icon-link rotate: false - xy: 1941, 1025 + xy: 1047, 913 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-liquid-small rotate: false - xy: 618, 1832 + xy: 795, 891 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-load rotate: false - xy: 1560, 923 + xy: 1063, 913 size: 14, 14 orig: 14, 14 offset: 0, 0 @@ -9203,35 +9204,35 @@ icon-locked index: -1 icon-logic rotate: false - xy: 1826, 961 + xy: 907, 913 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-map rotate: false - xy: 1594, 957 + xy: 1079, 913 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-menu rotate: false - xy: 1838, 961 + xy: 606, 1832 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-menu-large rotate: false - xy: 741, 583 + xy: 204, 1759 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-missing rotate: false - xy: 1850, 961 + xy: 2035, 1283 size: 10, 10 orig: 10, 10 offset: 0, 0 @@ -9245,287 +9246,287 @@ icon-mission-background index: -1 icon-mission-battle rotate: false - xy: 1862, 961 + xy: 919, 913 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-mission-defense rotate: false - xy: 1874, 961 + xy: 618, 1832 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-mission-done rotate: false - xy: 1886, 961 + xy: 210, 4 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-none rotate: false - xy: 1898, 961 + xy: 222, 4 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 -icon-nullitem - rotate: false - xy: 1457, 973 - size: 8, 8 - orig: 8, 8 - offset: 0, 0 - index: -1 icon-paste - rotate: false - xy: 759, 583 - size: 16, 16 - orig: 16, 16 - offset: 0, 0 - index: -1 -icon-pause - rotate: false - xy: 1910, 961 - size: 10, 10 - orig: 10, 10 - offset: 0, 0 - index: -1 -icon-pencil - rotate: false - xy: 204, 1759 - size: 16, 16 - orig: 16, 16 - offset: 0, 0 - index: -1 -icon-pencil-small - rotate: false - xy: 55, 5 - size: 14, 14 - orig: 14, 14 - offset: 0, 0 - index: -1 -icon-pick rotate: false xy: 636, 1852 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 -icon-play - rotate: false - xy: 1922, 961 - size: 10, 10 - orig: 10, 10 - offset: 0, 0 - index: -1 -icon-play-2 - rotate: false - xy: 71, 5 - size: 14, 14 - orig: 14, 14 - offset: 0, 0 - index: -1 -icon-players - rotate: false - xy: 1051, 1150 - size: 10, 10 - orig: 10, 10 - offset: 0, 0 - index: -1 -icon-power-small - rotate: false - xy: 1051, 1138 - size: 10, 10 - orig: 10, 10 - offset: 0, 0 - index: -1 -icon-quit - rotate: false - xy: 1941, 1009 - size: 14, 14 - orig: 14, 14 - offset: 0, 0 - index: -1 -icon-redo - rotate: false - xy: 787, 327 - size: 16, 16 - orig: 16, 16 - offset: 0, 0 - index: -1 -icon-refresh - rotate: false - xy: 1610, 957 - size: 14, 14 - orig: 14, 14 - offset: 0, 0 - index: -1 -icon-rename - rotate: false - xy: 1941, 993 - size: 14, 14 - orig: 14, 14 - offset: 0, 0 - index: -1 -icon-resize - rotate: false - xy: 813, 55 - size: 16, 16 - orig: 16, 16 - offset: 0, 0 - index: -1 -icon-rotate - rotate: false - xy: 1626, 957 - size: 14, 14 - orig: 14, 14 - offset: 0, 0 - index: -1 -icon-rotate-arrow - rotate: false - xy: 1941, 977 - size: 14, 14 - orig: 14, 14 - offset: 0, 0 - index: -1 -icon-rotate-left - rotate: false - xy: 1642, 957 - size: 14, 14 - orig: 14, 14 - offset: 0, 0 - index: -1 -icon-rotate-right - rotate: false - xy: 1658, 957 - size: 14, 14 - orig: 14, 14 - offset: 0, 0 - index: -1 -icon-save - rotate: false - xy: 1674, 957 - size: 14, 14 - orig: 14, 14 - offset: 0, 0 - index: -1 -icon-save-image - rotate: false - xy: 1041, 1197 - size: 16, 16 - orig: 16, 16 - offset: 0, 0 - index: -1 -icon-save-map - rotate: false - xy: 777, 933 - size: 16, 16 - orig: 16, 16 - offset: 0, 0 - index: -1 -icon-settings - rotate: false - xy: 210, 4 - size: 10, 10 - orig: 10, 10 - offset: 0, 0 - index: -1 -icon-terrain - rotate: false - xy: 1941, 1059 - size: 16, 16 - orig: 16, 16 - offset: 0, 0 - index: -1 -icon-tools - rotate: false - xy: 1690, 957 - size: 14, 14 - orig: 14, 14 - offset: 0, 0 - index: -1 -icon-touch - rotate: false - xy: 222, 4 - size: 10, 10 - orig: 10, 10 - offset: 0, 0 - index: -1 -icon-touchDelete +icon-pause rotate: false xy: 234, 4 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 -icon-trash +icon-pencil rotate: false - xy: 1706, 957 - size: 14, 14 - orig: 14, 14 - offset: 0, 0 - index: -1 -icon-trash-16 - rotate: false - xy: 1560, 955 + xy: 909, 1065 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 -icon-trello +icon-pencil-small rotate: false - xy: 1722, 957 + xy: 1095, 913 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 -icon-tutorial +icon-pick rotate: false - xy: 1738, 957 - size: 14, 14 - orig: 14, 14 - offset: 0, 0 - index: -1 -icon-undo - rotate: false - xy: 1508, 877 + xy: 777, 933 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 -icon-unlocked +icon-play + rotate: false + xy: 246, 4 + size: 10, 10 + orig: 10, 10 + offset: 0, 0 + index: -1 +icon-play-2 + rotate: false + xy: 795, 919 + size: 14, 14 + orig: 14, 14 + offset: 0, 0 + index: -1 +icon-players + rotate: false + xy: 636, 1840 + size: 10, 10 + orig: 10, 10 + offset: 0, 0 + index: -1 +icon-power-small + rotate: false + xy: 1111, 913 + size: 10, 10 + orig: 10, 10 + offset: 0, 0 + index: -1 +icon-quit + rotate: false + xy: 795, 903 + size: 14, 14 + orig: 14, 14 + offset: 0, 0 + index: -1 +icon-redo + rotate: false + xy: 942, 11 + size: 16, 16 + orig: 16, 16 + offset: 0, 0 + index: -1 +icon-refresh + rotate: false + xy: 811, 925 + size: 14, 14 + orig: 14, 14 + offset: 0, 0 + index: -1 +icon-rename + rotate: false + xy: 827, 925 + size: 14, 14 + orig: 14, 14 + offset: 0, 0 + index: -1 +icon-resize rotate: false xy: 21, 3 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 +icon-rotate + rotate: false + xy: 811, 909 + size: 14, 14 + orig: 14, 14 + offset: 0, 0 + index: -1 +icon-rotate-arrow + rotate: false + xy: 843, 925 + size: 14, 14 + orig: 14, 14 + offset: 0, 0 + index: -1 +icon-rotate-left + rotate: false + xy: 827, 909 + size: 14, 14 + orig: 14, 14 + offset: 0, 0 + index: -1 +icon-rotate-right + rotate: false + xy: 859, 925 + size: 14, 14 + orig: 14, 14 + offset: 0, 0 + index: -1 +icon-save + rotate: false + xy: 843, 909 + size: 14, 14 + orig: 14, 14 + offset: 0, 0 + index: -1 +icon-save-image + rotate: false + xy: 222, 1759 + size: 16, 16 + orig: 16, 16 + offset: 0, 0 + index: -1 +icon-save-map + rotate: false + xy: 39, 3 + size: 16, 16 + orig: 16, 16 + offset: 0, 0 + index: -1 +icon-settings + rotate: false + xy: 1123, 913 + size: 10, 10 + orig: 10, 10 + offset: 0, 0 + index: -1 +icon-terrain + rotate: false + xy: 240, 1759 + size: 16, 16 + orig: 16, 16 + offset: 0, 0 + index: -1 +icon-tools + rotate: false + xy: 875, 925 + size: 14, 14 + orig: 14, 14 + offset: 0, 0 + index: -1 +icon-touch + rotate: false + xy: 811, 897 + size: 10, 10 + orig: 10, 10 + offset: 0, 0 + index: -1 +icon-touchDelete + rotate: false + xy: 823, 897 + size: 10, 10 + orig: 10, 10 + offset: 0, 0 + index: -1 +icon-trash + rotate: false + xy: 859, 909 + size: 14, 14 + orig: 14, 14 + offset: 0, 0 + index: -1 +icon-trash-16 + rotate: false + xy: 57, 3 + size: 16, 16 + orig: 16, 16 + offset: 0, 0 + index: -1 +icon-tree-locked + rotate: false + xy: 305, 77 + size: 32, 32 + orig: 32, 32 + offset: 0, 0 + index: -1 +icon-trello + rotate: false + xy: 891, 925 + size: 14, 14 + orig: 14, 14 + offset: 0, 0 + index: -1 +icon-tutorial + rotate: false + xy: 875, 909 + size: 14, 14 + orig: 14, 14 + offset: 0, 0 + index: -1 +icon-undo + rotate: false + xy: 919, 1005 + size: 16, 16 + orig: 16, 16 + offset: 0, 0 + index: -1 +icon-unlocked + rotate: false + xy: 960, 11 + size: 16, 16 + orig: 16, 16 + offset: 0, 0 + index: -1 icon-unlocks rotate: false - xy: 1754, 957 + xy: 907, 925 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-wiki rotate: false - xy: 1770, 957 + xy: 891, 909 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-zoom rotate: false - xy: 1941, 1041 + xy: 1029, 911 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-zoom-small rotate: false - xy: 1786, 957 + xy: 923, 925 size: 14, 14 orig: 14, 14 offset: 0, 0 @@ -9539,7 +9540,7 @@ info-banner index: -1 inventory rotate: false - xy: 1447, 983 + xy: 1643, 933 size: 24, 40 split: 10, 10, 10, 14 orig: 24, 40 @@ -9554,7 +9555,7 @@ logotext index: -1 pane rotate: false - xy: 711, 677 + xy: 711, 648 size: 36, 27 split: 12, 12, 12, 12 orig: 36, 27 @@ -9562,7 +9563,7 @@ pane index: -1 pane-2 rotate: false - xy: 711, 706 + xy: 711, 677 size: 36, 27 split: 12, 12, 12, 12 orig: 36, 27 @@ -9570,7 +9571,7 @@ pane-2 index: -1 scroll rotate: false - xy: 1326, 910 + xy: 1903, 880 size: 24, 35 split: 10, 10, 6, 5 orig: 24, 35 @@ -9578,7 +9579,7 @@ scroll index: -1 scroll-horizontal rotate: false - xy: 749, 805 + xy: 749, 834 size: 35, 24 split: 6, 5, 10, 10 orig: 35, 24 @@ -9594,7 +9595,7 @@ scroll-knob-horizontal-black index: -1 scroll-knob-vertical-black rotate: false - xy: 1300, 905 + xy: 821, 855 size: 24, 40 split: 10, 10, 6, 10 orig: 24, 40 @@ -9602,63 +9603,63 @@ scroll-knob-vertical-black index: -1 sector-edge rotate: false - xy: 915, 277 + xy: 1455, 1077 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 sector-select rotate: false - xy: 915, 243 + xy: 1489, 1077 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 selection rotate: false - xy: 258, 1825 + xy: 1928, 1003 size: 1, 1 orig: 1, 1 offset: 0, 0 index: -1 slider rotate: false - xy: 783, 792 + xy: 839, 81 size: 1, 8 orig: 1, 8 offset: 0, 0 index: -1 slider-knob rotate: false - xy: 1965, 1071 + xy: 1897, 969 size: 29, 38 orig: 29, 38 offset: 0, 0 index: -1 slider-knob-down rotate: false - xy: 1996, 1071 + xy: 1931, 1003 size: 29, 38 orig: 29, 38 offset: 0, 0 index: -1 slider-knob-over rotate: false - xy: 1996, 1071 + xy: 1931, 1003 size: 29, 38 orig: 29, 38 offset: 0, 0 index: -1 slider-vertical rotate: false - xy: 245, 557 + xy: 753, 525 size: 8, 1 orig: 8, 1 offset: 0, 0 index: -1 underline rotate: false - xy: 749, 831 + xy: 749, 860 size: 36, 27 split: 12, 12, 12, 12 orig: 36, 27 @@ -9666,7 +9667,7 @@ underline index: -1 underline-2 rotate: false - xy: 749, 860 + xy: 707, 581 size: 36, 27 split: 12, 12, 12, 12 orig: 36, 27 @@ -9681,7 +9682,7 @@ white index: -1 window-empty rotate: false - xy: 1115, 930 + xy: 813, 91 size: 27, 61 split: 8, 8, 44, 11 orig: 27, 61 diff --git a/core/assets/sprites/sprites.png b/core/assets/sprites/sprites.png index c0dc0e5bec..32800c6137 100644 Binary files a/core/assets/sprites/sprites.png and b/core/assets/sprites/sprites.png differ diff --git a/core/assets/ui/uiskin.json b/core/assets/ui/uiskin.json index af2fc8d5d6..3006ee32f2 100644 --- a/core/assets/ui/uiskin.json +++ b/core/assets/ui/uiskin.json @@ -24,6 +24,7 @@ ButtonStyle: { }, TextButtonStyle: { default: {over: button-over, disabled: button, font: default-font, fontColor: white, disabledFontColor: gray, down: button-down, up: button}, + node: {disabled: content-background, font: default-font, fontColor: white, disabledFontColor: gray, up: content-background, over: content-background-over}, right: {over: button-right-over, font: default-font, fontColor: white, disabledFontColor: gray, down: button-right-down, up: button-right}, wave: {font: default-font, fontColor: white, disabledFontColor: gray, up: button-edge-4}, clear: {over: flat-over, font: default-font, fontColor: white, disabledFontColor: gray, down: flat-over, up: flat}, @@ -37,7 +38,7 @@ TextButtonStyle: { }, ImageButtonStyle: { default: {down: button-down, up: button, over: button-over, imageDisabledColor: gray, imageUpColor: white }, - node: {down: content-background-over, up: content-background, over: content-background-over}, + node: {up: content-background, over: content-background-over}, right: {over: button-right-over, down: button-right-down, up: button-right}, empty: { imageDownColor: accent, imageUpColor: white}, emptytoggle: {imageCheckedColor: white, imageDownColor: white, imageUpColor: gray}, diff --git a/core/src/io/anuke/mindustry/content/Recipes.java b/core/src/io/anuke/mindustry/content/Recipes.java index 638a31a87b..678bb0e436 100644 --- a/core/src/io/anuke/mindustry/content/Recipes.java +++ b/core/src/io/anuke/mindustry/content/Recipes.java @@ -42,6 +42,7 @@ public class Recipes implements ContentList{ new Recipe(effect, Blocks.container, new ItemStack(Items.titanium, 200)); new Recipe(effect, Blocks.vault, new ItemStack(Items.titanium, 500), new ItemStack(Items.thorium, 250)); new Recipe(effect, Blocks.launchPad, new ItemStack(Items.copper, 500)); + new Recipe(effect, Blocks.core, new ItemStack(Items.titanium, 2000)).setHidden(true).setAlwaysUnlocked(true); //projectors new Recipe(effect, Blocks.mendProjector, new ItemStack(Items.lead, 200), new ItemStack(Items.titanium, 150), new ItemStack(Items.titanium, 50), new ItemStack(Items.silicon, 180)); @@ -160,9 +161,6 @@ public class Recipes implements ContentList{ new Recipe(units, Blocks.repairPoint, new ItemStack(Items.lead, 30), new ItemStack(Items.copper, 30), new ItemStack(Items.silicon, 30)); - //removed for testing MOBA-style unit production - //new Recipe(units, Blocks.commandCenter, new ItemStack(Items.lead, 100), new ItemStack(Items.densealloy, 100), new ItemStack(Items.silicon, 200)); - //LIQUIDS new Recipe(liquid, Blocks.conduit, new ItemStack(Items.lead, 1)); new Recipe(liquid, Blocks.pulseConduit, new ItemStack(Items.titanium, 1), new ItemStack(Items.lead, 1)); diff --git a/core/src/io/anuke/mindustry/content/TechTree.java b/core/src/io/anuke/mindustry/content/TechTree.java index 93dafb0cb6..6c66ecf3b7 100644 --- a/core/src/io/anuke/mindustry/content/TechTree.java +++ b/core/src/io/anuke/mindustry/content/TechTree.java @@ -13,7 +13,7 @@ public class TechTree implements ContentList{ @Override public void load(){ - root = node(null, with(), () -> { + root = node(Blocks.core, with(), () -> { node(Blocks.conveyor, with(Items.copper, 100), () -> { node(Blocks.launchPad, with(Items.copper, 100), () -> { @@ -252,12 +252,8 @@ public class TechTree implements ContentList{ 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(), () -> {}); + private void node(Block block, ItemStack[] requirements){ + new TechNode(block, requirements, () -> {}); } public static class TechNode{ @@ -281,5 +277,9 @@ public class TechTree implements ContentList{ children.run(); context = last; } + + public Recipe recipe(){ + return Recipe.getByResult(block); + } } } diff --git a/core/src/io/anuke/mindustry/game/GlobalData.java b/core/src/io/anuke/mindustry/game/GlobalData.java index 2b7c8f05f5..ab9e5b1f66 100644 --- a/core/src/io/anuke/mindustry/game/GlobalData.java +++ b/core/src/io/anuke/mindustry/game/GlobalData.java @@ -48,6 +48,10 @@ public class GlobalData{ modified = true; } + public boolean has(Item item, int amount){ + return items.get(item, 0) >= amount; + } + public ObjectIntMap items(){ return items; } diff --git a/core/src/io/anuke/mindustry/graphics/Palette.java b/core/src/io/anuke/mindustry/graphics/Palette.java index a4b4929db7..9af7a0d050 100644 --- a/core/src/io/anuke/mindustry/graphics/Palette.java +++ b/core/src/io/anuke/mindustry/graphics/Palette.java @@ -41,6 +41,7 @@ public class Palette{ heal = Color.valueOf("98ffa9"), bar = Color.SLATE, accent = Color.valueOf("ffd37f"), + locked = Color.valueOf("6b6b6b"), accentBack = Color.valueOf("d4816b"), place = Color.valueOf("6335f8"), remove = Color.valueOf("e55454"), diff --git a/core/src/io/anuke/mindustry/io/SaveFileVersion.java b/core/src/io/anuke/mindustry/io/SaveFileVersion.java index 2ef5a90d48..939cd98741 100644 --- a/core/src/io/anuke/mindustry/io/SaveFileVersion.java +++ b/core/src/io/anuke/mindustry/io/SaveFileVersion.java @@ -8,11 +8,15 @@ import io.anuke.arc.util.Pack; import io.anuke.mindustry.content.Blocks; import io.anuke.mindustry.entities.traits.SaveTrait; import io.anuke.mindustry.entities.traits.TypeTrait; -import io.anuke.mindustry.game.*; +import io.anuke.mindustry.game.Content; +import io.anuke.mindustry.game.MappableContent; +import io.anuke.mindustry.game.Rules; +import io.anuke.mindustry.game.Team; import io.anuke.mindustry.gen.Serialization; import io.anuke.mindustry.type.ContentType; import io.anuke.mindustry.world.Tile; import io.anuke.mindustry.world.blocks.BlockPart; +import io.anuke.mindustry.world.blocks.storage.CoreBlock; import java.io.DataInputStream; import java.io.DataOutputStream; @@ -120,7 +124,7 @@ public abstract class SaveFileVersion{ tile.entity.readConfig(stream); tile.entity.read(stream); - if(tile.block() == Blocks.core){ + if(tile.block() instanceof CoreBlock){ state.teams.get(t).cores.add(tile); } }else if(wallid == 0){ diff --git a/core/src/io/anuke/mindustry/ui/dialogs/DeployDialog.java b/core/src/io/anuke/mindustry/ui/dialogs/DeployDialog.java index 19d2bebc43..052be7517a 100644 --- a/core/src/io/anuke/mindustry/ui/dialogs/DeployDialog.java +++ b/core/src/io/anuke/mindustry/ui/dialogs/DeployDialog.java @@ -34,7 +34,7 @@ public class DeployDialog extends FloatingDialog{ ObjectIntMap items = data.items(); for(Item item : Vars.content.items()){ if(item.type == ItemType.material && data.isUnlocked(item)){ - add(items.get(item, 0) + "").left(); + label(() -> items.get(item, 0) + "").left(); addImage(item.region).size(8*4).pad(4); add("[LIGHT_GRAY]" + item.localizedName()).left(); row(); diff --git a/core/src/io/anuke/mindustry/ui/dialogs/TechTreeDialog.java b/core/src/io/anuke/mindustry/ui/dialogs/TechTreeDialog.java index 1609f97edc..7a208f28c2 100644 --- a/core/src/io/anuke/mindustry/ui/dialogs/TechTreeDialog.java +++ b/core/src/io/anuke/mindustry/ui/dialogs/TechTreeDialog.java @@ -1,34 +1,42 @@ 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.Color; import io.anuke.arc.graphics.g2d.Lines; import io.anuke.arc.graphics.g2d.ScissorStack; import io.anuke.arc.input.KeyCode; +import io.anuke.arc.math.Interpolation; import io.anuke.arc.math.geom.Rectangle; import io.anuke.arc.scene.Group; +import io.anuke.arc.scene.actions.Actions; import io.anuke.arc.scene.event.InputEvent; import io.anuke.arc.scene.event.InputListener; +import io.anuke.arc.scene.event.Touchable; +import io.anuke.arc.scene.style.TextureRegionDrawable; import io.anuke.arc.scene.ui.ImageButton; +import io.anuke.arc.scene.ui.layout.Table; import io.anuke.arc.util.Align; import io.anuke.arc.util.Log; import io.anuke.arc.util.Structs; -import io.anuke.mindustry.Vars; -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.ItemStack; 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; +import static io.anuke.mindustry.Vars.*; public class TechTreeDialog extends FloatingDialog{ private ObjectSet nodes = new ObjectSet<>(); + private TechTreeNode root = new TechTreeNode(TechTree.root, null); private static final float nodeSize = 60f; + private int toasts; public TechTreeDialog(){ super("$techtree"); @@ -36,14 +44,14 @@ public class TechTreeDialog extends FloatingDialog{ TreeLayout layout = new TreeLayout(); layout.gapBetweenLevels = 60f; layout.gapBetweenNodes = 40f; - layout.layout(new TechTreeNode(TechTree.root, null)); + layout.layout(root); cont.add(new View()).grow(); { //debug code; TODO remove ObjectSet used = new ObjectSet().select(t -> true); for(TechTreeNode node : nodes){ - if(node.node.block != null) used.add(Recipe.getByResult(node.node.block)); + used.add(node.node.recipe()); } Array recipes = content.recipes().select(r -> r.visibility == RecipeVisibility.all && !used.contains(r)); recipes.sort(Structs.comparing(r -> r.cost)); @@ -55,11 +63,44 @@ public class TechTreeDialog extends FloatingDialog{ } } + shown(() -> checkNodes(root)); addCloseButton(); } + void checkNodes(TechTreeNode node){ + boolean locked = locked(node); + if(!locked) node.visible = true; + for(TreeNode child : node.children){ + TechTreeNode l = (TechTreeNode)child; + l.visible = !locked; + checkNodes(l); + } + } + + void showToast(String info){ + toasts ++; + int t = toasts; + Table table = new Table(); + table.actions(Actions.fadeOut(7f, Interpolation.fade), Actions.run(() -> toasts --), Actions.removeActor()); + table.top().add(info); + table.update(() -> { + table.toFront(); + table.setPosition(Core.graphics.getWidth()/2f, Core.graphics.getHeight() - 21 - t*20f, Align.top); + }); + Core.scene.add(table); + } + + boolean locked(TreeNode node){ + return locked(((TechTreeNode)node).node); + } + + boolean locked(TechNode node){ + return !data.isUnlocked(node.recipe()); + } + class TechTreeNode extends TreeNode{ final TechNode node; + boolean visible = true; public TechTreeNode(TechNode node, TreeNode parent){ this.node = node; @@ -77,21 +118,47 @@ public class TechTreeDialog extends FloatingDialog{ class View extends Group{ float panX = 0, panY = 0; - Rectangle clip = new Rectangle(); boolean moved = false; + Rectangle clip = new Rectangle(); + ImageButton hoverNode; + Table infoTable = new Table(); { + infoTable.touchable(Touchable.enabled); + for(TechTreeNode node : nodes){ - ImageButton button = new ImageButton(node.node.block == null ? Blocks.core.icon(Icon.medium) : node.node.block.icon(Icon.medium), "node"); + ImageButton button = new ImageButton(node.node.block.icon(Icon.medium), "node"); button.clicked(() -> { - if(moved) return; - Vars.ui.content.show(Recipe.getByResult(node.node.block == null ? Blocks.conveyor : node.node.block)); + if(mobile){ + hoverNode = button; + rebuild(); + }else if(data.hasItems(node.node.requirements) && locked(node)){ + unlock(node.node); + } }); - button.tapped(() -> { - moved = false; + button.hovered(() -> { + if(!mobile && hoverNode != button && node.visible){ + hoverNode = button; + rebuild(); + } }); + button.exited(() -> { + if(hoverNode == button && !infoTable.hasMouse() && !hoverNode.hasMouse()){ + hoverNode = null; + rebuild(); + } + }); + button.touchable(() -> !node.visible ? Touchable.disabled : Touchable.enabled); + button.setUserObject(node.node); + button.tapped(() -> moved = false); button.setSize(nodeSize, nodeSize); - button.update(() -> button.setPosition(node.x + panX + width/2f, node.y + panY + height/2f - 0.5f, Align.center)); + button.update(() -> { + button.setPosition(node.x + panX + width/2f, node.y + panY + height/2f - 0.5f, Align.center); + button.getStyle().up = Core.scene.skin.getDrawable(!locked(node) ? "content-background" : "content-background-locked"); + ((TextureRegionDrawable)button.getStyle().imageUp) + .setRegion(node.visible ? node.node.block.icon(Icon.medium) : Core.atlas.find("icon-tree-locked")); + button.getImage().setColor(!locked(node) ? Color.WHITE : Color.GRAY); + }); addChild(button); } @@ -115,6 +182,75 @@ public class TechTreeDialog extends FloatingDialog{ }); } + void unlock(TechNode node){ + data.unlockContent(node.recipe()); + data.removeItems(node.requirements); + showToast(Core.bundle.format("researched", node.block.formalName)); + checkNodes(root); + hoverNode = null; + rebuild(); + } + + void rebuild(){ + ImageButton button = hoverNode; + + infoTable.remove(); + infoTable.clear(); + infoTable.update(null); + + if(button == null) return; + + TechNode node = (TechNode)button.getUserObject(); + + infoTable.exited(() -> { + if(hoverNode == button && !infoTable.hasMouse() && !hoverNode.hasMouse()){ + hoverNode = null; + rebuild(); + } + }); + + infoTable.background("content-background"); + infoTable.update(() -> infoTable.setPosition(button.getX() + button.getWidth(), button.getY() + button.getHeight(), Align.topLeft)); + + infoTable.margin(0).left().defaults().left(); + + infoTable.addImageButton("icon-info", "node", 14*2, () -> ui.content.show(node.recipe())).growY().width(50f); + + infoTable.add().grow(); + + infoTable.table(desc -> { + desc.left().defaults().left(); + desc.add(node.block.formalName); + desc.row(); + if(locked(node)){ + desc.table(t -> { + t.left(); + for(ItemStack req : node.requirements){ + t.table(list -> { + list.left(); + list.addImage(req.item.getContentIcon()).size(8 * 3).padRight(3); + list.add(req.item.localizedName()).color(Color.LIGHT_GRAY); + list.add(" " + Math.min(data.items().get(req.item, 0), req.amount) + " / " + req.amount) + .color(data.has(req.item, req.amount) ? Color.LIGHT_GRAY : Color.SCARLET); + }).fillX().left(); + t.row(); + } + }); + }else{ + desc.add("$completed"); + } + }).pad(9); + + if(mobile && locked(node)){ + infoTable.row(); + infoTable.addImageTextButton("$research", "icon-check", "node", 16*2, () -> unlock(node)) + .disabled(b -> !data.hasItems(node.requirements)).growX().height(44f).colspan(3); + } + + addChild(infoTable); + infoTable.pack(); + } + @Override public void draw(){ if(!ScissorStack.pushScissors(clip.set(x, y, width, height))){ @@ -123,26 +259,16 @@ public class TechTreeDialog extends FloatingDialog{ float offsetX = panX + width/2f + x, offsetY = panY + height/2f + y; - Lines.stroke(3f, Palette.accent); - for(TreeNode node : nodes){ for(TreeNode child : node.children){ + Lines.stroke(3f, locked(node) || locked(child) ? Palette.locked : Palette.accent); + Lines.line(node.x + offsetX, node.y + offsetY, child.x + offsetX, child.y + offsetY); } } super.draw(); - /* - Draw.color(); - - for(TechTreeNode node : nodes){ - 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()); - }*/ - ScissorStack.popScissors(); } }