diff --git a/core/assets-raw/sprites/blocks/units/mech-factory.png b/core/assets-raw/sprites/blocks/units/mech-factory.png deleted file mode 100644 index 7bcb543f2e..0000000000 Binary files a/core/assets-raw/sprites/blocks/units/mech-factory.png and /dev/null differ diff --git a/core/assets-raw/sprites/blocks/units/mechs/dart-ship-factory-open.png b/core/assets-raw/sprites/blocks/units/mechs/dart-ship-factory-open.png deleted file mode 100644 index 861bb76e63..0000000000 Binary files a/core/assets-raw/sprites/blocks/units/mechs/dart-ship-factory-open.png and /dev/null differ diff --git a/core/assets-raw/sprites/blocks/units/mechs/dart-ship-factory.png b/core/assets-raw/sprites/blocks/units/mechs/dart-ship-factory.png index e806ab59dd..5b2e33e02b 100644 Binary files a/core/assets-raw/sprites/blocks/units/mechs/dart-ship-factory.png and b/core/assets-raw/sprites/blocks/units/mechs/dart-ship-factory.png differ diff --git a/core/assets-raw/sprites/blocks/units/mechs/delta-mech-factory-open.png b/core/assets-raw/sprites/blocks/units/mechs/delta-mech-factory-open.png deleted file mode 100644 index 3d02fc63e4..0000000000 Binary files a/core/assets-raw/sprites/blocks/units/mechs/delta-mech-factory-open.png and /dev/null differ diff --git a/core/assets-raw/sprites/blocks/units/mechs/delta-mech-factory.png b/core/assets-raw/sprites/blocks/units/mechs/delta-mech-factory.png index 137514164f..a64f848ccf 100644 Binary files a/core/assets-raw/sprites/blocks/units/mechs/delta-mech-factory.png and b/core/assets-raw/sprites/blocks/units/mechs/delta-mech-factory.png differ diff --git a/core/assets-raw/sprites/blocks/units/mechs/glaive-ship-factory.png b/core/assets-raw/sprites/blocks/units/mechs/glaive-ship-factory.png new file mode 100644 index 0000000000..2fe64876bb Binary files /dev/null and b/core/assets-raw/sprites/blocks/units/mechs/glaive-ship-factory.png differ diff --git a/core/assets-raw/sprites/blocks/units/mechs/javelin-ship-factory-open.png b/core/assets-raw/sprites/blocks/units/mechs/javelin-ship-factory-open.png deleted file mode 100644 index 6d53256df7..0000000000 Binary files a/core/assets-raw/sprites/blocks/units/mechs/javelin-ship-factory-open.png and /dev/null differ diff --git a/core/assets-raw/sprites/blocks/units/mechs/javelin-ship-factory.png b/core/assets-raw/sprites/blocks/units/mechs/javelin-ship-factory.png index a47a925e30..655f9328e4 100644 Binary files a/core/assets-raw/sprites/blocks/units/mechs/javelin-ship-factory.png and b/core/assets-raw/sprites/blocks/units/mechs/javelin-ship-factory.png differ diff --git a/core/assets-raw/sprites/blocks/units/mechs/omega-mech-factory.png b/core/assets-raw/sprites/blocks/units/mechs/omega-mech-factory.png new file mode 100644 index 0000000000..263070dfa3 Binary files /dev/null and b/core/assets-raw/sprites/blocks/units/mechs/omega-mech-factory.png differ diff --git a/core/assets-raw/sprites/blocks/units/ship-factory.png b/core/assets-raw/sprites/blocks/units/mechs/ship-factory.png similarity index 100% rename from core/assets-raw/sprites/blocks/units/ship-factory.png rename to core/assets-raw/sprites/blocks/units/mechs/ship-factory.png diff --git a/core/assets-raw/sprites/blocks/units/mechs/tau-mech-factory.png b/core/assets-raw/sprites/blocks/units/mechs/tau-mech-factory.png new file mode 100644 index 0000000000..9591fa2d00 Binary files /dev/null and b/core/assets-raw/sprites/blocks/units/mechs/tau-mech-factory.png differ diff --git a/core/assets-raw/sprites/blocks/units/mechs/trident-ship-factory.png b/core/assets-raw/sprites/blocks/units/mechs/trident-ship-factory.png new file mode 100644 index 0000000000..971ca22723 Binary files /dev/null and b/core/assets-raw/sprites/blocks/units/mechs/trident-ship-factory.png differ diff --git a/core/assets-raw/sprites/mechs/ships/halberd-ship.png b/core/assets-raw/sprites/mechs/ships/glaive-ship.png similarity index 100% rename from core/assets-raw/sprites/mechs/ships/halberd-ship.png rename to core/assets-raw/sprites/mechs/ships/glaive-ship.png diff --git a/core/assets/bundles/bundle.properties b/core/assets/bundles/bundle.properties index 95c778fca4..2471c9c3ee 100644 --- a/core/assets/bundles/bundle.properties +++ b/core/assets/bundles/bundle.properties @@ -438,7 +438,7 @@ mech.omega.name=Omega mech.dart.name=Dart mech.javelin.name=Javelin mech.trident.name=Trident -mech.halberd.name=Halberd +mech.glaive.name=Glaive text.item.explosiveness=[LIGHT_GRAY]Explosiveness: {0} text.item.flammability=[LIGHT_GRAY]Flammability: {0} @@ -522,6 +522,10 @@ block.cultivator.name=Cultivator block.dart-ship-factory.name=Dart Ship Reconstructor block.delta-mech-factory.name=Delta Mech Reconstructor block.javelin-ship-factory.name=Javelin Ship Reconstructor +block.trident-ship-factory.name=Trident Ship Reconstructor +block.glaive-ship-factory.name=Glaive Ship Reconstructor +block.omega-mech-factory.name=Omega Mech Reconstructor +block.tau-mech-factory.name=Tau Mech Reconstructor block.repairpoint.name=Repair Point block.resupplypoint.name=Resupply Point block.conduit.name=Conduit diff --git a/core/assets/sprites/sprites.atlas b/core/assets/sprites/sprites.atlas index ffdd94fe23..2e88112d70 100644 --- a/core/assets/sprites/sprites.atlas +++ b/core/assets/sprites/sprites.atlas @@ -13,322 +13,322 @@ background index: -1 bridge-conveyor-arrow rotate: false - xy: 544, 118 + xy: 494, 139 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 bridge-conveyor-bridge rotate: false - xy: 554, 118 + xy: 484, 129 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 bridge-conveyor-end rotate: false - xy: 564, 148 + xy: 514, 149 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 conveyor-0-1 rotate: false - xy: 831, 278 + xy: 554, 146 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 conveyor-0-2 rotate: false - xy: 813, 258 + xy: 554, 136 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 conveyor-0-3 rotate: false - xy: 823, 268 + xy: 564, 146 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 conveyor-1-0 rotate: false - xy: 813, 248 + xy: 564, 136 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 conveyor-1-1 rotate: false - xy: 823, 258 + xy: 574, 146 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 conveyor-1-2 rotate: false - xy: 813, 238 + xy: 574, 136 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 conveyor-1-3 rotate: false - xy: 823, 248 + xy: 544, 126 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 conveyor-2-0 rotate: false - xy: 813, 228 + xy: 554, 126 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 conveyor-2-1 rotate: false - xy: 823, 238 + xy: 564, 126 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 conveyor-2-2 rotate: false - xy: 813, 218 + xy: 574, 126 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 conveyor-2-3 rotate: false - xy: 823, 228 + xy: 584, 146 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 conveyor-3-0 rotate: false - xy: 813, 208 + xy: 584, 136 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 conveyor-3-1 rotate: false - xy: 823, 218 + xy: 584, 126 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 conveyor-3-2 rotate: false - xy: 813, 198 + xy: 541, 116 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 conveyor-3-3 rotate: false - xy: 823, 208 + xy: 551, 116 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 conveyor-4-0 rotate: false - xy: 813, 188 + xy: 561, 116 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 conveyor-4-1 rotate: false - xy: 823, 198 + xy: 571, 116 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 conveyor-4-2 rotate: false - xy: 813, 178 + xy: 581, 116 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 conveyor-4-3 rotate: false - xy: 823, 188 + xy: 591, 166 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 titanium-conveyor-0-1 rotate: false - xy: 953, 175 + xy: 930, 280 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 titanium-conveyor-0-2 rotate: false - xy: 963, 185 + xy: 940, 280 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 titanium-conveyor-0-3 rotate: false - xy: 973, 195 + xy: 479, 76 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 titanium-conveyor-1-0 rotate: false - xy: 983, 205 + xy: 476, 66 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 titanium-conveyor-1-1 rotate: false - xy: 993, 215 + xy: 474, 56 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 titanium-conveyor-1-2 rotate: false - xy: 963, 175 + xy: 486, 66 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 titanium-conveyor-1-3 rotate: false - xy: 973, 185 + xy: 484, 56 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 titanium-conveyor-2-0 rotate: false - xy: 983, 195 + xy: 971, 307 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 titanium-conveyor-2-1 rotate: false - xy: 993, 205 + xy: 981, 307 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 titanium-conveyor-2-2 rotate: false - xy: 973, 175 + xy: 991, 307 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 titanium-conveyor-2-3 rotate: false - xy: 983, 185 + xy: 1001, 307 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 titanium-conveyor-3-0 rotate: false - xy: 993, 195 + xy: 977, 297 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 titanium-conveyor-3-1 rotate: false - xy: 983, 175 + xy: 987, 297 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 titanium-conveyor-3-2 rotate: false - xy: 993, 185 + xy: 997, 297 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 titanium-conveyor-3-3 rotate: false - xy: 993, 175 + xy: 1007, 297 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 titanium-conveyor-4-0 rotate: false - xy: 853, 157 + xy: 584, 194 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 titanium-conveyor-4-1 rotate: false - xy: 863, 159 + xy: 594, 194 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 titanium-conveyor-4-2 rotate: false - xy: 873, 159 + xy: 604, 194 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 titanium-conveyor-4-3 rotate: false - xy: 883, 159 + xy: 614, 194 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 mass-driver-turret rotate: false - xy: 737, 368 + xy: 763, 368 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 phase-conveyor-arrow rotate: false - xy: 923, 209 + xy: 331, 33 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 phase-conveyor-bridge rotate: false - xy: 933, 219 + xy: 341, 33 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 phase-conveyor-end rotate: false - xy: 993, 275 + xy: 351, 33 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 warp-gate-top rotate: false - xy: 767, 290 + xy: 793, 290 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -363,70 +363,70 @@ blast-drill-top index: -1 laser-drill rotate: false - xy: 321, 117 + xy: 979, 317 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 laser-drill-rotator rotate: false - xy: 339, 117 + xy: 177, 117 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 laser-drill-top rotate: false - xy: 357, 117 + xy: 195, 117 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 mechanical-drill rotate: false - xy: 375, 117 + xy: 213, 117 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 mechanical-drill-rotator rotate: false - xy: 393, 117 + xy: 231, 117 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 mechanical-drill-top rotate: false - xy: 795, 188 + xy: 249, 117 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 oil-extractor rotate: false - xy: 741, 316 + xy: 767, 316 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 oil-extractor-liquid rotate: false - xy: 767, 316 + xy: 789, 368 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 oil-extractor-rotator rotate: false - xy: 789, 368 + xy: 789, 342 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 oil-extractor-top rotate: false - xy: 789, 342 + xy: 793, 316 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -461,49 +461,49 @@ plasma-drill-top index: -1 pneumatic-drill rotate: false - xy: 175, 81 + xy: 339, 117 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 pneumatic-drill-rotator rotate: false - xy: 211, 99 + xy: 357, 117 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 pneumatic-drill-top rotate: false - xy: 193, 81 + xy: 375, 117 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 water-extractor rotate: false - xy: 373, 99 + xy: 265, 81 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 water-extractor-liquid rotate: false - xy: 355, 81 + xy: 301, 99 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 water-extractor-rotator rotate: false - xy: 391, 99 + xy: 283, 81 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 water-extractor-top rotate: false - xy: 373, 81 + xy: 319, 99 size: 16, 16 orig: 16, 16 offset: 0, 0 @@ -531,602 +531,602 @@ blackrockshadow1 index: -1 blackstone1 rotate: false - xy: 1015, 381 + xy: 175, 23 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-icon-blackstone rotate: false - xy: 1015, 381 + xy: 175, 23 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blackstone2 rotate: false - xy: 673, 182 + xy: 1015, 381 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blackstone3 rotate: false - xy: 1007, 279 + xy: 1015, 329 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blackstoneedge rotate: false - xy: 166, 66 + xy: 953, 323 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 coal1 rotate: false - xy: 564, 138 + xy: 504, 139 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 coal2 rotate: false - xy: 564, 128 + xy: 494, 129 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 coal3 rotate: false - xy: 564, 118 + xy: 524, 149 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 copper1 rotate: false - xy: 813, 168 + xy: 591, 156 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 copper2 rotate: false - xy: 823, 178 + xy: 594, 176 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 copper3 rotate: false - xy: 823, 168 + xy: 594, 146 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 dirt2 rotate: false - xy: 833, 218 + xy: 604, 176 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 dirt3 rotate: false - xy: 833, 208 + xy: 604, 146 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 dirtedge rotate: false - xy: 361, 37 + xy: 297, 19 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 generic-cliff-edge rotate: false - xy: 843, 248 + xy: 614, 136 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ice-cliff-edge rotate: false - xy: 843, 248 + xy: 614, 136 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 generic-cliff-edge-1 rotate: false - xy: 843, 238 + xy: 614, 126 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ice-cliff-edge-1 rotate: false - xy: 843, 238 + xy: 614, 126 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 generic-cliff-edge-2 rotate: false - xy: 843, 228 + xy: 611, 116 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ice-cliff-edge-2 rotate: false - xy: 843, 228 + xy: 611, 116 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 generic-cliff-side rotate: false - xy: 843, 218 + xy: 621, 166 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ice-cliff-side rotate: false - xy: 843, 218 + xy: 621, 166 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 grass-cliff-edge rotate: false - xy: 843, 188 + xy: 624, 146 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 grass-cliff-edge-1 rotate: false - xy: 843, 178 + xy: 624, 136 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 grass-cliff-edge-2 rotate: false - xy: 843, 168 + xy: 624, 126 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 grass-cliff-side rotate: false - xy: 207, 23 + xy: 621, 116 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 grass2 rotate: false - xy: 843, 208 + xy: 621, 156 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 grass3 rotate: false - xy: 843, 198 + xy: 624, 176 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 grassedge rotate: false - xy: 1003, 367 + xy: 467, 110 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 ice2 rotate: false - xy: 227, 23 + xy: 631, 156 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ice3 rotate: false - xy: 237, 23 + xy: 634, 176 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 iceedge rotate: false - xy: 1005, 339 + xy: 445, 94 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 icerock2 rotate: false - xy: 247, 23 + xy: 634, 146 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 icerockshadow1 rotate: false - xy: 257, 23 + xy: 634, 136 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 rockshadow1 rotate: false - xy: 257, 23 + xy: 634, 136 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 icerockshadow2 rotate: false - xy: 267, 23 + xy: 634, 126 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 rockshadow2 rotate: false - xy: 267, 23 + xy: 634, 126 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 lavaedge rotate: false - xy: 177, 3 + xy: 177, 5 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 lead1 rotate: false - xy: 295, 13 + xy: 671, 166 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 lead2 rotate: false - xy: 295, 3 + xy: 671, 156 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 lead3 rotate: false - xy: 305, 13 + xy: 674, 176 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 metalfloor2 rotate: false - xy: 843, 158 + xy: 684, 126 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 metalfloor3 rotate: false - xy: 863, 279 + xy: 681, 116 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 metalfloor4 rotate: false - xy: 873, 279 + xy: 691, 166 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 metalfloor5 rotate: false - xy: 883, 279 + xy: 691, 156 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 metalfloor6 rotate: false - xy: 893, 279 + xy: 694, 176 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 metalflooredge rotate: false - xy: 765, 186 + xy: 247, 5 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 oiledge rotate: false - xy: 779, 186 + xy: 261, 5 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 rock2 rotate: false - xy: 973, 245 + xy: 341, 13 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 sand2 rotate: false - xy: 993, 265 + xy: 361, 13 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 sand3 rotate: false - xy: 903, 169 + xy: 331, 3 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 sandedge rotate: false - xy: 486, 195 + xy: 275, 5 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 shrubshadow rotate: false - xy: 913, 169 + xy: 415, 25 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 snow2 rotate: false - xy: 923, 179 + xy: 425, 25 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 snow3 rotate: false - xy: 933, 189 + xy: 381, 13 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 snowedge rotate: false - xy: 514, 195 + xy: 303, 5 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 spaceedge rotate: false - xy: 528, 195 + xy: 317, 5 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 stone-cliff-edge rotate: false - xy: 973, 215 + xy: 464, 58 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 stone-cliff-edge-1 rotate: false - xy: 983, 225 + xy: 840, 284 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 stone-cliff-edge-2 rotate: false - xy: 993, 235 + xy: 850, 284 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 stone-cliff-side rotate: false - xy: 933, 169 + xy: 860, 281 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 stone2 rotate: false - xy: 953, 195 + xy: 431, 15 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 stone3 rotate: false - xy: 963, 205 + xy: 431, 5 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 stoneedge rotate: false - xy: 542, 195 + xy: 436, 66 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 thorium1 rotate: false - xy: 943, 175 + xy: 870, 281 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 thorium2 rotate: false - xy: 953, 185 + xy: 880, 281 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 thorium3 rotate: false - xy: 963, 195 + xy: 890, 281 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 titanium1 rotate: false - xy: 973, 205 + xy: 900, 281 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 titanium2 rotate: false - xy: 983, 215 + xy: 910, 281 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 titanium3 rotate: false - xy: 993, 225 + xy: 920, 281 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 water-cliff-edge rotate: false - xy: 903, 159 + xy: 634, 194 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 water-cliff-edge-1 rotate: false - xy: 913, 159 + xy: 644, 194 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 water-cliff-edge-2 rotate: false - xy: 923, 159 + xy: 654, 194 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 water-cliff-side rotate: false - xy: 933, 159 + xy: 664, 194 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 wateredge rotate: false - xy: 540, 181 + xy: 765, 186 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 block-border rotate: false - xy: 481, 159 + xy: 831, 235 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-elevation rotate: false - xy: 491, 159 + xy: 831, 225 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 combustion-generator-top rotate: false - xy: 491, 159 + xy: 831, 225 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-middle rotate: false - xy: 544, 148 + xy: 474, 139 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 pump-liquid rotate: false - xy: 544, 148 + xy: 474, 139 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-slope rotate: false - xy: 544, 138 + xy: 484, 149 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 border rotate: false - xy: 554, 148 + xy: 474, 129 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 conduit-liquid rotate: false - xy: 793, 168 + xy: 511, 119 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 cross-1 rotate: false - xy: 833, 268 + xy: 594, 136 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 cross-2 rotate: false - xy: 919, 339 + xy: 863, 303 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 cross-3 rotate: false - xy: 609, 204 + xy: 661, 230 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -1140,7 +1140,7 @@ cross-4 index: -1 enemyspawn rotate: false - xy: 843, 258 + xy: 614, 146 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -1154,70 +1154,70 @@ nuclearreactor-shadow index: -1 place-arrow rotate: false - xy: 943, 225 + xy: 361, 33 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 playerspawn rotate: false - xy: 953, 235 + xy: 371, 33 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ripples rotate: false - xy: 570, 182 + xy: 875, 291 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 rubble-1-0 rotate: false - xy: 247, 99 + xy: 463, 166 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 rubble-1-1 rotate: false - xy: 229, 81 + xy: 997, 317 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 rubble-2-0 rotate: false - xy: 265, 99 + xy: 175, 99 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 rubble-2-1 rotate: false - xy: 247, 81 + xy: 193, 99 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 rubble-3-0 rotate: false - xy: 815, 368 + xy: 815, 342 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 rubble-3-1 rotate: false - xy: 815, 368 + xy: 815, 342 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 shadow-1 rotate: false - xy: 582, 180 + xy: 887, 291 size: 10, 10 orig: 10, 10 offset: 0, 0 @@ -1259,14 +1259,14 @@ shadow-6 index: -1 shadow-corner rotate: false - xy: 594, 180 + xy: 899, 291 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 shadow-round-1 rotate: false - xy: 606, 180 + xy: 911, 291 size: 10, 10 orig: 10, 10 offset: 0, 0 @@ -1294,245 +1294,245 @@ shadow-rounded-2 index: -1 bridge-conduit-arrow rotate: false - xy: 544, 128 + xy: 494, 149 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 bridge-conduit-bridge rotate: false - xy: 554, 138 + xy: 484, 139 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 bridge-conduit-end rotate: false - xy: 554, 128 + xy: 504, 149 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 conduit-bottom rotate: false - xy: 713, 165 + xy: 524, 139 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 conduit-bottom-0 rotate: false - xy: 723, 166 + xy: 514, 129 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 conduit-bottom-1 rotate: false - xy: 733, 166 + xy: 534, 139 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 conduit-bottom-2 rotate: false - xy: 743, 166 + xy: 524, 129 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 conduit-bottom-3 rotate: false - xy: 753, 166 + xy: 534, 129 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 conduit-bottom-4 rotate: false - xy: 763, 166 + xy: 481, 119 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 conduit-bottom-5 rotate: false - xy: 773, 166 + xy: 491, 119 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 conduit-bottom-6 rotate: false - xy: 783, 166 + xy: 501, 119 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 conduit-top-0 rotate: false - xy: 803, 168 + xy: 521, 119 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 conduit-top-1 rotate: false - xy: 813, 288 + xy: 531, 119 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 conduit-top-2 rotate: false - xy: 823, 288 + xy: 581, 166 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 conduit-top-3 rotate: false - xy: 811, 278 + xy: 581, 156 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 conduit-top-4 rotate: false - xy: 833, 288 + xy: 584, 176 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 conduit-top-5 rotate: false - xy: 821, 278 + xy: 544, 146 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 conduit-top-6 rotate: false - xy: 813, 268 + xy: 544, 136 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 liquid-router rotate: false - xy: 803, 158 + xy: 681, 156 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 liquid-router-bottom rotate: false - xy: 813, 158 + xy: 684, 176 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 liquid-router-liquid rotate: false - xy: 823, 158 + xy: 684, 146 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 liquid-router-top rotate: false - xy: 833, 158 + xy: 684, 136 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 liquid-tank-bottom rotate: false - xy: 661, 204 + xy: 711, 342 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 liquid-tank-liquid rotate: false - xy: 711, 368 + xy: 737, 368 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 liquid-tank-top rotate: false - xy: 711, 342 + xy: 737, 342 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 phase-conduit-arrow rotate: false - xy: 893, 179 + xy: 834, 128 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 phase-conduit-bridge rotate: false - xy: 903, 189 + xy: 831, 118 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 phase-conduit-end rotate: false - xy: 913, 199 + xy: 841, 118 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 pulse-conduit-top-0 rotate: false - xy: 963, 245 + xy: 381, 35 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 pulse-conduit-top-1 rotate: false - xy: 973, 255 + xy: 391, 35 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 pulse-conduit-top-2 rotate: false - xy: 983, 265 + xy: 401, 35 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 pulse-conduit-top-3 rotate: false - xy: 893, 169 + xy: 411, 35 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 pulse-conduit-top-4 rotate: false - xy: 903, 179 + xy: 421, 35 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 pulse-conduit-top-5 rotate: false - xy: 913, 189 + xy: 325, 23 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 pulse-conduit-top-6 rotate: false - xy: 923, 199 + xy: 335, 23 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -1623,28 +1623,28 @@ fusion-reactor-top index: -1 rtg-generator-top rotate: false - xy: 983, 255 + xy: 351, 13 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 thorium-reactor-center rotate: false - xy: 819, 316 + xy: 715, 290 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 thorium-reactor-lights rotate: false - xy: 715, 290 + xy: 741, 290 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 turbine-generator-top rotate: false - xy: 355, 99 + xy: 247, 81 size: 16, 16 orig: 16, 16 offset: 0, 0 @@ -1693,238 +1693,238 @@ block-icon-arc-smelter index: -1 arc-smelter-top rotate: false - xy: 813, 298 + xy: 427, 178 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 silicon-smelter-top rotate: false - xy: 813, 298 + xy: 427, 178 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 biomattercompressor rotate: false - xy: 427, 178 + xy: 445, 178 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 biomattercompressor-frame0 rotate: false - xy: 445, 178 + xy: 159, 5 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 biomattercompressor-frame1 rotate: false - xy: 831, 298 + xy: 679, 285 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 biomattercompressor-frame2 rotate: false - xy: 159, 5 + xy: 697, 285 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 biomattercompressor-liquid rotate: false - xy: 679, 285 + xy: 685, 267 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 biomattercompressor-top rotate: false - xy: 697, 285 + xy: 703, 267 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 blast-mixer rotate: false - xy: 685, 267 + xy: 721, 272 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 block-icon-blast-mixer rotate: false - xy: 685, 267 + xy: 721, 272 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 centrifuge-liquid rotate: false - xy: 881, 321 + xy: 917, 321 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 cryofluidmixer-bottom rotate: false - xy: 917, 321 + xy: 881, 303 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 cryofluidmixer-liquid rotate: false - xy: 949, 353 + xy: 899, 303 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 cryofluidmixer-top rotate: false - xy: 967, 353 + xy: 917, 303 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 cultivator rotate: false - xy: 985, 353 + xy: 949, 353 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 cultivator-middle rotate: false - xy: 687, 249 + xy: 967, 353 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 cultivator-top rotate: false - xy: 687, 231 + xy: 985, 353 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 lavasmelter rotate: false - xy: 285, 3 + xy: 661, 116 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 oilrefinery rotate: false - xy: 863, 259 + xy: 704, 136 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 phase-weaver rotate: false - xy: 466, 184 + xy: 267, 117 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 phase-weaver-bottom rotate: false - xy: 463, 166 + xy: 285, 117 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 phase-weaver-weave rotate: false - xy: 175, 99 + xy: 303, 117 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 plastanium-compressor-top rotate: false - xy: 193, 99 + xy: 321, 117 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 poweralloysmelter-top rotate: false - xy: 229, 99 + xy: 393, 117 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 pulverizer rotate: false - xy: 933, 209 + xy: 345, 23 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 pulverizer-rotator rotate: false - xy: 943, 215 + xy: 355, 23 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 separator-liquid rotate: false - xy: 983, 245 + xy: 395, 25 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 core-open rotate: false - xy: 635, 230 + xy: 609, 204 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 core-top rotate: false - xy: 583, 204 + xy: 635, 204 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 sortedunloader rotate: false - xy: 983, 235 + xy: 401, 5 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-1 rotate: false - xy: 403, 31 + xy: 831, 255 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-1-top rotate: false - xy: 403, 21 + xy: 831, 245 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-2 rotate: false - xy: 703, 267 + xy: 739, 272 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 block-2-top rotate: false - xy: 721, 272 + xy: 757, 272 size: 16, 16 orig: 16, 16 offset: 0, 0 @@ -1973,35 +1973,35 @@ arc-heat index: -1 cyclone rotate: false - xy: 635, 204 + xy: 661, 204 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 duo rotate: false - xy: 843, 268 + xy: 614, 176 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 fuse rotate: false - xy: 661, 230 + xy: 711, 368 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 spectre rotate: false - xy: 661, 230 + xy: 711, 368 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 hail rotate: false - xy: 217, 23 + xy: 631, 166 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -2015,14 +2015,14 @@ hail-heat index: -1 lancer rotate: false - xy: 285, 117 + xy: 985, 335 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 lancer-heat rotate: false - xy: 303, 117 + xy: 953, 305 size: 16, 16 orig: 16, 16 offset: 0, 0 @@ -2036,252 +2036,224 @@ meltdown index: -1 ripple rotate: false - xy: 793, 316 + xy: 807, 394 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 ripple-heat rotate: false - xy: 807, 394 + xy: 815, 368 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 salvo rotate: false - xy: 283, 99 + xy: 175, 81 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 salvo-heat rotate: false - xy: 265, 81 + xy: 211, 99 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 salvo-panel-left rotate: false - xy: 301, 99 + xy: 193, 81 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 salvo-panel-right rotate: false - xy: 283, 81 + xy: 229, 99 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 scatter rotate: false - xy: 953, 215 + xy: 371, 13 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 scorch rotate: false - xy: 963, 225 + xy: 371, 3 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 scorch-shoot rotate: false - xy: 973, 235 + xy: 385, 25 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 swarmer rotate: false - xy: 319, 99 + xy: 211, 81 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 wave rotate: false - xy: 391, 81 + xy: 301, 81 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 wave-liquid rotate: false - xy: 180, 63 + xy: 337, 99 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 dagger-pad-top rotate: false - xy: 687, 213 + xy: 687, 249 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 dagger-pad-top-open rotate: false - xy: 705, 249 + xy: 687, 231 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 drone-pad-top rotate: false - xy: 723, 236 + xy: 705, 249 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 drone-pad-top-open rotate: false - xy: 741, 254 + xy: 705, 231 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 fabricator-pad-top rotate: false - xy: 723, 218 + xy: 705, 213 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 fabricator-pad-top-open rotate: false - xy: 741, 236 + xy: 723, 254 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 interceptor-pad-top rotate: false - xy: 231, 117 + xy: 935, 301 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 interceptor-pad-top-open rotate: false - xy: 249, 117 + xy: 967, 335 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 -mech-factory +ship-factory rotate: false - xy: 737, 342 + xy: 819, 316 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 -dart-ship-factory-open - rotate: false - xy: 705, 231 - size: 16, 16 - orig: 16, 16 - offset: 0, 0 - index: -1 -delta-mech-factory-open - rotate: false - xy: 705, 213 - size: 16, 16 - orig: 16, 16 - offset: 0, 0 - index: -1 -javelin-ship-factory-open - rotate: false - xy: 267, 117 - size: 16, 16 - orig: 16, 16 - offset: 0, 0 - index: -1 monsoon-pad rotate: false - xy: 763, 368 + xy: 763, 342 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 monsoon-pad-top rotate: false - xy: 763, 342 + xy: 715, 316 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 titan-pad-top rotate: false - xy: 763, 342 + xy: 715, 316 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 monsoon-pad-top-open rotate: false - xy: 715, 316 + xy: 741, 316 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 titan-pad-top-open rotate: false - xy: 715, 316 + xy: 741, 316 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 reconstructor-open rotate: false - xy: 211, 81 + xy: 466, 184 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 repair-point-turret rotate: false - xy: 953, 225 + xy: 365, 23 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 resupply-point rotate: false - xy: 963, 235 + xy: 331, 13 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 -ship-factory - rotate: false - xy: 815, 342 - size: 24, 24 - orig: 24, 24 - offset: 0, 0 - index: -1 titan-pad rotate: false - xy: 741, 290 + xy: 767, 290 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 door-large-open rotate: false - xy: 723, 254 + xy: 687, 213 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 door-open rotate: false - xy: 841, 278 + xy: 611, 156 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -2316,56 +2288,56 @@ bullet index: -1 bullet-back rotate: false - xy: 618, 181 + xy: 923, 292 size: 9, 9 orig: 9, 9 offset: 0, 0 index: -1 casing rotate: false - xy: 845, 318 + xy: 827, 194 size: 2, 4 orig: 2, 4 offset: 0, 0 index: -1 clear rotate: false - xy: 481, 181 + xy: 551, 176 size: 1, 1 orig: 1, 1 offset: 0, 0 index: -1 command-attack rotate: false - xy: 683, 165 + xy: 514, 139 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 command-idle rotate: false - xy: 693, 165 + xy: 504, 129 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 command-retreat rotate: false - xy: 703, 165 + xy: 534, 149 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 enemyarrow rotate: false - xy: 853, 287 + xy: 431, 85 size: 8, 7 orig: 8, 7 offset: 0, 0 index: -1 error rotate: false - xy: 375, 37 + xy: 1003, 367 size: 12, 12 orig: 12, 12 offset: 0, 0 @@ -2407,14 +2379,14 @@ minelaser-end index: -1 missile rotate: false - xy: 629, 181 + xy: 934, 290 size: 9, 9 orig: 9, 9 offset: 0, 0 index: -1 missile-back rotate: false - xy: 640, 181 + xy: 945, 290 size: 9, 9 orig: 9, 9 offset: 0, 0 @@ -2456,21 +2428,21 @@ scorch5 index: -1 shell rotate: false - xy: 651, 181 + xy: 956, 294 size: 9, 9 orig: 9, 9 offset: 0, 0 index: -1 shell-back rotate: false - xy: 662, 181 + xy: 829, 275 size: 9, 9 orig: 9, 9 offset: 0, 0 index: -1 shot rotate: false - xy: 993, 255 + xy: 405, 25 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -2484,56 +2456,56 @@ transfer index: -1 transfer-arrow rotate: false - xy: 893, 159 + xy: 624, 194 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 transfer-end rotate: false - xy: 793, 296 + xy: 819, 296 size: 18, 18 orig: 18, 18 offset: 0, 0 index: -1 blackstone-cliff-edge rotate: false - xy: 406, 71 + xy: 1015, 319 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blackstone-cliff-edge-1 rotate: false - xy: 406, 61 + xy: 1015, 309 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blackstone-cliff-edge-2 rotate: false - xy: 403, 51 + xy: 829, 286 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blackstone-cliff-side rotate: false - xy: 403, 41 + xy: 831, 265 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-icon-arc rotate: false - xy: 739, 272 + xy: 775, 272 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 block-icon-biomattercompressor rotate: false - xy: 757, 272 + xy: 793, 272 size: 16, 16 orig: 16, 16 offset: 0, 0 @@ -2547,147 +2519,147 @@ block-icon-blast-drill index: -1 block-icon-bridge-conduit rotate: false - xy: 501, 159 + xy: 831, 215 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 bridge-conduit rotate: false - xy: 501, 159 + xy: 831, 215 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-icon-bridge-conveyor rotate: false - xy: 511, 159 + xy: 831, 205 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 bridge-conveyor rotate: false - xy: 511, 159 + xy: 831, 205 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-icon-centrifuge rotate: false - xy: 775, 272 + xy: 427, 160 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 centrifuge rotate: false - xy: 775, 272 + xy: 427, 160 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 block-icon-combustion-generator rotate: false - xy: 521, 159 + xy: 831, 195 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 combustion-generator rotate: false - xy: 521, 159 + xy: 831, 195 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-icon-command-center rotate: false - xy: 793, 278 + xy: 445, 160 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 command-center rotate: false - xy: 793, 278 + xy: 445, 160 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 block-icon-composite-wall rotate: false - xy: 531, 159 + xy: 486, 199 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 composite-wall rotate: false - xy: 531, 159 + xy: 486, 199 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-icon-composite-wall-large rotate: false - xy: 427, 160 + xy: 420, 142 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 composite-wall-large rotate: false - xy: 427, 160 + xy: 420, 142 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 block-icon-conduit rotate: false - xy: 541, 159 + xy: 496, 199 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-icon-conveyor rotate: false - xy: 551, 158 + xy: 506, 199 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 conveyor-0-0 rotate: false - xy: 551, 158 + xy: 506, 199 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-icon-copper-wall rotate: false - xy: 561, 158 + xy: 516, 199 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 copper-wall rotate: false - xy: 561, 158 + xy: 516, 199 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-icon-copper-wall-large rotate: false - xy: 445, 160 + xy: 438, 142 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 copper-wall-large rotate: false - xy: 445, 160 + xy: 438, 142 size: 16, 16 orig: 16, 16 offset: 0, 0 @@ -2708,14 +2680,14 @@ core index: -1 block-icon-cryofluidmixer rotate: false - xy: 420, 142 + xy: 853, 393 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 block-icon-cultivator rotate: false - xy: 438, 142 + xy: 871, 393 size: 16, 16 orig: 16, 16 offset: 0, 0 @@ -2729,168 +2701,168 @@ block-icon-cyclone index: -1 block-icon-dagger-pad rotate: false - xy: 853, 393 + xy: 889, 393 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 block-icon-dart-ship-factory rotate: false - xy: 871, 393 + xy: 907, 393 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 dart-ship-factory rotate: false - xy: 871, 393 + xy: 907, 393 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 block-icon-deepwater rotate: false - xy: 683, 185 + xy: 526, 199 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 deepwater rotate: false - xy: 683, 185 + xy: 526, 199 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-icon-deflector-wall rotate: false - xy: 693, 185 + xy: 536, 199 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 deflector-wall rotate: false - xy: 693, 185 + xy: 536, 199 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-icon-deflector-wall-large rotate: false - xy: 889, 393 + xy: 925, 393 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 deflector-wall-large rotate: false - xy: 889, 393 + xy: 925, 393 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 block-icon-delta-mech-factory rotate: false - xy: 907, 393 + xy: 943, 389 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 delta-mech-factory rotate: false - xy: 907, 393 + xy: 943, 389 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 block-icon-dirt rotate: false - xy: 703, 185 + xy: 546, 199 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 dirt1 rotate: false - xy: 703, 185 + xy: 546, 199 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-icon-distributor rotate: false - xy: 925, 393 + xy: 961, 389 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 distributor rotate: false - xy: 925, 393 + xy: 961, 389 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 block-icon-door rotate: false - xy: 713, 185 + xy: 484, 189 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 door rotate: false - xy: 713, 185 + xy: 484, 189 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-icon-door-large rotate: false - xy: 943, 389 + xy: 979, 389 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 door-large rotate: false - xy: 943, 389 + xy: 979, 389 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 block-icon-drone-pad rotate: false - xy: 961, 389 + xy: 997, 393 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 block-icon-drop-point rotate: false - xy: 413, 51 + xy: 494, 189 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 drop-point rotate: false - xy: 413, 51 + xy: 494, 189 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-icon-duo rotate: false - xy: 413, 41 + xy: 504, 189 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-icon-fabricator-pad rotate: false - xy: 979, 389 + xy: 811, 272 size: 16, 16 orig: 16, 16 offset: 0, 0 @@ -2909,233 +2881,247 @@ block-icon-fusion-reactor orig: 32, 32 offset: 0, 0 index: -1 -block-icon-grass - rotate: false - xy: 413, 31 - size: 8, 8 - orig: 8, 8 - offset: 0, 0 - index: -1 -grass1 - rotate: false - xy: 413, 31 - size: 8, 8 - orig: 8, 8 - offset: 0, 0 - index: -1 -block-icon-hail - rotate: false - xy: 413, 21 - size: 8, 8 - orig: 8, 8 - offset: 0, 0 - index: -1 -block-icon-ice - rotate: false - xy: 474, 149 - size: 8, 8 - orig: 8, 8 - offset: 0, 0 - index: -1 -ice1 - rotate: false - xy: 474, 149 - size: 8, 8 - orig: 8, 8 - offset: 0, 0 - index: -1 -block-icon-icerock - rotate: false - xy: 474, 139 - size: 8, 8 - orig: 8, 8 - offset: 0, 0 - index: -1 -icerock1 - rotate: false - xy: 474, 139 - size: 8, 8 - orig: 8, 8 - offset: 0, 0 - index: -1 -block-icon-incinerator - rotate: false - xy: 484, 149 - size: 8, 8 - orig: 8, 8 - offset: 0, 0 - index: -1 -incinerator - rotate: false - xy: 484, 149 - size: 8, 8 - orig: 8, 8 - offset: 0, 0 - index: -1 -block-icon-interceptor-pad - rotate: false - xy: 997, 393 - size: 16, 16 - orig: 16, 16 - offset: 0, 0 - index: -1 -block-icon-itemsource - rotate: false - xy: 474, 129 - size: 8, 8 - orig: 8, 8 - offset: 0, 0 - index: -1 -itemsource - rotate: false - xy: 474, 129 - size: 8, 8 - orig: 8, 8 - offset: 0, 0 - index: -1 -block-icon-itemvoid - rotate: false - xy: 484, 139 - size: 8, 8 - orig: 8, 8 - offset: 0, 0 - index: -1 -itemvoid - rotate: false - xy: 484, 139 - size: 8, 8 - orig: 8, 8 - offset: 0, 0 - index: -1 -block-icon-javelin-ship-factory - rotate: false - xy: 420, 124 - size: 16, 16 - orig: 16, 16 - offset: 0, 0 - index: -1 -javelin-ship-factory - rotate: false - xy: 420, 124 - size: 16, 16 - orig: 16, 16 - offset: 0, 0 - index: -1 -block-icon-junction - rotate: false - xy: 494, 149 - size: 8, 8 - orig: 8, 8 - offset: 0, 0 - index: -1 -junction - rotate: false - xy: 494, 149 - size: 8, 8 - orig: 8, 8 - offset: 0, 0 - index: -1 -block-icon-lancer - rotate: false - xy: 438, 124 - size: 16, 16 - orig: 16, 16 - offset: 0, 0 - index: -1 -block-icon-laser-drill - rotate: false - xy: 841, 372 - size: 16, 16 - orig: 16, 16 - offset: 0, 0 - index: -1 -block-icon-lava - rotate: false - xy: 484, 129 - size: 8, 8 - orig: 8, 8 - offset: 0, 0 - index: -1 -lava - rotate: false - xy: 484, 129 - size: 8, 8 - orig: 8, 8 - offset: 0, 0 - index: -1 -block-icon-liquid-junction - rotate: false - xy: 494, 139 - size: 8, 8 - orig: 8, 8 - offset: 0, 0 - index: -1 -liquid-junction - rotate: false - xy: 494, 139 - size: 8, 8 - orig: 8, 8 - offset: 0, 0 - index: -1 -block-icon-liquid-router - rotate: false - xy: 504, 149 - size: 8, 8 - orig: 8, 8 - offset: 0, 0 - index: -1 -block-icon-liquid-tank +block-icon-glaive-ship-factory rotate: false xy: 281, 135 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 -block-icon-liquidsource +glaive-ship-factory rotate: false - xy: 494, 129 - size: 8, 8 - orig: 8, 8 - offset: 0, 0 - index: -1 -liquidsource - rotate: false - xy: 494, 129 - size: 8, 8 - orig: 8, 8 - offset: 0, 0 - index: -1 -block-icon-mass-driver - rotate: false - xy: 307, 135 + xy: 281, 135 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 -mass-driver +block-icon-grass rotate: false - xy: 307, 135 - size: 24, 24 - orig: 24, 24 + xy: 514, 189 + size: 8, 8 + orig: 8, 8 offset: 0, 0 index: -1 -block-icon-mechanical-drill +grass1 + rotate: false + xy: 514, 189 + size: 8, 8 + orig: 8, 8 + offset: 0, 0 + index: -1 +block-icon-hail + rotate: false + xy: 524, 189 + size: 8, 8 + orig: 8, 8 + offset: 0, 0 + index: -1 +block-icon-ice + rotate: false + xy: 534, 189 + size: 8, 8 + orig: 8, 8 + offset: 0, 0 + index: -1 +ice1 + rotate: false + xy: 534, 189 + size: 8, 8 + orig: 8, 8 + offset: 0, 0 + index: -1 +block-icon-icerock + rotate: false + xy: 544, 189 + size: 8, 8 + orig: 8, 8 + offset: 0, 0 + index: -1 +icerock1 + rotate: false + xy: 544, 189 + size: 8, 8 + orig: 8, 8 + offset: 0, 0 + index: -1 +block-icon-incinerator + rotate: false + xy: 556, 196 + size: 8, 8 + orig: 8, 8 + offset: 0, 0 + index: -1 +incinerator + rotate: false + xy: 556, 196 + size: 8, 8 + orig: 8, 8 + offset: 0, 0 + index: -1 +block-icon-interceptor-pad + rotate: false + xy: 420, 124 + size: 16, 16 + orig: 16, 16 + offset: 0, 0 + index: -1 +block-icon-itemsource + rotate: false + xy: 566, 196 + size: 8, 8 + orig: 8, 8 + offset: 0, 0 + index: -1 +itemsource + rotate: false + xy: 566, 196 + size: 8, 8 + orig: 8, 8 + offset: 0, 0 + index: -1 +block-icon-itemvoid + rotate: false + xy: 484, 179 + size: 8, 8 + orig: 8, 8 + offset: 0, 0 + index: -1 +itemvoid + rotate: false + xy: 484, 179 + size: 8, 8 + orig: 8, 8 + offset: 0, 0 + index: -1 +block-icon-javelin-ship-factory + rotate: false + xy: 438, 124 + size: 16, 16 + orig: 16, 16 + offset: 0, 0 + index: -1 +javelin-ship-factory + rotate: false + xy: 438, 124 + size: 16, 16 + orig: 16, 16 + offset: 0, 0 + index: -1 +block-icon-junction + rotate: false + xy: 494, 179 + size: 8, 8 + orig: 8, 8 + offset: 0, 0 + index: -1 +junction + rotate: false + xy: 494, 179 + size: 8, 8 + orig: 8, 8 + offset: 0, 0 + index: -1 +block-icon-lancer + rotate: false + xy: 841, 372 + size: 16, 16 + orig: 16, 16 + offset: 0, 0 + index: -1 +block-icon-laser-drill rotate: false xy: 841, 354 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 +block-icon-lava + rotate: false + xy: 504, 179 + size: 8, 8 + orig: 8, 8 + offset: 0, 0 + index: -1 +lava + rotate: false + xy: 504, 179 + size: 8, 8 + orig: 8, 8 + offset: 0, 0 + index: -1 +block-icon-liquid-junction + rotate: false + xy: 514, 179 + size: 8, 8 + orig: 8, 8 + offset: 0, 0 + index: -1 +liquid-junction + rotate: false + xy: 514, 179 + size: 8, 8 + orig: 8, 8 + offset: 0, 0 + index: -1 +block-icon-liquid-router + rotate: false + xy: 524, 179 + size: 8, 8 + orig: 8, 8 + offset: 0, 0 + index: -1 +block-icon-liquid-tank + rotate: false + xy: 307, 135 + size: 24, 24 + orig: 24, 24 + offset: 0, 0 + index: -1 +block-icon-liquidsource + rotate: false + xy: 534, 179 + size: 8, 8 + orig: 8, 8 + offset: 0, 0 + index: -1 +liquidsource + rotate: false + xy: 534, 179 + size: 8, 8 + orig: 8, 8 + offset: 0, 0 + index: -1 +block-icon-mass-driver + rotate: false + xy: 333, 135 + size: 24, 24 + orig: 24, 24 + offset: 0, 0 + index: -1 +mass-driver + rotate: false + xy: 333, 135 + size: 24, 24 + orig: 24, 24 + offset: 0, 0 + index: -1 +block-icon-mechanical-drill + rotate: false + xy: 859, 375 + size: 16, 16 + orig: 16, 16 + offset: 0, 0 + index: -1 block-icon-mechanical-pump rotate: false - xy: 504, 139 + xy: 544, 179 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 mechanical-pump rotate: false - xy: 504, 139 + xy: 544, 179 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -3149,133 +3135,147 @@ block-icon-meltdown index: -1 block-icon-melter rotate: false - xy: 514, 149 + xy: 554, 186 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 melter rotate: false - xy: 514, 149 + xy: 554, 186 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-icon-metalfloor rotate: false - xy: 504, 129 + xy: 564, 186 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 metalfloor1 rotate: false - xy: 504, 129 + xy: 564, 186 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-icon-monsoon-pad rotate: false - xy: 333, 135 + xy: 359, 135 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 block-icon-oil rotate: false - xy: 514, 139 + xy: 481, 169 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 oil rotate: false - xy: 514, 139 + xy: 481, 169 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-icon-oil-extractor rotate: false - xy: 359, 135 + xy: 385, 135 + size: 24, 24 + orig: 24, 24 + offset: 0, 0 + index: -1 +block-icon-omega-mech-factory + rotate: false + xy: 572, 256 + size: 24, 24 + orig: 24, 24 + offset: 0, 0 + index: -1 +omega-mech-factory + rotate: false + xy: 572, 256 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 block-icon-overflow-gate rotate: false - xy: 524, 149 + xy: 491, 169 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 overflow-gate rotate: false - xy: 524, 149 + xy: 491, 169 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-icon-phase-conduit rotate: false - xy: 514, 129 + xy: 501, 169 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 phase-conduit rotate: false - xy: 514, 129 + xy: 501, 169 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-icon-phase-conveyor rotate: false - xy: 524, 139 + xy: 511, 169 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 phase-conveyor rotate: false - xy: 524, 139 + xy: 511, 169 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-icon-phase-wall rotate: false - xy: 534, 149 + xy: 521, 169 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 phase-wall rotate: false - xy: 534, 149 + xy: 521, 169 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-icon-phase-wall-large rotate: false - xy: 859, 375 + xy: 859, 357 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 phase-wall-large rotate: false - xy: 859, 375 + xy: 859, 357 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 block-icon-phase-weaver rotate: false - xy: 859, 357 + xy: 877, 375 size: 16, 16 orig: 16, 16 offset: 0, 0 @@ -3289,392 +3289,392 @@ block-icon-plasma-drill index: -1 block-icon-plastanium-compressor rotate: false - xy: 877, 375 + xy: 877, 357 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 plastanium-compressor rotate: false - xy: 877, 375 + xy: 877, 357 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 block-icon-pneumatic-drill rotate: false - xy: 877, 357 + xy: 895, 375 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 block-icon-power-node rotate: false - xy: 524, 129 + xy: 531, 169 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 power-node rotate: false - xy: 524, 129 + xy: 531, 169 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-icon-power-node-large rotate: false - xy: 895, 375 + xy: 895, 357 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 power-node-large rotate: false - xy: 895, 375 + xy: 895, 357 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 block-icon-powerinfinite rotate: false - xy: 534, 139 + xy: 541, 169 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 powerinfinite rotate: false - xy: 534, 139 + xy: 541, 169 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-icon-powervoid rotate: false - xy: 534, 129 + xy: 554, 176 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 powervoid rotate: false - xy: 534, 129 + xy: 554, 176 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-icon-pulse-conduit rotate: false - xy: 474, 119 + xy: 564, 176 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-icon-pulverizer rotate: false - xy: 484, 119 + xy: 469, 84 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-icon-pyratite-mixer rotate: false - xy: 895, 357 + xy: 913, 375 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 pyratite-mixer rotate: false - xy: 895, 357 + xy: 913, 375 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 block-icon-reconstructor rotate: false - xy: 913, 375 + xy: 913, 357 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 dagger-pad rotate: false - xy: 913, 375 + xy: 913, 357 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 drone-pad rotate: false - xy: 913, 375 + xy: 913, 357 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 fabricator-pad rotate: false - xy: 913, 375 + xy: 913, 357 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 interceptor-pad rotate: false - xy: 913, 375 + xy: 913, 357 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 reconstructor rotate: false - xy: 913, 375 + xy: 913, 357 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 block-icon-repair-point rotate: false - xy: 494, 119 + xy: 479, 86 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 repair-point rotate: false - xy: 494, 119 + xy: 479, 86 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-icon-ripple rotate: false - xy: 385, 135 + xy: 598, 256 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 block-icon-rock rotate: false - xy: 504, 119 + xy: 956, 284 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 rock1 rotate: false - xy: 504, 119 + xy: 956, 284 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-icon-rotary-pump rotate: false - xy: 913, 357 + xy: 931, 363 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 rotary-pump rotate: false - xy: 913, 357 + xy: 931, 363 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 block-icon-router rotate: false - xy: 514, 119 + xy: 967, 295 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 router rotate: false - xy: 514, 119 + xy: 967, 295 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-icon-rtg-generator rotate: false - xy: 524, 119 + xy: 551, 166 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 rtg-generator rotate: false - xy: 524, 119 + xy: 551, 166 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-icon-salvo rotate: false - xy: 931, 363 + xy: 949, 371 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 block-icon-sand rotate: false - xy: 534, 119 + xy: 561, 166 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 sand1 rotate: false - xy: 534, 119 + xy: 561, 166 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-icon-scorch rotate: false - xy: 683, 175 + xy: 481, 159 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-icon-separator rotate: false - xy: 693, 175 + xy: 491, 159 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 separator rotate: false - xy: 693, 175 + xy: 491, 159 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-icon-shrub rotate: false - xy: 703, 175 + xy: 501, 159 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 shrub rotate: false - xy: 703, 175 + xy: 501, 159 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-icon-silicon-smelter rotate: false - xy: 949, 371 + xy: 967, 371 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 silicon-smelter rotate: false - xy: 949, 371 + xy: 967, 371 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 block-icon-smelter rotate: false - xy: 713, 175 + xy: 511, 159 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 smelter rotate: false - xy: 713, 175 + xy: 511, 159 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-icon-snow rotate: false - xy: 723, 176 + xy: 521, 159 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 snow1 rotate: false - xy: 723, 176 + xy: 521, 159 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-icon-solar-panel rotate: false - xy: 733, 176 + xy: 531, 159 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 solar-panel rotate: false - xy: 733, 176 + xy: 531, 159 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-icon-solar-panel-large rotate: false - xy: 572, 256 + xy: 624, 256 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 solar-panel-large rotate: false - xy: 572, 256 + xy: 624, 256 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 block-icon-solidifer rotate: false - xy: 743, 176 + xy: 541, 159 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 solidifer rotate: false - xy: 743, 176 + xy: 541, 159 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-icon-sorter rotate: false - xy: 753, 176 + xy: 551, 156 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 sorter rotate: false - xy: 753, 176 + xy: 551, 156 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-icon-space rotate: false - xy: 763, 176 + xy: 561, 156 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 space rotate: false - xy: 763, 176 + xy: 561, 156 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -3688,1260 +3688,1281 @@ block-icon-spectre index: -1 block-icon-stone rotate: false - xy: 773, 176 + xy: 571, 166 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 stone1 rotate: false - xy: 773, 176 + xy: 571, 166 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-icon-swarmer rotate: false - xy: 967, 371 + xy: 985, 371 + size: 16, 16 + orig: 16, 16 + offset: 0, 0 + index: -1 +block-icon-tau-mech-factory + rotate: false + xy: 845, 324 + size: 16, 16 + orig: 16, 16 + offset: 0, 0 + index: -1 +tau-mech-factory + rotate: false + xy: 845, 324 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 block-icon-thermal-generator rotate: false - xy: 985, 371 + xy: 865, 339 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 thermal-generator rotate: false - xy: 985, 371 + xy: 865, 339 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 block-icon-thermal-pump rotate: false - xy: 845, 324 + xy: 883, 339 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 thermal-pump rotate: false - xy: 845, 324 + xy: 883, 339 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 block-icon-thorium-reactor rotate: false - xy: 598, 256 + xy: 650, 256 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 thorium-reactor rotate: false - xy: 598, 256 + xy: 650, 256 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 block-icon-thorium-wall rotate: false - xy: 783, 176 + xy: 571, 156 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 thorium-wall rotate: false - xy: 783, 176 + xy: 571, 156 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-icon-thorium-wall-large rotate: false - xy: 865, 339 + xy: 901, 339 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 thorium-wall-large rotate: false - xy: 865, 339 + xy: 901, 339 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 block-icon-titan-pad rotate: false - xy: 624, 256 + xy: 583, 230 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 block-icon-titanium-conveyor rotate: false - xy: 793, 178 + xy: 574, 176 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 titanium-conveyor-0-0 rotate: false - xy: 793, 178 + xy: 574, 176 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 -block-icon-turbine-generator - rotate: false - xy: 883, 339 - size: 16, 16 - orig: 16, 16 - offset: 0, 0 - index: -1 -turbine-generator - rotate: false - xy: 883, 339 - size: 16, 16 - orig: 16, 16 - offset: 0, 0 - index: -1 -block-icon-unloader - rotate: false - xy: 803, 178 - size: 8, 8 - orig: 8, 8 - offset: 0, 0 - index: -1 -unloader - rotate: false - xy: 803, 178 - size: 8, 8 - orig: 8, 8 - offset: 0, 0 - index: -1 -block-icon-vault - rotate: false - xy: 650, 256 - size: 24, 24 - orig: 24, 24 - offset: 0, 0 - index: -1 -vault - rotate: false - xy: 650, 256 - size: 24, 24 - orig: 24, 24 - offset: 0, 0 - index: -1 -block-icon-warp-gate - rotate: false - xy: 583, 230 - size: 24, 24 - orig: 24, 24 - offset: 0, 0 - index: -1 -warp-gate - rotate: false - xy: 583, 230 - size: 24, 24 - orig: 24, 24 - offset: 0, 0 - index: -1 -block-icon-water - rotate: false - xy: 673, 172 - size: 8, 8 - orig: 8, 8 - offset: 0, 0 - index: -1 -water - rotate: false - xy: 673, 172 - size: 8, 8 - orig: 8, 8 - offset: 0, 0 - index: -1 -block-icon-water-extractor - rotate: false - xy: 901, 339 - size: 16, 16 - orig: 16, 16 - offset: 0, 0 - index: -1 -block-icon-wave +block-icon-trident-ship-factory rotate: false xy: 863, 321 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 +trident-ship-factory + rotate: false + xy: 863, 321 + size: 16, 16 + orig: 16, 16 + offset: 0, 0 + index: -1 +block-icon-turbine-generator + rotate: false + xy: 881, 321 + size: 16, 16 + orig: 16, 16 + offset: 0, 0 + index: -1 +turbine-generator + rotate: false + xy: 881, 321 + size: 16, 16 + orig: 16, 16 + offset: 0, 0 + index: -1 +block-icon-unloader + rotate: false + xy: 574, 186 + size: 8, 8 + orig: 8, 8 + offset: 0, 0 + index: -1 +unloader + rotate: false + xy: 574, 186 + size: 8, 8 + orig: 8, 8 + offset: 0, 0 + index: -1 +block-icon-vault + rotate: false + xy: 609, 230 + size: 24, 24 + orig: 24, 24 + offset: 0, 0 + index: -1 +vault + rotate: false + xy: 609, 230 + size: 24, 24 + orig: 24, 24 + offset: 0, 0 + index: -1 +block-icon-warp-gate + rotate: false + xy: 635, 230 + size: 24, 24 + orig: 24, 24 + offset: 0, 0 + index: -1 +warp-gate + rotate: false + xy: 635, 230 + size: 24, 24 + orig: 24, 24 + offset: 0, 0 + index: -1 +block-icon-water + rotate: false + xy: 474, 149 + size: 8, 8 + orig: 8, 8 + offset: 0, 0 + index: -1 +water + rotate: false + xy: 474, 149 + size: 8, 8 + orig: 8, 8 + offset: 0, 0 + index: -1 +block-icon-water-extractor + rotate: false + xy: 899, 321 + size: 16, 16 + orig: 16, 16 + offset: 0, 0 + index: -1 +block-icon-wave + rotate: false + xy: 919, 339 + size: 16, 16 + orig: 16, 16 + offset: 0, 0 + index: -1 deepwater-cliff-edge rotate: false - xy: 833, 258 + xy: 594, 126 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 deepwater-cliff-edge-1 rotate: false - xy: 833, 248 + xy: 591, 116 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 deepwater-cliff-edge-2 rotate: false - xy: 833, 238 + xy: 601, 166 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 deepwater-cliff-side rotate: false - xy: 833, 228 + xy: 601, 156 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 dirt-cliff-edge rotate: false - xy: 833, 198 + xy: 604, 136 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 dirt-cliff-edge-1 rotate: false - xy: 833, 188 + xy: 604, 126 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 dirt-cliff-edge-2 rotate: false - xy: 833, 178 + xy: 601, 116 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 dirt-cliff-side rotate: false - xy: 833, 168 + xy: 611, 166 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 lava-cliff-edge rotate: false - xy: 265, 3 + xy: 664, 176 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 lava-cliff-edge-1 rotate: false - xy: 275, 13 + xy: 664, 146 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 lava-cliff-edge-2 rotate: false - xy: 275, 3 + xy: 664, 136 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 lava-cliff-side rotate: false - xy: 285, 13 + xy: 664, 126 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 liquid-icon-cryofluid rotate: false - xy: 409, 107 + xy: 674, 136 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 liquid-icon-lava rotate: false - xy: 409, 97 + xy: 674, 126 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 liquid-icon-oil rotate: false - xy: 409, 87 + xy: 671, 116 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 liquid-icon-water rotate: false - xy: 793, 158 + xy: 681, 166 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 mech-icon-alpha-mech rotate: false - xy: 191, 3 + xy: 191, 5 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 mech-icon-dart-ship rotate: false - xy: 723, 186 + xy: 205, 5 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 mech-icon-delta-mech rotate: false - xy: 737, 186 + xy: 219, 5 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 -mech-icon-halberd-ship - rotate: false - xy: 255, 49 - size: 14, 14 - orig: 14, 14 - offset: 0, 0 - index: -1 mech-icon-omega-mech rotate: false - xy: 255, 33 + xy: 399, 85 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 mech-icon-tau-mech rotate: false - xy: 751, 186 + xy: 233, 5 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 mech-icon-trident-ship rotate: false - xy: 271, 49 + xy: 356, 67 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 trident-ship rotate: false - xy: 271, 49 + xy: 356, 67 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 metalfloor-cliff-edge rotate: false - xy: 903, 279 + xy: 694, 146 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 metalfloor-cliff-edge-1 rotate: false - xy: 913, 279 + xy: 694, 136 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 metalfloor-cliff-edge-2 rotate: false - xy: 923, 279 + xy: 694, 126 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 metalfloor-cliff-side rotate: false - xy: 933, 279 + xy: 691, 116 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 oil-cliff-edge rotate: false - xy: 853, 277 + xy: 701, 166 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 oil-cliff-edge-1 rotate: false - xy: 853, 267 + xy: 701, 156 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 oil-cliff-edge-2 rotate: false - xy: 863, 269 + xy: 704, 176 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 oil-cliff-side rotate: false - xy: 853, 257 + xy: 704, 146 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-coal-blackstone1 rotate: false - xy: 873, 269 + xy: 704, 126 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-coal-blackstone2 rotate: false - xy: 853, 247 + xy: 701, 116 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-coal-blackstone3 rotate: false - xy: 863, 249 + xy: 711, 166 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-coal-grass1 rotate: false - xy: 873, 259 + xy: 711, 156 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-coal-grass2 rotate: false - xy: 883, 269 + xy: 714, 176 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-coal-grass3 rotate: false - xy: 853, 237 + xy: 724, 176 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-coal-ice1 rotate: false - xy: 863, 239 + xy: 721, 166 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-coal-ice2 rotate: false - xy: 873, 249 + xy: 734, 176 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-coal-ice3 rotate: false - xy: 883, 259 + xy: 721, 156 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-coal-sand1 rotate: false - xy: 893, 269 + xy: 714, 146 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-coal-sand2 rotate: false - xy: 853, 227 + xy: 731, 166 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-coal-sand3 rotate: false - xy: 863, 229 + xy: 744, 176 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-coal-snow1 rotate: false - xy: 873, 239 + xy: 714, 136 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-coal-snow2 rotate: false - xy: 883, 249 + xy: 731, 156 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-coal-snow3 rotate: false - xy: 893, 259 + xy: 724, 146 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-coal-stone1 rotate: false - xy: 903, 269 + xy: 741, 166 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-coal-stone2 rotate: false - xy: 853, 217 + xy: 754, 176 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-coal-stone3 rotate: false - xy: 863, 219 + xy: 714, 126 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-copper-blackstone1 rotate: false - xy: 873, 229 + xy: 711, 116 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-copper-blackstone2 rotate: false - xy: 883, 239 + xy: 724, 136 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-copper-blackstone3 rotate: false - xy: 893, 249 + xy: 741, 156 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-copper-grass1 rotate: false - xy: 903, 259 + xy: 734, 146 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-copper-grass2 rotate: false - xy: 913, 269 + xy: 751, 166 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-copper-grass3 rotate: false - xy: 853, 207 + xy: 764, 176 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-copper-ice1 rotate: false - xy: 863, 209 + xy: 724, 126 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-copper-ice2 rotate: false - xy: 873, 219 + xy: 721, 116 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-copper-ice3 rotate: false - xy: 883, 229 + xy: 734, 136 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-copper-sand1 rotate: false - xy: 893, 239 + xy: 751, 156 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-copper-sand2 rotate: false - xy: 903, 249 + xy: 744, 146 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-copper-sand3 rotate: false - xy: 913, 259 + xy: 761, 166 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-copper-snow1 rotate: false - xy: 923, 269 + xy: 734, 126 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-copper-snow2 rotate: false - xy: 853, 197 + xy: 731, 116 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-copper-snow3 rotate: false - xy: 863, 199 + xy: 744, 136 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-copper-stone1 rotate: false - xy: 873, 209 + xy: 761, 156 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-copper-stone2 rotate: false - xy: 883, 219 + xy: 754, 146 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-copper-stone3 rotate: false - xy: 893, 229 + xy: 744, 126 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-lead-blackstone1 rotate: false - xy: 903, 239 + xy: 741, 116 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-lead-blackstone2 rotate: false - xy: 913, 249 + xy: 754, 136 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-lead-blackstone3 rotate: false - xy: 923, 259 + xy: 754, 126 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-lead-grass1 rotate: false - xy: 933, 269 + xy: 751, 116 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-lead-grass2 rotate: false - xy: 943, 275 + xy: 764, 146 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-lead-grass3 rotate: false - xy: 853, 187 + xy: 764, 136 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-lead-ice1 rotate: false - xy: 863, 189 + xy: 764, 126 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-lead-ice2 rotate: false - xy: 873, 199 + xy: 761, 116 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-lead-ice3 rotate: false - xy: 883, 209 + xy: 774, 176 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-lead-sand1 rotate: false - xy: 893, 219 + xy: 771, 166 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-lead-sand2 rotate: false - xy: 903, 229 + xy: 771, 156 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-lead-sand3 rotate: false - xy: 913, 239 + xy: 784, 178 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-lead-snow1 rotate: false - xy: 923, 249 + xy: 794, 178 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-lead-snow2 rotate: false - xy: 933, 259 + xy: 804, 178 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-lead-snow3 rotate: false - xy: 953, 275 + xy: 814, 178 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-lead-stone1 rotate: false - xy: 943, 265 + xy: 774, 146 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-lead-stone2 rotate: false - xy: 853, 177 + xy: 774, 136 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-lead-stone3 rotate: false - xy: 863, 179 + xy: 774, 126 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-thorium-blackstone1 rotate: false - xy: 873, 189 + xy: 771, 116 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-thorium-blackstone2 rotate: false - xy: 883, 199 + xy: 824, 178 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-thorium-blackstone3 rotate: false - xy: 893, 209 + xy: 781, 166 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-thorium-grass1 rotate: false - xy: 903, 219 + xy: 781, 156 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-thorium-grass2 rotate: false - xy: 913, 229 + xy: 791, 168 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-thorium-grass3 rotate: false - xy: 923, 239 + xy: 791, 158 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-thorium-ice1 rotate: false - xy: 933, 249 + xy: 801, 168 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-thorium-ice2 rotate: false - xy: 963, 275 + xy: 801, 158 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-thorium-ice3 rotate: false - xy: 943, 255 + xy: 811, 168 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-thorium-sand1 rotate: false - xy: 953, 265 + xy: 811, 158 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-thorium-sand2 rotate: false - xy: 853, 167 + xy: 821, 168 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-thorium-sand3 rotate: false - xy: 863, 169 + xy: 821, 158 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-thorium-snow1 rotate: false - xy: 873, 179 + xy: 784, 146 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-thorium-snow2 rotate: false - xy: 883, 189 + xy: 784, 136 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-thorium-snow3 rotate: false - xy: 893, 199 + xy: 784, 126 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-thorium-stone1 rotate: false - xy: 903, 209 + xy: 781, 116 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-thorium-stone2 rotate: false - xy: 913, 219 + xy: 794, 148 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-thorium-stone3 rotate: false - xy: 923, 229 + xy: 794, 138 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-titanium-blackstone1 rotate: false - xy: 933, 239 + xy: 804, 148 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-titanium-blackstone2 rotate: false - xy: 973, 275 + xy: 794, 128 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-titanium-blackstone3 rotate: false - xy: 943, 245 + xy: 804, 138 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-titanium-grass1 rotate: false - xy: 953, 255 + xy: 814, 148 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-titanium-grass2 rotate: false - xy: 963, 265 + xy: 804, 128 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-titanium-grass3 rotate: false - xy: 873, 169 + xy: 814, 138 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-titanium-ice1 rotate: false - xy: 883, 179 + xy: 814, 128 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-titanium-ice2 rotate: false - xy: 893, 189 + xy: 824, 148 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-titanium-ice3 rotate: false - xy: 903, 199 + xy: 824, 138 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-titanium-sand1 rotate: false - xy: 913, 209 + xy: 824, 128 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-titanium-sand2 rotate: false - xy: 923, 219 + xy: 791, 116 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-titanium-sand3 rotate: false - xy: 933, 229 + xy: 801, 118 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-titanium-snow1 rotate: false - xy: 983, 275 + xy: 811, 118 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-titanium-snow2 rotate: false - xy: 943, 235 + xy: 821, 118 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-titanium-snow3 rotate: false - xy: 953, 245 + xy: 831, 168 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-titanium-stone1 rotate: false - xy: 963, 255 + xy: 831, 158 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-titanium-stone2 rotate: false - xy: 973, 265 + xy: 834, 148 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-titanium-stone3 rotate: false - xy: 883, 169 + xy: 834, 138 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 sand-cliff-edge rotate: false - xy: 913, 179 + xy: 341, 3 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 sand-cliff-edge-1 rotate: false - xy: 923, 189 + xy: 351, 3 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 sand-cliff-edge-2 rotate: false - xy: 933, 199 + xy: 361, 3 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 sand-cliff-side rotate: false - xy: 943, 205 + xy: 375, 23 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 snow-cliff-edge rotate: false - xy: 943, 195 + xy: 381, 3 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 snow-cliff-edge-1 rotate: false - xy: 953, 205 + xy: 391, 15 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 snow-cliff-edge-2 rotate: false - xy: 963, 215 + xy: 391, 5 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 snow-cliff-side rotate: false - xy: 973, 225 + xy: 401, 15 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 space-cliff-edge rotate: false - xy: 993, 245 + xy: 411, 15 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 space-cliff-edge-1 rotate: false - xy: 923, 169 + xy: 411, 5 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 space-cliff-edge-2 rotate: false - xy: 933, 179 + xy: 421, 15 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 space-cliff-side rotate: false - xy: 943, 185 + xy: 421, 5 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 unit-icon-dagger rotate: false - xy: 526, 181 + xy: 751, 186 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 unit-icon-titan rotate: false - xy: 337, 81 + xy: 283, 99 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 item-biomatter rotate: false - xy: 297, 23 + xy: 641, 156 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 item-blast-compound rotate: false - xy: 307, 23 + xy: 644, 176 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 item-coal rotate: false - xy: 205, 13 + xy: 644, 146 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 item-copper rotate: false - xy: 205, 3 + xy: 644, 136 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 item-dense-alloy rotate: false - xy: 215, 13 + xy: 644, 126 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 item-lead rotate: false - xy: 215, 3 + xy: 641, 116 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 item-phase-matter rotate: false - xy: 225, 13 + xy: 651, 166 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 item-plastanium rotate: false - xy: 225, 3 + xy: 651, 156 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 item-pyratite rotate: false - xy: 235, 13 + xy: 654, 176 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 item-sand rotate: false - xy: 235, 3 + xy: 654, 146 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 item-silicon rotate: false - xy: 245, 13 + xy: 654, 136 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 item-stone rotate: false - xy: 245, 3 + xy: 654, 126 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 item-surge-alloy rotate: false - xy: 255, 13 + xy: 651, 116 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 item-thorium rotate: false - xy: 255, 3 + xy: 661, 166 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 item-titanium rotate: false - xy: 265, 13 + xy: 661, 156 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 liquid-icon rotate: false - xy: 305, 3 + xy: 674, 146 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -4969,98 +4990,105 @@ alpha-mech-leg index: -1 delta-mech rotate: false - xy: 347, 37 + xy: 269, 19 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 delta-mech-leg rotate: false - xy: 361, 51 + xy: 283, 19 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 omega-mech rotate: false - xy: 271, 33 + xy: 372, 69 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 omega-mech-armor rotate: false - xy: 287, 49 + xy: 388, 69 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 omega-mech-base rotate: false - xy: 287, 33 + xy: 404, 69 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 omega-mech-leg rotate: false - xy: 303, 49 + xy: 415, 85 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 tau-mech rotate: false - xy: 484, 181 + xy: 473, 96 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 tau-mech-base rotate: false - xy: 498, 181 + xy: 723, 186 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 tau-mech-leg rotate: false - xy: 512, 181 + xy: 737, 186 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 dart-ship rotate: false - xy: 347, 51 + xy: 255, 19 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 -halberd-ship +glaive-ship rotate: false - xy: 198, 65 + xy: 319, 83 + size: 14, 14 + orig: 14, 14 + offset: 0, 0 + index: -1 +mech-icon-glaive-ship + rotate: false + xy: 319, 83 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 javelin-ship rotate: false - xy: 177, 17 + xy: 459, 94 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 mech-icon-javelin-ship rotate: false - xy: 177, 17 + xy: 459, 94 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 javelin-ship-shield rotate: false - xy: 191, 17 + xy: 455, 80 size: 12, 12 orig: 12, 12 offset: 0, 0 @@ -5173,7 +5201,7 @@ button-map-over index: -1 button-select rotate: false - xy: 609, 230 + xy: 583, 204 size: 24, 24 split: 4, 4, 4, 4 orig: 24, 24 @@ -5237,28 +5265,28 @@ discord-banner-over index: -1 controller-cursor rotate: false - xy: 899, 321 + xy: 845, 306 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-about rotate: false - xy: 214, 65 + xy: 355, 101 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-add rotate: false - xy: 230, 65 + xy: 335, 83 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-admin rotate: false - xy: 246, 65 + xy: 371, 101 size: 14, 14 orig: 14, 14 offset: 0, 0 @@ -5279,231 +5307,231 @@ icon-areaDelete index: -1 icon-arrow rotate: false - xy: 759, 254 + xy: 723, 236 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-arrow-16 rotate: false - xy: 759, 254 + xy: 723, 236 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-arrow-down rotate: false - xy: 1003, 381 + xy: 967, 323 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-arrow-left rotate: false - xy: 570, 194 + xy: 1003, 381 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-arrow-right rotate: false - xy: 582, 192 + xy: 779, 188 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-arrow-up rotate: false - xy: 594, 192 + xy: 791, 188 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-back rotate: false - xy: 741, 218 + xy: 741, 254 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-ban rotate: false - xy: 262, 65 + xy: 387, 101 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-break rotate: false - xy: 759, 236 + xy: 723, 218 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-cancel rotate: false - xy: 759, 218 + xy: 741, 236 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-chat rotate: false - xy: 606, 192 + xy: 803, 188 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-check rotate: false - xy: 777, 254 + xy: 759, 254 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-crafting rotate: false - xy: 618, 192 + xy: 815, 188 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-cursor rotate: false - xy: 630, 192 + xy: 319, 53 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-defense rotate: false - xy: 642, 192 + xy: 319, 41 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-dev-builds rotate: false - xy: 278, 65 + xy: 403, 101 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-discord rotate: false - xy: 294, 65 + xy: 419, 108 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-distribution rotate: false - xy: 654, 192 + xy: 331, 55 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-donate rotate: false - xy: 310, 65 + xy: 435, 108 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-dots rotate: false - xy: 326, 65 + xy: 451, 108 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-editor rotate: false - xy: 342, 65 + xy: 180, 65 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-egg rotate: false - xy: 358, 65 + xy: 196, 65 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-elevation rotate: false - xy: 777, 236 + xy: 741, 218 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-eraser rotate: false - xy: 777, 218 + xy: 759, 236 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-exit rotate: false - xy: 374, 65 + xy: 212, 65 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-file rotate: false - xy: 795, 260 + xy: 777, 254 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-file-image rotate: false - xy: 795, 242 + xy: 759, 218 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-file-text rotate: false - xy: 390, 65 + xy: 228, 65 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-fill rotate: false - xy: 795, 224 + xy: 777, 236 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-floppy rotate: false - xy: 175, 47 + xy: 244, 65 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-floppy-16 rotate: false - xy: 687, 195 + xy: 795, 254 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-folder rotate: false - xy: 175, 31 + xy: 260, 65 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-folder-parent rotate: false - xy: 863, 305 + xy: 276, 65 size: 14, 14 orig: 14, 14 offset: 0, 0 @@ -5517,441 +5545,441 @@ icon-generated index: -1 icon-github rotate: false - xy: 879, 305 + xy: 292, 65 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-google-play rotate: false - xy: 895, 305 + xy: 175, 49 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-grid rotate: false - xy: 705, 195 + xy: 777, 218 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-hold rotate: false - xy: 666, 192 + xy: 331, 43 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-holdDelete rotate: false - xy: 481, 169 + xy: 343, 55 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-home rotate: false - xy: 911, 305 + xy: 191, 49 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-host rotate: false - xy: 927, 305 + xy: 175, 33 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-info rotate: false - xy: 493, 169 + xy: 343, 43 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-itch.io rotate: false - xy: 863, 289 + xy: 207, 49 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-item rotate: false - xy: 505, 169 + xy: 355, 55 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-items-none rotate: false - xy: 277, 23 + xy: 631, 116 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 icon-line rotate: false - xy: 723, 200 + xy: 795, 236 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-link rotate: false - xy: 879, 289 + xy: 191, 33 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-liquid rotate: false - xy: 517, 169 + xy: 355, 43 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-load rotate: false - xy: 895, 289 + xy: 223, 49 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-load-image rotate: false - xy: 741, 200 + xy: 795, 218 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-load-map rotate: false - xy: 759, 200 + xy: 813, 254 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-loading rotate: false - xy: 777, 200 + xy: 813, 236 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-locked rotate: false - xy: 795, 206 + xy: 813, 218 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-logic rotate: false - xy: 529, 169 + xy: 464, 68 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-map rotate: false - xy: 911, 289 + xy: 207, 33 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-menu rotate: false - xy: 541, 169 + xy: 367, 55 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-menu-large rotate: false - xy: 456, 142 + xy: 687, 195 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-missing rotate: false - xy: 554, 180 + xy: 367, 43 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-none rotate: false - xy: 553, 168 + xy: 379, 57 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-nullitem rotate: false - xy: 287, 23 + xy: 641, 166 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 icon-pause rotate: false - xy: 319, 25 + xy: 391, 57 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-pencil rotate: false - xy: 456, 124 + xy: 705, 195 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-pencil-small rotate: false - xy: 927, 289 + xy: 239, 49 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-pick rotate: false - xy: 951, 335 + xy: 723, 200 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-play rotate: false - xy: 331, 25 + xy: 379, 45 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-play-2 rotate: false - xy: 943, 301 + xy: 223, 33 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-players rotate: false - xy: 343, 25 + xy: 403, 57 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-power rotate: false - xy: 355, 25 + xy: 391, 45 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-production rotate: false - xy: 367, 25 + xy: 415, 57 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-quit rotate: false - xy: 959, 301 + xy: 255, 49 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-redo rotate: false - xy: 969, 335 + xy: 741, 200 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-refresh rotate: false - xy: 975, 301 + xy: 239, 33 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-rename rotate: false - xy: 991, 301 + xy: 271, 49 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-resize rotate: false - xy: 987, 335 + xy: 759, 200 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-rotate rotate: false - xy: 943, 285 + xy: 255, 33 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-rotate-arrow rotate: false - xy: 959, 285 + xy: 287, 49 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-rotate-left rotate: false - xy: 975, 285 + xy: 271, 33 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-rotate-right rotate: false - xy: 991, 285 + xy: 287, 33 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-save rotate: false - xy: 191, 47 + xy: 308, 65 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-save-image rotate: false - xy: 951, 317 + xy: 777, 200 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-save-map rotate: false - xy: 969, 317 + xy: 795, 200 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-settings rotate: false - xy: 379, 25 + xy: 403, 45 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-terrain rotate: false - xy: 987, 317 + xy: 813, 200 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-tools rotate: false - xy: 191, 31 + xy: 303, 49 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-touch rotate: false - xy: 391, 25 + xy: 415, 45 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-touchDelete rotate: false - xy: 1007, 313 + xy: 839, 294 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-trash rotate: false - xy: 207, 49 + xy: 303, 33 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-trash-16 rotate: false - xy: 177, 117 + xy: 456, 142 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-trello rotate: false - xy: 207, 33 + xy: 324, 67 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-tutorial rotate: false - xy: 223, 49 + xy: 340, 67 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-undo rotate: false - xy: 195, 117 + xy: 456, 124 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-units rotate: false - xy: 1007, 301 + xy: 851, 294 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-unlocks rotate: false - xy: 223, 33 + xy: 351, 83 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-weapon rotate: false - xy: 1007, 289 + xy: 863, 291 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-wiki rotate: false - xy: 239, 49 + xy: 367, 85 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-zoom rotate: false - xy: 213, 117 + xy: 935, 319 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-zoom-small rotate: false - xy: 239, 33 + xy: 383, 85 size: 14, 14 orig: 14, 14 offset: 0, 0 @@ -6037,7 +6065,7 @@ scroll-knob-vertical-black index: -1 selection rotate: false - xy: 566, 287 + xy: 541, 126 size: 1, 1 orig: 1, 1 offset: 0, 0 @@ -6116,7 +6144,7 @@ textfield-over index: -1 white rotate: false - xy: 66, 52 + xy: 436, 80 size: 3, 3 orig: 3, 3 offset: 0, 0 @@ -6153,70 +6181,70 @@ unit-icon-alpha-drone index: -1 dagger rotate: false - xy: 319, 37 + xy: 213, 19 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 dagger-base rotate: false - xy: 333, 51 + xy: 227, 19 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 delta-mech-base rotate: false - xy: 333, 51 + xy: 227, 19 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 dagger-leg rotate: false - xy: 333, 37 + xy: 241, 19 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 drone rotate: false - xy: 375, 51 + xy: 311, 19 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 unit-icon-drone rotate: false - xy: 375, 51 + xy: 311, 19 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 fabricator rotate: false - xy: 935, 321 + xy: 951, 337 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 unit-icon-fabricator rotate: false - xy: 935, 321 + xy: 951, 337 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 interceptor rotate: false - xy: 1005, 325 + xy: 441, 80 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 unit-icon-interceptor rotate: false - xy: 1005, 325 + xy: 441, 80 size: 12, 12 orig: 12, 12 offset: 0, 0 @@ -6237,91 +6265,91 @@ unit-icon-monsoon index: -1 power-cell rotate: false - xy: 303, 33 + xy: 420, 69 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 titan rotate: false - xy: 301, 81 + xy: 247, 99 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 titan-base rotate: false - xy: 337, 99 + xy: 229, 81 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 titan-leg rotate: false - xy: 319, 81 + xy: 265, 99 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 blaster-equip rotate: false - xy: 849, 310 + xy: 166, 66 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 bomber-equip rotate: false - xy: 849, 296 + xy: 185, 19 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 missiles-equip rotate: false - xy: 849, 296 + xy: 185, 19 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 chain-blaster-equip rotate: false - xy: 319, 51 + xy: 199, 19 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 flakgun-equip rotate: false - xy: 389, 51 + xy: 1003, 353 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 flamethrower-equip rotate: false - xy: 389, 37 + xy: 1003, 339 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 heal-blaster-equip rotate: false - xy: 1003, 353 + xy: 431, 94 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 shockgun-equip rotate: false - xy: 500, 195 + xy: 289, 5 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 swarmer-equip rotate: false - xy: 556, 192 + xy: 450, 66 size: 12, 12 orig: 12, 12 offset: 0, 0 diff --git a/core/assets/sprites/sprites.png b/core/assets/sprites/sprites.png index a6db8f8456..e78e67823b 100644 Binary files a/core/assets/sprites/sprites.png and b/core/assets/sprites/sprites.png differ diff --git a/core/src/io/anuke/mindustry/content/AmmoTypes.java b/core/src/io/anuke/mindustry/content/AmmoTypes.java index b2936ab900..2d971b1ad9 100644 --- a/core/src/io/anuke/mindustry/content/AmmoTypes.java +++ b/core/src/io/anuke/mindustry/content/AmmoTypes.java @@ -12,7 +12,7 @@ import io.anuke.mindustry.type.ContentList; public class AmmoTypes implements ContentList{ public static AmmoType bulletCopper, bulletDense, bulletThorium, bulletSilicon, bulletPyratite, shotgunTungsten, bombExplosive, bombIncendiary, bombOil, shellCarbide, flamerThermite, weaponMissile, weaponMissileSwarm, bulletMech, - healBlaster, bulletHalberd, + healBlaster, bulletGlaive, flakLead, flakExplosive, flakPlastic, flakSurge, missileExplosive, missileIncindiary, missileSurge, artilleryDense, artilleryPlastic, artilleryHoming, artilleryIncindiary, artilleryExplosive, basicFlame, lancerLaser, lightning, spectreLaser, meltdownLaser, fuseShotgun, oil, water, lava, cryofluid; @@ -30,7 +30,7 @@ public class AmmoTypes implements ContentList{ }}; - bulletHalberd = new AmmoType(Items.pyratite, StandardBullets.halberd, 3){{ + bulletGlaive = new AmmoType(Items.pyratite, StandardBullets.glaive, 3){{ shootEffect = ShootFx.shootSmall; smokeEffect = ShootFx.shootSmallSmoke; inaccuracy = 3f; diff --git a/core/src/io/anuke/mindustry/content/Mechs.java b/core/src/io/anuke/mindustry/content/Mechs.java index 8245a7f51a..234d5b9ef3 100644 --- a/core/src/io/anuke/mindustry/content/Mechs.java +++ b/core/src/io/anuke/mindustry/content/Mechs.java @@ -30,7 +30,7 @@ import io.anuke.ucore.util.Mathf; import static io.anuke.mindustry.Vars.*; public class Mechs implements ContentList{ - public static Mech alpha, delta, tau, omega, dart, javelin, trident, halberd; + public static Mech alpha, delta, tau, omega, dart, javelin, trident, glaive; /**These are not new mechs, just re-assignments for convenience.*/ public static Mech starterDesktop, starterMobile; @@ -320,6 +320,7 @@ public class Mechs implements ContentList{ drag = 0.035f; turnCursor = false; armor = 20f; + itemCapacity = 30; trailColor = Color.valueOf("84f491"); weapon = Weapons.bomberTrident; } @@ -330,15 +331,16 @@ public class Mechs implements ContentList{ } }; - halberd = new Mech("halberd-ship", true){ + glaive = new Mech("glaive-ship", true){ { - weapon = Weapons.halberdBlaster; + weapon = Weapons.glaiveBlaster; drillPower = 4; mineSpeed = 1.3f; - speed = 0.3f; + speed = 0.32f; maxSpeed = 3f; drag = 0.06f; armor = 30f; + itemCapacity = 60; trailColor = Color.valueOf("feb380"); } }; diff --git a/core/src/io/anuke/mindustry/content/Recipes.java b/core/src/io/anuke/mindustry/content/Recipes.java index 2e3fea27db..8f6b2dfe56 100644 --- a/core/src/io/anuke/mindustry/content/Recipes.java +++ b/core/src/io/anuke/mindustry/content/Recipes.java @@ -128,7 +128,7 @@ public class Recipes implements ContentList{ new Recipe(units, UpgradeBlocks.dartFactory, new ItemStack(Items.lead, 150), new ItemStack(Items.silicon, 200), new ItemStack(Items.titanium, 240)).setDesktop(); //dart is desktop only, because it's the starter mobile ship new Recipe(units, UpgradeBlocks.javelinFactory, new ItemStack(Items.lead, 200), new ItemStack(Items.silicon, 250), new ItemStack(Items.titanium, 300), new ItemStack(Items.plastanium, 200)); new Recipe(units, UpgradeBlocks.tridentFactory, new ItemStack(Items.lead, 200), new ItemStack(Items.silicon, 250), new ItemStack(Items.titanium, 300), new ItemStack(Items.plastanium, 200)); - new Recipe(units, UpgradeBlocks.halberdFactory, new ItemStack(Items.lead, 200), new ItemStack(Items.silicon, 250), new ItemStack(Items.titanium, 300), new ItemStack(Items.plastanium, 200)); + new Recipe(units, UpgradeBlocks.glaiveFactory, new ItemStack(Items.lead, 200), new ItemStack(Items.silicon, 250), new ItemStack(Items.titanium, 300), new ItemStack(Items.plastanium, 200)); new Recipe(units, UpgradeBlocks.deltaFactory, new ItemStack(Items.densealloy, 160), new ItemStack(Items.silicon, 220), new ItemStack(Items.titanium, 250)).setDesktop(); new Recipe(units, UpgradeBlocks.omegaFactory, new ItemStack(Items.densealloy, 160), new ItemStack(Items.silicon, 220), new ItemStack(Items.titanium, 250)).setDesktop(); diff --git a/core/src/io/anuke/mindustry/content/Weapons.java b/core/src/io/anuke/mindustry/content/Weapons.java index 2680fea322..169c5648df 100644 --- a/core/src/io/anuke/mindustry/content/Weapons.java +++ b/core/src/io/anuke/mindustry/content/Weapons.java @@ -8,7 +8,7 @@ import io.anuke.mindustry.type.ContentList; import io.anuke.mindustry.type.Weapon; public class Weapons implements ContentList{ - public static Weapon blaster, halberdBlaster, droneBlaster, healBlaster, chainBlaster, shockgun, sapper, swarmer, bomber, bomberTrident, flakgun, flamethrower, missiles; + public static Weapon blaster, glaiveBlaster, droneBlaster, healBlaster, chainBlaster, shockgun, sapper, swarmer, bomber, bomberTrident, flakgun, flamethrower, missiles; @Override public void load(){ @@ -21,12 +21,12 @@ public class Weapons implements ContentList{ ammo = AmmoTypes.bulletMech; }}; - halberdBlaster = new Weapon("bomber"){{ + glaiveBlaster = new Weapon("bomber"){{ length = 1.5f; - reload = 12f; + reload = 10f; roundrobin = true; ejectEffect = ShootFx.shellEjectSmall; - ammo = AmmoTypes.bulletHalberd; + ammo = AmmoTypes.bulletGlaive; }}; droneBlaster = new Weapon("blaster"){{ diff --git a/core/src/io/anuke/mindustry/content/blocks/UpgradeBlocks.java b/core/src/io/anuke/mindustry/content/blocks/UpgradeBlocks.java index b2f9f7f1de..dfcc60b5a9 100644 --- a/core/src/io/anuke/mindustry/content/blocks/UpgradeBlocks.java +++ b/core/src/io/anuke/mindustry/content/blocks/UpgradeBlocks.java @@ -5,7 +5,7 @@ import io.anuke.mindustry.world.Block; import io.anuke.mindustry.world.blocks.units.MechFactory; public class UpgradeBlocks extends BlockList{ - public static Block deltaFactory, tauFactory, omegaFactory, dartFactory, javelinFactory, tridentFactory, halberdFactory; + public static Block deltaFactory, tauFactory, omegaFactory, dartFactory, javelinFactory, tridentFactory, glaiveFactory; @Override public void load(){ @@ -31,24 +31,28 @@ public class UpgradeBlocks extends BlockList{ mech = Mechs.dart; size = 2; powerCapacity = 50f; + shadow = "shadow-rounded-2"; }}; javelinFactory = new MechFactory("javelin-ship-factory"){{ mech = Mechs.javelin; size = 2; powerCapacity = 80f; + shadow = "shadow-rounded-2"; }}; tridentFactory = new MechFactory("trident-ship-factory"){{ mech = Mechs.trident; size = 2; powerCapacity = 100f; + shadow = "shadow-rounded-2"; }}; - halberdFactory = new MechFactory("halberd-ship-factory"){{ - mech = Mechs.halberd; + glaiveFactory = new MechFactory("glaive-ship-factory"){{ + mech = Mechs.glaive; size = 3; powerCapacity = 120f; + shadow = "shadow-round-3"; }}; } } diff --git a/core/src/io/anuke/mindustry/content/bullets/StandardBullets.java b/core/src/io/anuke/mindustry/content/bullets/StandardBullets.java index 0f68c1b679..3a8ff0a4d0 100644 --- a/core/src/io/anuke/mindustry/content/bullets/StandardBullets.java +++ b/core/src/io/anuke/mindustry/content/bullets/StandardBullets.java @@ -8,7 +8,7 @@ import io.anuke.mindustry.graphics.Palette; import io.anuke.mindustry.type.ContentList; public class StandardBullets extends BulletList implements ContentList{ - public static BulletType copper, dense, thorium, homing, tracer, mechSmall, halberd; + public static BulletType copper, dense, thorium, homing, tracer, mechSmall, glaive; @Override public void load(){ @@ -56,7 +56,7 @@ public class StandardBullets extends BulletList implements ContentList{ } }; - halberd = new BasicBulletType(3.2f, 6, "bullet"){ + glaive = new BasicBulletType(4f, 6, "bullet"){ { bulletWidth = 10f; bulletHeight = 12f; diff --git a/core/src/io/anuke/mindustry/core/NetServer.java b/core/src/io/anuke/mindustry/core/NetServer.java index ae8f41b2fb..4e78ffe845 100644 --- a/core/src/io/anuke/mindustry/core/NetServer.java +++ b/core/src/io/anuke/mindustry/core/NetServer.java @@ -118,7 +118,7 @@ public class NetServer extends Module{ return; } - boolean preventDuplicates = headless; + boolean preventDuplicates = headless && !debug; if(preventDuplicates){ for(Player player : playerGroup.all()){ diff --git a/core/src/io/anuke/mindustry/world/blocks/units/MechFactory.java b/core/src/io/anuke/mindustry/world/blocks/units/MechFactory.java index f4688c872a..6bf285dff1 100644 --- a/core/src/io/anuke/mindustry/world/blocks/units/MechFactory.java +++ b/core/src/io/anuke/mindustry/world/blocks/units/MechFactory.java @@ -132,7 +132,7 @@ public class MechFactory extends Block{ public void draw(Tile tile){ MechFactoryEntity entity = tile.entity(); - Draw.rect(entity.open ? openRegion : Draw.region(name), tile.drawx(), tile.drawy()); + Draw.rect(Draw.region(name), tile.drawx(), tile.drawy(), entity.open ? 180f : 0f); if(entity.player != null){ TextureRegion region = mech.iconRegion;