diff --git a/core/assets-raw/sprites/blocks/environment/spore-moss1.png b/core/assets-raw/sprites/blocks/environment/spore-moss1.png new file mode 100644 index 0000000000..270349168a Binary files /dev/null and b/core/assets-raw/sprites/blocks/environment/spore-moss1.png differ diff --git a/core/assets-raw/sprites/blocks/environment/spore-moss2.png b/core/assets-raw/sprites/blocks/environment/spore-moss2.png new file mode 100644 index 0000000000..0546666a22 Binary files /dev/null and b/core/assets-raw/sprites/blocks/environment/spore-moss2.png differ diff --git a/core/assets-raw/sprites/blocks/environment/spore-moss3.png b/core/assets-raw/sprites/blocks/environment/spore-moss3.png new file mode 100644 index 0000000000..4cfbe3ed3c Binary files /dev/null and b/core/assets-raw/sprites/blocks/environment/spore-moss3.png differ diff --git a/core/assets-raw/sprites/blocks/environment/stained-boulder1.png b/core/assets-raw/sprites/blocks/environment/stained-boulder1.png deleted file mode 100644 index 66f88b2a06..0000000000 Binary files a/core/assets-raw/sprites/blocks/environment/stained-boulder1.png and /dev/null differ diff --git a/core/assets-raw/sprites/blocks/environment/stained-boulder2.png b/core/assets-raw/sprites/blocks/environment/stained-boulder2.png deleted file mode 100644 index 4b45697887..0000000000 Binary files a/core/assets-raw/sprites/blocks/environment/stained-boulder2.png and /dev/null differ diff --git a/core/assets-raw/sprites/blocks/environment/stained-rocks-large.png b/core/assets-raw/sprites/blocks/environment/stained-rocks-large.png deleted file mode 100644 index ec311cc1fc..0000000000 Binary files a/core/assets-raw/sprites/blocks/environment/stained-rocks-large.png and /dev/null differ diff --git a/core/assets-raw/sprites/blocks/environment/stained-rocks-red-large.png b/core/assets-raw/sprites/blocks/environment/stained-rocks-red-large.png deleted file mode 100644 index 1697abb808..0000000000 Binary files a/core/assets-raw/sprites/blocks/environment/stained-rocks-red-large.png and /dev/null differ diff --git a/core/assets-raw/sprites/blocks/environment/stained-rocks-red1.png b/core/assets-raw/sprites/blocks/environment/stained-rocks-red1.png deleted file mode 100644 index e646fcbba3..0000000000 Binary files a/core/assets-raw/sprites/blocks/environment/stained-rocks-red1.png and /dev/null differ diff --git a/core/assets-raw/sprites/blocks/environment/stained-rocks-red2.png b/core/assets-raw/sprites/blocks/environment/stained-rocks-red2.png deleted file mode 100644 index f85c1882bc..0000000000 Binary files a/core/assets-raw/sprites/blocks/environment/stained-rocks-red2.png and /dev/null differ diff --git a/core/assets-raw/sprites/blocks/environment/stained-rocks-yellow-large.png b/core/assets-raw/sprites/blocks/environment/stained-rocks-yellow-large.png deleted file mode 100644 index 055bd4cc44..0000000000 Binary files a/core/assets-raw/sprites/blocks/environment/stained-rocks-yellow-large.png and /dev/null differ diff --git a/core/assets-raw/sprites/blocks/environment/stained-rocks-yellow1.png b/core/assets-raw/sprites/blocks/environment/stained-rocks-yellow1.png deleted file mode 100644 index 9e59a807c8..0000000000 Binary files a/core/assets-raw/sprites/blocks/environment/stained-rocks-yellow1.png and /dev/null differ diff --git a/core/assets-raw/sprites/blocks/environment/stained-rocks-yellow2.png b/core/assets-raw/sprites/blocks/environment/stained-rocks-yellow2.png deleted file mode 100644 index 4788cb582a..0000000000 Binary files a/core/assets-raw/sprites/blocks/environment/stained-rocks-yellow2.png and /dev/null differ diff --git a/core/assets-raw/sprites/blocks/environment/stained-rocks1.png b/core/assets-raw/sprites/blocks/environment/stained-rocks1.png deleted file mode 100644 index e0aa379812..0000000000 Binary files a/core/assets-raw/sprites/blocks/environment/stained-rocks1.png and /dev/null differ diff --git a/core/assets-raw/sprites/blocks/environment/stained-rocks2.png b/core/assets-raw/sprites/blocks/environment/stained-rocks2.png deleted file mode 100644 index 7b6eabb5d1..0000000000 Binary files a/core/assets-raw/sprites/blocks/environment/stained-rocks2.png and /dev/null differ diff --git a/core/assets-raw/sprites/blocks/environment/stained-stone-red1.png b/core/assets-raw/sprites/blocks/environment/stained-stone-red1.png deleted file mode 100644 index 78250c48d9..0000000000 Binary files a/core/assets-raw/sprites/blocks/environment/stained-stone-red1.png and /dev/null differ diff --git a/core/assets-raw/sprites/blocks/environment/stained-stone-red2.png b/core/assets-raw/sprites/blocks/environment/stained-stone-red2.png deleted file mode 100644 index baae667241..0000000000 Binary files a/core/assets-raw/sprites/blocks/environment/stained-stone-red2.png and /dev/null differ diff --git a/core/assets-raw/sprites/blocks/environment/stained-stone-red3.png b/core/assets-raw/sprites/blocks/environment/stained-stone-red3.png deleted file mode 100644 index f069c248ae..0000000000 Binary files a/core/assets-raw/sprites/blocks/environment/stained-stone-red3.png and /dev/null differ diff --git a/core/assets-raw/sprites/blocks/environment/stained-stone-yellow1.png b/core/assets-raw/sprites/blocks/environment/stained-stone-yellow1.png deleted file mode 100644 index 874ba9b380..0000000000 Binary files a/core/assets-raw/sprites/blocks/environment/stained-stone-yellow1.png and /dev/null differ diff --git a/core/assets-raw/sprites/blocks/environment/stained-stone-yellow2.png b/core/assets-raw/sprites/blocks/environment/stained-stone-yellow2.png deleted file mode 100644 index 20b285b768..0000000000 Binary files a/core/assets-raw/sprites/blocks/environment/stained-stone-yellow2.png and /dev/null differ diff --git a/core/assets-raw/sprites/blocks/environment/stained-stone-yellow3.png b/core/assets-raw/sprites/blocks/environment/stained-stone-yellow3.png deleted file mode 100644 index 2a92d862be..0000000000 Binary files a/core/assets-raw/sprites/blocks/environment/stained-stone-yellow3.png and /dev/null differ diff --git a/core/assets-raw/sprites/blocks/environment/stainedrocks-large.png b/core/assets-raw/sprites/blocks/environment/stainedrocks-large.png deleted file mode 100644 index 46c60a3be4..0000000000 Binary files a/core/assets-raw/sprites/blocks/environment/stainedrocks-large.png and /dev/null differ diff --git a/core/assets-raw/sprites/blocks/environment/stainedrocks1.png b/core/assets-raw/sprites/blocks/environment/stainedrocks1.png deleted file mode 100644 index d8af4693e9..0000000000 Binary files a/core/assets-raw/sprites/blocks/environment/stainedrocks1.png and /dev/null differ diff --git a/core/assets-raw/sprites/blocks/environment/stainedrocks2.png b/core/assets-raw/sprites/blocks/environment/stainedrocks2.png deleted file mode 100644 index 7a8d8b178b..0000000000 Binary files a/core/assets-raw/sprites/blocks/environment/stainedrocks2.png and /dev/null differ diff --git a/core/assets-raw/sprites_replacement/blocks/environment/metal-floor-2.png b/core/assets-raw/sprites_replacement/blocks/environment/metal-floor-2.png new file mode 100644 index 0000000000..563338725b Binary files /dev/null and b/core/assets-raw/sprites_replacement/blocks/environment/metal-floor-2.png differ diff --git a/core/assets-raw/sprites_replacement/blocks/environment/metal-floor-5.png b/core/assets-raw/sprites_replacement/blocks/environment/metal-floor-5.png new file mode 100644 index 0000000000..ed2bc67e17 Binary files /dev/null and b/core/assets-raw/sprites_replacement/blocks/environment/metal-floor-5.png differ diff --git a/core/assets-raw/sprites_replacement/blocks/environment/metal-floor-damaged5.png b/core/assets-raw/sprites_replacement/blocks/environment/metal-floor-damaged5.png new file mode 100644 index 0000000000..5d36f9193e Binary files /dev/null and b/core/assets-raw/sprites_replacement/blocks/environment/metal-floor-damaged5.png differ diff --git a/core/assets-raw/sprites_replacement/blocks/environment/metal-floor.png b/core/assets-raw/sprites_replacement/blocks/environment/metal-floor.png new file mode 100644 index 0000000000..d0085b65d9 Binary files /dev/null and b/core/assets-raw/sprites_replacement/blocks/environment/metal-floor.png differ diff --git a/core/assets/bundles/bundle.properties b/core/assets/bundles/bundle.properties index 10487dc868..0eed7a6252 100644 --- a/core/assets/bundles/bundle.properties +++ b/core/assets/bundles/bundle.properties @@ -300,7 +300,8 @@ no = No info.title = Info error.title = [crimson]An error has occured error.crashtitle = An error has occured -blocks.outputspeed = Drill Speed: {0}/s +blocks.outputspeed = Drill Speed: {0}/ +blocks.efficiency = Efficiency: {0}% blocks.unknown = [LIGHT_GRAY]??? blocks.blockinfo = Block Info blocks.powerbalance = Power: {0} @@ -525,6 +526,16 @@ mech.ability = [LIGHT_GRAY]Ability: {0} liquid.heatcapacity = [LIGHT_GRAY]Heat Capacity: {0} liquid.viscosity = [LIGHT_GRAY]Viscosity: {0} liquid.temperature = [LIGHT_GRAY]Temperature: {0} + +block.grass.name = Grass +block.salt.name = Salt +block.sandrocks.name = Sand Rocks +block.spore-pine.name = Spore Pine +block.shale.name = Shale +block.shale-boulder.name = Shale Boulder +block.moss.name = Moss +block.spore-moss.name = Spore Moss +block.shalerocks.name = Shale Rocks block.scrap-wall.name = Scrap Wall block.scrap-wall-large.name = Large Scrap Wall block.scrap-wall-huge.name = Huge Scrap Wall @@ -559,12 +570,6 @@ block.pine.name = Pine block.white-tree-dead.name = White Tree Dead block.white-tree.name = White Tree block.spore-cluster.name = Spore Cluster -block.stained-rocks.name = Stained Rocks -block.stained-rocks-red.name = Stained Rocks Red -block.stained-stone-red.name = Stained Stone Red -block.stained-rocks-yellow.name = Stained Rocks Yellow -block.stained-stone-yellow.name = Stained Stone Yellow -block.stained-boulder.name = Stained Boulder block.metal-floor.name = Metal Floor block.metal-floor-2.name = Metal Floor 2 block.metal-floor-3.name = Metal Floor 3 @@ -832,4 +837,4 @@ block.power-source.description = Infinitely outputs power. Sandbox only. block.power-void.description = Voids all power inputted into it. Sandbox only. liquid.water.description = Commonly used for cooling machines and waste processing. liquid.oil.description = Can be burnt, exploded or used as a coolant. -liquid.cryofluid.description = The most efficient liquid for cooling things down. +liquid.cryofluid.description = The most efficient liquid for cooling things down. \ No newline at end of file diff --git a/core/assets/maps/Fortress.mmap b/core/assets/maps/Fortress.mmap new file mode 100644 index 0000000000..67324f5cd1 Binary files /dev/null and b/core/assets/maps/Fortress.mmap differ diff --git a/core/assets/sprites/block_colors.png b/core/assets/sprites/block_colors.png index 2a3c0eb69e..cf39740b1b 100644 Binary files a/core/assets/sprites/block_colors.png and b/core/assets/sprites/block_colors.png differ diff --git a/core/assets/sprites/sprites.atlas b/core/assets/sprites/sprites.atlas index 844d7e5b76..5036498304 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: 1721, 973 + xy: 449, 530 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -153,203 +153,203 @@ conveyor-2-2 index: -1 conveyor-2-3 rotate: false - xy: 1395, 897 + xy: 873, 795 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 conveyor-3-0 rotate: false - xy: 1383, 863 + xy: 907, 795 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 conveyor-3-1 rotate: false - xy: 1383, 829 + xy: 941, 795 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 conveyor-3-2 rotate: false - xy: 873, 795 + xy: 975, 795 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 conveyor-3-3 rotate: false - xy: 907, 795 + xy: 1009, 795 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 conveyor-4-0 rotate: false - xy: 941, 795 + xy: 1043, 795 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 conveyor-4-1 rotate: false - xy: 975, 795 + xy: 1077, 795 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 conveyor-4-2 rotate: false - xy: 1009, 795 + xy: 1111, 795 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 conveyor-4-3 rotate: false - xy: 1043, 795 + xy: 1145, 795 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 titanium-conveyor-0-0 rotate: false - xy: 1739, 803 + xy: 479, 428 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 titanium-conveyor-0-1 rotate: false - xy: 449, 530 + xy: 479, 394 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 titanium-conveyor-0-2 rotate: false - xy: 449, 496 + xy: 479, 360 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 titanium-conveyor-0-3 rotate: false - xy: 449, 462 + xy: 479, 326 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 titanium-conveyor-1-0 rotate: false - xy: 445, 428 + xy: 479, 292 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 titanium-conveyor-1-1 rotate: false - xy: 445, 394 + xy: 479, 258 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 titanium-conveyor-1-2 rotate: false - xy: 445, 360 + xy: 479, 224 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 titanium-conveyor-1-3 rotate: false - xy: 445, 326 + xy: 479, 190 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 titanium-conveyor-2-0 rotate: false - xy: 445, 292 + xy: 479, 156 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 titanium-conveyor-2-1 rotate: false - xy: 445, 258 + xy: 479, 122 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 titanium-conveyor-2-2 rotate: false - xy: 445, 224 + xy: 479, 88 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 titanium-conveyor-2-3 rotate: false - xy: 445, 190 + xy: 479, 54 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 titanium-conveyor-3-0 rotate: false - xy: 445, 156 + xy: 479, 20 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 titanium-conveyor-3-1 rotate: false - xy: 445, 122 + xy: 1481, 765 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 titanium-conveyor-3-2 rotate: false - xy: 445, 88 + xy: 1481, 731 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 titanium-conveyor-3-3 rotate: false - xy: 1447, 761 + xy: 1447, 697 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 titanium-conveyor-4-0 rotate: false - xy: 1447, 727 + xy: 1481, 697 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 titanium-conveyor-4-1 rotate: false - xy: 1446, 693 + xy: 1446, 663 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 titanium-conveyor-4-2 rotate: false - xy: 1446, 659 + xy: 1480, 663 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 titanium-conveyor-4-3 rotate: false - xy: 1739, 769 + xy: 1463, 905 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -363,7 +363,7 @@ distributor index: -1 junction rotate: false - xy: 936, 693 + xy: 1174, 693 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -377,49 +377,49 @@ mass-driver-base index: -1 overflow-gate rotate: false - xy: 2003, 1151 + xy: 1417, 833 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 phase-conveyor rotate: false - xy: 1412, 693 + xy: 1617, 1097 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 phase-conveyor-arrow rotate: false - xy: 1412, 659 + xy: 1675, 1155 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 phase-conveyor-bridge rotate: false - xy: 1785, 1126 + xy: 1709, 1155 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 phase-conveyor-end rotate: false - xy: 1819, 1126 + xy: 1743, 1155 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 router rotate: false - xy: 1653, 1037 + xy: 1821, 1087 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 sorter rotate: false - xy: 1671, 935 + xy: 445, 292 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -678,7 +678,7 @@ rubble-4-1 index: -1 spawn rotate: false - xy: 1671, 901 + xy: 445, 258 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -825,28 +825,28 @@ conduit-top-6 index: -1 liquid-junction rotate: false - xy: 1174, 693 + xy: 834, 665 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 liquid-router-bottom rotate: false - xy: 1242, 693 + xy: 902, 659 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 liquid-router-liquid rotate: false - xy: 1310, 693 + xy: 970, 659 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 liquid-router-top rotate: false - xy: 1344, 693 + xy: 1004, 659 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -874,84 +874,84 @@ liquid-tank-top index: -1 mechanical-pump rotate: false - xy: 970, 659 + xy: 1242, 659 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 phase-conduit rotate: false - xy: 1417, 829 + xy: 1451, 867 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 phase-conduit-arrow rotate: false - xy: 1417, 795 + xy: 1451, 833 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 phase-conduit-bridge rotate: false - xy: 1413, 761 + xy: 1451, 799 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 phase-conduit-end rotate: false - xy: 1413, 727 + xy: 1575, 1055 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 pulse-conduit-top-0 rotate: false - xy: 1989, 1117 + xy: 1667, 1121 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 pulse-conduit-top-1 rotate: false - xy: 1955, 1083 + xy: 1701, 1121 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 pulse-conduit-top-2 rotate: false - xy: 1989, 1083 + xy: 1735, 1121 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 pulse-conduit-top-3 rotate: false - xy: 1467, 913 + xy: 1769, 1121 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 pulse-conduit-top-4 rotate: false - xy: 1501, 955 + xy: 1803, 1121 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 pulse-conduit-top-5 rotate: false - xy: 1501, 921 + xy: 1837, 1121 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 pulse-conduit-top-6 rotate: false - xy: 1551, 1005 + xy: 1871, 1105 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -1119,7 +1119,7 @@ impact-reactor-top index: -1 power-node rotate: false - xy: 1719, 1109 + xy: 1981, 1151 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -1133,28 +1133,28 @@ power-node-large index: -1 power-source rotate: false - xy: 1887, 1139 + xy: 1981, 1117 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 power-void rotate: false - xy: 1921, 1130 + xy: 2015, 1117 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 powerinfinite rotate: false - xy: 1887, 1105 + xy: 1609, 1055 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 powervoid rotate: false - xy: 1921, 1096 + xy: 1567, 1021 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -1168,14 +1168,14 @@ rtg-generator index: -1 rtg-generator-top rotate: false - xy: 1721, 1041 + xy: 1597, 987 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 solar-panel rotate: false - xy: 1535, 861 + xy: 445, 394 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -1308,21 +1308,21 @@ graphite-press index: -1 incinerator rotate: false - xy: 1345, 761 + xy: 1005, 727 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 item-source rotate: false - xy: 1277, 727 + xy: 936, 693 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 item-void rotate: false - xy: 868, 693 + xy: 1106, 693 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -1350,21 +1350,21 @@ silicon-smelter-top index: -1 lavasmelter rotate: false - xy: 1106, 693 + xy: 1344, 693 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 liquid-source rotate: false - xy: 800, 674 + xy: 1072, 659 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 melter rotate: false - xy: 1038, 659 + xy: 1310, 659 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -1413,14 +1413,14 @@ plastanium-compressor-top index: -1 pulverizer rotate: false - xy: 1617, 1063 + xy: 1905, 1096 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 pulverizer-rotator rotate: false - xy: 1685, 1071 + xy: 1973, 1083 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -1455,7 +1455,7 @@ silicon-smelter index: -1 smelter rotate: false - xy: 1603, 893 + xy: 445, 428 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -1546,14 +1546,14 @@ launch-pad index: -1 sortedunloader rotate: false - xy: 1637, 893 + xy: 445, 326 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 unloader rotate: false - xy: 479, 258 + xy: 1519, 811 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -1791,7 +1791,7 @@ phantom-factory-top-open index: -1 repair-point-base rotate: false - xy: 1535, 929 + xy: 1651, 1087 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -1854,7 +1854,7 @@ wraith-factory-top-open index: -1 copper-wall rotate: false - xy: 1077, 795 + xy: 1179, 795 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -1868,7 +1868,7 @@ copper-wall-large index: -1 door rotate: false - xy: 800, 708 + xy: 937, 761 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -1889,14 +1889,14 @@ door-large-open index: -1 door-open rotate: false - xy: 835, 733 + xy: 1005, 761 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 phase-wall rotate: false - xy: 1467, 947 + xy: 1777, 1155 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -1966,42 +1966,42 @@ scrap-wall-large4 index: -1 scrap-wall1 rotate: false - xy: 1653, 1003 + xy: 1573, 953 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 scrap-wall2 rotate: false - xy: 1687, 1003 + xy: 1607, 953 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 scrap-wall3 rotate: false - xy: 1721, 1007 + xy: 1641, 953 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 scrap-wall4 rotate: false - xy: 1585, 979 + xy: 1665, 987 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 scrap-wall5 rotate: false - xy: 1585, 979 + xy: 1665, 987 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 surge-wall rotate: false - xy: 1705, 867 + xy: 1413, 727 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -2015,7 +2015,7 @@ surge-wall-large index: -1 thorium-wall rotate: false - xy: 1739, 871 + xy: 1573, 885 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -2036,7 +2036,7 @@ thruster index: -1 titanium-wall rotate: false - xy: 479, 428 + xy: 1485, 871 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -2106,7 +2106,7 @@ minelaser-end index: -1 missile rotate: false - xy: 1931, 1164 + xy: 1923, 1164 size: 36, 36 orig: 36, 36 offset: 0, 0 @@ -2127,56 +2127,56 @@ scale_marker index: -1 scorch1 rotate: false - xy: 1773, 873 + xy: 453, 598 size: 28, 100 orig: 28, 100 offset: 0, 0 index: -1 scorch2 rotate: false - xy: 1773, 771 + xy: 483, 598 size: 28, 100 orig: 28, 100 offset: 0, 0 index: -1 scorch3 rotate: false - xy: 1451, 803 + xy: 513, 628 size: 28, 100 orig: 28, 100 offset: 0, 0 index: -1 scorch4 rotate: false - xy: 1481, 785 + xy: 543, 628 size: 28, 100 orig: 28, 100 offset: 0, 0 index: -1 scorch5 rotate: false - xy: 453, 598 + xy: 483, 496 size: 28, 100 orig: 28, 100 offset: 0, 0 index: -1 shell rotate: false - xy: 1709, 1143 + xy: 1425, 901 size: 36, 36 orig: 36, 36 offset: 0, 0 index: -1 shell-back rotate: false - xy: 1747, 1151 + xy: 1467, 943 size: 36, 36 orig: 36, 36 offset: 0, 0 index: -1 shot rotate: false - xy: 1603, 927 + xy: 449, 496 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -2190,7 +2190,7 @@ transfer index: -1 transfer-arrow rotate: false - xy: 479, 360 + xy: 1485, 803 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -2239,7 +2239,7 @@ alpha-dart-mech-pad-icon-medium index: -1 alpha-dart-mech-pad-icon-small rotate: false - xy: 2023, 1125 + xy: 583, 1633 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -2267,7 +2267,7 @@ arc-icon-large index: -1 arc-icon-small rotate: false - xy: 2023, 1099 + xy: 1956, 1819 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -2281,7 +2281,7 @@ battery-icon-large index: -1 battery-icon-small rotate: false - xy: 2023, 1073 + xy: 295, 56 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -2302,7 +2302,7 @@ battery-large-icon-medium index: -1 battery-large-icon-small rotate: false - xy: 1861, 1163 + xy: 891, 1363 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -2330,7 +2330,7 @@ blast-drill-icon-medium index: -1 blast-drill-icon-small rotate: false - xy: 583, 1633 + xy: 1395, 905 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -2351,7 +2351,7 @@ blast-mixer-icon-medium index: -1 blast-mixer-icon-small rotate: false - xy: 1956, 1819 + xy: 573, 704 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -2365,7 +2365,7 @@ bridge-conduit-icon-large index: -1 bridge-conduit-icon-small rotate: false - xy: 295, 56 + xy: 453, 572 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -2379,7 +2379,7 @@ bridge-conveyor-icon-large index: -1 bridge-conveyor-icon-small rotate: false - xy: 891, 1363 + xy: 483, 470 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -2393,7 +2393,7 @@ char-icon-large index: -1 char-icon-small rotate: false - xy: 1956, 1793 + xy: 513, 501 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -2407,7 +2407,7 @@ cliffs-icon-large index: -1 cliffs-icon-small rotate: false - xy: 891, 1337 + xy: 1956, 1793 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -2421,7 +2421,7 @@ combustion-generator-icon-large index: -1 combustion-generator-icon-small rotate: false - xy: 1784, 1100 + xy: 891, 1337 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -2442,7 +2442,7 @@ conduit-icon-large index: -1 conduit-icon-small rotate: false - xy: 1810, 1100 + xy: 573, 678 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -2463,7 +2463,7 @@ container-icon-medium index: -1 container-icon-small rotate: false - xy: 1836, 1100 + xy: 542, 576 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -2477,7 +2477,7 @@ conveyor-icon-large index: -1 conveyor-icon-small rotate: false - xy: 77, 8 + xy: 573, 652 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -2491,7 +2491,7 @@ copper-wall-icon-large index: -1 copper-wall-icon-small rotate: false - xy: 103, 11 + xy: 542, 550 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -2505,14 +2505,14 @@ copper-wall-large-icon-large index: -1 copper-wall-large-icon-medium rotate: false - xy: 1111, 795 + xy: 1213, 795 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 copper-wall-large-icon-small rotate: false - xy: 479, 572 + xy: 599, 674 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -2526,14 +2526,14 @@ core-foundation-icon-large index: -1 core-foundation-icon-medium rotate: false - xy: 1145, 795 + xy: 1247, 795 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 core-foundation-icon-small rotate: false - xy: 483, 546 + xy: 573, 626 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -2547,14 +2547,14 @@ core-nucleus-icon-large index: -1 core-nucleus-icon-medium rotate: false - xy: 1179, 795 + xy: 1281, 795 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 core-nucleus-icon-small rotate: false - xy: 483, 520 + xy: 599, 648 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -2568,14 +2568,14 @@ core-shard-icon-large index: -1 core-shard-icon-medium rotate: false - xy: 1213, 795 + xy: 1315, 795 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 core-shard-icon-small rotate: false - xy: 483, 494 + xy: 542, 524 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -2589,7 +2589,7 @@ craters-icon-large index: -1 craters-icon-small rotate: false - xy: 483, 468 + xy: 599, 622 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -2610,14 +2610,14 @@ crawler-factory-icon-large index: -1 crawler-factory-icon-medium rotate: false - xy: 1247, 795 + xy: 1349, 795 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 crawler-factory-icon-small rotate: false - xy: 427, 720 + xy: 568, 600 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -2638,14 +2638,14 @@ cryofluidmixer-icon-large index: -1 cryofluidmixer-icon-medium rotate: false - xy: 1281, 795 + xy: 801, 776 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 cryofluidmixer-icon-small rotate: false - xy: 453, 720 + xy: 568, 574 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -2666,14 +2666,14 @@ cultivator-icon-large index: -1 cultivator-icon-medium rotate: false - xy: 1315, 795 + xy: 801, 742 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 cultivator-icon-small rotate: false - xy: 510, 28 + xy: 568, 548 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -2701,14 +2701,14 @@ cyclone-icon-large index: -1 cyclone-icon-medium rotate: false - xy: 1349, 795 + xy: 800, 708 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 cyclone-icon-small rotate: false - xy: 510, 2 + xy: 568, 522 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -2729,14 +2729,14 @@ dagger-factory-icon-large index: -1 dagger-factory-icon-medium rotate: false - xy: 1383, 795 + xy: 835, 767 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 dagger-factory-icon-small rotate: false - xy: 1785, 1074 + xy: 594, 596 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -2750,7 +2750,7 @@ deepwater-icon-large index: -1 deepwater-icon-small rotate: false - xy: 1785, 1048 + xy: 594, 570 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -2764,14 +2764,14 @@ delta-mech-pad-icon-large index: -1 delta-mech-pad-icon-medium rotate: false - xy: 1429, 905 + xy: 835, 733 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 delta-mech-pad-icon-small rotate: false - xy: 1811, 1074 + xy: 594, 544 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -2785,14 +2785,14 @@ differential-generator-icon-large index: -1 differential-generator-icon-medium rotate: false - xy: 801, 776 + xy: 869, 761 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 differential-generator-icon-small rotate: false - xy: 1785, 1022 + xy: 594, 518 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -2806,14 +2806,14 @@ distributor-icon-large index: -1 distributor-icon-medium rotate: false - xy: 801, 742 + xy: 903, 761 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 distributor-icon-small rotate: false - xy: 1811, 1048 + xy: 539, 498 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -2827,7 +2827,7 @@ door-icon-large index: -1 door-icon-small rotate: false - xy: 1785, 996 + xy: 565, 496 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -2841,14 +2841,14 @@ door-large-icon-large index: -1 door-large-icon-medium rotate: false - xy: 835, 767 + xy: 971, 761 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 door-large-icon-small rotate: false - xy: 1811, 1022 + xy: 591, 492 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -2862,21 +2862,21 @@ dunerocks-icon-large index: -1 dunerocks-icon-small rotate: false - xy: 1811, 996 + xy: 1643, 1061 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 duo rotate: false - xy: 869, 761 + xy: 1039, 761 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 duo-icon-full rotate: false - xy: 903, 761 + xy: 1073, 761 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -2890,7 +2890,7 @@ duo-icon-large index: -1 duo-icon-small rotate: false - xy: 1837, 1074 + xy: 1669, 1061 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -2904,14 +2904,14 @@ force-projector-icon-large index: -1 force-projector-icon-medium rotate: false - xy: 971, 761 + xy: 1141, 761 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 force-projector-icon-small rotate: false - xy: 1837, 1048 + xy: 1695, 1061 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -2932,14 +2932,14 @@ fortress-factory-icon-large index: -1 fortress-factory-icon-medium rotate: false - xy: 1005, 761 + xy: 1175, 761 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 fortress-factory-icon-small rotate: false - xy: 1837, 1022 + xy: 1721, 1061 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -2967,14 +2967,14 @@ fuse-icon-large index: -1 fuse-icon-medium rotate: false - xy: 1039, 761 + xy: 1209, 761 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 fuse-icon-small rotate: false - xy: 1837, 996 + xy: 1747, 1061 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -2995,14 +2995,14 @@ ghoul-factory-icon-large index: -1 ghoul-factory-icon-medium rotate: false - xy: 1073, 761 + xy: 1243, 761 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ghoul-factory-icon-small rotate: false - xy: 1803, 970 + xy: 1773, 1061 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -3016,14 +3016,14 @@ glaive-ship-pad-icon-large index: -1 glaive-ship-pad-icon-medium rotate: false - xy: 1107, 761 + xy: 1277, 761 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 glaive-ship-pad-icon-small rotate: false - xy: 1803, 944 + xy: 1799, 1061 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -3037,14 +3037,14 @@ graphite-press-icon-large index: -1 graphite-press-icon-medium rotate: false - xy: 1141, 761 + xy: 1311, 761 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 graphite-press-icon-small rotate: false - xy: 1829, 970 + xy: 1825, 1061 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -3058,21 +3058,21 @@ grass-icon-large index: -1 grass-icon-small rotate: false - xy: 1803, 918 + xy: 1669, 1035 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 hail rotate: false - xy: 1175, 761 + xy: 1345, 761 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 hail-icon-full rotate: false - xy: 1209, 761 + xy: 869, 727 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -3086,7 +3086,7 @@ hail-icon-large index: -1 hail-icon-small rotate: false - xy: 1829, 944 + xy: 1695, 1035 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -3100,7 +3100,7 @@ holostone-icon-large index: -1 holostone-icon-small rotate: false - xy: 1803, 892 + xy: 1721, 1035 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -3114,7 +3114,7 @@ hotrock-icon-large index: -1 hotrock-icon-small rotate: false - xy: 1829, 918 + xy: 1747, 1035 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -3128,7 +3128,7 @@ ice-icon-large index: -1 ice-icon-small rotate: false - xy: 1803, 866 + xy: 1773, 1035 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -3142,7 +3142,7 @@ ice-snow-icon-large index: -1 ice-snow-icon-small rotate: false - xy: 1829, 892 + xy: 1799, 1035 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -3156,7 +3156,7 @@ icerocks-icon-large index: -1 icerocks-icon-small rotate: false - xy: 1803, 840 + xy: 1825, 1035 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -3170,7 +3170,7 @@ ignarock-icon-large index: -1 ignarock-icon-small rotate: false - xy: 1803, 788 + xy: 1777, 1009 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -3191,14 +3191,14 @@ impact-reactor-icon-large index: -1 impact-reactor-icon-medium rotate: false - xy: 1311, 761 + xy: 971, 727 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 impact-reactor-icon-small rotate: false - xy: 1829, 814 + xy: 1803, 1009 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -3212,21 +3212,21 @@ incinerator-icon-large index: -1 incinerator-icon-small rotate: false - xy: 1829, 788 + xy: 1829, 1009 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 item-blast-compound-medium rotate: false - xy: 1855, 928 + xy: 620, 554 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 item-blast-compound-small rotate: false - xy: 1881, 943 + xy: 643, 656 size: 16, 16 orig: 16, 16 offset: 0, 0 @@ -3240,14 +3240,14 @@ item-blast-compound-xlarge index: -1 item-coal-medium rotate: false - xy: 1855, 902 + xy: 620, 528 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 item-coal-small rotate: false - xy: 1881, 925 + xy: 661, 674 size: 16, 16 orig: 16, 16 offset: 0, 0 @@ -3261,14 +3261,14 @@ item-coal-xlarge index: -1 item-copper-medium rotate: false - xy: 1855, 876 + xy: 77, 8 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 item-copper-small rotate: false - xy: 1881, 907 + xy: 661, 656 size: 16, 16 orig: 16, 16 offset: 0, 0 @@ -3282,14 +3282,14 @@ item-copper-xlarge index: -1 item-graphite-medium rotate: false - xy: 1855, 850 + xy: 103, 11 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 item-graphite-small rotate: false - xy: 1881, 889 + xy: 643, 638 size: 16, 16 orig: 16, 16 offset: 0, 0 @@ -3303,140 +3303,140 @@ item-graphite-xlarge index: -1 item-lead-medium rotate: false - xy: 1855, 824 + xy: 620, 502 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 item-lead-small rotate: false - xy: 1881, 871 + xy: 679, 674 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 item-lead-xlarge rotate: false - xy: 1425, 939 + xy: 1675, 1189 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 item-metaglass-medium rotate: false - xy: 1855, 798 + xy: 1515, 679 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 item-metaglass-small rotate: false - xy: 1881, 853 + xy: 679, 656 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 item-metaglass-xlarge rotate: false - xy: 1475, 989 + xy: 1425, 939 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 item-phase-fabric-medium rotate: false - xy: 1803, 762 + xy: 1514, 653 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 item-phase-fabric-small rotate: false - xy: 1881, 835 + xy: 661, 638 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 item-phase-fabric-xlarge rotate: false - xy: 1525, 1039 + xy: 1475, 989 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 item-plastanium-medium rotate: false - xy: 1829, 762 + xy: 513, 475 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 item-plastanium-small rotate: false - xy: 1881, 817 + xy: 697, 674 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 item-plastanium-xlarge rotate: false - xy: 1575, 1089 + xy: 1525, 1039 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 item-pyratite-medium rotate: false - xy: 1855, 772 + xy: 539, 472 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 item-pyratite-small rotate: false - xy: 1881, 799 + xy: 697, 656 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 item-pyratite-xlarge rotate: false - xy: 1625, 1139 + xy: 1575, 1089 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 item-sand-medium rotate: false - xy: 1855, 746 + xy: 565, 470 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 item-sand-small rotate: false - xy: 1881, 781 + xy: 679, 638 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 item-sand-xlarge rotate: false - xy: 1725, 1189 + xy: 1625, 1139 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 item-scrap-medium rotate: false - xy: 1511, 835 + xy: 591, 466 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 item-scrap-small rotate: false - xy: 1881, 763 + xy: 715, 674 size: 16, 16 orig: 16, 16 offset: 0, 0 @@ -3450,21 +3450,21 @@ item-scrap-xlarge index: -1 item-silicon-medium rotate: false - xy: 1537, 835 + xy: 617, 476 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 item-silicon-small rotate: false - xy: 1899, 1069 + xy: 715, 656 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 item-silicon-xlarge rotate: false - xy: 1667, 1139 + xy: 1717, 1189 size: 40, 40 orig: 40, 40 offset: 0, 0 @@ -3478,91 +3478,91 @@ item-source-icon-large index: -1 item-source-icon-small rotate: false - xy: 1511, 809 + xy: 513, 449 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 item-spore-pod-medium rotate: false - xy: 1537, 809 + xy: 513, 423 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 item-spore-pod-small rotate: false - xy: 1899, 1051 + xy: 697, 638 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 item-spore-pod-xlarge rotate: false - xy: 1767, 1189 + xy: 809, 897 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 item-surge-alloy-medium rotate: false - xy: 1511, 783 + xy: 539, 446 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 item-surge-alloy-small rotate: false - xy: 1899, 1033 + xy: 733, 674 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 item-surge-alloy-xlarge rotate: false - xy: 809, 897 + xy: 1759, 1189 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 item-thorium-medium rotate: false - xy: 1537, 783 + xy: 565, 444 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 item-thorium-small rotate: false - xy: 1899, 1015 + xy: 733, 656 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 item-thorium-xlarge rotate: false - xy: 1809, 1189 + xy: 1801, 1189 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 item-titanium-medium rotate: false - xy: 1510, 757 + xy: 513, 397 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 item-titanium-small rotate: false - xy: 1899, 997 + xy: 715, 638 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 item-titanium-xlarge rotate: false - xy: 1851, 1189 + xy: 1843, 1189 size: 40, 40 orig: 40, 40 offset: 0, 0 @@ -3576,7 +3576,7 @@ item-void-icon-large index: -1 item-void-icon-small rotate: false - xy: 1510, 731 + xy: 539, 420 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -3590,14 +3590,14 @@ javelin-ship-pad-icon-large index: -1 javelin-ship-pad-icon-medium rotate: false - xy: 902, 693 + xy: 1140, 693 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 javelin-ship-pad-icon-small rotate: false - xy: 1536, 757 + xy: 513, 371 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -3611,7 +3611,7 @@ junction-icon-large index: -1 junction-icon-small rotate: false - xy: 1536, 731 + xy: 539, 394 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -3625,14 +3625,14 @@ kiln-icon-large index: -1 kiln-icon-medium rotate: false - xy: 970, 693 + xy: 1208, 693 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 kiln-icon-small rotate: false - xy: 1510, 705 + xy: 565, 418 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -3660,14 +3660,14 @@ lancer-icon-large index: -1 lancer-icon-medium rotate: false - xy: 1004, 693 + xy: 1242, 693 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 lancer-icon-small rotate: false - xy: 1536, 705 + xy: 591, 440 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -3688,14 +3688,14 @@ laser-drill-icon-large index: -1 laser-drill-icon-medium rotate: false - xy: 1038, 693 + xy: 1276, 693 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 laser-drill-icon-small rotate: false - xy: 1509, 679 + xy: 617, 450 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -3709,14 +3709,14 @@ launch-pad-icon-large index: -1 launch-pad-icon-medium rotate: false - xy: 1072, 693 + xy: 1310, 693 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 launch-pad-icon-small rotate: false - xy: 1509, 653 + xy: 513, 345 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -3730,14 +3730,14 @@ liquid-junction-icon-large index: -1 liquid-junction-icon-small rotate: false - xy: 1535, 679 + xy: 539, 368 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 liquid-router-icon-full rotate: false - xy: 1276, 693 + xy: 936, 659 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -3751,7 +3751,7 @@ liquid-router-icon-large index: -1 liquid-router-icon-small rotate: false - xy: 1535, 653 + xy: 565, 392 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -3765,7 +3765,7 @@ liquid-source-icon-large index: -1 liquid-source-icon-small rotate: false - xy: 1563, 817 + xy: 591, 414 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -3786,14 +3786,14 @@ liquid-tank-icon-large index: -1 liquid-tank-icon-medium rotate: false - xy: 834, 665 + xy: 1106, 659 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 liquid-tank-icon-small rotate: false - xy: 1563, 791 + xy: 617, 424 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -3807,7 +3807,7 @@ magmarock-icon-large index: -1 magmarock-icon-small rotate: false - xy: 1589, 799 + xy: 513, 319 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -3835,14 +3835,14 @@ mass-driver-icon-large index: -1 mass-driver-icon-medium rotate: false - xy: 902, 659 + xy: 1174, 659 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 mass-driver-icon-small rotate: false - xy: 1615, 799 + xy: 539, 342 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -3919,14 +3919,14 @@ mechanical-drill-icon-large index: -1 mechanical-drill-icon-medium rotate: false - xy: 936, 659 + xy: 1208, 659 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 mechanical-drill-icon-small rotate: false - xy: 1641, 799 + xy: 565, 366 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -3940,7 +3940,7 @@ mechanical-pump-icon-large index: -1 mechanical-pump-icon-small rotate: false - xy: 1563, 765 + xy: 591, 388 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -3968,14 +3968,14 @@ meltdown-icon-large index: -1 meltdown-icon-medium rotate: false - xy: 1004, 659 + xy: 1276, 659 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 meltdown-icon-small rotate: false - xy: 1589, 773 + xy: 617, 398 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -3989,7 +3989,7 @@ melter-icon-large index: -1 melter-icon-small rotate: false - xy: 1615, 773 + xy: 513, 293 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -4003,14 +4003,14 @@ mend-projector-icon-large index: -1 mend-projector-icon-medium rotate: false - xy: 1072, 659 + xy: 1344, 659 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 mend-projector-icon-small rotate: false - xy: 1641, 773 + xy: 539, 316 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -4024,7 +4024,7 @@ metal-floor-2-icon-large index: -1 metal-floor-2-icon-small rotate: false - xy: 1562, 739 + xy: 565, 340 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -4038,7 +4038,7 @@ metal-floor-3-icon-large index: -1 metal-floor-3-icon-small rotate: false - xy: 1562, 713 + xy: 591, 362 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -4052,7 +4052,7 @@ metal-floor-5-icon-large index: -1 metal-floor-5-icon-small rotate: false - xy: 1667, 773 + xy: 617, 372 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -4066,7 +4066,7 @@ metal-floor-damaged-icon-large index: -1 metal-floor-damaged-icon-small rotate: false - xy: 1693, 773 + xy: 513, 267 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -4080,7 +4080,7 @@ metal-floor-icon-large index: -1 metal-floor-icon-small rotate: false - xy: 1589, 747 + xy: 539, 290 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -4092,23 +4092,9 @@ moss-icon-large orig: 48, 48 offset: 0, 0 index: -1 -stained-stone-yellow-icon-large - rotate: false - xy: 775, 1189 - size: 48, 48 - orig: 48, 48 - offset: 0, 0 - index: -1 moss-icon-small rotate: false - xy: 1615, 747 - size: 24, 24 - orig: 24, 24 - offset: 0, 0 - index: -1 -stained-stone-yellow-icon-small - rotate: false - xy: 1615, 747 + xy: 565, 314 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -4122,14 +4108,14 @@ multi-press-icon-large index: -1 multi-press-icon-medium rotate: false - xy: 1106, 659 + xy: 1505, 947 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 multi-press-icon-small rotate: false - xy: 1641, 747 + xy: 591, 336 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -4150,14 +4136,14 @@ oil-extractor-icon-large index: -1 oil-extractor-icon-medium rotate: false - xy: 1140, 659 + xy: 1539, 947 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 oil-extractor-icon-small rotate: false - xy: 1667, 747 + xy: 617, 346 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -4171,28 +4157,28 @@ omega-mech-pad-icon-large index: -1 omega-mech-pad-icon-medium rotate: false - xy: 1174, 659 + xy: 1383, 863 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 omega-mech-pad-icon-small rotate: false - xy: 1693, 747 + xy: 513, 241 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 ore-coal-icon-full rotate: false - xy: 1208, 659 + xy: 1383, 829 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-coal-icon-medium rotate: false - xy: 1208, 659 + xy: 1383, 829 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -4206,21 +4192,21 @@ ore-coal-icon-large index: -1 ore-coal-icon-small rotate: false - xy: 1588, 721 + xy: 539, 264 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 ore-copper-icon-full rotate: false - xy: 1242, 659 + xy: 1383, 795 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-copper-icon-medium rotate: false - xy: 1242, 659 + xy: 1383, 795 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -4234,21 +4220,21 @@ ore-copper-icon-large index: -1 ore-copper-icon-small rotate: false - xy: 1614, 721 + xy: 565, 288 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 ore-lead-icon-full rotate: false - xy: 1276, 659 + xy: 1379, 761 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-lead-icon-medium rotate: false - xy: 1276, 659 + xy: 1379, 761 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -4262,21 +4248,21 @@ ore-lead-icon-large index: -1 ore-lead-icon-small rotate: false - xy: 1640, 721 + xy: 591, 310 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 ore-scrap-icon-full rotate: false - xy: 1310, 659 + xy: 1379, 727 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-scrap-icon-medium rotate: false - xy: 1310, 659 + xy: 1379, 727 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -4290,21 +4276,21 @@ ore-scrap-icon-large index: -1 ore-scrap-icon-small rotate: false - xy: 1666, 721 + xy: 617, 320 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 ore-thorium-icon-full rotate: false - xy: 1344, 659 + xy: 1378, 693 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-thorium-icon-medium rotate: false - xy: 1344, 659 + xy: 1378, 693 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -4318,7 +4304,7 @@ ore-thorium-icon-large index: -1 ore-thorium-icon-small rotate: false - xy: 1692, 721 + xy: 513, 215 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -4346,7 +4332,7 @@ ore-titanium-icon-large index: -1 ore-titanium-icon-small rotate: false - xy: 1562, 687 + xy: 539, 238 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -4360,14 +4346,14 @@ overdrive-projector-icon-large index: -1 overdrive-projector-icon-medium rotate: false - xy: 1969, 1151 + xy: 1417, 867 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 overdrive-projector-icon-small rotate: false - xy: 1588, 695 + xy: 565, 262 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -4381,7 +4367,7 @@ overflow-gate-icon-large index: -1 overflow-gate-icon-small rotate: false - xy: 1614, 695 + xy: 591, 284 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -4402,14 +4388,14 @@ phantom-factory-icon-large index: -1 phantom-factory-icon-medium rotate: false - xy: 1417, 863 + xy: 1417, 799 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 phantom-factory-icon-small rotate: false - xy: 1640, 695 + xy: 617, 294 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -4423,7 +4409,7 @@ phase-conduit-icon-large index: -1 phase-conduit-icon-small rotate: false - xy: 1666, 695 + xy: 513, 189 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -4437,7 +4423,7 @@ phase-conveyor-icon-large index: -1 phase-conveyor-icon-small rotate: false - xy: 1692, 695 + xy: 539, 212 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -4451,7 +4437,7 @@ phase-wall-icon-large index: -1 phase-wall-icon-small rotate: false - xy: 1561, 661 + xy: 565, 236 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -4465,14 +4451,14 @@ phase-wall-large-icon-large index: -1 phase-wall-large-icon-medium rotate: false - xy: 1517, 997 + xy: 1811, 1155 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 phase-wall-large-icon-small rotate: false - xy: 1588, 669 + xy: 591, 258 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -4493,28 +4479,28 @@ phase-weaver-icon-large index: -1 phase-weaver-icon-medium rotate: false - xy: 1567, 1047 + xy: 1845, 1155 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 phase-weaver-icon-small rotate: false - xy: 1614, 669 + xy: 617, 268 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 pine-icon-medium rotate: false - xy: 1617, 1097 + xy: 1879, 1139 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 pine-icon-small rotate: false - xy: 1640, 669 + xy: 513, 163 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -4528,14 +4514,14 @@ plastanium-compressor-icon-large index: -1 plastanium-compressor-icon-medium rotate: false - xy: 1651, 1105 + xy: 1913, 1130 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 plastanium-compressor-icon-small rotate: false - xy: 1666, 669 + xy: 539, 186 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -4556,14 +4542,14 @@ pneumatic-drill-icon-large index: -1 pneumatic-drill-icon-medium rotate: false - xy: 1685, 1105 + xy: 1947, 1130 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 pneumatic-drill-icon-small rotate: false - xy: 1692, 669 + xy: 565, 210 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -4577,7 +4563,7 @@ power-node-icon-large index: -1 power-node-icon-small rotate: false - xy: 1561, 635 + xy: 591, 232 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -4591,14 +4577,14 @@ power-node-large-icon-large index: -1 power-node-large-icon-medium rotate: false - xy: 1853, 1126 + xy: 2015, 1151 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 power-node-large-icon-small rotate: false - xy: 1587, 643 + xy: 617, 242 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -4612,7 +4598,7 @@ power-source-icon-large index: -1 power-source-icon-small rotate: false - xy: 1613, 643 + xy: 513, 137 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -4626,14 +4612,14 @@ power-void-icon-large index: -1 power-void-icon-small rotate: false - xy: 1639, 643 + xy: 539, 160 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 pulse-conduit-icon-full rotate: false - xy: 1955, 1117 + xy: 1601, 1021 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -4647,14 +4633,14 @@ pulse-conduit-icon-large index: -1 pulse-conduit-icon-small rotate: false - xy: 1665, 643 + xy: 565, 184 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 pulverizer-icon-full rotate: false - xy: 1651, 1071 + xy: 1939, 1096 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -4668,7 +4654,7 @@ pulverizer-icon-large index: -1 pulverizer-icon-small rotate: false - xy: 1691, 643 + xy: 591, 206 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -4682,28 +4668,28 @@ pyratite-mixer-icon-large index: -1 pyratite-mixer-icon-medium rotate: false - xy: 1719, 1075 + xy: 2007, 1083 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 pyratite-mixer-icon-small rotate: false - xy: 1587, 617 + xy: 617, 216 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 repair-point rotate: false - xy: 1535, 963 + xy: 1635, 1021 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 repair-point-icon-full rotate: false - xy: 1501, 887 + xy: 1685, 1087 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -4717,7 +4703,7 @@ repair-point-icon-large index: -1 repair-point-icon-small rotate: false - xy: 1613, 617 + xy: 513, 111 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -4738,14 +4724,14 @@ revenant-factory-icon-large index: -1 revenant-factory-icon-medium rotate: false - xy: 1535, 895 + xy: 1719, 1087 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 revenant-factory-icon-small rotate: false - xy: 1639, 617 + xy: 539, 134 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -4773,14 +4759,14 @@ ripple-icon-large index: -1 ripple-icon-medium rotate: false - xy: 1585, 1013 + xy: 1753, 1087 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ripple-icon-small rotate: false - xy: 1665, 617 + xy: 565, 158 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -4794,7 +4780,7 @@ rocks-icon-large index: -1 rocks-icon-small rotate: false - xy: 1691, 617 + xy: 591, 180 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -4808,14 +4794,14 @@ rotary-pump-icon-large index: -1 rotary-pump-icon-medium rotate: false - xy: 1619, 1029 + xy: 1787, 1087 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 rotary-pump-icon-small rotate: false - xy: 1509, 627 + xy: 617, 190 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -4829,7 +4815,7 @@ router-icon-large index: -1 router-icon-small rotate: false - xy: 1535, 627 + xy: 513, 85 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -4843,14 +4829,14 @@ rtg-generator-icon-large index: -1 rtg-generator-icon-medium rotate: false - xy: 1687, 1037 + xy: 1563, 987 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 rtg-generator-icon-small rotate: false - xy: 1561, 609 + xy: 539, 108 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -4864,7 +4850,7 @@ salt-icon-large index: -1 salt-icon-small rotate: false - xy: 1587, 591 + xy: 565, 132 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -4892,14 +4878,14 @@ salvo-icon-large index: -1 salvo-icon-medium rotate: false - xy: 1619, 995 + xy: 1631, 987 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 salvo-icon-small rotate: false - xy: 1613, 591 + xy: 591, 154 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -4913,7 +4899,7 @@ sand-icon-large index: -1 sand-icon-small rotate: false - xy: 1639, 591 + xy: 617, 164 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -4927,7 +4913,7 @@ sand-water-icon-large index: -1 sand-water-icon-small rotate: false - xy: 1665, 591 + xy: 513, 59 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -4941,7 +4927,7 @@ sandrocks-icon-large index: -1 sandrocks-icon-small rotate: false - xy: 1691, 591 + xy: 539, 82 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -4955,14 +4941,14 @@ scrap-wall-gigantic-icon-large index: -1 scrap-wall-gigantic-icon-medium rotate: false - xy: 1569, 945 + xy: 1675, 953 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 scrap-wall-gigantic-icon-small rotate: false - xy: 1773, 745 + xy: 565, 106 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -4976,14 +4962,14 @@ scrap-wall-huge-icon-large index: -1 scrap-wall-huge-icon-medium rotate: false - xy: 1569, 911 + xy: 1573, 919 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 scrap-wall-huge-icon-small rotate: false - xy: 1799, 736 + xy: 591, 128 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -4997,7 +4983,7 @@ scrap-wall-icon-large index: -1 scrap-wall-icon-small rotate: false - xy: 1825, 736 + xy: 617, 138 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -5011,14 +4997,14 @@ scrap-wall-large-icon-large index: -1 scrap-wall-large-icon-medium rotate: false - xy: 1619, 961 + xy: 1607, 919 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 scrap-wall-large-icon-small rotate: false - xy: 1851, 720 + xy: 513, 33 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -5032,140 +5018,182 @@ separator-icon-large index: -1 separator-icon-medium rotate: false - xy: 1687, 969 + xy: 1675, 919 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 separator-icon-small rotate: false - xy: 1877, 720 + xy: 591, 102 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 -shock-mine-icon-large +shale-boulder-icon-large rotate: false xy: 1225, 1181 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 -shock-mine-icon-small +shale-boulder-icon-small rotate: false - xy: 1719, 743 + xy: 617, 112 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 -silicon-smelter-icon-large +shale-icon-large + rotate: false + xy: 1075, 1031 + size: 48, 48 + orig: 48, 48 + offset: 0, 0 + index: -1 +shale-icon-small + rotate: false + xy: 565, 43 + size: 24, 24 + orig: 24, 24 + offset: 0, 0 + index: -1 +shalerocks-icon-large rotate: false xy: 1125, 1081 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 -silicon-smelter-icon-medium +shalerocks-icon-small rotate: false - xy: 1569, 877 - size: 32, 32 - orig: 32, 32 - offset: 0, 0 - index: -1 -silicon-smelter-icon-small - rotate: false - xy: 1745, 743 + xy: 591, 76 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 -snow-icon-large +shock-mine-icon-large rotate: false xy: 1175, 1131 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 -snow-icon-small +shock-mine-icon-small rotate: false - xy: 1718, 717 + xy: 617, 86 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 -snowrocks-icon-large - rotate: false - xy: 1275, 1181 - size: 48, 48 - orig: 48, 48 - offset: 0, 0 - index: -1 -snowrocks-icon-small - rotate: false - xy: 1718, 691 - size: 24, 24 - orig: 24, 24 - offset: 0, 0 - index: -1 -solar-panel-icon-large +silicon-smelter-icon-large rotate: false xy: 1075, 981 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 -solar-panel-icon-small +silicon-smelter-icon-medium rotate: false - xy: 1744, 717 + xy: 449, 462 + size: 32, 32 + orig: 32, 32 + offset: 0, 0 + index: -1 +silicon-smelter-icon-small + rotate: false + xy: 591, 50 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 -solar-panel-large-icon-large +snow-icon-large rotate: false xy: 1125, 1031 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 -solar-panel-large-icon-medium +snow-icon-small rotate: false - xy: 1637, 927 - size: 32, 32 - orig: 32, 32 - offset: 0, 0 - index: -1 -solar-panel-large-icon-small - rotate: false - xy: 1744, 691 + xy: 617, 60 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 -sorter-icon-large +snowrocks-icon-large rotate: false xy: 1175, 1081 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 -sorter-icon-small +snowrocks-icon-small rotate: false - xy: 1743, 665 + xy: 513, 7 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 -spawn-icon-large +solar-panel-icon-large rotate: false xy: 1225, 1131 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 +solar-panel-icon-small + rotate: false + xy: 539, 14 + size: 24, 24 + orig: 24, 24 + offset: 0, 0 + index: -1 +solar-panel-large-icon-large + rotate: false + xy: 1325, 1181 + size: 48, 48 + orig: 48, 48 + offset: 0, 0 + index: -1 +solar-panel-large-icon-medium + rotate: false + xy: 445, 360 + size: 32, 32 + orig: 32, 32 + offset: 0, 0 + index: -1 +solar-panel-large-icon-small + rotate: false + xy: 565, 17 + size: 24, 24 + orig: 24, 24 + offset: 0, 0 + index: -1 +sorter-icon-large + rotate: false + xy: 1075, 931 + size: 48, 48 + orig: 48, 48 + offset: 0, 0 + index: -1 +sorter-icon-small + rotate: false + xy: 591, 24 + size: 24, 24 + orig: 24, 24 + offset: 0, 0 + index: -1 +spawn-icon-large + rotate: false + xy: 1125, 981 + size: 48, 48 + orig: 48, 48 + offset: 0, 0 + index: -1 spawn-icon-small rotate: false - xy: 1743, 639 + xy: 617, 34 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -5186,21 +5214,21 @@ spectre-icon-full index: -1 spectre-icon-large rotate: false - xy: 1325, 1181 + xy: 1175, 1031 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 spectre-icon-medium rotate: false - xy: 1603, 859 + xy: 445, 224 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 spectre-icon-small rotate: false - xy: 1743, 613 + xy: 617, 8 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -5214,56 +5242,70 @@ spirit-factory-icon-full index: -1 spirit-factory-icon-large rotate: false - xy: 1125, 981 + xy: 1275, 1131 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 spirit-factory-icon-medium rotate: false - xy: 1637, 859 + xy: 445, 190 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 spirit-factory-icon-small rotate: false - xy: 1743, 587 + xy: 1553, 791 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 spore-cluster-icon-large rotate: false - xy: 1175, 1031 + xy: 1375, 1181 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 spore-cluster-icon-medium rotate: false - xy: 1671, 867 + xy: 445, 156 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 spore-cluster-icon-small rotate: false - xy: 1770, 717 + xy: 1579, 791 + size: 24, 24 + orig: 24, 24 + offset: 0, 0 + index: -1 +spore-moss-icon-large + rotate: false + xy: 1125, 931 + size: 48, 48 + orig: 48, 48 + offset: 0, 0 + index: -1 +spore-moss-icon-small + rotate: false + xy: 1605, 791 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 spore-pine-icon-medium rotate: false - xy: 1569, 843 + xy: 445, 122 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 spore-pine-icon-small rotate: false - xy: 1770, 691 + xy: 1549, 765 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -5277,161 +5319,91 @@ spore-press-icon-full index: -1 spore-press-icon-large rotate: false - xy: 1225, 1081 + xy: 1175, 981 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 spore-press-icon-medium rotate: false - xy: 1705, 935 + xy: 445, 88 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 spore-press-icon-small rotate: false - xy: 1769, 665 - size: 24, 24 - orig: 24, 24 - offset: 0, 0 - index: -1 -stained-boulder-icon-large - rotate: false - xy: 1275, 1131 - size: 48, 48 - orig: 48, 48 - offset: 0, 0 - index: -1 -stained-boulder-icon-small - rotate: false - xy: 1769, 639 - size: 24, 24 - orig: 24, 24 - offset: 0, 0 - index: -1 -stained-rocks-icon-large - rotate: false - xy: 1375, 1181 - size: 48, 48 - orig: 48, 48 - offset: 0, 0 - index: -1 -stained-rocks-icon-small - rotate: false - xy: 1769, 613 - size: 24, 24 - orig: 24, 24 - offset: 0, 0 - index: -1 -stained-rocks-red-icon-large - rotate: false - xy: 1125, 931 - size: 48, 48 - orig: 48, 48 - offset: 0, 0 - index: -1 -stained-rocks-red-icon-small - rotate: false - xy: 1769, 587 - size: 24, 24 - orig: 24, 24 - offset: 0, 0 - index: -1 -stained-rocks-yellow-icon-large - rotate: false - xy: 1175, 981 - size: 48, 48 - orig: 48, 48 - offset: 0, 0 - index: -1 -stained-rocks-yellow-icon-small - rotate: false - xy: 1796, 710 - size: 24, 24 - orig: 24, 24 - offset: 0, 0 - index: -1 -stained-stone-red-icon-large - rotate: false - xy: 1225, 1031 - size: 48, 48 - orig: 48, 48 - offset: 0, 0 - index: -1 -stained-stone-red-icon-small - rotate: false - xy: 1822, 710 + xy: 1575, 765 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 stone-icon-large rotate: false - xy: 1275, 1081 + xy: 1225, 1031 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 stone-icon-small rotate: false - xy: 1796, 684 + xy: 1601, 765 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 surge-tower-icon-large rotate: false - xy: 1325, 1131 + xy: 1275, 1081 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 surge-tower-icon-medium rotate: false - xy: 1705, 901 + xy: 1413, 761 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 surge-tower-icon-small rotate: false - xy: 1822, 684 + xy: 1545, 739 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 surge-wall-icon-large rotate: false - xy: 1425, 1181 + xy: 1325, 1131 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 surge-wall-icon-small rotate: false - xy: 1795, 658 + xy: 1571, 739 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 surge-wall-large-icon-large rotate: false - xy: 1175, 931 + xy: 1425, 1181 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 surge-wall-large-icon-medium rotate: false - xy: 1603, 825 + xy: 1412, 693 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 surge-wall-large-icon-small rotate: false - xy: 1795, 632 + xy: 1597, 739 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -5452,175 +5424,175 @@ swarmer-icon-full index: -1 swarmer-icon-large rotate: false - xy: 1275, 1031 + xy: 1225, 981 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 swarmer-icon-medium rotate: false - xy: 1637, 825 + xy: 1412, 659 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 swarmer-icon-small rotate: false - xy: 1821, 658 + xy: 1544, 713 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 tar-icon-large rotate: false - xy: 1325, 1081 + xy: 1275, 1031 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 tar-icon-small rotate: false - xy: 1795, 606 + xy: 1570, 713 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 tau-mech-pad-icon-large rotate: false - xy: 1225, 931 + xy: 1475, 1181 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 tau-mech-pad-icon-medium rotate: false - xy: 1671, 833 + xy: 1447, 765 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 tau-mech-pad-icon-small rotate: false - xy: 1821, 632 + xy: 1596, 713 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 thermal-generator-icon-large rotate: false - xy: 1275, 981 + xy: 1225, 931 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 thermal-generator-icon-medium rotate: false - xy: 1705, 833 + xy: 1447, 731 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 thermal-generator-icon-small rotate: false - xy: 1821, 606 + xy: 1544, 687 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 thermal-pump-icon-large rotate: false - xy: 1325, 1031 + xy: 1275, 981 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 thermal-pump-icon-medium rotate: false - xy: 1739, 939 + xy: 1505, 913 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 thermal-pump-icon-small rotate: false - xy: 1848, 694 + xy: 1570, 687 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 thorium-reactor-icon-large rotate: false - xy: 1375, 1081 + xy: 1325, 1031 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 thorium-reactor-icon-medium rotate: false - xy: 1739, 905 + xy: 1539, 913 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 thorium-reactor-icon-small rotate: false - xy: 1874, 694 + xy: 1596, 687 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 thorium-wall-icon-large rotate: false - xy: 1425, 1131 + xy: 1375, 1081 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 thorium-wall-icon-small rotate: false - xy: 1795, 580 + xy: 1541, 661 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 thorium-wall-large-icon-large rotate: false - xy: 1525, 1181 + xy: 1425, 1131 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 thorium-wall-large-icon-medium rotate: false - xy: 1739, 837 + xy: 1607, 885 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 thorium-wall-large-icon-small rotate: false - xy: 1821, 580 + xy: 1567, 661 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 thruster-icon-large rotate: false - xy: 1275, 931 + xy: 1525, 1181 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 thruster-icon-medium rotate: false - xy: 1671, 799 + xy: 1641, 885 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 thruster-icon-small rotate: false - xy: 1848, 668 + xy: 1593, 661 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -5634,112 +5606,112 @@ titan-factory-icon-full index: -1 titan-factory-icon-large rotate: false - xy: 1325, 981 + xy: 1275, 931 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 titan-factory-icon-medium rotate: false - xy: 1705, 799 + xy: 1675, 885 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 titan-factory-icon-small rotate: false - xy: 1874, 668 + xy: 1540, 635 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 titanium-conveyor-icon-large rotate: false - xy: 1375, 1031 + xy: 1325, 981 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 titanium-conveyor-icon-small rotate: false - xy: 1847, 642 + xy: 1566, 635 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 titanium-wall-icon-large rotate: false - xy: 1425, 1081 + xy: 1375, 1031 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 titanium-wall-icon-small rotate: false - xy: 1847, 616 + xy: 1592, 635 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 titanium-wall-large-icon-large rotate: false - xy: 1475, 1131 + xy: 1425, 1081 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 titanium-wall-large-icon-medium rotate: false - xy: 479, 394 + xy: 1485, 837 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 titanium-wall-large-icon-small rotate: false - xy: 1873, 642 + xy: 1709, 983 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 trident-ship-pad-icon-large rotate: false - xy: 1575, 1181 + xy: 1475, 1131 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 trident-ship-pad-icon-medium rotate: false - xy: 479, 326 + xy: 1519, 879 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 trident-ship-pad-icon-small rotate: false - xy: 1847, 590 + xy: 1709, 957 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 turbine-generator-icon-large rotate: false - xy: 1325, 931 + xy: 1575, 1181 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 turbine-generator-icon-medium rotate: false - xy: 479, 292 + xy: 1519, 845 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 turbine-generator-icon-small rotate: false - xy: 1873, 616 + xy: 1735, 983 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -5753,14 +5725,14 @@ unit-icon-chaos-array index: -1 unit-icon-crawler rotate: false - xy: 1375, 981 + xy: 1325, 931 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 unit-icon-dagger rotate: false - xy: 1425, 1031 + xy: 1375, 981 size: 48, 48 orig: 48, 48 offset: 0, 0 @@ -5795,35 +5767,35 @@ unit-icon-titan index: -1 unloader-icon-large rotate: false - xy: 1475, 1081 + xy: 1425, 1031 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 unloader-icon-small rotate: false - xy: 1873, 590 + xy: 1709, 931 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 vault-icon-large rotate: false - xy: 1525, 1131 + xy: 1475, 1081 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 vault-icon-medium rotate: false - xy: 479, 224 + xy: 1553, 851 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 vault-icon-small rotate: false - xy: 1847, 564 + xy: 1735, 957 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -5837,35 +5809,35 @@ water-extractor-icon-full index: -1 water-extractor-icon-large rotate: false - xy: 1625, 1181 + xy: 1525, 1131 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 water-extractor-icon-medium rotate: false - xy: 479, 190 + xy: 1553, 817 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 water-extractor-icon-small rotate: false - xy: 1873, 564 + xy: 1761, 983 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 water-icon-large rotate: false - xy: 1375, 931 + xy: 1625, 1181 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 water-icon-small rotate: false - xy: 1900, 694 + xy: 1709, 905 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -5886,63 +5858,63 @@ wave-icon-full index: -1 wave-icon-large rotate: false - xy: 1425, 981 + xy: 1375, 931 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 wave-icon-medium rotate: false - xy: 479, 156 + xy: 1587, 851 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 wave-icon-small rotate: false - xy: 1900, 668 + xy: 1735, 931 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 white-tree-dead-icon-large rotate: false - xy: 1475, 1031 + xy: 1425, 981 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 white-tree-dead-icon-medium rotate: false - xy: 479, 122 + xy: 1587, 817 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 white-tree-dead-icon-small rotate: false - xy: 1899, 642 + xy: 1761, 957 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 white-tree-icon-large rotate: false - xy: 1525, 1081 + xy: 1475, 1031 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 white-tree-icon-medium rotate: false - xy: 479, 88 + xy: 1621, 851 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 white-tree-icon-small rotate: false - xy: 1899, 616 + xy: 1787, 983 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -5956,168 +5928,168 @@ wraith-factory-icon-full index: -1 wraith-factory-icon-large rotate: false - xy: 1675, 1181 + xy: 1575, 1131 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 wraith-factory-icon-medium rotate: false - xy: 479, 54 + xy: 1621, 817 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 wraith-factory-icon-small rotate: false - xy: 1899, 590 + xy: 1735, 905 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 item-biomatter rotate: false - xy: 1379, 761 + xy: 1039, 727 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 item-blast-compound rotate: false - xy: 869, 727 + xy: 1073, 727 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 item-coal rotate: false - xy: 903, 727 + xy: 1107, 727 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 item-copper rotate: false - xy: 937, 727 + xy: 1141, 727 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 item-graphite rotate: false - xy: 971, 727 + xy: 1175, 727 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 item-lead rotate: false - xy: 1005, 727 + xy: 1209, 727 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 item-metaglass rotate: false - xy: 1039, 727 + xy: 1243, 727 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 item-phase-fabric rotate: false - xy: 1073, 727 + xy: 1277, 727 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 item-plastanium rotate: false - xy: 1107, 727 + xy: 1311, 727 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 item-pyratite rotate: false - xy: 1141, 727 + xy: 1345, 727 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 item-sand rotate: false - xy: 1175, 727 + xy: 834, 699 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 item-scrap rotate: false - xy: 1209, 727 + xy: 868, 693 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 item-silicon rotate: false - xy: 1243, 727 + xy: 902, 693 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 item-spore-pod rotate: false - xy: 1311, 727 + xy: 970, 693 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 item-surge-alloy rotate: false - xy: 1345, 727 + xy: 1004, 693 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 item-thorium rotate: false - xy: 1379, 727 + xy: 1038, 693 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 item-titanium rotate: false - xy: 834, 699 + xy: 1072, 693 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 liquid-cryofluid rotate: false - xy: 1140, 693 + xy: 800, 674 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 liquid-oil rotate: false - xy: 1208, 693 + xy: 868, 659 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 liquid-slag rotate: false - xy: 1378, 693 + xy: 1038, 659 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 liquid-water rotate: false - xy: 868, 659 + xy: 1140, 659 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -6201,14 +6173,14 @@ tau-mech index: -1 tau-mech-base rotate: false - xy: 1375, 1131 + xy: 1325, 1081 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 tau-mech-leg rotate: false - xy: 1475, 1181 + xy: 1375, 1131 size: 48, 48 orig: 48, 48 offset: 0, 0 @@ -6250,7 +6222,7 @@ trident-ship index: -1 blank rotate: false - xy: 87, 34 + xy: 539, 524 size: 1, 1 orig: 1, 1 offset: 0, 0 @@ -6264,7 +6236,7 @@ circle index: -1 clear rotate: false - xy: 1848, 733 + xy: 591, 519 size: 1, 1 orig: 1, 1 offset: 0, 0 @@ -6278,7 +6250,7 @@ shape-3 index: -1 bar rotate: false - xy: 1481, 709 + xy: 513, 590 size: 27, 36 split: 9, 9, 9, 9 orig: 27, 36 @@ -6286,7 +6258,7 @@ bar index: -1 bar-top rotate: false - xy: 1481, 747 + xy: 1515, 705 size: 27, 36 split: 9, 10, 9, 10 orig: 27, 36 @@ -6326,7 +6298,7 @@ button-edge-1 index: -1 button-edge-2 rotate: false - xy: 1893, 1202 + xy: 1885, 1202 size: 36, 27 split: 12, 12, 12, 12 orig: 36, 27 @@ -6342,7 +6314,7 @@ button-edge-3 index: -1 button-edge-4 rotate: false - xy: 1931, 1202 + xy: 1923, 1202 size: 36, 27 split: 12, 12, 12, 12 orig: 36, 27 @@ -6382,7 +6354,7 @@ button-right-over index: -1 button-select rotate: false - xy: 453, 572 + xy: 542, 602 size: 24, 24 split: 4, 4, 4, 4 orig: 24, 24 @@ -6390,42 +6362,42 @@ button-select index: -1 check-off rotate: false - xy: 1753, 1077 + xy: 1655, 811 size: 28, 32 orig: 28, 32 offset: 0, 0 index: -1 check-on rotate: false - xy: 1755, 1043 + xy: 1685, 811 size: 28, 32 orig: 28, 32 offset: 0, 0 index: -1 check-on-over rotate: false - xy: 1755, 1009 + xy: 1519, 777 size: 28, 32 orig: 28, 32 offset: 0, 0 index: -1 check-over rotate: false - xy: 1755, 975 + xy: 1515, 743 size: 28, 32 orig: 28, 32 offset: 0, 0 index: -1 clear rotate: false - xy: 1719, 769 + xy: 599, 1420 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 content-background rotate: false - xy: 1893, 1173 + xy: 1885, 1173 size: 36, 27 split: 12, 12, 12, 12 orig: 36, 27 @@ -6463,21 +6435,21 @@ discord-banner index: -1 empty-sector rotate: false - xy: 937, 761 + xy: 1107, 761 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 icon-crafting rotate: false - xy: 299, 1218 + xy: 445, 70 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-defense rotate: false - xy: 445, 70 + xy: 1553, 895 size: 16, 16 orig: 16, 16 offset: 0, 0 @@ -6491,49 +6463,49 @@ icon-distribution index: -1 icon-effect rotate: false - xy: 479, 728 + xy: 625, 682 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-liquid rotate: false - xy: 2030, 1885 + xy: 1761, 921 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-power rotate: false - xy: 1481, 895 + xy: 1745, 887 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-production rotate: false - xy: 1903, 1087 + xy: 1735, 869 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-turret rotate: false - xy: 1881, 1051 + xy: 129, 7 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-units rotate: false - xy: 1881, 1015 + xy: 165, 7 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-upgrade rotate: false - xy: 1881, 979 + xy: 201, 7 size: 16, 16 orig: 16, 16 offset: 0, 0 @@ -6575,56 +6547,56 @@ icon-admin-small index: -1 icon-areaDelete rotate: false - xy: 599, 1420 + xy: 609, 900 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-arrow rotate: false - xy: 1785, 978 + xy: 777, 792 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-arrow-16 rotate: false - xy: 1785, 978 + xy: 777, 792 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-arrow-down rotate: false - xy: 609, 900 + xy: 1087, 1679 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-arrow-left rotate: false - xy: 2037, 1173 + xy: 568, 1949 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-arrow-right rotate: false - xy: 2037, 1161 + xy: 575, 882 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-arrow-up rotate: false - xy: 1087, 1679 + xy: 1961, 1219 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-back rotate: false - xy: 777, 792 + xy: 321, 64 size: 16, 16 orig: 16, 16 offset: 0, 0 @@ -6638,56 +6610,56 @@ icon-ban index: -1 icon-break rotate: false - xy: 321, 64 + xy: 649, 1356 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-cancel rotate: false - xy: 649, 1356 + xy: 295, 721 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-cancel-2 rotate: false - xy: 1829, 866 + xy: 1699, 1009 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 icon-chat rotate: false - xy: 568, 1949 + xy: 1669, 1023 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-check rotate: false - xy: 295, 721 + xy: 564, 1771 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-check-2 rotate: false - xy: 1803, 814 + xy: 1725, 1009 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 icon-copy rotate: false - xy: 564, 1771 + xy: 299, 1218 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-cursor rotate: false - xy: 575, 882 + xy: 329, 2 size: 10, 10 orig: 10, 10 offset: 0, 0 @@ -6701,14 +6673,14 @@ icon-database index: -1 icon-database-small rotate: false - xy: 1955, 1152 + xy: 989, 1663 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-dev-builds rotate: false - xy: 1603, 963 + xy: 1855, 1105 size: 14, 14 orig: 14, 14 offset: 0, 0 @@ -6750,56 +6722,56 @@ icon-egg index: -1 icon-elevation rotate: false - xy: 1862, 1108 + xy: 1631, 799 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-eraser rotate: false - xy: 1511, 869 + xy: 1709, 887 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-exit rotate: false - xy: 1601, 1073 + xy: 1651, 1123 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-file rotate: false - xy: 1719, 781 + xy: 1761, 939 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-file-image rotate: false - xy: 1718, 673 + xy: 1787, 965 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-file-text rotate: false - xy: 1601, 1057 + xy: 565, 1 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-fill rotate: false - xy: 1899, 572 + xy: 1813, 991 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-floppy rotate: false - xy: 1569, 989 + xy: 581, 1 size: 14, 14 orig: 14, 14 offset: 0, 0 @@ -6834,168 +6806,168 @@ icon-generated index: -1 icon-github rotate: false - xy: 303, 1386 + xy: 1761, 905 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-google-play rotate: false - xy: 1881, 747 + xy: 303, 1386 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-grid rotate: false - xy: 427, 755 + xy: 625, 664 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-hold rotate: false - xy: 329, 2 + xy: 694, 610 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-holdDelete rotate: false - xy: 1589, 831 + xy: 646, 546 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-home rotate: false - xy: 1899, 981 + xy: 1855, 1089 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-host rotate: false - xy: 1899, 965 + xy: 751, 676 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-info rotate: false - xy: 1899, 949 + xy: 733, 640 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-itch.io rotate: false - xy: 1899, 933 + xy: 1871, 1089 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-item rotate: false - xy: 989, 1663 + xy: 662, 562 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-items-none rotate: false - xy: 219, 15 + xy: 1699, 999 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 icon-line rotate: false - xy: 2030, 1903 + xy: 1727, 887 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-link rotate: false - xy: 1899, 917 + xy: 751, 660 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-liquid-small rotate: false - xy: 1933, 1036 + xy: 678, 578 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-load rotate: false - xy: 1899, 901 + xy: 767, 676 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-load-image rotate: false - xy: 2030, 1867 + xy: 1831, 991 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-load-map rotate: false - xy: 2030, 1849 + xy: 625, 646 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-loading rotate: false - xy: 129, 7 + xy: 625, 628 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-locked rotate: false - xy: 147, 7 + xy: 427, 755 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-logic rotate: false - xy: 1917, 1004 + xy: 568, 1937 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-map rotate: false - xy: 1899, 885 + xy: 1887, 1089 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-menu rotate: false - xy: 568, 1937 + xy: 587, 882 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-menu-large rotate: false - xy: 165, 7 + xy: 427, 737 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-missing rotate: false - xy: 587, 882 + xy: 1961, 1207 size: 10, 10 orig: 10, 10 offset: 0, 0 @@ -7009,308 +6981,308 @@ icon-mission-background index: -1 icon-mission-battle rotate: false - xy: 341, 2 + xy: 1681, 1023 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-mission-defense rotate: false - xy: 1933, 1024 + xy: 341, 2 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-mission-done rotate: false - xy: 568, 1925 + xy: 694, 598 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-none rotate: false - xy: 353, 2 + xy: 706, 610 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-paste rotate: false - xy: 183, 7 + xy: 427, 719 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-pause rotate: false - xy: 365, 2 + xy: 646, 534 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-pencil rotate: false - xy: 201, 7 + xy: 1717, 869 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-pencil-small rotate: false - xy: 1899, 869 + xy: 767, 660 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-pick rotate: false - xy: 453, 702 + xy: 1717, 851 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-play rotate: false - xy: 377, 2 + xy: 568, 1925 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-play-2 rotate: false - xy: 1899, 853 + xy: 783, 676 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-play-custom rotate: false - xy: 1899, 837 + xy: 783, 660 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-players rotate: false - xy: 389, 2 + xy: 1961, 1195 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-power-requirement rotate: false - xy: 1243, 761 + xy: 903, 727 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 icon-power-small rotate: false - xy: 401, 2 + xy: 353, 2 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-quit rotate: false - xy: 1899, 821 + xy: 1763, 889 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-redo rotate: false - xy: 1863, 1090 + xy: 1735, 851 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-refresh rotate: false - xy: 1899, 805 + xy: 643, 622 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-rename rotate: false - xy: 1899, 789 + xy: 659, 622 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-resize rotate: false - xy: 1863, 1072 + xy: 2030, 1903 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-rotate rotate: false - xy: 1899, 773 + xy: 646, 606 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-rotate-arrow rotate: false - xy: 299, 1202 + xy: 675, 622 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-rotate-left rotate: false - xy: 299, 1370 + xy: 646, 590 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-rotate-right rotate: false - xy: 1899, 757 + xy: 662, 606 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-save rotate: false - xy: 1921, 1080 + xy: 691, 622 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-save-image rotate: false - xy: 1863, 1054 + xy: 2030, 1885 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-save-map rotate: false - xy: 1863, 1036 + xy: 2030, 1867 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-settings rotate: false - xy: 413, 2 + xy: 706, 598 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-spray rotate: false - xy: 1863, 1018 + xy: 2030, 1849 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-terrain rotate: false - xy: 1863, 1000 + xy: 445, 728 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-tools rotate: false - xy: 1937, 1080 + xy: 646, 574 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-touch rotate: false - xy: 425, 2 + xy: 646, 522 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-touchDelete rotate: false - xy: 437, 2 + xy: 1961, 1183 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-trash rotate: false - xy: 1917, 1064 + xy: 662, 590 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-trash-16 rotate: false - xy: 1881, 1087 + xy: 463, 728 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-tree rotate: false - xy: 1881, 1069 + xy: 481, 728 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-tree-locked rotate: false - xy: 1277, 761 + xy: 937, 727 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 icon-trello rotate: false - xy: 1917, 1048 + xy: 678, 606 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-tutorial rotate: false - xy: 1933, 1064 + xy: 707, 622 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-undo rotate: false - xy: 1881, 1033 + xy: 147, 7 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-unlocked rotate: false - xy: 1881, 997 + xy: 183, 7 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-unlocks rotate: false - xy: 1917, 1032 + xy: 646, 558 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-wiki rotate: false - xy: 1933, 1048 + xy: 662, 574 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-zone rotate: false - xy: 1829, 840 + xy: 1751, 1009 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -7324,14 +7296,14 @@ icon-zone-locked index: -1 icon-zoom rotate: false - xy: 1881, 961 + xy: 643, 674 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-zoom-small rotate: false - xy: 1917, 1016 + xy: 678, 590 size: 14, 14 orig: 14, 14 offset: 0, 0 @@ -7345,7 +7317,7 @@ info-banner index: -1 inventory rotate: false - xy: 1855, 954 + xy: 620, 580 size: 24, 40 split: 10, 10, 10, 14 orig: 24, 40 @@ -7376,7 +7348,7 @@ pane-2 index: -1 scroll rotate: false - xy: 1717, 590 + xy: 565, 69 size: 24, 35 split: 10, 10, 6, 5 orig: 24, 35 @@ -7400,7 +7372,7 @@ scroll-knob-horizontal-black index: -1 scroll-knob-vertical-black rotate: false - xy: 1717, 627 + xy: 539, 40 size: 24, 40 split: 10, 10, 6, 10 orig: 24, 40 @@ -7408,56 +7380,56 @@ scroll-knob-vertical-black index: -1 sector-select rotate: false - xy: 1653, 969 + xy: 1641, 919 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 selection rotate: false - xy: 1785, 975 + xy: 617, 515 size: 1, 1 orig: 1, 1 offset: 0, 0 index: -1 slider rotate: false - xy: 497, 736 + xy: 1541, 695 size: 1, 8 orig: 1, 8 offset: 0, 0 index: -1 slider-knob rotate: false - xy: 479, 14 + xy: 1655, 845 size: 29, 38 orig: 29, 38 offset: 0, 0 index: -1 slider-knob-down rotate: false - xy: 1753, 1111 + xy: 1686, 845 size: 29, 38 orig: 29, 38 offset: 0, 0 index: -1 slider-knob-over rotate: false - xy: 1753, 1111 + xy: 1686, 845 size: 29, 38 orig: 29, 38 offset: 0, 0 index: -1 slider-vertical rotate: false - xy: 1861, 1160 + xy: 87, 34 size: 8, 1 orig: 8, 1 offset: 0, 0 index: -1 underline rotate: false - xy: 1823, 1160 + xy: 1517, 981 size: 36, 27 split: 12, 12, 12, 12 orig: 36, 27 @@ -7465,7 +7437,7 @@ underline index: -1 underline-2 rotate: false - xy: 1785, 1160 + xy: 1525, 1010 size: 36, 27 split: 12, 12, 12, 12 orig: 36, 27 @@ -7480,7 +7452,7 @@ white index: -1 window-empty rotate: false - xy: 1480, 646 + xy: 513, 527 size: 27, 61 split: 8, 8, 44, 11 orig: 27, 61 @@ -7663,7 +7635,7 @@ revenant index: -1 spirit rotate: false - xy: 1075, 931 + xy: 1225, 1081 size: 48, 48 orig: 48, 48 offset: 0, 0 @@ -7684,7 +7656,7 @@ titan-leg index: -1 wraith rotate: false - xy: 1575, 1131 + xy: 1525, 1081 size: 48, 48 orig: 48, 48 offset: 0, 0 @@ -7789,14 +7761,14 @@ revenant-missiles-equip index: -1 shockgun-equip rotate: false - xy: 1075, 1031 + xy: 1275, 1181 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 swarmer-equip rotate: false - xy: 1225, 981 + xy: 1175, 931 size: 48, 48 orig: 48, 48 offset: 0, 0 @@ -8465,13 +8437,6 @@ editor-moss1 orig: 32, 32 offset: 0, 0 index: -1 -editor-stained-stone-yellow1 - rotate: false - xy: 1929, 205 - size: 32, 32 - orig: 32, 32 - offset: 0, 0 - index: -1 moss-icon-editor rotate: false xy: 1929, 205 @@ -8479,13 +8444,6 @@ moss-icon-editor orig: 32, 32 offset: 0, 0 index: -1 -stained-stone-yellow-icon-editor - rotate: false - xy: 1929, 205 - size: 32, 32 - orig: 32, 32 - offset: 0, 0 - index: -1 editor-moss2 rotate: false xy: 1963, 205 @@ -8682,79 +8640,121 @@ editor-sand3 orig: 32, 32 offset: 0, 0 index: -1 -editor-snow1 +editor-shale1 rotate: false xy: 1917, 35 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 -snow-icon-editor +shale-icon-editor rotate: false xy: 1917, 35 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 -editor-snow2 +editor-shale2 rotate: false xy: 1951, 35 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 -editor-snow3 +editor-shale3 rotate: false xy: 1849, 1 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 -editor-stained-stone-red1 +editor-snow1 rotate: false xy: 1883, 1 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 -stained-stone-red-icon-editor +snow-icon-editor rotate: false xy: 1883, 1 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 -editor-stone3 +editor-snow2 rotate: false xy: 1917, 1 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 -editor-tar +editor-snow3 rotate: false xy: 1951, 1 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 +editor-spore-moss1 + rotate: false + xy: 1347, 73 + size: 32, 32 + orig: 32, 32 + offset: 0, 0 + index: -1 +spore-moss-icon-editor + rotate: false + xy: 1347, 73 + size: 32, 32 + orig: 32, 32 + offset: 0, 0 + index: -1 +editor-spore-moss2 + rotate: false + xy: 1381, 73 + size: 32, 32 + orig: 32, 32 + offset: 0, 0 + index: -1 +editor-spore-moss3 + rotate: false + xy: 1415, 73 + size: 32, 32 + orig: 32, 32 + offset: 0, 0 + index: -1 +editor-stone3 + rotate: false + xy: 1449, 73 + size: 32, 32 + orig: 32, 32 + offset: 0, 0 + index: -1 +editor-tar + rotate: false + xy: 1483, 73 + size: 32, 32 + orig: 32, 32 + offset: 0, 0 + index: -1 tar-icon-editor rotate: false - xy: 1951, 1 + xy: 1483, 73 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 editor-water rotate: false - xy: 1347, 73 + xy: 1517, 73 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 water-icon-editor rotate: false - xy: 1347, 73 + xy: 1517, 73 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -8803,14 +8803,14 @@ graphite-press-icon-editor index: -1 hail-icon-editor rotate: false - xy: 1381, 73 + xy: 1551, 73 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 icerocks-icon-editor rotate: false - xy: 1415, 73 + xy: 1585, 73 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -8824,21 +8824,21 @@ impact-reactor-icon-editor index: -1 incinerator-icon-editor rotate: false - xy: 1449, 73 + xy: 1619, 73 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 item-source-icon-editor rotate: false - xy: 1483, 73 + xy: 1653, 73 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 item-void-icon-editor rotate: false - xy: 1517, 73 + xy: 1991, 171 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -8852,7 +8852,7 @@ javelin-ship-pad-icon-editor index: -1 junction-icon-editor rotate: false - xy: 1551, 73 + xy: 1991, 137 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -8887,21 +8887,21 @@ launch-pad-icon-editor index: -1 liquid-junction-icon-editor rotate: false - xy: 1585, 73 + xy: 1991, 103 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 liquid-router-icon-editor rotate: false - xy: 1619, 73 + xy: 1991, 69 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 liquid-source-icon-editor rotate: false - xy: 1653, 73 + xy: 1985, 35 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -8929,7 +8929,7 @@ mechanical-drill-icon-editor index: -1 mechanical-pump-icon-editor rotate: false - xy: 1991, 171 + xy: 1985, 1 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -8943,7 +8943,7 @@ meltdown-icon-editor index: -1 melter-icon-editor rotate: false - xy: 1991, 137 + xy: 1013, 43 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -8985,7 +8985,7 @@ overdrive-projector-icon-editor index: -1 overflow-gate-icon-editor rotate: false - xy: 1991, 103 + xy: 1047, 43 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -8999,21 +8999,21 @@ phantom-factory-icon-editor index: -1 phase-conduit-icon-editor rotate: false - xy: 1991, 69 + xy: 1081, 41 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 phase-conveyor-icon-editor rotate: false - xy: 1985, 35 + xy: 1115, 41 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 phase-wall-icon-editor rotate: false - xy: 1985, 1 + xy: 1149, 41 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -9055,7 +9055,7 @@ pneumatic-drill-icon-editor index: -1 power-node-icon-editor rotate: false - xy: 1013, 43 + xy: 1183, 41 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -9069,28 +9069,28 @@ power-node-large-icon-editor index: -1 power-source-icon-editor rotate: false - xy: 1047, 43 + xy: 1217, 41 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 power-void-icon-editor rotate: false - xy: 1081, 41 + xy: 1251, 41 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 pulse-conduit-icon-editor rotate: false - xy: 1115, 41 + xy: 1285, 41 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 pulverizer-icon-editor rotate: false - xy: 1149, 41 + xy: 1319, 39 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -9104,7 +9104,7 @@ pyratite-mixer-icon-editor index: -1 repair-point-icon-editor rotate: false - xy: 1183, 41 + xy: 1353, 39 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -9125,7 +9125,7 @@ ripple-icon-editor index: -1 rocks-icon-editor rotate: false - xy: 1217, 41 + xy: 1387, 39 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -9139,7 +9139,7 @@ rotary-pump-icon-editor index: -1 router-icon-editor rotate: false - xy: 1251, 41 + xy: 1421, 39 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -9160,7 +9160,7 @@ salvo-icon-editor index: -1 sandrocks-icon-editor rotate: false - xy: 1285, 41 + xy: 1455, 39 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -9181,7 +9181,7 @@ scrap-wall-huge-icon-editor index: -1 scrap-wall-icon-editor rotate: false - xy: 1319, 39 + xy: 1489, 39 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -9200,9 +9200,23 @@ separator-icon-editor orig: 64, 64 offset: 0, 0 index: -1 +shale-boulder-icon-editor + rotate: false + xy: 1523, 39 + size: 32, 32 + orig: 32, 32 + offset: 0, 0 + index: -1 +shalerocks-icon-editor + rotate: false + xy: 1557, 39 + size: 32, 32 + orig: 32, 32 + offset: 0, 0 + index: -1 shock-mine-icon-editor rotate: false - xy: 1353, 39 + xy: 1591, 39 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -9216,14 +9230,14 @@ silicon-smelter-icon-editor index: -1 snowrocks-icon-editor rotate: false - xy: 1387, 39 + xy: 1625, 39 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 solar-panel-icon-editor rotate: false - xy: 1421, 39 + xy: 1659, 39 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -9237,14 +9251,14 @@ solar-panel-large-icon-editor index: -1 sorter-icon-editor rotate: false - xy: 1455, 39 + xy: 1997, 265 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 spawn-icon-editor rotate: false - xy: 1489, 39 + xy: 1997, 231 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -9284,34 +9298,6 @@ spore-press-icon-editor orig: 64, 64 offset: 0, 0 index: -1 -stained-boulder-icon-editor - rotate: false - xy: 1523, 39 - size: 32, 32 - orig: 32, 32 - offset: 0, 0 - index: -1 -stained-rocks-icon-editor - rotate: false - xy: 1557, 39 - size: 32, 32 - orig: 32, 32 - offset: 0, 0 - index: -1 -stained-rocks-red-icon-editor - rotate: false - xy: 1591, 39 - size: 32, 32 - orig: 32, 32 - offset: 0, 0 - index: -1 -stained-rocks-yellow-icon-editor - rotate: false - xy: 1625, 39 - size: 32, 32 - orig: 32, 32 - offset: 0, 0 - index: -1 surge-tower-icon-editor rotate: false xy: 1923, 273 @@ -9321,7 +9307,7 @@ surge-tower-icon-editor index: -1 surge-wall-icon-editor rotate: false - xy: 1659, 39 + xy: 619, 13 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -9370,7 +9356,7 @@ thorium-reactor-icon-editor index: -1 thorium-wall-icon-editor rotate: false - xy: 1997, 265 + xy: 653, 13 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -9398,14 +9384,14 @@ titan-factory-icon-editor index: -1 titanium-conveyor-icon-editor rotate: false - xy: 1997, 231 + xy: 687, 13 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 titanium-wall-icon-editor rotate: false - xy: 619, 13 + xy: 721, 13 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -9433,7 +9419,7 @@ turbine-generator-icon-editor index: -1 unloader-icon-editor rotate: false - xy: 653, 13 + xy: 755, 13 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -9482,1105 +9468,1070 @@ wraith-factory-icon-editor index: -1 sprites3.png -size: 2048,512 +size: 2048,1024 format: RGBA8888 filter: Nearest,Nearest repeat: none char1 rotate: false - xy: 2003, 479 + xy: 1549, 793 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 char2 rotate: false - xy: 581, 107 + xy: 373, 401 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 char3 rotate: false - xy: 1805, 231 + xy: 117, 51 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 cliffs1 rotate: false - xy: 249, 59 + xy: 1773, 873 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 coal1 rotate: false - xy: 283, 59 + xy: 1889, 989 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 coal2 rotate: false - xy: 1805, 197 + xy: 721, 499 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 coal3 rotate: false - xy: 317, 59 + xy: 1011, 597 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 copper1 rotate: false - xy: 1805, 163 + xy: 1301, 695 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 copper2 rotate: false - xy: 351, 59 + xy: 1583, 793 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 copper3 rotate: false - xy: 1805, 129 + xy: 407, 401 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 craters1 rotate: false - xy: 385, 59 + xy: 151, 51 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 craters2 rotate: false - xy: 419, 59 + xy: 1773, 839 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 craters3 rotate: false - xy: 453, 59 + xy: 1923, 989 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 craters4 rotate: false - xy: 487, 59 + xy: 755, 499 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 craters5 rotate: false - xy: 521, 59 + xy: 1045, 597 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 stone1 rotate: false - xy: 521, 59 + xy: 1045, 597 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 craters6 rotate: false - xy: 2003, 445 + xy: 1335, 695 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 stone2 rotate: false - xy: 2003, 445 + xy: 1335, 695 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 deepwater rotate: false - xy: 555, 59 + xy: 1617, 793 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 deepwater-edge rotate: false - xy: 1, 93 + xy: 323, 925 size: 288, 96 orig: 288, 96 offset: 0, 0 index: -1 dunerocks-large rotate: false - xy: 1, 27 + xy: 1, 19 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 dunerocks1 rotate: false - xy: 1937, 371 + xy: 441, 401 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 dunerocks2 rotate: false - xy: 283, 25 + xy: 185, 51 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 edge-stencil-blocky rotate: false - xy: 645, 415 + xy: 1, 281 size: 288, 96 orig: 288, 96 offset: 0, 0 index: -1 edge-stencil-smooth rotate: false - xy: 291, 93 + xy: 323, 827 size: 288, 96 orig: 288, 96 offset: 0, 0 index: -1 grass-edge rotate: false - xy: 645, 317 + xy: 613, 925 size: 288, 96 orig: 288, 96 offset: 0, 0 index: -1 grass1 rotate: false - xy: 317, 25 + xy: 1957, 989 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 grass2 rotate: false - xy: 351, 25 + xy: 789, 499 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 grass3 rotate: false - xy: 385, 25 + xy: 1079, 597 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 holostone-edge rotate: false - xy: 935, 415 + xy: 1, 183 size: 288, 96 orig: 288, 96 offset: 0, 0 index: -1 holostone1 rotate: false - xy: 419, 25 + xy: 1369, 695 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 holostone2 rotate: false - xy: 453, 25 + xy: 1651, 793 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 holostone3 rotate: false - xy: 487, 25 + xy: 475, 401 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 hotrock1 rotate: false - xy: 521, 25 + xy: 219, 51 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 hotrock2 rotate: false - xy: 555, 25 + xy: 1991, 989 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 hotrock3 rotate: false - xy: 1921, 337 + xy: 823, 499 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ice-edge rotate: false - xy: 645, 219 + xy: 323, 729 size: 288, 96 orig: 288, 96 offset: 0, 0 index: -1 ice-snow-edge rotate: false - xy: 935, 317 + xy: 613, 827 size: 288, 96 orig: 288, 96 offset: 0, 0 index: -1 ice-snow1 rotate: false - xy: 1839, 163 + xy: 509, 401 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ice-snow2 rotate: false - xy: 1839, 129 + xy: 253, 51 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ice-snow3 rotate: false - xy: 1955, 337 + xy: 857, 499 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ice1 rotate: false - xy: 1855, 281 + xy: 1113, 597 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ice2 rotate: false - xy: 1839, 231 + xy: 1403, 695 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ice3 rotate: false - xy: 1839, 197 + xy: 1685, 793 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 icerocks-large rotate: false - xy: 1805, 447 + xy: 1773, 957 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 icerocks1 rotate: false - xy: 1971, 371 + xy: 1147, 597 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 icerocks2 rotate: false - xy: 1889, 297 + xy: 1437, 695 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ignarock-edge rotate: false - xy: 1225, 415 + xy: 903, 925 size: 288, 96 orig: 288, 96 offset: 0, 0 index: -1 ignarock1 rotate: false - xy: 1923, 303 + xy: 1719, 793 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ignarock2 rotate: false - xy: 1957, 303 + xy: 543, 401 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ignarock3 rotate: false - xy: 1989, 337 + xy: 577, 401 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 lead1 rotate: false - xy: 1991, 303 + xy: 291, 345 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 lead2 rotate: false - xy: 1889, 263 + xy: 291, 311 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 lead3 rotate: false - xy: 1923, 269 + xy: 291, 277 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 magmarock1 rotate: false - xy: 1957, 269 + xy: 291, 243 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 magmarock2 rotate: false - xy: 1991, 269 + xy: 291, 209 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 magmarock3 rotate: false - xy: 1873, 229 + xy: 291, 175 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 metal-floor rotate: false - xy: 1873, 195 + xy: 291, 141 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 metal-floor-damaged5 rotate: false - xy: 1873, 195 + xy: 291, 141 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 metal-floor-2 rotate: false - xy: 1873, 161 + xy: 291, 107 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 +metal-floor-2-edge + rotate: false + xy: 1, 85 + size: 288, 96 + orig: 288, 96 + offset: 0, 0 + index: -1 metal-floor-3 rotate: false - xy: 1873, 127 + xy: 613, 433 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 +metal-floor-3-edge + rotate: false + xy: 323, 631 + size: 288, 96 + orig: 288, 96 + offset: 0, 0 + index: -1 metal-floor-5 rotate: false - xy: 1907, 229 + xy: 903, 531 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 +metal-floor-5-edge + rotate: false + xy: 613, 729 + size: 288, 96 + orig: 288, 96 + offset: 0, 0 + index: -1 +metal-floor-damaged-edge + rotate: false + xy: 903, 827 + size: 288, 96 + orig: 288, 96 + offset: 0, 0 + index: -1 metal-floor-damaged1 rotate: false - xy: 1907, 195 + xy: 1193, 629 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 metal-floor-damaged2 rotate: false - xy: 1907, 161 + xy: 1483, 727 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 metal-floor-damaged3 rotate: false - xy: 1907, 127 + xy: 1549, 759 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 metal-floor-damaged4 rotate: false - xy: 1941, 235 + xy: 1583, 759 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 metal-floor-damaged6 rotate: false - xy: 1941, 201 + xy: 1617, 759 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 metal-floor-edge rotate: false - xy: 935, 219 + xy: 1193, 925 size: 288, 96 orig: 288, 96 offset: 0, 0 index: -1 moss-edge rotate: false - xy: 1225, 317 - size: 288, 96 - orig: 288, 96 - offset: 0, 0 - index: -1 -stained-stone-yellow-edge - rotate: false - xy: 1225, 317 + xy: 323, 533 size: 288, 96 orig: 288, 96 offset: 0, 0 index: -1 moss1 rotate: false - xy: 1975, 235 - size: 32, 32 - orig: 32, 32 - offset: 0, 0 - index: -1 -stained-stone-yellow1 - rotate: false - xy: 1975, 235 + xy: 1651, 759 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 moss2 rotate: false - xy: 1941, 167 + xy: 1685, 759 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 moss3 rotate: false - xy: 1975, 201 + xy: 1719, 759 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-coal1 rotate: false - xy: 1941, 133 + xy: 647, 433 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-coal2 rotate: false - xy: 1975, 167 + xy: 937, 531 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-coal3 rotate: false - xy: 1975, 133 + xy: 1227, 629 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-copper1 rotate: false - xy: 2009, 235 + xy: 611, 399 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-copper2 rotate: false - xy: 2009, 201 + xy: 645, 399 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-copper3 rotate: false - xy: 2009, 167 + xy: 325, 351 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-lead1 rotate: false - xy: 2009, 133 + xy: 325, 317 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-lead2 rotate: false - xy: 589, 73 + xy: 325, 283 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-lead3 rotate: false - xy: 589, 39 + xy: 325, 249 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-scrap1 rotate: false - xy: 589, 5 + xy: 325, 215 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-scrap2 rotate: false - xy: 1979, 411 + xy: 325, 181 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-scrap3 rotate: false - xy: 2013, 411 + xy: 325, 147 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-thorium1 rotate: false - xy: 2005, 377 + xy: 325, 113 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-thorium2 rotate: false - xy: 1805, 95 + xy: 291, 73 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-thorium3 rotate: false - xy: 1839, 95 + xy: 325, 79 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-titanium1 rotate: false - xy: 1873, 93 + xy: 1753, 793 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-titanium2 rotate: false - xy: 1907, 93 + xy: 1753, 759 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-titanium3 rotate: false - xy: 1941, 99 + xy: 891, 497 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 pine rotate: false - xy: 581, 141 + xy: 323, 385 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 rock1 rotate: false - xy: 199, 43 + xy: 67, 35 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 rock2 rotate: false - xy: 1805, 265 + xy: 1773, 907 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 rocks-large rotate: false - xy: 67, 27 + xy: 613, 467 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 rocks1 rotate: false - xy: 1975, 99 + xy: 925, 497 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 rocks2 rotate: false - xy: 2009, 99 + xy: 1181, 595 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 salt rotate: false - xy: 1941, 65 + xy: 1215, 595 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 salt-edge rotate: false - xy: 1515, 415 + xy: 613, 631 size: 288, 96 orig: 288, 96 offset: 0, 0 index: -1 sand-edge rotate: false - xy: 1225, 219 + xy: 903, 729 size: 288, 96 orig: 288, 96 offset: 0, 0 index: -1 sand-water rotate: false - xy: 623, 27 + xy: 1823, 923 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 sand-water-edge rotate: false - xy: 1515, 317 + xy: 1193, 827 size: 288, 96 orig: 288, 96 offset: 0, 0 index: -1 sand1 rotate: false - xy: 1975, 65 + xy: 1471, 693 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 sand2 rotate: false - xy: 2009, 65 + xy: 287, 39 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 sand3 rotate: false - xy: 623, 61 + xy: 67, 1 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 sandrocks-large rotate: false - xy: 1805, 381 + xy: 903, 565 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 sandrocks1 rotate: false - xy: 657, 87 + xy: 1807, 873 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 sandrocks2 rotate: false - xy: 691, 87 + xy: 1807, 839 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 scrap1 rotate: false - xy: 657, 53 + xy: 1787, 805 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 scrap2 rotate: false - xy: 725, 87 + xy: 1787, 771 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 scrap3 rotate: false - xy: 691, 53 + xy: 1821, 805 + size: 32, 32 + orig: 32, 32 + offset: 0, 0 + index: -1 +shale-boulder1 + rotate: false + xy: 1957, 955 + size: 32, 32 + orig: 32, 32 + offset: 0, 0 + index: -1 +shale-boulder2 + rotate: false + xy: 1991, 955 + size: 32, 32 + orig: 32, 32 + offset: 0, 0 + index: -1 +shale-edge + rotate: false + xy: 1483, 925 + size: 288, 96 + orig: 288, 96 + offset: 0, 0 + index: -1 +shale1 + rotate: false + xy: 1821, 771 + size: 32, 32 + orig: 32, 32 + offset: 0, 0 + index: -1 +shale2 + rotate: false + xy: 1889, 955 + size: 32, 32 + orig: 32, 32 + offset: 0, 0 + index: -1 +shale3 + rotate: false + xy: 1923, 955 + size: 32, 32 + orig: 32, 32 + offset: 0, 0 + index: -1 +shalerocks-large + rotate: false + xy: 1193, 663 + size: 64, 64 + orig: 64, 64 + offset: 0, 0 + index: -1 +shalerocks1 + rotate: false + xy: 373, 367 + size: 32, 32 + orig: 32, 32 + offset: 0, 0 + index: -1 +shalerocks2 + rotate: false + xy: 407, 367 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 snow-edge rotate: false - xy: 1515, 219 + xy: 323, 435 size: 288, 96 orig: 288, 96 offset: 0, 0 index: -1 snow1 rotate: false - xy: 759, 87 + xy: 441, 367 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 snow2 rotate: false - xy: 725, 53 + xy: 475, 367 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 snow3 rotate: false - xy: 793, 87 + xy: 509, 367 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 snowrocks-large rotate: false - xy: 1871, 447 + xy: 1483, 761 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 snowrocks1 rotate: false - xy: 759, 53 + xy: 543, 367 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 snowrocks2 rotate: false - xy: 827, 87 + xy: 577, 367 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 spore-cluster1 rotate: false - xy: 199, 1 + xy: 679, 491 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 spore-cluster2 rotate: false - xy: 241, 1 + xy: 969, 589 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 spore-cluster3 rotate: false - xy: 1937, 405 + xy: 1259, 687 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 -spore-pine +spore-moss-edge rotate: false - xy: 1871, 331 - size: 48, 48 - orig: 48, 48 - offset: 0, 0 - index: -1 -stained-boulder1 - rotate: false - xy: 793, 53 - size: 32, 32 - orig: 32, 32 - offset: 0, 0 - index: -1 -stained-boulder2 - rotate: false - xy: 861, 87 - size: 32, 32 - orig: 32, 32 - offset: 0, 0 - index: -1 -stained-rocks-large - rotate: false - xy: 133, 27 - size: 64, 64 - orig: 64, 64 - offset: 0, 0 - index: -1 -stained-rocks-red-large - rotate: false - xy: 1805, 315 - size: 64, 64 - orig: 64, 64 - offset: 0, 0 - index: -1 -stained-rocks-red1 - rotate: false - xy: 861, 53 - size: 32, 32 - orig: 32, 32 - offset: 0, 0 - index: -1 -stained-rocks-red2 - rotate: false - xy: 929, 87 - size: 32, 32 - orig: 32, 32 - offset: 0, 0 - index: -1 -stained-rocks-yellow-large - rotate: false - xy: 1871, 381 - size: 64, 64 - orig: 64, 64 - offset: 0, 0 - index: -1 -stained-rocks-yellow1 - rotate: false - xy: 895, 53 - size: 32, 32 - orig: 32, 32 - offset: 0, 0 - index: -1 -stained-rocks-yellow2 - rotate: false - xy: 963, 87 - size: 32, 32 - orig: 32, 32 - offset: 0, 0 - index: -1 -stained-rocks1 - rotate: false - xy: 827, 53 - size: 32, 32 - orig: 32, 32 - offset: 0, 0 - index: -1 -stained-rocks2 - rotate: false - xy: 895, 87 - size: 32, 32 - orig: 32, 32 - offset: 0, 0 - index: -1 -stained-stone-red-edge - rotate: false - xy: 645, 121 + xy: 613, 533 size: 288, 96 orig: 288, 96 offset: 0, 0 index: -1 -stained-stone-red1 +spore-moss1 rotate: false - xy: 929, 53 + xy: 611, 365 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 -stained-stone-red3 +spore-moss2 rotate: false - xy: 929, 53 + xy: 645, 365 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 -stained-stone-red2 +spore-moss3 rotate: false - xy: 997, 87 + xy: 359, 333 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 -stained-stone-yellow2 +spore-pine rotate: false - xy: 963, 53 - size: 32, 32 - orig: 32, 32 - offset: 0, 0 - index: -1 -stained-stone-yellow3 - rotate: false - xy: 1031, 87 - size: 32, 32 - orig: 32, 32 - offset: 0, 0 - index: -1 -stainedrocks-large - rotate: false - xy: 1937, 447 - size: 64, 64 - orig: 64, 64 - offset: 0, 0 - index: -1 -stainedrocks1 - rotate: false - xy: 997, 53 - size: 32, 32 - orig: 32, 32 - offset: 0, 0 - index: -1 -stainedrocks2 - rotate: false - xy: 1065, 87 - size: 32, 32 - orig: 32, 32 + xy: 1839, 973 + size: 48, 48 + orig: 48, 48 offset: 0, 0 index: -1 stone-edge rotate: false - xy: 935, 121 + xy: 903, 631 size: 288, 96 orig: 288, 96 offset: 0, 0 index: -1 stone3 rotate: false - xy: 1031, 53 + xy: 359, 299 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 tar rotate: false - xy: 1099, 87 + xy: 393, 333 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 tar-edge rotate: false - xy: 1225, 121 + xy: 1193, 729 size: 288, 96 orig: 288, 96 offset: 0, 0 index: -1 thorium1 rotate: false - xy: 1065, 53 + xy: 359, 265 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 thorium2 rotate: false - xy: 1133, 87 + xy: 393, 299 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 thorium3 rotate: false - xy: 1099, 53 + xy: 427, 333 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 titanium1 rotate: false - xy: 1167, 87 + xy: 359, 231 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 titanium2 rotate: false - xy: 1133, 53 + xy: 393, 265 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 titanium3 rotate: false - xy: 1201, 87 + xy: 427, 299 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 water rotate: false - xy: 1167, 53 + xy: 461, 333 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 water-edge rotate: false - xy: 1515, 121 + xy: 1483, 827 size: 288, 96 orig: 288, 96 offset: 0, 0 index: -1 white-tree rotate: false - xy: 1, 191 + xy: 1, 701 size: 320, 320 orig: 320, 320 offset: 0, 0 index: -1 white-tree-dead rotate: false - xy: 323, 191 + xy: 1, 379 size: 320, 320 orig: 320, 320 offset: 0, 0 diff --git a/core/assets/sprites/sprites.png b/core/assets/sprites/sprites.png index 9f82caa9fe..55ffc26d33 100644 Binary files a/core/assets/sprites/sprites.png and b/core/assets/sprites/sprites.png differ diff --git a/core/assets/sprites/sprites2.png b/core/assets/sprites/sprites2.png index 13bd277106..57cbfabda1 100644 Binary files a/core/assets/sprites/sprites2.png and b/core/assets/sprites/sprites2.png differ diff --git a/core/assets/sprites/sprites3.png b/core/assets/sprites/sprites3.png index 82c7ccf278..8102b5b089 100644 Binary files a/core/assets/sprites/sprites3.png and b/core/assets/sprites/sprites3.png differ diff --git a/core/src/io/anuke/mindustry/ai/WaveSpawner.java b/core/src/io/anuke/mindustry/ai/WaveSpawner.java index c32006b4de..c04ac6e725 100644 --- a/core/src/io/anuke/mindustry/ai/WaveSpawner.java +++ b/core/src/io/anuke/mindustry/ai/WaveSpawner.java @@ -23,7 +23,7 @@ import java.io.IOException; import static io.anuke.mindustry.Vars.*; public class WaveSpawner{ - private static final float shockwaveBase = 380f, shockwaveRand = 50f, maxShockwaveDst = shockwaveBase + shockwaveRand; + private static final float shockwaveBase = 380f, shockwaveRand = 0f, maxShockwaveDst = shockwaveBase + shockwaveRand; private Array groups; private Array flySpawns = new Array<>(); private Array groundSpawns = new Array<>(); diff --git a/core/src/io/anuke/mindustry/content/Blocks.java b/core/src/io/anuke/mindustry/content/Blocks.java index bef48546c4..97611cf371 100644 --- a/core/src/io/anuke/mindustry/content/Blocks.java +++ b/core/src/io/anuke/mindustry/content/Blocks.java @@ -26,6 +26,7 @@ import io.anuke.mindustry.world.blocks.units.RepairPoint; import io.anuke.mindustry.world.blocks.units.UnitFactory; import io.anuke.mindustry.world.consumers.ConsumeItemFilter; import io.anuke.mindustry.world.consumers.ConsumeLiquidFilter; +import io.anuke.mindustry.world.meta.Attribute; import static io.anuke.mindustry.Vars.state; import static io.anuke.mindustry.Vars.world; @@ -36,7 +37,7 @@ public class Blocks implements ContentList{ //environment air, part, spawn, deepwater, water, tar, stone, craters, charr, sand, ice, snow, holostone, rocks, icerocks, cliffs, sporePine, pine, whiteTree, whiteTreeDead, sporeCluster, - iceSnow, sandWater, duneRocks, sandRocks, stainedRocks, moss, stainedRocksRed, stainedStoneRed, stainedRocksYellow, stainedStoneYellow, stainedBoulder, grass, salt, + iceSnow, sandWater, duneRocks, sandRocks, moss, sporeMoss, shale, shaleRocks, shaleBoulder, grass, salt, metalFloor, metalFloorDamaged, metalFloor2, metalFloor3, metalFloor5, ignarock, magmarock, hotrock, snowrocks, //ores @@ -190,15 +191,18 @@ public class Blocks implements ContentList{ iceSnow = new Floor("ice-snow"){{ variants = 3; + attributes.set(Attribute.water, 0.3f); }}; snow = new Floor("snow"){{ + attributes.set(Attribute.water, 0.2f); }}; ice = new Floor("ice"){{ - //TODO fix + //TODO fix drag/speed dragMultiplier = 1f; speedMultiplier = 1f; + attributes.set(Attribute.water, 0.4f); }}; cliffs = new StaticWall("cliffs"){{ @@ -244,32 +248,27 @@ public class Blocks implements ContentList{ variants = 3; }}; - stainedRocks = new StaticWall("stained-rocks"){{ + shale = new Floor("shale"){{ + variants = 3; + attributes.set(Attribute.oil, 0.3f); + }}; + + shaleRocks = new StaticWall("shalerocks"){{ + variants = 2; + }}; + + shaleBoulder = new Rock("shale-boulder"){{ variants = 2; }}; moss = new Floor("moss"){{ variants = 3; + attributes.set(Attribute.spores, 0.15f); }}; - stainedRocksRed = new StaticWall("stained-rocks-red"){{ - variants = 2; - }}; - - stainedStoneRed = new Floor("stained-stone-red"){{ - variants = 1; - }}; - - stainedRocksYellow = new StaticWall("stained-rocks-yellow"){{ - variants = 2; - }}; - - stainedStoneYellow = new Floor("stained-stone-yellow"){{ - variants = 1; - }}; - - stainedBoulder = new Rock("stained-boulder"){{ - variants = 2; + sporeMoss = new Floor("spore-moss"){{ + variants = 3; + attributes.set(Attribute.spores, 0.3f); }}; metalFloor = new Floor("metal-floor"){{ @@ -278,22 +277,18 @@ public class Blocks implements ContentList{ metalFloorDamaged = new Floor("metal-floor-damaged"){{ variants = 6; - blendGroup = metalFloor; }}; metalFloor2 = new Floor("metal-floor-2"){{ variants = 0; - blendGroup = metalFloor; }}; metalFloor3 = new Floor("metal-floor-3"){{ variants = 0; - blendGroup = metalFloor; }}; metalFloor5 = new Floor("metal-floor-5"){{ variants = 0; - blendGroup = metalFloor; }}; ignarock = new Floor("ignarock"){{ @@ -301,12 +296,12 @@ public class Blocks implements ContentList{ }}; hotrock = new Floor("hotrock"){{ - heat = 0.5f; + attributes.set(Attribute.heat, 0.5f); blendGroup = ignarock; }}; magmarock = new Floor("magmarock"){{ - heat = 0.75f; + attributes.set(Attribute.heat, 0.75f); updateEffect = Fx.magmasmoke; blendGroup = ignarock; }}; @@ -975,6 +970,7 @@ public class Blocks implements ContentList{ size = 2; liquidCapacity = 30f; rotateSpeed = 1.4f; + attribute = Attribute.water; consumes.power(0.90f); }}; @@ -988,6 +984,7 @@ public class Blocks implements ContentList{ pumpAmount = 0.25f; size = 3; liquidCapacity = 30f; + attribute = Attribute.oil; consumes.item(Items.sand); consumes.power(3f); diff --git a/core/src/io/anuke/mindustry/content/Zones.java b/core/src/io/anuke/mindustry/content/Zones.java index f42d1d3d6d..066242bdaf 100644 --- a/core/src/io/anuke/mindustry/content/Zones.java +++ b/core/src/io/anuke/mindustry/content/Zones.java @@ -279,7 +279,7 @@ public class Zones implements ContentList{ stainedMountains = new Zone("stainedMountains", new MapGenerator("stainedMountains", 2) .dist(2.5f, true) - .decor(new Decoration(Blocks.moss, Blocks.stainedBoulder, 0.01))){{ + .decor(new Decoration(Blocks.moss, Blocks.shaleBoulder, 0.02))){{ loadout = Loadouts.basicFoundation; baseLaunchCost = ItemStack.with(Items.copper, 100, Items.lead, 200, Items.silicon, 100); startingItems = ItemStack.list(Items.copper, 400, Items.lead, 100); diff --git a/core/src/io/anuke/mindustry/core/Control.java b/core/src/io/anuke/mindustry/core/Control.java index f4dbf86f18..5a3f7d47f7 100644 --- a/core/src/io/anuke/mindustry/core/Control.java +++ b/core/src/io/anuke/mindustry/core/Control.java @@ -110,6 +110,13 @@ public class Control implements ApplicationListener{ //todo high scores for custom maps, as well as other statistics + Events.on(WaveEvent.class, event -> { + if(world.getMap().getHightScore() < state.wave){ + hiscore = true; + world.getMap().setHighScore(state.wave); + } + }); + Events.on(GameOverEvent.class, event -> { state.stats.wavesLasted = state.wave; Effects.shake(5, 6, Core.camera.position.x, Core.camera.position.y); diff --git a/core/src/io/anuke/mindustry/io/MapIO.java b/core/src/io/anuke/mindustry/io/MapIO.java index 5327ddbdd0..a0cab82f2c 100644 --- a/core/src/io/anuke/mindustry/io/MapIO.java +++ b/core/src/io/anuke/mindustry/io/MapIO.java @@ -44,8 +44,15 @@ public class MapIO{ private static void initBlocks(){ if(missingBlocks != null) return; + //stainedRocks, stainedRocksRed, stainedRocksYellow, stainedStoneYellow, stainedBoulder, missingBlocks = ObjectMap.of( - "stained-stone", Blocks.moss + "stained-stone", Blocks.shale, + "stained-stone-red", Blocks.shale, + "stained-stone-yellow", Blocks.shale, + "stained-rocks", Blocks.shaleRocks, + "stained-boulder", Blocks.shaleBoulder, + "stained-rocks-red", Blocks.shaleRocks, + "stained-rocks-yellow", Blocks.shaleRocks ); } @@ -74,8 +81,7 @@ public class MapIO{ @Override public void setOreByte(byte b){ - if(b != 0) - floor.drawPixel(x, floor.getHeight() - 1 - y, colorFor(floor(), Blocks.air, content.block(b), getTeam())); + if(b != 0) floor.drawPixel(x, floor.getHeight() - 1 - y, colorFor(floor(), Blocks.air, content.block(b), getTeam())); } @Override @@ -165,7 +171,7 @@ public class MapIO{ stream.writeByte(tile.link); }else if(tile.entity != null){ stream.writeByte(Pack.byteByte(tile.getTeamID(), tile.getRotation())); //team + rotation - stream.writeShort((short)tile.entity.health); //health + stream.writeShort(/*(short)tile.entity.health*/tile.block().health); //health tile.entity.writeConfig(stream); }else{ //write consecutive non-entity blocks @@ -267,13 +273,13 @@ public class MapIO{ Tile tile = tiles.get(x, y); tile.setFloor((Floor)content.block(floorid)); - tile.setOreByte(oreid); + tile.setOre(content.block(oreid)); for(int j = i + 1; j < i + 1 + consecutives; j++){ int newx = j % width, newy = j / width; Tile newTile = tiles.get(newx, newy); newTile.setFloor((Floor)content.block(floorid)); - newTile.setOreByte(oreid); + newTile.setOre(content.block(oreid)); } i += consecutives; @@ -297,7 +303,7 @@ public class MapIO{ byte rotation = Pack.rightByte(tr); tile.setTeam(Team.all[team]); - tile.entity.health = health; + tile.entity.health = /*health*/tile.block().health; tile.setRotation(rotation); tile.entity.readConfig(stream); @@ -432,7 +438,7 @@ public class MapIO{ } if(oreMap.containsKey(floorb)){ - tile.setOreByte((byte)oreMap.get(floorb, 0)); + tile.setOre(content.block(oreMap.get(floorb, 0))); } } } diff --git a/core/src/io/anuke/mindustry/maps/Map.java b/core/src/io/anuke/mindustry/maps/Map.java index 9d9c2858d5..d73c234169 100644 --- a/core/src/io/anuke/mindustry/maps/Map.java +++ b/core/src/io/anuke/mindustry/maps/Map.java @@ -4,6 +4,7 @@ import io.anuke.arc.Core; import io.anuke.arc.collection.ObjectMap; import io.anuke.arc.files.FileHandle; import io.anuke.arc.graphics.Texture; +import io.anuke.mindustry.Vars; import io.anuke.mindustry.io.MapIO; public class Map{ @@ -44,6 +45,15 @@ public class Map{ return file.nameWithoutExtension(); } + public int getHightScore(){ + return Core.settings.getInt("hiscore" + fileName(), 0); + } + + public void setHighScore(int score){ + Core.settings.put("hiscore" + fileName(), score); + Vars.data.modified(); + } + public String getDisplayName(){ return tags.get("name", fileName()); } diff --git a/core/src/io/anuke/mindustry/maps/Maps.java b/core/src/io/anuke/mindustry/maps/Maps.java index bf3473cb8a..18e29d8cee 100644 --- a/core/src/io/anuke/mindustry/maps/Maps.java +++ b/core/src/io/anuke/mindustry/maps/Maps.java @@ -17,7 +17,7 @@ import static io.anuke.mindustry.Vars.*; public class Maps implements Disposable{ /** List of all built-in maps. */ - private static final String[] defaultMapNames = {"impact0079"}; + private static final String[] defaultMapNames = {"Fortress"}; /** All maps stored in an ordered array. */ private Array maps = new Array<>(); @@ -107,7 +107,7 @@ public class Maps implements Disposable{ /** Import a map, then save it. This updates all values and stored data necessary. */ public void importMap(FileHandle file, Map map) throws IOException{ - file.copyTo(customMapDirectory.child(file.name())); + file.copyTo(customMapDirectory.child(map.name() + ".mmap")); if(!headless){ map.texture = new Texture(MapIO.generatePreview(map)); } diff --git a/core/src/io/anuke/mindustry/ui/dialogs/CustomGameDialog.java b/core/src/io/anuke/mindustry/ui/dialogs/CustomGameDialog.java index bfc1d4902d..d5012b49d9 100644 --- a/core/src/io/anuke/mindustry/ui/dialogs/CustomGameDialog.java +++ b/core/src/io/anuke/mindustry/ui/dialogs/CustomGameDialog.java @@ -106,7 +106,7 @@ public class CustomGameDialog extends FloatingDialog{ image.row(); image.add("[accent]" + map.getDisplayName()).pad(3f).growX().wrap().get().setAlignment(Align.center, Align.center); image.row(); - image.label((() -> Core.bundle.format("level.highscore", Core.settings.getInt("hiscore" + map.fileName(), 0)))).pad(3f); + image.label((() -> Core.bundle.format("level.highscore", map.getHightScore()))).pad(3f); BorderImage border = new BorderImage(map.texture, 3f); border.setScaling(Scaling.fit); diff --git a/core/src/io/anuke/mindustry/ui/dialogs/MapsDialog.java b/core/src/io/anuke/mindustry/ui/dialogs/MapsDialog.java index 5b30ca64b3..bf64a6a35e 100644 --- a/core/src/io/anuke/mindustry/ui/dialogs/MapsDialog.java +++ b/core/src/io/anuke/mindustry/ui/dialogs/MapsDialog.java @@ -137,8 +137,6 @@ public class MapsDialog extends FloatingDialog{ t.add("$editor.description").padRight(10).color(Color.GRAY).top(); t.row(); t.add(map.description()).growX().wrap().padTop(2); - t.row(); - t.add("$editor.oregen.info").padRight(10).color(Color.GRAY); }).height(mapsize).width(mapsize); table.row(); diff --git a/core/src/io/anuke/mindustry/world/Block.java b/core/src/io/anuke/mindustry/world/Block.java index 39f013d854..9652ca9146 100644 --- a/core/src/io/anuke/mindustry/world/Block.java +++ b/core/src/io/anuke/mindustry/world/Block.java @@ -8,13 +8,13 @@ import io.anuke.arc.collection.EnumSet; import io.anuke.arc.function.BooleanProvider; import io.anuke.arc.function.Function; import io.anuke.arc.graphics.Color; -import io.anuke.arc.graphics.g2d.Draw; -import io.anuke.arc.graphics.g2d.Lines; +import io.anuke.arc.graphics.g2d.*; import io.anuke.arc.graphics.g2d.TextureAtlas.AtlasRegion; -import io.anuke.arc.graphics.g2d.TextureRegion; import io.anuke.arc.math.Mathf; import io.anuke.arc.scene.ui.layout.Table; +import io.anuke.arc.util.Align; import io.anuke.arc.util.Time; +import io.anuke.arc.util.pooling.Pools; import io.anuke.mindustry.entities.Damage; import io.anuke.mindustry.entities.bullet.Bullet; import io.anuke.mindustry.entities.effect.Puddle; @@ -32,10 +32,7 @@ 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; -import io.anuke.mindustry.world.meta.BlockGroup; -import io.anuke.mindustry.world.meta.BlockStat; -import io.anuke.mindustry.world.meta.StatUnit; +import io.anuke.mindustry.world.meta.*; import java.util.Arrays; @@ -202,6 +199,28 @@ public class Block extends BlockStorage{ public void drawPlace(int x, int y, int rotation, boolean valid){ } + protected void drawPlaceText(String text, int x, int y, boolean valid){ + Color color = valid ? Pal.accent : Pal.remove; + BitmapFont font = Core.scene.skin.getFont("default-font"); + GlyphLayout layout = Pools.obtain(GlyphLayout.class, GlyphLayout::new); + boolean ints = font.usesIntegerPositions(); + font.setUseIntegerPositions(false); + font.getData().setScale(1f / 4f); + layout.setText(font, text); + + font.setColor(color); + float dx = x*tilesize + offset(), dy = y*tilesize + offset() + size*tilesize/2f + 2; + font.draw(text, dx, dy + layout.height + 1, Align.center); + Lines.stroke(1f, color); + Lines.line(dx - layout.width/2f - 2f, dy, dx + layout.width/2f + 2f, dy); + + font.setUseIntegerPositions(ints); + font.setColor(Color.WHITE); + font.getData().setScale(1f); + Draw.reset(); + Pools.free(layout); + } + public void draw(Tile tile){ Draw.rect(region, tile.drawx(), tile.drawy(), rotate ? tile.getRotation() * 90 : 0); } @@ -248,6 +267,15 @@ public class Block extends BlockStorage{ } } + public float sumAttribute(Attribute attr, int x, int y){ + Tile tile = world.tile(x, y); + float sum = 0; + for(Tile other : tile.getLinkedTilesAs(this, tempTiles)){ + sum += other.floor().attributes.get(attr); + } + return sum; + } + @Override public String localizedName(){ return localizedName; diff --git a/core/src/io/anuke/mindustry/world/LegacyColorMapper.java b/core/src/io/anuke/mindustry/world/LegacyColorMapper.java index 264d469f28..2879f7d894 100644 --- a/core/src/io/anuke/mindustry/world/LegacyColorMapper.java +++ b/core/src/io/anuke/mindustry/world/LegacyColorMapper.java @@ -23,7 +23,7 @@ public class LegacyColorMapper implements ContentList{ map("323232", Blocks.stone); map("646464", Blocks.stone, Blocks.rocks); map("50965a", Blocks.grass); - map("5ab464", Blocks.grass, Blocks.stainedRocks); + map("5ab464", Blocks.grass, Blocks.pine); map("506eb4", Blocks.water); map("465a96", Blocks.deepwater); map("252525", Blocks.ignarock); @@ -33,8 +33,8 @@ public class LegacyColorMapper implements ContentList{ map("c2d1d2", Blocks.snow); map("c4e3e7", Blocks.ice); map("f7feff", Blocks.snow, Blocks.snowrocks); - map("6e501e", Blocks.stainedStoneRed); - map("ed5334", Blocks.stainedStoneRed); + map("6e501e", Blocks.holostone); + map("ed5334", Blocks.magmarock); map("292929", Blocks.tar); map("c3a490", Blocks.stone, Blocks.air, Blocks.oreCopper); map("161616", Blocks.stone, Blocks.air, Blocks.oreCoal); diff --git a/core/src/io/anuke/mindustry/world/blocks/Attributes.java b/core/src/io/anuke/mindustry/world/blocks/Attributes.java new file mode 100644 index 0000000000..ce343a852c --- /dev/null +++ b/core/src/io/anuke/mindustry/world/blocks/Attributes.java @@ -0,0 +1,15 @@ +package io.anuke.mindustry.world.blocks; + +import io.anuke.mindustry.world.meta.Attribute; + +public class Attributes{ + private float[] array = new float[Attribute.values().length]; + + public float get(Attribute attr){ + return array[attr.ordinal()]; + } + + public void set(Attribute attr, float value){ + array[attr.ordinal()] = value; + } +} diff --git a/core/src/io/anuke/mindustry/world/blocks/Floor.java b/core/src/io/anuke/mindustry/world/blocks/Floor.java index e27c0d7302..58564e9ebc 100644 --- a/core/src/io/anuke/mindustry/world/blocks/Floor.java +++ b/core/src/io/anuke/mindustry/world/blocks/Floor.java @@ -48,8 +48,6 @@ public class Floor extends Block{ public Item itemDrop = null; /** whether this block can be drowned in */ public boolean isLiquid; - /** Heat of this block, 0 at baseline. Used for calculating output of thermal generators.*/ - public float heat = 0f; /** if true, this block cannot be mined by players. useful for annoying things like sand. */ public boolean playerUnmineable = false; /**Style of the edge stencil. Loaded by looking up "edge-stencil-{name}".*/ @@ -58,6 +56,8 @@ public class Floor extends Block{ public Block blendGroup = this; /**Effect displayed when randomly updated.*/ public Effect updateEffect = Fx.none; + /**Array of affinities to certain things.*/ + public Attributes attributes = new Attributes(); protected TextureRegion[][] edges; protected byte eq = 0; diff --git a/core/src/io/anuke/mindustry/world/blocks/power/ThermalGenerator.java b/core/src/io/anuke/mindustry/world/blocks/power/ThermalGenerator.java index b0f79b0035..053840decf 100644 --- a/core/src/io/anuke/mindustry/world/blocks/power/ThermalGenerator.java +++ b/core/src/io/anuke/mindustry/world/blocks/power/ThermalGenerator.java @@ -1,10 +1,12 @@ package io.anuke.mindustry.world.blocks.power; -import io.anuke.mindustry.entities.Effects; -import io.anuke.mindustry.entities.Effects.Effect; +import io.anuke.arc.Core; import io.anuke.arc.math.Mathf; import io.anuke.mindustry.content.Fx; +import io.anuke.mindustry.entities.Effects; +import io.anuke.mindustry.entities.Effects.Effect; import io.anuke.mindustry.world.Tile; +import io.anuke.mindustry.world.meta.Attribute; public class ThermalGenerator extends PowerGenerator{ protected Effect generateEffect = Fx.none; @@ -24,6 +26,11 @@ public class ThermalGenerator extends PowerGenerator{ super.update(tile); } + @Override + public void drawPlace(int x, int y, int rotation, boolean valid){ + drawPlaceText(Core.bundle.format("blocks.efficiency", sumAttribute(Attribute.heat, x, y)*100, 1), x, y, valid); + } + @Override public void placed(Tile tile){ super.placed(tile); @@ -34,10 +41,7 @@ public class ThermalGenerator extends PowerGenerator{ super.onProximityAdded(tile); GeneratorEntity entity = tile.entity(); - entity.productionEfficiency = 0f; - for(Tile other : tile.getLinkedTiles(tempTiles)){ - entity.productionEfficiency += other.floor().heat; - } + entity.productionEfficiency = sumAttribute(Attribute.heat, tile.x, tile.y); } @Override @@ -50,6 +54,6 @@ public class ThermalGenerator extends PowerGenerator{ @Override public boolean canPlaceOn(Tile tile){ //make sure there's heat at this location - return tile.getLinkedTilesAs(this, tempTiles).sum(other -> other.floor().heat) > 0.01f; + return tile.getLinkedTilesAs(this, tempTiles).sum(other -> other.floor().attributes.get(Attribute.heat)) > 0.01f; } } diff --git a/core/src/io/anuke/mindustry/world/blocks/production/Cultivator.java b/core/src/io/anuke/mindustry/world/blocks/production/Cultivator.java index 6a5ac51af7..51cf6cae9f 100644 --- a/core/src/io/anuke/mindustry/world/blocks/production/Cultivator.java +++ b/core/src/io/anuke/mindustry/world/blocks/production/Cultivator.java @@ -10,7 +10,10 @@ import io.anuke.arc.math.RandomXS128; import io.anuke.arc.util.Time; import io.anuke.mindustry.content.Fx; import io.anuke.mindustry.entities.type.TileEntity; +import io.anuke.mindustry.graphics.Pal; +import io.anuke.mindustry.ui.Bar; import io.anuke.mindustry.world.Tile; +import io.anuke.mindustry.world.meta.Attribute; import java.io.DataInput; import java.io.DataOutput; @@ -46,6 +49,21 @@ public class Cultivator extends GenericCrafter{ entity.warmup = Mathf.lerpDelta(entity.warmup, entity.cons.valid() ? 1f : 0f, 0.015f); } + @Override + public void setBars(){ + super.setBars(); + bars.add("multiplier", entity -> new Bar(() -> + Core.bundle.format("blocks.efficiency", + ((((CultivatorEntity)entity).boost + 1f) * ((CultivatorEntity)entity).warmup)*100f,1), + () -> Pal.ammo, + () -> ((CultivatorEntity)entity).warmup)); + } + + @Override + public void drawPlace(int x, int y, int rotation, boolean valid){ + drawPlaceText(Core.bundle.format("blocks.efficiency", (1+sumAttribute(Attribute.spores, x, y))*100, 1), x, y, valid); + } + @Override public void draw(Tile tile){ CultivatorEntity entity = tile.entity(); @@ -84,8 +102,23 @@ public class Cultivator extends GenericCrafter{ return new CultivatorEntity(); } + @Override + public void onProximityAdded(Tile tile){ + super.onProximityAdded(tile); + + CultivatorEntity entity = tile.entity(); + entity.boost = sumAttribute(Attribute.spores, tile.x, tile.y); + } + + @Override + protected float getProgressIncrease(TileEntity entity, float baseTime){ + CultivatorEntity c = (CultivatorEntity)entity; + return super.getProgressIncrease(entity, baseTime) * (1f + c.boost); + } + public static class CultivatorEntity extends GenericCrafterEntity{ public float warmup; + public float boost; @Override public void write(DataOutput stream) throws IOException{ diff --git a/core/src/io/anuke/mindustry/world/blocks/production/SolidPump.java b/core/src/io/anuke/mindustry/world/blocks/production/SolidPump.java index 226933c355..f91501c1cf 100644 --- a/core/src/io/anuke/mindustry/world/blocks/production/SolidPump.java +++ b/core/src/io/anuke/mindustry/world/blocks/production/SolidPump.java @@ -1,17 +1,20 @@ package io.anuke.mindustry.world.blocks.production; import io.anuke.arc.Core; +import io.anuke.arc.graphics.g2d.Draw; import io.anuke.arc.graphics.g2d.TextureRegion; -import io.anuke.mindustry.content.Liquids; +import io.anuke.arc.math.Mathf; import io.anuke.mindustry.content.Fx; -import io.anuke.mindustry.entities.type.TileEntity; -import io.anuke.mindustry.type.Liquid; -import io.anuke.mindustry.world.Tile; -import io.anuke.mindustry.world.meta.BlockStat; +import io.anuke.mindustry.content.Liquids; import io.anuke.mindustry.entities.Effects; import io.anuke.mindustry.entities.Effects.Effect; -import io.anuke.arc.graphics.g2d.Draw; -import io.anuke.arc.math.Mathf; +import io.anuke.mindustry.entities.type.TileEntity; +import io.anuke.mindustry.graphics.Pal; +import io.anuke.mindustry.type.Liquid; +import io.anuke.mindustry.ui.Bar; +import io.anuke.mindustry.world.Tile; +import io.anuke.mindustry.world.meta.Attribute; +import io.anuke.mindustry.world.meta.BlockStat; /** * Pump that makes liquid from solids and takes in power. Only works on solid floor blocks. @@ -21,6 +24,8 @@ public class SolidPump extends Pump{ protected Effect updateEffect = Fx.none; protected float updateEffectChance = 0.02f; protected float rotateSpeed = 1f; + /**Attribute that is checked when calculating output.*/ + protected Attribute attribute; public SolidPump(String name){ super(name); @@ -34,11 +39,27 @@ public class SolidPump extends Pump{ liquidRegion = Core.atlas.find(name + "-liquid"); } + @Override + public void drawPlace(int x, int y, int rotation, boolean valid){ + if(attribute != null){ + drawPlaceText(Core.bundle.format("blocks.efficiency", (sumAttribute(attribute, x, y) + 1f)*100, 1), x, y, valid); + } + } + + @Override + public void setBars(){ + super.setBars(); + bars.add("efficiency", entity -> new Bar(() -> + Core.bundle.format("blocks.efficiency", + ((((SolidPumpEntity)entity).boost + 1f) * ((SolidPumpEntity)entity).warmup) * 100, 1), + () -> Pal.ammo, + () -> ((SolidPumpEntity)entity).warmup)); + } + @Override public void setStats(){ super.setStats(); - // stats.remove(BlockStat.liquidOutput); stats.add(BlockStat.liquidOutput, result); } @@ -76,6 +97,8 @@ public class SolidPump extends Pump{ if(isValid(tile)) fraction = 1f; } + fraction += entity.boost; + if(tile.entity.cons.valid() && typeLiquid(tile) < liquidCapacity - 0.001f){ float maxPump = Math.min(liquidCapacity - typeLiquid(tile), pumpAmount * entity.delta() * fraction * entity.power.satisfaction); tile.entity.liquids.add(result, maxPump); @@ -115,6 +138,16 @@ public class SolidPump extends Pump{ return new SolidPumpEntity(); } + @Override + public void onProximityAdded(Tile tile){ + super.onProximityAdded(tile); + + if(attribute != null){ + SolidPumpEntity entity = tile.entity(); + entity.boost = sumAttribute(attribute, tile.x, tile.y); + } + } + public float typeLiquid(Tile tile){ return tile.entity.liquids.total(); } @@ -122,5 +155,6 @@ public class SolidPump extends Pump{ public static class SolidPumpEntity extends TileEntity{ public float warmup; public float pumpTime; + public float boost; } } diff --git a/core/src/io/anuke/mindustry/world/meta/Attribute.java b/core/src/io/anuke/mindustry/world/meta/Attribute.java new file mode 100644 index 0000000000..5f761f5359 --- /dev/null +++ b/core/src/io/anuke/mindustry/world/meta/Attribute.java @@ -0,0 +1,12 @@ +package io.anuke.mindustry.world.meta; + +public enum Attribute{ + /** Heat of this block. Used for calculating output of thermal generators.*/ + heat, + /** Spore content of this block. Used for increasing cultivator yield.*/ + spores, + /** Water content of this block. Used for increasing water extractor yield.*/ + water, + /** Oil content of this block. Used for increasing oil extractor yield.*/ + oil +} diff --git a/core/src/io/anuke/mindustry/world/modules/ConsumeModule.java b/core/src/io/anuke/mindustry/world/modules/ConsumeModule.java index 9643377a7b..f2daa58255 100644 --- a/core/src/io/anuke/mindustry/world/modules/ConsumeModule.java +++ b/core/src/io/anuke/mindustry/world/modules/ConsumeModule.java @@ -18,9 +18,10 @@ public class ConsumeModule extends BlockModule{ public void update(){ boolean prevValid = valid(); valid = true; + boolean docons = entity.tile.block().shouldConsume(entity.tile); for(Consume cons : entity.tile.block().consumes.all()){ - if(cons.isUpdate() && prevValid && entity.tile.block().shouldConsume(entity.tile) && cons.valid(entity.getTile().block(), entity)){ + if(docons && cons.isUpdate() && prevValid && cons.valid(entity.getTile().block(), entity)){ cons.update(entity.getTile().block(), entity); }