From 56bcabedf76d5b1f4803022ffd2179aeffc2f04d Mon Sep 17 00:00:00 2001 From: Anuken Date: Thu, 7 Feb 2019 23:06:43 -0500 Subject: [PATCH] Balancing / Bugfixes / Badly antialiased turret outlines --- build.gradle | 8 +- .../assets-raw/sprites/blocks/turrets/duo.png | Bin 135 -> 1227 bytes .../sprites/blocks/turrets/fuse.png | Bin 378 -> 9132 bytes .../blocks/turrets/duo.png | Bin 2301 -> 2339 bytes .../blocks/turrets/lancer.png | Bin 7913 -> 0 bytes core/assets/bundles/bundle.properties | 2 +- core/assets/sprites/sprites.atlas | 967 +++++++++--------- core/assets/sprites/sprites.png | Bin 1143952 -> 1145233 bytes .../io/anuke/mindustry/content/Blocks.java | 21 +- .../io/anuke/mindustry/content/Bullets.java | 2 +- core/src/io/anuke/mindustry/core/World.java | 4 +- .../entities/effect/ScorchDecal.java | 2 + .../mindustry/entities/type/base/Drone.java | 2 - core/src/io/anuke/mindustry/world/Block.java | 19 +- .../anuke/mindustry/world/blocks/Floor.java | 11 +- .../world/blocks/SelectionTrait.java | 2 +- .../world/blocks/defense/turrets/Turret.java | 5 +- .../world/blocks/distribution/MassDriver.java | 7 +- .../world/blocks/units/RepairPoint.java | 8 +- .../world/blocks/units/UnitFactory.java | 2 +- .../anuke/mindustry/server/ServerControl.java | 2 +- tests/src/test/java/ApplicationTests.java | 5 + tools/src/io/anuke/mindustry/Generators.java | 47 +- tools/src/io/anuke/mindustry/Image.java | 1 + tools/src/io/anuke/mindustry/ImagePacker.java | 9 +- 25 files changed, 592 insertions(+), 534 deletions(-) delete mode 100644 core/assets-raw/sprites_replacement/blocks/turrets/lancer.png diff --git a/build.gradle b/build.gradle index 4549a1c0ac..8fb24f284b 100644 --- a/build.gradle +++ b/build.gradle @@ -26,6 +26,10 @@ allprojects{ gdxVersion = '1.9.9' roboVMVersion = '2.3.0' arcHash = null + + debugged = { + return new File(projectDir.parent, '../debug').exists() && System.properties["release"] == null + } localArc = { return (System.properties["release"] == null || System.properties["release"] == "false") && new File(projectDir.parent, '../Arc').exists() @@ -117,7 +121,7 @@ project(":desktop"){ compile project(":core") compile project(":net") - if(new File(projectDir.parent, '../debug').exists() && System.properties["release"] == null) compile project(":debug") + if(debugged()) compile project(":debug") compile "com.badlogicgames.gdx:gdx-platform:$gdxVersion:natives-desktop" compile "com.badlogicgames.gdx:gdx-freetype-platform:$gdxVersion:natives-desktop" @@ -194,7 +198,7 @@ project(":core"){ compile arcModule("arc-core") compile arcModule("extensions:freetype") - if(localArc()) compile arcModule("extensions:recorder") + if(localArc() && debugged()) compile arcModule("extensions:recorder") compileOnly project(":annotations") annotationProcessor project(":annotations") diff --git a/core/assets-raw/sprites/blocks/turrets/duo.png b/core/assets-raw/sprites/blocks/turrets/duo.png index d520c6e4f576ffc4bbf3a315498683b424d35a66..40d21d0fb0a6324ac9a3629dbe3170bdc7519ec3 100644 GIT binary patch delta 1208 zcmZo?Jk2>lxt{q$RY*ihP-3}4K~a8MW=^U?No7H*LTW{38UsVct*hbDlU{4^{7o0# z%%URD^fW;(w48nOAIpSWm0PUm9{(#DY`95jiLz{?@a2DhFQ2vFF(bzy&ZJGG>FCqR z{&N&vcE|trxpw~d);yd0FV22sb$)8F`>)}a)cFgipJw{%z5j0gtKMl()%Dy7Re6uh(!B{ZX8=!?H;1yTu|4g@Ti*=1&U4 z7EFU7viiK{A)=1M+n#8GY1PR-xp6ZA*oN~EK|sb153rfV`+Y7!PonxCy`RZNHEGgE`yp9#t!OscT+Ywn6xH@7?WenX!BUN=L*R6xrEw9K3@SR-f@|v2yz`xpB_i z=e#@O7%OVbJ$ z&q>YPb{-s#hbO489dCVkDh z4JRrepUthCtedmzsBZ4g1+`uJK~5KiytQ@~m5Scp-?nPmu~}JpS1x#+HP2j_*{!?v z&c*DzrT3S%ue1Gj<@3Q?NnfX#?n-`Vn7t)Jy60!+a`9^m!u}RHKDL;6P*NhJzgC{|n{+5iU*(_-;PK zxOvynJLUKMB34)K3%sL}@#auq@M|kRGl?xTET4V!vzlM+wyIofN$Fan_qxCBX3Gce zd2#IzuSv4m{slM7wx8W~%FKUnsc%Ks?J%ozlQI+SqW;z^Y~8+bX7Km?1mpaqo%81w zRvT}7=k@nuR%`8(Q-7k4syEIQ{hXZeEV4@edj0EXDTT-Lr>^wf_WRRf@4IEId$vxu z%bFISe<*v(GoEMG8fPWXln2z^{_CYa@jUa#eD>ShrRFTVnrp3XR^RnT(#2oVxc}3? zjf^|PJ~>?q%Bnccd$Yd6+tfesL*C}#L(zZomMQ(dlGNqqQB6iWvIcMzbH{Oj} zS6wCe^62`bvmdpK-O1*gRdMW~y#a5gS4H7*{kwnHEZObLlX(5%nQ5Vif?{~}-}Rl& zv3qm4+2^zOeA}Cn?2G!#PgJb8-O3#2`sLrB{lzWu89(gv|1sN4VqNr7roMG60|NtR zfk$L91B0G22s2hJwJ&2}U|=ut^mS!_%)~Cr&!WgJD8azMkmu>*7$R{wIiaCxXYq5R zgk_(v|0O3I8yOfF%!#@6e|}?QdSxg{Cf)?{M%yq;(vj8#Ld|TGM446>mHuism&AiO>Kv7<4ZLz28RDr X?1~;-)iYyYU|{fc^>bP0l+XkK-@!Y- delta 107 zcmX@j+0HmYIfcQ`)5S5Q;#P7(L(|UU=SB(1haKyqzSK+nesbyGe~C#7JeN2RDX?mE zIZRSuESbf4^91j1z5}ZF_EdhBzv;DsQ-M{1XA(=|ns*JF2PPb0XPB`q{P!-|E?x!( O1_n=8KbLh*2~7aG?JQ^j diff --git a/core/assets-raw/sprites/blocks/turrets/fuse.png b/core/assets-raw/sprites/blocks/turrets/fuse.png index 32218df3621c9f191750e49bc58d67a31894c1fd..c03bad9cba2b070647cd85e9e14ce8de5810e8f9 100644 GIT binary patch literal 9132 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 MboFyt=akR{05*o8mjD0& diff --git a/core/assets-raw/sprites_replacement/blocks/turrets/duo.png b/core/assets-raw/sprites_replacement/blocks/turrets/duo.png index 128b9c684b3be67284362c33fcf5ddffea7f517b..efcdb608323a2286b095e4607141a53db4872cd6 100644 GIT binary patch delta 2299 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 delta 2261 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%0D_kAtc-PFI)coLuZ-_$iT-;8YF)+E^ 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 diff --git a/core/assets/bundles/bundle.properties b/core/assets/bundles/bundle.properties index cc6f8e3700..ea8d3926a0 100644 --- a/core/assets/bundles/bundle.properties +++ b/core/assets/bundles/bundle.properties @@ -469,7 +469,7 @@ item.metaglass.description = A super-tough glass compound. Extensively used for item.scrap.name = Scrap item.scrap.description = Leftover remnants of old structures and units. Contains trace amounts of many different metals. liquid.water.name = Water -liquid.lava.name = Lava +liquid.slag.name = Slag liquid.oil.name = Oil liquid.cryofluid.name = Cryofluid mech.alpha-mech.name = Alpha diff --git a/core/assets/sprites/sprites.atlas b/core/assets/sprites/sprites.atlas index d198280c80..3218083b9f 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: 1421, 363 + xy: 1421, 329 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: 1523, 170 + xy: 1557, 204 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 titanium-conveyor-0-1 rotate: false - xy: 1557, 204 + xy: 1557, 170 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 titanium-conveyor-0-2 rotate: false - xy: 1557, 170 + xy: 1489, 136 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 titanium-conveyor-0-3 rotate: false - xy: 1489, 136 + xy: 1523, 136 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 titanium-conveyor-1-0 rotate: false - xy: 1523, 136 + xy: 1557, 136 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 titanium-conveyor-1-1 rotate: false - xy: 1557, 136 + xy: 1591, 499 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 titanium-conveyor-1-2 rotate: false - xy: 1591, 499 + xy: 1591, 465 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 titanium-conveyor-1-3 rotate: false - xy: 1591, 465 + xy: 1591, 431 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 titanium-conveyor-2-0 rotate: false - xy: 1591, 431 + xy: 1591, 397 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 titanium-conveyor-2-1 rotate: false - xy: 1591, 397 + xy: 1591, 363 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 titanium-conveyor-2-2 rotate: false - xy: 1591, 363 + xy: 1591, 329 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 titanium-conveyor-2-3 rotate: false - xy: 1591, 329 + xy: 1591, 295 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 titanium-conveyor-3-0 rotate: false - xy: 1591, 295 + xy: 1591, 261 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 titanium-conveyor-3-1 rotate: false - xy: 1591, 261 + xy: 1591, 227 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 titanium-conveyor-3-2 rotate: false - xy: 1591, 227 + xy: 1591, 193 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 titanium-conveyor-3-3 rotate: false - xy: 1591, 193 + xy: 1591, 159 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 titanium-conveyor-4-0 rotate: false - xy: 1591, 159 + xy: 1591, 125 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 titanium-conveyor-4-1 rotate: false - xy: 1591, 125 + xy: 1625, 485 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 titanium-conveyor-4-2 rotate: false - xy: 1625, 485 + xy: 1659, 485 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 titanium-conveyor-4-3 rotate: false - xy: 1659, 485 + xy: 1625, 451 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -370,14 +370,7 @@ junction index: -1 mass-driver rotate: false - xy: 1261, 1494 - size: 96, 96 - orig: 96, 96 - offset: 0, 0 - index: -1 -mass-driver-turret - rotate: false - xy: 1457, 1494 + xy: 1359, 1494 size: 96, 96 orig: 96, 96 offset: 0, 0 @@ -419,14 +412,14 @@ phase-conveyor-end index: -1 router rotate: false - xy: 1847, 510 + xy: 1881, 510 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 sorter rotate: false - xy: 1429, 57 + xy: 1429, 23 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -1084,84 +1077,84 @@ rocks-large index: -1 rocks1 rotate: false - xy: 1745, 510 + xy: 1779, 510 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 rocks2 rotate: false - xy: 1779, 510 + xy: 1813, 510 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 sand-water rotate: false - xy: 1387, 431 + xy: 1387, 397 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 sand1 rotate: false - xy: 1983, 510 + xy: 1387, 499 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 sand2 rotate: false - xy: 1387, 499 + xy: 1387, 465 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 sand3 rotate: false - xy: 1387, 465 + xy: 1387, 431 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 scrap1 rotate: false - xy: 1387, 397 + xy: 1387, 363 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 scrap2 rotate: false - xy: 1387, 363 + xy: 1387, 329 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 scrap3 rotate: false - xy: 1387, 329 + xy: 1387, 295 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 snow1 rotate: false - xy: 1421, 227 + xy: 1421, 193 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 snow2 rotate: false - xy: 1421, 193 + xy: 1421, 159 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 snow3 rotate: false - xy: 1421, 159 + xy: 1421, 125 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -1175,14 +1168,14 @@ snowrocks-large index: -1 snowrocks1 rotate: false - xy: 1421, 125 + xy: 1395, 91 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 snowrocks2 rotate: false - xy: 1395, 91 + xy: 1395, 57 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -1210,14 +1203,14 @@ spore-cluster3 index: -1 stained-boulder1 rotate: false - xy: 1455, 413 + xy: 1455, 379 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 stained-boulder2 rotate: false - xy: 1455, 379 + xy: 1455, 345 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -1238,14 +1231,14 @@ stained-rocks-red-large index: -1 stained-rocks-red1 rotate: false - xy: 1455, 277 + xy: 1455, 243 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 stained-rocks-red2 rotate: false - xy: 1455, 243 + xy: 1455, 209 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -1259,91 +1252,91 @@ stained-rocks-yellow-large index: -1 stained-rocks-yellow1 rotate: false - xy: 1455, 209 + xy: 1455, 175 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 stained-rocks-yellow2 rotate: false - xy: 1455, 175 + xy: 1455, 141 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 stained-rocks1 rotate: false - xy: 1455, 345 + xy: 1455, 311 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 stained-rocks2 rotate: false - xy: 1455, 311 + xy: 1455, 277 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 stained-stone-red1 rotate: false - xy: 1523, 510 + xy: 1489, 442 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 stained-stone-red2 rotate: false - xy: 1489, 442 + xy: 1523, 476 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 stained-stone-red3 rotate: false - xy: 1523, 476 + xy: 1557, 510 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 stained-stone-yellow1 rotate: false - xy: 1557, 510 + xy: 1489, 408 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 stained-stone-yellow2 rotate: false - xy: 1489, 408 + xy: 1523, 442 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 stained-stone-yellow3 rotate: false - xy: 1523, 442 + xy: 1557, 476 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 stained-stone1 rotate: false - xy: 1455, 141 + xy: 1489, 510 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 stained-stone2 rotate: false - xy: 1489, 510 + xy: 1489, 476 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 stained-stone3 rotate: false - xy: 1489, 476 + xy: 1523, 510 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -1357,77 +1350,77 @@ stainedrocks-large index: -1 stainedrocks1 rotate: false - xy: 1557, 476 + xy: 1489, 374 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 stainedrocks2 rotate: false - xy: 1489, 374 + xy: 1523, 408 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 stone3 rotate: false - xy: 1523, 408 + xy: 1557, 442 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 tar rotate: false - xy: 1489, 306 + xy: 1523, 340 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 thorium1 rotate: false - xy: 1523, 306 + xy: 1557, 340 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 thorium2 rotate: false - xy: 1557, 340 + xy: 1489, 238 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 thorium3 rotate: false - xy: 1489, 238 + xy: 1523, 272 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 titanium1 rotate: false - xy: 1489, 170 + xy: 1523, 204 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 titanium2 rotate: false - xy: 1523, 204 + xy: 1557, 238 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 titanium3 rotate: false - xy: 1557, 238 + xy: 1523, 170 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 water rotate: false - xy: 1625, 315 + xy: 1659, 349 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -1539,7 +1532,7 @@ rubble-4-1 index: -1 spawn rotate: false - xy: 1429, 23 + xy: 1455, 515 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -2015,14 +2008,14 @@ rtg-generator index: -1 rtg-generator-top rotate: false - xy: 1915, 510 + xy: 1949, 510 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 solar-panel rotate: false - xy: 1395, 57 + xy: 1395, 23 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -2337,7 +2330,7 @@ separator index: -1 separator-liquid rotate: false - xy: 1421, 397 + xy: 1421, 363 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -2351,7 +2344,7 @@ silicon-smelter index: -1 smelter rotate: false - xy: 1421, 261 + xy: 1421, 227 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -2400,14 +2393,14 @@ launch-pad index: -1 sortedunloader rotate: false - xy: 1429, 91 + xy: 1429, 57 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 unloader rotate: false - xy: 1625, 349 + xy: 1659, 383 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -2419,13 +2412,6 @@ vault orig: 96, 96 offset: 0, 0 index: -1 -arc - rotate: false - xy: 2013, 1570 - size: 32, 32 - orig: 32, 32 - offset: 0, 0 - index: -1 arc-heat rotate: false xy: 2013, 1536 @@ -2461,34 +2447,6 @@ block-4 orig: 128, 128 offset: 0, 0 index: -1 -cyclone - rotate: false - xy: 291, 12 - size: 96, 96 - orig: 96, 96 - offset: 0, 0 - index: -1 -duo - rotate: false - xy: 1081, 404 - size: 32, 32 - orig: 32, 32 - offset: 0, 0 - index: -1 -fuse - rotate: false - xy: 771, 1462 - size: 96, 96 - orig: 96, 96 - offset: 0, 0 - index: -1 -hail - rotate: false - xy: 1115, 498 - size: 32, 32 - orig: 32, 32 - offset: 0, 0 - index: -1 hail-heat rotate: false xy: 581, 896 @@ -2496,13 +2454,6 @@ hail-heat orig: 40, 40 offset: 0, 0 index: -1 -lancer - rotate: false - xy: 775, 1004 - size: 64, 64 - orig: 64, 64 - offset: 0, 0 - index: -1 lancer-heat rotate: false xy: 581, 938 @@ -2510,13 +2461,6 @@ lancer-heat orig: 64, 64 offset: 0, 0 index: -1 -meltdown - rotate: false - xy: 1826, 1820 - size: 128, 128 - orig: 128, 128 - offset: 0, 0 - index: -1 meltdown-heat rotate: false xy: 509, 766 @@ -2524,13 +2468,6 @@ meltdown-heat orig: 128, 128 offset: 0, 0 index: -1 -ripple - rotate: false - xy: 389, 12 - size: 96, 96 - orig: 96, 96 - offset: 0, 0 - index: -1 ripple-heat rotate: false xy: 583, 440 @@ -2538,13 +2475,6 @@ ripple-heat orig: 96, 96 offset: 0, 0 index: -1 -salvo - rotate: false - xy: 879, 443 - size: 64, 64 - orig: 64, 64 - offset: 0, 0 - index: -1 salvo-heat rotate: false xy: 879, 377 @@ -2566,27 +2496,6 @@ salvo-panel-right orig: 64, 64 offset: 0, 0 index: -1 -spectre - rotate: false - xy: 1826, 1690 - size: 128, 128 - orig: 128, 128 - offset: 0, 0 - index: -1 -swarmer - rotate: false - xy: 1591, 1198 - size: 64, 64 - orig: 64, 64 - offset: 0, 0 - index: -1 -wave - rotate: false - xy: 1909, 1132 - size: 64, 64 - orig: 64, 64 - offset: 0, 0 - index: -1 wave-liquid rotate: false xy: 1051, 1066 @@ -2707,13 +2616,6 @@ phantom-factory-top-open offset: 0, 0 index: -1 repair-point - rotate: false - xy: 1983, 612 - size: 32, 32 - orig: 32, 32 - offset: 0, 0 - index: -1 -repair-point-turret rotate: false xy: 1949, 544 size: 32, 32 @@ -2890,42 +2792,42 @@ scrap-wall-large4 index: -1 scrap-wall1 rotate: false - xy: 1387, 295 + xy: 1387, 261 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 scrap-wall2 rotate: false - xy: 1387, 261 + xy: 1387, 227 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 scrap-wall3 rotate: false - xy: 1387, 227 + xy: 1387, 193 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 scrap-wall4 rotate: false - xy: 1387, 193 + xy: 1387, 159 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 scrap-wall5 rotate: false - xy: 1387, 193 + xy: 1387, 159 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 surge-wall rotate: false - xy: 1489, 340 + xy: 1523, 374 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -2939,7 +2841,7 @@ surge-wall-large index: -1 thorium-wall rotate: false - xy: 1557, 306 + xy: 1489, 204 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -2960,7 +2862,7 @@ thruster index: -1 titanium-wall rotate: false - xy: 1625, 451 + xy: 1625, 417 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -3002,7 +2904,7 @@ bullet-back index: -1 casing rotate: false - xy: 2039, 490 + xy: 1891, 190 size: 8, 16 orig: 8, 16 offset: 0, 0 @@ -3072,7 +2974,7 @@ laserfull index: -1 minelaser rotate: false - xy: 2043, 1084 + xy: 2043, 484 size: 4, 48 orig: 4, 48 offset: 0, 0 @@ -3128,14 +3030,14 @@ scorch3 index: -1 scorch4 rotate: false - xy: 1625, 105 + xy: 1723, 408 size: 28, 100 orig: 28, 100 offset: 0, 0 index: -1 scorch5 rotate: false - xy: 1723, 408 + xy: 1753, 408 size: 28, 100 orig: 28, 100 offset: 0, 0 @@ -3156,21 +3058,21 @@ shell-back index: -1 shot rotate: false - xy: 1421, 329 + xy: 1421, 295 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 transfer rotate: false - xy: 479, 124 + xy: 2043, 434 size: 4, 48 orig: 4, 48 offset: 0, 0 index: -1 transfer-arrow rotate: false - xy: 1659, 451 + xy: 1625, 383 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -3224,6 +3126,13 @@ alpha-dart-mech-pad-icon-small orig: 24, 24 offset: 0, 0 index: -1 +arc + rotate: false + xy: 2013, 1570 + size: 32, 32 + orig: 32, 32 + offset: 0, 0 + index: -1 arc-icon-full rotate: false xy: 2013, 1502 @@ -3275,7 +3184,7 @@ battery-large-icon-medium index: -1 battery-large-icon-small rotate: false - xy: 1693, 288 + xy: 1659, 215 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -3303,7 +3212,7 @@ biomattercompressor-icon-medium index: -1 biomattercompressor-icon-small rotate: false - xy: 1753, 484 + xy: 1693, 288 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -3331,7 +3240,7 @@ blast-drill-icon-medium index: -1 blast-drill-icon-small rotate: false - xy: 1723, 319 + xy: 1783, 484 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -3352,7 +3261,7 @@ blast-mixer-icon-medium index: -1 blast-mixer-icon-small rotate: false - xy: 1047, 4 + xy: 1723, 319 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -3366,7 +3275,7 @@ bridge-conduit-icon-large index: -1 bridge-conduit-icon-small rotate: false - xy: 1753, 458 + xy: 1752, 382 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -3380,7 +3289,7 @@ bridge-conveyor-icon-large index: -1 bridge-conveyor-icon-small rotate: false - xy: 1779, 484 + xy: 1047, 4 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -3394,7 +3303,7 @@ char-icon-large index: -1 char-icon-small rotate: false - xy: 1779, 458 + xy: 1809, 484 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -3408,7 +3317,7 @@ cliffs-icon-large index: -1 cliffs-icon-small rotate: false - xy: 1805, 484 + xy: 1752, 356 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -3422,7 +3331,7 @@ combustion-generator-icon-large index: -1 combustion-generator-icon-small rotate: false - xy: 1779, 432 + xy: 1783, 432 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -3443,7 +3352,7 @@ conduit-icon-large index: -1 conduit-icon-small rotate: false - xy: 1805, 458 + xy: 1809, 458 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -3464,7 +3373,7 @@ container-icon-medium index: -1 container-icon-small rotate: false - xy: 1831, 484 + xy: 1835, 484 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -3478,7 +3387,7 @@ conveyor-icon-large index: -1 conveyor-icon-small rotate: false - xy: 1805, 432 + xy: 1809, 432 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -3492,7 +3401,7 @@ copper-wall-icon-large index: -1 copper-wall-icon-small rotate: false - xy: 1831, 458 + xy: 1835, 458 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -3513,7 +3422,7 @@ copper-wall-large-icon-medium index: -1 copper-wall-large-icon-small rotate: false - xy: 1857, 484 + xy: 1861, 484 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -3534,7 +3443,7 @@ core-foundation-icon-medium index: -1 core-foundation-icon-small rotate: false - xy: 1831, 432 + xy: 1835, 432 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -3555,7 +3464,7 @@ core-nucleus-icon-medium index: -1 core-nucleus-icon-small rotate: false - xy: 1857, 458 + xy: 1861, 458 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -3576,7 +3485,7 @@ core-shard-icon-medium index: -1 core-shard-icon-small rotate: false - xy: 1883, 484 + xy: 1887, 484 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -3590,7 +3499,7 @@ craters-icon-large index: -1 craters-icon-small rotate: false - xy: 1857, 432 + xy: 1861, 432 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -3618,7 +3527,7 @@ cryofluidmixer-icon-medium index: -1 cryofluidmixer-icon-small rotate: false - xy: 1883, 458 + xy: 1887, 458 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -3646,11 +3555,18 @@ cultivator-icon-medium index: -1 cultivator-icon-small rotate: false - xy: 1909, 484 + xy: 1913, 484 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 +cyclone + rotate: false + xy: 291, 12 + size: 96, 96 + orig: 96, 96 + offset: 0, 0 + index: -1 cyclone-icon-full rotate: false xy: 583, 538 @@ -3674,7 +3590,7 @@ cyclone-icon-medium index: -1 cyclone-icon-small rotate: false - xy: 1883, 432 + xy: 1887, 432 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -3702,7 +3618,7 @@ dagger-factory-icon-medium index: -1 dagger-factory-icon-small rotate: false - xy: 1909, 458 + xy: 1913, 458 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -3723,7 +3639,7 @@ deepwater-icon-large index: -1 deepwater-icon-small rotate: false - xy: 1935, 484 + xy: 1939, 484 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -3744,7 +3660,7 @@ delta-mech-pad-icon-medium index: -1 delta-mech-pad-icon-small rotate: false - xy: 1909, 432 + xy: 1913, 432 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -3765,7 +3681,7 @@ differential-generator-icon-medium index: -1 differential-generator-icon-small rotate: false - xy: 1935, 458 + xy: 1939, 458 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -3786,7 +3702,7 @@ distributor-icon-medium index: -1 distributor-icon-small rotate: false - xy: 1961, 484 + xy: 1965, 484 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -3800,7 +3716,7 @@ door-icon-large index: -1 door-icon-small rotate: false - xy: 1935, 432 + xy: 1939, 432 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -3821,7 +3737,7 @@ door-large-icon-medium index: -1 door-large-icon-small rotate: false - xy: 1961, 458 + xy: 1965, 458 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -3835,11 +3751,18 @@ dunerocks-icon-large index: -1 dunerocks-icon-small rotate: false - xy: 1987, 484 + xy: 1991, 484 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 +duo + rotate: false + xy: 1081, 404 + size: 32, 32 + orig: 32, 32 + offset: 0, 0 + index: -1 duo-icon-full rotate: false xy: 1047, 336 @@ -3856,7 +3779,7 @@ duo-icon-large index: -1 duo-icon-small rotate: false - xy: 1961, 432 + xy: 2017, 508 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -3877,7 +3800,7 @@ force-projector-icon-medium index: -1 force-projector-icon-small rotate: false - xy: 1987, 458 + xy: 1965, 432 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -3905,11 +3828,18 @@ fortress-factory-icon-medium index: -1 fortress-factory-icon-small rotate: false - xy: 1987, 432 + xy: 1991, 458 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 +fuse + rotate: false + xy: 771, 1462 + size: 96, 96 + orig: 96, 96 + offset: 0, 0 + index: -1 fuse-icon-full rotate: false xy: 747, 1364 @@ -3933,7 +3863,7 @@ fuse-icon-medium index: -1 fuse-icon-small rotate: false - xy: 2017, 508 + xy: 2017, 482 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -3961,7 +3891,7 @@ ghoul-factory-icon-medium index: -1 ghoul-factory-icon-small rotate: false - xy: 1753, 406 + xy: 1991, 432 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -3982,7 +3912,7 @@ glaive-ship-pad-icon-medium index: -1 glaive-ship-pad-icon-small rotate: false - xy: 1779, 406 + xy: 2017, 456 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -4003,11 +3933,18 @@ graphite-press-icon-medium index: -1 graphite-press-icon-small rotate: false - xy: 1805, 406 + xy: 1783, 406 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 +hail + rotate: false + xy: 1115, 498 + size: 32, 32 + orig: 32, 32 + offset: 0, 0 + index: -1 hail-icon-full rotate: false xy: 1115, 464 @@ -4024,7 +3961,7 @@ hail-icon-large index: -1 hail-icon-small rotate: false - xy: 1831, 406 + xy: 1809, 406 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -4045,7 +3982,7 @@ holostone-icon-large index: -1 holostone-icon-small rotate: false - xy: 1857, 406 + xy: 1835, 406 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -4059,7 +3996,7 @@ hotrock-icon-large index: -1 hotrock-icon-small rotate: false - xy: 1883, 406 + xy: 1861, 406 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -4073,7 +4010,7 @@ ice-icon-large index: -1 ice-icon-small rotate: false - xy: 1909, 406 + xy: 1887, 406 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -4094,7 +4031,7 @@ ice-snow-icon-large index: -1 ice-snow-icon-small rotate: false - xy: 1935, 406 + xy: 1913, 406 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -4108,7 +4045,7 @@ icerocks-icon-large index: -1 icerocks-icon-small rotate: false - xy: 1961, 406 + xy: 1939, 406 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -4122,7 +4059,7 @@ ignarock-icon-large index: -1 ignarock-icon-small rotate: false - xy: 1778, 380 + xy: 2017, 404 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -4150,7 +4087,7 @@ impact-reactor-icon-medium index: -1 impact-reactor-icon-small rotate: false - xy: 1778, 354 + xy: 1778, 380 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -4178,7 +4115,7 @@ item-source-icon-large index: -1 item-source-icon-small rotate: false - xy: 1804, 354 + xy: 1830, 380 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -4192,7 +4129,7 @@ item-void-icon-large index: -1 item-void-icon-small rotate: false - xy: 1830, 380 + xy: 1463, 73 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -4213,7 +4150,7 @@ javelin-ship-pad-icon-medium index: -1 javelin-ship-pad-icon-small rotate: false - xy: 2013, 440 + xy: 1489, 110 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -4227,7 +4164,7 @@ junction-icon-large index: -1 junction-icon-small rotate: false - xy: 1830, 354 + xy: 1856, 380 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -4248,11 +4185,18 @@ kiln-icon-medium index: -1 kiln-icon-small rotate: false - xy: 1856, 380 + xy: 1463, 47 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 +lancer + rotate: false + xy: 775, 1004 + size: 64, 64 + orig: 64, 64 + offset: 0, 0 + index: -1 lancer-icon-full rotate: false xy: 647, 938 @@ -4276,7 +4220,7 @@ lancer-icon-medium index: -1 lancer-icon-small rotate: false - xy: 2013, 414 + xy: 1489, 84 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -4304,7 +4248,7 @@ laser-drill-icon-medium index: -1 laser-drill-icon-small rotate: false - xy: 1856, 354 + xy: 1515, 110 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -4339,7 +4283,7 @@ liquid-junction-icon-large index: -1 liquid-junction-icon-small rotate: false - xy: 1882, 354 + xy: 1489, 58 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -4360,7 +4304,7 @@ liquid-router-icon-large index: -1 liquid-router-icon-small rotate: false - xy: 1908, 380 + xy: 1515, 84 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -4374,7 +4318,7 @@ liquid-source-icon-large index: -1 liquid-source-icon-small rotate: false - xy: 1908, 354 + xy: 1541, 110 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -4402,7 +4346,7 @@ liquid-tank-icon-medium index: -1 liquid-tank-icon-small rotate: false - xy: 1934, 380 + xy: 1908, 380 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -4416,14 +4360,21 @@ magmarock-icon-large index: -1 magmarock-icon-small rotate: false - xy: 1934, 354 + xy: 1515, 58 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 +mass-driver + rotate: false + xy: 1261, 1494 + size: 96, 96 + orig: 96, 96 + offset: 0, 0 + index: -1 mass-driver-icon-full rotate: false - xy: 1359, 1494 + xy: 1457, 1494 size: 96, 96 orig: 96, 96 offset: 0, 0 @@ -4444,7 +4395,7 @@ mass-driver-icon-medium index: -1 mass-driver-icon-small rotate: false - xy: 1960, 380 + xy: 1541, 84 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -4528,7 +4479,7 @@ mechanical-drill-icon-medium index: -1 mechanical-drill-icon-small rotate: false - xy: 1960, 354 + xy: 1934, 380 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -4542,11 +4493,18 @@ mechanical-pump-icon-large index: -1 mechanical-pump-icon-small rotate: false - xy: 1986, 380 + xy: 1541, 58 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 +meltdown + rotate: false + xy: 1826, 1820 + size: 128, 128 + orig: 128, 128 + offset: 0, 0 + index: -1 meltdown-icon-full rotate: false xy: 509, 636 @@ -4570,7 +4528,7 @@ meltdown-icon-medium index: -1 meltdown-icon-small rotate: false - xy: 1986, 354 + xy: 1960, 380 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -4584,7 +4542,7 @@ melter-icon-large index: -1 melter-icon-small rotate: false - xy: 787, 1 + xy: 1986, 380 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -4605,7 +4563,7 @@ mend-projector-icon-medium index: -1 mend-projector-icon-small rotate: false - xy: 813, 1 + xy: 1778, 354 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -4619,7 +4577,7 @@ metal-floor-2-icon-large index: -1 metal-floor-2-icon-small rotate: false - xy: 839, 1 + xy: 1804, 354 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -4633,7 +4591,7 @@ metal-floor-3-icon-large index: -1 metal-floor-3-icon-small rotate: false - xy: 865, 1 + xy: 1830, 354 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -4647,7 +4605,7 @@ metal-floor-5-icon-large index: -1 metal-floor-5-icon-small rotate: false - xy: 891, 1 + xy: 1856, 354 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -4661,7 +4619,7 @@ metal-floor-damaged-icon-large index: -1 metal-floor-damaged-icon-small rotate: false - xy: 917, 1 + xy: 1882, 354 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -4682,7 +4640,7 @@ metal-floor-icon-large index: -1 metal-floor-icon-small rotate: false - xy: 943, 1 + xy: 1908, 354 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -4703,7 +4661,7 @@ multi-press-icon-medium index: -1 multi-press-icon-small rotate: false - xy: 553, 446 + xy: 1934, 354 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -4731,7 +4689,7 @@ oil-extractor-icon-medium index: -1 oil-extractor-icon-small rotate: false - xy: 1463, 115 + xy: 1960, 354 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -4752,7 +4710,7 @@ omega-mech-pad-icon-medium index: -1 omega-mech-pad-icon-small rotate: false - xy: 1463, 89 + xy: 1986, 354 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -4766,7 +4724,7 @@ ore-coal-holostone-icon-large index: -1 ore-coal-holostone-icon-small rotate: false - xy: 1489, 110 + xy: 1463, 21 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -4815,7 +4773,7 @@ ore-coal-sand-icon-large index: -1 ore-coal-sand-icon-small rotate: false - xy: 1463, 63 + xy: 1489, 32 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -4864,7 +4822,7 @@ ore-coal-stained-stone-icon-large index: -1 ore-coal-stained-stone-icon-small rotate: false - xy: 1515, 110 + xy: 1515, 32 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -4878,7 +4836,7 @@ ore-coal-stained-stone-red-icon-large index: -1 ore-coal-stained-stone-red-icon-small rotate: false - xy: 1489, 84 + xy: 1541, 32 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -4962,7 +4920,7 @@ ore-coal-stone-icon-large index: -1 ore-coal-stone-icon-small rotate: false - xy: 1463, 37 + xy: 2012, 378 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -5011,7 +4969,7 @@ ore-copper-holostone-icon-large index: -1 ore-copper-holostone-icon-small rotate: false - xy: 1541, 110 + xy: 2012, 352 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -5060,7 +5018,7 @@ ore-copper-sand-icon-large index: -1 ore-copper-sand-icon-small rotate: false - xy: 1489, 58 + xy: 787, 1 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -5109,7 +5067,7 @@ ore-copper-stained-stone-icon-large index: -1 ore-copper-stained-stone-icon-small rotate: false - xy: 1515, 84 + xy: 813, 1 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -5123,7 +5081,7 @@ ore-copper-stained-stone-red-icon-large index: -1 ore-copper-stained-stone-red-icon-small rotate: false - xy: 1515, 58 + xy: 839, 1 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -5207,7 +5165,7 @@ ore-copper-stone-icon-large index: -1 ore-copper-stone-icon-small rotate: false - xy: 1541, 84 + xy: 865, 1 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -5256,7 +5214,7 @@ ore-lead-holostone-icon-large index: -1 ore-lead-holostone-icon-small rotate: false - xy: 1541, 58 + xy: 891, 1 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -5305,7 +5263,7 @@ ore-lead-sand-icon-large index: -1 ore-lead-sand-icon-small rotate: false - xy: 1489, 32 + xy: 917, 1 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -5354,7 +5312,7 @@ ore-lead-stained-stone-icon-large index: -1 ore-lead-stained-stone-icon-small rotate: false - xy: 1515, 32 + xy: 943, 1 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -5368,7 +5326,7 @@ ore-lead-stained-stone-red-icon-large index: -1 ore-lead-stained-stone-red-icon-small rotate: false - xy: 1541, 32 + xy: 553, 446 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -5452,7 +5410,7 @@ ore-lead-stone-icon-large index: -1 ore-lead-stone-icon-small rotate: false - xy: 1463, 11 + xy: 1625, 115 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -5501,7 +5459,7 @@ ore-scrap-holostone-icon-large index: -1 ore-scrap-holostone-icon-small rotate: false - xy: 1489, 6 + xy: 1752, 330 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -5550,7 +5508,7 @@ ore-scrap-sand-icon-large index: -1 ore-scrap-sand-icon-small rotate: false - xy: 1515, 6 + xy: 1778, 328 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -5599,7 +5557,7 @@ ore-scrap-snow-icon-large index: -1 ore-scrap-snow-icon-small rotate: false - xy: 1541, 6 + xy: 1804, 328 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -5648,7 +5606,7 @@ ore-scrap-stained-stone-icon-large index: -1 ore-scrap-stained-stone-icon-small rotate: false - xy: 1752, 328 + xy: 1830, 328 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -5662,7 +5620,7 @@ ore-scrap-stained-stone-red-icon-large index: -1 ore-scrap-stained-stone-red-icon-small rotate: false - xy: 1778, 328 + xy: 1856, 328 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -5746,7 +5704,7 @@ ore-scrap-stone-icon-large index: -1 ore-scrap-stone-icon-small rotate: false - xy: 1804, 328 + xy: 1882, 328 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -5795,7 +5753,7 @@ ore-thorium-holostone-icon-large index: -1 ore-thorium-holostone-icon-small rotate: false - xy: 1830, 328 + xy: 1908, 328 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -5844,7 +5802,7 @@ ore-thorium-sand-icon-large index: -1 ore-thorium-sand-icon-small rotate: false - xy: 1856, 328 + xy: 1934, 328 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -5893,7 +5851,7 @@ ore-thorium-stained-stone-icon-large index: -1 ore-thorium-stained-stone-icon-small rotate: false - xy: 1882, 328 + xy: 1960, 328 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -5907,7 +5865,7 @@ ore-thorium-stained-stone-red-icon-large index: -1 ore-thorium-stained-stone-red-icon-small rotate: false - xy: 1908, 328 + xy: 1986, 328 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -5991,7 +5949,7 @@ ore-thorium-stone-icon-large index: -1 ore-thorium-stone-icon-small rotate: false - xy: 1934, 328 + xy: 2012, 326 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -6040,7 +5998,7 @@ ore-titanium-holostone-icon-large index: -1 ore-titanium-holostone-icon-small rotate: false - xy: 1960, 328 + xy: 1489, 6 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -6089,7 +6047,7 @@ ore-titanium-sand-icon-large index: -1 ore-titanium-sand-icon-small rotate: false - xy: 1986, 328 + xy: 1515, 6 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -6138,7 +6096,7 @@ ore-titanium-stained-stone-icon-large index: -1 ore-titanium-stained-stone-icon-small rotate: false - xy: 2022, 1702 + xy: 1541, 6 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -6152,7 +6110,7 @@ ore-titanium-stained-stone-red-icon-large index: -1 ore-titanium-stained-stone-red-icon-small rotate: false - xy: 2022, 1676 + xy: 2022, 1702 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -6236,7 +6194,7 @@ ore-titanium-stone-icon-large index: -1 ore-titanium-stone-icon-small rotate: false - xy: 2013, 388 + xy: 2022, 1676 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -6292,7 +6250,7 @@ overdrive-projector-icon-medium index: -1 overdrive-projector-icon-small rotate: false - xy: 2012, 362 + xy: 1749, 304 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -6306,7 +6264,7 @@ overflow-gate-icon-large index: -1 overflow-gate-icon-small rotate: false - xy: 2012, 336 + xy: 1775, 302 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -6334,7 +6292,7 @@ phantom-factory-icon-medium index: -1 phantom-factory-icon-small rotate: false - xy: 2012, 310 + xy: 1801, 302 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -6348,7 +6306,7 @@ phase-conduit-icon-large index: -1 phase-conduit-icon-small rotate: false - xy: 1693, 262 + xy: 1827, 302 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -6362,7 +6320,7 @@ phase-conveyor-icon-large index: -1 phase-conveyor-icon-small rotate: false - xy: 1689, 236 + xy: 1853, 302 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -6376,7 +6334,7 @@ phase-wall-icon-large index: -1 phase-wall-icon-small rotate: false - xy: 1685, 210 + xy: 1879, 302 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -6397,7 +6355,7 @@ phase-wall-large-icon-medium index: -1 phase-wall-large-icon-small rotate: false - xy: 1749, 302 + xy: 1905, 302 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -6425,7 +6383,7 @@ phase-weaver-icon-medium index: -1 phase-weaver-icon-small rotate: false - xy: 1775, 302 + xy: 1931, 302 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -6439,7 +6397,7 @@ pine-icon-large index: -1 pine-icon-small rotate: false - xy: 1801, 302 + xy: 1957, 302 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -6467,7 +6425,7 @@ plasma-drill-icon-medium index: -1 plasma-drill-icon-small rotate: false - xy: 1827, 302 + xy: 1983, 302 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -6488,7 +6446,7 @@ plastanium-compressor-icon-medium index: -1 plastanium-compressor-icon-small rotate: false - xy: 1853, 302 + xy: 2009, 300 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -6516,7 +6474,7 @@ pneumatic-drill-icon-medium index: -1 pneumatic-drill-icon-small rotate: false - xy: 1879, 302 + xy: 1723, 293 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -6530,7 +6488,7 @@ power-node-icon-large index: -1 power-node-icon-small rotate: false - xy: 1905, 302 + xy: 1749, 278 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -6551,7 +6509,7 @@ power-node-large-icon-medium index: -1 power-node-large-icon-small rotate: false - xy: 1931, 302 + xy: 1775, 276 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -6565,7 +6523,7 @@ power-source-icon-large index: -1 power-source-icon-small rotate: false - xy: 1957, 302 + xy: 1801, 276 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -6579,7 +6537,7 @@ power-void-icon-large index: -1 power-void-icon-small rotate: false - xy: 1983, 302 + xy: 1827, 276 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -6600,7 +6558,7 @@ pulse-conduit-icon-large index: -1 pulse-conduit-icon-small rotate: false - xy: 1723, 293 + xy: 1853, 276 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -6621,7 +6579,7 @@ pulverizer-icon-large index: -1 pulverizer-icon-small rotate: false - xy: 1719, 267 + xy: 1879, 276 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -6642,11 +6600,25 @@ pyratite-mixer-icon-medium index: -1 pyratite-mixer-icon-small rotate: false - xy: 1749, 276 + xy: 1905, 276 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 +repair-point + rotate: false + xy: 1983, 612 + size: 32, 32 + orig: 32, 32 + offset: 0, 0 + index: -1 +repair-point-icon-full + rotate: false + xy: 1983, 578 + size: 32, 32 + orig: 32, 32 + offset: 0, 0 + index: -1 repair-point-icon-large rotate: false xy: 1219, 700 @@ -6656,7 +6628,7 @@ repair-point-icon-large index: -1 repair-point-icon-small rotate: false - xy: 1775, 276 + xy: 1931, 276 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -6677,18 +6649,25 @@ revenant-factory-icon-large index: -1 revenant-factory-icon-medium rotate: false - xy: 1983, 578 + xy: 1983, 544 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 revenant-factory-icon-small rotate: false - xy: 1801, 276 + xy: 1957, 276 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 +ripple + rotate: false + xy: 389, 12 + size: 96, 96 + orig: 96, 96 + offset: 0, 0 + index: -1 ripple-icon-full rotate: false xy: 869, 1396 @@ -6705,14 +6684,14 @@ ripple-icon-large index: -1 ripple-icon-medium rotate: false - xy: 1983, 544 + xy: 1745, 510 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ripple-icon-small rotate: false - xy: 1827, 276 + xy: 1983, 276 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -6726,7 +6705,7 @@ rocks-icon-large index: -1 rocks-icon-small rotate: false - xy: 1853, 276 + xy: 2009, 274 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -6740,14 +6719,14 @@ rotary-pump-icon-large index: -1 rotary-pump-icon-medium rotate: false - xy: 1813, 510 + xy: 1847, 510 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 rotary-pump-icon-small rotate: false - xy: 1879, 276 + xy: 1693, 262 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -6761,7 +6740,7 @@ router-icon-large index: -1 router-icon-small rotate: false - xy: 1905, 276 + xy: 1719, 267 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -6775,18 +6754,25 @@ rtg-generator-icon-large index: -1 rtg-generator-icon-medium rotate: false - xy: 1881, 510 + xy: 1915, 510 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 rtg-generator-icon-small rotate: false - xy: 1931, 276 + xy: 1690, 236 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 +salvo + rotate: false + xy: 879, 443 + size: 64, 64 + orig: 64, 64 + offset: 0, 0 + index: -1 salvo-icon-full rotate: false xy: 1933, 1264 @@ -6803,14 +6789,14 @@ salvo-icon-large index: -1 salvo-icon-medium rotate: false - xy: 1949, 510 + xy: 1983, 510 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 salvo-icon-small rotate: false - xy: 1957, 276 + xy: 1685, 210 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -6831,7 +6817,7 @@ sand-icon-large index: -1 sand-icon-small rotate: false - xy: 1983, 276 + xy: 1745, 252 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -6852,7 +6838,7 @@ sand-water-icon-large index: -1 sand-water-icon-small rotate: false - xy: 2009, 284 + xy: 1719, 241 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -6866,14 +6852,14 @@ scrap-wall-gigantic-icon-large index: -1 scrap-wall-gigantic-icon-medium rotate: false - xy: 1387, 159 + xy: 1387, 125 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 scrap-wall-gigantic-icon-small rotate: false - xy: 2009, 258 + xy: 1771, 250 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -6887,14 +6873,14 @@ scrap-wall-huge-icon-large index: -1 scrap-wall-huge-icon-medium rotate: false - xy: 1387, 125 + xy: 1421, 499 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 scrap-wall-huge-icon-small rotate: false - xy: 1719, 241 + xy: 1797, 250 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -6908,7 +6894,7 @@ scrap-wall-icon-large index: -1 scrap-wall-icon-small rotate: false - xy: 1745, 250 + xy: 1823, 250 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -6922,14 +6908,14 @@ scrap-wall-large-icon-large index: -1 scrap-wall-large-icon-medium rotate: false - xy: 1421, 499 + xy: 1421, 465 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 scrap-wall-large-icon-small rotate: false - xy: 1771, 250 + xy: 1849, 250 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -6943,14 +6929,14 @@ separator-icon-large index: -1 separator-icon-medium rotate: false - xy: 1421, 431 + xy: 1421, 397 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 separator-icon-small rotate: false - xy: 1849, 250 + xy: 1927, 250 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -6964,7 +6950,7 @@ shock-mine-icon-large index: -1 shock-mine-icon-small rotate: false - xy: 1875, 250 + xy: 1953, 250 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -6978,14 +6964,14 @@ silicon-smelter-icon-large index: -1 silicon-smelter-icon-medium rotate: false - xy: 1421, 295 + xy: 1421, 261 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 silicon-smelter-icon-small rotate: false - xy: 1901, 250 + xy: 1979, 250 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -7006,7 +6992,7 @@ snow-icon-large index: -1 snow-icon-small rotate: false - xy: 1927, 250 + xy: 2005, 248 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -7020,7 +7006,7 @@ snowrocks-icon-large index: -1 snowrocks-icon-small rotate: false - xy: 1953, 250 + xy: 1745, 226 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -7034,7 +7020,7 @@ solar-panel-icon-large index: -1 solar-panel-icon-small rotate: false - xy: 1979, 250 + xy: 1771, 224 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -7048,14 +7034,14 @@ solar-panel-large-icon-large index: -1 solar-panel-large-icon-medium rotate: false - xy: 1395, 23 + xy: 1429, 91 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 solar-panel-large-icon-small rotate: false - xy: 1849, 224 + xy: 1797, 224 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -7069,7 +7055,7 @@ sorter-icon-large index: -1 sorter-icon-small rotate: false - xy: 1875, 224 + xy: 1823, 224 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -7083,11 +7069,18 @@ spawn-icon-large index: -1 spawn-icon-small rotate: false - xy: 1901, 224 + xy: 1849, 224 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 +spectre + rotate: false + xy: 1826, 1690 + size: 128, 128 + orig: 128, 128 + offset: 0, 0 + index: -1 spectre-icon-full rotate: false xy: 477, 1560 @@ -7104,7 +7097,7 @@ spectre-icon-large index: -1 spectre-icon-medium rotate: false - xy: 1455, 515 + xy: 1455, 481 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -7132,7 +7125,7 @@ spirit-factory-icon-large index: -1 spirit-factory-icon-medium rotate: false - xy: 1455, 481 + xy: 1455, 447 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -7153,7 +7146,7 @@ spore-cluster-icon-large index: -1 spore-cluster-icon-medium rotate: false - xy: 1455, 447 + xy: 1455, 413 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -7174,7 +7167,7 @@ stained-boulder-icon-large index: -1 stained-boulder-icon-small rotate: false - xy: 2005, 232 + xy: 2005, 222 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -7188,7 +7181,7 @@ stained-rocks-icon-large index: -1 stained-rocks-icon-small rotate: false - xy: 1823, 213 + xy: 1901, 213 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -7202,7 +7195,7 @@ stained-rocks-red-icon-large index: -1 stained-rocks-red-icon-small rotate: false - xy: 1849, 198 + xy: 1875, 208 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -7216,7 +7209,7 @@ stained-rocks-yellow-icon-large index: -1 stained-rocks-yellow-icon-small rotate: false - xy: 1875, 198 + xy: 1927, 198 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -7237,7 +7230,7 @@ stained-stone-icon-large index: -1 stained-stone-icon-small rotate: false - xy: 1901, 198 + xy: 1953, 198 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -7258,7 +7251,7 @@ stained-stone-red-icon-large index: -1 stained-stone-red-icon-small rotate: false - xy: 1927, 198 + xy: 1979, 198 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -7279,7 +7272,7 @@ stained-stone-yellow-icon-large index: -1 stained-stone-yellow-icon-small rotate: false - xy: 1953, 198 + xy: 2005, 196 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -7300,7 +7293,7 @@ stone-icon-large index: -1 stone-icon-small rotate: false - xy: 1979, 198 + xy: 1901, 187 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -7314,14 +7307,14 @@ surge-tower-icon-large index: -1 surge-tower-icon-medium rotate: false - xy: 1557, 442 + xy: 1489, 340 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 surge-tower-icon-small rotate: false - xy: 2005, 206 + xy: 1927, 172 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -7335,7 +7328,7 @@ surge-wall-icon-large index: -1 surge-wall-icon-small rotate: false - xy: 1745, 224 + xy: 1953, 172 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -7349,18 +7342,25 @@ surge-wall-large-icon-large index: -1 surge-wall-large-icon-medium rotate: false - xy: 1523, 374 + xy: 1557, 408 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 surge-wall-large-icon-small rotate: false - xy: 1771, 224 + xy: 1979, 172 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 +swarmer + rotate: false + xy: 1591, 1198 + size: 64, 64 + orig: 64, 64 + offset: 0, 0 + index: -1 swarmer-icon-full rotate: false xy: 1657, 1198 @@ -7377,14 +7377,14 @@ swarmer-icon-large index: -1 swarmer-icon-medium rotate: false - xy: 1557, 408 + xy: 1489, 306 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 swarmer-icon-small rotate: false - xy: 1797, 208 + xy: 2005, 170 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -7405,7 +7405,7 @@ tar-icon-large index: -1 tar-icon-small rotate: false - xy: 1823, 187 + xy: 1659, 189 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -7419,14 +7419,14 @@ tau-mech-pad-icon-large index: -1 tau-mech-pad-icon-medium rotate: false - xy: 1523, 340 + xy: 1557, 374 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 tau-mech-pad-icon-small rotate: false - xy: 1849, 172 + xy: 1685, 184 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -7440,14 +7440,14 @@ thermal-generator-icon-large index: -1 thermal-generator-icon-medium rotate: false - xy: 1557, 374 + xy: 1489, 272 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 thermal-generator-icon-small rotate: false - xy: 1875, 172 + xy: 1655, 163 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -7461,14 +7461,14 @@ thermal-pump-icon-large index: -1 thermal-pump-icon-medium rotate: false - xy: 1489, 272 + xy: 1523, 306 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 thermal-pump-icon-small rotate: false - xy: 1901, 172 + xy: 1654, 137 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -7482,14 +7482,14 @@ thorium-reactor-icon-large index: -1 thorium-reactor-icon-medium rotate: false - xy: 1523, 272 + xy: 1557, 306 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 thorium-reactor-icon-small rotate: false - xy: 1927, 172 + xy: 1651, 111 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -7503,7 +7503,7 @@ thorium-wall-icon-large index: -1 thorium-wall-icon-small rotate: false - xy: 1953, 172 + xy: 1681, 158 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -7517,14 +7517,14 @@ thorium-wall-large-icon-large index: -1 thorium-wall-large-icon-medium rotate: false - xy: 1489, 204 + xy: 1523, 238 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 thorium-wall-large-icon-small rotate: false - xy: 1979, 172 + xy: 1680, 132 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -7538,14 +7538,14 @@ thruster-icon-large index: -1 thruster-icon-medium rotate: false - xy: 1523, 238 + xy: 1557, 272 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 thruster-icon-small rotate: false - xy: 2005, 180 + xy: 1677, 106 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -7566,14 +7566,14 @@ titan-factory-icon-large index: -1 titan-factory-icon-medium rotate: false - xy: 1557, 272 + xy: 1489, 170 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 titan-factory-icon-small rotate: false - xy: 2005, 154 + xy: 1711, 210 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -7587,7 +7587,7 @@ titanium-conveyor-icon-large index: -1 titanium-conveyor-icon-small rotate: false - xy: 1711, 210 + xy: 1711, 184 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -7601,7 +7601,7 @@ titanium-wall-icon-large index: -1 titanium-wall-icon-small rotate: false - xy: 1737, 198 + xy: 1707, 158 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -7615,14 +7615,14 @@ titanium-wall-large-icon-large index: -1 titanium-wall-large-icon-medium rotate: false - xy: 1625, 417 + xy: 1659, 451 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 titanium-wall-large-icon-small rotate: false - xy: 1763, 198 + xy: 1706, 132 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -7636,14 +7636,14 @@ trident-ship-pad-icon-large index: -1 trident-ship-pad-icon-medium rotate: false - xy: 1625, 383 + xy: 1659, 417 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 trident-ship-pad-icon-small rotate: false - xy: 1567, 99 + xy: 1703, 106 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -7657,14 +7657,14 @@ turbine-generator-icon-large index: -1 turbine-generator-icon-medium rotate: false - xy: 1659, 417 + xy: 1625, 349 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 turbine-generator-icon-small rotate: false - xy: 1593, 99 + xy: 1737, 200 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -7727,7 +7727,7 @@ unloader-icon-large index: -1 unloader-icon-small rotate: false - xy: 1567, 73 + xy: 1763, 198 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -7741,14 +7741,14 @@ vault-icon-large index: -1 vault-icon-medium rotate: false - xy: 1659, 383 + xy: 1625, 315 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 vault-icon-small rotate: false - xy: 1567, 47 + xy: 1789, 198 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -7776,14 +7776,14 @@ water-extractor-icon-large index: -1 water-extractor-icon-medium rotate: false - xy: 1659, 349 + xy: 1625, 281 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 water-extractor-icon-small rotate: false - xy: 1593, 73 + xy: 1815, 198 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -7797,11 +7797,18 @@ water-icon-large index: -1 water-icon-small rotate: false - xy: 1567, 21 + xy: 1841, 198 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 +wave + rotate: false + xy: 1909, 1132 + size: 64, 64 + orig: 64, 64 + offset: 0, 0 + index: -1 wave-icon-full rotate: false xy: 985, 1066 @@ -7818,14 +7825,14 @@ wave-icon-large index: -1 wave-icon-medium rotate: false - xy: 1625, 281 + xy: 1659, 315 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 wave-icon-small rotate: false - xy: 1593, 47 + xy: 1737, 174 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -7839,14 +7846,14 @@ white-tree-dead-icon-large index: -1 white-tree-dead-icon-medium rotate: false - xy: 1659, 315 + xy: 1625, 247 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 white-tree-dead-icon-small rotate: false - xy: 1593, 21 + xy: 1763, 172 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -7860,14 +7867,14 @@ white-tree-icon-large index: -1 white-tree-icon-medium rotate: false - xy: 1625, 247 + xy: 1659, 281 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 white-tree-icon-small rotate: false - xy: 1619, 79 + xy: 1789, 172 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -7888,14 +7895,14 @@ wraith-factory-icon-large index: -1 wraith-factory-icon-medium rotate: false - xy: 1659, 281 + xy: 1625, 213 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 wraith-factory-icon-small rotate: false - xy: 1619, 53 + xy: 1815, 172 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -8231,7 +8238,7 @@ circle index: -1 clear rotate: false - xy: 2009, 325 + xy: 1690, 278 size: 1, 1 orig: 1, 1 offset: 0, 0 @@ -8253,7 +8260,7 @@ bar index: -1 bar-top rotate: false - xy: 1656, 209 + xy: 1625, 141 size: 27, 36 split: 9, 10, 9, 10 orig: 27, 36 @@ -8341,7 +8348,7 @@ button-right-over index: -1 button-select rotate: false - xy: 1753, 432 + xy: 1783, 458 size: 24, 24 split: 4, 4, 4, 4 orig: 24, 24 @@ -8370,7 +8377,7 @@ check-on-over index: -1 check-over rotate: false - xy: 1659, 247 + xy: 1625, 179 size: 28, 32 orig: 28, 32 offset: 0, 0 @@ -8429,28 +8436,28 @@ empty-sector index: -1 icon-crafting rotate: false - xy: 2031, 204 + xy: 2031, 220 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-defense rotate: false - xy: 2031, 186 + xy: 2031, 202 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-distribution rotate: false - xy: 2031, 168 + xy: 2031, 184 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-effect rotate: false - xy: 2031, 150 + xy: 2031, 166 size: 16, 16 orig: 16, 16 offset: 0, 0 @@ -8464,35 +8471,35 @@ icon-liquid index: -1 icon-power rotate: false - xy: 1603, 3 + xy: 1567, 82 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-production rotate: false - xy: 2025, 1164 + xy: 1567, 64 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-turret rotate: false - xy: 1645, 87 + xy: 2024, 1074 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-units rotate: false - xy: 1645, 51 + xy: 2024, 1038 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-upgrade rotate: false - xy: 1413, 5 + xy: 1732, 138 size: 16, 16 orig: 16, 16 offset: 0, 0 @@ -8611,7 +8618,7 @@ icon-cancel index: -1 icon-cancel-2 rotate: false - xy: 1987, 406 + xy: 1965, 406 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -8625,21 +8632,21 @@ icon-chat index: -1 icon-check rotate: false - xy: 2031, 240 + xy: 2031, 256 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-check-2 rotate: false - xy: 1752, 380 + xy: 1991, 406 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 icon-copy rotate: false - xy: 2031, 222 + xy: 2031, 238 size: 16, 16 orig: 16, 16 offset: 0, 0 @@ -8758,14 +8765,14 @@ icon-floppy-16 index: -1 icon-folder rotate: false - xy: 2032, 2016 + xy: 1603, 109 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-folder-parent rotate: false - xy: 2032, 2000 + xy: 1585, 91 size: 14, 14 orig: 14, 14 offset: 0, 0 @@ -8779,14 +8786,14 @@ icon-generated index: -1 icon-github rotate: false - xy: 2032, 1984 + xy: 2032, 2016 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-google-play rotate: false - xy: 2032, 1968 + xy: 1585, 75 size: 14, 14 orig: 14, 14 offset: 0, 0 @@ -8814,28 +8821,28 @@ icon-holdDelete index: -1 icon-home rotate: false - xy: 2032, 1952 + xy: 2032, 2000 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-host rotate: false - xy: 1643, 724 + xy: 1585, 59 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-info rotate: false - xy: 1637, 35 + xy: 2032, 1984 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-itch.io rotate: false - xy: 1653, 35 + xy: 1585, 43 size: 14, 14 orig: 14, 14 offset: 0, 0 @@ -8863,7 +8870,7 @@ icon-line index: -1 icon-link rotate: false - xy: 1089, 6 + xy: 2032, 1968 size: 14, 14 orig: 14, 14 offset: 0, 0 @@ -8877,35 +8884,35 @@ icon-liquid-small index: -1 icon-load rotate: false - xy: 1105, 6 + xy: 1585, 27 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-load-image rotate: false - xy: 1619, 35 + xy: 1567, 118 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-load-map rotate: false - xy: 453, 1469 + xy: 1841, 180 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-loading rotate: false - xy: 845, 1426 + xy: 453, 1469 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-locked rotate: false - xy: 495, 1695 + xy: 845, 1426 size: 16, 16 orig: 16, 16 offset: 0, 0 @@ -8919,7 +8926,7 @@ icon-logic index: -1 icon-map rotate: false - xy: 2030, 1934 + xy: 2032, 1952 size: 14, 14 orig: 14, 14 offset: 0, 0 @@ -8933,7 +8940,7 @@ icon-menu index: -1 icon-menu-large rotate: false - xy: 963, 184 + xy: 495, 1695 size: 16, 16 orig: 16, 16 offset: 0, 0 @@ -8975,224 +8982,224 @@ icon-mission-done index: -1 icon-none rotate: false - xy: 1, 2 + xy: 1751, 162 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-paste rotate: false - xy: 845, 1408 + xy: 963, 184 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-pause rotate: false - xy: 1625, 521 + xy: 1, 2 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-pencil rotate: false - xy: 1567, 3 + xy: 1567, 100 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-pencil-small rotate: false - xy: 2030, 1918 + xy: 1585, 11 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-pick rotate: false - xy: 1585, 3 + xy: 845, 1408 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-play rotate: false - xy: 2022, 1664 + xy: 1625, 521 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-play-2 rotate: false - xy: 2030, 1902 + xy: 1643, 724 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-play-custom rotate: false - xy: 2030, 1886 + xy: 613, 6 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-players rotate: false - xy: 795, 380 + xy: 2022, 1664 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-power-small rotate: false - xy: 813, 644 + xy: 795, 380 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-quit rotate: false - xy: 2030, 1870 + xy: 1395, 7 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-redo rotate: false - xy: 2025, 1146 + xy: 1567, 46 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-refresh rotate: false - xy: 2030, 1854 + xy: 1411, 7 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-rename rotate: false - xy: 2030, 1838 + xy: 1427, 7 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-resize rotate: false - xy: 2025, 1128 + xy: 1567, 28 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-rotate rotate: false - xy: 2030, 1822 + xy: 1443, 7 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-rotate-arrow rotate: false - xy: 2030, 1806 + xy: 1459, 5 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-rotate-left rotate: false - xy: 2030, 1790 + xy: 1841, 164 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-rotate-right rotate: false - xy: 2030, 1774 + xy: 1859, 182 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-save rotate: false - xy: 2030, 1758 + xy: 1089, 6 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-save-image rotate: false - xy: 2024, 1110 + xy: 1567, 10 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-save-map rotate: false - xy: 2024, 1092 + xy: 2025, 1164 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-settings rotate: false - xy: 825, 644 + xy: 813, 644 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-spray rotate: false - xy: 2024, 1074 + xy: 2025, 1146 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-terrain rotate: false - xy: 2024, 1056 + xy: 2025, 1128 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-tools rotate: false - xy: 2030, 1742 + xy: 1105, 6 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-touch rotate: false - xy: 1405, 546 + xy: 825, 644 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-touchDelete rotate: false - xy: 1449, 11 + xy: 1405, 546 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-trash rotate: false - xy: 1789, 192 + xy: 1732, 122 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-trash-16 rotate: false - xy: 2024, 1038 + xy: 2024, 1110 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-tree rotate: false - xy: 613, 4 + xy: 2024, 1092 size: 16, 16 orig: 16, 16 offset: 0, 0 @@ -9206,49 +9213,49 @@ icon-tree-locked index: -1 icon-trello rotate: false - xy: 1805, 192 + xy: 1729, 106 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-tutorial rotate: false - xy: 1621, 19 + xy: 1875, 192 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-undo rotate: false - xy: 1645, 69 + xy: 2024, 1056 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-unlocked rotate: false - xy: 1395, 5 + xy: 1733, 156 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-unlocks rotate: false - xy: 1621, 3 + xy: 1875, 176 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-wiki rotate: false - xy: 1637, 19 + xy: 1859, 166 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-zone rotate: false - xy: 1752, 354 + xy: 2017, 430 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -9262,14 +9269,14 @@ icon-zone-locked index: -1 icon-zoom rotate: false - xy: 1431, 5 + xy: 1585, 107 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-zoom-small rotate: false - xy: 1637, 3 + xy: 1875, 160 size: 14, 14 orig: 14, 14 offset: 0, 0 @@ -9283,7 +9290,7 @@ info-banner index: -1 inventory rotate: false - xy: 2013, 466 + xy: 1463, 99 size: 24, 40 split: 10, 10, 10, 14 orig: 24, 40 @@ -9314,7 +9321,7 @@ pane-2 index: -1 scroll rotate: false - xy: 1823, 239 + xy: 1901, 239 size: 24, 35 split: 10, 10, 6, 5 orig: 24, 35 @@ -9338,7 +9345,7 @@ scroll-knob-horizontal-black index: -1 scroll-knob-vertical-black rotate: false - xy: 1797, 234 + xy: 1875, 234 size: 24, 40 split: 10, 10, 6, 10 orig: 24, 40 @@ -9346,21 +9353,21 @@ scroll-knob-vertical-black index: -1 sector-select rotate: false - xy: 1421, 465 + xy: 1421, 431 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 selection rotate: false - xy: 1637, 737 + xy: 1651, 138 size: 1, 1 orig: 1, 1 offset: 0, 0 index: -1 slider rotate: false - xy: 1749, 332 + xy: 1729, 122 size: 1, 8 orig: 1, 8 offset: 0, 0 @@ -9374,14 +9381,14 @@ slider-knob index: -1 slider-knob-down rotate: false - xy: 1625, 207 + xy: 1659, 241 size: 29, 38 orig: 29, 38 offset: 0, 0 index: -1 slider-knob-over rotate: false - xy: 1625, 207 + xy: 1659, 241 size: 29, 38 orig: 29, 38 offset: 0, 0 @@ -9411,7 +9418,7 @@ underline-2 index: -1 white rotate: false - xy: 521, 1752 + xy: 1685, 236 size: 3, 3 orig: 3, 3 offset: 0, 0 diff --git a/core/assets/sprites/sprites.png b/core/assets/sprites/sprites.png index f9524a71ecc3d61d4133705f1a9ad17e7b33edc6..a2b60390dd1ce811417809c7f7904d5ffd051b24 100644 GIT binary patch literal 1145233 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