diff --git a/core/assets-raw/sprites/effects/scorch1.png b/core/assets-raw/sprites/effects/scorch1.png new file mode 100644 index 0000000000..70f74ca624 Binary files /dev/null and b/core/assets-raw/sprites/effects/scorch1.png differ diff --git a/core/assets-raw/sprites/effects/scorch2.png b/core/assets-raw/sprites/effects/scorch2.png new file mode 100644 index 0000000000..696f77a9f1 Binary files /dev/null and b/core/assets-raw/sprites/effects/scorch2.png differ diff --git a/core/assets-raw/sprites/effects/scorch3.png b/core/assets-raw/sprites/effects/scorch3.png new file mode 100644 index 0000000000..76725325de Binary files /dev/null and b/core/assets-raw/sprites/effects/scorch3.png differ diff --git a/core/assets-raw/sprites/effects/scorch4.png b/core/assets-raw/sprites/effects/scorch4.png new file mode 100644 index 0000000000..908ac88324 Binary files /dev/null and b/core/assets-raw/sprites/effects/scorch4.png differ diff --git a/core/assets-raw/sprites/effects/scorch5.png b/core/assets-raw/sprites/effects/scorch5.png new file mode 100644 index 0000000000..09bc0c4a01 Binary files /dev/null and b/core/assets-raw/sprites/effects/scorch5.png differ diff --git a/core/assets/sprites/sprites.atlas b/core/assets/sprites/sprites.atlas index 3caf351d3b..204fa32e3a 100644 --- a/core/assets/sprites/sprites.atlas +++ b/core/assets/sprites/sprites.atlas @@ -13,28 +13,28 @@ background index: -1 conveyor-arrow rotate: false - xy: 555, 101 + xy: 817, 361 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 laserconveyor-arrow rotate: false - xy: 787, 391 + xy: 697, 329 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 laserconveyor-bridge rotate: false - xy: 797, 401 + xy: 697, 319 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 laserconveyor-end rotate: false - xy: 807, 411 + xy: 707, 329 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -90,35 +90,35 @@ blast-drill-top index: -1 carbide-drill rotate: false - xy: 505, 101 + xy: 807, 381 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 carbide-drill-rotator rotate: false - xy: 525, 111 + xy: 817, 391 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 carbide-drill-top rotate: false - xy: 515, 101 + xy: 827, 393 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 laser-drill rotate: false - xy: 315, 81 + xy: 333, 81 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 laser-drill-rotator rotate: false - xy: 333, 81 + xy: 333, 63 size: 16, 16 orig: 16, 16 offset: 0, 0 @@ -188,49 +188,49 @@ plasma-drill-top index: -1 tungsten-drill rotate: false - xy: 847, 355 + xy: 736, 268 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 tungsten-drill-rotator rotate: false - xy: 837, 343 + xy: 746, 268 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 tungsten-drill-top rotate: false - xy: 847, 345 + xy: 756, 268 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 water-extractor rotate: false - xy: 351, 63 + xy: 261, 37 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 water-extractor-liquid rotate: false - xy: 369, 63 + xy: 279, 43 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 water-extractor-rotator rotate: false - xy: 387, 63 + xy: 297, 45 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 water-extractor-top rotate: false - xy: 405, 63 + xy: 315, 45 size: 16, 16 orig: 16, 16 offset: 0, 0 @@ -251,595 +251,595 @@ block-icon-blackrock index: -1 blackrockshadow1 rotate: false - xy: 207, 52 + xy: 249, 99 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blackstone1 rotate: false - xy: 249, 99 + xy: 639, 232 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-icon-blackstone rotate: false - xy: 249, 99 + xy: 639, 232 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blackstone2 rotate: false - xy: 187, 8 + xy: 649, 232 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blackstone3 rotate: false - xy: 639, 232 + xy: 659, 233 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blackstoneedge rotate: false - xy: 623, 138 + xy: 655, 243 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 coal2 rotate: false - xy: 545, 111 + xy: 817, 381 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 coal3 rotate: false - xy: 535, 101 + xy: 827, 383 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 dirt2 rotate: false - xy: 565, 101 + xy: 785, 351 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 dirt3 rotate: false - xy: 575, 101 + xy: 785, 341 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 dirtedge rotate: false - xy: 859, 437 + xy: 686, 209 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 grass-cliff-edge rotate: false - xy: 607, 110 + xy: 815, 351 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 grass-cliff-edge-1 rotate: false - xy: 617, 110 + xy: 805, 331 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 grass-cliff-edge-2 rotate: false - xy: 627, 110 + xy: 815, 341 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 grass-cliff-side rotate: false - xy: 637, 110 + xy: 815, 331 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 grass2 rotate: false - xy: 699, 229 + xy: 795, 331 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 grass3 rotate: false - xy: 496, 35 + xy: 805, 341 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 grassedge rotate: false - xy: 915, 439 + xy: 657, 181 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 ice-cliff-edge rotate: false - xy: 615, 100 + xy: 915, 431 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ice-cliff-edge-1 rotate: false - xy: 625, 100 + xy: 925, 431 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ice-cliff-edge-2 rotate: false - xy: 635, 100 + xy: 935, 431 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ice-cliff-side rotate: false - xy: 645, 100 + xy: 945, 431 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ice2 rotate: false - xy: 647, 110 + xy: 895, 431 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ice3 rotate: false - xy: 605, 100 + xy: 905, 431 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 iceedge rotate: false - xy: 929, 439 + xy: 671, 181 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 icerock2 rotate: false - xy: 657, 110 + xy: 955, 423 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 icerockshadow1 rotate: false - xy: 655, 100 + xy: 965, 416 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 rockshadow1 rotate: false - xy: 655, 100 + xy: 965, 416 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 icerockshadow2 rotate: false - xy: 641, 204 + xy: 975, 416 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 rockshadow2 rotate: false - xy: 641, 204 + xy: 975, 416 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 lavaedge rotate: false - xy: 943, 439 + xy: 685, 181 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 lead2 rotate: false - xy: 827, 423 + xy: 717, 329 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 lead3 rotate: false - xy: 777, 381 + xy: 707, 319 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 metalfloor2 rotate: false - xy: 827, 413 + xy: 727, 319 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 metalfloor3 rotate: false - xy: 777, 371 + xy: 727, 309 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 metalfloor4 rotate: false - xy: 787, 371 + xy: 737, 328 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 metalfloor5 rotate: false - xy: 797, 381 + xy: 737, 318 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 metalfloor6 rotate: false - xy: 807, 391 + xy: 747, 328 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 metalflooredge rotate: false - xy: 325, 33 + xy: 653, 110 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 oiledge rotate: false - xy: 339, 33 + xy: 827, 435 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 rock2 rotate: false - xy: 827, 393 + xy: 767, 310 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 sand-cliff-edge rotate: false - xy: 827, 383 + xy: 787, 311 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 sand-cliff-edge-1 rotate: false - xy: 807, 361 + xy: 797, 321 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 sand-cliff-edge-2 rotate: false - xy: 817, 371 + xy: 797, 311 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 sand-cliff-side rotate: false - xy: 827, 373 + xy: 807, 321 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 sand2 rotate: false - xy: 807, 371 + xy: 777, 310 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 sand3 rotate: false - xy: 817, 381 + xy: 787, 321 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 sandedge rotate: false - xy: 353, 33 + xy: 841, 437 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 shrubshadow rotate: false - xy: 837, 403 + xy: 706, 289 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 snow-cliff-edge rotate: false - xy: 837, 363 + xy: 726, 299 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 snow-cliff-edge-1 rotate: false - xy: 847, 425 + xy: 716, 279 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 snow-cliff-edge-2 rotate: false - xy: 847, 415 + xy: 726, 289 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 snow-cliff-side rotate: false - xy: 847, 405 + xy: 726, 279 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 snow2 rotate: false - xy: 837, 383 + xy: 706, 279 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 snow3 rotate: false - xy: 837, 373 + xy: 716, 289 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 snowedge rotate: false - xy: 381, 33 + xy: 869, 437 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 spaceedge rotate: false - xy: 395, 33 + xy: 449, 122 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 stone-cliff-edge rotate: false - xy: 847, 375 + xy: 746, 298 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 stone-cliff-edge-1 rotate: false - xy: 847, 365 + xy: 746, 288 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 stone-cliff-edge-2 rotate: false - xy: 787, 351 + xy: 756, 298 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 stone-cliff-side rotate: false - xy: 787, 341 + xy: 756, 288 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 stone2 rotate: false - xy: 847, 395 + xy: 736, 298 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 stone3 rotate: false - xy: 847, 385 + xy: 736, 288 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 stoneedge rotate: false - xy: 409, 33 + xy: 435, 121 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 thorium2 rotate: false - xy: 797, 351 + xy: 736, 278 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 thorium3 rotate: false - xy: 797, 341 + xy: 746, 278 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 titanium2 rotate: false - xy: 807, 351 + xy: 756, 278 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 titanium3 rotate: false - xy: 807, 341 + xy: 706, 269 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 tungsten2 rotate: false - xy: 827, 343 + xy: 715, 259 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 tungsten3 rotate: false - xy: 837, 353 + xy: 725, 259 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 water-cliff-edge rotate: false - xy: 725, 339 + xy: 755, 258 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 water-cliff-edge-1 rotate: false - xy: 859, 427 + xy: 713, 249 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 water-cliff-edge-2 rotate: false - xy: 869, 427 + xy: 713, 239 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 water-cliff-side rotate: false - xy: 857, 417 + xy: 723, 249 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 wateredge rotate: false - xy: 253, 41 + xy: 477, 118 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 block-border rotate: false - xy: 489, 65 + xy: 955, 433 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-elevation rotate: false - xy: 489, 55 + xy: 533, 99 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 combustion-generator-top rotate: false - xy: 489, 55 + xy: 533, 99 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-middle rotate: false - xy: 453, 16 + xy: 827, 413 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 pump-liquid rotate: false - xy: 453, 16 + xy: 827, 413 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-slope rotate: false - xy: 463, 26 + xy: 777, 361 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 border rotate: false - xy: 453, 6 + xy: 787, 371 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 conduit-liquid rotate: false - xy: 545, 101 + xy: 817, 371 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 cross-1 rotate: false - xy: 575, 111 + xy: 827, 363 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 cross-2 rotate: false - xy: 381, 99 + xy: 399, 99 size: 16, 16 orig: 16, 16 offset: 0, 0 @@ -860,7 +860,7 @@ cross-4 index: -1 enemyspawn rotate: false - xy: 585, 98 + xy: 795, 341 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -874,49 +874,49 @@ nuclearreactor-shadow index: -1 place-arrow rotate: false - xy: 817, 401 + xy: 747, 318 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 playerspawn rotate: false - xy: 827, 403 + xy: 757, 328 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ripples rotate: false - xy: 477, 60 + xy: 535, 109 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 rubble-1-0 rotate: false - xy: 261, 55 + xy: 387, 63 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 rubble-1-1 rotate: false - xy: 279, 61 + xy: 405, 81 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 rubble-2-0 rotate: false - xy: 297, 63 + xy: 405, 63 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 rubble-2-1 rotate: false - xy: 315, 63 + xy: 423, 81 size: 16, 16 orig: 16, 16 offset: 0, 0 @@ -937,7 +937,7 @@ rubble-3-1 index: -1 shadow-1 rotate: false - xy: 451, 36 + xy: 773, 330 size: 10, 10 orig: 10, 10 offset: 0, 0 @@ -979,7 +979,7 @@ shadow-6 index: -1 shadow-round-1 rotate: false - xy: 463, 36 + xy: 499, 97 size: 10, 10 orig: 10, 10 offset: 0, 0 @@ -993,105 +993,105 @@ shadow-round-2 index: -1 bridgeconduit-arrow rotate: false - xy: 463, 16 + xy: 797, 381 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 bridgeconduit-bridge rotate: false - xy: 463, 6 + xy: 807, 391 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 bridgeconduit-end rotate: false - xy: 495, 110 + xy: 817, 401 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 bridgeconveyor-arrow rotate: false - xy: 495, 100 + xy: 827, 403 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 bridgeconveyor-bridge rotate: false - xy: 505, 111 + xy: 787, 361 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 bridgeconveyor-end rotate: false - xy: 515, 111 + xy: 797, 371 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 conduit-bottom rotate: false - xy: 555, 111 + xy: 807, 361 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 conduit-top rotate: false - xy: 565, 111 + xy: 827, 373 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 laserconduit-arrow rotate: false - xy: 797, 411 + xy: 425, 27 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 laserconduit-bridge rotate: false - xy: 807, 421 + xy: 435, 27 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 laserconduit-end rotate: false - xy: 777, 391 + xy: 445, 27 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 liquidrouter rotate: false - xy: 787, 381 + xy: 717, 319 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 liquidrouter-bottom rotate: false - xy: 797, 391 + xy: 707, 309 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 liquidrouter-liquid rotate: false - xy: 807, 401 + xy: 717, 309 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 liquidrouter-top rotate: false - xy: 817, 411 + xy: 727, 329 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -1119,14 +1119,14 @@ liquidtank-top index: -1 pulseconduit-bottom rotate: false - xy: 777, 361 + xy: 757, 318 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 pulseconduit-top rotate: false - xy: 787, 361 + xy: 737, 308 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -1231,7 +1231,7 @@ nuclear-reactor-lights index: -1 rtg-generator-top rotate: false - xy: 797, 361 + xy: 777, 320 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -1301,168 +1301,168 @@ biomattercompressor index: -1 biomattercompressor-frame0 rotate: false - xy: 197, 34 + xy: 255, 109 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 biomattercompressor-frame1 rotate: false - xy: 197, 16 + xy: 463, 132 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 biomattercompressor-frame2 rotate: false - xy: 255, 109 + xy: 481, 132 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 biomattercompressor-liquid rotate: false - xy: 463, 132 + xy: 499, 139 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 biomattercompressor-top rotate: false - xy: 481, 132 + xy: 517, 139 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 blast-mixer rotate: false - xy: 499, 139 + xy: 535, 139 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 block-icon-blast-mixer rotate: false - xy: 499, 139 + xy: 535, 139 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 centrifuge-liquid rotate: false - xy: 345, 99 + xy: 363, 99 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 cryofluidmixer-bottom rotate: false - xy: 535, 121 + xy: 553, 121 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 cryofluidmixer-liquid rotate: false - xy: 553, 121 + xy: 571, 121 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 cryofluidmixer-top rotate: false - xy: 571, 121 + xy: 589, 136 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 cultivator rotate: false - xy: 589, 136 + xy: 589, 118 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 cultivator-middle rotate: false - xy: 589, 118 + xy: 607, 120 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 cultivator-top rotate: false - xy: 607, 120 + xy: 625, 124 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 extractor rotate: false - xy: 595, 98 + xy: 805, 351 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 lavasmelter rotate: false - xy: 817, 421 + xy: 697, 309 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 plasteel-compressor-top rotate: false - xy: 369, 81 + xy: 351, 63 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 poweralloysmelter-top rotate: false - xy: 387, 81 + xy: 369, 81 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 powersmelter-top rotate: false - xy: 405, 81 + xy: 369, 63 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 silicon-smelter-top rotate: false - xy: 405, 81 + xy: 369, 63 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 pulverizer rotate: false - xy: 797, 371 + xy: 747, 308 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 pulverizer-rotator rotate: false - xy: 807, 381 + xy: 757, 308 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 separator-liquid rotate: false - xy: 817, 361 + xy: 807, 311 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 siliconextractor rotate: false - xy: 837, 393 + xy: 716, 299 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -1476,21 +1476,21 @@ core-open index: -1 block-1 rotate: false - xy: 489, 75 + xy: 955, 443 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-2 rotate: false - xy: 517, 139 + xy: 553, 139 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 block-2-top rotate: false - xy: 535, 139 + xy: 571, 139 size: 16, 16 orig: 16, 16 offset: 0, 0 @@ -1539,35 +1539,35 @@ arc-heat index: -1 crux rotate: false - xy: 399, 99 + xy: 417, 99 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 crux-heat rotate: false - xy: 417, 99 + xy: 499, 121 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 crux-panel-left rotate: false - xy: 499, 121 + xy: 517, 121 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 crux-panel-right rotate: false - xy: 517, 121 + xy: 535, 121 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 duo rotate: false - xy: 595, 108 + xy: 785, 331 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -1588,28 +1588,28 @@ spectre index: -1 hail rotate: false - xy: 267, 43 + xy: 463, 106 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 scatter rotate: false - xy: 267, 43 + xy: 463, 106 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 lancer rotate: false - xy: 465, 60 + xy: 511, 109 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 lancer-heat rotate: false - xy: 477, 72 + xy: 523, 109 size: 10, 10 orig: 10, 10 offset: 0, 0 @@ -1623,70 +1623,70 @@ meltdown index: -1 scatter-heat rotate: false - xy: 453, 48 + xy: 547, 109 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 scorch rotate: false - xy: 465, 48 + xy: 559, 109 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 scorch-shoot rotate: false - xy: 477, 48 + xy: 571, 109 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 swarmer rotate: false - xy: 333, 63 + xy: 423, 63 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 wave rotate: false - xy: 423, 63 + xy: 333, 45 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 wave-liquid rotate: false - xy: 279, 43 + xy: 351, 45 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 dronefactory-top rotate: false - xy: 643, 120 + xy: 737, 426 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 walkerfactory-top rotate: false - xy: 643, 120 + xy: 737, 426 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 dronefactory-top-open rotate: false - xy: 633, 214 + xy: 755, 430 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 walkerfactory-top-open rotate: false - xy: 633, 214 + xy: 755, 430 size: 16, 16 orig: 16, 16 offset: 0, 0 @@ -1707,28 +1707,28 @@ ship-factory index: -1 reconstructor-open rotate: false - xy: 423, 81 + xy: 387, 81 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 repairpoint-turret rotate: false - xy: 817, 391 + xy: 767, 320 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 door-large-open rotate: false - xy: 625, 120 + xy: 643, 124 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 door-open rotate: false - xy: 585, 108 + xy: 795, 351 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -1749,7 +1749,7 @@ beam-end index: -1 blank rotate: false - xy: 486, 45 + xy: 566, 287 size: 1, 1 orig: 1, 1 offset: 0, 0 @@ -1777,21 +1777,21 @@ casing index: -1 clear rotate: false - xy: 566, 287 + xy: 229, 169 size: 1, 1 orig: 1, 1 offset: 0, 0 index: -1 enemyarrow rotate: false - xy: 649, 232 + xy: 883, 430 size: 8, 7 orig: 8, 7 offset: 0, 0 index: -1 error rotate: false - xy: 887, 439 + xy: 672, 195 size: 12, 12 orig: 12, 12 offset: 0, 0 @@ -1831,6 +1831,41 @@ minelaser-end orig: 18, 18 offset: 0, 0 index: -1 +scorch1 + rotate: false + xy: 197, 25 + size: 7, 25 + orig: 7, 25 + offset: 0, 0 + index: -1 +scorch2 + rotate: false + xy: 623, 179 + size: 7, 25 + orig: 7, 25 + offset: 0, 0 + index: -1 +scorch3 + rotate: false + xy: 623, 152 + size: 7, 25 + orig: 7, 25 + offset: 0, 0 + index: -1 +scorch4 + rotate: false + xy: 633, 205 + size: 7, 25 + orig: 7, 25 + offset: 0, 0 + index: -1 +scorch5 + rotate: false + xy: 632, 178 + size: 7, 25 + orig: 7, 25 + offset: 0, 0 + index: -1 shell rotate: false xy: 646, 258 @@ -1840,14 +1875,14 @@ shell index: -1 shell-back rotate: false - xy: 475, 37 + xy: 511, 98 size: 9, 9 orig: 9, 9 offset: 0, 0 index: -1 shot rotate: false - xy: 837, 413 + xy: 706, 299 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -1861,7 +1896,7 @@ transfer index: -1 transfer-arrow rotate: false - xy: 817, 351 + xy: 716, 269 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -1875,14 +1910,14 @@ transfer-end index: -1 block-icon-arc rotate: false - xy: 553, 139 + xy: 705, 349 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 block-icon-biomattercompressor rotate: false - xy: 571, 139 + xy: 632, 160 size: 16, 16 orig: 16, 16 offset: 0, 0 @@ -1896,112 +1931,112 @@ block-icon-blast-drill index: -1 block-icon-bridgeconduit rotate: false - xy: 489, 45 + xy: 543, 99 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 bridgeconduit rotate: false - xy: 489, 45 + xy: 543, 99 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-icon-bridgeconveyor rotate: false - xy: 486, 35 + xy: 553, 99 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 bridgeconveyor rotate: false - xy: 486, 35 + xy: 553, 99 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-icon-carbide-drill rotate: false - xy: 659, 231 + xy: 563, 99 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-icon-carbide-wall rotate: false - xy: 669, 229 + xy: 573, 99 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 carbide-wall rotate: false - xy: 669, 229 + xy: 573, 99 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-icon-carbide-wall-large rotate: false - xy: 623, 188 + xy: 723, 367 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 carbide-wall-large rotate: false - xy: 623, 188 + xy: 723, 367 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 block-icon-centrifuge rotate: false - xy: 623, 170 + xy: 723, 349 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 centrifuge rotate: false - xy: 623, 170 + xy: 723, 349 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 block-icon-combustion-generator rotate: false - xy: 679, 229 + xy: 583, 108 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 combustion-generator rotate: false - xy: 679, 229 + xy: 583, 108 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-icon-conduit rotate: false - xy: 689, 229 + xy: 593, 108 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-icon-conveyor rotate: false - xy: 263, 31 + xy: 583, 98 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 conveyor rotate: false - xy: 263, 31 + xy: 583, 98 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -2022,154 +2057,154 @@ core index: -1 block-icon-cryofluidmixer rotate: false - xy: 623, 152 + xy: 679, 321 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 block-icon-cultivator rotate: false - xy: 705, 349 + xy: 679, 303 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 block-icon-deepwater rotate: false - xy: 263, 21 + xy: 593, 98 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 deepwater rotate: false - xy: 263, 21 + xy: 593, 98 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-icon-deflector-wall rotate: false - xy: 263, 11 + xy: 603, 108 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 deflector-wall rotate: false - xy: 263, 11 + xy: 603, 108 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 phase-wall rotate: false - xy: 263, 11 + xy: 603, 108 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-icon-phase-wall rotate: false - xy: 263, 11 + xy: 603, 108 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-icon-deflector-wall-large rotate: false - xy: 723, 367 + xy: 273, 109 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 deflector-wall-large rotate: false - xy: 723, 367 + xy: 273, 109 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 phase-wall-large rotate: false - xy: 723, 367 + xy: 273, 109 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 block-icon-phase-wall-large rotate: false - xy: 723, 367 + xy: 273, 109 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 block-icon-dirt rotate: false - xy: 263, 1 + xy: 603, 98 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 dirt1 rotate: false - xy: 263, 1 + xy: 603, 98 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-icon-door rotate: false - xy: 273, 33 + xy: 613, 110 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 door rotate: false - xy: 273, 33 + xy: 613, 110 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-icon-door-large rotate: false - xy: 723, 349 + xy: 291, 117 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 door-large rotate: false - xy: 723, 349 + xy: 291, 117 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 block-icon-dronefactory rotate: false - xy: 679, 321 + xy: 309, 117 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 block-icon-droppoint rotate: false - xy: 273, 23 + xy: 613, 100 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 droppoint rotate: false - xy: 273, 23 + xy: 613, 100 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-icon-duo rotate: false - xy: 283, 33 + xy: 623, 100 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -2190,112 +2225,112 @@ block-icon-fusion-reactor index: -1 block-icon-grass rotate: false - xy: 273, 13 + xy: 633, 100 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 grass1 rotate: false - xy: 273, 13 + xy: 633, 100 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-icon-hail rotate: false - xy: 283, 23 + xy: 643, 100 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-icon-ice rotate: false - xy: 273, 3 + xy: 653, 100 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ice1 rotate: false - xy: 273, 3 + xy: 653, 100 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-icon-icerock rotate: false - xy: 283, 13 + xy: 663, 100 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 icerock1 rotate: false - xy: 283, 13 + xy: 663, 100 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-icon-incinerator rotate: false - xy: 283, 3 + xy: 297, 35 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 incinerator rotate: false - xy: 283, 3 + xy: 297, 35 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-icon-itemsource rotate: false - xy: 293, 23 + xy: 307, 35 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 itemsource rotate: false - xy: 293, 23 + xy: 307, 35 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-icon-itemvoid rotate: false - xy: 293, 13 + xy: 317, 35 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 itemvoid rotate: false - xy: 293, 13 + xy: 317, 35 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-icon-junction rotate: false - xy: 303, 23 + xy: 327, 35 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 junction rotate: false - xy: 303, 23 + xy: 327, 35 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-icon-lancer rotate: false - xy: 679, 303 + xy: 327, 117 size: 16, 16 orig: 16, 16 offset: 0, 0 @@ -2316,84 +2351,84 @@ large-solar-panel index: -1 block-icon-laser-drill rotate: false - xy: 273, 109 + xy: 345, 117 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 block-icon-laserconduit rotate: false - xy: 293, 3 + xy: 337, 35 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 laserconduit rotate: false - xy: 293, 3 + xy: 337, 35 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-icon-laserconveyor rotate: false - xy: 303, 13 + xy: 347, 35 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 laserconveyor rotate: false - xy: 303, 13 + xy: 347, 35 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-icon-lava rotate: false - xy: 313, 23 + xy: 357, 35 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 lava rotate: false - xy: 313, 23 + xy: 357, 35 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-icon-liquidjunction rotate: false - xy: 303, 3 + xy: 295, 25 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 liquidjunction rotate: false - xy: 303, 3 + xy: 295, 25 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-icon-liquidrouter rotate: false - xy: 313, 13 + xy: 305, 25 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-icon-liquidsource rotate: false - xy: 323, 23 + xy: 315, 25 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 liquidsource rotate: false - xy: 323, 23 + xy: 315, 25 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -2428,14 +2463,14 @@ core-top index: -1 block-icon-mechanical-pump rotate: false - xy: 313, 3 + xy: 325, 25 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 mechanical-pump rotate: false - xy: 313, 3 + xy: 325, 25 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -2449,42 +2484,42 @@ block-icon-meltdown index: -1 block-icon-melter rotate: false - xy: 323, 13 + xy: 335, 25 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 melter rotate: false - xy: 323, 13 + xy: 335, 25 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-icon-metalfloor rotate: false - xy: 333, 23 + xy: 345, 25 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 metalfloor1 rotate: false - xy: 333, 23 + xy: 345, 25 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-icon-multiplexer rotate: false - xy: 291, 117 + xy: 363, 117 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 multiplexer rotate: false - xy: 291, 117 + xy: 363, 117 size: 16, 16 orig: 16, 16 offset: 0, 0 @@ -2505,14 +2540,14 @@ nuclear-reactor index: -1 block-icon-oil rotate: false - xy: 323, 3 + xy: 355, 25 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 oil rotate: false - xy: 323, 3 + xy: 355, 25 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -2526,203 +2561,238 @@ block-icon-oil-extractor index: -1 block-icon-oilrefinery rotate: false - xy: 333, 13 + xy: 369, 37 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 oilrefinery rotate: false - xy: 333, 13 + xy: 369, 37 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-icon-ore-coal-grass rotate: false - xy: 343, 23 + xy: 379, 37 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 coal1 rotate: false - xy: 343, 23 + xy: 379, 37 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-icon-ore-coal-ice rotate: false - xy: 343, 23 + xy: 379, 37 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-icon-ore-coal-sand rotate: false - xy: 343, 23 + xy: 379, 37 + size: 8, 8 + orig: 8, 8 + offset: 0, 0 + index: -1 +block-icon-ore-coal-snow + rotate: false + xy: 379, 37 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-icon-ore-coal-stone rotate: false - xy: 343, 23 + xy: 379, 37 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-icon-ore-lead-grass rotate: false - xy: 333, 3 + xy: 389, 37 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 lead1 rotate: false - xy: 333, 3 + xy: 389, 37 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-icon-ore-lead-ice rotate: false - xy: 333, 3 + xy: 389, 37 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-icon-ore-lead-sand rotate: false - xy: 333, 3 + xy: 389, 37 + size: 8, 8 + orig: 8, 8 + offset: 0, 0 + index: -1 +block-icon-ore-lead-snow + rotate: false + xy: 389, 37 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-icon-ore-lead-stone rotate: false - xy: 333, 3 + xy: 389, 37 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-icon-ore-thorium-grass rotate: false - xy: 343, 13 + xy: 399, 37 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 thorium1 rotate: false - xy: 343, 13 + xy: 399, 37 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-icon-ore-thorium-ice rotate: false - xy: 343, 13 + xy: 399, 37 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-icon-ore-thorium-sand rotate: false - xy: 343, 13 + xy: 399, 37 + size: 8, 8 + orig: 8, 8 + offset: 0, 0 + index: -1 +block-icon-ore-thorium-snow + rotate: false + xy: 399, 37 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-icon-ore-thorium-stone rotate: false - xy: 343, 13 + xy: 399, 37 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-icon-ore-titanium-grass rotate: false - xy: 353, 23 + xy: 409, 37 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 titanium1 rotate: false - xy: 353, 23 + xy: 409, 37 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-icon-ore-titanium-ice rotate: false - xy: 353, 23 + xy: 409, 37 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-icon-ore-titanium-sand rotate: false - xy: 353, 23 + xy: 409, 37 + size: 8, 8 + orig: 8, 8 + offset: 0, 0 + index: -1 +block-icon-ore-titanium-snow + rotate: false + xy: 409, 37 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-icon-ore-titanium-stone rotate: false - xy: 353, 23 + xy: 409, 37 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-icon-ore-tungsten-grass rotate: false - xy: 343, 3 + xy: 419, 37 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 tungsten1 rotate: false - xy: 343, 3 + xy: 419, 37 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-icon-ore-tungsten-ice rotate: false - xy: 343, 3 + xy: 419, 37 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-icon-ore-tungsten-sand rotate: false - xy: 343, 3 + xy: 419, 37 + size: 8, 8 + orig: 8, 8 + offset: 0, 0 + index: -1 +block-icon-ore-tungsten-snow + rotate: false + xy: 419, 37 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-icon-ore-tungsten-stone rotate: false - xy: 343, 3 + xy: 419, 37 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-icon-overflowgate rotate: false - xy: 353, 13 + xy: 429, 37 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 overflowgate rotate: false - xy: 353, 13 + xy: 429, 37 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -2736,140 +2806,140 @@ block-icon-plasma-drill index: -1 block-icon-plasteel-compressor rotate: false - xy: 309, 117 + xy: 381, 117 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 plasteel-compressor rotate: false - xy: 309, 117 + xy: 381, 117 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 block-icon-power-node rotate: false - xy: 363, 23 + xy: 439, 37 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 power-node rotate: false - xy: 363, 23 + xy: 439, 37 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-icon-power-node-large rotate: false - xy: 327, 117 + xy: 399, 117 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 power-node-large rotate: false - xy: 327, 117 + xy: 399, 117 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 block-icon-powerinfinite rotate: false - xy: 353, 3 + xy: 705, 339 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 powerinfinite rotate: false - xy: 353, 3 + xy: 705, 339 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-icon-powervoid rotate: false - xy: 363, 13 + xy: 715, 339 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 powervoid rotate: false - xy: 363, 13 + xy: 715, 339 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-icon-pulseconduit rotate: false - xy: 373, 23 + xy: 725, 339 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-icon-pulverizer rotate: false - xy: 363, 3 + xy: 699, 173 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-icon-reconstructor rotate: false - xy: 345, 117 + xy: 417, 117 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 dronefactory rotate: false - xy: 345, 117 + xy: 417, 117 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 reconstructor rotate: false - xy: 345, 117 + xy: 417, 117 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 walkerfactory rotate: false - xy: 345, 117 + xy: 417, 117 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 block-icon-repairpoint rotate: false - xy: 373, 13 + xy: 767, 420 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 repairpoint rotate: false - xy: 373, 13 + xy: 767, 420 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-icon-resupplypoint rotate: false - xy: 383, 23 + xy: 767, 410 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 resupplypoint rotate: false - xy: 383, 23 + xy: 767, 410 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -2883,399 +2953,399 @@ block-icon-ripple index: -1 block-icon-rock rotate: false - xy: 373, 3 + xy: 767, 400 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 rock1 rotate: false - xy: 373, 3 + xy: 767, 400 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-icon-rotary-pump rotate: false - xy: 363, 117 + xy: 213, 98 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 rotary-pump rotate: false - xy: 363, 117 + xy: 213, 98 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 block-icon-router rotate: false - xy: 383, 13 + xy: 767, 390 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 router rotate: false - xy: 383, 13 + xy: 767, 390 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-icon-rtg-generator rotate: false - xy: 393, 23 + xy: 777, 421 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 rtg-generator rotate: false - xy: 393, 23 + xy: 777, 421 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-icon-sand rotate: false - xy: 383, 3 + xy: 777, 411 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 sand1 rotate: false - xy: 383, 3 + xy: 777, 411 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-icon-scorch rotate: false - xy: 393, 13 + xy: 787, 421 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-icon-separator rotate: false - xy: 403, 23 + xy: 777, 401 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 separator rotate: false - xy: 403, 23 + xy: 777, 401 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-icon-shrub rotate: false - xy: 393, 3 + xy: 787, 411 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 shrub rotate: false - xy: 393, 3 + xy: 787, 411 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-icon-silicon-smelter rotate: false - xy: 381, 117 + xy: 231, 99 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 silicon-smelter rotate: false - xy: 381, 117 + xy: 231, 99 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 block-icon-smelter rotate: false - xy: 403, 13 + xy: 797, 421 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 smelter rotate: false - xy: 403, 13 + xy: 797, 421 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-icon-snow rotate: false - xy: 413, 23 + xy: 777, 391 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 snow1 rotate: false - xy: 413, 23 + xy: 777, 391 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-icon-solar-panel rotate: false - xy: 403, 3 + xy: 787, 401 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 solar-panel rotate: false - xy: 403, 3 + xy: 787, 401 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-icon-sortedunloader rotate: false - xy: 413, 13 + xy: 797, 411 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 sortedunloader rotate: false - xy: 413, 13 + xy: 797, 411 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-icon-sorter rotate: false - xy: 423, 23 + xy: 807, 421 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 sorter rotate: false - xy: 423, 23 + xy: 807, 421 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-icon-space rotate: false - xy: 413, 3 + xy: 817, 421 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 space rotate: false - xy: 413, 3 + xy: 817, 421 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-icon-splitter rotate: false - xy: 423, 13 + xy: 777, 381 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 splitter rotate: false - xy: 423, 13 + xy: 777, 381 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-icon-stone rotate: false - xy: 433, 23 + xy: 787, 391 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 stone1 rotate: false - xy: 433, 23 + xy: 787, 391 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-icon-stoneformer rotate: false - xy: 423, 3 + xy: 797, 401 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 stoneformer rotate: false - xy: 423, 3 + xy: 797, 401 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-icon-swarmer rotate: false - xy: 399, 117 + xy: 207, 80 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 block-icon-thermal-generator rotate: false - xy: 417, 117 + xy: 207, 62 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 thermal-generator rotate: false - xy: 417, 117 + xy: 207, 62 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 block-icon-thermal-pump rotate: false - xy: 213, 98 + xy: 207, 44 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 thermal-pump rotate: false - xy: 213, 98 + xy: 207, 44 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 block-icon-thermite-mixer rotate: false - xy: 231, 99 + xy: 206, 26 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 thermite-mixer rotate: false - xy: 231, 99 + xy: 206, 26 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 block-icon-thorium-wall rotate: false - xy: 433, 13 + xy: 807, 411 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 thorium-wall rotate: false - xy: 433, 13 + xy: 807, 411 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-icon-thorium-wall-large rotate: false - xy: 207, 80 + xy: 632, 142 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 thorium-wall-large rotate: false - xy: 207, 80 + xy: 632, 142 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 block-icon-titanium-conveyor rotate: false - xy: 433, 3 + xy: 777, 371 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 titanium-conveyor rotate: false - xy: 433, 3 + xy: 777, 371 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-icon-tungsten-drill rotate: false - xy: 443, 23 + xy: 787, 381 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-icon-tungsten-wall rotate: false - xy: 443, 13 + xy: 797, 391 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 tungsten-wall rotate: false - xy: 443, 13 + xy: 797, 391 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-icon-tungsten-wall-large rotate: false - xy: 207, 62 + xy: 291, 99 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 tungsten-wall-large rotate: false - xy: 207, 62 + xy: 291, 99 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 block-icon-turbine-generator rotate: false - xy: 291, 99 + xy: 309, 99 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 turbine-generator rotate: false - xy: 291, 99 + xy: 309, 99 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 block-icon-unloader rotate: false - xy: 443, 3 + xy: 807, 401 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 unloader rotate: false - xy: 443, 3 + xy: 807, 401 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -3310,189 +3380,189 @@ warpgate index: -1 block-icon-water rotate: false - xy: 453, 26 + xy: 817, 411 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 water rotate: false - xy: 453, 26 + xy: 817, 411 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-icon-water-extractor rotate: false - xy: 309, 99 + xy: 327, 99 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 block-icon-wave rotate: false - xy: 327, 99 + xy: 345, 99 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 mech-icon-alpha-mech rotate: false - xy: 297, 33 + xy: 625, 110 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 mech-icon-delta-mech rotate: false - xy: 297, 33 + xy: 625, 110 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 mech-icon-omega-mech rotate: false - xy: 297, 33 + xy: 625, 110 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 mech-icon-tau-mech rotate: false - xy: 297, 33 + xy: 625, 110 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 mech-icon-dart-ship rotate: false - xy: 311, 33 + xy: 639, 110 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 mech-icon-halberd-ship rotate: false - xy: 311, 33 + xy: 639, 110 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 mech-icon-javelin-ship rotate: false - xy: 311, 33 + xy: 639, 110 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 mech-icon-trident-ship rotate: false - xy: 311, 33 + xy: 639, 110 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 item-biomatter rotate: false - xy: 641, 184 + xy: 995, 413 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 item-blast-compound rotate: false - xy: 641, 174 + xy: 1005, 413 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 item-carbide rotate: false - xy: 641, 164 + xy: 1015, 413 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 item-coal rotate: false - xy: 641, 154 + xy: 613, 90 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 item-lead rotate: false - xy: 767, 420 + xy: 623, 90 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 item-phase-matter rotate: false - xy: 767, 410 + xy: 633, 90 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 item-plasteel rotate: false - xy: 767, 400 + xy: 643, 90 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 item-sand rotate: false - xy: 767, 390 + xy: 653, 90 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 item-silicon rotate: false - xy: 777, 421 + xy: 663, 90 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 item-stone rotate: false - xy: 787, 421 + xy: 365, 25 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 item-surge-alloy rotate: false - xy: 777, 411 + xy: 375, 27 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 item-thermite rotate: false - xy: 787, 411 + xy: 385, 27 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 item-thorium rotate: false - xy: 797, 421 + xy: 395, 27 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 item-titanium rotate: false - xy: 777, 401 + xy: 405, 27 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 item-tungsten rotate: false - xy: 787, 401 + xy: 415, 27 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -3597,28 +3667,28 @@ scout-leg index: -1 dart-ship rotate: false - xy: 197, 2 + xy: 672, 209 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 halberd-ship rotate: false - xy: 197, 2 + xy: 672, 209 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 javelin-ship rotate: false - xy: 197, 2 + xy: 672, 209 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 trident-ship rotate: false - xy: 197, 2 + xy: 672, 209 size: 12, 12 orig: 12, 12 offset: 0, 0 @@ -3795,7 +3865,7 @@ discord-banner-over index: -1 controller-cursor rotate: false - xy: 363, 99 + xy: 381, 99 size: 16, 16 orig: 16, 16 offset: 0, 0 @@ -3830,56 +3900,56 @@ icon-admin-small index: -1 icon-areaDelete rotate: false - xy: 251, 29 + xy: 475, 106 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-arrow rotate: false - xy: 737, 426 + xy: 773, 431 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-arrow-16 rotate: false - xy: 737, 426 + xy: 773, 431 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-arrow-down rotate: false - xy: 251, 17 + xy: 773, 342 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-arrow-left rotate: false - xy: 251, 5 + xy: 701, 243 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-arrow-right rotate: false - xy: 451, 124 + xy: 701, 231 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-arrow-up rotate: false - xy: 463, 120 + xy: 701, 219 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-back rotate: false - xy: 755, 430 + xy: 791, 431 size: 16, 16 orig: 16, 16 offset: 0, 0 @@ -3893,49 +3963,49 @@ icon-ban index: -1 icon-break rotate: false - xy: 773, 431 + xy: 809, 431 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-cancel rotate: false - xy: 791, 431 + xy: 731, 408 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-chat rotate: false - xy: 475, 120 + xy: 700, 207 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-check rotate: false - xy: 809, 431 + xy: 731, 390 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-crafting rotate: false - xy: 487, 120 + xy: 700, 195 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-cursor rotate: false - xy: 435, 114 + xy: 699, 183 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-defense rotate: false - xy: 435, 102 + xy: 827, 423 size: 10, 10 orig: 10, 10 offset: 0, 0 @@ -3956,7 +4026,7 @@ icon-discord index: -1 icon-distribution rotate: false - xy: 447, 112 + xy: 883, 439 size: 10, 10 orig: 10, 10 offset: 0, 0 @@ -3970,406 +4040,406 @@ icon-donate index: -1 icon-dots rotate: false - xy: 607, 138 + xy: 187, 2 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-editor rotate: false - xy: 297, 47 + xy: 607, 138 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-egg rotate: false - xy: 313, 47 + xy: 369, 47 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-elevation rotate: false - xy: 731, 408 + xy: 225, 80 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-eraser rotate: false - xy: 731, 390 + xy: 225, 62 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-exit rotate: false - xy: 329, 47 + xy: 385, 47 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-file rotate: false - xy: 225, 80 + xy: 225, 44 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-file-image rotate: false - xy: 225, 62 + xy: 224, 26 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-file-text rotate: false - xy: 345, 47 + xy: 401, 47 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-fill rotate: false - xy: 217, 44 + xy: 749, 408 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-floppy rotate: false - xy: 361, 47 + xy: 417, 47 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-floppy-16 rotate: false - xy: 215, 26 + xy: 749, 390 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-folder rotate: false - xy: 377, 47 + xy: 433, 47 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-folder-parent rotate: false - xy: 393, 47 + xy: 279, 27 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-github rotate: false - xy: 409, 47 + xy: 741, 338 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-google-play rotate: false - xy: 425, 47 + xy: 757, 338 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-grid rotate: false - xy: 215, 8 + xy: 741, 372 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-hold rotate: false - xy: 447, 100 + xy: 895, 441 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-holdDelete rotate: false - xy: 459, 108 + xy: 907, 441 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-home rotate: false - xy: 741, 338 + xy: 626, 285 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-host rotate: false - xy: 757, 338 + xy: 624, 269 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-info rotate: false - xy: 471, 108 + xy: 919, 441 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-itch.io rotate: false - xy: 626, 285 + xy: 642, 285 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-items-none rotate: false - xy: 641, 194 + xy: 985, 413 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 icon-line rotate: false - xy: 235, 44 + xy: 741, 354 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-link rotate: false - xy: 624, 269 + xy: 640, 269 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-liquid rotate: false - xy: 483, 108 + xy: 931, 441 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-load rotate: false - xy: 642, 285 + xy: 658, 289 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-load-image rotate: false - xy: 233, 26 + xy: 759, 372 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-load-map rotate: false - xy: 233, 8 + xy: 759, 354 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-loading rotate: false - xy: 749, 408 + xy: 243, 81 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-logic rotate: false - xy: 459, 96 + xy: 943, 441 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-menu rotate: false - xy: 471, 96 + xy: 965, 438 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-menu-large rotate: false - xy: 749, 390 + xy: 243, 63 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-none rotate: false - xy: 483, 96 + xy: 977, 438 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-pause rotate: false - xy: 441, 88 + xy: 989, 435 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-pencil rotate: false - xy: 741, 372 + xy: 243, 45 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-pencil-small rotate: false - xy: 640, 269 + xy: 674, 287 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-pick rotate: false - xy: 741, 354 + xy: 261, 91 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-play rotate: false - xy: 441, 76 + xy: 1001, 435 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-play-2 rotate: false - xy: 658, 289 + xy: 639, 242 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-players rotate: false - xy: 441, 64 + xy: 1013, 435 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-power rotate: false - xy: 441, 52 + xy: 965, 426 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-production rotate: false - xy: 453, 84 + xy: 977, 426 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-quit rotate: false - xy: 674, 287 + xy: 690, 287 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-redo rotate: false - xy: 759, 372 + xy: 261, 73 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-refresh rotate: false - xy: 639, 242 + xy: 642, 216 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-rename rotate: false - xy: 690, 287 + xy: 642, 200 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-resize rotate: false - xy: 759, 354 + xy: 261, 55 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-rotate rotate: false - xy: 658, 273 + xy: 641, 184 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-rotate-arrow rotate: false - xy: 674, 271 + xy: 658, 273 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-rotate-left rotate: false - xy: 690, 271 + xy: 674, 271 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-rotate-right rotate: false - xy: 657, 257 + xy: 690, 271 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-save rotate: false - xy: 655, 241 + xy: 657, 257 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-save-image rotate: false - xy: 243, 81 + xy: 279, 79 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-save-map rotate: false - xy: 243, 63 + xy: 279, 61 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-settings rotate: false - xy: 453, 72 + xy: 989, 423 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-terrain rotate: false - xy: 261, 91 + xy: 297, 81 size: 16, 16 orig: 16, 16 offset: 0, 0 @@ -4383,14 +4453,14 @@ icon-tools index: -1 icon-touch rotate: false - xy: 465, 84 + xy: 1001, 423 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-touchDelete rotate: false - xy: 453, 60 + xy: 1013, 423 size: 10, 10 orig: 10, 10 offset: 0, 0 @@ -4404,63 +4474,63 @@ icon-trash index: -1 icon-trash-16 rotate: false - xy: 261, 73 + xy: 297, 63 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-trello rotate: false - xy: 671, 239 + xy: 669, 239 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-tutorial rotate: false - xy: 687, 239 + xy: 685, 239 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-undo rotate: false - xy: 279, 79 + xy: 315, 81 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-units rotate: false - xy: 465, 72 + xy: 487, 106 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-weapon rotate: false - xy: 477, 84 + xy: 499, 109 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-wiki rotate: false - xy: 827, 433 + xy: 669, 223 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-zoom rotate: false - xy: 297, 81 + xy: 315, 63 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-zoom-small rotate: false - xy: 843, 435 + xy: 685, 223 size: 14, 14 orig: 14, 14 offset: 0, 0 @@ -4531,7 +4601,7 @@ scroll-knob-vertical-black index: -1 selection rotate: false - xy: 229, 169 + xy: 587, 209 size: 1, 1 orig: 1, 1 offset: 0, 0 @@ -4633,42 +4703,42 @@ window-empty index: -1 drone rotate: false - xy: 873, 437 + xy: 658, 195 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 scout rotate: false - xy: 367, 33 + xy: 855, 437 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 vtol rotate: false - xy: 423, 33 + xy: 435, 107 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 vtol-booster-1 rotate: false - xy: 773, 340 + xy: 449, 108 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 vtol-booster-2 rotate: false - xy: 437, 33 + xy: 463, 118 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 vtol-flame rotate: false - xy: 489, 85 + xy: 522, 98 size: 9, 9 orig: 9, 9 offset: 0, 0 @@ -4682,77 +4752,77 @@ beam-equip index: -1 blaster rotate: false - xy: 441, 126 + xy: 659, 223 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blaster-equip rotate: false - xy: 637, 138 + xy: 658, 209 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 clustergun rotate: false - xy: 535, 111 + xy: 797, 361 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 clustergun-equip rotate: false - xy: 525, 101 + xy: 807, 371 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 generic-weapon rotate: false - xy: 901, 439 + xy: 686, 195 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 shockgun rotate: false - xy: 827, 363 + xy: 817, 321 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 shockgun-equip rotate: false - xy: 837, 423 + xy: 817, 311 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 triblaster rotate: false - xy: 827, 353 + xy: 726, 269 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 triblaster-equip rotate: false - xy: 817, 341 + xy: 705, 259 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 vulcan rotate: false - xy: 705, 339 + xy: 735, 258 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 vulcan-equip rotate: false - xy: 715, 339 + xy: 745, 258 size: 8, 8 orig: 8, 8 offset: 0, 0 diff --git a/core/assets/sprites/sprites.png b/core/assets/sprites/sprites.png index 5bf6d44027..2430c625cd 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 1b65008cb9..1de33adebf 100644 --- a/core/src/io/anuke/mindustry/content/Recipes.java +++ b/core/src/io/anuke/mindustry/content/Recipes.java @@ -62,7 +62,7 @@ public class Recipes implements ContentList{ //POWER new Recipe(power, PowerBlocks.powernode, new ItemStack(Items.tungsten, 2), new ItemStack(Items.lead, 6)); - new Recipe(power, PowerBlocks.powernodelarge, new ItemStack(Items.carbide, 5), new ItemStack(Items.lead, 20), new ItemStack(Items.silicon, 6)); + new Recipe(power, PowerBlocks.powernodelarge, new ItemStack(Items.carbide, 10), new ItemStack(Items.lead, 20), new ItemStack(Items.silicon, 6)); new Recipe(power, PowerBlocks.battery, new ItemStack(Items.tungsten, 8), new ItemStack(Items.lead, 30), new ItemStack(Items.silicon, 4)); new Recipe(power, PowerBlocks.batteryLarge, new ItemStack(Items.carbide, 16), new ItemStack(Items.tungsten, 16), new ItemStack(Items.lead, 80), new ItemStack(Items.silicon, 20)); new Recipe(power, PowerBlocks.combustiongenerator, new ItemStack(Items.tungsten, 30), new ItemStack(Items.lead, 30)); diff --git a/core/src/io/anuke/mindustry/entities/Player.java b/core/src/io/anuke/mindustry/entities/Player.java index fdb301885a..1912c3c878 100644 --- a/core/src/io/anuke/mindustry/entities/Player.java +++ b/core/src/io/anuke/mindustry/entities/Player.java @@ -10,6 +10,7 @@ import io.anuke.annotations.Annotations.Loc; import io.anuke.annotations.Annotations.Remote; import io.anuke.mindustry.Vars; import io.anuke.mindustry.entities.effect.ItemDrop; +import io.anuke.mindustry.entities.effect.ScorchDecal; import io.anuke.mindustry.entities.traits.BuilderTrait; import io.anuke.mindustry.entities.traits.CarriableTrait; import io.anuke.mindustry.entities.traits.CarryTrait; @@ -222,6 +223,7 @@ public class Player extends Unit implements BuilderTrait, CarryTrait { float explosiveness = 2f + (player.inventory.hasItem() ? player.inventory.getItem().item.explosiveness * player.inventory.getItem().amount : 0f); float flammability = (player.inventory.hasItem() ? player.inventory.getItem().item.flammability * player.inventory.getItem().amount : 0f); Damage.dynamicExplosion(player.x, player.y, flammability, explosiveness, 0f, player.getSize()/2f, Palette.darkFlame); + ScorchDecal.create(player.x, player.y); Effects.sound("die", player); player.onDeath(); } diff --git a/core/src/io/anuke/mindustry/entities/effect/Rubble.java b/core/src/io/anuke/mindustry/entities/effect/Decal.java similarity index 58% rename from core/src/io/anuke/mindustry/entities/effect/Rubble.java rename to core/src/io/anuke/mindustry/entities/effect/Decal.java index 7b414f9678..762cc480e6 100644 --- a/core/src/io/anuke/mindustry/entities/effect/Rubble.java +++ b/core/src/io/anuke/mindustry/entities/effect/Decal.java @@ -11,17 +11,8 @@ import io.anuke.ucore.util.Mathf; import static io.anuke.mindustry.Vars.groundEffectGroup; /**Class for creating block rubble on the ground.*/ -public class Rubble extends TimedEntity implements BelowLiquidTrait, DrawTrait { +public abstract class Decal extends TimedEntity implements BelowLiquidTrait, DrawTrait { private static final Color color = Color.valueOf("52504e"); - private int size; - - /**Creates a rubble effect at a position. Provide a block size to use.*/ - public static void create(float x, float y, int size){ - Rubble rubble = new Rubble(); - rubble.size = size; - rubble.set(x, y); - rubble.add(); - } @Override public float lifetime() { @@ -30,15 +21,8 @@ public class Rubble extends TimedEntity implements BelowLiquidTrait, DrawTrait { @Override public void draw(){ - String region = "rubble-" + size + "-" + Mathf.randomSeed(id, 0, 1); - - if(!Draw.hasRegion(region)){ - remove(); - return; - } - Draw.color(color.r, color.g, color.b, 1f-Mathf.curve(fin(), 0.98f)); - Draw.rect(region, x, y, Mathf.randomSeed(id, 0, 4) * 90); + drawDecal(); Draw.color(); } @@ -46,4 +30,6 @@ public class Rubble extends TimedEntity implements BelowLiquidTrait, DrawTrait { public EntityGroup targetGroup() { return groundEffectGroup; } + + abstract void drawDecal(); } diff --git a/core/src/io/anuke/mindustry/entities/effect/ItemDrop.java b/core/src/io/anuke/mindustry/entities/effect/ItemDrop.java index 9788aa2d7f..5d538efd35 100644 --- a/core/src/io/anuke/mindustry/entities/effect/ItemDrop.java +++ b/core/src/io/anuke/mindustry/entities/effect/ItemDrop.java @@ -123,7 +123,7 @@ public class ItemDrop extends SolidEntity implements SaveTrait, SyncTrait, DrawT @Override public void draw() { - float size = itemSize * (1f - sinktime/sinkLifetime); + float size = itemSize * (1f - sinktime/sinkLifetime) * (1f-Mathf.curve(fin(), 0.98f)); Tile tile = world.tileWorld(x, y); diff --git a/core/src/io/anuke/mindustry/entities/effect/RubbleDecal.java b/core/src/io/anuke/mindustry/entities/effect/RubbleDecal.java new file mode 100644 index 0000000000..217dc9e62a --- /dev/null +++ b/core/src/io/anuke/mindustry/entities/effect/RubbleDecal.java @@ -0,0 +1,28 @@ +package io.anuke.mindustry.entities.effect; + +import io.anuke.ucore.graphics.Draw; +import io.anuke.ucore.util.Mathf; + +public class RubbleDecal extends Decal { + private int size; + + /**Creates a rubble effect at a position. Provide a block size to use.*/ + public static void create(float x, float y, int size){ + RubbleDecal decal = new RubbleDecal(); + decal.size = size; + decal.set(x, y); + decal.add(); + } + + @Override + public void drawDecal(){ + String region = "rubble-" + size + "-" + Mathf.randomSeed(id, 0, 1); + + if(!Draw.hasRegion(region)){ + remove(); + return; + } + + Draw.rect(region, x, y, Mathf.randomSeed(id, 0, 4) * 90); + } +} diff --git a/core/src/io/anuke/mindustry/entities/effect/ScorchDecal.java b/core/src/io/anuke/mindustry/entities/effect/ScorchDecal.java new file mode 100644 index 0000000000..1ef31e49fc --- /dev/null +++ b/core/src/io/anuke/mindustry/entities/effect/ScorchDecal.java @@ -0,0 +1,41 @@ +package io.anuke.mindustry.entities.effect; + +import com.badlogic.gdx.graphics.g2d.TextureRegion; +import io.anuke.mindustry.world.Tile; +import io.anuke.ucore.graphics.Draw; +import io.anuke.ucore.util.Angles; +import io.anuke.ucore.util.Mathf; + +import static io.anuke.mindustry.Vars.world; + +public class ScorchDecal extends Decal { + private static final int scorches = 5; + private static final TextureRegion[] regions = new TextureRegion[scorches]; + + public static void create(float x, float y){ + if(regions[0] == null){ + for (int i = 0; i < regions.length; i++) { + regions[i] = Draw.region("scorch" + (i+1)); + } + } + + Tile tile = world.tileWorld(x, y); + + if(tile == null || tile.floor().liquidDrop != null) return; + + ScorchDecal decal = new ScorchDecal(); + decal.set(x, y); + decal.add(); + } + + @Override + public void drawDecal(){ + + for (int i = 0; i < 5; i++) { + TextureRegion region = regions[Mathf.randomSeed(id - i, 0, scorches-1)]; + float rotation = Mathf.randomSeed(id + i, 0, 360); + float space = 1.5f + Mathf.randomSeed(id + i + 1, 0, 20)/10f; + Draw.grect(region, x + Angles.trnsx(rotation, space), y + Angles.trnsy(rotation, space), rotation - 90); + } + } +} diff --git a/core/src/io/anuke/mindustry/entities/units/BaseUnit.java b/core/src/io/anuke/mindustry/entities/units/BaseUnit.java index 5726f1042e..e46b208750 100644 --- a/core/src/io/anuke/mindustry/entities/units/BaseUnit.java +++ b/core/src/io/anuke/mindustry/entities/units/BaseUnit.java @@ -8,6 +8,7 @@ import io.anuke.mindustry.entities.TileEntity; import io.anuke.mindustry.entities.Unit; import io.anuke.mindustry.entities.Units; import io.anuke.mindustry.entities.bullet.Bullet; +import io.anuke.mindustry.entities.effect.ScorchDecal; import io.anuke.mindustry.entities.traits.TargetTrait; import io.anuke.mindustry.game.Team; import io.anuke.mindustry.gen.CallEntity; @@ -319,6 +320,7 @@ public abstract class BaseUnit extends Unit{ unit.onSuperDeath(); UnitDrops.dropItems(unit); + ScorchDecal.create(unit.x, unit.y); Effects.effect(ExplosionFx.explosion, unit); Effects.shake(2f, 2f, unit); diff --git a/core/src/io/anuke/mindustry/world/Block.java b/core/src/io/anuke/mindustry/world/Block.java index 54151b87b2..9baa3b3811 100644 --- a/core/src/io/anuke/mindustry/world/Block.java +++ b/core/src/io/anuke/mindustry/world/Block.java @@ -11,8 +11,9 @@ import io.anuke.mindustry.entities.Player; import io.anuke.mindustry.entities.TileEntity; import io.anuke.mindustry.entities.Unit; import io.anuke.mindustry.entities.bullet.Bullet; +import io.anuke.mindustry.entities.effect.Decal; import io.anuke.mindustry.entities.effect.Puddle; -import io.anuke.mindustry.entities.effect.Rubble; +import io.anuke.mindustry.entities.effect.RubbleDecal; import io.anuke.mindustry.game.Content; import io.anuke.mindustry.game.UnlockableContent; import io.anuke.mindustry.graphics.CacheLayer; @@ -322,7 +323,7 @@ public class Block extends BaseBlock implements UnlockableContent{ Damage.dynamicExplosion(x, y, flammability, explosiveness, power, tilesize * size/2f, tempColor); if(!tile.floor().solid && !tile.floor().isLiquid){ - Rubble.create(tile.drawx(), tile.drawy(), size); + RubbleDecal.create(tile.drawx(), tile.drawy(), size); } } diff --git a/core/src/io/anuke/mindustry/world/blocks/BreakBlock.java b/core/src/io/anuke/mindustry/world/blocks/BreakBlock.java index 4cf01fe6c8..beb3fd0aca 100644 --- a/core/src/io/anuke/mindustry/world/blocks/BreakBlock.java +++ b/core/src/io/anuke/mindustry/world/blocks/BreakBlock.java @@ -8,7 +8,7 @@ import io.anuke.mindustry.content.fx.Fx; import io.anuke.mindustry.entities.Player; import io.anuke.mindustry.entities.TileEntity; import io.anuke.mindustry.entities.Unit; -import io.anuke.mindustry.entities.effect.Rubble; +import io.anuke.mindustry.entities.effect.RubbleDecal; import io.anuke.mindustry.entities.traits.BuilderTrait.BuildRequest; import io.anuke.mindustry.game.Team; import io.anuke.mindustry.gen.CallBlocks; @@ -69,7 +69,7 @@ public class BreakBlock extends Block { Effects.effect(ExplosionFx.blockExplosionSmoke, tile); if(!tile.floor().solid && !tile.floor().isLiquid){ - Rubble.create(tile.drawx(), tile.drawy(), size); + RubbleDecal.create(tile.drawx(), tile.drawy(), size); } } diff --git a/core/src/io/anuke/mindustry/world/blocks/BuildBlock.java b/core/src/io/anuke/mindustry/world/blocks/BuildBlock.java index 484fa347ee..a36de36f72 100644 --- a/core/src/io/anuke/mindustry/world/blocks/BuildBlock.java +++ b/core/src/io/anuke/mindustry/world/blocks/BuildBlock.java @@ -7,7 +7,7 @@ import io.anuke.mindustry.content.fx.ExplosionFx; import io.anuke.mindustry.content.fx.Fx; import io.anuke.mindustry.entities.Player; import io.anuke.mindustry.entities.TileEntity; -import io.anuke.mindustry.entities.effect.Rubble; +import io.anuke.mindustry.entities.effect.RubbleDecal; import io.anuke.mindustry.entities.traits.BuilderTrait.BuildRequest; import io.anuke.mindustry.game.Team; import io.anuke.mindustry.gen.CallBlocks; @@ -74,7 +74,7 @@ public class BuildBlock extends Block { Effects.effect(ExplosionFx.blockExplosionSmoke, tile); if(!tile.floor().solid && !tile.floor().isLiquid){ - Rubble.create(tile.drawx(), tile.drawy(), size); + RubbleDecal.create(tile.drawx(), tile.drawy(), size); } }