diff --git a/core/assets-raw/sprites/ui/icons/icon-power-requirement.png b/core/assets-raw/sprites/ui/icons/icon-power-requirement.png new file mode 100644 index 0000000000..dc82f5942e Binary files /dev/null and b/core/assets-raw/sprites/ui/icons/icon-power-requirement.png differ diff --git a/core/assets-raw/sprites_replacement/items/liquid-cryofluid.png b/core/assets-raw/sprites_replacement/items/liquid-cryofluid.png index 209bb76894..198c21ad17 100644 Binary files a/core/assets-raw/sprites_replacement/items/liquid-cryofluid.png and b/core/assets-raw/sprites_replacement/items/liquid-cryofluid.png differ diff --git a/core/assets-raw/sprites_replacement/items/liquid-oil.png b/core/assets-raw/sprites_replacement/items/liquid-oil.png index c687ef4fbb..e0fbc07cf2 100644 Binary files a/core/assets-raw/sprites_replacement/items/liquid-oil.png and b/core/assets-raw/sprites_replacement/items/liquid-oil.png differ diff --git a/core/assets-raw/sprites_replacement/items/liquid-slag.png b/core/assets-raw/sprites_replacement/items/liquid-slag.png index 778c87479a..87c2a41d07 100644 Binary files a/core/assets-raw/sprites_replacement/items/liquid-slag.png and b/core/assets-raw/sprites_replacement/items/liquid-slag.png differ diff --git a/core/assets-raw/sprites_replacement/items/liquid-water.png b/core/assets-raw/sprites_replacement/items/liquid-water.png index 8e9df22eef..025c812967 100644 Binary files a/core/assets-raw/sprites_replacement/items/liquid-water.png and b/core/assets-raw/sprites_replacement/items/liquid-water.png differ diff --git a/core/assets/bundles/bundle.properties b/core/assets/bundles/bundle.properties index da3a01689a..62c90c2978 100644 --- a/core/assets/bundles/bundle.properties +++ b/core/assets/bundles/bundle.properties @@ -436,7 +436,7 @@ mode.freebuild.description = Limited resources and no timer for waves. mode.pvp.name = PvP mode.pvp.description = Fight against other players locally. mode.attack.name = Attack -mode.attack.descrption = No waves, with the goal to destroy the enemy base. +mode.attack.description = No waves, with the goal to destroy the enemy base. content.item.name = Items content.liquid.name = Liquids content.unit.name = Units diff --git a/core/assets/sprites/sprites.atlas b/core/assets/sprites/sprites.atlas index 2f8d868bc8..0d307368c2 100644 --- a/core/assets/sprites/sprites.atlas +++ b/core/assets/sprites/sprites.atlas @@ -48,7 +48,7 @@ overdrive-projector-top index: -1 shock-mine rotate: false - xy: 1543, 275 + xy: 1577, 275 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -216,140 +216,140 @@ conveyor-4-3 index: -1 titanium-conveyor-0-0 rotate: false - xy: 691, 3 + xy: 725, 109 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 titanium-conveyor-0-1 rotate: false - xy: 725, 109 + xy: 759, 109 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 titanium-conveyor-0-2 rotate: false - xy: 759, 109 + xy: 725, 75 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 titanium-conveyor-0-3 rotate: false - xy: 725, 75 + xy: 793, 109 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 titanium-conveyor-1-0 rotate: false - xy: 793, 109 + xy: 725, 41 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 titanium-conveyor-1-1 rotate: false - xy: 725, 41 + xy: 759, 75 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 titanium-conveyor-1-2 rotate: false - xy: 759, 75 + xy: 827, 109 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 titanium-conveyor-1-3 rotate: false - xy: 827, 109 + xy: 725, 7 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 titanium-conveyor-2-0 rotate: false - xy: 725, 7 + xy: 759, 41 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 titanium-conveyor-2-1 rotate: false - xy: 759, 41 + xy: 793, 75 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 titanium-conveyor-2-2 rotate: false - xy: 793, 75 + xy: 861, 109 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 titanium-conveyor-2-3 rotate: false - xy: 861, 109 + xy: 759, 7 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 titanium-conveyor-3-0 rotate: false - xy: 759, 7 + xy: 793, 41 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 titanium-conveyor-3-1 rotate: false - xy: 793, 41 + xy: 827, 75 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 titanium-conveyor-3-2 rotate: false - xy: 827, 75 + xy: 793, 7 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 titanium-conveyor-3-3 rotate: false - xy: 793, 7 + xy: 827, 41 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 titanium-conveyor-4-0 rotate: false - xy: 827, 41 + xy: 861, 75 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 titanium-conveyor-4-1 rotate: false - xy: 861, 75 + xy: 827, 7 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 titanium-conveyor-4-2 rotate: false - xy: 827, 7 + xy: 861, 41 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 titanium-conveyor-4-3 rotate: false - xy: 861, 41 + xy: 861, 7 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -363,7 +363,7 @@ distributor index: -1 junction rotate: false - xy: 1835, 1055 + xy: 1801, 1021 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -377,49 +377,49 @@ mass-driver-base index: -1 overflow-gate rotate: false - xy: 1339, 341 + xy: 1339, 307 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 phase-conveyor rotate: false - xy: 1357, 205 + xy: 1357, 171 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 phase-conveyor-arrow rotate: false - xy: 1357, 171 + xy: 1391, 239 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 phase-conveyor-bridge rotate: false - xy: 1391, 239 + xy: 1391, 205 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 phase-conveyor-end rotate: false - xy: 1391, 205 + xy: 1391, 171 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 router rotate: false - xy: 1441, 323 + xy: 1475, 359 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 sorter rotate: false - xy: 1781, 271 + xy: 1815, 371 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -895,140 +895,140 @@ icerocks2 index: -1 ignarock1 rotate: false - xy: 1699, 1131 + xy: 1699, 1097 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ignarock2 rotate: false - xy: 1699, 1097 + xy: 1699, 1063 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ignarock3 rotate: false - xy: 1699, 1063 + xy: 1699, 1029 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 lead1 rotate: false - xy: 1937, 1067 + xy: 1903, 1033 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 lead2 rotate: false - xy: 1903, 1033 + xy: 1971, 1067 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 lead3 rotate: false - xy: 1971, 1067 + xy: 1937, 1033 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 magmarock1 rotate: false - xy: 1741, 919 + xy: 1809, 987 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 magmarock2 rotate: false - xy: 1809, 987 + xy: 1775, 953 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 magmarock3 rotate: false - xy: 1775, 953 + xy: 1843, 987 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 metal-floor rotate: false - xy: 1877, 965 + xy: 1911, 965 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 metal-floor-damaged5 rotate: false - xy: 1877, 965 + xy: 1911, 965 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 metal-floor-2 rotate: false - xy: 1911, 965 + xy: 1877, 931 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 metal-floor-3 rotate: false - xy: 1877, 931 + xy: 1945, 965 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 metal-floor-5 rotate: false - xy: 1945, 965 + xy: 1911, 931 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 metal-floor-damaged1 rotate: false - xy: 1911, 931 + xy: 1979, 965 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 metal-floor-damaged2 rotate: false - xy: 1979, 965 + xy: 1945, 931 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 metal-floor-damaged3 rotate: false - xy: 1945, 931 + xy: 1979, 931 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 metal-floor-damaged4 rotate: false - xy: 1979, 931 + xy: 2013, 965 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 metal-floor-damaged6 rotate: false - xy: 2013, 965 + xy: 2013, 931 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 pine rotate: false - xy: 1387, 69 + xy: 1373, 341 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -1056,84 +1056,84 @@ rocks-large index: -1 rocks1 rotate: false - xy: 1686, 377 + xy: 1720, 373 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 rocks2 rotate: false - xy: 1720, 373 + xy: 1441, 357 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 sand-water rotate: false - xy: 1645, 343 + xy: 1679, 343 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 sand1 rotate: false - xy: 1543, 343 + xy: 1577, 343 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 sand2 rotate: false - xy: 1577, 343 + xy: 1611, 343 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 sand3 rotate: false - xy: 1611, 343 + xy: 1645, 343 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 scrap1 rotate: false - xy: 1679, 343 + xy: 1713, 339 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 scrap2 rotate: false - xy: 1713, 339 + xy: 1433, 289 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 scrap3 rotate: false - xy: 1433, 289 + xy: 1509, 309 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 snow1 rotate: false - xy: 1679, 275 + xy: 1713, 271 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 snow2 rotate: false - xy: 1713, 271 + xy: 1747, 339 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 snow3 rotate: false - xy: 1747, 339 + xy: 1747, 305 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -1147,14 +1147,14 @@ snowrocks-large index: -1 snowrocks1 rotate: false - xy: 1747, 305 + xy: 1747, 271 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 snowrocks2 rotate: false - xy: 1747, 271 + xy: 1754, 373 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -1182,14 +1182,14 @@ spore-cluster3 index: -1 stained-boulder1 rotate: false - xy: 1849, 337 + xy: 1849, 303 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 stained-boulder2 rotate: false - xy: 1849, 303 + xy: 1815, 269 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -1210,14 +1210,14 @@ stained-rocks-red-large index: -1 stained-rocks-red1 rotate: false - xy: 1883, 353 + xy: 1883, 319 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 stained-rocks-red2 rotate: false - xy: 1883, 319 + xy: 1917, 353 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -1231,91 +1231,91 @@ stained-rocks-yellow-large index: -1 stained-rocks-yellow1 rotate: false - xy: 1917, 353 + xy: 1883, 285 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 stained-rocks-yellow2 rotate: false - xy: 1883, 285 + xy: 1917, 319 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 stained-rocks1 rotate: false - xy: 1815, 269 + xy: 1849, 269 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 stained-rocks2 rotate: false - xy: 1849, 269 + xy: 1883, 353 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 stained-stone-red1 rotate: false - xy: 1951, 319 + xy: 1951, 285 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 stained-stone-red2 rotate: false - xy: 1951, 285 + xy: 1985, 353 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 stained-stone-red3 rotate: false - xy: 1985, 353 + xy: 1985, 319 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 stained-stone-yellow1 rotate: false - xy: 1985, 319 + xy: 1985, 285 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 stained-stone-yellow2 rotate: false - xy: 1985, 285 + xy: 1883, 251 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 stained-stone-yellow3 rotate: false - xy: 1883, 251 + xy: 1917, 251 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 stained-stone1 rotate: false - xy: 1917, 319 + xy: 1951, 353 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 stained-stone2 rotate: false - xy: 1951, 353 + xy: 1917, 285 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 stained-stone3 rotate: false - xy: 1917, 285 + xy: 1951, 319 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -1329,77 +1329,77 @@ stainedrocks-large index: -1 stainedrocks1 rotate: false - xy: 1917, 251 + xy: 1951, 251 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 stainedrocks2 rotate: false - xy: 1951, 251 + xy: 1985, 251 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 stone3 rotate: false - xy: 1985, 251 + xy: 579, 139 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 tar rotate: false - xy: 589, 105 + xy: 589, 71 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 thorium1 rotate: false - xy: 623, 71 + xy: 657, 105 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 thorium2 rotate: false - xy: 657, 105 + xy: 623, 37 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 thorium3 rotate: false - xy: 623, 37 + xy: 657, 71 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 titanium1 rotate: false - xy: 589, 3 + xy: 623, 3 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 titanium2 rotate: false - xy: 623, 3 + xy: 657, 3 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 titanium3 rotate: false - xy: 657, 3 + xy: 691, 3 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 water rotate: false - xy: 929, 89 + xy: 929, 55 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -1518,7 +1518,7 @@ rubble-4-1 index: -1 spawn rotate: false - xy: 1815, 371 + xy: 1815, 337 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -1665,28 +1665,28 @@ conduit-top-6 index: -1 liquid-junction rotate: false - xy: 1971, 1033 + xy: 1903, 999 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 liquid-router-bottom rotate: false - xy: 1937, 999 + xy: 1971, 999 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 liquid-router-liquid rotate: false - xy: 2005, 1067 + xy: 2005, 1033 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 liquid-router-top rotate: false - xy: 2005, 1033 + xy: 2005, 999 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -1714,84 +1714,84 @@ liquid-tank-top index: -1 mechanical-pump rotate: false - xy: 1775, 919 + xy: 1843, 953 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 phase-conduit rotate: false - xy: 1346, 375 + xy: 1331, 273 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 phase-conduit-arrow rotate: false - xy: 1331, 273 + xy: 1365, 273 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 phase-conduit-bridge rotate: false - xy: 1365, 273 + xy: 1357, 239 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 phase-conduit-end rotate: false - xy: 1357, 239 + xy: 1357, 205 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 pulse-conduit-top-0 rotate: false - xy: 1455, 137 + xy: 1455, 103 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 pulse-conduit-top-1 rotate: false - xy: 1455, 103 + xy: 1455, 69 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 pulse-conduit-top-2 rotate: false - xy: 1455, 69 + xy: 1351, 425 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 pulse-conduit-top-3 rotate: false - xy: 1351, 425 + xy: 1385, 425 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 pulse-conduit-top-4 rotate: false - xy: 1385, 425 + xy: 1380, 391 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 pulse-conduit-top-5 rotate: false - xy: 1380, 391 + xy: 1414, 391 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 pulse-conduit-top-6 rotate: false - xy: 1414, 391 + xy: 1448, 393 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -1945,7 +1945,7 @@ impact-reactor-top index: -1 power-node rotate: false - xy: 1399, 273 + xy: 1425, 239 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -1959,28 +1959,28 @@ power-node-large index: -1 power-source rotate: false - xy: 1425, 205 + xy: 1425, 171 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 power-void rotate: false - xy: 1425, 171 + xy: 1421, 137 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 powerinfinite rotate: false - xy: 1421, 137 + xy: 1421, 103 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 powervoid rotate: false - xy: 1421, 103 + xy: 1421, 69 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -1994,14 +1994,14 @@ rtg-generator index: -1 rtg-generator-top rotate: false - xy: 1475, 325 + xy: 1509, 343 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 solar-panel rotate: false - xy: 1754, 373 + xy: 1781, 339 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -2176,21 +2176,21 @@ graphite-press index: -1 incinerator rotate: false - xy: 1699, 995 + xy: 1451, 427 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 item-source rotate: false - xy: 1767, 1055 + xy: 1733, 1021 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 item-void rotate: false - xy: 1767, 1021 + xy: 1869, 1089 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -2218,21 +2218,21 @@ silicon-smelter-top index: -1 lavasmelter rotate: false - xy: 1903, 1067 + xy: 1937, 1067 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 liquid-source rotate: false - xy: 1741, 987 + xy: 1741, 953 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 melter rotate: false - xy: 1809, 919 + xy: 1843, 919 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -2246,7 +2246,7 @@ multi-press index: -1 oilrefinery rotate: false - xy: 1911, 897 + xy: 1945, 897 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -2288,14 +2288,14 @@ plastanium-compressor-top index: -1 pulverizer rotate: false - xy: 1448, 393 + xy: 1482, 393 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 pulverizer-rotator rotate: false - xy: 1407, 357 + xy: 1407, 323 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -2330,7 +2330,7 @@ silicon-smelter index: -1 smelter rotate: false - xy: 1645, 275 + xy: 1679, 275 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -2379,14 +2379,14 @@ launch-pad index: -1 sortedunloader rotate: false - xy: 1781, 305 + xy: 1781, 271 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 unloader rotate: false - xy: 929, 123 + xy: 963, 123 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -2603,7 +2603,7 @@ phantom-factory-top-open index: -1 repair-point-base rotate: false - xy: 1550, 377 + xy: 1584, 377 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -2708,7 +2708,7 @@ door-open index: -1 phase-wall rotate: false - xy: 1391, 171 + xy: 1387, 137 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -2778,42 +2778,42 @@ scrap-wall-large4 index: -1 scrap-wall1 rotate: false - xy: 1509, 309 + xy: 1543, 309 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 scrap-wall2 rotate: false - xy: 1543, 309 + xy: 1577, 309 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 scrap-wall3 rotate: false - xy: 1577, 309 + xy: 1611, 309 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 scrap-wall4 rotate: false - xy: 1611, 309 + xy: 1645, 309 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 scrap-wall5 rotate: false - xy: 1611, 309 + xy: 1645, 309 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 surge-wall rotate: false - xy: 613, 139 + xy: 647, 139 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -2827,7 +2827,7 @@ surge-wall-large index: -1 thorium-wall rotate: false - xy: 657, 37 + xy: 691, 105 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -2848,7 +2848,7 @@ thruster index: -1 titanium-wall rotate: false - xy: 861, 7 + xy: 895, 109 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -2904,7 +2904,7 @@ error index: -1 laser rotate: false - xy: 2035, 71 + xy: 2032, 1999 size: 4, 48 orig: 4, 48 offset: 0, 0 @@ -2925,7 +2925,7 @@ laserfull index: -1 minelaser rotate: false - xy: 2032, 1967 + xy: 2035, 19 size: 4, 48 orig: 4, 48 offset: 0, 0 @@ -2974,21 +2974,21 @@ scorch2 index: -1 scorch3 rotate: false - xy: 997, 28 + xy: 1459, 173 size: 28, 100 orig: 28, 100 offset: 0, 0 index: -1 scorch4 rotate: false - xy: 1459, 173 + xy: 1489, 173 size: 28, 100 orig: 28, 100 offset: 0, 0 index: -1 scorch5 rotate: false - xy: 1489, 173 + xy: 1519, 173 size: 28, 100 orig: 28, 100 offset: 0, 0 @@ -3009,21 +3009,21 @@ shell-back index: -1 shot rotate: false - xy: 1577, 275 + xy: 1611, 275 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 transfer rotate: false - xy: 2037, 1232 + xy: 2037, 1244 size: 4, 48 orig: 4, 48 offset: 0, 0 index: -1 transfer-arrow rotate: false - xy: 895, 75 + xy: 895, 41 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -3191,7 +3191,7 @@ blast-drill-icon-medium index: -1 blast-drill-icon-small rotate: false - xy: 2016, 1107 + xy: 1607, 249 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -3212,7 +3212,7 @@ blast-mixer-icon-medium index: -1 blast-mixer-icon-small rotate: false - xy: 1577, 249 + xy: 1578, 211 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -3226,7 +3226,7 @@ bridge-conduit-icon-large index: -1 bridge-conduit-icon-small rotate: false - xy: 1548, 211 + xy: 1633, 249 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -3240,7 +3240,7 @@ bridge-conveyor-icon-large index: -1 bridge-conveyor-icon-small rotate: false - xy: 1603, 249 + xy: 1578, 185 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -3254,7 +3254,7 @@ char-icon-large index: -1 char-icon-small rotate: false - xy: 1629, 249 + xy: 1685, 249 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -3268,7 +3268,7 @@ cliffs-icon-large index: -1 cliffs-icon-small rotate: false - xy: 1655, 249 + xy: 1489, 147 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -3282,7 +3282,7 @@ combustion-generator-icon-large index: -1 combustion-generator-icon-small rotate: false - xy: 1681, 249 + xy: 1489, 121 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -3303,7 +3303,7 @@ conduit-icon-large index: -1 conduit-icon-small rotate: false - xy: 1489, 147 + xy: 1515, 147 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -3324,7 +3324,7 @@ container-icon-medium index: -1 container-icon-small rotate: false - xy: 1489, 121 + xy: 1489, 95 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -3338,7 +3338,7 @@ conveyor-icon-large index: -1 conveyor-icon-small rotate: false - xy: 1489, 95 + xy: 1515, 121 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -3373,7 +3373,7 @@ copper-wall-large-icon-medium index: -1 copper-wall-large-icon-small rotate: false - xy: 487, 181 + xy: 1515, 95 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -3394,7 +3394,7 @@ core-foundation-icon-medium index: -1 core-foundation-icon-small rotate: false - xy: 1707, 245 + xy: 1515, 69 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -3415,7 +3415,7 @@ core-nucleus-icon-medium index: -1 core-nucleus-icon-small rotate: false - xy: 1733, 245 + xy: 2016, 1175 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -3436,7 +3436,7 @@ core-shard-icon-medium index: -1 core-shard-icon-small rotate: false - xy: 1759, 245 + xy: 2016, 1149 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -3450,7 +3450,7 @@ craters-icon-large index: -1 craters-icon-small rotate: false - xy: 1785, 245 + xy: 2016, 1123 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -3478,7 +3478,7 @@ cryofluidmixer-icon-medium index: -1 cryofluidmixer-icon-small rotate: false - xy: 1811, 243 + xy: 1711, 245 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -3506,7 +3506,7 @@ cultivator-icon-medium index: -1 cultivator-icon-small rotate: false - xy: 1837, 243 + xy: 1737, 245 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -3541,7 +3541,7 @@ cyclone-icon-medium index: -1 cyclone-icon-small rotate: false - xy: 1127, 1160 + xy: 1763, 245 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -3569,7 +3569,7 @@ dagger-factory-icon-medium index: -1 dagger-factory-icon-small rotate: false - xy: 1577, 223 + xy: 1789, 245 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -3590,7 +3590,7 @@ deepwater-icon-large index: -1 deepwater-icon-small rotate: false - xy: 1603, 223 + xy: 1815, 243 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -3611,7 +3611,7 @@ delta-mech-pad-icon-medium index: -1 delta-mech-pad-icon-small rotate: false - xy: 1629, 223 + xy: 1841, 243 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -3632,7 +3632,7 @@ differential-generator-icon-medium index: -1 differential-generator-icon-small rotate: false - xy: 1655, 223 + xy: 487, 181 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -3653,7 +3653,7 @@ distributor-icon-medium index: -1 distributor-icon-small rotate: false - xy: 1681, 223 + xy: 1127, 1160 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -3667,7 +3667,7 @@ door-icon-large index: -1 door-icon-small rotate: false - xy: 1574, 197 + xy: 1607, 223 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -3688,7 +3688,7 @@ door-large-icon-medium index: -1 door-large-icon-small rotate: false - xy: 1600, 197 + xy: 1633, 223 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -3702,7 +3702,7 @@ dunerocks-icon-large index: -1 dunerocks-icon-small rotate: false - xy: 1626, 197 + xy: 1659, 223 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -3730,7 +3730,7 @@ duo-icon-large index: -1 duo-icon-small rotate: false - xy: 1652, 197 + xy: 1685, 223 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -3751,7 +3751,7 @@ force-projector-icon-medium index: -1 force-projector-icon-small rotate: false - xy: 1678, 197 + xy: 1604, 197 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -3779,7 +3779,7 @@ fortress-factory-icon-medium index: -1 fortress-factory-icon-small rotate: false - xy: 1707, 219 + xy: 1630, 197 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -3814,7 +3814,7 @@ fuse-icon-medium index: -1 fuse-icon-small rotate: false - xy: 1733, 219 + xy: 1656, 197 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -3842,7 +3842,7 @@ ghoul-factory-icon-medium index: -1 ghoul-factory-icon-small rotate: false - xy: 1759, 219 + xy: 1682, 197 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -3863,7 +3863,7 @@ glaive-ship-pad-icon-medium index: -1 glaive-ship-pad-icon-small rotate: false - xy: 1785, 219 + xy: 1711, 219 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -3884,7 +3884,7 @@ graphite-press-icon-medium index: -1 graphite-press-icon-small rotate: false - xy: 1811, 217 + xy: 1737, 219 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -3912,7 +3912,7 @@ hail-icon-large index: -1 hail-icon-small rotate: false - xy: 1837, 217 + xy: 1763, 219 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -3933,7 +3933,7 @@ holostone-icon-large index: -1 holostone-icon-small rotate: false - xy: 1704, 193 + xy: 1789, 219 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -3947,7 +3947,7 @@ hotrock-icon-large index: -1 hotrock-icon-small rotate: false - xy: 1730, 193 + xy: 1815, 217 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -3961,7 +3961,7 @@ ice-icon-large index: -1 ice-icon-small rotate: false - xy: 1756, 193 + xy: 1841, 217 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -3982,7 +3982,7 @@ ice-snow-icon-large index: -1 ice-snow-icon-small rotate: false - xy: 1782, 193 + xy: 1708, 193 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -3996,7 +3996,7 @@ icerocks-icon-large index: -1 icerocks-icon-small rotate: false - xy: 1808, 191 + xy: 1734, 193 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -4010,7 +4010,7 @@ ignarock-icon-large index: -1 ignarock-icon-small rotate: false - xy: 1626, 171 + xy: 1838, 191 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -4031,14 +4031,14 @@ impact-reactor-icon-large index: -1 impact-reactor-icon-medium rotate: false - xy: 1699, 1029 + xy: 1699, 995 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 impact-reactor-icon-small rotate: false - xy: 1652, 171 + xy: 1604, 171 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -4052,21 +4052,21 @@ incinerator-icon-large index: -1 incinerator-icon-small rotate: false - xy: 1678, 171 + xy: 1630, 171 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 item-biomatter-medium rotate: false - xy: 1574, 145 + xy: 1682, 171 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 item-biomatter-small rotate: false - xy: 947, 3 + xy: 491, 1000 size: 16, 16 orig: 16, 16 offset: 0, 0 @@ -4080,14 +4080,14 @@ item-biomatter-xlarge index: -1 item-blast-compound-medium rotate: false - xy: 1600, 145 + xy: 1578, 159 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 item-blast-compound-small rotate: false - xy: 965, 3 + xy: 509, 1000 size: 16, 16 orig: 16, 16 offset: 0, 0 @@ -4101,14 +4101,14 @@ item-blast-compound-xlarge index: -1 item-coal-medium rotate: false - xy: 1626, 145 + xy: 1708, 167 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 item-coal-small rotate: false - xy: 1023, 8 + xy: 929, 3 size: 16, 16 orig: 16, 16 offset: 0, 0 @@ -4122,14 +4122,14 @@ item-coal-xlarge index: -1 item-copper-medium rotate: false - xy: 1652, 145 + xy: 1734, 167 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 item-copper-small rotate: false - xy: 1041, 8 + xy: 947, 3 size: 16, 16 orig: 16, 16 offset: 0, 0 @@ -4143,14 +4143,14 @@ item-copper-xlarge index: -1 item-graphite-medium rotate: false - xy: 1678, 145 + xy: 1760, 167 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 item-graphite-small rotate: false - xy: 1059, 8 + xy: 965, 3 size: 16, 16 orig: 16, 16 offset: 0, 0 @@ -4164,14 +4164,14 @@ item-graphite-xlarge index: -1 item-lead-medium rotate: false - xy: 1704, 167 + xy: 1786, 167 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 item-lead-small rotate: false - xy: 1383, 51 + xy: 983, 3 size: 16, 16 orig: 16, 16 offset: 0, 0 @@ -4185,14 +4185,14 @@ item-lead-xlarge index: -1 item-metaglass-medium rotate: false - xy: 1730, 167 + xy: 1812, 165 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 item-metaglass-small rotate: false - xy: 1383, 33 + xy: 1001, 4 size: 16, 16 orig: 16, 16 offset: 0, 0 @@ -4206,14 +4206,14 @@ item-metaglass-xlarge index: -1 item-phase-fabric-medium rotate: false - xy: 1756, 167 + xy: 1838, 165 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 item-phase-fabric-small rotate: false - xy: 1401, 51 + xy: 1788, 397 size: 16, 16 orig: 16, 16 offset: 0, 0 @@ -4227,14 +4227,14 @@ item-phase-fabric-xlarge index: -1 item-plastanium-medium rotate: false - xy: 1782, 167 + xy: 1682, 145 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 item-plastanium-small rotate: false - xy: 1401, 33 + xy: 1788, 379 size: 16, 16 orig: 16, 16 offset: 0, 0 @@ -4248,14 +4248,14 @@ item-plastanium-xlarge index: -1 item-pyratite-medium rotate: false - xy: 1808, 165 + xy: 1708, 141 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 item-pyratite-small rotate: false - xy: 1419, 51 + xy: 1295, 864 size: 16, 16 orig: 16, 16 offset: 0, 0 @@ -4269,14 +4269,14 @@ item-pyratite-xlarge index: -1 item-sand-medium rotate: false - xy: 1834, 165 + xy: 1734, 141 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 item-sand-small rotate: false - xy: 1419, 33 + xy: 2029, 853 size: 16, 16 orig: 16, 16 offset: 0, 0 @@ -4290,14 +4290,14 @@ item-sand-xlarge index: -1 item-scrap-medium rotate: false - xy: 1704, 141 + xy: 1760, 141 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 item-scrap-small rotate: false - xy: 1437, 51 + xy: 2029, 835 size: 16, 16 orig: 16, 16 offset: 0, 0 @@ -4311,14 +4311,14 @@ item-scrap-xlarge index: -1 item-silicon-medium rotate: false - xy: 1730, 141 + xy: 1786, 141 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 item-silicon-small rotate: false - xy: 1437, 33 + xy: 2029, 817 size: 16, 16 orig: 16, 16 offset: 0, 0 @@ -4339,21 +4339,21 @@ item-source-icon-large index: -1 item-source-icon-small rotate: false - xy: 1756, 141 + xy: 1812, 139 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 item-surge-alloy-medium rotate: false - xy: 1782, 141 + xy: 1838, 139 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 item-surge-alloy-small rotate: false - xy: 1455, 51 + xy: 2029, 799 size: 16, 16 orig: 16, 16 offset: 0, 0 @@ -4367,14 +4367,14 @@ item-surge-alloy-xlarge index: -1 item-thorium-medium rotate: false - xy: 1808, 139 + xy: 1604, 145 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 item-thorium-small rotate: false - xy: 1455, 33 + xy: 505, 7 size: 16, 16 orig: 16, 16 offset: 0, 0 @@ -4388,14 +4388,14 @@ item-thorium-xlarge index: -1 item-titanium-medium rotate: false - xy: 1834, 139 + xy: 1630, 145 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 item-titanium-small rotate: false - xy: 1473, 51 + xy: 523, 7 size: 16, 16 orig: 16, 16 offset: 0, 0 @@ -4416,7 +4416,7 @@ item-void-icon-large index: -1 item-void-icon-small rotate: false - xy: 2022, 1703 + xy: 1656, 129 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -4430,14 +4430,14 @@ javelin-ship-pad-icon-large index: -1 javelin-ship-pad-icon-medium rotate: false - xy: 1869, 1089 + xy: 1835, 1055 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 javelin-ship-pad-icon-small rotate: false - xy: 2022, 1677 + xy: 1682, 119 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -4451,7 +4451,7 @@ junction-icon-large index: -1 junction-icon-small rotate: false - xy: 997, 2 + xy: 1708, 115 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -4465,14 +4465,14 @@ kiln-icon-large index: -1 kiln-icon-medium rotate: false - xy: 1801, 1021 + xy: 1869, 1055 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 kiln-icon-small rotate: false - xy: 1027, 78 + xy: 1734, 115 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -4500,14 +4500,14 @@ lancer-icon-large index: -1 lancer-icon-medium rotate: false - xy: 1869, 1055 + xy: 1835, 1021 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 lancer-icon-small rotate: false - xy: 1053, 78 + xy: 1760, 115 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -4528,14 +4528,14 @@ laser-drill-icon-large index: -1 laser-drill-icon-medium rotate: false - xy: 1835, 1021 + xy: 1869, 1021 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 laser-drill-icon-small rotate: false - xy: 1027, 52 + xy: 1786, 115 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -4549,14 +4549,14 @@ launch-pad-icon-large index: -1 launch-pad-icon-medium rotate: false - xy: 1869, 1021 + xy: 1903, 1067 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 launch-pad-icon-small rotate: false - xy: 1053, 52 + xy: 1812, 113 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -4570,14 +4570,14 @@ liquid-junction-icon-large index: -1 liquid-junction-icon-small rotate: false - xy: 1079, 74 + xy: 1838, 113 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 liquid-router-icon-full rotate: false - xy: 1971, 999 + xy: 2005, 1067 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -4591,7 +4591,7 @@ liquid-router-icon-large index: -1 liquid-router-icon-small rotate: false - xy: 1027, 26 + xy: 1867, 225 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -4605,7 +4605,7 @@ liquid-source-icon-large index: -1 liquid-source-icon-small rotate: false - xy: 1053, 26 + xy: 1893, 225 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -4626,14 +4626,14 @@ liquid-tank-icon-large index: -1 liquid-tank-icon-medium rotate: false - xy: 1741, 953 + xy: 1775, 987 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 liquid-tank-icon-small rotate: false - xy: 1079, 48 + xy: 1919, 225 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -4647,7 +4647,7 @@ magmarock-icon-large index: -1 magmarock-icon-small rotate: false - xy: 1079, 22 + xy: 1945, 225 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -4675,14 +4675,14 @@ mass-driver-icon-large index: -1 mass-driver-icon-medium rotate: false - xy: 1843, 987 + xy: 1809, 953 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 mass-driver-icon-small rotate: false - xy: 1105, 69 + xy: 1971, 225 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -4759,14 +4759,14 @@ mechanical-drill-icon-large index: -1 mechanical-drill-icon-medium rotate: false - xy: 1809, 953 + xy: 1775, 919 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 mechanical-drill-icon-small rotate: false - xy: 1105, 43 + xy: 1997, 225 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -4780,7 +4780,7 @@ mechanical-pump-icon-large index: -1 mechanical-pump-icon-small rotate: false - xy: 1105, 17 + xy: 2023, 225 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -4808,14 +4808,14 @@ meltdown-icon-large index: -1 meltdown-icon-medium rotate: false - xy: 1843, 953 + xy: 1809, 919 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 meltdown-icon-small rotate: false - xy: 1131, 64 + xy: 2022, 1703 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -4829,7 +4829,7 @@ melter-icon-large index: -1 melter-icon-small rotate: false - xy: 1157, 64 + xy: 2022, 1677 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -4843,14 +4843,14 @@ mend-projector-icon-large index: -1 mend-projector-icon-medium rotate: false - xy: 1843, 919 + xy: 1877, 965 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 mend-projector-icon-small rotate: false - xy: 1131, 38 + xy: 1541, 147 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -4864,7 +4864,7 @@ metal-floor-2-icon-large index: -1 metal-floor-2-icon-small rotate: false - xy: 1183, 64 + xy: 1541, 121 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -4878,7 +4878,7 @@ metal-floor-3-icon-large index: -1 metal-floor-3-icon-small rotate: false - xy: 1157, 38 + xy: 1541, 95 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -4892,7 +4892,7 @@ metal-floor-5-icon-large index: -1 metal-floor-5-icon-small rotate: false - xy: 1209, 64 + xy: 1541, 69 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -4906,7 +4906,7 @@ metal-floor-damaged-icon-large index: -1 metal-floor-damaged-icon-small rotate: false - xy: 1183, 38 + xy: 1567, 133 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -4927,7 +4927,7 @@ metal-floor-icon-large index: -1 metal-floor-icon-small rotate: false - xy: 1235, 64 + xy: 1567, 107 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -4941,14 +4941,14 @@ multi-press-icon-large index: -1 multi-press-icon-medium rotate: false - xy: 2013, 931 + xy: 1877, 897 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 multi-press-icon-small rotate: false - xy: 1209, 38 + xy: 1567, 81 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -4969,14 +4969,14 @@ oil-extractor-icon-large index: -1 oil-extractor-icon-medium rotate: false - xy: 1877, 897 + xy: 1911, 897 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 oil-extractor-icon-small rotate: false - xy: 1261, 64 + xy: 1593, 119 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -4990,14 +4990,14 @@ omega-mech-pad-icon-large index: -1 omega-mech-pad-icon-medium rotate: false - xy: 1945, 897 + xy: 1979, 897 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 omega-mech-pad-icon-small rotate: false - xy: 1235, 38 + xy: 1593, 93 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -5011,42 +5011,42 @@ ore-coal-holostone-icon-large index: -1 ore-coal-holostone-icon-small rotate: false - xy: 1287, 64 + xy: 1619, 119 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 ore-coal-holostone1 rotate: false - xy: 1979, 897 + xy: 2013, 897 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-coal-holostone2 rotate: false - xy: 2013, 897 + xy: 1783, 885 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-coal-holostone3 rotate: false - xy: 1783, 885 + xy: 1783, 851 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-coal-holostone-icon-full rotate: false - xy: 1783, 885 + xy: 1783, 851 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-coal-holostone-icon-medium rotate: false - xy: 1783, 885 + xy: 1783, 851 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -5060,42 +5060,42 @@ ore-coal-sand-icon-large index: -1 ore-coal-sand-icon-small rotate: false - xy: 1261, 38 + xy: 1619, 93 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 ore-coal-sand1 rotate: false - xy: 1783, 851 + xy: 1817, 885 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-coal-sand2 rotate: false - xy: 1817, 885 + xy: 1817, 851 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-coal-sand3 rotate: false - xy: 1817, 851 + xy: 1825, 817 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-coal-sand-icon-full rotate: false - xy: 1817, 851 + xy: 1825, 817 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-coal-sand-icon-medium rotate: false - xy: 1817, 851 + xy: 1825, 817 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -5109,7 +5109,7 @@ ore-coal-stained-stone-icon-large index: -1 ore-coal-stained-stone-icon-small rotate: false - xy: 1313, 64 + xy: 1645, 103 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -5123,77 +5123,77 @@ ore-coal-stained-stone-red-icon-large index: -1 ore-coal-stained-stone-red-icon-small rotate: false - xy: 1287, 38 + xy: 1567, 55 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 ore-coal-stained-stone-red1 rotate: false - xy: 1919, 863 + xy: 1953, 863 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-coal-stained-stone-red2 rotate: false - xy: 1953, 863 + xy: 1987, 863 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-coal-stained-stone-red3 rotate: false - xy: 1987, 863 + xy: 1859, 829 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-coal-stained-stone-red-icon-full rotate: false - xy: 1987, 863 + xy: 1859, 829 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-coal-stained-stone-red-icon-medium rotate: false - xy: 1987, 863 + xy: 1859, 829 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-coal-stained-stone1 rotate: false - xy: 1825, 817 + xy: 1851, 863 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-coal-stained-stone2 rotate: false - xy: 1851, 863 + xy: 1885, 863 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-coal-stained-stone3 rotate: false - xy: 1885, 863 + xy: 1919, 863 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-coal-stained-stone-icon-full rotate: false - xy: 1885, 863 + xy: 1919, 863 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-coal-stained-stone-icon-medium rotate: false - xy: 1885, 863 + xy: 1919, 863 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -5207,42 +5207,42 @@ ore-coal-stone-icon-large index: -1 ore-coal-stone-icon-small rotate: false - xy: 1339, 64 + xy: 1593, 67 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 ore-coal-stone1 rotate: false - xy: 1859, 829 + xy: 1893, 829 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-coal-stone2 rotate: false - xy: 1893, 829 + xy: 1927, 829 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-coal-stone3 rotate: false - xy: 1927, 829 + xy: 1961, 829 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-coal-stone-icon-full rotate: false - xy: 1927, 829 + xy: 1961, 829 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-coal-stone-icon-medium rotate: false - xy: 1927, 829 + xy: 1961, 829 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -5256,42 +5256,42 @@ ore-copper-holostone-icon-large index: -1 ore-copper-holostone-icon-small rotate: false - xy: 1313, 38 + xy: 1619, 67 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 ore-copper-holostone1 rotate: false - xy: 1961, 829 + xy: 1995, 829 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-copper-holostone2 rotate: false - xy: 1995, 829 + xy: 1859, 795 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-copper-holostone3 rotate: false - xy: 1859, 795 + xy: 1893, 795 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-copper-holostone-icon-full rotate: false - xy: 1859, 795 + xy: 1893, 795 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-copper-holostone-icon-medium rotate: false - xy: 1859, 795 + xy: 1893, 795 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -5305,42 +5305,42 @@ ore-copper-sand-icon-large index: -1 ore-copper-sand-icon-small rotate: false - xy: 1339, 38 + xy: 1645, 77 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 ore-copper-sand1 rotate: false - xy: 1893, 795 + xy: 1927, 795 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-copper-sand2 rotate: false - xy: 1927, 795 + xy: 1961, 795 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-copper-sand3 rotate: false - xy: 1961, 795 + xy: 1995, 795 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-copper-sand-icon-full rotate: false - xy: 1961, 795 + xy: 1995, 795 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-copper-sand-icon-medium rotate: false - xy: 1961, 795 + xy: 1995, 795 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -5354,7 +5354,7 @@ ore-copper-stained-stone-icon-large index: -1 ore-copper-stained-stone-icon-small rotate: false - xy: 1131, 12 + xy: 1671, 93 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -5368,77 +5368,77 @@ ore-copper-stained-stone-red-icon-large index: -1 ore-copper-stained-stone-red-icon-small rotate: false - xy: 1157, 12 + xy: 1671, 67 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 ore-copper-stained-stone-red1 rotate: false - xy: 1871, 761 + xy: 1837, 693 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-copper-stained-stone-red2 rotate: false - xy: 1837, 693 + xy: 1905, 761 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-copper-stained-stone-red3 rotate: false - xy: 1905, 761 + xy: 1871, 727 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-copper-stained-stone-red-icon-full rotate: false - xy: 1905, 761 + xy: 1871, 727 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-copper-stained-stone-red-icon-medium rotate: false - xy: 1905, 761 + xy: 1871, 727 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-copper-stained-stone1 rotate: false - xy: 1995, 795 + xy: 1837, 761 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-copper-stained-stone2 rotate: false - xy: 1837, 761 + xy: 1837, 727 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-copper-stained-stone3 rotate: false - xy: 1837, 727 + xy: 1871, 761 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-copper-stained-stone-icon-full rotate: false - xy: 1837, 727 + xy: 1871, 761 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-copper-stained-stone-icon-medium rotate: false - xy: 1837, 727 + xy: 1871, 761 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -5452,42 +5452,42 @@ ore-copper-stone-icon-large index: -1 ore-copper-stone-icon-small rotate: false - xy: 1183, 12 + xy: 1645, 51 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 ore-copper-stone1 rotate: false - xy: 1871, 727 + xy: 1837, 659 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-copper-stone2 rotate: false - xy: 1837, 659 + xy: 1939, 761 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-copper-stone3 rotate: false - xy: 1939, 761 + xy: 1905, 727 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-copper-stone-icon-full rotate: false - xy: 1939, 761 + xy: 1905, 727 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-copper-stone-icon-medium rotate: false - xy: 1939, 761 + xy: 1905, 727 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -5501,42 +5501,42 @@ ore-lead-holostone-icon-large index: -1 ore-lead-holostone-icon-small rotate: false - xy: 1209, 12 + xy: 1671, 41 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 ore-lead-holostone1 rotate: false - xy: 1905, 727 + xy: 1871, 693 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-lead-holostone2 rotate: false - xy: 1871, 693 + xy: 1837, 625 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-lead-holostone3 rotate: false - xy: 1837, 625 + xy: 1973, 761 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-lead-holostone-icon-full rotate: false - xy: 1837, 625 + xy: 1973, 761 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-lead-holostone-icon-medium rotate: false - xy: 1837, 625 + xy: 1973, 761 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -5550,42 +5550,42 @@ ore-lead-sand-icon-large index: -1 ore-lead-sand-icon-small rotate: false - xy: 1235, 12 + xy: 1697, 89 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 ore-lead-sand1 rotate: false - xy: 1973, 761 + xy: 1939, 727 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-lead-sand2 rotate: false - xy: 1939, 727 + xy: 1905, 693 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-lead-sand3 rotate: false - xy: 1905, 693 + xy: 1871, 659 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-lead-sand-icon-full rotate: false - xy: 1905, 693 + xy: 1871, 659 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-lead-sand-icon-medium rotate: false - xy: 1905, 693 + xy: 1871, 659 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -5599,7 +5599,7 @@ ore-lead-stained-stone-icon-large index: -1 ore-lead-stained-stone-icon-small rotate: false - xy: 1261, 12 + xy: 1697, 63 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -5613,77 +5613,77 @@ ore-lead-stained-stone-red-icon-large index: -1 ore-lead-stained-stone-red-icon-small rotate: false - xy: 1287, 12 + xy: 1723, 89 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 ore-lead-stained-stone-red1 rotate: false - xy: 1939, 693 + xy: 1905, 659 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-lead-stained-stone-red2 rotate: false - xy: 1905, 659 + xy: 1871, 625 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-lead-stained-stone-red3 rotate: false - xy: 1871, 625 + xy: 1837, 557 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-lead-stained-stone-red-icon-full rotate: false - xy: 1871, 625 + xy: 1837, 557 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-lead-stained-stone-red-icon-medium rotate: false - xy: 1871, 625 + xy: 1837, 557 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-lead-stained-stone1 rotate: false - xy: 1871, 659 + xy: 1837, 591 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-lead-stained-stone2 rotate: false - xy: 1837, 591 + xy: 1973, 727 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-lead-stained-stone3 rotate: false - xy: 1973, 727 + xy: 1939, 693 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-lead-stained-stone-icon-full rotate: false - xy: 1973, 727 + xy: 1939, 693 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-lead-stained-stone-icon-medium rotate: false - xy: 1973, 727 + xy: 1939, 693 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -5697,42 +5697,42 @@ ore-lead-stone-icon-large index: -1 ore-lead-stone-icon-small rotate: false - xy: 1313, 12 + xy: 1723, 63 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 ore-lead-stone1 rotate: false - xy: 1837, 557 + xy: 1973, 693 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-lead-stone2 rotate: false - xy: 1973, 693 + xy: 1939, 659 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-lead-stone3 rotate: false - xy: 1939, 659 + xy: 1905, 625 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-lead-stone-icon-full rotate: false - xy: 1939, 659 + xy: 1905, 625 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-lead-stone-icon-medium rotate: false - xy: 1939, 659 + xy: 1905, 625 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -5746,42 +5746,42 @@ ore-scrap-holostone-icon-large index: -1 ore-scrap-holostone-icon-small rotate: false - xy: 1339, 12 + xy: 1749, 89 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 ore-scrap-holostone1 rotate: false - xy: 1905, 625 + xy: 1871, 591 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-scrap-holostone2 rotate: false - xy: 1871, 591 + xy: 1973, 659 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-scrap-holostone3 rotate: false - xy: 1973, 659 + xy: 1939, 625 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-scrap-holostone-icon-full rotate: false - xy: 1973, 659 + xy: 1939, 625 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-scrap-holostone-icon-medium rotate: false - xy: 1973, 659 + xy: 1939, 625 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -5795,42 +5795,42 @@ ore-scrap-sand-icon-large index: -1 ore-scrap-sand-icon-small rotate: false - xy: 1863, 225 + xy: 1749, 63 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 ore-scrap-sand1 rotate: false - xy: 1939, 625 + xy: 1905, 591 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-scrap-sand2 rotate: false - xy: 1905, 591 + xy: 1871, 557 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-scrap-sand3 rotate: false - xy: 1871, 557 + xy: 1973, 625 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-scrap-sand-icon-full rotate: false - xy: 1871, 557 + xy: 1973, 625 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-scrap-sand-icon-medium rotate: false - xy: 1871, 557 + xy: 1973, 625 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -5844,42 +5844,42 @@ ore-scrap-snow-icon-large index: -1 ore-scrap-snow-icon-small rotate: false - xy: 1889, 225 + xy: 1775, 89 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 ore-scrap-snow1 rotate: false - xy: 1973, 625 + xy: 1939, 591 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-scrap-snow2 rotate: false - xy: 1939, 591 + xy: 1905, 557 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-scrap-snow3 rotate: false - xy: 1905, 557 + xy: 1973, 591 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-scrap-snow-icon-full rotate: false - xy: 1905, 557 + xy: 1973, 591 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-scrap-snow-icon-medium rotate: false - xy: 1905, 557 + xy: 1973, 591 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -5893,7 +5893,7 @@ ore-scrap-stained-stone-icon-large index: -1 ore-scrap-stained-stone-icon-small rotate: false - xy: 1915, 225 + xy: 1775, 63 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -5907,77 +5907,77 @@ ore-scrap-stained-stone-red-icon-large index: -1 ore-scrap-stained-stone-red-icon-small rotate: false - xy: 1941, 225 + xy: 1697, 37 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 ore-scrap-stained-stone-red1 rotate: false - xy: 2007, 761 + xy: 2007, 727 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-scrap-stained-stone-red2 rotate: false - xy: 2007, 727 + xy: 2007, 693 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-scrap-stained-stone-red3 rotate: false - xy: 2007, 693 + xy: 2007, 659 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-scrap-stained-stone-red-icon-full rotate: false - xy: 2007, 693 + xy: 2007, 659 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-scrap-stained-stone-red-icon-medium rotate: false - xy: 2007, 693 + xy: 2007, 659 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-scrap-stained-stone1 rotate: false - xy: 1973, 591 + xy: 1939, 557 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-scrap-stained-stone2 rotate: false - xy: 1939, 557 + xy: 1973, 557 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-scrap-stained-stone3 rotate: false - xy: 1973, 557 + xy: 2007, 761 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-scrap-stained-stone-icon-full rotate: false - xy: 1973, 557 + xy: 2007, 761 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-scrap-stained-stone-icon-medium rotate: false - xy: 1973, 557 + xy: 2007, 761 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -5991,42 +5991,42 @@ ore-scrap-stone-icon-large index: -1 ore-scrap-stone-icon-small rotate: false - xy: 1967, 225 + xy: 1723, 37 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 ore-scrap-stone1 rotate: false - xy: 2007, 659 + xy: 2007, 625 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-scrap-stone2 rotate: false - xy: 2007, 625 + xy: 2007, 591 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-scrap-stone3 rotate: false - xy: 2007, 591 + xy: 2007, 557 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-scrap-stone-icon-full rotate: false - xy: 2007, 591 + xy: 2007, 557 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-scrap-stone-icon-medium rotate: false - xy: 2007, 591 + xy: 2007, 557 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -6040,42 +6040,42 @@ ore-thorium-holostone-icon-large index: -1 ore-thorium-holostone-icon-small rotate: false - xy: 1993, 225 + xy: 1749, 37 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 ore-thorium-holostone1 rotate: false - xy: 2007, 557 + xy: 1863, 523 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-thorium-holostone2 rotate: false - xy: 1863, 523 + xy: 1863, 489 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-thorium-holostone3 rotate: false - xy: 1863, 489 + xy: 1897, 523 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-thorium-holostone-icon-full rotate: false - xy: 1863, 489 + xy: 1897, 523 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-thorium-holostone-icon-medium rotate: false - xy: 1863, 489 + xy: 1897, 523 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -6089,42 +6089,42 @@ ore-thorium-sand-icon-large index: -1 ore-thorium-sand-icon-small rotate: false - xy: 2019, 225 + xy: 1775, 37 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 ore-thorium-sand1 rotate: false - xy: 1897, 523 + xy: 1931, 523 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-thorium-sand2 rotate: false - xy: 1931, 523 + xy: 1897, 489 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-thorium-sand3 rotate: false - xy: 1897, 489 + xy: 1965, 523 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-thorium-sand-icon-full rotate: false - xy: 1897, 489 + xy: 1965, 523 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-thorium-sand-icon-medium rotate: false - xy: 1897, 489 + xy: 1965, 523 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -6138,7 +6138,7 @@ ore-thorium-stained-stone-icon-large index: -1 ore-thorium-stained-stone-icon-small rotate: false - xy: 1863, 199 + xy: 1801, 87 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -6152,77 +6152,77 @@ ore-thorium-stained-stone-red-icon-large index: -1 ore-thorium-stained-stone-red-icon-small rotate: false - xy: 1889, 199 + xy: 1801, 61 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 ore-thorium-stained-stone-red1 rotate: false - xy: 1965, 489 + xy: 1999, 489 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-thorium-stained-stone-red2 rotate: false - xy: 1999, 489 + xy: 1889, 455 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-thorium-stained-stone-red3 rotate: false - xy: 1889, 455 + xy: 1923, 455 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-thorium-stained-stone-red-icon-full rotate: false - xy: 1889, 455 + xy: 1923, 455 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-thorium-stained-stone-red-icon-medium rotate: false - xy: 1889, 455 + xy: 1923, 455 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-thorium-stained-stone1 rotate: false - xy: 1965, 523 + xy: 1931, 489 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-thorium-stained-stone2 rotate: false - xy: 1931, 489 + xy: 1999, 523 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-thorium-stained-stone3 rotate: false - xy: 1999, 523 + xy: 1965, 489 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-thorium-stained-stone-icon-full rotate: false - xy: 1999, 523 + xy: 1965, 489 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-thorium-stained-stone-icon-medium rotate: false - xy: 1999, 523 + xy: 1965, 489 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -6236,42 +6236,42 @@ ore-thorium-stone-icon-large index: -1 ore-thorium-stone-icon-small rotate: false - xy: 1915, 199 + xy: 1827, 87 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 ore-thorium-stone1 rotate: false - xy: 1923, 455 + xy: 1957, 455 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-thorium-stone2 rotate: false - xy: 1957, 455 + xy: 1991, 455 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-thorium-stone3 rotate: false - xy: 1991, 455 + xy: 1915, 421 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-thorium-stone-icon-full rotate: false - xy: 1991, 455 + xy: 1915, 421 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-thorium-stone-icon-medium rotate: false - xy: 1991, 455 + xy: 1915, 421 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -6285,42 +6285,42 @@ ore-titanium-holostone-icon-large index: -1 ore-titanium-holostone-icon-small rotate: false - xy: 1941, 199 + xy: 1827, 61 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 ore-titanium-holostone1 rotate: false - xy: 1915, 421 + xy: 1949, 421 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-titanium-holostone2 rotate: false - xy: 1949, 421 + xy: 1983, 421 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-titanium-holostone3 rotate: false - xy: 1983, 421 + xy: 1915, 387 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-titanium-holostone-icon-full rotate: false - xy: 1983, 421 + xy: 1915, 387 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-titanium-holostone-icon-medium rotate: false - xy: 1983, 421 + xy: 1915, 387 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -6334,42 +6334,42 @@ ore-titanium-sand-icon-large index: -1 ore-titanium-sand-icon-small rotate: false - xy: 1967, 199 + xy: 1801, 35 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 ore-titanium-sand1 rotate: false - xy: 1915, 387 + xy: 1949, 387 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-titanium-sand2 rotate: false - xy: 1949, 387 + xy: 1983, 387 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-titanium-sand3 rotate: false - xy: 1983, 387 + xy: 1249, 443 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-titanium-sand-icon-full rotate: false - xy: 1983, 387 + xy: 1249, 443 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-titanium-sand-icon-medium rotate: false - xy: 1983, 387 + xy: 1249, 443 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -6383,7 +6383,7 @@ ore-titanium-stained-stone-icon-large index: -1 ore-titanium-stained-stone-icon-small rotate: false - xy: 1993, 199 + xy: 1827, 35 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -6397,77 +6397,77 @@ ore-titanium-stained-stone-red-icon-large index: -1 ore-titanium-stained-stone-red-icon-small rotate: false - xy: 2019, 199 + xy: 1593, 41 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 ore-titanium-stained-stone-red1 rotate: false - xy: 1249, 409 + xy: 1283, 409 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-titanium-stained-stone-red2 rotate: false - xy: 1283, 409 + xy: 1317, 409 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-titanium-stained-stone-red3 rotate: false - xy: 1317, 409 + xy: 1278, 375 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-titanium-stained-stone-red-icon-full rotate: false - xy: 1317, 409 + xy: 1278, 375 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-titanium-stained-stone-red-icon-medium rotate: false - xy: 1317, 409 + xy: 1278, 375 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-titanium-stained-stone1 rotate: false - xy: 1249, 443 + xy: 1283, 443 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-titanium-stained-stone2 rotate: false - xy: 1283, 443 + xy: 1317, 443 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-titanium-stained-stone3 rotate: false - xy: 1317, 443 + xy: 1249, 409 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-titanium-stained-stone-icon-full rotate: false - xy: 1317, 443 + xy: 1249, 409 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-titanium-stained-stone-icon-medium rotate: false - xy: 1317, 443 + xy: 1249, 409 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -6481,42 +6481,42 @@ ore-titanium-stone-icon-large index: -1 ore-titanium-stone-icon-small rotate: false - xy: 1860, 173 + xy: 1619, 41 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 ore-titanium-stone1 rotate: false - xy: 1278, 375 + xy: 1312, 375 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-titanium-stone2 rotate: false - xy: 1312, 375 + xy: 1305, 341 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-titanium-stone3 rotate: false - xy: 1305, 341 + xy: 1305, 307 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-titanium-stone-icon-full rotate: false - xy: 1305, 341 + xy: 1305, 307 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-titanium-stone-icon-medium rotate: false - xy: 1305, 341 + xy: 1305, 307 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -6530,14 +6530,14 @@ overdrive-projector-icon-large index: -1 overdrive-projector-icon-medium rotate: false - xy: 1305, 307 + xy: 1339, 341 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 overdrive-projector-icon-small rotate: false - xy: 1860, 147 + xy: 1645, 25 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -6551,7 +6551,7 @@ overflow-gate-icon-large index: -1 overflow-gate-icon-small rotate: false - xy: 1886, 173 + xy: 1671, 15 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -6572,14 +6572,14 @@ phantom-factory-icon-large index: -1 phantom-factory-icon-medium rotate: false - xy: 1339, 307 + xy: 1346, 375 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 phantom-factory-icon-small rotate: false - xy: 1886, 147 + xy: 1697, 11 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -6593,7 +6593,7 @@ phase-conduit-icon-large index: -1 phase-conduit-icon-small rotate: false - xy: 1912, 173 + xy: 1723, 11 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -6607,7 +6607,7 @@ phase-conveyor-icon-large index: -1 phase-conveyor-icon-small rotate: false - xy: 1912, 147 + xy: 1749, 11 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -6621,7 +6621,7 @@ phase-wall-icon-large index: -1 phase-wall-icon-small rotate: false - xy: 1938, 173 + xy: 1775, 11 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -6635,14 +6635,14 @@ phase-wall-large-icon-large index: -1 phase-wall-large-icon-medium rotate: false - xy: 1387, 137 + xy: 1387, 103 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 phase-wall-large-icon-small rotate: false - xy: 1938, 147 + xy: 1801, 9 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -6663,14 +6663,14 @@ phase-weaver-icon-large index: -1 phase-weaver-icon-medium rotate: false - xy: 1387, 103 + xy: 1387, 69 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 phase-weaver-icon-small rotate: false - xy: 1964, 173 + xy: 1827, 9 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -6684,7 +6684,7 @@ pine-icon-large index: -1 pine-icon-small rotate: false - xy: 1964, 147 + xy: 1853, 87 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -6698,14 +6698,14 @@ plastanium-compressor-icon-large index: -1 plastanium-compressor-icon-medium rotate: false - xy: 1373, 341 + xy: 1373, 307 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 plastanium-compressor-icon-small rotate: false - xy: 1990, 173 + xy: 1853, 61 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -6726,14 +6726,14 @@ pneumatic-drill-icon-large index: -1 pneumatic-drill-icon-medium rotate: false - xy: 1373, 307 + xy: 1399, 273 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 pneumatic-drill-icon-small rotate: false - xy: 1990, 147 + xy: 1853, 35 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -6747,7 +6747,7 @@ power-node-icon-large index: -1 power-node-icon-small rotate: false - xy: 2016, 173 + xy: 1853, 9 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -6761,14 +6761,14 @@ power-node-large-icon-large index: -1 power-node-large-icon-medium rotate: false - xy: 1425, 239 + xy: 1425, 205 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 power-node-large-icon-small rotate: false - xy: 2016, 147 + xy: 1867, 199 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -6782,7 +6782,7 @@ power-source-icon-large index: -1 power-source-icon-small rotate: false - xy: 1860, 121 + xy: 1893, 199 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -6796,14 +6796,14 @@ power-void-icon-large index: -1 power-void-icon-small rotate: false - xy: 1886, 121 + xy: 1919, 199 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 pulse-conduit-icon-full rotate: false - xy: 1421, 69 + xy: 1455, 137 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -6817,14 +6817,14 @@ pulse-conduit-icon-large index: -1 pulse-conduit-icon-small rotate: false - xy: 1912, 121 + xy: 1945, 199 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 pulverizer-icon-full rotate: false - xy: 1482, 393 + xy: 1407, 357 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -6838,7 +6838,7 @@ pulverizer-icon-large index: -1 pulverizer-icon-small rotate: false - xy: 1938, 121 + xy: 1971, 199 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -6852,28 +6852,28 @@ pyratite-mixer-icon-large index: -1 pyratite-mixer-icon-medium rotate: false - xy: 1407, 323 + xy: 1516, 377 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 pyratite-mixer-icon-small rotate: false - xy: 1964, 121 + xy: 1997, 199 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 repair-point rotate: false - xy: 1516, 377 + xy: 1550, 377 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 repair-point-icon-full rotate: false - xy: 1584, 377 + xy: 1618, 377 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -6887,7 +6887,7 @@ repair-point-icon-large index: -1 repair-point-icon-small rotate: false - xy: 1990, 121 + xy: 2023, 199 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -6908,14 +6908,14 @@ revenant-factory-icon-large index: -1 revenant-factory-icon-medium rotate: false - xy: 1618, 377 + xy: 1652, 377 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 revenant-factory-icon-small rotate: false - xy: 2016, 121 + xy: 1864, 173 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -6943,14 +6943,14 @@ ripple-icon-large index: -1 ripple-icon-medium rotate: false - xy: 1652, 377 + xy: 1686, 377 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ripple-icon-small rotate: false - xy: 1515, 147 + xy: 1864, 147 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -6964,7 +6964,7 @@ rocks-icon-large index: -1 rocks-icon-small rotate: false - xy: 1515, 121 + xy: 1890, 173 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -6978,14 +6978,14 @@ rotary-pump-icon-large index: -1 rotary-pump-icon-medium rotate: false - xy: 1441, 357 + xy: 1441, 323 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 rotary-pump-icon-small rotate: false - xy: 1515, 95 + xy: 1864, 121 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -6999,7 +6999,7 @@ router-icon-large index: -1 router-icon-small rotate: false - xy: 1515, 69 + xy: 1890, 147 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -7013,14 +7013,14 @@ rtg-generator-icon-large index: -1 rtg-generator-icon-medium rotate: false - xy: 1475, 359 + xy: 1475, 325 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 rtg-generator-icon-small rotate: false - xy: 1541, 117 + xy: 1916, 173 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -7048,14 +7048,14 @@ salvo-icon-large index: -1 salvo-icon-medium rotate: false - xy: 1509, 343 + xy: 1543, 343 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 salvo-icon-small rotate: false - xy: 1541, 91 + xy: 1890, 121 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -7076,7 +7076,7 @@ sand-icon-large index: -1 sand-icon-small rotate: false - xy: 1541, 65 + xy: 1916, 147 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -7097,7 +7097,7 @@ sand-water-icon-large index: -1 sand-water-icon-small rotate: false - xy: 1567, 117 + xy: 1942, 173 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -7111,14 +7111,14 @@ scrap-wall-gigantic-icon-large index: -1 scrap-wall-gigantic-icon-medium rotate: false - xy: 1645, 309 + xy: 1679, 309 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 scrap-wall-gigantic-icon-small rotate: false - xy: 1567, 91 + xy: 1916, 121 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -7132,14 +7132,14 @@ scrap-wall-huge-icon-large index: -1 scrap-wall-huge-icon-medium rotate: false - xy: 1679, 309 + xy: 1713, 305 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 scrap-wall-huge-icon-small rotate: false - xy: 1567, 65 + xy: 1942, 147 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -7153,7 +7153,7 @@ scrap-wall-icon-large index: -1 scrap-wall-icon-small rotate: false - xy: 1593, 119 + xy: 1968, 173 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -7167,14 +7167,14 @@ scrap-wall-large-icon-large index: -1 scrap-wall-large-icon-medium rotate: false - xy: 1713, 305 + xy: 1475, 291 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 scrap-wall-large-icon-small rotate: false - xy: 1619, 119 + xy: 1942, 121 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -7188,14 +7188,14 @@ separator-icon-large index: -1 separator-icon-medium rotate: false - xy: 1509, 275 + xy: 1543, 275 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 separator-icon-small rotate: false - xy: 1645, 119 + xy: 1994, 136 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -7209,7 +7209,7 @@ shock-mine-icon-large index: -1 shock-mine-icon-small rotate: false - xy: 1671, 119 + xy: 2020, 173 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -7223,14 +7223,14 @@ silicon-smelter-icon-large index: -1 silicon-smelter-icon-medium rotate: false - xy: 1611, 275 + xy: 1645, 275 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 silicon-smelter-icon-small rotate: false - xy: 1645, 93 + xy: 2020, 147 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -7251,7 +7251,7 @@ snow-icon-large index: -1 snow-icon-small rotate: false - xy: 1671, 93 + xy: 1879, 95 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -7265,7 +7265,7 @@ snowrocks-icon-large index: -1 snowrocks-icon-small rotate: false - xy: 1697, 115 + xy: 1879, 69 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -7279,7 +7279,7 @@ solar-panel-icon-large index: -1 solar-panel-icon-small rotate: false - xy: 1723, 115 + xy: 1905, 95 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -7293,14 +7293,14 @@ solar-panel-large-icon-large index: -1 solar-panel-large-icon-medium rotate: false - xy: 1781, 339 + xy: 1781, 305 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 solar-panel-large-icon-small rotate: false - xy: 1749, 115 + xy: 1879, 43 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -7314,7 +7314,7 @@ sorter-icon-large index: -1 sorter-icon-small rotate: false - xy: 1775, 115 + xy: 1905, 69 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -7328,7 +7328,7 @@ spawn-icon-large index: -1 spawn-icon-small rotate: false - xy: 1697, 89 + xy: 1931, 95 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -7356,14 +7356,14 @@ spectre-icon-large index: -1 spectre-icon-medium rotate: false - xy: 1815, 337 + xy: 1849, 371 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 spectre-icon-small rotate: false - xy: 1723, 89 + xy: 1879, 17 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -7384,14 +7384,14 @@ spirit-factory-icon-large index: -1 spirit-factory-icon-medium rotate: false - xy: 1849, 371 + xy: 1815, 303 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 spirit-factory-icon-small rotate: false - xy: 1749, 89 + xy: 1905, 43 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -7405,14 +7405,14 @@ spore-cluster-icon-large index: -1 spore-cluster-icon-medium rotate: false - xy: 1815, 303 + xy: 1849, 337 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 spore-cluster-icon-small rotate: false - xy: 1775, 89 + xy: 1931, 69 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -7426,7 +7426,7 @@ stained-boulder-icon-large index: -1 stained-boulder-icon-small rotate: false - xy: 1801, 113 + xy: 1905, 17 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -7440,7 +7440,7 @@ stained-rocks-icon-large index: -1 stained-rocks-icon-small rotate: false - xy: 1827, 113 + xy: 1931, 43 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -7454,7 +7454,7 @@ stained-rocks-red-icon-large index: -1 stained-rocks-red-icon-small rotate: false - xy: 1801, 87 + xy: 1931, 17 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -7468,7 +7468,7 @@ stained-rocks-yellow-icon-large index: -1 stained-rocks-yellow-icon-small rotate: false - xy: 1827, 87 + xy: 2020, 121 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -7489,7 +7489,7 @@ stained-stone-icon-large index: -1 stained-stone-icon-small rotate: false - xy: 1853, 95 + xy: 1994, 110 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -7510,7 +7510,7 @@ stained-stone-red-icon-large index: -1 stained-stone-red-icon-small rotate: false - xy: 1879, 95 + xy: 1968, 105 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -7531,7 +7531,7 @@ stained-stone-yellow-icon-large index: -1 stained-stone-yellow-icon-small rotate: false - xy: 1905, 95 + xy: 1957, 79 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -7552,7 +7552,7 @@ stone-icon-large index: -1 stone-icon-small rotate: false - xy: 1931, 95 + xy: 1957, 53 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -7566,14 +7566,14 @@ surge-tower-icon-large index: -1 surge-tower-icon-medium rotate: false - xy: 579, 139 + xy: 613, 139 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 surge-tower-icon-small rotate: false - xy: 1957, 95 + xy: 1957, 27 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -7587,7 +7587,7 @@ surge-wall-icon-large index: -1 surge-wall-icon-small rotate: false - xy: 1983, 95 + xy: 1957, 1 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -7601,14 +7601,14 @@ surge-wall-large-icon-large index: -1 surge-wall-large-icon-medium rotate: false - xy: 647, 139 + xy: 681, 139 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 surge-wall-large-icon-small rotate: false - xy: 2009, 95 + xy: 2020, 95 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -7636,14 +7636,14 @@ swarmer-icon-large index: -1 swarmer-icon-medium rotate: false - xy: 681, 139 + xy: 589, 105 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 swarmer-icon-small rotate: false - xy: 1593, 51 + xy: 1994, 84 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -7664,7 +7664,7 @@ tar-icon-large index: -1 tar-icon-small rotate: false - xy: 1619, 56 + xy: 1983, 58 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -7678,14 +7678,14 @@ tau-mech-pad-icon-large index: -1 tau-mech-pad-icon-medium rotate: false - xy: 589, 71 + xy: 623, 105 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 tau-mech-pad-icon-small rotate: false - xy: 1645, 67 + xy: 1983, 32 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -7699,14 +7699,14 @@ thermal-generator-icon-large index: -1 thermal-generator-icon-medium rotate: false - xy: 623, 105 + xy: 589, 37 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 thermal-generator-icon-small rotate: false - xy: 1671, 67 + xy: 1983, 6 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -7720,14 +7720,14 @@ thermal-pump-icon-large index: -1 thermal-pump-icon-medium rotate: false - xy: 589, 37 + xy: 623, 71 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 thermal-pump-icon-small rotate: false - xy: 1697, 63 + xy: 2020, 69 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -7741,14 +7741,14 @@ thorium-reactor-icon-large index: -1 thorium-reactor-icon-medium rotate: false - xy: 657, 71 + xy: 657, 37 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 thorium-reactor-icon-small rotate: false - xy: 1723, 63 + xy: 2009, 43 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -7762,7 +7762,7 @@ thorium-wall-icon-large index: -1 thorium-wall-icon-small rotate: false - xy: 1749, 63 + xy: 2009, 17 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -7776,14 +7776,14 @@ thorium-wall-large-icon-large index: -1 thorium-wall-large-icon-medium rotate: false - xy: 691, 105 + xy: 691, 71 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 thorium-wall-large-icon-small rotate: false - xy: 1775, 63 + xy: 1882, 1175 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -7797,14 +7797,14 @@ thruster-icon-large index: -1 thruster-icon-medium rotate: false - xy: 691, 71 + xy: 691, 37 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 thruster-icon-small rotate: false - xy: 1801, 61 + xy: 1028, 70 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -7825,14 +7825,14 @@ titan-factory-icon-large index: -1 titan-factory-icon-medium rotate: false - xy: 691, 37 + xy: 589, 3 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 titan-factory-icon-small rotate: false - xy: 1827, 61 + xy: 1054, 78 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -7846,7 +7846,7 @@ titanium-conveyor-icon-large index: -1 titanium-conveyor-icon-small rotate: false - xy: 1853, 69 + xy: 1080, 74 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -7860,7 +7860,7 @@ titanium-wall-icon-large index: -1 titanium-wall-icon-small rotate: false - xy: 1879, 69 + xy: 1028, 44 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -7874,14 +7874,14 @@ titanium-wall-large-icon-large index: -1 titanium-wall-large-icon-medium rotate: false - xy: 895, 109 + xy: 895, 75 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 titanium-wall-large-icon-small rotate: false - xy: 1905, 69 + xy: 1054, 52 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -7895,14 +7895,14 @@ trident-ship-pad-icon-large index: -1 trident-ship-pad-icon-medium rotate: false - xy: 895, 41 + xy: 895, 7 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 trident-ship-pad-icon-small rotate: false - xy: 1931, 69 + xy: 1080, 48 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -7916,14 +7916,14 @@ turbine-generator-icon-large index: -1 turbine-generator-icon-medium rotate: false - xy: 895, 7 + xy: 929, 123 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 turbine-generator-icon-small rotate: false - xy: 1957, 69 + xy: 1027, 18 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -7986,7 +7986,7 @@ unloader-icon-large index: -1 unloader-icon-small rotate: false - xy: 1983, 69 + xy: 1106, 69 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -8000,14 +8000,14 @@ vault-icon-large index: -1 vault-icon-medium rotate: false - xy: 963, 123 + xy: 929, 89 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 vault-icon-small rotate: false - xy: 2009, 69 + xy: 1106, 43 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -8035,14 +8035,14 @@ water-extractor-icon-large index: -1 water-extractor-icon-medium rotate: false - xy: 929, 55 + xy: 963, 89 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 water-extractor-icon-small rotate: false - xy: 1645, 41 + xy: 1054, 26 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -8056,7 +8056,7 @@ water-icon-large index: -1 water-icon-small rotate: false - xy: 1671, 41 + xy: 1080, 22 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -8084,14 +8084,14 @@ wave-icon-large index: -1 wave-icon-medium rotate: false - xy: 963, 89 + xy: 929, 21 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 wave-icon-small rotate: false - xy: 1697, 37 + xy: 1106, 17 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -8105,14 +8105,14 @@ white-tree-dead-icon-large index: -1 white-tree-dead-icon-medium rotate: false - xy: 929, 21 + xy: 963, 55 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 white-tree-dead-icon-small rotate: false - xy: 1723, 37 + xy: 1132, 64 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -8126,14 +8126,14 @@ white-tree-icon-large index: -1 white-tree-icon-medium rotate: false - xy: 963, 55 + xy: 963, 21 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 white-tree-icon-small rotate: false - xy: 1749, 37 + xy: 1158, 64 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -8154,154 +8154,154 @@ wraith-factory-icon-large index: -1 wraith-factory-icon-medium rotate: false - xy: 963, 21 + xy: 997, 96 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 wraith-factory-icon-small rotate: false - xy: 1775, 37 + xy: 1132, 38 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 item-biomatter rotate: false - xy: 1451, 427 + xy: 1485, 427 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 item-blast-compound rotate: false - xy: 1485, 427 + xy: 1519, 411 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 item-coal rotate: false - xy: 1519, 411 + xy: 1553, 411 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 item-copper rotate: false - xy: 1553, 411 + xy: 1587, 411 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 item-graphite rotate: false - xy: 1587, 411 + xy: 1621, 411 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 item-lead rotate: false - xy: 1621, 411 + xy: 1655, 411 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 item-metaglass rotate: false - xy: 1655, 411 + xy: 1689, 411 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 item-phase-fabric rotate: false - xy: 1689, 411 + xy: 1723, 407 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 item-plastanium rotate: false - xy: 1723, 407 + xy: 1733, 1089 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 item-pyratite rotate: false - xy: 1733, 1089 + xy: 1767, 1089 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 item-sand rotate: false - xy: 1767, 1089 + xy: 1733, 1055 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 item-scrap rotate: false - xy: 1733, 1055 + xy: 1801, 1089 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 item-silicon rotate: false - xy: 1801, 1089 + xy: 1767, 1055 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 item-surge-alloy rotate: false - xy: 1733, 1021 + xy: 1835, 1089 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 item-thorium rotate: false - xy: 1835, 1089 + xy: 1801, 1055 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 item-titanium rotate: false - xy: 1801, 1055 + xy: 1767, 1021 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 liquid-cryofluid rotate: false - xy: 1937, 1033 + xy: 1971, 1033 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 liquid-oil rotate: false - xy: 1903, 999 + xy: 1937, 999 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 liquid-slag rotate: false - xy: 2005, 999 + xy: 1741, 987 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 liquid-water rotate: false - xy: 1775, 987 + xy: 1741, 919 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -8504,7 +8504,7 @@ shape-3 index: -1 bar rotate: false - xy: 1548, 237 + xy: 1578, 237 size: 27, 36 split: 9, 9, 9, 9 orig: 27, 36 @@ -8512,7 +8512,7 @@ bar index: -1 bar-top rotate: false - xy: 1519, 237 + xy: 1549, 237 size: 27, 36 split: 9, 10, 9, 10 orig: 27, 36 @@ -8608,7 +8608,7 @@ button-right-over index: -1 button-select rotate: false - xy: 1548, 185 + xy: 1659, 249 size: 24, 24 split: 4, 4, 4, 4 orig: 24, 24 @@ -8623,21 +8623,21 @@ check-off index: -1 check-on rotate: false - xy: 1219, 443 + xy: 997, 22 size: 28, 32 orig: 28, 32 offset: 0, 0 index: -1 check-on-over rotate: false - xy: 2016, 1167 + xy: 1733, 1132 size: 28, 32 orig: 28, 32 offset: 0, 0 index: -1 check-over rotate: false - xy: 2016, 1133 + xy: 1219, 443 size: 28, 32 orig: 28, 32 offset: 0, 0 @@ -8696,70 +8696,70 @@ empty-sector index: -1 icon-crafting rotate: false - xy: 1335, 1403 + xy: 1173, 1102 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-defense rotate: false - xy: 1173, 1102 + xy: 1371, 1139 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-distribution rotate: false - xy: 1371, 1139 + xy: 531, 1543 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-effect rotate: false - xy: 531, 1543 + xy: 845, 987 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-liquid rotate: false - xy: 915, 159 + xy: 1153, 1168 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-power rotate: false - xy: 433, 9 + xy: 495, 1698 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-production rotate: false - xy: 495, 1698 + xy: 1202, 72 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-turret rotate: false - xy: 455, 1000 + xy: 1328, 72 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-units rotate: false - xy: 491, 1000 + xy: 1364, 72 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-upgrade rotate: false - xy: 1837, 43 + xy: 455, 1000 size: 16, 16 orig: 16, 16 offset: 0, 0 @@ -8794,7 +8794,7 @@ icon-admin index: -1 icon-admin-small rotate: false - xy: 1093, 304 + xy: 2021, 863 size: 6, 6 orig: 6, 6 offset: 0, 0 @@ -8864,21 +8864,21 @@ icon-ban index: -1 icon-break rotate: false - xy: 1863, 251 + xy: 471, 637 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-cancel rotate: false - xy: 471, 637 + xy: 489, 637 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-cancel-2 rotate: false - xy: 1834, 191 + xy: 1760, 193 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -8892,21 +8892,21 @@ icon-chat index: -1 icon-check rotate: false - xy: 489, 637 + xy: 845, 1543 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-check-2 rotate: false - xy: 1574, 171 + xy: 1786, 193 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 icon-copy rotate: false - xy: 845, 1543 + xy: 1335, 1403 size: 16, 16 orig: 16, 16 offset: 0, 0 @@ -8962,14 +8962,14 @@ icon-egg index: -1 icon-elevation rotate: false - xy: 845, 987 + xy: 433, 27 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-eraser rotate: false - xy: 1882, 1213 + xy: 477, 1698 size: 16, 16 orig: 16, 16 offset: 0, 0 @@ -8983,14 +8983,14 @@ icon-exit index: -1 icon-file rotate: false - xy: 433, 27 + xy: 1877, 1003 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-file-image rotate: false - xy: 477, 1698 + xy: 1851, 901 size: 16, 16 orig: 16, 16 offset: 0, 0 @@ -9004,7 +9004,7 @@ icon-file-text index: -1 icon-fill rotate: false - xy: 1877, 1003 + xy: 1825, 799 size: 16, 16 orig: 16, 16 offset: 0, 0 @@ -9018,7 +9018,7 @@ icon-floppy index: -1 icon-floppy-16 rotate: false - xy: 1851, 901 + xy: 1757, 423 size: 16, 16 orig: 16, 16 offset: 0, 0 @@ -9060,56 +9060,56 @@ icon-google-play index: -1 icon-grid rotate: false - xy: 1825, 799 + xy: 915, 159 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-hold rotate: false - xy: 845, 1495 + xy: 1882, 1201 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-holdDelete rotate: false - xy: 1225, 1275 + xy: 845, 1495 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-home rotate: false - xy: 845, 971 + xy: 1867, 253 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-host rotate: false - xy: 1843, 801 + xy: 1031, 114 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-info rotate: false - xy: 1757, 407 + xy: 845, 971 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-itch.io rotate: false - xy: 535, 1084 + xy: 1843, 801 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-item rotate: false - xy: 1695, 829 + xy: 1225, 1275 size: 10, 10 orig: 10, 10 offset: 0, 0 @@ -9123,77 +9123,77 @@ icon-items-none index: -1 icon-line rotate: false - xy: 1757, 423 + xy: 2016, 1105 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-link rotate: false - xy: 1553, 779 + xy: 1757, 407 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-liquid-small rotate: false - xy: 651, 637 + xy: 1695, 829 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-load rotate: false - xy: 569, 457 + xy: 535, 1084 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-load-image rotate: false - xy: 1153, 1168 + xy: 1882, 1213 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-load-map rotate: false - xy: 1027, 112 + xy: 1184, 72 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-loading rotate: false - xy: 1365, 72 + xy: 1132, 20 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-locked rotate: false - xy: 1801, 43 + xy: 1158, 46 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-logic rotate: false - xy: 1225, 1263 + xy: 651, 637 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-map rotate: false - xy: 623, 907 + xy: 1553, 779 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-menu rotate: false - xy: 1707, 829 + xy: 1225, 1263 size: 10, 10 orig: 10, 10 offset: 0, 0 @@ -9207,7 +9207,7 @@ icon-menu-large index: -1 icon-missing rotate: false - xy: 663, 637 + xy: 1707, 829 size: 10, 10 orig: 10, 10 offset: 0, 0 @@ -9221,28 +9221,28 @@ icon-mission-background index: -1 icon-mission-battle rotate: false - xy: 1767, 891 + xy: 663, 637 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-mission-defense rotate: false - xy: 2037, 1390 + xy: 1767, 891 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-mission-done rotate: false - xy: 2037, 1378 + xy: 2037, 1390 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-none rotate: false - xy: 2037, 1366 + xy: 2037, 1378 size: 10, 10 orig: 10, 10 offset: 0, 0 @@ -9256,7 +9256,7 @@ icon-paste index: -1 icon-pause rotate: false - xy: 2037, 1354 + xy: 2037, 1366 size: 10, 10 orig: 10, 10 offset: 0, 0 @@ -9270,252 +9270,259 @@ icon-pencil index: -1 icon-pencil-small rotate: false - xy: 1363, 529 + xy: 569, 457 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-pick rotate: false - xy: 1882, 1195 + xy: 433, 9 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-play rotate: false - xy: 2037, 1342 + xy: 2037, 1354 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-play-2 rotate: false - xy: 579, 175 + xy: 623, 907 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-play-custom rotate: false - xy: 1900, 1185 + xy: 1363, 529 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-players rotate: false - xy: 2037, 1330 + xy: 2037, 1342 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 -icon-power-small - rotate: false - xy: 2037, 1318 - size: 10, 10 - orig: 10, 10 - offset: 0, 0 - index: -1 -icon-quit - rotate: false - xy: 2033, 541 - size: 14, 14 - orig: 14, 14 - offset: 0, 0 - index: -1 -icon-redo - rotate: false - xy: 1365, 54 - size: 16, 16 - orig: 16, 16 - offset: 0, 0 - index: -1 -icon-refresh - rotate: false - xy: 2033, 525 - size: 14, 14 - orig: 14, 14 - offset: 0, 0 - index: -1 -icon-rename - rotate: false - xy: 2033, 509 - size: 14, 14 - orig: 14, 14 - offset: 0, 0 - index: -1 -icon-resize - rotate: false - xy: 1819, 43 - size: 16, 16 - orig: 16, 16 - offset: 0, 0 - index: -1 -icon-rotate - rotate: false - xy: 2033, 493 - size: 14, 14 - orig: 14, 14 - offset: 0, 0 - index: -1 -icon-rotate-arrow - rotate: false - xy: 451, 1 - size: 14, 14 - orig: 14, 14 - offset: 0, 0 - index: -1 -icon-rotate-left - rotate: false - xy: 467, 1 - size: 14, 14 - orig: 14, 14 - offset: 0, 0 - index: -1 -icon-rotate-right - rotate: false - xy: 483, 1 - size: 14, 14 - orig: 14, 14 - offset: 0, 0 - index: -1 -icon-save - rotate: false - xy: 499, 1 - size: 14, 14 - orig: 14, 14 - offset: 0, 0 - index: -1 -icon-save-image - rotate: false - xy: 845, 1507 - size: 16, 16 - orig: 16, 16 - offset: 0, 0 - index: -1 -icon-save-map - rotate: false - xy: 531, 1507 - size: 16, 16 - orig: 16, 16 - offset: 0, 0 - index: -1 -icon-settings - rotate: false - xy: 2037, 1306 - size: 10, 10 - orig: 10, 10 - offset: 0, 0 - index: -1 -icon-spray - rotate: false - xy: 1882, 1177 - size: 16, 16 - orig: 16, 16 - offset: 0, 0 - index: -1 -icon-terrain - rotate: false - xy: 1365, 36 - size: 16, 16 - orig: 16, 16 - offset: 0, 0 - index: -1 -icon-tools - rotate: false - xy: 2033, 477 - size: 14, 14 - orig: 14, 14 - offset: 0, 0 - index: -1 -icon-touch - rotate: false - xy: 2037, 1294 - size: 10, 10 - orig: 10, 10 - offset: 0, 0 - index: -1 -icon-touchDelete - rotate: false - xy: 2037, 1282 - size: 10, 10 - orig: 10, 10 - offset: 0, 0 - index: -1 -icon-trash - rotate: false - xy: 1363, 513 - size: 14, 14 - orig: 14, 14 - offset: 0, 0 - index: -1 -icon-trash-16 - rotate: false - xy: 1365, 18 - size: 16, 16 - orig: 16, 16 - offset: 0, 0 - index: -1 -icon-tree - rotate: false - xy: 437, 1000 - size: 16, 16 - orig: 16, 16 - offset: 0, 0 - index: -1 -icon-tree-locked +icon-power-requirement rotate: false xy: 1353, 90 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 +icon-power-small + rotate: false + xy: 2037, 1330 + size: 10, 10 + orig: 10, 10 + offset: 0, 0 + index: -1 +icon-quit + rotate: false + xy: 579, 175 + size: 14, 14 + orig: 14, 14 + offset: 0, 0 + index: -1 +icon-redo + rotate: false + xy: 845, 1507 + size: 16, 16 + orig: 16, 16 + offset: 0, 0 + index: -1 +icon-refresh + rotate: false + xy: 2009, 1 + size: 14, 14 + orig: 14, 14 + offset: 0, 0 + index: -1 +icon-rename + rotate: false + xy: 1031, 98 + size: 14, 14 + orig: 14, 14 + offset: 0, 0 + index: -1 +icon-resize + rotate: false + xy: 531, 1507 + size: 16, 16 + orig: 16, 16 + offset: 0, 0 + index: -1 +icon-rotate + rotate: false + xy: 2025, 1 + size: 14, 14 + orig: 14, 14 + offset: 0, 0 + index: -1 +icon-rotate-arrow + rotate: false + xy: 2033, 541 + size: 14, 14 + orig: 14, 14 + offset: 0, 0 + index: -1 +icon-rotate-left + rotate: false + xy: 2033, 525 + size: 14, 14 + orig: 14, 14 + offset: 0, 0 + index: -1 +icon-rotate-right + rotate: false + xy: 2033, 509 + size: 14, 14 + orig: 14, 14 + offset: 0, 0 + index: -1 +icon-save + rotate: false + xy: 2033, 493 + size: 14, 14 + orig: 14, 14 + offset: 0, 0 + index: -1 +icon-save-image + rotate: false + xy: 1220, 72 + size: 16, 16 + orig: 16, 16 + offset: 0, 0 + index: -1 +icon-save-map + rotate: false + xy: 1238, 72 + size: 16, 16 + orig: 16, 16 + offset: 0, 0 + index: -1 +icon-settings + rotate: false + xy: 2037, 1318 + size: 10, 10 + orig: 10, 10 + offset: 0, 0 + index: -1 +icon-spray + rotate: false + xy: 1256, 72 + size: 16, 16 + orig: 16, 16 + offset: 0, 0 + index: -1 +icon-terrain + rotate: false + xy: 1274, 72 + size: 16, 16 + orig: 16, 16 + offset: 0, 0 + index: -1 +icon-tools + rotate: false + xy: 1879, 1 + size: 14, 14 + orig: 14, 14 + offset: 0, 0 + index: -1 +icon-touch + rotate: false + xy: 2037, 1306 + size: 10, 10 + orig: 10, 10 + offset: 0, 0 + index: -1 +icon-touchDelete + rotate: false + xy: 2037, 1294 + size: 10, 10 + orig: 10, 10 + offset: 0, 0 + index: -1 +icon-trash + rotate: false + xy: 1895, 1 + size: 14, 14 + orig: 14, 14 + offset: 0, 0 + index: -1 +icon-trash-16 + rotate: false + xy: 1292, 72 + size: 16, 16 + orig: 16, 16 + offset: 0, 0 + index: -1 +icon-tree + rotate: false + xy: 1310, 72 + size: 16, 16 + orig: 16, 16 + offset: 0, 0 + index: -1 +icon-tree-locked + rotate: false + xy: 1699, 1131 + size: 32, 32 + orig: 32, 32 + offset: 0, 0 + index: -1 icon-trello rotate: false - xy: 2032, 2033 + xy: 1911, 1 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-tutorial rotate: false - xy: 1473, 35 + xy: 1927, 1 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-undo rotate: false - xy: 473, 1000 + xy: 1346, 72 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-unlocked rotate: false - xy: 509, 1000 + xy: 437, 1000 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-unlocks rotate: false - xy: 1491, 53 + xy: 451, 1 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-wiki rotate: false - xy: 2032, 2017 + xy: 467, 1 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-zone rotate: false - xy: 1600, 171 + xy: 1812, 191 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -9529,14 +9536,14 @@ icon-zone-locked index: -1 icon-zoom rotate: false - xy: 929, 3 + xy: 473, 1000 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-zoom-small rotate: false - xy: 1507, 53 + xy: 483, 1 size: 14, 14 orig: 14, 14 offset: 0, 0 @@ -9550,7 +9557,7 @@ info-banner index: -1 inventory rotate: false - xy: 1548, 143 + xy: 1656, 155 size: 24, 40 split: 10, 10, 10, 14 orig: 24, 40 @@ -9581,7 +9588,7 @@ pane-2 index: -1 scroll rotate: false - xy: 1619, 82 + xy: 1994, 162 size: 24, 35 split: 10, 10, 6, 5 orig: 24, 35 @@ -9605,7 +9612,7 @@ scroll-knob-horizontal-black index: -1 scroll-knob-vertical-black rotate: false - xy: 1593, 77 + xy: 1968, 131 size: 24, 40 split: 10, 10, 6, 10 orig: 24, 40 @@ -9613,7 +9620,7 @@ scroll-knob-vertical-black index: -1 sector-select rotate: false - xy: 1475, 291 + xy: 1509, 275 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -9641,14 +9648,14 @@ slider-knob index: -1 slider-knob-down rotate: false - xy: 1733, 1126 + xy: 997, 56 size: 29, 38 orig: 29, 38 offset: 0, 0 index: -1 slider-knob-over rotate: false - xy: 1733, 1126 + xy: 997, 56 size: 29, 38 orig: 29, 38 offset: 0, 0 @@ -9685,7 +9692,7 @@ white index: -1 window-empty rotate: false - xy: 1519, 174 + xy: 1549, 174 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 e38f89e91b..5875b0e7ba 100644 Binary files a/core/assets/sprites/sprites.png and b/core/assets/sprites/sprites.png differ diff --git a/core/src/io/anuke/mindustry/content/Blocks.java b/core/src/io/anuke/mindustry/content/Blocks.java index 72bd8db72f..0d20b269f7 100644 --- a/core/src/io/anuke/mindustry/content/Blocks.java +++ b/core/src/io/anuke/mindustry/content/Blocks.java @@ -883,7 +883,7 @@ public class Blocks implements ContentList{ }}; impactReactor = new ImpactReactor("impact-reactor"){{ - requirements(Category.power, ItemStack.with(Items.lead, 800, Items.silicon, 600, Items.graphite, 600, Items.thorium, 200, Items.surgealloy, 400, Items.metaglass, 200)); + requirements(Category.power, ItemStack.with(Items.lead, 1000, Items.silicon, 600, Items.graphite, 600, Items.thorium, 200, Items.surgealloy, 400, Items.metaglass, 200)); size = 4; health = 900; powerProduction = 70f; diff --git a/core/src/io/anuke/mindustry/entities/type/Unit.java b/core/src/io/anuke/mindustry/entities/type/Unit.java index cdfa1b9dcc..8de61db1df 100644 --- a/core/src/io/anuke/mindustry/entities/type/Unit.java +++ b/core/src/io/anuke/mindustry/entities/type/Unit.java @@ -332,7 +332,7 @@ public abstract class Unit extends DestructibleEntity implements SaveTrait, Targ } public int maxAccepted(Item item){ - return this.item.item != item ? 0 : getItemCapacity() - this.item.amount; + return this.item.item != item && this.item.amount > 0 ? 0 : getItemCapacity() - this.item.amount; } public void applyEffect(StatusEffect effect, float duration){ diff --git a/core/src/io/anuke/mindustry/ui/ItemImage.java b/core/src/io/anuke/mindustry/ui/ItemImage.java index 1ccd3a6f02..3e4692c270 100644 --- a/core/src/io/anuke/mindustry/ui/ItemImage.java +++ b/core/src/io/anuke/mindustry/ui/ItemImage.java @@ -10,6 +10,14 @@ import io.anuke.arc.scene.ui.layout.Table; public class ItemImage extends Stack{ + public ItemImage(TextureRegion region, int amount){ + Table t = new Table().left().bottom(); + t.add(amount + "").name("item-label"); + + add(new Image(region)); + add(t); + } + public ItemImage(TextureRegion region, Supplier text){ Table t = new Table().left().bottom(); t.label(text).name("item-label"); diff --git a/core/src/io/anuke/mindustry/ui/ReqImage.java b/core/src/io/anuke/mindustry/ui/ReqImage.java new file mode 100644 index 0000000000..570330102e --- /dev/null +++ b/core/src/io/anuke/mindustry/ui/ReqImage.java @@ -0,0 +1,36 @@ +package io.anuke.mindustry.ui; + +import io.anuke.arc.function.BooleanProvider; +import io.anuke.arc.graphics.g2d.Draw; +import io.anuke.arc.graphics.g2d.Lines; +import io.anuke.arc.graphics.g2d.TextureRegion; +import io.anuke.arc.scene.Element; +import io.anuke.arc.scene.ui.Image; +import io.anuke.arc.scene.ui.layout.Stack; +import io.anuke.arc.scene.ui.layout.Unit; +import io.anuke.mindustry.graphics.Pal; + +public class ReqImage extends Stack{ + + public ReqImage(Element image, BooleanProvider valid){ + add(image); + add(new Element(){ + { + visible(() -> !valid.get()); + } + + @Override + public void draw(){ + Lines.stroke(Unit.dp.scl(2f), Pal.removeBack); + Lines.line(x, y - 2f + height, x + width, y - 2f); + Draw.color(Pal.remove); + Lines.line(x, y + height, x + width, y); + Draw.reset(); + } + }); + } + + public ReqImage(TextureRegion region, BooleanProvider valid){ + this(new Image(region), valid); + } +} diff --git a/core/src/io/anuke/mindustry/world/Block.java b/core/src/io/anuke/mindustry/world/Block.java index eab9e1cf0b..db997ef03b 100644 --- a/core/src/io/anuke/mindustry/world/Block.java +++ b/core/src/io/anuke/mindustry/world/Block.java @@ -30,6 +30,7 @@ import io.anuke.mindustry.graphics.Pal; import io.anuke.mindustry.type.*; import io.anuke.mindustry.ui.Bar; import io.anuke.mindustry.ui.ContentDisplay; +import io.anuke.mindustry.world.consumers.Consume; import io.anuke.mindustry.world.consumers.ConsumeLiquid; import io.anuke.mindustry.world.consumers.ConsumePower; import io.anuke.mindustry.world.meta.BlockFlag; @@ -494,17 +495,27 @@ public class Block extends BlockStorage{ displayBars(tile, bars); }).growX(); + table.row(); + table.table(ctable -> { + displayConsumption(tile, ctable); + }).growX(); table.marginBottom(-5); } } + public void displayConsumption(Tile tile, Table table){ + table.left(); + for(Consume cons : consumes.all()){ + cons.build(tile, table); + } + } + public void displayBars(Tile tile, Table table){ for(Function bar : bars.list()){ table.add(bar.get(tile.entity)).growX(); table.row(); } - } public TextureRegion icon(Icon icon){ diff --git a/core/src/io/anuke/mindustry/world/blocks/power/PowerNode.java b/core/src/io/anuke/mindustry/world/blocks/power/PowerNode.java index 707392f2f0..b92833bac3 100644 --- a/core/src/io/anuke/mindustry/world/blocks/power/PowerNode.java +++ b/core/src/io/anuke/mindustry/world/blocks/power/PowerNode.java @@ -93,9 +93,9 @@ public class PowerNode extends PowerBlock{ super.setBars(); bars.add("power", entity -> new Bar(() -> Core.bundle.format("blocks.powerbalance", - (entity.power.graph.getPowerBalance() >= 0 ? "+" : "") + Strings.toFixed(entity.power.graph.getPowerBalance()*60, 1)), + entity.power.graph == null ? "+0" : ((entity.power.graph.getPowerBalance() >= 0 ? "+" : "") + Strings.toFixed(entity.power.graph.getPowerBalance()*60, 1))), () -> Pal.powerBar, - () -> Mathf.clamp(entity.power.graph.getPowerProduced() / entity.power.graph.getPowerNeeded()))); + () -> entity.power.graph == null ? 0 :Mathf.clamp(entity.power.graph.getPowerProduced() / entity.power.graph.getPowerNeeded()))); } @Override diff --git a/core/src/io/anuke/mindustry/world/consumers/Consume.java b/core/src/io/anuke/mindustry/world/consumers/Consume.java index 43c5b21866..1baea5fd3a 100644 --- a/core/src/io/anuke/mindustry/world/consumers/Consume.java +++ b/core/src/io/anuke/mindustry/world/consumers/Consume.java @@ -1,14 +1,10 @@ package io.anuke.mindustry.world.consumers; -import io.anuke.arc.graphics.Color; -import io.anuke.mindustry.entities.type.TileEntity; -import io.anuke.mindustry.graphics.Pal; -import io.anuke.mindustry.world.Block; -import io.anuke.mindustry.world.meta.BlockStats; -import io.anuke.arc.scene.ui.Tooltip; import io.anuke.arc.scene.ui.layout.Table; - -import static io.anuke.mindustry.Vars.mobile; +import io.anuke.mindustry.entities.type.TileEntity; +import io.anuke.mindustry.world.Block; +import io.anuke.mindustry.world.Tile; +import io.anuke.mindustry.world.meta.BlockStats; /**An abstract class that defines a type of resource that a block can consume.*/ public abstract class Consume{ @@ -38,7 +34,8 @@ public abstract class Consume{ return update; } - public void build(Table table){ + public abstract void build(Tile tile, Table table);/*{ + Table t = new Table("flat"); t.margin(4); buildTooltip(t); @@ -50,15 +47,13 @@ public abstract class Consume{ out.addImage(getIcon()).size(10 * scale).color(Pal.accent); out.addImage("icon-missing").size(10 * scale).color(Pal.remove).padLeft(-10 * scale); }).size(10 * scale).get().addListener(new Tooltip<>(t)); - } + }*/ /**Called when a consumption is triggered manually.*/ public void trigger(Block block, TileEntity entity){ } - public abstract void buildTooltip(Table table); - public abstract String getIcon(); public abstract void update(Block block, TileEntity entity); diff --git a/core/src/io/anuke/mindustry/world/consumers/ConsumeItem.java b/core/src/io/anuke/mindustry/world/consumers/ConsumeItem.java index 88e88e68c0..2afce34150 100644 --- a/core/src/io/anuke/mindustry/world/consumers/ConsumeItem.java +++ b/core/src/io/anuke/mindustry/world/consumers/ConsumeItem.java @@ -1,13 +1,15 @@ package io.anuke.mindustry.world.consumers; +import io.anuke.arc.scene.ui.layout.Table; import io.anuke.mindustry.entities.type.TileEntity; import io.anuke.mindustry.type.Item; -import io.anuke.mindustry.type.ItemStack; +import io.anuke.mindustry.type.Item.Icon; import io.anuke.mindustry.ui.ItemImage; +import io.anuke.mindustry.ui.ReqImage; import io.anuke.mindustry.world.Block; +import io.anuke.mindustry.world.Tile; import io.anuke.mindustry.world.meta.BlockStat; import io.anuke.mindustry.world.meta.BlockStats; -import io.anuke.arc.scene.ui.layout.Table; public class ConsumeItem extends Consume{ private final Item item; @@ -37,8 +39,8 @@ public class ConsumeItem extends Consume{ } @Override - public void buildTooltip(Table table){ - table.add(new ItemImage(new ItemStack(item, amount))).size(8 * 4); + public void build(Tile tile, Table table){ + table.add(new ReqImage(new ItemImage(item.icon(Icon.large), amount), () -> valid(tile.block(), tile.entity))).size(8*4); } @Override diff --git a/core/src/io/anuke/mindustry/world/consumers/ConsumeItemFilter.java b/core/src/io/anuke/mindustry/world/consumers/ConsumeItemFilter.java index 5426510dd8..592bb07a9f 100644 --- a/core/src/io/anuke/mindustry/world/consumers/ConsumeItemFilter.java +++ b/core/src/io/anuke/mindustry/world/consumers/ConsumeItemFilter.java @@ -5,6 +5,7 @@ import io.anuke.mindustry.entities.type.TileEntity; import io.anuke.mindustry.type.Item; import io.anuke.mindustry.type.Item.Icon; import io.anuke.mindustry.world.Block; +import io.anuke.mindustry.world.Tile; import io.anuke.mindustry.world.meta.BlockStat; import io.anuke.mindustry.world.meta.BlockStats; import io.anuke.mindustry.world.meta.values.ItemFilterValue; @@ -20,12 +21,8 @@ public class ConsumeItemFilter extends Consume{ } @Override - public void buildTooltip(Table table){ - Array list = new Array<>(); - - for(Item item : content.items()){ - if(filter.test(item)) list.add(item); - } + public void build(Tile tile, Table table){ + Array list = content.items().select(filter); for(int i = 0; i < list.size; i++){ Item item = list.get(i); diff --git a/core/src/io/anuke/mindustry/world/consumers/ConsumeItems.java b/core/src/io/anuke/mindustry/world/consumers/ConsumeItems.java index 5c2fb5840c..e0d9f61006 100644 --- a/core/src/io/anuke/mindustry/world/consumers/ConsumeItems.java +++ b/core/src/io/anuke/mindustry/world/consumers/ConsumeItems.java @@ -1,13 +1,16 @@ package io.anuke.mindustry.world.consumers; +import io.anuke.arc.scene.ui.layout.Table; import io.anuke.mindustry.entities.type.TileEntity; +import io.anuke.mindustry.type.Item.Icon; import io.anuke.mindustry.type.ItemStack; import io.anuke.mindustry.ui.ItemImage; +import io.anuke.mindustry.ui.ReqImage; import io.anuke.mindustry.world.Block; +import io.anuke.mindustry.world.Tile; import io.anuke.mindustry.world.meta.BlockStat; import io.anuke.mindustry.world.meta.BlockStats; import io.anuke.mindustry.world.meta.values.ItemListValue; -import io.anuke.arc.scene.ui.layout.Table; public class ConsumeItems extends Consume{ private ItemStack[] items; @@ -21,9 +24,9 @@ public class ConsumeItems extends Consume{ } @Override - public void buildTooltip(Table table){ + public void build(Tile tile, Table table){ for(ItemStack stack : items){ - table.add(new ItemImage(stack)).size(8 * 4).padRight(5); + table.add(new ReqImage(new ItemImage(stack.item.icon(Icon.large), stack.amount), () -> valid(tile.block(), tile.entity))).size(8*4).padRight(5); } } diff --git a/core/src/io/anuke/mindustry/world/consumers/ConsumeLiquid.java b/core/src/io/anuke/mindustry/world/consumers/ConsumeLiquid.java index 5f605bdb7f..3ebeae1509 100644 --- a/core/src/io/anuke/mindustry/world/consumers/ConsumeLiquid.java +++ b/core/src/io/anuke/mindustry/world/consumers/ConsumeLiquid.java @@ -1,12 +1,14 @@ package io.anuke.mindustry.world.consumers; +import io.anuke.arc.scene.ui.layout.Table; import io.anuke.mindustry.entities.type.TileEntity; import io.anuke.mindustry.type.Liquid; +import io.anuke.mindustry.ui.ReqImage; import io.anuke.mindustry.world.Block; +import io.anuke.mindustry.world.Tile; import io.anuke.mindustry.world.meta.BlockStat; import io.anuke.mindustry.world.meta.BlockStats; import io.anuke.mindustry.world.meta.StatUnit; -import io.anuke.arc.scene.ui.layout.Table; public class ConsumeLiquid extends Consume{ protected final float use; @@ -26,8 +28,8 @@ public class ConsumeLiquid extends Consume{ } @Override - public void buildTooltip(Table table){ - table.addImage(liquid.getContentIcon()).size(8 * 3); + public void build(Tile tile, Table table){ + table.add(new ReqImage(liquid.getContentIcon(), () -> valid(tile.block(), tile.entity))).size(8*4); } @Override diff --git a/core/src/io/anuke/mindustry/world/consumers/ConsumeLiquidFilter.java b/core/src/io/anuke/mindustry/world/consumers/ConsumeLiquidFilter.java index c138143ceb..c836f898b0 100644 --- a/core/src/io/anuke/mindustry/world/consumers/ConsumeLiquidFilter.java +++ b/core/src/io/anuke/mindustry/world/consumers/ConsumeLiquidFilter.java @@ -1,15 +1,17 @@ package io.anuke.mindustry.world.consumers; import io.anuke.arc.collection.Array; +import io.anuke.arc.function.Predicate; +import io.anuke.arc.scene.ui.layout.Table; import io.anuke.mindustry.entities.type.TileEntity; import io.anuke.mindustry.type.Liquid; +import io.anuke.mindustry.ui.ReqImage; import io.anuke.mindustry.world.Block; +import io.anuke.mindustry.world.Tile; import io.anuke.mindustry.world.meta.BlockStat; import io.anuke.mindustry.world.meta.BlockStats; import io.anuke.mindustry.world.meta.StatUnit; import io.anuke.mindustry.world.meta.values.LiquidFilterValue; -import io.anuke.arc.function.Predicate; -import io.anuke.arc.scene.ui.layout.Table; import static io.anuke.mindustry.Vars.content; @@ -29,16 +31,13 @@ public class ConsumeLiquidFilter extends Consume{ } @Override - public void buildTooltip(Table table){ - Array list = new Array<>(); - - for(Liquid item : content.liquids()){ - if(!item.isHidden() && filter.test(item)) list.add(item); - } + public void build(Tile tile, Table table){ + Array list = content.liquids().select(l -> !l.isHidden() && filter.test(l)); for(int i = 0; i < list.size; i++){ - Liquid item = list.get(i); - table.addImage(item.getContentIcon()).size(8 * 3).padRight(2).padLeft(2).padTop(2).padBottom(2); + Liquid liquid = list.get(i); + + table.add(new ReqImage(liquid.getContentIcon(), () -> valid(tile.block(), tile.entity))).size(8*4).pad(2); if(i != list.size - 1){ table.add("/"); } diff --git a/core/src/io/anuke/mindustry/world/consumers/ConsumePower.java b/core/src/io/anuke/mindustry/world/consumers/ConsumePower.java index 9bc332daa1..d2cc52fc33 100644 --- a/core/src/io/anuke/mindustry/world/consumers/ConsumePower.java +++ b/core/src/io/anuke/mindustry/world/consumers/ConsumePower.java @@ -4,6 +4,7 @@ import io.anuke.arc.math.Mathf; import io.anuke.arc.scene.ui.layout.Table; import io.anuke.mindustry.entities.type.TileEntity; import io.anuke.mindustry.world.Block; +import io.anuke.mindustry.world.Tile; import io.anuke.mindustry.world.meta.BlockStat; import io.anuke.mindustry.world.meta.BlockStats; import io.anuke.mindustry.world.meta.StatUnit; @@ -24,7 +25,8 @@ public class ConsumePower extends Consume{ } @Override - public void buildTooltip(Table table){ + public void build(Tile tile, Table table){ + //table.add(new ReqImage(new Image("icon-power-requirement"), () -> valid(tile.block(), tile.entity))).size(8*4).padRight(4); // No tooltip for power }