diff --git a/core/assets-raw/sprites/blocks/walls/phase-wall-large.png b/core/assets-raw/sprites/blocks/walls/phase-wall-large.png index abbce58e93..f77e66b163 100644 Binary files a/core/assets-raw/sprites/blocks/walls/phase-wall-large.png and b/core/assets-raw/sprites/blocks/walls/phase-wall-large.png differ diff --git a/core/assets-raw/sprites/blocks/walls/phase-wall.png b/core/assets-raw/sprites/blocks/walls/phase-wall.png index 4e234bd1d0..bb6be842ac 100644 Binary files a/core/assets-raw/sprites/blocks/walls/phase-wall.png and b/core/assets-raw/sprites/blocks/walls/phase-wall.png differ diff --git a/core/assets-raw/sprites/blocks/walls/thorium-wall-large.png b/core/assets-raw/sprites/blocks/walls/thorium-wall-large.png index 5993f7da90..9ffdbcaa09 100644 Binary files a/core/assets-raw/sprites/blocks/walls/thorium-wall-large.png and b/core/assets-raw/sprites/blocks/walls/thorium-wall-large.png differ diff --git a/core/assets-raw/sprites/blocks/walls/thorium-wall.png b/core/assets-raw/sprites/blocks/walls/thorium-wall.png index 7dc866f4d1..af27e4ff93 100644 Binary files a/core/assets-raw/sprites/blocks/walls/thorium-wall.png and b/core/assets-raw/sprites/blocks/walls/thorium-wall.png differ diff --git a/core/assets-raw/sprites/items/item-phase-matter.png b/core/assets-raw/sprites/items/item-phase-matter.png index a0c016a8b0..a0fc930db2 100644 Binary files a/core/assets-raw/sprites/items/item-phase-matter.png and b/core/assets-raw/sprites/items/item-phase-matter.png differ diff --git a/core/assets/bundles/bundle.properties b/core/assets/bundles/bundle.properties index 6ac93f58f2..501c1bc062 100644 --- a/core/assets/bundles/bundle.properties +++ b/core/assets/bundles/bundle.properties @@ -459,11 +459,11 @@ block.rock.name=rock block.blackrock.name=blackrock block.icerock.name=icerock block.copper-wall.name=Copper Wall -block.copper-wall-large.name=Large Tungsten Wall +block.copper-wall-large.name=Large Copper Wall block.composite-wall.name=Composite Wall block.composite-wall-large.name=Large Composite Wall -block.phase-wall.name=Composite Wall -block.phase-wall-large.name=Large Composite Wall +block.phase-wall.name=Phase Wall +block.phase-wall-large.name=Large Phase Wall block.thorium-wall.name=Thorium Wall block.thorium-wall-large.name=Large Thorium Wall block.door.name=Door diff --git a/core/assets/sprites/sprites.atlas b/core/assets/sprites/sprites.atlas index ffa0476dab..8cc5d9813f 100644 --- a/core/assets/sprites/sprites.atlas +++ b/core/assets/sprites/sprites.atlas @@ -13,287 +13,287 @@ background index: -1 bridge-conveyor-arrow rotate: false - xy: 631, 164 + xy: 863, 279 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 bridge-conveyor-bridge rotate: false - xy: 641, 174 + xy: 873, 279 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 bridge-conveyor-end rotate: false - xy: 641, 164 + xy: 883, 279 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 conveyor-0-1 rotate: false - xy: 761, 178 + xy: 873, 239 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 conveyor-0-2 rotate: false - xy: 761, 168 + xy: 883, 249 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 conveyor-0-3 rotate: false - xy: 771, 178 + xy: 893, 259 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 conveyor-1-0 rotate: false - xy: 771, 168 + xy: 903, 269 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 conveyor-1-1 rotate: false - xy: 781, 178 + xy: 853, 216 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 conveyor-1-2 rotate: false - xy: 781, 168 + xy: 863, 219 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 conveyor-1-3 rotate: false - xy: 791, 178 + xy: 873, 229 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 conveyor-2-0 rotate: false - xy: 791, 168 + xy: 883, 239 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 conveyor-2-1 rotate: false - xy: 801, 178 + xy: 893, 249 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 conveyor-2-2 rotate: false - xy: 801, 168 + xy: 903, 259 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 conveyor-2-3 rotate: false - xy: 721, 158 + xy: 913, 269 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 conveyor-3-0 rotate: false - xy: 731, 158 + xy: 853, 206 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 conveyor-3-1 rotate: false - xy: 741, 158 + xy: 863, 209 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 conveyor-3-2 rotate: false - xy: 751, 158 + xy: 873, 219 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 conveyor-3-3 rotate: false - xy: 761, 158 + xy: 883, 229 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 conveyor-4-0 rotate: false - xy: 771, 158 + xy: 893, 239 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 conveyor-4-1 rotate: false - xy: 781, 158 + xy: 903, 249 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 conveyor-4-2 rotate: false - xy: 791, 158 + xy: 913, 259 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 conveyor-4-3 rotate: false - xy: 801, 158 + xy: 923, 269 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 titanium-conveyor-0-1 rotate: false - xy: 963, 209 + xy: 841, 168 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 titanium-conveyor-0-2 rotate: false - xy: 973, 219 + xy: 851, 176 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 titanium-conveyor-0-3 rotate: false - xy: 983, 229 + xy: 851, 166 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 titanium-conveyor-1-0 rotate: false - xy: 993, 239 + xy: 861, 169 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 titanium-conveyor-1-1 rotate: false - xy: 1003, 241 + xy: 871, 169 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 titanium-conveyor-1-2 rotate: false - xy: 1013, 251 + xy: 881, 169 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 titanium-conveyor-1-3 rotate: false - xy: 953, 189 + xy: 891, 169 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 titanium-conveyor-2-0 rotate: false - xy: 963, 199 + xy: 901, 169 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 titanium-conveyor-2-1 rotate: false - xy: 973, 209 + xy: 911, 169 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 titanium-conveyor-2-2 rotate: false - xy: 983, 219 + xy: 921, 169 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 titanium-conveyor-2-3 rotate: false - xy: 993, 229 + xy: 931, 169 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 titanium-conveyor-3-0 rotate: false - xy: 1003, 231 + xy: 941, 165 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 titanium-conveyor-3-1 rotate: false - xy: 1013, 241 + xy: 951, 165 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 titanium-conveyor-3-2 rotate: false - xy: 963, 189 + xy: 961, 165 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 titanium-conveyor-3-3 rotate: false - xy: 973, 199 + xy: 971, 165 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 titanium-conveyor-4-0 rotate: false - xy: 983, 209 + xy: 981, 165 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 titanium-conveyor-4-1 rotate: false - xy: 993, 219 + xy: 991, 165 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 titanium-conveyor-4-2 rotate: false - xy: 1003, 221 + xy: 1001, 165 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 titanium-conveyor-4-3 rotate: false - xy: 1013, 231 + xy: 1011, 165 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -307,21 +307,21 @@ mass-driver-turret index: -1 phase-conveyor-arrow rotate: false - xy: 871, 153 + xy: 631, 182 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 phase-conveyor-bridge rotate: false - xy: 881, 153 + xy: 621, 172 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 phase-conveyor-end rotate: false - xy: 891, 153 + xy: 641, 182 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -363,42 +363,42 @@ blast-drill-top index: -1 laser-drill rotate: false - xy: 303, 117 + xy: 321, 117 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 laser-drill-rotator rotate: false - xy: 321, 117 + xy: 339, 117 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 laser-drill-top rotate: false - xy: 339, 117 + xy: 357, 117 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 mechanical-drill rotate: false - xy: 357, 117 + xy: 375, 117 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 mechanical-drill-rotator rotate: false - xy: 375, 117 + xy: 393, 117 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 mechanical-drill-top rotate: false - xy: 393, 117 + xy: 795, 188 size: 16, 16 orig: 16, 16 offset: 0, 0 @@ -461,49 +461,49 @@ plasma-drill-top index: -1 pneumatic-drill rotate: false - xy: 193, 99 + xy: 175, 81 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 pneumatic-drill-rotator rotate: false - xy: 175, 81 + xy: 211, 99 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 pneumatic-drill-top rotate: false - xy: 211, 99 + xy: 193, 81 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 water-extractor rotate: false - xy: 337, 81 + xy: 373, 99 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 water-extractor-liquid rotate: false - xy: 373, 99 + xy: 355, 81 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 water-extractor-rotator rotate: false - xy: 355, 81 + xy: 391, 99 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 water-extractor-top rotate: false - xy: 391, 99 + xy: 373, 81 size: 16, 16 orig: 16, 16 offset: 0, 0 @@ -531,28 +531,28 @@ blackrockshadow1 index: -1 blackstone1 rotate: false - xy: 175, 23 + xy: 1015, 381 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-icon-blackstone rotate: false - xy: 175, 23 + xy: 1015, 381 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blackstone2 rotate: false - xy: 1015, 381 + xy: 677, 194 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blackstone3 rotate: false - xy: 1015, 371 + xy: 359, 27 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -566,560 +566,560 @@ blackstoneedge index: -1 coal1 rotate: false - xy: 651, 174 + xy: 893, 279 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 coal2 rotate: false - xy: 651, 164 + xy: 903, 279 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 coal3 rotate: false - xy: 661, 174 + xy: 913, 279 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 copper1 rotate: false - xy: 813, 288 + xy: 853, 196 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 copper2 rotate: false - xy: 823, 288 + xy: 863, 199 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 copper3 rotate: false - xy: 811, 278 + xy: 873, 209 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 dirt2 rotate: false - xy: 823, 268 + xy: 933, 269 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 dirt3 rotate: false - xy: 813, 248 + xy: 943, 275 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 dirtedge rotate: false - xy: 891, 307 + xy: 269, 37 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 generic-cliff-edge rotate: false - xy: 813, 208 + xy: 943, 265 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ice-cliff-edge rotate: false - xy: 813, 208 + xy: 943, 265 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 generic-cliff-edge-1 rotate: false - xy: 823, 218 + xy: 953, 275 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ice-cliff-edge-1 rotate: false - xy: 823, 218 + xy: 953, 275 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 generic-cliff-edge-2 rotate: false - xy: 813, 198 + xy: 883, 199 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ice-cliff-edge-2 rotate: false - xy: 813, 198 + xy: 883, 199 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 generic-cliff-side rotate: false - xy: 823, 208 + xy: 893, 209 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ice-cliff-side rotate: false - xy: 823, 208 + xy: 893, 209 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 grass-cliff-edge rotate: false - xy: 823, 198 + xy: 923, 239 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 grass-cliff-edge-1 rotate: false - xy: 811, 168 + xy: 933, 249 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 grass-cliff-edge-2 rotate: false - xy: 823, 188 + xy: 943, 255 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 grass-cliff-side rotate: false - xy: 821, 178 + xy: 953, 265 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 grass2 rotate: false - xy: 813, 188 + xy: 903, 219 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 grass3 rotate: false - xy: 811, 178 + xy: 913, 229 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 grassedge rotate: false - xy: 877, 293 + xy: 311, 51 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 ice2 rotate: false - xy: 821, 168 + xy: 893, 199 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ice3 rotate: false - xy: 821, 158 + xy: 903, 209 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 iceedge rotate: false - xy: 905, 293 + xy: 325, 51 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 icerock2 rotate: false - xy: 833, 268 + xy: 913, 219 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 icerockshadow1 rotate: false - xy: 833, 258 + xy: 923, 229 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 rockshadow1 rotate: false - xy: 833, 258 + xy: 923, 229 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 icerockshadow2 rotate: false - xy: 833, 248 + xy: 933, 239 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 rockshadow2 rotate: false - xy: 833, 248 + xy: 933, 239 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 lavaedge rotate: false - xy: 947, 303 + xy: 339, 37 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 lead1 rotate: false - xy: 853, 286 + xy: 923, 199 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 lead2 rotate: false - xy: 863, 283 + xy: 933, 209 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 lead3 rotate: false - xy: 873, 283 + xy: 943, 215 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 metalfloor2 rotate: false - xy: 853, 256 + xy: 973, 235 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 metalfloor3 rotate: false - xy: 863, 263 + xy: 983, 245 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 metalfloor4 rotate: false - xy: 873, 273 + xy: 993, 255 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 metalfloor5 rotate: false - xy: 853, 246 + xy: 953, 205 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 metalfloor6 rotate: false - xy: 863, 253 + xy: 963, 215 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 metalflooredge rotate: false - xy: 975, 289 + xy: 381, 37 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 oiledge rotate: false - xy: 185, 19 + xy: 395, 37 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 rock2 rotate: false - xy: 963, 269 + xy: 651, 162 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 sand2 rotate: false - xy: 993, 279 + xy: 671, 174 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 sand3 rotate: false - xy: 943, 239 + xy: 671, 164 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 sandedge rotate: false - xy: 213, 19 + xy: 1003, 353 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 shrubshadow rotate: false - xy: 953, 229 + xy: 731, 178 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 snow2 rotate: false - xy: 963, 239 + xy: 721, 168 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 snow3 rotate: false - xy: 973, 249 + xy: 741, 178 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 snowedge rotate: false - xy: 241, 19 + xy: 1005, 325 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 spaceedge rotate: false - xy: 255, 19 + xy: 177, 17 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 stone-cliff-edge rotate: false - xy: 943, 199 + xy: 801, 178 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 stone-cliff-edge-1 rotate: false - xy: 953, 209 + xy: 791, 168 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 stone-cliff-edge-2 rotate: false - xy: 963, 219 + xy: 811, 178 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 stone-cliff-side rotate: false - xy: 973, 229 + xy: 801, 168 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 stone2 rotate: false - xy: 1003, 261 + xy: 791, 178 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 stone3 rotate: false - xy: 1013, 271 + xy: 781, 168 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 stoneedge rotate: false - xy: 269, 19 + xy: 191, 17 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 thorium1 rotate: false - xy: 983, 239 + xy: 821, 178 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 thorium2 rotate: false - xy: 993, 249 + xy: 811, 168 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 thorium3 rotate: false - xy: 1003, 251 + xy: 831, 178 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 titanium1 rotate: false - xy: 1013, 261 + xy: 821, 168 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 titanium2 rotate: false - xy: 943, 189 + xy: 841, 178 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 titanium3 rotate: false - xy: 953, 199 + xy: 831, 168 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 water-cliff-edge rotate: false - xy: 983, 199 + xy: 731, 158 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 water-cliff-edge-1 rotate: false - xy: 993, 209 + xy: 741, 158 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 water-cliff-edge-2 rotate: false - xy: 1003, 211 + xy: 751, 158 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 water-cliff-side rotate: false - xy: 1013, 221 + xy: 761, 158 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 wateredge rotate: false - xy: 297, 19 + xy: 191, 3 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 block-border rotate: false - xy: 1005, 327 + xy: 501, 175 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-elevation rotate: false - xy: 1015, 321 + xy: 511, 175 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 combustion-generator-top rotate: false - xy: 1015, 321 + xy: 511, 175 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-middle rotate: false - xy: 704, 185 + xy: 843, 228 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 pump-liquid rotate: false - xy: 704, 185 + xy: 843, 228 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-slope rotate: false - xy: 611, 173 + xy: 843, 218 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 border rotate: false - xy: 611, 163 + xy: 843, 208 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 conduit-liquid rotate: false - xy: 721, 178 + xy: 883, 269 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 cross-1 rotate: false - xy: 833, 288 + xy: 883, 219 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 cross-2 rotate: false - xy: 899, 321 + xy: 919, 339 size: 16, 16 orig: 16, 16 offset: 0, 0 @@ -1140,7 +1140,7 @@ cross-4 index: -1 enemyspawn rotate: false - xy: 823, 228 + xy: 933, 259 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -1154,49 +1154,49 @@ nuclearreactor-shadow index: -1 place-arrow rotate: false - xy: 901, 153 + xy: 631, 172 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 playerspawn rotate: false - xy: 911, 153 + xy: 651, 182 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ripples rotate: false - xy: 508, 185 + xy: 267, 25 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 rubble-1-0 rotate: false - xy: 211, 81 + xy: 247, 99 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 rubble-1-1 rotate: false - xy: 247, 99 + xy: 229, 81 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 rubble-2-0 rotate: false - xy: 229, 81 + xy: 265, 99 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 rubble-2-1 rotate: false - xy: 265, 99 + xy: 247, 81 size: 16, 16 orig: 16, 16 offset: 0, 0 @@ -1217,7 +1217,7 @@ rubble-3-1 index: -1 shadow-1 rotate: false - xy: 520, 185 + xy: 279, 25 size: 10, 10 orig: 10, 10 offset: 0, 0 @@ -1259,14 +1259,14 @@ shadow-6 index: -1 shadow-corner rotate: false - xy: 532, 185 + xy: 291, 25 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 shadow-round-1 rotate: false - xy: 557, 194 + xy: 303, 25 size: 10, 10 orig: 10, 10 offset: 0, 0 @@ -1294,154 +1294,154 @@ shadow-rounded-2 index: -1 bridge-conduit-arrow rotate: false - xy: 621, 174 + xy: 843, 198 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 bridge-conduit-bridge rotate: false - xy: 621, 164 + xy: 843, 188 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 bridge-conduit-end rotate: false - xy: 631, 174 + xy: 853, 286 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 conduit-bottom rotate: false - xy: 681, 174 + xy: 853, 266 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 conduit-bottom-0 rotate: false - xy: 681, 164 + xy: 863, 269 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 conduit-bottom-1 rotate: false - xy: 691, 175 + xy: 853, 256 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 conduit-bottom-2 rotate: false - xy: 691, 165 + xy: 863, 259 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 conduit-bottom-3 rotate: false - xy: 701, 175 + xy: 873, 269 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 conduit-bottom-4 rotate: false - xy: 701, 165 + xy: 853, 246 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 conduit-bottom-5 rotate: false - xy: 711, 175 + xy: 863, 249 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 conduit-bottom-6 rotate: false - xy: 711, 165 + xy: 873, 259 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 conduit-top-0 rotate: false - xy: 721, 168 + xy: 853, 236 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 conduit-top-1 rotate: false - xy: 731, 178 + xy: 863, 239 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 conduit-top-2 rotate: false - xy: 731, 168 + xy: 873, 249 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 conduit-top-3 rotate: false - xy: 741, 178 + xy: 883, 259 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 conduit-top-4 rotate: false - xy: 741, 168 + xy: 893, 269 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 conduit-top-5 rotate: false - xy: 751, 178 + xy: 853, 226 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 conduit-top-6 rotate: false - xy: 751, 168 + xy: 863, 229 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 liquid-router rotate: false - xy: 933, 283 + xy: 933, 199 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 liquid-router-bottom rotate: false - xy: 853, 276 + xy: 943, 205 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 liquid-router-liquid rotate: false - xy: 853, 266 + xy: 953, 215 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 liquid-router-top rotate: false - xy: 863, 273 + xy: 963, 225 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -1469,70 +1469,70 @@ liquid-tank-top index: -1 phase-conduit-arrow rotate: false - xy: 931, 173 + xy: 601, 172 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 phase-conduit-bridge rotate: false - xy: 931, 163 + xy: 621, 182 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 phase-conduit-end rotate: false - xy: 861, 153 + xy: 611, 172 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 pulse-conduit-top-0 rotate: false - xy: 921, 153 + xy: 641, 172 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 pulse-conduit-top-1 rotate: false - xy: 931, 153 + xy: 661, 182 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 pulse-conduit-top-2 rotate: false - xy: 943, 279 + xy: 651, 172 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 pulse-conduit-top-3 rotate: false - xy: 953, 279 + xy: 661, 172 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 pulse-conduit-top-4 rotate: false - xy: 943, 269 + xy: 581, 162 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 pulse-conduit-top-5 rotate: false - xy: 963, 279 + xy: 591, 162 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 pulse-conduit-top-6 rotate: false - xy: 943, 259 + xy: 601, 162 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -1623,7 +1623,7 @@ fusion-reactor-top index: -1 rtg-generator-top rotate: false - xy: 983, 279 + xy: 661, 162 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -1644,7 +1644,7 @@ thorium-reactor-lights index: -1 turbine-generator-top rotate: false - xy: 319, 81 + xy: 355, 99 size: 16, 16 orig: 16, 16 offset: 0, 0 @@ -1763,119 +1763,119 @@ block-icon-blast-mixer index: -1 centrifuge-liquid rotate: false - xy: 863, 321 + xy: 881, 321 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 cryofluidmixer-bottom rotate: false - xy: 919, 339 + xy: 917, 321 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 cryofluidmixer-liquid rotate: false - xy: 917, 321 + xy: 949, 353 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 cryofluidmixer-top rotate: false - xy: 949, 353 + xy: 967, 353 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 cultivator rotate: false - xy: 967, 353 + xy: 985, 353 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 cultivator-middle rotate: false - xy: 985, 353 + xy: 687, 249 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 cultivator-top rotate: false - xy: 687, 249 + xy: 687, 231 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 lavasmelter rotate: false - xy: 841, 158 + xy: 993, 275 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 oilrefinery rotate: false - xy: 863, 233 + xy: 983, 215 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 phase-weaver rotate: false - xy: 795, 188 + xy: 466, 184 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 phase-weaver-bottom rotate: false - xy: 466, 184 + xy: 463, 166 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 phase-weaver-weave rotate: false - xy: 463, 166 + xy: 175, 99 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 plastanium-compressor-top rotate: false - xy: 175, 99 + xy: 193, 99 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 poweralloysmelter-top rotate: false - xy: 193, 81 + xy: 229, 99 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 pulverizer rotate: false - xy: 953, 269 + xy: 611, 162 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 pulverizer-rotator rotate: false - xy: 973, 279 + xy: 621, 162 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 separator-liquid rotate: false - xy: 983, 269 + xy: 711, 165 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -1896,21 +1896,21 @@ core-top index: -1 sortedunloader rotate: false - xy: 953, 219 + xy: 751, 168 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-1 rotate: false - xy: 1005, 337 + xy: 481, 174 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-1-top rotate: false - xy: 1015, 331 + xy: 491, 175 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -1980,7 +1980,7 @@ cyclone index: -1 duo rotate: false - xy: 813, 218 + xy: 923, 249 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -2001,7 +2001,7 @@ spectre index: -1 hail rotate: false - xy: 811, 158 + xy: 963, 275 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -2015,14 +2015,14 @@ hail-heat index: -1 lancer rotate: false - xy: 267, 117 + xy: 285, 117 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 lancer-heat rotate: false - xy: 285, 117 + xy: 303, 117 size: 16, 16 orig: 16, 16 offset: 0, 0 @@ -2050,126 +2050,126 @@ ripple-heat index: -1 salvo rotate: false - xy: 247, 81 + xy: 283, 99 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 salvo-heat rotate: false - xy: 283, 99 + xy: 265, 81 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 salvo-panel-left rotate: false - xy: 265, 81 + xy: 301, 99 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 salvo-panel-right rotate: false - xy: 301, 99 + xy: 283, 81 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 scatter rotate: false - xy: 953, 239 + xy: 701, 175 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 scorch rotate: false - xy: 963, 249 + xy: 701, 165 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 scorch-shoot rotate: false - xy: 973, 259 + xy: 711, 175 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 swarmer rotate: false - xy: 283, 81 + xy: 319, 99 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 wave rotate: false - xy: 373, 81 + xy: 391, 81 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 wave-liquid rotate: false - xy: 391, 81 + xy: 180, 63 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 dagger-pad-top rotate: false - xy: 687, 231 + xy: 687, 213 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 dagger-pad-top-open rotate: false - xy: 687, 213 + xy: 705, 249 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 drone-pad-top rotate: false - xy: 723, 254 + xy: 723, 236 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 drone-pad-top-open rotate: false - xy: 723, 236 + xy: 741, 254 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 fabricator-pad-top rotate: false - xy: 741, 254 + xy: 723, 218 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 fabricator-pad-top-open rotate: false - xy: 723, 218 + xy: 741, 236 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 interceptor-pad-top rotate: false - xy: 213, 117 + xy: 231, 117 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 interceptor-pad-top-open rotate: false - xy: 231, 117 + xy: 249, 117 size: 16, 16 orig: 16, 16 offset: 0, 0 @@ -2183,21 +2183,21 @@ mech-factory index: -1 dart-ship-factory-open rotate: false - xy: 705, 249 + xy: 705, 231 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 delta-mech-factory-open rotate: false - xy: 705, 231 + xy: 705, 213 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 javelin-ship-factory-open rotate: false - xy: 249, 117 + xy: 267, 117 size: 16, 16 orig: 16, 16 offset: 0, 0 @@ -2239,21 +2239,21 @@ titan-pad-top-open index: -1 reconstructor-open rotate: false - xy: 229, 99 + xy: 211, 81 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 repair-point-turret rotate: false - xy: 943, 249 + xy: 631, 162 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 resupply-point rotate: false - xy: 953, 259 + xy: 641, 162 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -2274,14 +2274,14 @@ titan-pad index: -1 door-large-open rotate: false - xy: 705, 213 + xy: 723, 254 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 door-open rotate: false - xy: 823, 238 + xy: 913, 239 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -2337,21 +2337,21 @@ clear index: -1 command-attack rotate: false - xy: 661, 164 + xy: 923, 279 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 command-idle rotate: false - xy: 671, 174 + xy: 933, 279 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 command-retreat rotate: false - xy: 671, 164 + xy: 853, 276 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -2365,7 +2365,7 @@ enemyarrow index: -1 error rotate: false - xy: 919, 307 + xy: 283, 37 size: 12, 12 orig: 12, 12 offset: 0, 0 @@ -2407,14 +2407,14 @@ minelaser-end index: -1 missile rotate: false - xy: 569, 195 + xy: 315, 26 size: 9, 9 orig: 9, 9 offset: 0, 0 index: -1 missile-back rotate: false - xy: 580, 193 + xy: 326, 26 size: 9, 9 orig: 9, 9 offset: 0, 0 @@ -2456,21 +2456,21 @@ scorch5 index: -1 shell rotate: false - xy: 591, 193 + xy: 337, 26 size: 9, 9 orig: 9, 9 offset: 0, 0 index: -1 shell-back rotate: false - xy: 602, 193 + xy: 348, 26 size: 9, 9 orig: 9, 9 offset: 0, 0 index: -1 shot rotate: false - xy: 943, 219 + xy: 721, 178 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -2484,7 +2484,7 @@ transfer index: -1 transfer-arrow rotate: false - xy: 973, 189 + xy: 721, 158 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -2498,28 +2498,28 @@ transfer-end index: -1 blackstone-cliff-edge rotate: false - xy: 1015, 361 + xy: 369, 27 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blackstone-cliff-edge-1 rotate: false - xy: 1015, 351 + xy: 379, 27 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blackstone-cliff-edge-2 rotate: false - xy: 1005, 347 + xy: 389, 27 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blackstone-cliff-side rotate: false - xy: 1015, 341 + xy: 399, 27 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -2547,28 +2547,28 @@ block-icon-blast-drill index: -1 block-icon-bridge-conduit rotate: false - xy: 1005, 317 + xy: 521, 175 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 bridge-conduit rotate: false - xy: 1005, 317 + xy: 521, 175 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-icon-bridge-conveyor rotate: false - xy: 1015, 311 + xy: 531, 175 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 bridge-conveyor rotate: false - xy: 1015, 311 + xy: 531, 175 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -2589,14 +2589,14 @@ centrifuge index: -1 block-icon-combustion-generator rotate: false - xy: 1015, 301 + xy: 481, 164 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 combustion-generator rotate: false - xy: 1015, 301 + xy: 481, 164 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -2617,14 +2617,14 @@ command-center index: -1 block-icon-composite-wall rotate: false - xy: 1015, 291 + xy: 491, 165 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 composite-wall rotate: false - xy: 1015, 291 + xy: 491, 165 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -2645,35 +2645,35 @@ composite-wall-large index: -1 block-icon-conduit rotate: false - xy: 1015, 281 + xy: 501, 165 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-icon-conveyor rotate: false - xy: 613, 194 + xy: 511, 165 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 conveyor-0-0 rotate: false - xy: 613, 194 + xy: 511, 165 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-icon-copper-wall rotate: false - xy: 623, 194 + xy: 521, 165 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 copper-wall rotate: false - xy: 623, 194 + xy: 521, 165 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -2750,42 +2750,28 @@ dart-ship-factory index: -1 block-icon-deepwater rotate: false - xy: 633, 194 + xy: 531, 165 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 deepwater rotate: false - xy: 633, 194 + xy: 531, 165 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-icon-deflector-wall rotate: false - xy: 643, 194 + xy: 406, 71 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 deflector-wall rotate: false - xy: 643, 194 - size: 8, 8 - orig: 8, 8 - offset: 0, 0 - index: -1 -phase-wall - rotate: false - xy: 643, 194 - size: 8, 8 - orig: 8, 8 - offset: 0, 0 - index: -1 -block-icon-phase-wall - rotate: false - xy: 643, 194 + xy: 406, 71 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -2804,20 +2790,6 @@ deflector-wall-large orig: 16, 16 offset: 0, 0 index: -1 -phase-wall-large - rotate: false - xy: 889, 393 - size: 16, 16 - orig: 16, 16 - offset: 0, 0 - index: -1 -block-icon-phase-wall-large - rotate: false - xy: 889, 393 - size: 16, 16 - orig: 16, 16 - offset: 0, 0 - index: -1 block-icon-delta-mech-factory rotate: false xy: 907, 393 @@ -2834,14 +2806,14 @@ delta-mech-factory index: -1 block-icon-dirt rotate: false - xy: 653, 194 + xy: 541, 175 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 dirt1 rotate: false - xy: 653, 194 + xy: 541, 175 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -2862,14 +2834,14 @@ distributor index: -1 block-icon-door rotate: false - xy: 663, 194 + xy: 541, 165 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 door rotate: false - xy: 663, 194 + xy: 541, 165 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -2897,21 +2869,21 @@ block-icon-drone-pad index: -1 block-icon-drop-point rotate: false - xy: 673, 194 + xy: 554, 184 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 drop-point rotate: false - xy: 673, 194 + xy: 554, 184 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-icon-duo rotate: false - xy: 399, 43 + xy: 564, 184 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -2939,63 +2911,63 @@ block-icon-fusion-reactor index: -1 block-icon-grass rotate: false - xy: 397, 33 + xy: 551, 174 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 grass1 rotate: false - xy: 397, 33 + xy: 551, 174 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-icon-hail rotate: false - xy: 395, 23 + xy: 561, 174 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-icon-ice rotate: false - xy: 481, 174 + xy: 551, 164 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ice1 rotate: false - xy: 481, 174 + xy: 551, 164 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-icon-icerock rotate: false - xy: 491, 175 + xy: 561, 164 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 icerock1 rotate: false - xy: 491, 175 + xy: 561, 164 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-icon-incinerator rotate: false - xy: 501, 175 + xy: 571, 174 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 incinerator rotate: false - xy: 501, 175 + xy: 571, 174 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -3009,28 +2981,28 @@ block-icon-interceptor-pad index: -1 block-icon-itemsource rotate: false - xy: 511, 175 + xy: 571, 164 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 itemsource rotate: false - xy: 511, 175 + xy: 571, 164 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-icon-itemvoid rotate: false - xy: 521, 175 + xy: 813, 288 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 itemvoid rotate: false - xy: 521, 175 + xy: 813, 288 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -3051,14 +3023,14 @@ javelin-ship-factory index: -1 block-icon-junction rotate: false - xy: 531, 175 + xy: 823, 288 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 junction rotate: false - xy: 531, 175 + xy: 823, 288 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -3079,35 +3051,35 @@ block-icon-laser-drill index: -1 block-icon-lava rotate: false - xy: 481, 164 + xy: 811, 278 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 lava rotate: false - xy: 481, 164 + xy: 811, 278 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-icon-liquid-junction rotate: false - xy: 491, 165 + xy: 833, 288 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 liquid-junction rotate: false - xy: 491, 165 + xy: 833, 288 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-icon-liquid-router rotate: false - xy: 501, 165 + xy: 821, 278 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -3121,14 +3093,14 @@ block-icon-liquid-tank index: -1 block-icon-liquidsource rotate: false - xy: 511, 165 + xy: 813, 268 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 liquidsource rotate: false - xy: 511, 165 + xy: 813, 268 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -3156,14 +3128,14 @@ block-icon-mechanical-drill index: -1 block-icon-mechanical-pump rotate: false - xy: 521, 165 + xy: 831, 278 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 mechanical-pump rotate: false - xy: 521, 165 + xy: 831, 278 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -3177,28 +3149,28 @@ block-icon-meltdown index: -1 block-icon-melter rotate: false - xy: 531, 165 + xy: 813, 258 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 melter rotate: false - xy: 531, 165 + xy: 813, 258 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-icon-metalfloor rotate: false - xy: 541, 175 + xy: 823, 268 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 metalfloor1 rotate: false - xy: 541, 175 + xy: 823, 268 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -3212,14 +3184,14 @@ block-icon-monsoon-pad index: -1 block-icon-oil rotate: false - xy: 541, 165 + xy: 813, 248 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 oil rotate: false - xy: 541, 165 + xy: 813, 248 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -3233,53 +3205,81 @@ block-icon-oil-extractor index: -1 block-icon-overflow-gate rotate: false - xy: 554, 184 + xy: 823, 258 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 overflow-gate rotate: false - xy: 554, 184 + xy: 823, 258 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-icon-phase-conduit rotate: false - xy: 551, 174 + xy: 813, 238 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 phase-conduit rotate: false - xy: 551, 174 + xy: 813, 238 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-icon-phase-conveyor rotate: false - xy: 551, 164 + xy: 823, 248 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 phase-conveyor rotate: false - xy: 551, 164 + xy: 823, 248 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 -block-icon-phase-weaver +block-icon-phase-wall + rotate: false + xy: 813, 228 + size: 8, 8 + orig: 8, 8 + offset: 0, 0 + index: -1 +phase-wall + rotate: false + xy: 813, 228 + size: 8, 8 + orig: 8, 8 + offset: 0, 0 + index: -1 +block-icon-phase-wall-large rotate: false xy: 859, 375 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 +phase-wall-large + rotate: false + xy: 859, 375 + size: 16, 16 + orig: 16, 16 + offset: 0, 0 + index: -1 +block-icon-phase-weaver + rotate: false + xy: 859, 357 + size: 16, 16 + orig: 16, 16 + offset: 0, 0 + index: -1 block-icon-plasma-drill rotate: false xy: 248, 161 @@ -3289,161 +3289,161 @@ block-icon-plasma-drill index: -1 block-icon-plastanium-compressor rotate: false - xy: 859, 357 + xy: 877, 375 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 plastanium-compressor rotate: false - xy: 859, 357 + xy: 877, 375 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 block-icon-pneumatic-drill rotate: false - xy: 877, 375 + xy: 877, 357 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 block-icon-power-node rotate: false - xy: 564, 184 + xy: 823, 238 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 power-node rotate: false - xy: 564, 184 + xy: 823, 238 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-icon-power-node-large rotate: false - xy: 877, 357 + xy: 895, 375 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 power-node-large rotate: false - xy: 877, 357 + xy: 895, 375 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 block-icon-powerinfinite rotate: false - xy: 561, 174 + xy: 813, 218 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 powerinfinite rotate: false - xy: 561, 174 + xy: 813, 218 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-icon-powervoid rotate: false - xy: 561, 164 + xy: 823, 228 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 powervoid rotate: false - xy: 561, 164 + xy: 823, 228 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-icon-pulse-conduit rotate: false - xy: 574, 183 + xy: 813, 208 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-icon-pulverizer rotate: false - xy: 584, 183 + xy: 823, 218 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-icon-pyratite-mixer rotate: false - xy: 895, 375 + xy: 895, 357 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 pyratite-mixer rotate: false - xy: 895, 375 + xy: 895, 357 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 block-icon-reconstructor rotate: false - xy: 895, 357 + xy: 913, 375 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 dagger-pad rotate: false - xy: 895, 357 + xy: 913, 375 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 drone-pad rotate: false - xy: 895, 357 + xy: 913, 375 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 fabricator-pad rotate: false - xy: 895, 357 + xy: 913, 375 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 interceptor-pad rotate: false - xy: 895, 357 + xy: 913, 375 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 reconstructor rotate: false - xy: 895, 357 + xy: 913, 375 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 block-icon-repair-point rotate: false - xy: 594, 183 + xy: 813, 198 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 repair-point rotate: false - xy: 594, 183 + xy: 813, 198 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -3457,168 +3457,168 @@ block-icon-ripple index: -1 block-icon-rock rotate: false - xy: 604, 183 + xy: 823, 208 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 rock1 rotate: false - xy: 604, 183 + xy: 823, 208 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-icon-rotary-pump rotate: false - xy: 913, 375 + xy: 913, 357 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 rotary-pump rotate: false - xy: 913, 375 + xy: 913, 357 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 block-icon-router rotate: false - xy: 614, 184 + xy: 813, 188 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 router rotate: false - xy: 614, 184 + xy: 813, 188 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-icon-rtg-generator rotate: false - xy: 624, 184 + xy: 823, 198 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 rtg-generator rotate: false - xy: 624, 184 + xy: 823, 198 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-icon-salvo rotate: false - xy: 913, 357 + xy: 931, 363 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 block-icon-sand rotate: false - xy: 634, 184 + xy: 823, 188 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 sand1 rotate: false - xy: 634, 184 + xy: 823, 188 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-icon-scorch rotate: false - xy: 644, 184 + xy: 833, 268 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-icon-separator rotate: false - xy: 654, 184 + xy: 833, 258 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 separator rotate: false - xy: 654, 184 + xy: 833, 258 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-icon-shrub rotate: false - xy: 664, 184 + xy: 833, 248 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 shrub rotate: false - xy: 664, 184 + xy: 833, 248 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-icon-silicon-smelter rotate: false - xy: 931, 363 + xy: 949, 371 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 silicon-smelter rotate: false - xy: 931, 363 + xy: 949, 371 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 block-icon-smelter rotate: false - xy: 674, 184 + xy: 833, 238 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 smelter rotate: false - xy: 674, 184 + xy: 833, 238 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-icon-snow rotate: false - xy: 571, 173 + xy: 833, 228 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 snow1 rotate: false - xy: 571, 173 + xy: 833, 228 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-icon-solar-panel rotate: false - xy: 581, 173 + xy: 833, 218 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 solar-panel rotate: false - xy: 581, 173 + xy: 833, 218 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -3639,42 +3639,42 @@ solar-panel-large index: -1 block-icon-solidifer rotate: false - xy: 591, 173 + xy: 833, 208 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 solidifer rotate: false - xy: 591, 173 + xy: 833, 208 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-icon-sorter rotate: false - xy: 601, 173 + xy: 833, 198 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 sorter rotate: false - xy: 601, 173 + xy: 833, 198 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-icon-space rotate: false - xy: 571, 163 + xy: 833, 188 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 space rotate: false - xy: 571, 163 + xy: 833, 188 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -3688,49 +3688,49 @@ block-icon-spectre index: -1 block-icon-stone rotate: false - xy: 581, 163 + xy: 841, 278 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 stone1 rotate: false - xy: 581, 163 + xy: 841, 278 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-icon-swarmer rotate: false - xy: 949, 371 + xy: 967, 371 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 block-icon-thermal-generator rotate: false - xy: 967, 371 + xy: 985, 371 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 thermal-generator rotate: false - xy: 967, 371 + xy: 985, 371 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 block-icon-thermal-pump rotate: false - xy: 985, 371 + xy: 845, 324 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 thermal-pump rotate: false - xy: 985, 371 + xy: 845, 324 size: 16, 16 orig: 16, 16 offset: 0, 0 @@ -3751,28 +3751,28 @@ thorium-reactor index: -1 block-icon-thorium-wall rotate: false - xy: 591, 163 + xy: 843, 268 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 thorium-wall rotate: false - xy: 591, 163 + xy: 843, 268 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-icon-thorium-wall-large rotate: false - xy: 845, 324 + xy: 865, 339 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 thorium-wall-large rotate: false - xy: 845, 324 + xy: 865, 339 size: 16, 16 orig: 16, 16 offset: 0, 0 @@ -3786,42 +3786,42 @@ block-icon-titan-pad index: -1 block-icon-titanium-conveyor rotate: false - xy: 601, 163 + xy: 843, 258 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 titanium-conveyor-0-0 rotate: false - xy: 601, 163 + xy: 843, 258 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-icon-turbine-generator rotate: false - xy: 865, 339 + xy: 883, 339 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 turbine-generator rotate: false - xy: 865, 339 + xy: 883, 339 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 block-icon-unloader rotate: false - xy: 684, 185 + xy: 843, 248 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 unloader rotate: false - xy: 684, 185 + xy: 843, 248 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -3856,1085 +3856,1085 @@ warp-gate index: -1 block-icon-water rotate: false - xy: 694, 185 + xy: 843, 238 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 water rotate: false - xy: 694, 185 + xy: 843, 238 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-icon-water-extractor rotate: false - xy: 883, 339 + xy: 901, 339 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 block-icon-wave rotate: false - xy: 901, 339 + xy: 863, 321 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 deepwater-cliff-edge rotate: false - xy: 821, 278 + xy: 893, 229 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 deepwater-cliff-edge-1 rotate: false - xy: 813, 268 + xy: 903, 239 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 deepwater-cliff-edge-2 rotate: false - xy: 831, 278 + xy: 913, 249 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 deepwater-cliff-side rotate: false - xy: 813, 258 + xy: 923, 259 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 dirt-cliff-edge rotate: false - xy: 823, 258 + xy: 873, 199 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 dirt-cliff-edge-1 rotate: false - xy: 813, 238 + xy: 883, 209 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 dirt-cliff-edge-2 rotate: false - xy: 823, 248 + xy: 893, 219 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 dirt-cliff-side rotate: false - xy: 813, 228 + xy: 903, 229 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 lava-cliff-edge rotate: false - xy: 843, 198 + xy: 953, 235 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 lava-cliff-edge-1 rotate: false - xy: 843, 188 + xy: 963, 245 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 lava-cliff-edge-2 rotate: false - xy: 841, 178 + xy: 973, 255 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 lava-cliff-side rotate: false - xy: 841, 168 + xy: 983, 265 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 liquid-icon-cryofluid rotate: false - xy: 893, 283 + xy: 963, 235 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 liquid-icon-lava rotate: false - xy: 903, 283 + xy: 973, 245 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 liquid-icon-oil rotate: false - xy: 913, 283 + xy: 983, 255 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 liquid-icon-water rotate: false - xy: 923, 283 + xy: 993, 265 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 mech-icon-alpha-mech rotate: false - xy: 961, 303 + xy: 353, 51 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 mech-icon-dart-ship rotate: false - xy: 975, 303 + xy: 353, 37 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 mech-icon-delta-mech rotate: false - xy: 989, 303 + xy: 367, 51 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 mech-icon-halberd-ship rotate: false - xy: 947, 289 + xy: 367, 37 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 mech-icon-trident-ship rotate: false - xy: 947, 289 + xy: 367, 37 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 mech-icon-omega-mech rotate: false - xy: 961, 289 + xy: 381, 51 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 mech-icon-tau-mech rotate: false - xy: 961, 289 + xy: 381, 51 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 metalfloor-cliff-edge rotate: false - xy: 873, 263 + xy: 973, 225 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 metalfloor-cliff-edge-1 rotate: false - xy: 883, 273 + xy: 983, 235 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 metalfloor-cliff-edge-2 rotate: false - xy: 853, 236 + xy: 993, 245 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 metalfloor-cliff-side rotate: false - xy: 863, 243 + xy: 963, 205 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 oil-cliff-edge rotate: false - xy: 873, 253 + xy: 973, 215 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 oil-cliff-edge-1 rotate: false - xy: 883, 263 + xy: 983, 225 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 oil-cliff-edge-2 rotate: false - xy: 893, 273 + xy: 993, 235 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 oil-cliff-side rotate: false - xy: 853, 226 + xy: 973, 205 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-coal-blackstone1 rotate: false - xy: 873, 243 + xy: 993, 225 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-coal-blackstone2 rotate: false - xy: 883, 253 + xy: 983, 205 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-coal-blackstone3 rotate: false - xy: 893, 263 + xy: 993, 215 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-coal-grass1 rotate: false - xy: 903, 273 + xy: 993, 205 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-coal-grass2 rotate: false - xy: 853, 216 + xy: 853, 186 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-coal-grass3 rotate: false - xy: 863, 223 + xy: 863, 189 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-coal-ice1 rotate: false - xy: 873, 233 + xy: 873, 189 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-coal-ice2 rotate: false - xy: 883, 243 + xy: 883, 189 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-coal-ice3 rotate: false - xy: 893, 253 + xy: 893, 189 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-coal-sand1 rotate: false - xy: 903, 263 + xy: 903, 189 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-coal-sand2 rotate: false - xy: 913, 273 + xy: 913, 189 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-coal-sand3 rotate: false - xy: 853, 206 + xy: 923, 189 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-coal-snow1 rotate: false - xy: 863, 213 + xy: 933, 189 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-coal-snow2 rotate: false - xy: 873, 223 + xy: 943, 195 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-coal-snow3 rotate: false - xy: 883, 233 + xy: 953, 195 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-coal-stone1 rotate: false - xy: 893, 243 + xy: 963, 195 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-coal-stone2 rotate: false - xy: 903, 253 + xy: 973, 195 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-coal-stone3 rotate: false - xy: 913, 263 + xy: 983, 195 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-copper-blackstone1 rotate: false - xy: 923, 273 + xy: 993, 195 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-copper-blackstone2 rotate: false - xy: 853, 196 + xy: 943, 185 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-copper-blackstone3 rotate: false - xy: 863, 203 + xy: 953, 185 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-copper-grass1 rotate: false - xy: 873, 213 + xy: 963, 185 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-copper-grass2 rotate: false - xy: 883, 223 + xy: 973, 185 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-copper-grass3 rotate: false - xy: 893, 233 + xy: 983, 185 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-copper-ice1 rotate: false - xy: 903, 243 + xy: 993, 185 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-copper-ice2 rotate: false - xy: 913, 253 + xy: 1003, 275 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-copper-ice3 rotate: false - xy: 923, 263 + xy: 1003, 265 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-copper-sand1 rotate: false - xy: 933, 273 + xy: 1003, 255 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-copper-sand2 rotate: false - xy: 873, 203 + xy: 1003, 245 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-copper-sand3 rotate: false - xy: 883, 213 + xy: 1003, 235 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-copper-snow1 rotate: false - xy: 893, 223 + xy: 1003, 225 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-copper-snow2 rotate: false - xy: 903, 233 + xy: 1003, 215 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-copper-snow3 rotate: false - xy: 913, 243 + xy: 1003, 205 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-copper-stone1 rotate: false - xy: 923, 253 + xy: 1003, 195 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-copper-stone2 rotate: false - xy: 933, 263 + xy: 1003, 185 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-copper-stone3 rotate: false - xy: 883, 203 + xy: 863, 179 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-lead-blackstone1 rotate: false - xy: 893, 213 + xy: 873, 179 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-lead-blackstone2 rotate: false - xy: 903, 223 + xy: 883, 179 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-lead-blackstone3 rotate: false - xy: 913, 233 + xy: 893, 179 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-lead-grass1 rotate: false - xy: 923, 243 + xy: 903, 179 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-lead-grass2 rotate: false - xy: 933, 253 + xy: 913, 179 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-lead-grass3 rotate: false - xy: 893, 203 + xy: 923, 179 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-lead-ice1 rotate: false - xy: 903, 213 + xy: 933, 179 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-lead-ice2 rotate: false - xy: 913, 223 + xy: 943, 175 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-lead-ice3 rotate: false - xy: 923, 233 + xy: 953, 175 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-lead-sand1 rotate: false - xy: 933, 243 + xy: 963, 175 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-lead-sand2 rotate: false - xy: 903, 203 + xy: 973, 175 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-lead-sand3 rotate: false - xy: 913, 213 + xy: 983, 175 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-lead-snow1 rotate: false - xy: 923, 223 + xy: 993, 175 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-lead-snow2 rotate: false - xy: 933, 233 + xy: 1003, 175 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-lead-snow3 rotate: false - xy: 913, 203 + xy: 677, 184 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-lead-stone1 rotate: false - xy: 923, 213 + xy: 687, 185 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-lead-stone2 rotate: false - xy: 933, 223 + xy: 697, 185 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-lead-stone3 rotate: false - xy: 923, 203 + xy: 707, 185 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-thorium-blackstone1 rotate: false - xy: 933, 213 + xy: 207, 23 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-thorium-blackstone2 rotate: false - xy: 933, 203 + xy: 217, 23 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-thorium-blackstone3 rotate: false - xy: 853, 186 + xy: 227, 23 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-thorium-grass1 rotate: false - xy: 863, 193 + xy: 237, 23 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-thorium-grass2 rotate: false - xy: 873, 193 + xy: 205, 13 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-thorium-grass3 rotate: false - xy: 883, 193 + xy: 205, 3 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-thorium-ice1 rotate: false - xy: 893, 193 + xy: 215, 13 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-thorium-ice2 rotate: false - xy: 903, 193 + xy: 215, 3 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-thorium-ice3 rotate: false - xy: 913, 193 + xy: 225, 13 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-thorium-sand1 rotate: false - xy: 923, 193 + xy: 225, 3 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-thorium-sand2 rotate: false - xy: 933, 193 + xy: 235, 13 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-thorium-sand3 rotate: false - xy: 851, 176 + xy: 235, 3 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-thorium-snow1 rotate: false - xy: 851, 166 + xy: 409, 107 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-thorium-snow2 rotate: false - xy: 851, 156 + xy: 409, 97 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-thorium-snow3 rotate: false - xy: 863, 183 + xy: 409, 87 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-thorium-stone1 rotate: false - xy: 873, 183 + xy: 1007, 315 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-thorium-stone2 rotate: false - xy: 883, 183 + xy: 1007, 305 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-thorium-stone3 rotate: false - xy: 893, 183 + xy: 1007, 295 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-titanium-blackstone1 rotate: false - xy: 903, 183 + xy: 1007, 285 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-titanium-blackstone2 rotate: false - xy: 913, 183 + xy: 1013, 275 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-titanium-blackstone3 rotate: false - xy: 923, 183 + xy: 1013, 265 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-titanium-grass1 rotate: false - xy: 933, 183 + xy: 1013, 255 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-titanium-grass2 rotate: false - xy: 861, 173 + xy: 1013, 245 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-titanium-grass3 rotate: false - xy: 861, 163 + xy: 1013, 235 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-titanium-ice1 rotate: false - xy: 871, 173 + xy: 1013, 225 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-titanium-ice2 rotate: false - xy: 871, 163 + xy: 1013, 215 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-titanium-ice3 rotate: false - xy: 881, 173 + xy: 1013, 205 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-titanium-sand1 rotate: false - xy: 881, 163 + xy: 1013, 195 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-titanium-sand2 rotate: false - xy: 891, 173 + xy: 1013, 185 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-titanium-sand3 rotate: false - xy: 891, 163 + xy: 1013, 175 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-titanium-snow1 rotate: false - xy: 901, 173 + xy: 581, 182 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-titanium-snow2 rotate: false - xy: 901, 163 + xy: 591, 182 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-titanium-snow3 rotate: false - xy: 911, 173 + xy: 581, 172 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-titanium-stone1 rotate: false - xy: 911, 163 + xy: 601, 182 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-titanium-stone2 rotate: false - xy: 921, 173 + xy: 591, 172 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-titanium-stone3 rotate: false - xy: 921, 163 + xy: 611, 182 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 sand-cliff-edge rotate: false - xy: 953, 249 + xy: 681, 174 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 sand-cliff-edge-1 rotate: false - xy: 963, 259 + xy: 681, 164 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 sand-cliff-edge-2 rotate: false - xy: 973, 269 + xy: 691, 175 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 sand-cliff-side rotate: false - xy: 943, 229 + xy: 691, 165 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 snow-cliff-edge rotate: false - xy: 983, 259 + xy: 731, 168 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 snow-cliff-edge-1 rotate: false - xy: 993, 269 + xy: 751, 178 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 snow-cliff-edge-2 rotate: false - xy: 1003, 271 + xy: 741, 168 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 snow-cliff-side rotate: false - xy: 943, 209 + xy: 761, 178 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 space-cliff-edge rotate: false - xy: 963, 229 + xy: 771, 178 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 space-cliff-edge-1 rotate: false - xy: 973, 239 + xy: 761, 168 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 space-cliff-edge-2 rotate: false - xy: 983, 249 + xy: 781, 178 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 space-cliff-side rotate: false - xy: 993, 259 + xy: 771, 168 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 unit-icon-dagger rotate: false - xy: 283, 19 + xy: 177, 3 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 unit-icon-titan rotate: false - xy: 355, 99 + xy: 337, 81 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 item-biomatter rotate: false - xy: 833, 218 + xy: 963, 265 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 item-blast-compound rotate: false - xy: 833, 208 + xy: 973, 275 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 item-coal rotate: false - xy: 833, 198 + xy: 903, 199 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 item-copper rotate: false - xy: 833, 188 + xy: 913, 209 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 item-dense-alloy rotate: false - xy: 831, 178 + xy: 923, 219 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 item-lead rotate: false - xy: 831, 168 + xy: 933, 229 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 item-phase-matter rotate: false - xy: 831, 158 + xy: 943, 235 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 item-plastanium rotate: false - xy: 841, 278 + xy: 953, 245 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 item-pyratite rotate: false - xy: 843, 268 + xy: 963, 255 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 item-sand rotate: false - xy: 843, 258 + xy: 973, 265 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 item-silicon rotate: false - xy: 843, 248 + xy: 983, 275 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 item-stone rotate: false - xy: 843, 238 + xy: 913, 199 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 item-surge-alloy rotate: false - xy: 843, 228 + xy: 923, 209 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 item-thorium rotate: false - xy: 843, 218 + xy: 933, 219 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 item-titanium rotate: false - xy: 843, 208 + xy: 943, 225 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 liquid-icon rotate: false - xy: 883, 283 + xy: 953, 225 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -5011,63 +5011,63 @@ dagger-leg index: -1 delta-mech rotate: false - xy: 863, 307 + xy: 255, 37 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 delta-mech-leg rotate: false - xy: 877, 307 + xy: 269, 51 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 omega-mech rotate: false - xy: 199, 19 + xy: 1003, 367 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 tau-mech rotate: false - xy: 199, 19 + xy: 1003, 367 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 dart-ship rotate: false - xy: 849, 296 + xy: 255, 51 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 halberd-ship rotate: false - xy: 891, 293 + xy: 311, 37 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 trident-ship rotate: false - xy: 891, 293 + xy: 311, 37 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 javelin-ship rotate: false - xy: 933, 293 + xy: 339, 51 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 mech-icon-javelin-ship rotate: false - xy: 933, 293 + xy: 339, 51 size: 12, 12 orig: 12, 12 offset: 0, 0 @@ -5244,28 +5244,28 @@ discord-banner-over index: -1 controller-cursor rotate: false - xy: 881, 321 + xy: 899, 321 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-about rotate: false - xy: 180, 65 + xy: 198, 65 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-add rotate: false - xy: 196, 65 + xy: 214, 65 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-admin rotate: false - xy: 212, 65 + xy: 230, 65 size: 14, 14 orig: 14, 14 offset: 0, 0 @@ -5286,231 +5286,231 @@ icon-areaDelete index: -1 icon-arrow rotate: false - xy: 741, 236 + xy: 759, 254 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-arrow-16 rotate: false - xy: 741, 236 + xy: 759, 254 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-arrow-down rotate: false - xy: 311, 21 + xy: 1003, 381 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-arrow-left rotate: false - xy: 323, 21 + xy: 723, 188 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-arrow-right rotate: false - xy: 335, 21 + xy: 735, 188 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-arrow-up rotate: false - xy: 347, 21 + xy: 747, 188 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-back rotate: false - xy: 759, 254 + xy: 741, 218 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-ban rotate: false - xy: 228, 65 + xy: 246, 65 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-break rotate: false - xy: 741, 218 + xy: 759, 236 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-cancel rotate: false - xy: 759, 236 + xy: 759, 218 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-chat rotate: false - xy: 359, 21 + xy: 759, 188 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-check rotate: false - xy: 759, 218 + xy: 777, 254 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-crafting rotate: false - xy: 371, 21 + xy: 771, 188 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-cursor rotate: false - xy: 383, 23 + xy: 783, 188 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-defense rotate: false - xy: 1003, 381 + xy: 486, 197 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-dev-builds rotate: false - xy: 244, 65 + xy: 262, 65 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-discord rotate: false - xy: 260, 65 + xy: 278, 65 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-distribution rotate: false - xy: 1003, 369 + xy: 498, 197 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-donate rotate: false - xy: 276, 65 + xy: 294, 65 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-dots rotate: false - xy: 292, 65 + xy: 310, 65 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-editor rotate: false - xy: 308, 65 + xy: 326, 65 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-egg rotate: false - xy: 324, 65 + xy: 342, 65 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-elevation rotate: false - xy: 777, 254 + xy: 777, 236 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-eraser rotate: false - xy: 777, 236 + xy: 777, 218 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-exit rotate: false - xy: 340, 65 + xy: 358, 65 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-file rotate: false - xy: 777, 218 + xy: 795, 260 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-file-image rotate: false - xy: 795, 260 + xy: 795, 242 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-file-text rotate: false - xy: 356, 65 + xy: 374, 65 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-fill rotate: false - xy: 795, 242 + xy: 795, 224 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-floppy rotate: false - xy: 372, 65 + xy: 390, 65 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-floppy-16 rotate: false - xy: 795, 224 + xy: 687, 195 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-folder rotate: false - xy: 388, 65 + xy: 175, 47 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-folder-parent rotate: false - xy: 175, 49 + xy: 175, 31 size: 14, 14 orig: 14, 14 offset: 0, 0 @@ -5524,441 +5524,441 @@ icon-generated index: -1 icon-github rotate: false - xy: 191, 49 + xy: 863, 305 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-google-play rotate: false - xy: 175, 33 + xy: 879, 305 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-grid rotate: false - xy: 687, 195 + xy: 705, 195 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-hold rotate: false - xy: 1003, 357 + xy: 510, 197 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-holdDelete rotate: false - xy: 1003, 305 + xy: 522, 197 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-home rotate: false - xy: 207, 49 + xy: 895, 305 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-host rotate: false - xy: 191, 33 + xy: 911, 305 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-info rotate: false - xy: 1003, 293 + xy: 534, 197 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-itch.io rotate: false - xy: 223, 49 + xy: 927, 305 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-item rotate: false - xy: 1003, 281 + xy: 484, 185 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-items-none rotate: false - xy: 833, 238 + xy: 943, 245 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 icon-line rotate: false - xy: 705, 195 + xy: 723, 200 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-link rotate: false - xy: 207, 33 + xy: 863, 289 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-liquid rotate: false - xy: 723, 188 + xy: 496, 185 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-load rotate: false - xy: 239, 49 + xy: 879, 289 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-load-image rotate: false - xy: 723, 200 + xy: 741, 200 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-load-map rotate: false - xy: 741, 200 + xy: 759, 200 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-loading rotate: false - xy: 759, 200 + xy: 777, 200 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-locked rotate: false - xy: 777, 200 + xy: 795, 206 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-logic rotate: false - xy: 735, 188 + xy: 508, 185 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-map rotate: false - xy: 223, 33 + xy: 895, 289 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-menu rotate: false - xy: 747, 188 + xy: 520, 185 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-menu-large rotate: false - xy: 795, 206 + xy: 456, 142 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-missing rotate: false - xy: 759, 188 + xy: 532, 185 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-none rotate: false - xy: 771, 188 + xy: 557, 194 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-nullitem rotate: false - xy: 833, 228 + xy: 953, 255 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 icon-pause rotate: false - xy: 783, 188 + xy: 569, 194 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-pencil rotate: false - xy: 456, 142 + xy: 456, 124 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-pencil-small rotate: false - xy: 255, 49 + xy: 911, 289 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-pick rotate: false - xy: 456, 124 + xy: 951, 335 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-play rotate: false - xy: 404, 69 + xy: 581, 192 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-play-2 rotate: false - xy: 239, 33 + xy: 927, 289 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-players rotate: false - xy: 399, 53 + xy: 593, 192 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-power rotate: false - xy: 486, 197 + xy: 605, 192 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-production rotate: false - xy: 498, 197 + xy: 617, 192 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-quit rotate: false - xy: 271, 49 + xy: 943, 301 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-redo rotate: false - xy: 951, 335 + xy: 969, 335 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-refresh rotate: false - xy: 255, 33 + xy: 959, 301 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-rename rotate: false - xy: 287, 49 + xy: 975, 301 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-resize rotate: false - xy: 969, 335 + xy: 987, 335 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-rotate rotate: false - xy: 271, 33 + xy: 991, 301 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-rotate-arrow rotate: false - xy: 303, 49 + xy: 943, 285 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-rotate-left rotate: false - xy: 287, 33 + xy: 959, 285 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-rotate-right rotate: false - xy: 319, 49 + xy: 975, 285 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-save rotate: false - xy: 303, 33 + xy: 991, 285 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-save-image rotate: false - xy: 987, 335 + xy: 951, 317 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-save-map rotate: false - xy: 951, 317 + xy: 969, 317 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-settings rotate: false - xy: 510, 197 + xy: 629, 192 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-terrain rotate: false - xy: 969, 317 + xy: 987, 317 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-tools rotate: false - xy: 335, 49 + xy: 191, 47 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-touch rotate: false - xy: 522, 197 + xy: 641, 192 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-touchDelete rotate: false - xy: 534, 197 + xy: 653, 192 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-trash rotate: false - xy: 319, 33 + xy: 191, 31 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-trash-16 rotate: false - xy: 987, 317 + xy: 177, 117 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-trello rotate: false - xy: 351, 49 + xy: 207, 49 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-tutorial rotate: false - xy: 335, 33 + xy: 207, 33 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-undo rotate: false - xy: 177, 117 + xy: 195, 117 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-units rotate: false - xy: 484, 185 + xy: 665, 192 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-unlocks rotate: false - xy: 367, 49 + xy: 223, 49 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-weapon rotate: false - xy: 496, 185 + xy: 255, 25 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-wiki rotate: false - xy: 351, 33 + xy: 223, 33 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-zoom rotate: false - xy: 195, 117 + xy: 213, 117 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-zoom-small rotate: false - xy: 383, 49 + xy: 239, 49 size: 14, 14 orig: 14, 14 offset: 0, 0 @@ -6146,21 +6146,21 @@ window-empty index: -1 dagger rotate: false - xy: 849, 310 + xy: 849, 296 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 drone rotate: false - xy: 905, 307 + xy: 283, 51 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 unit-icon-drone rotate: false - xy: 905, 307 + xy: 283, 51 size: 12, 12 orig: 12, 12 offset: 0, 0 @@ -6181,14 +6181,14 @@ unit-icon-fabricator index: -1 interceptor rotate: false - xy: 919, 293 + xy: 325, 37 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 unit-icon-interceptor rotate: false - xy: 919, 293 + xy: 325, 37 size: 12, 12 orig: 12, 12 offset: 0, 0 @@ -6209,28 +6209,28 @@ unit-icon-monsoon index: -1 power-cell rotate: false - xy: 367, 33 + xy: 239, 33 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 titan rotate: false - xy: 319, 99 + xy: 301, 81 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 titan-base rotate: false - xy: 301, 81 + xy: 337, 99 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 titan-leg rotate: false - xy: 337, 99 + xy: 319, 81 size: 16, 16 orig: 16, 16 offset: 0, 0 @@ -6244,35 +6244,35 @@ blaster-equip index: -1 chain-blaster-equip rotate: false - xy: 383, 35 + xy: 849, 310 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 flakgun-equip rotate: false - xy: 933, 307 + xy: 297, 51 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 flamethrower-equip rotate: false - xy: 863, 293 + xy: 297, 37 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 missiles-equip rotate: false - xy: 989, 289 + xy: 395, 51 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 shockgun-equip rotate: false - xy: 227, 19 + xy: 1005, 339 size: 12, 12 orig: 12, 12 offset: 0, 0 diff --git a/core/assets/sprites/sprites.png b/core/assets/sprites/sprites.png index c40aa4cc79..54fba77265 100644 Binary files a/core/assets/sprites/sprites.png and b/core/assets/sprites/sprites.png differ diff --git a/core/src/io/anuke/mindustry/content/Recipes.java b/core/src/io/anuke/mindustry/content/Recipes.java index 37ec9de4a1..8f07cc1bd6 100644 --- a/core/src/io/anuke/mindustry/content/Recipes.java +++ b/core/src/io/anuke/mindustry/content/Recipes.java @@ -24,8 +24,8 @@ public class Recipes implements ContentList{ new Recipe(defense, DefenseBlocks.thoriumWallLarge, new ItemStack(Items.thorium, 12 * 4)); //TODO will be added once sprites are ready - //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.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)); diff --git a/core/src/io/anuke/mindustry/content/blocks/DefenseBlocks.java b/core/src/io/anuke/mindustry/content/blocks/DefenseBlocks.java index 0f5d910132..f9134df68b 100644 --- a/core/src/io/anuke/mindustry/content/blocks/DefenseBlocks.java +++ b/core/src/io/anuke/mindustry/content/blocks/DefenseBlocks.java @@ -6,7 +6,6 @@ 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.PhaseWall; public class DefenseBlocks extends BlockList implements ContentList{ public static Block copperWall, copperWallLarge, compositeWall, compositeWallLarge, thoriumWall, thoriumWallLarge, door, doorLarge, deflectorwall, deflectorwalllarge, @@ -52,14 +51,13 @@ public class DefenseBlocks extends BlockList implements ContentList{ size = 2; }}; - phaseWall = new PhaseWall("phase-wall"){{ + phaseWall = new DeflectorWall("phase-wall"){{ health = 150 * wallHealthMultiplier; }}; - phaseWallLarge = new PhaseWall("phase-wall-large"){{ + phaseWallLarge = new DeflectorWall("phase-wall-large"){{ health = 150 * 4 * wallHealthMultiplier; size = 2; - regenSpeed = 0.5f; }}; door = new Door("door"){{ 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 c8c72c9439..d1a2bd9851 100644 --- a/core/src/io/anuke/mindustry/world/blocks/defense/DeflectorWall.java +++ b/core/src/io/anuke/mindustry/world/blocks/defense/DeflectorWall.java @@ -17,9 +17,9 @@ import io.anuke.ucore.util.Physics; import static io.anuke.mindustry.Vars.tilesize; public class DeflectorWall extends Wall{ - static final float hitTime = 10f; + public static final float hitTime = 10f; - protected float maxDamageDeflect = 5f; + protected float maxDamageDeflect = 10f; protected Rectangle rect = new Rectangle(); public DeflectorWall(String name){ @@ -81,7 +81,7 @@ public class DeflectorWall extends Wall{ return new DeflectorEntity(); } - static class DeflectorEntity extends TileEntity{ + public static class DeflectorEntity extends TileEntity{ public float hit; } } diff --git a/core/src/io/anuke/mindustry/world/blocks/defense/PhaseWall.java b/core/src/io/anuke/mindustry/world/blocks/defense/PhaseWall.java index 6127a8b469..311c993897 100644 --- a/core/src/io/anuke/mindustry/world/blocks/defense/PhaseWall.java +++ b/core/src/io/anuke/mindustry/world/blocks/defense/PhaseWall.java @@ -1,10 +1,18 @@ package io.anuke.mindustry.world.blocks.defense; +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; +import io.anuke.ucore.graphics.Draw; import io.anuke.ucore.util.Mathf; +import static io.anuke.mindustry.Vars.tilesize; + public class PhaseWall extends Wall{ protected float regenSpeed = 0.25f; @@ -13,8 +21,39 @@ public class PhaseWall extends Wall{ update = true; } + @Override + public void handleBulletHit(TileEntity entity, Bullet bullet){ + super.handleBulletHit(entity, bullet); + ((DeflectorEntity) entity).hit = 1f; + } + + @Override + public void draw(Tile tile){ + super.draw(tile); + + DeflectorEntity entity = tile.entity(); + + if(entity.hit < 0.0001f) return; + + Graphics.setAdditiveBlending(); + + Draw.color(Color.WHITE); + Draw.alpha(entity.hit * 0.5f); + Draw.rect("blank", tile.drawx(), tile.drawy(), tilesize * size, tilesize * size); + Draw.reset(); + + entity.hit = Mathf.clamp(entity.hit - Timers.delta() / DeflectorWall.hitTime); + + Graphics.setNormalBlending(); + } + @Override public void update(Tile tile){ tile.entity.health = Mathf.clamp(tile.entity.health + regenSpeed * Timers.delta(), 0f, health); } + + @Override + public TileEntity getEntity(){ + return new DeflectorEntity(); + } }