diff --git a/core/assets-raw/sprites/blocks/environment/generic-cliff-edge-1.png b/core/assets-raw/sprites/blocks/environment/generic-cliff-edge-1.png index eccc9e20a5..98f4628813 100644 Binary files a/core/assets-raw/sprites/blocks/environment/generic-cliff-edge-1.png and b/core/assets-raw/sprites/blocks/environment/generic-cliff-edge-1.png differ diff --git a/core/assets-raw/sprites/blocks/environment/generic-cliff-edge-2.png b/core/assets-raw/sprites/blocks/environment/generic-cliff-edge-2.png index d88235bed9..f649319a4c 100644 Binary files a/core/assets-raw/sprites/blocks/environment/generic-cliff-edge-2.png and b/core/assets-raw/sprites/blocks/environment/generic-cliff-edge-2.png differ diff --git a/core/assets-raw/sprites/blocks/environment/generic-cliff-edge.png b/core/assets-raw/sprites/blocks/environment/generic-cliff-edge.png index e93dd6f1ac..2aa7715bb6 100644 Binary files a/core/assets-raw/sprites/blocks/environment/generic-cliff-edge.png and b/core/assets-raw/sprites/blocks/environment/generic-cliff-edge.png differ diff --git a/core/assets-raw/sprites/blocks/environment/generic-cliff-side.png b/core/assets-raw/sprites/blocks/environment/generic-cliff-side.png index 33bc3ca031..13a019f92b 100644 Binary files a/core/assets-raw/sprites/blocks/environment/generic-cliff-side.png and b/core/assets-raw/sprites/blocks/environment/generic-cliff-side.png differ diff --git a/core/assets-raw/sprites/blocks/turrets/turrets/cyclone.png b/core/assets-raw/sprites/blocks/turrets/turrets/cyclone.png index 1e1cbd0cbd..f4c5a98516 100644 Binary files a/core/assets-raw/sprites/blocks/turrets/turrets/cyclone.png and b/core/assets-raw/sprites/blocks/turrets/turrets/cyclone.png differ diff --git a/core/assets-raw/sprites/blocks/turrets/turrets/fuse.png b/core/assets-raw/sprites/blocks/turrets/turrets/fuse.png index 67d16fc9b5..983bd96512 100644 Binary files a/core/assets-raw/sprites/blocks/turrets/turrets/fuse.png and b/core/assets-raw/sprites/blocks/turrets/turrets/fuse.png differ diff --git a/core/assets-raw/sprites/blocks/turrets/turrets/ripple.png b/core/assets-raw/sprites/blocks/turrets/turrets/ripple.png index 3cb1a4401a..d4632a1f72 100644 Binary files a/core/assets-raw/sprites/blocks/turrets/turrets/ripple.png and b/core/assets-raw/sprites/blocks/turrets/turrets/ripple.png differ diff --git a/core/assets-raw/sprites/blocks/turrets/turrets/swarmer.png b/core/assets-raw/sprites/blocks/turrets/turrets/swarmer.png index a5e681209d..cc33a28cfa 100644 Binary files a/core/assets-raw/sprites/blocks/turrets/turrets/swarmer.png and b/core/assets-raw/sprites/blocks/turrets/turrets/swarmer.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 index 263070dfa3..ccbae942b1 100644 Binary files a/core/assets-raw/sprites/blocks/units/mechs/omega-mech-factory.png and b/core/assets-raw/sprites/blocks/units/mechs/omega-mech-factory.png differ diff --git a/core/assets-raw/sprites/blocks/units/mechs/ship-factory.png b/core/assets-raw/sprites/blocks/units/mechs/ship-factory.png deleted file mode 100644 index 236bf80219..0000000000 Binary files a/core/assets-raw/sprites/blocks/units/mechs/ship-factory.png and /dev/null differ diff --git a/core/assets-raw/sprites/blocks/walls/surge-wall-large.png b/core/assets-raw/sprites/blocks/walls/surge-wall-large.png new file mode 100644 index 0000000000..6558256859 Binary files /dev/null and b/core/assets-raw/sprites/blocks/walls/surge-wall-large.png differ diff --git a/core/assets-raw/sprites/blocks/walls/surge-wall.png b/core/assets-raw/sprites/blocks/walls/surge-wall.png new file mode 100644 index 0000000000..dab77c97b0 Binary files /dev/null and b/core/assets-raw/sprites/blocks/walls/surge-wall.png differ diff --git a/core/assets/sprites/sprites.atlas b/core/assets/sprites/sprites.atlas index 1ec689c5b7..71891a2d37 100644 --- a/core/assets/sprites/sprites.atlas +++ b/core/assets/sprites/sprites.atlas @@ -13,294 +13,294 @@ background index: -1 mend-projector-top rotate: false - xy: 303, 117 + xy: 321, 117 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 bridge-conveyor-arrow rotate: false - xy: 474, 82 + xy: 959, 265 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 bridge-conveyor-bridge rotate: false - xy: 474, 72 + xy: 969, 285 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 bridge-conveyor-end rotate: false - xy: 479, 102 + xy: 969, 275 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 conveyor-0-1 rotate: false - xy: 347, 33 + xy: 571, 162 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 conveyor-0-2 rotate: false - xy: 357, 33 + xy: 581, 160 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 conveyor-0-3 rotate: false - xy: 367, 33 + xy: 591, 160 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 conveyor-1-0 rotate: false - xy: 377, 33 + xy: 601, 170 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 conveyor-1-1 rotate: false - xy: 387, 33 + xy: 601, 160 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 conveyor-1-2 rotate: false - xy: 397, 35 + xy: 611, 171 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 conveyor-1-3 rotate: false - xy: 407, 35 + xy: 611, 161 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 conveyor-2-0 rotate: false - xy: 417, 35 + xy: 621, 171 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 conveyor-2-1 rotate: false - xy: 793, 178 + xy: 621, 161 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 conveyor-2-2 rotate: false - xy: 803, 178 + xy: 631, 171 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 conveyor-2-3 rotate: false - xy: 813, 178 + xy: 631, 161 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 conveyor-3-0 rotate: false - xy: 849, 186 + xy: 641, 172 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 conveyor-3-1 rotate: false - xy: 971, 307 + xy: 641, 162 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 conveyor-3-2 rotate: false - xy: 981, 307 + xy: 651, 172 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 conveyor-3-3 rotate: false - xy: 991, 307 + xy: 651, 162 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 conveyor-4-0 rotate: false - xy: 1001, 307 + xy: 661, 172 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 conveyor-4-1 rotate: false - xy: 973, 297 + xy: 661, 162 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 conveyor-4-2 rotate: false - xy: 983, 297 + xy: 671, 172 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 conveyor-4-3 rotate: false - xy: 993, 297 + xy: 671, 162 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 titanium-conveyor-0-1 rotate: false - xy: 941, 215 + xy: 1011, 227 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 titanium-conveyor-0-2 rotate: false - xy: 951, 225 + xy: 1011, 217 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 titanium-conveyor-0-3 rotate: false - xy: 961, 235 + xy: 1005, 207 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 titanium-conveyor-1-0 rotate: false - xy: 951, 215 + xy: 1015, 207 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 titanium-conveyor-1-1 rotate: false - xy: 961, 225 + xy: 1005, 197 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 titanium-conveyor-1-2 rotate: false - xy: 961, 215 + xy: 1015, 197 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 titanium-conveyor-1-3 rotate: false - xy: 941, 205 + xy: 931, 191 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 titanium-conveyor-2-0 rotate: false - xy: 951, 205 + xy: 931, 181 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 titanium-conveyor-2-1 rotate: false - xy: 961, 205 + xy: 931, 171 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 titanium-conveyor-2-2 rotate: false - xy: 971, 247 + xy: 931, 161 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 titanium-conveyor-2-3 rotate: false - xy: 971, 237 + xy: 931, 151 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 titanium-conveyor-3-0 rotate: false - xy: 981, 247 + xy: 941, 185 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 titanium-conveyor-3-1 rotate: false - xy: 971, 227 + xy: 941, 175 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 titanium-conveyor-3-2 rotate: false - xy: 981, 237 + xy: 951, 185 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 titanium-conveyor-3-3 rotate: false - xy: 991, 247 + xy: 941, 165 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 titanium-conveyor-4-0 rotate: false - xy: 971, 217 + xy: 951, 175 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 titanium-conveyor-4-1 rotate: false - xy: 981, 227 + xy: 961, 185 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 titanium-conveyor-4-2 rotate: false - xy: 991, 237 + xy: 941, 155 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 titanium-conveyor-4-3 rotate: false - xy: 1001, 247 + xy: 951, 165 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -314,21 +314,21 @@ mass-driver-turret index: -1 phase-conveyor-arrow rotate: false - xy: 495, 94 + xy: 891, 153 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 phase-conveyor-bridge rotate: false - xy: 499, 104 + xy: 901, 153 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 phase-conveyor-end rotate: false - xy: 505, 94 + xy: 911, 153 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -370,42 +370,42 @@ blast-drill-top index: -1 laser-drill rotate: false - xy: 195, 117 + xy: 213, 117 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 laser-drill-rotator rotate: false - xy: 213, 117 + xy: 231, 117 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 laser-drill-top rotate: false - xy: 231, 117 + xy: 249, 117 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 mechanical-drill rotate: false - xy: 249, 117 + xy: 267, 117 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 mechanical-drill-rotator rotate: false - xy: 267, 117 + xy: 285, 117 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 mechanical-drill-top rotate: false - xy: 285, 117 + xy: 303, 117 size: 16, 16 orig: 16, 16 offset: 0, 0 @@ -468,49 +468,49 @@ plasma-drill-top index: -1 pneumatic-drill rotate: false - xy: 393, 117 + xy: 466, 184 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 pneumatic-drill-rotator rotate: false - xy: 466, 184 + xy: 463, 166 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 pneumatic-drill-top rotate: false - xy: 463, 166 + xy: 997, 317 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 water-extractor rotate: false - xy: 283, 81 + xy: 319, 99 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 water-extractor-liquid rotate: false - xy: 319, 99 + xy: 301, 81 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 water-extractor-rotator rotate: false - xy: 301, 81 + xy: 337, 99 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 water-extractor-top rotate: false - xy: 337, 99 + xy: 319, 81 size: 16, 16 orig: 16, 16 offset: 0, 0 @@ -573,511 +573,511 @@ blackstoneedge index: -1 coal1 rotate: false - xy: 949, 265 + xy: 969, 265 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 coal2 rotate: false - xy: 959, 265 + xy: 481, 174 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 coal3 rotate: false - xy: 969, 285 + xy: 491, 175 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 copper1 rotate: false - xy: 979, 287 + xy: 681, 174 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 copper2 rotate: false - xy: 979, 277 + xy: 681, 164 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 copper3 rotate: false - xy: 989, 287 + xy: 691, 175 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 dirt2 rotate: false - xy: 999, 277 + xy: 721, 176 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 dirt3 rotate: false - xy: 999, 267 + xy: 721, 166 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 dirtedge rotate: false - xy: 297, 19 + xy: 331, 5 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 generic-cliff-edge rotate: false - xy: 467, 42 + xy: 761, 166 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ice-cliff-edge rotate: false - xy: 467, 42 + xy: 761, 166 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 generic-cliff-edge-1 rotate: false - xy: 477, 52 + xy: 771, 176 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ice-cliff-edge-1 rotate: false - xy: 477, 52 + xy: 771, 176 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 generic-cliff-edge-2 rotate: false - xy: 477, 42 + xy: 771, 166 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ice-cliff-edge-2 rotate: false - xy: 477, 42 + xy: 771, 166 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 generic-cliff-side rotate: false - xy: 487, 62 + xy: 781, 176 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ice-cliff-side rotate: false - xy: 487, 62 + xy: 781, 176 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 grass-cliff-edge rotate: false - xy: 501, 156 + xy: 791, 166 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 grass-cliff-edge-1 rotate: false - xy: 511, 156 + xy: 801, 176 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 grass-cliff-edge-2 rotate: false - xy: 521, 157 + xy: 801, 166 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 grass-cliff-side rotate: false - xy: 531, 157 + xy: 811, 176 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 grass2 rotate: false - xy: 487, 52 + xy: 781, 166 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 grass3 rotate: false - xy: 487, 42 + xy: 791, 176 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 grassedge rotate: false - xy: 1003, 339 + xy: 345, 5 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 ice2 rotate: false - xy: 481, 154 + xy: 821, 176 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ice3 rotate: false - xy: 491, 147 + xy: 821, 166 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 iceedge rotate: false - xy: 450, 78 + xy: 433, 110 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 icerock2 rotate: false - xy: 501, 146 + xy: 831, 176 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 icerockshadow1 rotate: false - xy: 511, 146 + xy: 831, 166 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 rockshadow1 rotate: false - xy: 511, 146 + xy: 831, 166 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 icerockshadow2 rotate: false - xy: 521, 147 + xy: 841, 176 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 rockshadow2 rotate: false - xy: 521, 147 + xy: 841, 176 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 lavaedge rotate: false - xy: 191, 5 + xy: 433, 96 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 lead1 rotate: false - xy: 409, 25 + xy: 999, 277 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 lead2 rotate: false - xy: 419, 25 + xy: 999, 267 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 lead3 rotate: false - xy: 345, 13 + xy: 1013, 299 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 metalfloor2 rotate: false - xy: 395, 13 + xy: 881, 263 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 metalfloor3 rotate: false - xy: 395, 3 + xy: 861, 243 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 metalfloor4 rotate: false - xy: 405, 15 + xy: 871, 253 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 metalfloor5 rotate: false - xy: 405, 5 + xy: 851, 233 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 metalfloor6 rotate: false - xy: 415, 15 + xy: 891, 263 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 metalflooredge rotate: false - xy: 247, 5 + xy: 419, 82 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 oiledge rotate: false - xy: 261, 5 + xy: 433, 82 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 rock2 rotate: false - xy: 931, 221 + xy: 961, 225 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 sand2 rotate: false - xy: 495, 84 + xy: 951, 215 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 sand3 rotate: false - xy: 505, 84 + xy: 961, 215 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 sandedge rotate: false - xy: 275, 5 + xy: 447, 82 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 shrubshadow rotate: false - xy: 509, 34 + xy: 971, 247 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 snow2 rotate: false - xy: 505, 24 + xy: 971, 237 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 snow3 rotate: false - xy: 505, 14 + xy: 981, 247 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 snowedge rotate: false - xy: 303, 5 + xy: 723, 186 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 spaceedge rotate: false - xy: 317, 5 + xy: 737, 186 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 stone-cliff-edge rotate: false - xy: 525, 4 + xy: 1001, 227 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 stone-cliff-edge-1 rotate: false - xy: 941, 255 + xy: 1001, 217 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 stone-cliff-edge-2 rotate: false - xy: 951, 255 + xy: 975, 207 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 stone-cliff-side rotate: false - xy: 941, 245 + xy: 975, 197 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 stone2 rotate: false - xy: 525, 24 + xy: 1001, 237 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 stone3 rotate: false - xy: 525, 14 + xy: 991, 217 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 stoneedge rotate: false - xy: 331, 5 + xy: 751, 186 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 thorium1 rotate: false - xy: 961, 255 + xy: 985, 207 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 thorium2 rotate: false - xy: 941, 235 + xy: 985, 197 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 thorium3 rotate: false - xy: 951, 245 + xy: 995, 207 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 titanium1 rotate: false - xy: 941, 225 + xy: 995, 197 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 titanium2 rotate: false - xy: 951, 235 + xy: 1011, 247 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 titanium3 rotate: false - xy: 961, 245 + xy: 1011, 237 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 water-cliff-edge rotate: false - xy: 981, 217 + xy: 951, 155 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 water-cliff-edge-1 rotate: false - xy: 991, 227 + xy: 961, 165 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 water-cliff-edge-2 rotate: false - xy: 1001, 237 + xy: 961, 155 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 water-cliff-side rotate: false - xy: 981, 207 + xy: 971, 185 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 wateredge rotate: false - xy: 779, 186 + xy: 821, 186 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 block-border rotate: false - xy: 537, 188 + xy: 658, 182 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-elevation rotate: false - xy: 839, 296 + xy: 668, 182 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 combustion-generator-top rotate: false - xy: 839, 296 + xy: 668, 182 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -1112,21 +1112,21 @@ border index: -1 conduit-liquid rotate: false - xy: 511, 176 + xy: 541, 165 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 cross-1 rotate: false - xy: 979, 267 + xy: 691, 165 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 cross-2 rotate: false - xy: 899, 303 + xy: 917, 303 size: 16, 16 orig: 16, 16 offset: 0, 0 @@ -1147,7 +1147,7 @@ cross-4 index: -1 enemyspawn rotate: false - xy: 477, 62 + xy: 761, 176 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -1161,49 +1161,49 @@ nuclearreactor-shadow index: -1 place-arrow rotate: false - xy: 475, 2 + xy: 921, 153 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 playerspawn rotate: false - xy: 485, 2 + xy: 371, 21 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ripples rotate: false - xy: 486, 197 + xy: 557, 182 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 rubble-1-0 rotate: false - xy: 175, 99 + xy: 193, 99 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 rubble-1-1 rotate: false - xy: 193, 99 + xy: 175, 81 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 rubble-2-0 rotate: false - xy: 175, 81 + xy: 211, 99 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 rubble-2-1 rotate: false - xy: 211, 99 + xy: 193, 81 size: 16, 16 orig: 16, 16 offset: 0, 0 @@ -1224,7 +1224,7 @@ rubble-3-1 index: -1 shadow-1 rotate: false - xy: 498, 197 + xy: 569, 182 size: 10, 10 orig: 10, 10 offset: 0, 0 @@ -1266,14 +1266,14 @@ shadow-6 index: -1 shadow-corner rotate: false - xy: 510, 197 + xy: 581, 180 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 shadow-round-1 rotate: false - xy: 522, 197 + xy: 593, 180 size: 10, 10 orig: 10, 10 offset: 0, 0 @@ -1315,140 +1315,140 @@ bridge-conduit-bridge index: -1 bridge-conduit-end rotate: false - xy: 475, 92 + xy: 949, 265 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 conduit-bottom rotate: false - xy: 484, 82 + xy: 531, 175 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 conduit-bottom-0 rotate: false - xy: 484, 72 + xy: 481, 164 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 conduit-bottom-1 rotate: false - xy: 481, 174 + xy: 491, 165 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 conduit-bottom-2 rotate: false - xy: 481, 164 + xy: 501, 165 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 conduit-bottom-3 rotate: false - xy: 491, 176 + xy: 511, 165 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 conduit-bottom-4 rotate: false - xy: 501, 176 + xy: 521, 165 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 conduit-bottom-5 rotate: false - xy: 491, 166 + xy: 531, 165 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 conduit-bottom-6 rotate: false - xy: 501, 166 + xy: 541, 175 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 conduit-top-0 rotate: false - xy: 511, 166 + xy: 551, 172 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 conduit-top-1 rotate: false - xy: 521, 177 + xy: 561, 172 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 conduit-top-2 rotate: false - xy: 521, 167 + xy: 571, 172 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 conduit-top-3 rotate: false - xy: 531, 177 + xy: 581, 170 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 conduit-top-4 rotate: false - xy: 531, 167 + xy: 591, 170 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 conduit-top-5 rotate: false - xy: 541, 178 + xy: 551, 162 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 conduit-top-6 rotate: false - xy: 541, 168 + xy: 561, 162 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 liquid-router rotate: false - xy: 355, 3 + xy: 851, 253 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 liquid-router-bottom rotate: false - xy: 365, 3 + xy: 871, 263 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 liquid-router-liquid rotate: false - xy: 375, 3 + xy: 861, 253 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 liquid-router-top rotate: false - xy: 385, 3 + xy: 851, 243 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -1476,70 +1476,70 @@ liquid-tank-top index: -1 phase-conduit-arrow rotate: false - xy: 989, 257 + xy: 861, 153 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 phase-conduit-bridge rotate: false - xy: 999, 257 + xy: 871, 153 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 phase-conduit-end rotate: false - xy: 1009, 257 + xy: 881, 153 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 pulse-conduit-top-0 rotate: false - xy: 495, 2 + xy: 941, 255 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 pulse-conduit-top-1 rotate: false - xy: 921, 261 + xy: 951, 255 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 pulse-conduit-top-2 rotate: false - xy: 931, 261 + xy: 941, 245 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 pulse-conduit-top-3 rotate: false - xy: 921, 251 + xy: 961, 255 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 pulse-conduit-top-4 rotate: false - xy: 921, 241 + xy: 941, 235 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 pulse-conduit-top-5 rotate: false - xy: 931, 251 + xy: 951, 245 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 pulse-conduit-top-6 rotate: false - xy: 921, 231 + xy: 941, 225 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -1630,7 +1630,7 @@ fusion-reactor-top index: -1 rtg-generator-top rotate: false - xy: 931, 211 + xy: 941, 215 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -1651,7 +1651,7 @@ thorium-reactor-lights index: -1 turbine-generator-top rotate: false - xy: 265, 81 + xy: 301, 99 size: 16, 16 orig: 16, 16 offset: 0, 0 @@ -1777,112 +1777,112 @@ block-icon-blast-mixer index: -1 centrifuge-liquid rotate: false - xy: 863, 303 + xy: 881, 303 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 cryofluidmixer-bottom rotate: false - xy: 917, 303 + xy: 949, 353 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 cryofluidmixer-liquid rotate: false - xy: 949, 353 + xy: 967, 353 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 cryofluidmixer-top rotate: false - xy: 967, 353 + xy: 985, 353 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 cultivator rotate: false - xy: 985, 353 + xy: 687, 249 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 cultivator-middle rotate: false - xy: 687, 249 + xy: 687, 231 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 cultivator-top rotate: false - xy: 687, 231 + xy: 687, 213 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 lavasmelter rotate: false - xy: 399, 25 + xy: 999, 287 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 oilrefinery rotate: false - xy: 479, 32 + xy: 891, 253 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 phase-weaver rotate: false - xy: 321, 117 + xy: 339, 117 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 phase-weaver-bottom rotate: false - xy: 339, 117 + xy: 357, 117 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 phase-weaver-weave rotate: false - xy: 357, 117 + xy: 375, 117 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 plastanium-compressor-top rotate: false - xy: 375, 117 + xy: 393, 117 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 pulverizer rotate: false - xy: 931, 241 + xy: 951, 235 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 pulverizer-rotator rotate: false - xy: 921, 221 + xy: 961, 245 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 separator-liquid rotate: false - xy: 507, 44 + xy: 955, 195 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -1903,21 +1903,21 @@ core-top index: -1 sortedunloader rotate: false - xy: 517, 44 + xy: 981, 227 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-1 rotate: false - xy: 566, 196 + xy: 638, 182 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-1-top rotate: false - xy: 527, 187 + xy: 648, 182 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -1987,7 +1987,7 @@ cyclone index: -1 duo rotate: false - xy: 467, 52 + xy: 751, 166 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -1999,16 +1999,9 @@ fuse orig: 24, 24 offset: 0, 0 index: -1 -spectre - rotate: false - xy: 711, 368 - size: 24, 24 - orig: 24, 24 - offset: 0, 0 - index: -1 hail rotate: false - xy: 541, 158 + xy: 811, 166 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -2022,14 +2015,14 @@ hail-heat index: -1 lancer rotate: false - xy: 979, 317 + xy: 177, 117 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 lancer-heat rotate: false - xy: 177, 117 + xy: 195, 117 size: 16, 16 orig: 16, 16 offset: 0, 0 @@ -2057,137 +2050,137 @@ ripple-heat index: -1 salvo rotate: false - xy: 193, 81 + xy: 229, 99 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 salvo-heat rotate: false - xy: 229, 99 + xy: 211, 81 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 salvo-panel-left rotate: false - xy: 211, 81 + xy: 247, 99 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 salvo-panel-right rotate: false - xy: 247, 99 + xy: 229, 81 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 scatter rotate: false - xy: 497, 44 + xy: 955, 205 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 scorch rotate: false - xy: 507, 64 + xy: 965, 205 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 scorch-shoot rotate: false - xy: 507, 54 + xy: 945, 195 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 +spectre + rotate: false + xy: 819, 316 + size: 24, 24 + orig: 24, 24 + offset: 0, 0 + index: -1 swarmer rotate: false - xy: 229, 81 + xy: 265, 99 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 wave rotate: false - xy: 319, 81 + xy: 355, 99 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 wave-liquid rotate: false - xy: 355, 99 + xy: 337, 81 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 dagger-pad-top rotate: false - xy: 687, 213 + xy: 705, 249 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 dagger-pad-top-open rotate: false - xy: 705, 249 + xy: 705, 231 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 drone-pad-top rotate: false - xy: 705, 213 + xy: 723, 254 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 drone-pad-top-open rotate: false - xy: 723, 254 + xy: 723, 236 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 fabricator-pad-top rotate: false - xy: 723, 236 + xy: 741, 254 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 fabricator-pad-top-open rotate: false - xy: 741, 254 + xy: 723, 218 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 interceptor-pad-top rotate: false - xy: 985, 335 + xy: 953, 305 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 interceptor-pad-top-open rotate: false - xy: 953, 305 + xy: 979, 317 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 -ship-factory - rotate: false - xy: 819, 316 - size: 24, 24 - orig: 24, 24 - offset: 0, 0 - index: -1 monsoon-pad rotate: false xy: 763, 342 @@ -2225,21 +2218,21 @@ titan-pad-top-open index: -1 reconstructor-open rotate: false - xy: 997, 317 + xy: 175, 99 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 repair-point-turret rotate: false - xy: 931, 231 + xy: 951, 225 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 resupply-point rotate: false - xy: 921, 211 + xy: 961, 235 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -2253,14 +2246,14 @@ titan-pad index: -1 door-large-open rotate: false - xy: 705, 231 + xy: 705, 213 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 door-open rotate: false - xy: 467, 62 + xy: 751, 176 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -2295,14 +2288,14 @@ bullet index: -1 bullet-back rotate: false - xy: 534, 198 + xy: 546, 198 size: 9, 9 orig: 9, 9 offset: 0, 0 index: -1 casing rotate: false - xy: 465, 102 + xy: 831, 200 size: 2, 4 orig: 2, 4 offset: 0, 0 @@ -2316,35 +2309,35 @@ clear index: -1 command-attack rotate: false - xy: 969, 275 + xy: 501, 175 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 command-idle rotate: false - xy: 969, 265 + xy: 511, 175 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 command-retreat rotate: false - xy: 485, 92 + xy: 521, 175 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 enemyarrow rotate: false - xy: 491, 157 + xy: 373, 92 size: 8, 7 orig: 8, 7 offset: 0, 0 index: -1 error rotate: false - xy: 325, 19 + xy: 1003, 353 size: 12, 12 orig: 12, 12 offset: 0, 0 @@ -2386,14 +2379,14 @@ minelaser-end index: -1 missile rotate: false - xy: 545, 198 + xy: 546, 187 size: 9, 9 orig: 9, 9 offset: 0, 0 index: -1 missile-back rotate: false - xy: 484, 186 + xy: 605, 181 size: 9, 9 orig: 9, 9 offset: 0, 0 @@ -2435,21 +2428,21 @@ scorch5 index: -1 shell rotate: false - xy: 495, 186 + xy: 616, 181 size: 9, 9 orig: 9, 9 offset: 0, 0 index: -1 shell-back rotate: false - xy: 506, 186 + xy: 627, 181 size: 9, 9 orig: 9, 9 offset: 0, 0 index: -1 shot rotate: false - xy: 499, 34 + xy: 965, 195 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -2463,7 +2456,7 @@ transfer index: -1 transfer-arrow rotate: false - xy: 971, 207 + xy: 961, 175 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -2491,14 +2484,14 @@ blackstone-cliff-edge-1 index: -1 blackstone-cliff-edge-2 rotate: false - xy: 517, 187 + xy: 351, 19 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blackstone-cliff-side rotate: false - xy: 556, 196 + xy: 677, 194 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -2526,28 +2519,28 @@ block-icon-blast-drill index: -1 block-icon-bridge-conduit rotate: false - xy: 849, 296 + xy: 678, 184 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 bridge-conduit rotate: false - xy: 849, 296 + xy: 678, 184 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-icon-bridge-conveyor rotate: false - xy: 829, 286 + xy: 688, 185 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 bridge-conveyor rotate: false - xy: 829, 286 + xy: 688, 185 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -2568,14 +2561,14 @@ centrifuge index: -1 block-icon-combustion-generator rotate: false - xy: 829, 276 + xy: 698, 185 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 combustion-generator rotate: false - xy: 829, 276 + xy: 698, 185 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -2596,14 +2589,14 @@ command-center index: -1 block-icon-composite-wall rotate: false - xy: 839, 286 + xy: 708, 185 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 composite-wall rotate: false - xy: 839, 286 + xy: 708, 185 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -2624,35 +2617,35 @@ composite-wall-large index: -1 block-icon-conduit rotate: false - xy: 839, 276 + xy: 839, 296 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-icon-conveyor rotate: false - xy: 849, 286 + xy: 849, 296 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 conveyor-0-0 rotate: false - xy: 849, 286 + xy: 849, 296 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-icon-copper-wall rotate: false - xy: 849, 276 + xy: 829, 286 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 copper-wall rotate: false - xy: 849, 276 + xy: 829, 286 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -2729,28 +2722,28 @@ dart-ship-factory index: -1 block-icon-deepwater rotate: false - xy: 859, 293 + xy: 829, 276 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 deepwater rotate: false - xy: 859, 293 + xy: 829, 276 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-icon-deflector-wall rotate: false - xy: 859, 283 + xy: 839, 286 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 deflector-wall rotate: false - xy: 859, 283 + xy: 839, 286 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -2785,14 +2778,14 @@ delta-mech-factory index: -1 block-icon-dirt rotate: false - xy: 869, 293 + xy: 839, 276 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 dirt1 rotate: false - xy: 869, 293 + xy: 839, 276 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -2813,14 +2806,14 @@ distributor index: -1 block-icon-door rotate: false - xy: 869, 283 + xy: 849, 286 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 door rotate: false - xy: 869, 283 + xy: 849, 286 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -2848,21 +2841,21 @@ block-icon-drone-pad index: -1 block-icon-drop-point rotate: false - xy: 879, 293 + xy: 849, 276 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 drop-point rotate: false - xy: 879, 293 + xy: 849, 276 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-icon-duo rotate: false - xy: 879, 283 + xy: 859, 293 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -2904,63 +2897,63 @@ glaive-ship-factory index: -1 block-icon-grass rotate: false - xy: 889, 293 + xy: 859, 283 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 grass1 rotate: false - xy: 889, 293 + xy: 859, 283 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-icon-hail rotate: false - xy: 889, 283 + xy: 869, 293 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-icon-ice rotate: false - xy: 899, 293 + xy: 869, 283 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ice1 rotate: false - xy: 899, 293 + xy: 869, 283 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-icon-icerock rotate: false - xy: 899, 283 + xy: 879, 293 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 icerock1 rotate: false - xy: 899, 283 + xy: 879, 293 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-icon-incinerator rotate: false - xy: 909, 293 + xy: 879, 283 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 incinerator rotate: false - xy: 909, 293 + xy: 879, 283 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -2974,28 +2967,28 @@ block-icon-interceptor-pad index: -1 block-icon-itemsource rotate: false - xy: 909, 283 + xy: 889, 293 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 itemsource rotate: false - xy: 909, 283 + xy: 889, 293 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-icon-itemvoid rotate: false - xy: 919, 293 + xy: 889, 283 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 itemvoid rotate: false - xy: 919, 293 + xy: 889, 283 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -3016,14 +3009,14 @@ javelin-ship-factory index: -1 block-icon-junction rotate: false - xy: 919, 283 + xy: 899, 293 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 junction rotate: false - xy: 919, 283 + xy: 899, 293 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -3044,35 +3037,35 @@ block-icon-laser-drill index: -1 block-icon-lava rotate: false - xy: 859, 273 + xy: 899, 283 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 lava rotate: false - xy: 859, 273 + xy: 899, 283 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-icon-liquid-junction rotate: false - xy: 869, 273 + xy: 909, 293 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 liquid-junction rotate: false - xy: 869, 273 + xy: 909, 293 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-icon-liquid-router rotate: false - xy: 879, 273 + xy: 909, 283 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -3086,14 +3079,14 @@ block-icon-liquid-tank index: -1 block-icon-liquidsource rotate: false - xy: 889, 273 + xy: 919, 293 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 liquidsource rotate: false - xy: 889, 273 + xy: 919, 293 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -3121,14 +3114,14 @@ block-icon-mechanical-drill index: -1 block-icon-mechanical-pump rotate: false - xy: 899, 273 + xy: 919, 283 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 mechanical-pump rotate: false - xy: 899, 273 + xy: 919, 283 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -3142,14 +3135,14 @@ block-icon-meltdown index: -1 block-icon-melter rotate: false - xy: 909, 273 + xy: 859, 273 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 melter rotate: false - xy: 909, 273 + xy: 859, 273 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -3170,14 +3163,14 @@ mend-projector index: -1 block-icon-metalfloor rotate: false - xy: 919, 273 + xy: 869, 273 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 metalfloor1 rotate: false - xy: 919, 273 + xy: 869, 273 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -3191,14 +3184,14 @@ block-icon-monsoon-pad index: -1 block-icon-oil rotate: false - xy: 831, 266 + xy: 879, 273 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 oil rotate: false - xy: 831, 266 + xy: 879, 273 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -3226,56 +3219,56 @@ omega-mech-factory index: -1 block-icon-overflow-gate rotate: false - xy: 831, 256 + xy: 889, 273 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 overflow-gate rotate: false - xy: 831, 256 + xy: 889, 273 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-icon-phase-conduit rotate: false - xy: 841, 266 + xy: 899, 273 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 phase-conduit rotate: false - xy: 841, 266 + xy: 899, 273 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-icon-phase-conveyor rotate: false - xy: 831, 246 + xy: 909, 273 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 phase-conveyor rotate: false - xy: 831, 246 + xy: 909, 273 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-icon-phase-wall rotate: false - xy: 841, 256 + xy: 919, 273 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 phase-wall rotate: false - xy: 841, 256 + xy: 919, 273 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -3331,14 +3324,14 @@ block-icon-pneumatic-drill index: -1 block-icon-power-node rotate: false - xy: 831, 236 + xy: 831, 266 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 power-node rotate: false - xy: 831, 236 + xy: 831, 266 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -3359,42 +3352,42 @@ power-node-large index: -1 block-icon-powerinfinite rotate: false - xy: 841, 246 + xy: 831, 256 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 powerinfinite rotate: false - xy: 841, 246 + xy: 831, 256 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-icon-powervoid rotate: false - xy: 831, 226 + xy: 841, 266 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 powervoid rotate: false - xy: 831, 226 + xy: 841, 266 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-icon-pulse-conduit rotate: false - xy: 841, 236 + xy: 831, 246 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-icon-pulverizer rotate: false - xy: 831, 216 + xy: 841, 256 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -3457,14 +3450,14 @@ reconstructor index: -1 block-icon-repair-point rotate: false - xy: 841, 226 + xy: 831, 236 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 repair-point rotate: false - xy: 841, 226 + xy: 831, 236 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -3478,14 +3471,14 @@ block-icon-ripple index: -1 block-icon-rock rotate: false - xy: 831, 206 + xy: 841, 246 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 rock1 rotate: false - xy: 831, 206 + xy: 841, 246 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -3506,28 +3499,28 @@ rotary-pump index: -1 block-icon-router rotate: false - xy: 841, 216 + xy: 831, 226 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 router rotate: false - xy: 841, 216 + xy: 831, 226 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-icon-rtg-generator rotate: false - xy: 841, 206 + xy: 841, 236 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 rtg-generator rotate: false - xy: 841, 206 + xy: 841, 236 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -3541,49 +3534,49 @@ block-icon-salvo index: -1 block-icon-sand rotate: false - xy: 831, 196 + xy: 831, 216 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 sand1 rotate: false - xy: 831, 196 + xy: 831, 216 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-icon-scorch rotate: false - xy: 841, 196 + xy: 841, 226 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-icon-separator rotate: false - xy: 829, 186 + xy: 831, 206 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 separator rotate: false - xy: 829, 186 + xy: 831, 206 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-icon-shrub rotate: false - xy: 839, 186 + xy: 841, 216 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 shrub rotate: false - xy: 839, 186 + xy: 841, 216 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -3604,42 +3597,42 @@ silicon-smelter index: -1 block-icon-smelter rotate: false - xy: 953, 295 + xy: 841, 206 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 smelter rotate: false - xy: 953, 295 + xy: 841, 206 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-icon-snow rotate: false - xy: 963, 295 + xy: 953, 295 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 snow1 rotate: false - xy: 963, 295 + xy: 953, 295 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-icon-solar-panel rotate: false - xy: 469, 102 + xy: 963, 295 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 solar-panel rotate: false - xy: 469, 102 + xy: 963, 295 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -3660,42 +3653,42 @@ solar-panel-large index: -1 block-icon-solidifer rotate: false - xy: 465, 92 + xy: 835, 196 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 solidifer rotate: false - xy: 465, 92 + xy: 835, 196 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-icon-sorter rotate: false - xy: 464, 82 + xy: 835, 186 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 sorter rotate: false - xy: 464, 82 + xy: 835, 186 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-icon-space rotate: false - xy: 464, 72 + xy: 845, 196 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 space rotate: false - xy: 464, 72 + xy: 845, 196 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -3709,63 +3702,91 @@ block-icon-spectre index: -1 block-icon-stone rotate: false - xy: 929, 291 + xy: 845, 186 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 stone1 + rotate: false + xy: 845, 186 + size: 8, 8 + orig: 8, 8 + offset: 0, 0 + index: -1 +block-icon-surge-wall rotate: false xy: 929, 291 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 -block-icon-swarmer +surge-wall + rotate: false + xy: 929, 291 + size: 8, 8 + orig: 8, 8 + offset: 0, 0 + index: -1 +block-icon-surge-wall-large rotate: false xy: 865, 339 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 -block-icon-tau-mech-factory +surge-wall-large + rotate: false + xy: 865, 339 + size: 16, 16 + orig: 16, 16 + offset: 0, 0 + index: -1 +block-icon-swarmer rotate: false xy: 883, 339 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 +block-icon-tau-mech-factory + rotate: false + xy: 901, 339 + size: 16, 16 + orig: 16, 16 + offset: 0, 0 + index: -1 tau-mech-factory rotate: false - xy: 883, 339 + xy: 901, 339 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 block-icon-thermal-generator rotate: false - xy: 901, 339 + xy: 863, 321 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 thermal-generator rotate: false - xy: 901, 339 + xy: 863, 321 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 block-icon-thermal-pump rotate: false - xy: 863, 321 + xy: 881, 321 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 thermal-pump rotate: false - xy: 863, 321 + xy: 881, 321 size: 16, 16 orig: 16, 16 offset: 0, 0 @@ -3800,14 +3821,14 @@ thorium-wall index: -1 block-icon-thorium-wall-large rotate: false - xy: 881, 321 + xy: 899, 321 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 thorium-wall-large rotate: false - xy: 881, 321 + xy: 899, 321 size: 16, 16 orig: 16, 16 offset: 0, 0 @@ -3835,28 +3856,28 @@ titanium-conveyor-0-0 index: -1 block-icon-trident-ship-factory rotate: false - xy: 899, 321 + xy: 919, 339 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 trident-ship-factory rotate: false - xy: 899, 321 + xy: 919, 339 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 block-icon-turbine-generator rotate: false - xy: 919, 339 + xy: 917, 321 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 turbine-generator rotate: false - xy: 919, 339 + xy: 917, 321 size: 16, 16 orig: 16, 16 offset: 0, 0 @@ -3919,1071 +3940,1071 @@ water index: -1 block-icon-water-extractor rotate: false - xy: 917, 321 + xy: 845, 306 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 block-icon-wave rotate: false - xy: 845, 306 + xy: 863, 303 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 deepwater-cliff-edge rotate: false - xy: 989, 277 + xy: 701, 175 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 deepwater-cliff-edge-1 rotate: false - xy: 989, 267 + xy: 701, 165 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 deepwater-cliff-edge-2 rotate: false - xy: 1003, 297 + xy: 711, 175 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 deepwater-cliff-side rotate: false - xy: 999, 287 + xy: 711, 165 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 dirt-cliff-edge rotate: false - xy: 1013, 299 + xy: 731, 176 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 dirt-cliff-edge-1 rotate: false - xy: 1009, 287 + xy: 731, 166 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 dirt-cliff-edge-2 rotate: false - xy: 1009, 277 + xy: 741, 176 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 dirt-cliff-side rotate: false - xy: 1009, 267 + xy: 741, 166 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 lava-cliff-edge rotate: false - xy: 359, 23 + xy: 979, 267 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 lava-cliff-edge-1 rotate: false - xy: 369, 23 + xy: 989, 277 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 lava-cliff-edge-2 rotate: false - xy: 379, 23 + xy: 989, 267 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 lava-cliff-side rotate: false - xy: 389, 23 + xy: 1003, 297 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 liquid-icon-cryofluid rotate: false - xy: 365, 13 + xy: 1009, 277 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 liquid-icon-lava rotate: false - xy: 375, 13 + xy: 1009, 267 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 liquid-icon-oil rotate: false - xy: 385, 13 + xy: 851, 263 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 liquid-icon-water rotate: false - xy: 345, 3 + xy: 861, 263 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 mech-icon-alpha-mech rotate: false - xy: 205, 5 + xy: 447, 96 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 mech-icon-dart-ship rotate: false - xy: 219, 5 + xy: 461, 96 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 mech-icon-delta-mech rotate: false - xy: 233, 5 + xy: 405, 89 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 mech-icon-omega-mech rotate: false - xy: 405, 101 + xy: 209, 1 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 mech-icon-tau-mech rotate: false - xy: 404, 69 + xy: 217, 17 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 mech-icon-trident-ship rotate: false - xy: 421, 108 + xy: 225, 1 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 trident-ship rotate: false - xy: 421, 108 + xy: 225, 1 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 metalfloor-cliff-edge rotate: false - xy: 415, 5 + xy: 861, 233 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 metalfloor-cliff-edge-1 rotate: false - xy: 425, 15 + xy: 871, 243 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 metalfloor-cliff-edge-2 rotate: false - xy: 425, 5 + xy: 881, 253 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 metalfloor-cliff-side rotate: false - xy: 429, 30 + xy: 851, 223 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 oil-cliff-edge rotate: false - xy: 439, 30 + xy: 901, 263 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 oil-cliff-edge-1 rotate: false - xy: 449, 30 + xy: 861, 223 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 oil-cliff-edge-2 rotate: false - xy: 459, 30 + xy: 871, 233 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 oil-cliff-side rotate: false - xy: 469, 32 + xy: 881, 243 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-coal-blackstone1 rotate: false - xy: 489, 32 + xy: 851, 213 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-coal-blackstone2 rotate: false - xy: 435, 20 + xy: 911, 263 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-coal-blackstone3 rotate: false - xy: 435, 10 + xy: 861, 213 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-coal-grass1 rotate: false - xy: 445, 20 + xy: 871, 223 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-coal-grass2 rotate: false - xy: 445, 10 + xy: 881, 233 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-coal-grass3 rotate: false - xy: 455, 20 + xy: 891, 243 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-coal-ice1 rotate: false - xy: 455, 10 + xy: 901, 253 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-coal-ice2 rotate: false - xy: 465, 20 + xy: 871, 213 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-coal-ice3 rotate: false - xy: 465, 10 + xy: 881, 223 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-coal-sand1 rotate: false - xy: 475, 22 + xy: 891, 233 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-coal-sand2 rotate: false - xy: 475, 12 + xy: 901, 243 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-coal-sand3 rotate: false - xy: 485, 22 + xy: 911, 253 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-coal-snow1 rotate: false - xy: 485, 12 + xy: 881, 213 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-coal-snow2 rotate: false - xy: 495, 22 + xy: 891, 223 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-coal-snow3 rotate: false - xy: 495, 12 + xy: 901, 233 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-coal-stone1 rotate: false - xy: 823, 176 + xy: 911, 243 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-coal-stone2 rotate: false - xy: 833, 176 + xy: 891, 213 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-coal-stone3 rotate: false - xy: 843, 176 + xy: 901, 223 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-copper-blackstone1 rotate: false - xy: 853, 176 + xy: 911, 233 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-copper-blackstone2 rotate: false - xy: 851, 263 + xy: 901, 213 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-copper-blackstone3 rotate: false - xy: 851, 253 + xy: 911, 223 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-copper-grass1 rotate: false - xy: 861, 263 + xy: 911, 213 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-copper-grass2 rotate: false - xy: 851, 243 + xy: 855, 203 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-copper-grass3 rotate: false - xy: 871, 263 + xy: 855, 193 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-copper-ice1 rotate: false - xy: 861, 253 + xy: 865, 203 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-copper-ice2 rotate: false - xy: 851, 233 + xy: 865, 193 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-copper-ice3 rotate: false - xy: 881, 263 + xy: 875, 203 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-copper-sand1 rotate: false - xy: 871, 253 + xy: 875, 193 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-copper-sand2 rotate: false - xy: 861, 243 + xy: 885, 203 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-copper-sand3 rotate: false - xy: 851, 223 + xy: 885, 193 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-copper-snow1 rotate: false - xy: 891, 263 + xy: 895, 203 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-copper-snow2 rotate: false - xy: 881, 253 + xy: 895, 193 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-copper-snow3 rotate: false - xy: 871, 243 + xy: 905, 203 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-copper-stone1 rotate: false - xy: 861, 233 + xy: 905, 193 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-copper-stone2 rotate: false - xy: 851, 213 + xy: 915, 203 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-copper-stone3 rotate: false - xy: 901, 263 + xy: 915, 193 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-lead-blackstone1 rotate: false - xy: 891, 253 + xy: 861, 183 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-lead-blackstone2 rotate: false - xy: 881, 243 + xy: 861, 173 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-lead-blackstone3 rotate: false - xy: 871, 233 + xy: 871, 183 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-lead-grass1 rotate: false - xy: 861, 223 + xy: 871, 173 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-lead-grass2 rotate: false - xy: 851, 203 + xy: 881, 183 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-lead-grass3 rotate: false - xy: 911, 263 + xy: 881, 173 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-lead-ice1 rotate: false - xy: 901, 253 + xy: 891, 183 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-lead-ice2 rotate: false - xy: 891, 243 + xy: 891, 173 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-lead-ice3 rotate: false - xy: 881, 233 + xy: 901, 183 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-lead-sand1 rotate: false - xy: 871, 223 + xy: 901, 173 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-lead-sand2 rotate: false - xy: 861, 213 + xy: 911, 183 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-lead-sand3 rotate: false - xy: 911, 253 + xy: 911, 173 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-lead-snow1 rotate: false - xy: 901, 243 + xy: 861, 163 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-lead-snow2 rotate: false - xy: 891, 233 + xy: 871, 163 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-lead-snow3 rotate: false - xy: 881, 223 + xy: 881, 163 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-lead-stone1 rotate: false - xy: 871, 213 + xy: 891, 163 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-lead-stone2 rotate: false - xy: 861, 203 + xy: 901, 163 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-lead-stone3 rotate: false - xy: 911, 243 + xy: 911, 163 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-thorium-blackstone1 rotate: false - xy: 901, 233 + xy: 921, 183 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-thorium-blackstone2 rotate: false - xy: 891, 223 + xy: 921, 173 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-thorium-blackstone3 rotate: false - xy: 881, 213 + xy: 921, 163 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-thorium-grass1 rotate: false - xy: 871, 203 + xy: 369, 9 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-thorium-grass2 rotate: false - xy: 911, 233 + xy: 979, 257 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-thorium-grass3 rotate: false - xy: 901, 223 + xy: 989, 257 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-thorium-ice1 rotate: false - xy: 891, 213 + xy: 999, 257 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-thorium-ice2 rotate: false - xy: 881, 203 + xy: 1009, 257 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-thorium-ice3 rotate: false - xy: 911, 223 + xy: 921, 261 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-thorium-sand1 rotate: false - xy: 901, 213 + xy: 931, 261 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-thorium-sand2 rotate: false - xy: 891, 203 + xy: 921, 251 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-thorium-sand3 rotate: false - xy: 911, 213 + xy: 931, 251 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-thorium-snow1 rotate: false - xy: 901, 203 + xy: 921, 241 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-thorium-snow2 rotate: false - xy: 911, 203 + xy: 931, 241 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-thorium-snow3 rotate: false - xy: 859, 193 + xy: 921, 231 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-thorium-stone1 rotate: false - xy: 869, 193 + xy: 931, 231 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-thorium-stone2 rotate: false - xy: 879, 193 + xy: 921, 221 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-thorium-stone3 rotate: false - xy: 889, 193 + xy: 931, 221 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-titanium-blackstone1 rotate: false - xy: 899, 193 + xy: 681, 154 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-titanium-blackstone2 rotate: false - xy: 909, 193 + xy: 691, 155 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-titanium-blackstone3 rotate: false - xy: 863, 183 + xy: 701, 155 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-titanium-grass1 rotate: false - xy: 873, 183 + xy: 711, 155 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-titanium-grass2 rotate: false - xy: 883, 183 + xy: 721, 156 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-titanium-grass3 rotate: false - xy: 893, 183 + xy: 731, 156 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-titanium-ice1 rotate: false - xy: 903, 183 + xy: 741, 156 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-titanium-ice2 rotate: false - xy: 863, 173 + xy: 751, 156 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-titanium-ice3 rotate: false - xy: 873, 173 + xy: 761, 156 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-titanium-sand1 rotate: false - xy: 883, 173 + xy: 771, 156 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-titanium-sand2 rotate: false - xy: 893, 173 + xy: 781, 156 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-titanium-sand3 rotate: false - xy: 903, 173 + xy: 791, 156 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-titanium-snow1 rotate: false - xy: 913, 183 + xy: 801, 156 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-titanium-snow2 rotate: false - xy: 913, 173 + xy: 811, 156 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-titanium-snow3 rotate: false - xy: 919, 193 + xy: 821, 156 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-titanium-stone1 rotate: false - xy: 923, 183 + xy: 831, 156 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-titanium-stone2 rotate: false - xy: 923, 173 + xy: 841, 156 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-titanium-stone3 rotate: false - xy: 979, 257 + xy: 851, 156 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 sand-cliff-edge rotate: false - xy: 494, 74 + xy: 931, 211 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 sand-cliff-edge-1 rotate: false - xy: 504, 74 + xy: 925, 201 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 sand-cliff-edge-2 rotate: false - xy: 497, 64 + xy: 935, 201 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 sand-cliff-side rotate: false - xy: 497, 54 + xy: 945, 205 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 snow-cliff-edge rotate: false - xy: 505, 4 + xy: 971, 227 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 snow-cliff-edge-1 rotate: false - xy: 514, 74 + xy: 981, 237 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 snow-cliff-edge-2 rotate: false - xy: 517, 64 + xy: 991, 247 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 snow-cliff-side rotate: false - xy: 517, 54 + xy: 971, 217 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 space-cliff-edge rotate: false - xy: 519, 34 + xy: 991, 237 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 space-cliff-edge-1 rotate: false - xy: 515, 24 + xy: 1001, 247 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 space-cliff-edge-2 rotate: false - xy: 515, 14 + xy: 981, 217 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 space-cliff-side rotate: false - xy: 515, 4 + xy: 991, 227 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 unit-icon-dagger rotate: false - xy: 765, 186 + xy: 807, 186 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 unit-icon-titan rotate: false - xy: 301, 99 + xy: 283, 81 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 item-biomatter rotate: false - xy: 481, 144 + xy: 851, 166 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 item-blast-compound rotate: false - xy: 491, 137 + xy: 383, 91 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 item-coal rotate: false - xy: 501, 136 + xy: 393, 91 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 item-copper rotate: false - xy: 511, 136 + xy: 359, 9 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 item-dense-alloy rotate: false - xy: 521, 137 + xy: 361, 19 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 item-lead rotate: false - xy: 531, 137 + xy: 971, 307 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 item-phase-matter rotate: false - xy: 541, 138 + xy: 981, 307 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 item-plastanium rotate: false - xy: 481, 134 + xy: 991, 307 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 item-pyratite rotate: false - xy: 474, 124 + xy: 1001, 307 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 item-sand rotate: false - xy: 484, 124 + xy: 973, 297 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 item-silicon rotate: false - xy: 481, 114 + xy: 983, 297 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 item-stone rotate: false - xy: 491, 114 + xy: 993, 297 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 item-surge-alloy rotate: false - xy: 489, 104 + xy: 979, 287 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 item-thorium rotate: false - xy: 339, 23 + xy: 979, 277 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 item-titanium rotate: false - xy: 349, 23 + xy: 989, 287 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 liquid-icon rotate: false - xy: 355, 13 + xy: 1009, 287 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -5011,105 +5032,105 @@ alpha-mech-leg index: -1 delta-mech rotate: false - xy: 269, 19 + xy: 303, 5 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 delta-mech-leg rotate: false - xy: 283, 19 + xy: 317, 5 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 omega-mech rotate: false - xy: 437, 108 + xy: 233, 17 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 omega-mech-armor rotate: false - xy: 453, 108 + xy: 241, 1 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 omega-mech-base rotate: false - xy: 417, 85 + xy: 249, 17 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 omega-mech-leg rotate: false - xy: 420, 69 + xy: 257, 1 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 tau-mech rotate: false - xy: 449, 92 + xy: 273, 1 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 tau-mech-base rotate: false - xy: 737, 186 + xy: 779, 186 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 tau-mech-leg rotate: false - xy: 751, 186 + xy: 793, 186 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 dart-ship rotate: false - xy: 255, 19 + xy: 289, 5 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 glaive-ship rotate: false - xy: 337, 83 + xy: 373, 101 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 mech-icon-glaive-ship rotate: false - xy: 337, 83 + xy: 373, 101 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 javelin-ship rotate: false - xy: 450, 64 + xy: 461, 110 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 mech-icon-javelin-ship rotate: false - xy: 450, 64 + xy: 461, 110 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 javelin-ship-shield rotate: false - xy: 177, 5 + xy: 419, 96 size: 12, 12 orig: 12, 12 offset: 0, 0 @@ -5286,28 +5307,28 @@ discord-banner-over index: -1 controller-cursor rotate: false - xy: 881, 303 + xy: 899, 303 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-about rotate: false - xy: 373, 101 + xy: 355, 83 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-add rotate: false - xy: 353, 83 + xy: 389, 101 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-admin rotate: false - xy: 389, 101 + xy: 180, 65 size: 14, 14 orig: 14, 14 offset: 0, 0 @@ -5328,14 +5349,14 @@ icon-areaDelete index: -1 icon-arrow rotate: false - xy: 723, 218 + xy: 741, 236 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-arrow-16 rotate: false - xy: 723, 218 + xy: 741, 236 size: 16, 16 orig: 16, 16 offset: 0, 0 @@ -5356,203 +5377,203 @@ icon-arrow-left index: -1 icon-arrow-right rotate: false - xy: 793, 188 + xy: 351, 53 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-arrow-up rotate: false - xy: 805, 188 + xy: 351, 41 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-back rotate: false - xy: 741, 236 + xy: 759, 254 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-ban rotate: false - xy: 180, 65 + xy: 196, 65 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-break rotate: false - xy: 759, 254 + xy: 741, 218 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-cancel rotate: false - xy: 741, 218 + xy: 759, 236 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-chat rotate: false - xy: 817, 188 + xy: 351, 29 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-check rotate: false - xy: 759, 236 + xy: 777, 254 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-crafting rotate: false - xy: 469, 112 + xy: 363, 55 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-cursor rotate: false - xy: 335, 53 + xy: 363, 43 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-defense rotate: false - xy: 335, 41 + xy: 363, 31 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-dev-builds rotate: false - xy: 196, 65 + xy: 212, 65 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-discord rotate: false - xy: 212, 65 + xy: 228, 65 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-distribution rotate: false - xy: 347, 55 + xy: 486, 197 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-donate rotate: false - xy: 228, 65 + xy: 244, 65 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-dots rotate: false - xy: 244, 65 + xy: 260, 65 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-editor rotate: false - xy: 260, 65 + xy: 276, 65 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-egg rotate: false - xy: 276, 65 + xy: 292, 65 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-elevation rotate: false - xy: 777, 254 + xy: 759, 218 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-eraser rotate: false - xy: 759, 218 + xy: 777, 236 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-exit rotate: false - xy: 292, 65 + xy: 308, 65 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-file rotate: false - xy: 777, 236 + xy: 795, 254 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-file-image rotate: false - xy: 795, 254 + xy: 777, 218 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-file-text rotate: false - xy: 308, 65 + xy: 324, 65 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-fill rotate: false - xy: 777, 218 + xy: 795, 236 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-floppy rotate: false - xy: 324, 65 + xy: 340, 65 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-floppy-16 rotate: false - xy: 795, 236 + xy: 795, 218 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-folder rotate: false - xy: 340, 67 + xy: 356, 67 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-folder-parent rotate: false - xy: 356, 67 + xy: 175, 49 size: 14, 14 orig: 14, 14 offset: 0, 0 @@ -5566,364 +5587,364 @@ icon-generated index: -1 icon-github rotate: false - xy: 175, 49 + xy: 191, 49 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-google-play rotate: false - xy: 191, 49 + xy: 175, 33 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-grid rotate: false - xy: 795, 218 + xy: 813, 254 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-hold rotate: false - xy: 359, 55 + xy: 498, 197 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-holdDelete rotate: false - xy: 347, 43 + xy: 510, 197 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-home rotate: false - xy: 175, 33 + xy: 207, 49 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-host rotate: false - xy: 207, 49 + xy: 191, 33 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-info rotate: false - xy: 371, 55 + xy: 522, 197 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-itch.io rotate: false - xy: 191, 33 + xy: 223, 49 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-item rotate: false - xy: 359, 43 + xy: 534, 197 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-items-none rotate: false - xy: 531, 147 + xy: 841, 166 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 icon-line rotate: false - xy: 813, 254 + xy: 813, 236 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-link rotate: false - xy: 223, 49 + xy: 207, 33 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-liquid rotate: false - xy: 371, 43 + xy: 484, 185 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-load rotate: false - xy: 207, 33 + xy: 239, 49 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-load-image rotate: false - xy: 813, 236 + xy: 813, 218 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-load-map rotate: false - xy: 813, 218 + xy: 687, 195 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-loading rotate: false - xy: 687, 195 + xy: 705, 195 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-locked rotate: false - xy: 705, 195 + xy: 723, 200 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-logic rotate: false - xy: 383, 55 + xy: 496, 185 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-map rotate: false - xy: 239, 49 + xy: 223, 33 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-menu rotate: false - xy: 383, 43 + xy: 508, 185 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-menu-large rotate: false - xy: 723, 200 + xy: 741, 200 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-missing rotate: false - xy: 395, 57 + xy: 520, 185 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-none rotate: false - xy: 407, 57 + xy: 532, 185 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-nullitem rotate: false - xy: 541, 148 + xy: 851, 176 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 icon-pause rotate: false - xy: 395, 45 + xy: 557, 194 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-pencil rotate: false - xy: 741, 200 + xy: 759, 200 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-pencil-small rotate: false - xy: 223, 33 + xy: 255, 49 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-pick rotate: false - xy: 759, 200 + xy: 777, 200 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-play rotate: false - xy: 419, 57 + xy: 569, 194 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-play-2 rotate: false - xy: 255, 49 + xy: 239, 33 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-players rotate: false - xy: 407, 45 + xy: 581, 192 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-power rotate: false - xy: 419, 45 + xy: 593, 192 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-production rotate: false - xy: 431, 52 + xy: 605, 192 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-quit rotate: false - xy: 239, 33 + xy: 271, 49 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-redo rotate: false - xy: 777, 200 + xy: 795, 200 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-refresh rotate: false - xy: 271, 49 + xy: 255, 33 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-rename rotate: false - xy: 255, 33 + xy: 287, 49 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-resize rotate: false - xy: 795, 200 + xy: 813, 200 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-rotate rotate: false - xy: 287, 49 + xy: 271, 33 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-rotate-arrow rotate: false - xy: 271, 33 + xy: 303, 49 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-rotate-left rotate: false - xy: 303, 49 + xy: 287, 33 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-rotate-right rotate: false - xy: 287, 33 + xy: 319, 49 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-save rotate: false - xy: 319, 49 + xy: 303, 33 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-save-image rotate: false - xy: 813, 200 + xy: 456, 142 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-save-map rotate: false - xy: 456, 142 + xy: 456, 124 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-settings rotate: false - xy: 443, 52 + xy: 617, 192 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-terrain rotate: false - xy: 456, 124 + xy: 935, 319 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-tools rotate: false - xy: 303, 33 + xy: 335, 49 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-touch rotate: false - xy: 455, 52 + xy: 629, 192 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-touchDelete rotate: false - xy: 431, 40 + xy: 641, 192 size: 10, 10 orig: 10, 10 offset: 0, 0 @@ -5937,70 +5958,70 @@ icon-trash index: -1 icon-trash-16 rotate: false - xy: 935, 319 + xy: 935, 301 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-trello rotate: false - xy: 369, 83 + xy: 335, 33 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-tutorial rotate: false - xy: 385, 85 + xy: 185, 17 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-undo rotate: false - xy: 935, 301 + xy: 967, 335 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-units rotate: false - xy: 443, 40 + xy: 653, 192 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-unlocks rotate: false - xy: 372, 67 + xy: 177, 1 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-weapon rotate: false - xy: 455, 40 + xy: 665, 192 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-wiki rotate: false - xy: 388, 69 + xy: 193, 1 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-zoom rotate: false - xy: 967, 335 + xy: 985, 335 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-zoom-small rotate: false - xy: 401, 85 + xy: 201, 17 size: 14, 14 orig: 14, 14 offset: 0, 0 @@ -6165,7 +6186,7 @@ textfield-over index: -1 white rotate: false - xy: 431, 64 + xy: 66, 52 size: 3, 3 orig: 3, 3 offset: 0, 0 @@ -6202,42 +6223,42 @@ unit-icon-alpha-drone index: -1 dagger rotate: false - xy: 213, 19 + xy: 309, 19 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 dagger-base rotate: false - xy: 227, 19 + xy: 323, 19 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 delta-mech-base rotate: false - xy: 227, 19 + xy: 323, 19 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 dagger-leg rotate: false - xy: 241, 19 + xy: 337, 19 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 drone rotate: false - xy: 311, 19 + xy: 1003, 367 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 unit-icon-drone rotate: false - xy: 311, 19 + xy: 1003, 367 size: 12, 12 orig: 12, 12 offset: 0, 0 @@ -6258,14 +6279,14 @@ unit-icon-fabricator index: -1 interceptor rotate: false - xy: 436, 64 + xy: 447, 110 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 unit-icon-interceptor rotate: false - xy: 436, 64 + xy: 447, 110 size: 12, 12 orig: 12, 12 offset: 0, 0 @@ -6286,28 +6307,28 @@ unit-icon-monsoon index: -1 power-cell rotate: false - xy: 433, 92 + xy: 265, 17 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 titan rotate: false - xy: 265, 99 + xy: 247, 81 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 titan-base rotate: false - xy: 247, 81 + xy: 283, 99 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 titan-leg rotate: false - xy: 283, 99 + xy: 265, 81 size: 16, 16 orig: 16, 16 offset: 0, 0 @@ -6321,56 +6342,56 @@ blaster-equip index: -1 bomber-equip rotate: false - xy: 185, 19 + xy: 281, 19 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 missiles-equip rotate: false - xy: 185, 19 + xy: 281, 19 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 chain-blaster-equip rotate: false - xy: 199, 19 + xy: 295, 19 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 flakgun-equip rotate: false - xy: 1003, 367 + xy: 1003, 339 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 flamethrower-equip rotate: false - xy: 1003, 353 + xy: 405, 103 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 heal-blaster-equip rotate: false - xy: 436, 78 + xy: 419, 110 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 shockgun-equip rotate: false - xy: 289, 5 + xy: 461, 82 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 swarmer-equip rotate: false - xy: 723, 186 + xy: 765, 186 size: 12, 12 orig: 12, 12 offset: 0, 0 diff --git a/core/assets/sprites/sprites.png b/core/assets/sprites/sprites.png index 76bc9faa9d..1fb927ea28 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/ai/Pathfinder.java b/core/src/io/anuke/mindustry/ai/Pathfinder.java index 51bf87b392..681ab83dd1 100644 --- a/core/src/io/anuke/mindustry/ai/Pathfinder.java +++ b/core/src/io/anuke/mindustry/ai/Pathfinder.java @@ -53,7 +53,7 @@ public class Pathfinder{ public Tile getTargetTile(Team team, Tile tile){ float[][] values = paths[team.ordinal()].weights; - if(values == null) return tile; + if(values == null || tile == null) return tile; float value = values[tile.x][tile.y]; diff --git a/core/src/io/anuke/mindustry/content/AmmoTypes.java b/core/src/io/anuke/mindustry/content/AmmoTypes.java index 2d971b1ad9..6e652a262b 100644 --- a/core/src/io/anuke/mindustry/content/AmmoTypes.java +++ b/core/src/io/anuke/mindustry/content/AmmoTypes.java @@ -13,8 +13,9 @@ public class AmmoTypes implements ContentList{ public static AmmoType bulletCopper, bulletDense, bulletThorium, bulletSilicon, bulletPyratite, shotgunTungsten, bombExplosive, bombIncendiary, bombOil, shellCarbide, flamerThermite, weaponMissile, weaponMissileSwarm, bulletMech, healBlaster, bulletGlaive, - flakLead, flakExplosive, flakPlastic, flakSurge, missileExplosive, missileIncindiary, missileSurge, - artilleryDense, artilleryPlastic, artilleryHoming, artilleryIncindiary, artilleryExplosive, + flakExplosive, flakPlastic, flakSurge, + missileExplosive, missileIncindiary, missileSurge, + artilleryDense, artilleryPlastic, artilleryHoming, artilleryIncindiary, artilleryExplosive, basicFlame, lancerLaser, lightning, spectreLaser, meltdownLaser, fuseShotgun, oil, water, lava, cryofluid; @Override @@ -29,7 +30,6 @@ public class AmmoTypes implements ContentList{ inaccuracy = 5f; }}; - bulletGlaive = new AmmoType(Items.pyratite, StandardBullets.glaive, 3){{ shootEffect = ShootFx.shootSmall; smokeEffect = ShootFx.shootSmallSmoke; @@ -118,24 +118,19 @@ public class AmmoTypes implements ContentList{ //flak - flakLead = new AmmoType(Items.lead, FlakBullets.lead, 5){{ - shootEffect = ShootFx.shootSmall; - smokeEffect = ShootFx.shootSmallSmoke; - }}; - flakExplosive = new AmmoType(Items.blastCompound, FlakBullets.explosive, 5){{ - shootEffect = ShootFx.shootSmall; - smokeEffect = ShootFx.shootSmallSmoke; + shootEffect = ShootFx.shootBig; + smokeEffect = ShootFx.shootBigSmoke; }}; flakPlastic = new AmmoType(Items.plastanium, FlakBullets.plastic, 5){{ - shootEffect = ShootFx.shootSmall; - smokeEffect = ShootFx.shootSmallSmoke; + shootEffect = ShootFx.shootBig; + smokeEffect = ShootFx.shootBigSmoke; }}; flakSurge = new AmmoType(Items.surgealloy, FlakBullets.surge, 5){{ - shootEffect = ShootFx.shootSmall; - smokeEffect = ShootFx.shootSmallSmoke; + shootEffect = ShootFx.shootBig; + smokeEffect = ShootFx.shootBigSmoke; }}; //missiles diff --git a/core/src/io/anuke/mindustry/content/Recipes.java b/core/src/io/anuke/mindustry/content/Recipes.java index b2768996ab..be8b079f7b 100644 --- a/core/src/io/anuke/mindustry/content/Recipes.java +++ b/core/src/io/anuke/mindustry/content/Recipes.java @@ -22,14 +22,18 @@ public class Recipes implements ContentList{ new Recipe(defense, DefenseBlocks.compositeWall, new ItemStack(Items.densealloy, 12)); new Recipe(defense, DefenseBlocks.compositeWallLarge, new ItemStack(Items.densealloy, 12 * 4)); + new Recipe(defense, DefenseBlocks.door, new ItemStack(Items.densealloy, 12), new ItemStack(Items.silicon, 8)); + new Recipe(defense, DefenseBlocks.doorLarge, new ItemStack(Items.densealloy, 12 * 4), new ItemStack(Items.silicon, 8 * 4)); + new Recipe(defense, DefenseBlocks.thoriumWall, new ItemStack(Items.thorium, 12)); new Recipe(defense, DefenseBlocks.thoriumWallLarge, new ItemStack(Items.thorium, 12 * 4)); new Recipe(defense, DefenseBlocks.phaseWall, new ItemStack(Items.phasematter, 12)); new Recipe(defense, DefenseBlocks.phaseWallLarge, new ItemStack(Items.phasematter, 12 * 4)); - new Recipe(defense, DefenseBlocks.door, new ItemStack(Items.densealloy, 12), new ItemStack(Items.silicon, 8)); - new Recipe(defense, DefenseBlocks.doorLarge, new ItemStack(Items.densealloy, 12 * 4), new ItemStack(Items.silicon, 8 * 4)); + new Recipe(defense, DefenseBlocks.surgeWall, new ItemStack(Items.surgealloy, 12)); + new Recipe(defense, DefenseBlocks.surgeWallLarge, new ItemStack(Items.surgealloy, 12 * 4)); + //projectors new Recipe(defense, DefenseBlocks.mendProjector, new ItemStack(Items.lead, 200), new ItemStack(Items.densealloy, 150), new ItemStack(Items.titanium, 150), new ItemStack(Items.silicon, 250)); @@ -38,12 +42,13 @@ public class Recipes implements ContentList{ new Recipe(weapon, TurretBlocks.duo, new ItemStack(Items.copper, 40)); new Recipe(weapon, TurretBlocks.scorch, new ItemStack(Items.copper, 50), new ItemStack(Items.densealloy, 20)); new Recipe(weapon, TurretBlocks.hail, new ItemStack(Items.copper, 60), new ItemStack(Items.densealloy, 35)); - new Recipe(weapon, TurretBlocks.lancer, new ItemStack(Items.copper, 50), new ItemStack(Items.lead, 100), new ItemStack(Items.silicon, 90)); new Recipe(weapon, TurretBlocks.wave, new ItemStack(Items.densealloy, 60), new ItemStack(Items.titanium, 70), new ItemStack(Items.lead, 150)); - new Recipe(weapon, TurretBlocks.swarmer, new ItemStack(Items.densealloy, 70), new ItemStack(Items.titanium, 70), new ItemStack(Items.plastanium, 90), new ItemStack(Items.silicon, 60)); new Recipe(weapon, TurretBlocks.salvo, new ItemStack(Items.copper, 210), new ItemStack(Items.densealloy, 190), new ItemStack(Items.thorium, 130)); + new Recipe(weapon, TurretBlocks.swarmer, new ItemStack(Items.densealloy, 70), new ItemStack(Items.titanium, 70), new ItemStack(Items.plastanium, 90), new ItemStack(Items.silicon, 60)); new Recipe(weapon, TurretBlocks.ripple, new ItemStack(Items.copper, 300), new ItemStack(Items.densealloy, 220), new ItemStack(Items.thorium, 120)); + new Recipe(weapon, TurretBlocks.cyclone, new ItemStack(Items.copper, 210), new ItemStack(Items.densealloy, 190), new ItemStack(Items.thorium, 130)); + new Recipe(weapon, TurretBlocks.fuse, new ItemStack(Items.copper, 300), new ItemStack(Items.densealloy, 220), new ItemStack(Items.thorium, 120)); //DISTRIBUTION new Recipe(distribution, DistributionBlocks.conveyor, new ItemStack(Items.copper, 1)); diff --git a/core/src/io/anuke/mindustry/content/blocks/DefenseBlocks.java b/core/src/io/anuke/mindustry/content/blocks/DefenseBlocks.java index 88bf1ee052..3dade68ae1 100644 --- a/core/src/io/anuke/mindustry/content/blocks/DefenseBlocks.java +++ b/core/src/io/anuke/mindustry/content/blocks/DefenseBlocks.java @@ -4,14 +4,11 @@ import io.anuke.mindustry.content.Items; import io.anuke.mindustry.content.fx.BlockFx; import io.anuke.mindustry.type.ContentList; import io.anuke.mindustry.world.Block; -import io.anuke.mindustry.world.blocks.Wall; -import io.anuke.mindustry.world.blocks.defense.DeflectorWall; -import io.anuke.mindustry.world.blocks.defense.Door; -import io.anuke.mindustry.world.blocks.defense.MendProjector; +import io.anuke.mindustry.world.blocks.defense.*; public class DefenseBlocks extends BlockList implements ContentList{ public static Block copperWall, copperWallLarge, compositeWall, compositeWallLarge, thoriumWall, thoriumWallLarge, door, doorLarge, deflectorwall, deflectorwalllarge, - phaseWall, phaseWallLarge, mendProjector; + phaseWall, phaseWallLarge, surgeWall, surgeWallLarge, mendProjector; @Override public void load(){ @@ -62,6 +59,15 @@ public class DefenseBlocks extends BlockList implements ContentList{ size = 2; }}; + surgeWall = new SurgeWall("surge-wall"){{ + health = 230 * wallHealthMultiplier; + }}; + + surgeWallLarge = new SurgeWall("surge-wall-large"){{ + health = 230 * 4 * wallHealthMultiplier; + size = 2; + }}; + door = new Door("door"){{ health = 100 * wallHealthMultiplier; }}; diff --git a/core/src/io/anuke/mindustry/content/blocks/TurretBlocks.java b/core/src/io/anuke/mindustry/content/blocks/TurretBlocks.java index 6bf9652d62..8962d890be 100644 --- a/core/src/io/anuke/mindustry/content/blocks/TurretBlocks.java +++ b/core/src/io/anuke/mindustry/content/blocks/TurretBlocks.java @@ -1,6 +1,7 @@ package io.anuke.mindustry.content.blocks; import com.badlogic.gdx.graphics.Color; +import com.badlogic.gdx.graphics.g2d.TextureRegion; import io.anuke.mindustry.content.AmmoTypes; import io.anuke.mindustry.content.fx.ShootFx; import io.anuke.mindustry.type.AmmoType; @@ -51,16 +52,26 @@ public class TurretBlocks extends BlockList implements ContentList{ health = 120; }}; - scorch = new LiquidTurret("scorch"){{ - ammoTypes = new AmmoType[]{AmmoTypes.basicFlame}; - recoil = 0f; - reload = 4f; - shootCone = 50f; - ammoUseEffect = ShootFx.shellEjectSmall; - health = 160; + scorch = new LiquidTurret("scorch"){ + protected TextureRegion shootRegion; - drawer = (tile, entity) -> Draw.rect(entity.target != null ? name + "-shoot" : name, tile.drawx() + tr2.x, tile.drawy() + tr2.y, entity.rotation - 90); - }}; + @Override + public void load(){ + super.load(); + shootRegion = Draw.region(name + "-shoot"); + } + + { + ammoTypes = new AmmoType[]{AmmoTypes.basicFlame}; + recoil = 0f; + reload = 4f; + shootCone = 50f; + ammoUseEffect = ShootFx.shellEjectSmall; + health = 160; + + drawer = (tile, entity) -> Draw.rect(entity.target != null ? shootRegion : region, tile.drawx() + tr2.x, tile.drawy() + tr2.y, entity.rotation - 90); + } + }; wave = new LiquidTurret("wave"){{ ammoTypes = new AmmoType[]{AmmoTypes.water, AmmoTypes.lava, AmmoTypes.cryofluid, AmmoTypes.oil}; @@ -180,8 +191,16 @@ public class TurretBlocks extends BlockList implements ContentList{ }}; cyclone = new ItemTurret("cyclone"){{ - ammoTypes = new AmmoType[]{AmmoTypes.flakLead, AmmoTypes.flakExplosive, AmmoTypes.flakPlastic, AmmoTypes.flakSurge}; + ammoTypes = new AmmoType[]{AmmoTypes.flakExplosive, AmmoTypes.flakPlastic, AmmoTypes.flakSurge}; + xRand = 4f; + reload = 8f; + range = 140f; size = 3; + recoil = 3f; + shots = 2; + rotatespeed = 20f; + inaccuracy = 13f; + shootCone = 30f; }}; fuse = new ItemTurret("fuse"){{ diff --git a/core/src/io/anuke/mindustry/content/bullets/FlakBullets.java b/core/src/io/anuke/mindustry/content/bullets/FlakBullets.java index 276cb76c7d..fafd1f4a1b 100644 --- a/core/src/io/anuke/mindustry/content/bullets/FlakBullets.java +++ b/core/src/io/anuke/mindustry/content/bullets/FlakBullets.java @@ -1,40 +1,31 @@ package io.anuke.mindustry.content.bullets; -import io.anuke.mindustry.entities.bullet.BasicBulletType; import io.anuke.mindustry.entities.bullet.BulletType; +import io.anuke.mindustry.entities.bullet.FlakBulletType; import io.anuke.mindustry.type.ContentList; public class FlakBullets extends BulletList implements ContentList{ - public static BulletType lead, plastic, explosive, surge; + public static BulletType plastic, explosive, surge; @Override public void load(){ - lead = new BasicBulletType(3f, 5, "bullet"){ + + plastic = new FlakBulletType(4f, 5){ { - bulletWidth = 7f; - bulletHeight = 9f; + } }; - plastic = new BasicBulletType(3f, 5, "bullet"){ + explosive = new FlakBulletType(4f, 5){ { - bulletWidth = 7f; - bulletHeight = 9f; + } }; - explosive = new BasicBulletType(3f, 5, "bullet"){ + surge = new FlakBulletType(4f, 5){ { - bulletWidth = 7f; - bulletHeight = 9f; - } - }; - surge = new BasicBulletType(3f, 5, "bullet"){ - { - bulletWidth = 7f; - bulletHeight = 9f; } }; } diff --git a/core/src/io/anuke/mindustry/content/fx/BulletFx.java b/core/src/io/anuke/mindustry/content/fx/BulletFx.java index a7a6a776cb..c44e4dece0 100644 --- a/core/src/io/anuke/mindustry/content/fx/BulletFx.java +++ b/core/src/io/anuke/mindustry/content/fx/BulletFx.java @@ -12,7 +12,7 @@ import io.anuke.ucore.util.Mathf; public class BulletFx extends FxList implements ContentList{ public static Effect hitBulletSmall, hitBulletBig, hitFlameSmall, hitLiquid, hitLaser, hitLancer, despawn, flakExplosion, blastExplosion, plasticExplosion, - artilleryTrail, incendTrail, missileTrail, absorb; + artilleryTrail, incendTrail, missileTrail, absorb, flakExplosionBig; @Override public void load(){ @@ -197,6 +197,30 @@ public class BulletFx extends FxList implements ContentList{ Lines.circle(e.x, e.y, 5f * e.fout()); Draw.reset(); }); + + flakExplosionBig = new Effect(30, e -> { + + Draw.color(Palette.bulletYellowBack); + e.scaled(6, i -> { + Lines.stroke(3f * i.fout()); + Lines.circle(e.x, e.y, 3f + i.fin() * 25f); + }); + + Draw.color(Color.GRAY); + + Angles.randLenVectors(e.id, 6, 2f + 23f * e.finpow(), (x, y) -> { + Fill.circle(e.x + x, e.y + y, e.fout() * 4f + 0.5f); + }); + + Draw.color(Palette.bulletYellow); + Lines.stroke(1f * e.fout()); + + Angles.randLenVectors(e.id + 1, 4, 1f + 23f * e.finpow(), (x, y) -> { + Lines.lineAngle(e.x + x, e.y + y, Mathf.atan2(x, y), 1f + e.fout() * 3f); + }); + + Draw.reset(); + }); } } diff --git a/core/src/io/anuke/mindustry/core/Control.java b/core/src/io/anuke/mindustry/core/Control.java index 9cbfcdfb19..fac84a7ef6 100644 --- a/core/src/io/anuke/mindustry/core/Control.java +++ b/core/src/io/anuke/mindustry/core/Control.java @@ -368,6 +368,11 @@ public class Control extends Module{ input.update(); } + //auto-update rpc every 5 seconds + if(Timers.get("rpcUpdate", 60 * 5)){ + Platform.instance.updateRPC(); + } + //check unlocked sectors if(world.getSector() != null && !world.getSector().complete){ //all assigned missions are complete diff --git a/core/src/io/anuke/mindustry/core/NetServer.java b/core/src/io/anuke/mindustry/core/NetServer.java index 6f352f9d61..69e5497b18 100644 --- a/core/src/io/anuke/mindustry/core/NetServer.java +++ b/core/src/io/anuke/mindustry/core/NetServer.java @@ -127,7 +127,7 @@ public class NetServer extends Module{ if(preventDuplicates){ for(Player player : playerGroup.all()){ - if(player.name.equalsIgnoreCase(packet.name)){ + if(player.name.trim().equalsIgnoreCase(packet.name.trim())){ kick(id, KickReason.nameInUse); return; } @@ -518,6 +518,7 @@ public class NetServer extends Module{ } String fixName(String name){ + name = name.trim(); if(name.equals("[") || name.equals("]")){ return ""; } diff --git a/core/src/io/anuke/mindustry/entities/TileEntity.java b/core/src/io/anuke/mindustry/entities/TileEntity.java index 0e539ee9b6..9e4891583c 100644 --- a/core/src/io/anuke/mindustry/entities/TileEntity.java +++ b/core/src/io/anuke/mindustry/entities/TileEntity.java @@ -14,7 +14,7 @@ import io.anuke.mindustry.gen.Call; import io.anuke.mindustry.world.Block; import io.anuke.mindustry.world.Edges; import io.anuke.mindustry.world.Tile; -import io.anuke.mindustry.world.blocks.Wall; +import io.anuke.mindustry.world.blocks.defense.Wall; import io.anuke.mindustry.world.consumers.Consume; import io.anuke.mindustry.world.modules.ConsumeModule; import io.anuke.mindustry.world.modules.InventoryModule; diff --git a/core/src/io/anuke/mindustry/entities/bullet/Bullet.java b/core/src/io/anuke/mindustry/entities/bullet/Bullet.java index eb3998ea9b..fd63c9bbec 100644 --- a/core/src/io/anuke/mindustry/entities/bullet/Bullet.java +++ b/core/src/io/anuke/mindustry/entities/bullet/Bullet.java @@ -108,6 +108,10 @@ public class Bullet extends BulletEntity implements TeamTrait, SyncT return data; } + public void setData(Object data){ + this.data = data; + } + @Override public float getDamage(){ if(owner instanceof Unit){ diff --git a/core/src/io/anuke/mindustry/entities/bullet/FlakBulletType.java b/core/src/io/anuke/mindustry/entities/bullet/FlakBulletType.java new file mode 100644 index 0000000000..6d5f272836 --- /dev/null +++ b/core/src/io/anuke/mindustry/entities/bullet/FlakBulletType.java @@ -0,0 +1,41 @@ +package io.anuke.mindustry.entities.bullet; + +import com.badlogic.gdx.math.Rectangle; +import io.anuke.mindustry.content.fx.BulletFx; +import io.anuke.mindustry.entities.Units; +import io.anuke.ucore.core.Timers; + +public abstract class FlakBulletType extends BasicBulletType{ + protected static Rectangle rect = new Rectangle(); + protected float explodeRange = 30f; + + public FlakBulletType(float speed, float damage){ + super(speed, damage, "shell"); + splashDamage = 15f; + splashDamageRadius = 34f; + hiteffect = BulletFx.flakExplosionBig; + bulletWidth = 8f; + bulletHeight = 10f; + } + + @Override + public void update(Bullet b){ + super.update(b); + if(b.getData() instanceof Integer) return; + + if(b.timer.get(2, 6)){ + Units.getNearbyEnemies(b.getTeam(), rect.setSize(explodeRange*2f).setCenter(b.x, b.y), unit -> { + if(b.getData() instanceof Float) return; + + if(unit.distanceTo(b) < explodeRange){ + b.setData(0); + Timers.run(5f, () -> { + if(b.getData() instanceof Integer){ + b.time(b.lifetime()); + } + }); + } + }); + } + } +} diff --git a/core/src/io/anuke/mindustry/entities/effect/Lightning.java b/core/src/io/anuke/mindustry/entities/effect/Lightning.java index f71e44eca4..f5bad9a03e 100644 --- a/core/src/io/anuke/mindustry/entities/effect/Lightning.java +++ b/core/src/io/anuke/mindustry/entities/effect/Lightning.java @@ -56,6 +56,7 @@ public class Lightning extends TimedEntity implements Poolable, DrawTrait, SyncT Call.createLighting(lastSeed++, team, effect, color, damage, x, y, targetAngle, length); } + /**Do not invoke!*/ @Remote(called = Loc.server) public static void createLighting(int seed, Team team, Effect effect, Color color, float damage, float x, float y, float targetAngle, int length){ Lightning l = Pooling.obtain(Lightning.class); diff --git a/core/src/io/anuke/mindustry/entities/units/GroundUnit.java b/core/src/io/anuke/mindustry/entities/units/GroundUnit.java index c0eb69b84c..424fe4b214 100644 --- a/core/src/io/anuke/mindustry/entities/units/GroundUnit.java +++ b/core/src/io/anuke/mindustry/entities/units/GroundUnit.java @@ -251,6 +251,7 @@ public abstract class GroundUnit extends BaseUnit{ if(enemy == null) return; Tile tile = world.tileWorld(x, y); + if(tile == null) return; Tile targetTile = world.pathfinder().getTargetTile(enemy, tile); TileEntity core = getClosestCore(); diff --git a/core/src/io/anuke/mindustry/graphics/Palette.java b/core/src/io/anuke/mindustry/graphics/Palette.java index 4a86ed5fc0..cca2e5bbd4 100644 --- a/core/src/io/anuke/mindustry/graphics/Palette.java +++ b/core/src/io/anuke/mindustry/graphics/Palette.java @@ -68,6 +68,8 @@ public class Palette{ lightTrail = Color.valueOf("ffe2a9"), + surge = Color.valueOf("f3e979"), + redSpark = Color.valueOf("fbb97f"), orangeSpark = Color.valueOf("d2b29c"), diff --git a/core/src/io/anuke/mindustry/maps/generation/WorldGenerator.java b/core/src/io/anuke/mindustry/maps/generation/WorldGenerator.java index c131093bff..96a276858d 100644 --- a/core/src/io/anuke/mindustry/maps/generation/WorldGenerator.java +++ b/core/src/io/anuke/mindustry/maps/generation/WorldGenerator.java @@ -248,7 +248,7 @@ public class WorldGenerator{ double iceridge = rid.getValue(x+99999, y, 1f / 300f) + sim3.octaveNoise2D(2, 1f, 1f/14f, x, y)/11f; double elevation = elevationOf(x, y, detailed); double temp = vn.noise(x, y, 1f / 300f) * sim3.octaveNoise2D(detailed ? 2 : 1, 1, 1f / 13f, x, y)/13f - + sim3.octaveNoise2D(detailed ? 12 : 9, 0.6, 1f / 1020f, x, y); + + sim3.octaveNoise2D(detailed ? 12 : 9, 0.6, 1f / 1100f, x, y); int lerpDst = 20; lerpDst *= lerpDst; @@ -272,7 +272,7 @@ public class WorldGenerator{ floor = Blocks.water; }else if(elevation < 0.85){ floor = Blocks.sand; - }else if (elevation < 2.5 && temp > 0.4){ + }else if (elevation < 2.5 && temp > 0.5){ floor = Blocks.sand; }else if(temp < 0.42){ floor = Blocks.snow; @@ -313,7 +313,7 @@ public class WorldGenerator{ double elevationOf(int x, int y, boolean detailed){ double ridge = rid.getValue(x, y, 1f / 400f); - return sim.octaveNoise2D(detailed ? 7 : 4, 0.62, 1f / 740, x, y) * 6.1 - 1 - ridge; + return sim.octaveNoise2D(detailed ? 7 : 4, 0.62, 1f / 800, x, y) * 6.1 - 1 - ridge; } public static class GenResult{ diff --git a/core/src/io/anuke/mindustry/ui/ContentDisplay.java b/core/src/io/anuke/mindustry/ui/ContentDisplay.java index 8c69a97eec..edeeeddb97 100644 --- a/core/src/io/anuke/mindustry/ui/ContentDisplay.java +++ b/core/src/io/anuke/mindustry/ui/ContentDisplay.java @@ -174,7 +174,6 @@ public class ContentDisplay{ table.add(Bundles.format("text.mech.minepower", mech.drillPower)); table.row(); } - } public static void displayUnit(Table table, UnitType unit){ diff --git a/core/src/io/anuke/mindustry/world/BaseBlock.java b/core/src/io/anuke/mindustry/world/BaseBlock.java index 2973b8d102..3b1969b225 100644 --- a/core/src/io/anuke/mindustry/world/BaseBlock.java +++ b/core/src/io/anuke/mindustry/world/BaseBlock.java @@ -274,7 +274,7 @@ public abstract class BaseBlock{ /** Try offloading an item to a nearby container in its facing direction. Returns true if success.*/ public boolean offloadDir(Tile tile, Item item){ Tile other = tile.getNearby(tile.getRotation()); - if(other != null && other.target().getTeamID() == tile.getTeamID() && other.block().acceptItem(item, other, tile)){ + if(other != null && other.target().getTeamID() == tile.getTeamID() && other.block().acceptItem(item, other, tile)){ other.block().handleItem(item, other, tile); return true; } diff --git a/core/src/io/anuke/mindustry/world/blocks/defense/DeflectorWall.java b/core/src/io/anuke/mindustry/world/blocks/defense/DeflectorWall.java index d1a2bd9851..7ff42bfe39 100644 --- a/core/src/io/anuke/mindustry/world/blocks/defense/DeflectorWall.java +++ b/core/src/io/anuke/mindustry/world/blocks/defense/DeflectorWall.java @@ -7,7 +7,6 @@ import io.anuke.mindustry.entities.TileEntity; import io.anuke.mindustry.entities.bullet.Bullet; import io.anuke.mindustry.game.Team; import io.anuke.mindustry.world.Tile; -import io.anuke.mindustry.world.blocks.Wall; import io.anuke.ucore.core.Graphics; import io.anuke.ucore.core.Timers; import io.anuke.ucore.graphics.Draw; diff --git a/core/src/io/anuke/mindustry/world/blocks/defense/Door.java b/core/src/io/anuke/mindustry/world/blocks/defense/Door.java index d186815e23..d1924e4b93 100644 --- a/core/src/io/anuke/mindustry/world/blocks/defense/Door.java +++ b/core/src/io/anuke/mindustry/world/blocks/defense/Door.java @@ -8,7 +8,6 @@ import io.anuke.mindustry.entities.TileEntity; import io.anuke.mindustry.entities.Units; import io.anuke.mindustry.input.CursorType; import io.anuke.mindustry.world.Tile; -import io.anuke.mindustry.world.blocks.Wall; import io.anuke.ucore.core.Effects; import io.anuke.ucore.core.Effects.Effect; import io.anuke.ucore.graphics.Draw; diff --git a/core/src/io/anuke/mindustry/world/blocks/defense/PhaseWall.java b/core/src/io/anuke/mindustry/world/blocks/defense/MendingWall.java similarity index 92% rename from core/src/io/anuke/mindustry/world/blocks/defense/PhaseWall.java rename to core/src/io/anuke/mindustry/world/blocks/defense/MendingWall.java index 311c993897..357c2ead89 100644 --- a/core/src/io/anuke/mindustry/world/blocks/defense/PhaseWall.java +++ b/core/src/io/anuke/mindustry/world/blocks/defense/MendingWall.java @@ -4,7 +4,6 @@ import com.badlogic.gdx.graphics.Color; import io.anuke.mindustry.entities.TileEntity; import io.anuke.mindustry.entities.bullet.Bullet; import io.anuke.mindustry.world.Tile; -import io.anuke.mindustry.world.blocks.Wall; import io.anuke.mindustry.world.blocks.defense.DeflectorWall.DeflectorEntity; import io.anuke.ucore.core.Graphics; import io.anuke.ucore.core.Timers; @@ -13,10 +12,10 @@ import io.anuke.ucore.util.Mathf; import static io.anuke.mindustry.Vars.tilesize; -public class PhaseWall extends Wall{ +public class MendingWall extends Wall{ protected float regenSpeed = 0.25f; - public PhaseWall(String name){ + public MendingWall(String name){ super(name); update = true; } diff --git a/core/src/io/anuke/mindustry/world/blocks/defense/SurgeWall.java b/core/src/io/anuke/mindustry/world/blocks/defense/SurgeWall.java new file mode 100644 index 0000000000..5d7a20e5a8 --- /dev/null +++ b/core/src/io/anuke/mindustry/world/blocks/defense/SurgeWall.java @@ -0,0 +1,26 @@ +package io.anuke.mindustry.world.blocks.defense; + +import io.anuke.mindustry.content.fx.BulletFx; +import io.anuke.mindustry.entities.TileEntity; +import io.anuke.mindustry.entities.bullet.Bullet; +import io.anuke.mindustry.entities.effect.Lightning; +import io.anuke.mindustry.graphics.Palette; +import io.anuke.ucore.util.Mathf; + +public class SurgeWall extends Wall{ + protected float lightningChance = 0.05f; + protected float lightningDamage = 11f; + protected int lightningLength = 20; + + public SurgeWall(String name){ + super(name); + } + + @Override + public void handleBulletHit(TileEntity entity, Bullet bullet){ + super.handleBulletHit(entity, bullet); + if(Mathf.chance(lightningChance)){ + Lightning.create(entity.getTeam(), BulletFx.hitLancer, Palette.surge, lightningDamage, bullet.x, bullet.y, bullet.angle() + 180f, lightningLength); + } + } +} diff --git a/core/src/io/anuke/mindustry/world/blocks/Wall.java b/core/src/io/anuke/mindustry/world/blocks/defense/Wall.java similarity index 89% rename from core/src/io/anuke/mindustry/world/blocks/Wall.java rename to core/src/io/anuke/mindustry/world/blocks/defense/Wall.java index e2cb089f92..cd2f2a61d3 100644 --- a/core/src/io/anuke/mindustry/world/blocks/Wall.java +++ b/core/src/io/anuke/mindustry/world/blocks/defense/Wall.java @@ -1,4 +1,4 @@ -package io.anuke.mindustry.world.blocks; +package io.anuke.mindustry.world.blocks.defense; import io.anuke.mindustry.world.Block; import io.anuke.mindustry.world.meta.BlockGroup; diff --git a/core/src/io/anuke/mindustry/world/blocks/defense/turrets/BurstTurret.java b/core/src/io/anuke/mindustry/world/blocks/defense/turrets/BurstTurret.java index c31fe33cd4..c0bd3da94b 100644 --- a/core/src/io/anuke/mindustry/world/blocks/defense/turrets/BurstTurret.java +++ b/core/src/io/anuke/mindustry/world/blocks/defense/turrets/BurstTurret.java @@ -9,7 +9,6 @@ import static io.anuke.mindustry.Vars.tilesize; public class BurstTurret extends ItemTurret{ protected float burstSpacing = 5; - protected float xRand = 0f; public BurstTurret(String name){ super(name); diff --git a/core/src/io/anuke/mindustry/world/blocks/defense/turrets/Turret.java b/core/src/io/anuke/mindustry/world/blocks/defense/turrets/Turret.java index 80cab51df7..9aaeb51983 100644 --- a/core/src/io/anuke/mindustry/world/blocks/defense/turrets/Turret.java +++ b/core/src/io/anuke/mindustry/world/blocks/defense/turrets/Turret.java @@ -58,6 +58,7 @@ public abstract class Turret extends Block{ protected float rotatespeed = 5f; //in degrees per tick protected float shootCone = 8f; protected float shootShake = 0f; + protected float xRand = 0f; protected boolean targetAir = true; protected Translator tr = new Translator(); @@ -274,13 +275,13 @@ public abstract class Turret extends Block{ entity.heat = 1f; AmmoType type = peekAmmo(tile); - useAmmo(tile); - tr.trns(entity.rotation, size * tilesize / 2); + tr.trns(entity.rotation, size * tilesize / 2, Mathf.range(xRand)); bullet(tile, ammo.bullet, entity.rotation + Mathf.range(inaccuracy + type.inaccuracy)); effects(tile); + useAmmo(tile); } protected void bullet(Tile tile, BulletType type, float angle){ diff --git a/core/src/io/anuke/mindustry/world/blocks/distribution/Conveyor.java b/core/src/io/anuke/mindustry/world/blocks/distribution/Conveyor.java index 0feea8a4ba..daade85a99 100644 --- a/core/src/io/anuke/mindustry/world/blocks/distribution/Conveyor.java +++ b/core/src/io/anuke/mindustry/world/blocks/distribution/Conveyor.java @@ -49,7 +49,7 @@ public class Conveyor extends Block{ itemCapacity = 4; } - private static int compareItems(Long a, Long b){ + private static int compareItems(long a, long b){ pos1.set(a, ItemPos.packShorts); pos2.set(b, ItemPos.packShorts); return Float.compare(pos1.y, pos2.y); diff --git a/core/src/io/anuke/mindustry/world/blocks/production/PlastaniumCompressor.java b/core/src/io/anuke/mindustry/world/blocks/production/PlastaniumCompressor.java index 0a8c5fda3f..6b8a931b1c 100644 --- a/core/src/io/anuke/mindustry/world/blocks/production/PlastaniumCompressor.java +++ b/core/src/io/anuke/mindustry/world/blocks/production/PlastaniumCompressor.java @@ -1,15 +1,24 @@ package io.anuke.mindustry.world.blocks.production; +import com.badlogic.gdx.graphics.g2d.TextureRegion; import io.anuke.mindustry.world.Tile; import io.anuke.ucore.graphics.Draw; import io.anuke.ucore.util.Mathf; public class PlastaniumCompressor extends GenericCrafter{ + protected TextureRegion topRegion; public PlastaniumCompressor(String name){ super(name); } + @Override + public void load(){ + super.load(); + + topRegion = Draw.region(name + "-top"); + } + @Override public void draw(Tile tile){ super.draw(tile); @@ -17,7 +26,7 @@ public class PlastaniumCompressor extends GenericCrafter{ GenericCrafterEntity entity = tile.entity(); Draw.alpha(Mathf.absin(entity.totalProgress, 3f, 0.9f) * entity.warmup); - Draw.rect(name + "-top", tile.drawx(), tile.drawy()); + Draw.rect(topRegion, tile.drawx(), tile.drawy()); Draw.reset(); } } diff --git a/core/src/io/anuke/mindustry/world/blocks/units/UnitPad.java b/core/src/io/anuke/mindustry/world/blocks/units/UnitPad.java index e0ee770fd0..1c784fbd97 100644 --- a/core/src/io/anuke/mindustry/world/blocks/units/UnitPad.java +++ b/core/src/io/anuke/mindustry/world/blocks/units/UnitPad.java @@ -46,6 +46,7 @@ public class UnitPad extends Block{ protected UnitType type; protected float produceTime = 1000f; protected float launchVelocity = 0f; + protected TextureRegion topRegion; public UnitPad(String name){ super(name); @@ -78,6 +79,13 @@ public class UnitPad extends Block{ } } + @Override + public void load(){ + super.load(); + + topRegion = Draw.region(name + "-top"); + } + @Override public boolean outputsItems(){ return false; @@ -135,7 +143,7 @@ public class UnitPad extends Block{ Draw.reset(); - Draw.rect(name + "-top", tile.drawx(), tile.drawy()); + Draw.rect(topRegion, tile.drawx(), tile.drawy()); } @Override