diff --git a/core/assets-raw/sprites/effects/bullet-back.png b/core/assets-raw/sprites/effects/bullet-back.png index 9e03b3ce0d..6ea1da16fb 100644 Binary files a/core/assets-raw/sprites/effects/bullet-back.png and b/core/assets-raw/sprites/effects/bullet-back.png differ diff --git a/core/assets-raw/sprites/effects/bullet.png b/core/assets-raw/sprites/effects/bullet.png index 5dac3bfe3c..3615b601ee 100644 Binary files a/core/assets-raw/sprites/effects/bullet.png and b/core/assets-raw/sprites/effects/bullet.png differ diff --git a/core/assets/sprites/sprites.atlas b/core/assets/sprites/sprites.atlas index 4e64399fe0..1c180ea23a 100644 --- a/core/assets/sprites/sprites.atlas +++ b/core/assets/sprites/sprites.atlas @@ -27,287 +27,287 @@ overdrive-projector-top index: -1 bridge-conveyor-arrow rotate: false - xy: 679, 391 + xy: 699, 411 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 bridge-conveyor-bridge rotate: false - xy: 669, 381 + xy: 689, 401 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 bridge-conveyor-end rotate: false - xy: 659, 371 + xy: 679, 391 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 conveyor-0-1 rotate: false - xy: 669, 361 + xy: 689, 381 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 conveyor-0-2 rotate: false - xy: 659, 351 + xy: 679, 371 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 conveyor-0-3 rotate: false - xy: 649, 341 + xy: 669, 361 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 conveyor-1-0 rotate: false - xy: 639, 331 + xy: 659, 351 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 conveyor-1-1 rotate: false - xy: 629, 321 + xy: 649, 341 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 conveyor-1-2 rotate: false - xy: 619, 301 + xy: 639, 331 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 conveyor-1-3 rotate: false - xy: 749, 431 + xy: 629, 321 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 conveyor-2-0 rotate: false - xy: 739, 421 + xy: 619, 301 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 conveyor-2-1 rotate: false - xy: 729, 411 + xy: 749, 431 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 conveyor-2-2 rotate: false - xy: 719, 401 + xy: 739, 421 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 conveyor-2-3 rotate: false - xy: 709, 391 + xy: 729, 411 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 conveyor-3-0 rotate: false - xy: 699, 381 + xy: 719, 401 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 conveyor-3-1 rotate: false - xy: 689, 371 + xy: 709, 391 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 conveyor-3-2 rotate: false - xy: 679, 361 + xy: 699, 381 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 conveyor-3-3 rotate: false - xy: 669, 351 + xy: 689, 371 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 conveyor-4-0 rotate: false - xy: 659, 341 + xy: 679, 361 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 conveyor-4-1 rotate: false - xy: 649, 331 + xy: 669, 351 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 conveyor-4-2 rotate: false - xy: 639, 321 + xy: 659, 341 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 conveyor-4-3 rotate: false - xy: 629, 311 + xy: 649, 331 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 titanium-conveyor-0-1 rotate: false - xy: 740, 281 + xy: 819, 351 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 titanium-conveyor-0-2 rotate: false - xy: 730, 261 + xy: 809, 341 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 titanium-conveyor-0-3 rotate: false - xy: 740, 271 + xy: 799, 331 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 titanium-conveyor-1-0 rotate: false - xy: 750, 281 + xy: 789, 321 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 titanium-conveyor-1-1 rotate: false - xy: 740, 261 + xy: 779, 311 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 titanium-conveyor-1-2 rotate: false - xy: 750, 271 + xy: 769, 301 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 titanium-conveyor-1-3 rotate: false - xy: 760, 281 + xy: 759, 291 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 titanium-conveyor-2-0 rotate: false - xy: 750, 261 + xy: 919, 433 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 titanium-conveyor-2-1 rotate: false - xy: 760, 271 + xy: 909, 423 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 titanium-conveyor-2-2 rotate: false - xy: 770, 281 + xy: 899, 413 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 titanium-conveyor-2-3 rotate: false - xy: 760, 261 + xy: 889, 403 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 titanium-conveyor-3-0 rotate: false - xy: 770, 271 + xy: 879, 393 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 titanium-conveyor-3-1 rotate: false - xy: 780, 281 + xy: 869, 383 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 titanium-conveyor-3-2 rotate: false - xy: 770, 261 + xy: 859, 373 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 titanium-conveyor-3-3 rotate: false - xy: 780, 271 + xy: 839, 361 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 titanium-conveyor-4-0 rotate: false - xy: 790, 281 + xy: 849, 363 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 titanium-conveyor-4-1 rotate: false - xy: 780, 261 + xy: 829, 351 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 titanium-conveyor-4-2 rotate: false - xy: 790, 271 + xy: 819, 341 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 titanium-conveyor-4-3 rotate: false - xy: 800, 281 + xy: 809, 331 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -321,21 +321,21 @@ mass-driver-turret index: -1 phase-conveyor-arrow rotate: false - xy: 809, 341 + xy: 849, 403 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 phase-conveyor-bridge rotate: false - xy: 799, 331 + xy: 829, 391 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 phase-conveyor-end rotate: false - xy: 789, 321 + xy: 819, 381 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -524,49 +524,49 @@ water-extractor-top index: -1 blackrock1 rotate: false - xy: 847, 443 + xy: 438, 230 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-icon-blackrock rotate: false - xy: 847, 443 + xy: 438, 230 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blackrockshadow1 rotate: false - xy: 857, 443 + xy: 133, 36 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blackstone1 rotate: false - xy: 867, 443 + xy: 849, 443 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-icon-blackstone rotate: false - xy: 867, 443 + xy: 849, 443 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blackstone2 rotate: false - xy: 877, 443 + xy: 859, 443 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blackstone3 rotate: false - xy: 887, 443 + xy: 869, 443 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -580,553 +580,553 @@ blackstoneedge index: -1 coal1 rotate: false - xy: 649, 361 + xy: 669, 381 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 coal2 rotate: false - xy: 639, 351 + xy: 659, 371 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 coal3 rotate: false - xy: 629, 341 + xy: 649, 361 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 copper1 rotate: false - xy: 619, 291 + xy: 639, 321 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 copper2 rotate: false - xy: 759, 431 + xy: 629, 311 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 copper3 rotate: false - xy: 749, 421 + xy: 619, 291 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 dirt2 rotate: false - xy: 679, 351 + xy: 699, 371 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 dirt3 rotate: false - xy: 669, 341 + xy: 689, 361 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 dirtedge rotate: false - xy: 546, 225 + xy: 193, 263 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 generic-cliff-edge rotate: false - xy: 739, 401 + xy: 759, 421 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ice-cliff-edge rotate: false - xy: 739, 401 + xy: 759, 421 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 generic-cliff-edge-1 rotate: false - xy: 729, 391 + xy: 749, 411 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ice-cliff-edge-1 rotate: false - xy: 729, 391 + xy: 749, 411 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 generic-cliff-edge-2 rotate: false - xy: 719, 381 + xy: 739, 401 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ice-cliff-edge-2 rotate: false - xy: 719, 381 + xy: 739, 401 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 generic-cliff-side rotate: false - xy: 709, 371 + xy: 729, 391 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ice-cliff-side rotate: false - xy: 709, 371 + xy: 729, 391 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 grass-cliff-edge rotate: false - xy: 679, 341 + xy: 699, 361 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 grass-cliff-edge-1 rotate: false - xy: 669, 331 + xy: 689, 351 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 grass-cliff-edge-2 rotate: false - xy: 659, 321 + xy: 679, 341 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 grass-cliff-side rotate: false - xy: 649, 311 + xy: 669, 331 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 grass2 rotate: false - xy: 699, 361 + xy: 719, 381 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 grass3 rotate: false - xy: 689, 351 + xy: 709, 371 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 grassedge rotate: false - xy: 191, 235 + xy: 205, 235 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 ice2 rotate: false - xy: 629, 291 + xy: 649, 311 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ice3 rotate: false - xy: 779, 431 + xy: 639, 301 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 iceedge rotate: false - xy: 205, 235 + xy: 193, 207 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 icerock2 rotate: false - xy: 769, 421 + xy: 629, 291 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 icerockshadow1 rotate: false - xy: 759, 411 + xy: 779, 431 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 rockshadow1 rotate: false - xy: 759, 411 + xy: 779, 431 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 icerockshadow2 rotate: false - xy: 749, 401 + xy: 769, 421 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 rockshadow2 rotate: false - xy: 749, 401 + xy: 769, 421 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 lavaedge rotate: false - xy: 193, 179 + xy: 207, 207 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 lead1 rotate: false - xy: 679, 321 + xy: 699, 341 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 lead2 rotate: false - xy: 669, 311 + xy: 689, 331 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 lead3 rotate: false - xy: 659, 301 + xy: 679, 321 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 metalfloor2 rotate: false - xy: 729, 361 + xy: 749, 381 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 metalfloor3 rotate: false - xy: 719, 351 + xy: 739, 371 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 metalfloor4 rotate: false - xy: 709, 341 + xy: 729, 361 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 metalfloor5 rotate: false - xy: 699, 331 + xy: 719, 351 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 metalfloor6 rotate: false - xy: 689, 321 + xy: 709, 341 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 metalflooredge rotate: false - xy: 207, 179 + xy: 219, 243 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 oiledge rotate: false - xy: 221, 257 + xy: 221, 229 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 rock2 rotate: false - xy: 809, 311 + xy: 859, 403 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 sand2 rotate: false - xy: 789, 291 + xy: 849, 393 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 sand3 rotate: false - xy: 809, 301 + xy: 829, 381 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 sandedge rotate: false - xy: 219, 243 + xy: 221, 215 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 shrubshadow rotate: false - xy: 660, 281 + xy: 889, 423 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 snow2 rotate: false - xy: 650, 261 + xy: 879, 413 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 snow3 rotate: false - xy: 660, 271 + xy: 869, 403 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 snowedge rotate: false - xy: 221, 215 + xy: 221, 187 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 spaceedge rotate: false - xy: 221, 201 + xy: 221, 173 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 stone-cliff-edge rotate: false - xy: 700, 271 + xy: 749, 291 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 stone-cliff-edge-1 rotate: false - xy: 710, 281 + xy: 909, 433 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 stone-cliff-edge-2 rotate: false - xy: 700, 261 + xy: 899, 423 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 stone-cliff-side rotate: false - xy: 710, 271 + xy: 889, 413 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 stone2 rotate: false - xy: 700, 281 + xy: 769, 311 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 stone3 rotate: false - xy: 690, 261 + xy: 759, 301 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 stoneedge rotate: false - xy: 221, 187 + xy: 233, 243 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 thorium1 rotate: false - xy: 720, 281 + xy: 879, 403 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 thorium2 rotate: false - xy: 710, 261 + xy: 869, 393 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 thorium3 rotate: false - xy: 720, 271 + xy: 859, 383 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 titanium1 rotate: false - xy: 730, 281 + xy: 839, 371 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 titanium2 rotate: false - xy: 720, 261 + xy: 849, 373 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 titanium3 rotate: false - xy: 730, 271 + xy: 829, 361 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 water-cliff-edge rotate: false - xy: 800, 271 + xy: 789, 311 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 water-cliff-edge-1 rotate: false - xy: 800, 261 + xy: 779, 301 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 water-cliff-edge-2 rotate: false - xy: 810, 281 + xy: 769, 291 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 water-cliff-side rotate: false - xy: 810, 271 + xy: 929, 433 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 wateredge rotate: false - xy: 235, 229 + xy: 235, 201 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 block-border rotate: false - xy: 957, 443 + xy: 939, 443 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-elevation rotate: false - xy: 967, 443 + xy: 949, 443 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 combustion-generator-top rotate: false - xy: 967, 443 + xy: 949, 443 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-middle rotate: false - xy: 629, 351 + xy: 649, 371 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 pump-liquid rotate: false - xy: 629, 351 + xy: 649, 371 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-slope rotate: false - xy: 619, 331 + xy: 639, 361 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 border rotate: false - xy: 719, 431 + xy: 629, 351 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 conduit-liquid rotate: false - xy: 619, 311 + xy: 639, 341 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 cross-1 rotate: false - xy: 739, 411 + xy: 759, 431 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -1154,7 +1154,7 @@ cross-4 index: -1 enemyspawn rotate: false - xy: 749, 411 + xy: 769, 431 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -1168,21 +1168,21 @@ nuclearreactor-shadow index: -1 place-arrow rotate: false - xy: 779, 311 + xy: 809, 371 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 playerspawn rotate: false - xy: 769, 301 + xy: 799, 361 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ripples rotate: false - xy: 777, 441 + xy: 801, 441 size: 10, 10 orig: 10, 10 offset: 0, 0 @@ -1231,7 +1231,7 @@ rubble-3-1 index: -1 shadow-1 rotate: false - xy: 789, 441 + xy: 813, 441 size: 10, 10 orig: 10, 10 offset: 0, 0 @@ -1273,14 +1273,14 @@ shadow-6 index: -1 shadow-corner rotate: false - xy: 801, 441 + xy: 825, 441 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 shadow-round-1 rotate: false - xy: 813, 441 + xy: 837, 441 size: 10, 10 orig: 10, 10 offset: 0, 0 @@ -1308,154 +1308,154 @@ shadow-rounded-2 index: -1 shadow-shock-mine rotate: false - xy: 640, 261 + xy: 739, 291 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 bridge-conduit-arrow rotate: false - xy: 709, 421 + xy: 619, 331 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 bridge-conduit-bridge rotate: false - xy: 699, 411 + xy: 719, 431 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 bridge-conduit-end rotate: false - xy: 689, 401 + xy: 709, 421 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 conduit-bottom rotate: false - xy: 699, 401 + xy: 719, 421 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 conduit-bottom-0 rotate: false - xy: 689, 391 + xy: 709, 411 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 conduit-bottom-1 rotate: false - xy: 679, 381 + xy: 699, 401 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 conduit-bottom-2 rotate: false - xy: 669, 371 + xy: 689, 391 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 conduit-bottom-3 rotate: false - xy: 659, 361 + xy: 679, 381 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 conduit-bottom-4 rotate: false - xy: 649, 351 + xy: 669, 371 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 conduit-bottom-5 rotate: false - xy: 639, 341 + xy: 659, 361 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 conduit-bottom-6 rotate: false - xy: 629, 331 + xy: 649, 351 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 conduit-top-0 rotate: false - xy: 739, 431 + xy: 629, 331 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 conduit-top-1 rotate: false - xy: 729, 421 + xy: 619, 311 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 conduit-top-2 rotate: false - xy: 719, 411 + xy: 739, 431 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 conduit-top-3 rotate: false - xy: 709, 401 + xy: 729, 421 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 conduit-top-4 rotate: false - xy: 699, 391 + xy: 719, 411 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 conduit-top-5 rotate: false - xy: 689, 381 + xy: 709, 401 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 conduit-top-6 rotate: false - xy: 679, 371 + xy: 699, 391 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 liquid-router-bottom rotate: false - xy: 759, 391 + xy: 779, 411 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 liquid-router-liquid rotate: false - xy: 749, 381 + xy: 769, 401 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 liquid-router-top rotate: false - xy: 739, 371 + xy: 759, 391 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -1483,84 +1483,84 @@ liquid-tank-top index: -1 phase-conduit-arrow rotate: false - xy: 769, 311 + xy: 869, 423 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 phase-conduit-bridge rotate: false - xy: 759, 301 + xy: 859, 413 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 phase-conduit-end rotate: false - xy: 749, 291 + xy: 839, 401 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 pulse-conduit-top-0 rotate: false - xy: 759, 291 + xy: 789, 351 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 pulse-conduit-top-1 rotate: false - xy: 809, 331 + xy: 779, 341 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 pulse-conduit-top-2 rotate: false - xy: 799, 321 + xy: 769, 331 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 pulse-conduit-top-3 rotate: false - xy: 789, 311 + xy: 759, 321 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 pulse-conduit-top-4 rotate: false - xy: 779, 301 + xy: 749, 311 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 pulse-conduit-top-5 rotate: false - xy: 769, 291 + xy: 739, 301 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 pulse-conduit-top-6 rotate: false - xy: 809, 321 + xy: 729, 291 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 battery rotate: false - xy: 438, 230 + xy: 123, 36 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-icon-battery rotate: false - xy: 438, 230 + xy: 123, 36 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -1637,7 +1637,7 @@ fusion-reactor-top index: -1 rtg-generator-top rotate: false - xy: 799, 301 + xy: 839, 391 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -1826,14 +1826,14 @@ cultivator-top index: -1 lavasmelter rotate: false - xy: 689, 331 + xy: 709, 351 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 oilrefinery rotate: false - xy: 759, 381 + xy: 779, 401 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -1868,21 +1868,21 @@ plastanium-compressor-top index: -1 pulverizer rotate: false - xy: 799, 311 + xy: 889, 433 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 pulverizer-rotator rotate: false - xy: 789, 301 + xy: 879, 423 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 separator-liquid rotate: false - xy: 630, 261 + xy: 749, 301 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -1903,21 +1903,21 @@ core-top index: -1 sortedunloader rotate: false - xy: 670, 261 + xy: 819, 361 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-1 rotate: false - xy: 937, 443 + xy: 919, 443 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-1-top rotate: false - xy: 947, 443 + xy: 929, 443 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -1987,7 +1987,7 @@ cyclone index: -1 duo rotate: false - xy: 759, 421 + xy: 629, 301 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -2001,7 +2001,7 @@ fuse index: -1 hail rotate: false - xy: 639, 301 + xy: 659, 321 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -2078,21 +2078,21 @@ salvo-panel-right index: -1 scatter rotate: false - xy: 630, 271 + xy: 779, 331 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 scorch rotate: false - xy: 640, 271 + xy: 769, 321 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 scorch-shoot rotate: false - xy: 650, 281 + xy: 759, 311 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -2246,7 +2246,7 @@ reconstructor-open index: -1 repair-point-turret rotate: false - xy: 779, 291 + xy: 869, 413 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -2260,7 +2260,7 @@ titan-pad index: -1 deflector-wall rotate: false - xy: 689, 361 + xy: 709, 381 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -2281,7 +2281,7 @@ door-large-open index: -1 door-open rotate: false - xy: 769, 431 + xy: 639, 311 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -2309,16 +2309,16 @@ blank index: -1 bullet rotate: false - xy: 1014, 502 - size: 9, 9 - orig: 9, 9 + xy: 123, 61 + size: 13, 13 + orig: 13, 13 offset: 0, 0 index: -1 bullet-back rotate: false - xy: 1014, 491 - size: 9, 9 - orig: 9, 9 + xy: 123, 46 + size: 13, 13 + orig: 13, 13 offset: 0, 0 index: -1 casing @@ -2337,42 +2337,42 @@ clear index: -1 command-attack rotate: false - xy: 619, 321 + xy: 639, 351 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 command-idle rotate: false - xy: 729, 431 + xy: 629, 341 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 command-patrol rotate: false - xy: 719, 421 + xy: 619, 321 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 command-retreat rotate: false - xy: 709, 411 + xy: 729, 431 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 enemyarrow rotate: false - xy: 810, 262 + xy: 919, 424 size: 8, 7 orig: 8, 7 offset: 0, 0 index: -1 error rotate: false - xy: 193, 263 + xy: 191, 249 size: 12, 12 orig: 12, 12 offset: 0, 0 @@ -2414,14 +2414,14 @@ minelaser-end index: -1 missile rotate: false - xy: 1014, 480 + xy: 1014, 502 size: 9, 9 orig: 9, 9 offset: 0, 0 index: -1 missile-back rotate: false - xy: 266, 372 + xy: 1014, 491 size: 9, 9 orig: 9, 9 offset: 0, 0 @@ -2463,21 +2463,21 @@ scorch5 index: -1 shell rotate: false - xy: 825, 442 + xy: 1014, 480 size: 9, 9 orig: 9, 9 offset: 0, 0 index: -1 shell-back rotate: false - xy: 836, 442 + xy: 266, 372 size: 9, 9 orig: 9, 9 offset: 0, 0 index: -1 shot rotate: false - xy: 650, 271 + xy: 899, 433 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -2491,7 +2491,7 @@ transfer index: -1 transfer-arrow rotate: false - xy: 790, 261 + xy: 799, 321 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -2505,35 +2505,35 @@ transfer-end index: -1 blackstone-cliff-edge rotate: false - xy: 897, 443 + xy: 879, 443 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blackstone-cliff-edge-1 rotate: false - xy: 907, 443 + xy: 889, 443 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blackstone-cliff-edge-2 rotate: false - xy: 917, 443 + xy: 899, 443 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blackstone-cliff-side rotate: false - xy: 927, 443 + xy: 909, 443 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-icon-arc rotate: false - xy: 977, 443 + xy: 959, 443 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -2554,28 +2554,28 @@ block-icon-blast-drill index: -1 block-icon-bridge-conduit rotate: false - xy: 987, 443 + xy: 969, 443 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 bridge-conduit rotate: false - xy: 987, 443 + xy: 969, 443 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-icon-bridge-conveyor rotate: false - xy: 997, 443 + xy: 979, 443 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 bridge-conveyor rotate: false - xy: 997, 443 + xy: 979, 443 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -2596,14 +2596,14 @@ centrifuge index: -1 block-icon-combustion-generator rotate: false - xy: 619, 431 + xy: 989, 443 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 combustion-generator rotate: false - xy: 619, 431 + xy: 989, 443 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -2624,14 +2624,14 @@ command-center index: -1 block-icon-composite-wall rotate: false - xy: 619, 421 + xy: 999, 443 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 composite-wall rotate: false - xy: 619, 421 + xy: 999, 443 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -2652,35 +2652,35 @@ composite-wall-large index: -1 block-icon-conduit rotate: false - xy: 629, 431 + xy: 619, 431 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-icon-conveyor rotate: false - xy: 619, 411 + xy: 619, 421 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 conveyor-0-0 rotate: false - xy: 619, 411 + xy: 619, 421 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-icon-copper-wall rotate: false - xy: 639, 431 + xy: 629, 431 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 copper-wall rotate: false - xy: 639, 431 + xy: 629, 431 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -2757,14 +2757,14 @@ dart-ship-factory index: -1 block-icon-deepwater rotate: false - xy: 629, 421 + xy: 619, 411 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 deepwater rotate: false - xy: 629, 421 + xy: 619, 411 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -2785,14 +2785,14 @@ delta-mech-factory index: -1 block-icon-dirt rotate: false - xy: 619, 401 + xy: 639, 431 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 dirt1 rotate: false - xy: 619, 401 + xy: 639, 431 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -2813,14 +2813,14 @@ distributor index: -1 block-icon-door rotate: false - xy: 649, 431 + xy: 629, 421 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 door rotate: false - xy: 649, 431 + xy: 629, 421 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -2848,7 +2848,7 @@ block-icon-drone-pad index: -1 block-icon-duo rotate: false - xy: 639, 421 + xy: 619, 401 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -2904,63 +2904,63 @@ glaive-ship-factory index: -1 block-icon-grass rotate: false - xy: 629, 411 + xy: 649, 431 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 grass1 rotate: false - xy: 629, 411 + xy: 649, 431 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-icon-hail rotate: false - xy: 619, 391 + xy: 639, 421 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-icon-ice rotate: false - xy: 659, 431 + xy: 629, 411 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ice1 rotate: false - xy: 659, 431 + xy: 629, 411 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-icon-icerock rotate: false - xy: 649, 421 + xy: 619, 391 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 icerock1 rotate: false - xy: 649, 421 + xy: 619, 391 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-icon-incinerator rotate: false - xy: 639, 411 + xy: 659, 431 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 incinerator rotate: false - xy: 639, 411 + xy: 659, 431 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -2974,28 +2974,28 @@ block-icon-interceptor-pad index: -1 block-icon-itemsource rotate: false - xy: 629, 401 + xy: 649, 421 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 itemsource rotate: false - xy: 629, 401 + xy: 649, 421 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-icon-itemvoid rotate: false - xy: 619, 381 + xy: 639, 411 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 itemvoid rotate: false - xy: 619, 381 + xy: 639, 411 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -3016,14 +3016,14 @@ javelin-ship-factory index: -1 block-icon-junction rotate: false - xy: 669, 431 + xy: 629, 401 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 junction rotate: false - xy: 669, 431 + xy: 629, 401 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -3044,35 +3044,35 @@ block-icon-laser-drill index: -1 block-icon-lava rotate: false - xy: 659, 421 + xy: 619, 381 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 lava rotate: false - xy: 659, 421 + xy: 619, 381 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-icon-liquid-junction rotate: false - xy: 649, 411 + xy: 669, 431 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 liquid-junction rotate: false - xy: 649, 411 + xy: 669, 431 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-icon-liquid-router rotate: false - xy: 639, 401 + xy: 659, 421 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -3086,14 +3086,14 @@ block-icon-liquid-tank index: -1 block-icon-liquidsource rotate: false - xy: 629, 391 + xy: 649, 411 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 liquidsource rotate: false - xy: 629, 391 + xy: 649, 411 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -3121,14 +3121,14 @@ block-icon-mechanical-drill index: -1 block-icon-mechanical-pump rotate: false - xy: 619, 371 + xy: 639, 401 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 mechanical-pump rotate: false - xy: 619, 371 + xy: 639, 401 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -3142,14 +3142,14 @@ block-icon-meltdown index: -1 block-icon-melter rotate: false - xy: 679, 431 + xy: 629, 391 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 melter rotate: false - xy: 679, 431 + xy: 629, 391 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -3170,14 +3170,14 @@ mend-projector index: -1 block-icon-metalfloor rotate: false - xy: 669, 421 + xy: 619, 371 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 metalfloor1 rotate: false - xy: 669, 421 + xy: 619, 371 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -3191,14 +3191,14 @@ block-icon-monsoon-pad index: -1 block-icon-oil rotate: false - xy: 659, 411 + xy: 679, 431 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 oil rotate: false - xy: 659, 411 + xy: 679, 431 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -3240,56 +3240,56 @@ overdrive-projector index: -1 block-icon-overflow-gate rotate: false - xy: 649, 401 + xy: 669, 421 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 overflow-gate rotate: false - xy: 649, 401 + xy: 669, 421 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-icon-phase-conduit rotate: false - xy: 639, 391 + xy: 659, 411 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 phase-conduit rotate: false - xy: 639, 391 + xy: 659, 411 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-icon-phase-conveyor rotate: false - xy: 629, 381 + xy: 649, 401 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 phase-conveyor rotate: false - xy: 629, 381 + xy: 649, 401 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-icon-phase-wall rotate: false - xy: 619, 361 + xy: 639, 391 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 phase-wall rotate: false - xy: 619, 361 + xy: 639, 391 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -3345,14 +3345,14 @@ block-icon-pneumatic-drill index: -1 block-icon-power-node rotate: false - xy: 689, 431 + xy: 629, 381 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 power-node rotate: false - xy: 689, 431 + xy: 629, 381 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -3373,42 +3373,42 @@ power-node-large index: -1 block-icon-powerinfinite rotate: false - xy: 679, 421 + xy: 619, 361 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 powerinfinite rotate: false - xy: 679, 421 + xy: 619, 361 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-icon-powervoid rotate: false - xy: 669, 411 + xy: 689, 431 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 powervoid rotate: false - xy: 669, 411 + xy: 689, 431 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-icon-pulse-conduit rotate: false - xy: 659, 401 + xy: 679, 421 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-icon-pulverizer rotate: false - xy: 649, 391 + xy: 669, 411 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -3471,14 +3471,14 @@ reconstructor index: -1 block-icon-repair-point rotate: false - xy: 639, 381 + xy: 659, 401 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 repair-point rotate: false - xy: 639, 381 + xy: 659, 401 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -3492,14 +3492,14 @@ block-icon-ripple index: -1 block-icon-rock rotate: false - xy: 629, 371 + xy: 649, 391 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 rock1 rotate: false - xy: 629, 371 + xy: 649, 391 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -3520,14 +3520,14 @@ rotary-pump index: -1 block-icon-router rotate: false - xy: 619, 351 + xy: 639, 381 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 router rotate: false - xy: 619, 351 + xy: 639, 381 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -3555,63 +3555,63 @@ block-icon-salvo index: -1 block-icon-sand rotate: false - xy: 699, 431 + xy: 629, 371 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 sand1 rotate: false - xy: 699, 431 + xy: 629, 371 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-icon-scorch rotate: false - xy: 689, 421 + xy: 619, 351 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-icon-separator rotate: false - xy: 679, 411 + xy: 699, 431 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 separator rotate: false - xy: 679, 411 + xy: 699, 431 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-icon-shock-mine rotate: false - xy: 669, 401 + xy: 689, 421 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 shock-mine rotate: false - xy: 669, 401 + xy: 689, 421 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-icon-shrub rotate: false - xy: 659, 391 + xy: 679, 411 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 shrub rotate: false - xy: 659, 391 + xy: 679, 411 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -3632,42 +3632,42 @@ silicon-smelter index: -1 block-icon-smelter rotate: false - xy: 649, 381 + xy: 669, 401 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 smelter rotate: false - xy: 649, 381 + xy: 669, 401 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-icon-snow rotate: false - xy: 639, 371 + xy: 659, 391 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 snow1 rotate: false - xy: 639, 371 + xy: 659, 391 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-icon-solar-panel rotate: false - xy: 629, 361 + xy: 649, 381 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 solar-panel rotate: false - xy: 629, 361 + xy: 649, 381 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -3688,42 +3688,42 @@ solar-panel-large index: -1 block-icon-solidifer rotate: false - xy: 619, 341 + xy: 639, 371 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 solidifer rotate: false - xy: 619, 341 + xy: 639, 371 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-icon-sorter rotate: false - xy: 709, 431 + xy: 629, 361 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 sorter rotate: false - xy: 709, 431 + xy: 629, 361 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-icon-space rotate: false - xy: 699, 421 + xy: 619, 341 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 space rotate: false - xy: 699, 421 + xy: 619, 341 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -3737,28 +3737,28 @@ block-icon-spectre index: -1 block-icon-stone rotate: false - xy: 689, 411 + xy: 709, 431 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 stone1 rotate: false - xy: 689, 411 + xy: 709, 431 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-icon-surge-wall rotate: false - xy: 679, 401 + xy: 699, 421 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 surge-wall rotate: false - xy: 679, 401 + xy: 699, 421 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -3842,14 +3842,14 @@ thorium-reactor index: -1 block-icon-thorium-wall rotate: false - xy: 669, 391 + xy: 689, 411 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 thorium-wall rotate: false - xy: 669, 391 + xy: 689, 411 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -3877,14 +3877,14 @@ block-icon-titan-pad index: -1 block-icon-titanium-conveyor rotate: false - xy: 659, 381 + xy: 679, 401 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 titanium-conveyor-0-0 rotate: false - xy: 659, 381 + xy: 679, 401 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -3919,14 +3919,14 @@ turbine-generator index: -1 block-icon-unloader rotate: false - xy: 649, 371 + xy: 669, 391 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 unloader rotate: false - xy: 649, 371 + xy: 669, 391 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -3961,14 +3961,14 @@ warp-gate index: -1 block-icon-water rotate: false - xy: 639, 361 + xy: 659, 381 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 water rotate: false - xy: 639, 361 + xy: 659, 381 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -3989,133 +3989,133 @@ block-icon-wave index: -1 deepwater-cliff-edge rotate: false - xy: 729, 401 + xy: 749, 421 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 deepwater-cliff-edge-1 rotate: false - xy: 719, 391 + xy: 739, 411 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 deepwater-cliff-edge-2 rotate: false - xy: 709, 381 + xy: 729, 401 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 deepwater-cliff-side rotate: false - xy: 699, 371 + xy: 719, 391 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 dirt-cliff-edge rotate: false - xy: 659, 331 + xy: 679, 351 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 dirt-cliff-edge-1 rotate: false - xy: 649, 321 + xy: 669, 341 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 dirt-cliff-edge-2 rotate: false - xy: 639, 311 + xy: 659, 331 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 dirt-cliff-side rotate: false - xy: 629, 301 + xy: 649, 321 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 lava-cliff-edge rotate: false - xy: 729, 371 + xy: 749, 391 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 lava-cliff-edge-1 rotate: false - xy: 719, 361 + xy: 739, 381 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 lava-cliff-edge-2 rotate: false - xy: 709, 351 + xy: 729, 371 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 lava-cliff-side rotate: false - xy: 699, 341 + xy: 719, 361 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 liquid-icon-cryofluid rotate: false - xy: 799, 431 + xy: 659, 301 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 liquid-icon-lava rotate: false - xy: 789, 421 + xy: 649, 291 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 liquid-icon-oil rotate: false - xy: 779, 411 + xy: 799, 431 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 liquid-icon-water rotate: false - xy: 769, 401 + xy: 789, 421 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 mech-icon-alpha-mech rotate: false - xy: 207, 221 + xy: 207, 193 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 mech-icon-dart-ship rotate: false - xy: 207, 207 + xy: 207, 179 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 mech-icon-delta-mech rotate: false - xy: 207, 193 + xy: 221, 257 size: 12, 12 orig: 12, 12 offset: 0, 0 @@ -4150,777 +4150,777 @@ trident-ship index: -1 metalfloor-cliff-edge rotate: false - xy: 679, 311 + xy: 699, 331 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 metalfloor-cliff-edge-1 rotate: false - xy: 669, 301 + xy: 689, 321 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 metalfloor-cliff-edge-2 rotate: false - xy: 659, 291 + xy: 679, 311 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 metalfloor-cliff-side rotate: false - xy: 809, 431 + xy: 669, 301 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 oil-cliff-edge rotate: false - xy: 799, 421 + xy: 659, 291 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 oil-cliff-edge-1 rotate: false - xy: 789, 411 + xy: 809, 431 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 oil-cliff-edge-2 rotate: false - xy: 779, 401 + xy: 799, 421 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 oil-cliff-side rotate: false - xy: 769, 391 + xy: 789, 411 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-coal-blackstone1 rotate: false - xy: 749, 371 + xy: 769, 391 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-coal-blackstone2 rotate: false - xy: 739, 361 + xy: 759, 381 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-coal-blackstone3 rotate: false - xy: 729, 351 + xy: 749, 371 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-coal-grass1 rotate: false - xy: 719, 341 + xy: 739, 361 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-coal-grass2 rotate: false - xy: 709, 331 + xy: 729, 351 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-coal-grass3 rotate: false - xy: 699, 321 + xy: 719, 341 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-coal-ice1 rotate: false - xy: 689, 311 + xy: 709, 331 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-coal-ice2 rotate: false - xy: 679, 301 + xy: 699, 321 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-coal-ice3 rotate: false - xy: 669, 291 + xy: 689, 311 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-coal-sand1 rotate: false - xy: 809, 421 + xy: 679, 301 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-coal-sand2 rotate: false - xy: 799, 411 + xy: 669, 291 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-coal-sand3 rotate: false - xy: 789, 401 + xy: 819, 431 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-coal-snow1 rotate: false - xy: 779, 391 + xy: 809, 421 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-coal-snow2 rotate: false - xy: 769, 381 + xy: 799, 411 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-coal-snow3 rotate: false - xy: 759, 371 + xy: 789, 401 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-coal-stone1 rotate: false - xy: 749, 361 + xy: 779, 391 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-coal-stone2 rotate: false - xy: 739, 351 + xy: 769, 381 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-coal-stone3 rotate: false - xy: 729, 341 + xy: 759, 371 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-copper-blackstone1 rotate: false - xy: 719, 331 + xy: 749, 361 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-copper-blackstone2 rotate: false - xy: 709, 321 + xy: 739, 351 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-copper-blackstone3 rotate: false - xy: 699, 311 + xy: 729, 341 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-copper-grass1 rotate: false - xy: 689, 301 + xy: 719, 331 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-copper-grass2 rotate: false - xy: 679, 291 + xy: 709, 321 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-copper-grass3 rotate: false - xy: 809, 411 + xy: 699, 311 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-copper-ice1 rotate: false - xy: 799, 401 + xy: 689, 301 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-copper-ice2 rotate: false - xy: 789, 391 + xy: 679, 291 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-copper-ice3 rotate: false - xy: 779, 381 + xy: 829, 431 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-copper-sand1 rotate: false - xy: 769, 371 + xy: 819, 421 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-copper-sand2 rotate: false - xy: 759, 361 + xy: 809, 411 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-copper-sand3 rotate: false - xy: 749, 351 + xy: 799, 401 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-copper-snow1 rotate: false - xy: 739, 341 + xy: 789, 391 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-copper-snow2 rotate: false - xy: 729, 331 + xy: 779, 381 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-copper-snow3 rotate: false - xy: 719, 321 + xy: 769, 371 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-copper-stone1 rotate: false - xy: 709, 311 + xy: 759, 361 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-copper-stone2 rotate: false - xy: 699, 301 + xy: 749, 351 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-copper-stone3 rotate: false - xy: 689, 291 + xy: 739, 341 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-lead-blackstone1 rotate: false - xy: 809, 401 + xy: 729, 331 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-lead-blackstone2 rotate: false - xy: 799, 391 + xy: 719, 321 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-lead-blackstone3 rotate: false - xy: 789, 381 + xy: 709, 311 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-lead-grass1 rotate: false - xy: 779, 371 + xy: 699, 301 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-lead-grass2 rotate: false - xy: 769, 361 + xy: 689, 291 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-lead-grass3 rotate: false - xy: 759, 351 + xy: 839, 431 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-lead-ice1 rotate: false - xy: 749, 341 + xy: 849, 433 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-lead-ice2 rotate: false - xy: 739, 331 + xy: 829, 421 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-lead-ice3 rotate: false - xy: 729, 321 + xy: 819, 411 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-lead-sand1 rotate: false - xy: 719, 311 + xy: 809, 401 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-lead-sand2 rotate: false - xy: 709, 301 + xy: 799, 391 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-lead-sand3 rotate: false - xy: 699, 291 + xy: 789, 381 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-lead-snow1 rotate: false - xy: 809, 391 + xy: 779, 371 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-lead-snow2 rotate: false - xy: 799, 381 + xy: 769, 361 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-lead-snow3 rotate: false - xy: 789, 371 + xy: 759, 351 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-lead-stone1 rotate: false - xy: 779, 361 + xy: 749, 341 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-lead-stone2 rotate: false - xy: 769, 351 + xy: 739, 331 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-lead-stone3 rotate: false - xy: 759, 341 + xy: 729, 321 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-thorium-blackstone1 rotate: false - xy: 749, 331 + xy: 719, 311 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-thorium-blackstone2 rotate: false - xy: 739, 321 + xy: 709, 301 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-thorium-blackstone3 rotate: false - xy: 729, 311 + xy: 699, 291 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-thorium-grass1 rotate: false - xy: 719, 301 + xy: 859, 433 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-thorium-grass2 rotate: false - xy: 709, 291 + xy: 839, 421 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-thorium-grass3 rotate: false - xy: 809, 381 + xy: 849, 423 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-thorium-ice1 rotate: false - xy: 799, 371 + xy: 829, 411 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-thorium-ice2 rotate: false - xy: 789, 361 + xy: 819, 401 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-thorium-ice3 rotate: false - xy: 779, 351 + xy: 809, 391 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-thorium-sand1 rotate: false - xy: 769, 341 + xy: 799, 381 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-thorium-sand2 rotate: false - xy: 759, 331 + xy: 789, 371 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-thorium-sand3 rotate: false - xy: 749, 321 + xy: 779, 361 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-thorium-snow1 rotate: false - xy: 739, 311 + xy: 769, 351 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-thorium-snow2 rotate: false - xy: 729, 301 + xy: 759, 341 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-thorium-snow3 rotate: false - xy: 719, 291 + xy: 749, 331 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-thorium-stone1 rotate: false - xy: 809, 371 + xy: 739, 321 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-thorium-stone2 rotate: false - xy: 799, 361 + xy: 729, 311 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-thorium-stone3 rotate: false - xy: 789, 351 + xy: 719, 301 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-titanium-blackstone1 rotate: false - xy: 779, 341 + xy: 709, 291 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-titanium-blackstone2 rotate: false - xy: 769, 331 + xy: 869, 433 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-titanium-blackstone3 rotate: false - xy: 759, 321 + xy: 859, 423 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-titanium-grass1 rotate: false - xy: 749, 311 + xy: 839, 411 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-titanium-grass2 rotate: false - xy: 739, 301 + xy: 849, 413 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-titanium-grass3 rotate: false - xy: 729, 291 + xy: 829, 401 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-titanium-ice1 rotate: false - xy: 809, 361 + xy: 819, 391 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-titanium-ice2 rotate: false - xy: 799, 351 + xy: 809, 381 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-titanium-ice3 rotate: false - xy: 789, 341 + xy: 799, 371 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-titanium-sand1 rotate: false - xy: 779, 331 + xy: 789, 361 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-titanium-sand2 rotate: false - xy: 769, 321 + xy: 779, 351 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-titanium-sand3 rotate: false - xy: 759, 311 + xy: 769, 341 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-titanium-snow1 rotate: false - xy: 749, 301 + xy: 759, 331 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-titanium-snow2 rotate: false - xy: 739, 291 + xy: 749, 321 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-titanium-snow3 rotate: false - xy: 809, 351 + xy: 739, 311 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-titanium-stone1 rotate: false - xy: 799, 341 + xy: 729, 301 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-titanium-stone2 rotate: false - xy: 789, 331 + xy: 719, 291 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-titanium-stone3 rotate: false - xy: 779, 321 + xy: 879, 433 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 sand-cliff-edge rotate: false - xy: 799, 291 + xy: 819, 371 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 sand-cliff-edge-1 rotate: false - xy: 809, 291 + xy: 809, 361 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 sand-cliff-edge-2 rotate: false - xy: 630, 281 + xy: 799, 351 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 sand-cliff-side rotate: false - xy: 640, 281 + xy: 789, 341 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 snow-cliff-edge rotate: false - xy: 670, 281 + xy: 859, 393 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 snow-cliff-edge-1 rotate: false - xy: 660, 261 + xy: 839, 381 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 snow-cliff-edge-2 rotate: false - xy: 670, 271 + xy: 849, 383 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 snow-cliff-side rotate: false - xy: 680, 281 + xy: 829, 371 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 space-cliff-edge rotate: false - xy: 680, 271 + xy: 809, 351 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 space-cliff-edge-1 rotate: false - xy: 690, 281 + xy: 799, 341 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 space-cliff-edge-2 rotate: false - xy: 680, 261 + xy: 789, 331 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 space-cliff-side rotate: false - xy: 690, 271 + xy: 779, 321 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 unit-icon-dagger rotate: false - xy: 249, 258 + xy: 235, 215 size: 12, 12 orig: 12, 12 offset: 0, 0 @@ -4941,112 +4941,112 @@ unit-icon-titan index: -1 item-biomatter rotate: false - xy: 719, 371 + xy: 739, 391 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 item-blast-compound rotate: false - xy: 709, 361 + xy: 729, 381 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 item-coal rotate: false - xy: 699, 351 + xy: 719, 371 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 item-copper rotate: false - xy: 689, 341 + xy: 709, 361 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 item-dense-alloy rotate: false - xy: 679, 331 + xy: 699, 351 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 item-lead rotate: false - xy: 669, 321 + xy: 689, 341 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 item-phase-matter rotate: false - xy: 659, 311 + xy: 679, 331 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 item-plastanium rotate: false - xy: 649, 301 + xy: 669, 321 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 item-pyratite rotate: false - xy: 639, 291 + xy: 659, 311 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 item-sand rotate: false - xy: 789, 431 + xy: 649, 301 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 item-silicon rotate: false - xy: 779, 421 + xy: 639, 291 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 item-stone rotate: false - xy: 769, 411 + xy: 789, 431 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 item-surge-alloy rotate: false - xy: 759, 401 + xy: 779, 421 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 item-thorium rotate: false - xy: 749, 391 + xy: 769, 411 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 item-titanium rotate: false - xy: 739, 381 + xy: 759, 401 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 liquid-icon rotate: false - xy: 649, 291 + xy: 669, 311 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -5074,14 +5074,14 @@ alpha-mech-leg index: -1 delta-mech rotate: false - xy: 518, 225 + xy: 546, 225 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 delta-mech-leg rotate: false - xy: 532, 225 + xy: 560, 225 size: 12, 12 orig: 12, 12 offset: 0, 0 @@ -5123,21 +5123,21 @@ tau-mech index: -1 tau-mech-base rotate: false - xy: 233, 243 + xy: 249, 258 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 tau-mech-leg rotate: false - xy: 235, 257 + xy: 235, 229 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 dart-ship rotate: false - xy: 504, 225 + xy: 532, 225 size: 12, 12 orig: 12, 12 offset: 0, 0 @@ -5158,21 +5158,21 @@ mech-icon-glaive-ship index: -1 javelin-ship rotate: false - xy: 193, 207 + xy: 193, 179 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 mech-icon-javelin-ship rotate: false - xy: 193, 207 + xy: 193, 179 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 javelin-ship-shield rotate: false - xy: 193, 193 + xy: 207, 221 size: 12, 12 orig: 12, 12 offset: 0, 0 @@ -5356,7 +5356,7 @@ icon-admin-small index: -1 icon-areaDelete rotate: false - xy: 123, 36 + xy: 235, 189 size: 10, 10 orig: 10, 10 offset: 0, 0 @@ -5377,28 +5377,28 @@ icon-arrow-16 index: -1 icon-arrow-down rotate: false - xy: 235, 217 + xy: 235, 177 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-arrow-left rotate: false - xy: 235, 205 + xy: 263, 256 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-arrow-right rotate: false - xy: 235, 193 + xy: 275, 256 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-arrow-up rotate: false - xy: 235, 181 + xy: 235, 165 size: 10, 10 orig: 10, 10 offset: 0, 0 @@ -5433,7 +5433,7 @@ icon-cancel index: -1 icon-chat rotate: false - xy: 263, 256 + xy: 193, 167 size: 10, 10 orig: 10, 10 offset: 0, 0 @@ -5447,21 +5447,21 @@ icon-check index: -1 icon-crafting rotate: false - xy: 275, 256 + xy: 205, 167 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-cursor rotate: false - xy: 235, 169 + xy: 139, 24 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-defense rotate: false - xy: 193, 167 + xy: 576, 229 size: 10, 10 orig: 10, 10 offset: 0, 0 @@ -5482,7 +5482,7 @@ icon-discord index: -1 icon-distribution rotate: false - xy: 205, 167 + xy: 588, 229 size: 10, 10 orig: 10, 10 offset: 0, 0 @@ -5622,14 +5622,14 @@ icon-grid index: -1 icon-hold rotate: false - xy: 576, 229 + xy: 600, 229 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-holdDelete rotate: false - xy: 588, 229 + xy: 612, 229 size: 10, 10 orig: 10, 10 offset: 0, 0 @@ -5650,7 +5650,7 @@ icon-host index: -1 icon-info rotate: false - xy: 600, 229 + xy: 624, 229 size: 10, 10 orig: 10, 10 offset: 0, 0 @@ -5664,14 +5664,14 @@ icon-itch.io index: -1 icon-item rotate: false - xy: 612, 229 + xy: 636, 229 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-items-none rotate: false - xy: 739, 391 + xy: 759, 411 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -5692,7 +5692,7 @@ icon-link index: -1 icon-liquid rotate: false - xy: 624, 229 + xy: 621, 441 size: 10, 10 orig: 10, 10 offset: 0, 0 @@ -5734,7 +5734,7 @@ icon-locked index: -1 icon-logic rotate: false - xy: 636, 229 + xy: 633, 441 size: 10, 10 orig: 10, 10 offset: 0, 0 @@ -5748,7 +5748,7 @@ icon-map index: -1 icon-menu rotate: false - xy: 621, 441 + xy: 645, 441 size: 10, 10 orig: 10, 10 offset: 0, 0 @@ -5762,28 +5762,28 @@ icon-menu-large index: -1 icon-missing rotate: false - xy: 633, 441 + xy: 657, 441 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-none rotate: false - xy: 645, 441 + xy: 669, 441 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-nullitem rotate: false - xy: 729, 381 + xy: 749, 401 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 icon-pause rotate: false - xy: 657, 441 + xy: 681, 441 size: 10, 10 orig: 10, 10 offset: 0, 0 @@ -5811,7 +5811,7 @@ icon-pick index: -1 icon-play rotate: false - xy: 669, 441 + xy: 693, 441 size: 10, 10 orig: 10, 10 offset: 0, 0 @@ -5825,21 +5825,21 @@ icon-play-2 index: -1 icon-players rotate: false - xy: 681, 441 + xy: 705, 441 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-power rotate: false - xy: 693, 441 + xy: 717, 441 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-production rotate: false - xy: 705, 441 + xy: 729, 441 size: 10, 10 orig: 10, 10 offset: 0, 0 @@ -5930,7 +5930,7 @@ icon-save-map index: -1 icon-settings rotate: false - xy: 717, 441 + xy: 741, 441 size: 10, 10 orig: 10, 10 offset: 0, 0 @@ -5951,14 +5951,14 @@ icon-tools index: -1 icon-touch rotate: false - xy: 729, 441 + xy: 753, 441 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-touchDelete rotate: false - xy: 741, 441 + xy: 765, 441 size: 10, 10 orig: 10, 10 offset: 0, 0 @@ -6000,7 +6000,7 @@ icon-undo index: -1 icon-units rotate: false - xy: 753, 441 + xy: 777, 441 size: 10, 10 orig: 10, 10 offset: 0, 0 @@ -6014,7 +6014,7 @@ icon-unlocks index: -1 icon-weapon rotate: false - xy: 765, 441 + xy: 789, 441 size: 10, 10 orig: 10, 10 offset: 0, 0 @@ -6237,42 +6237,42 @@ unit-icon-alpha-drone index: -1 dagger rotate: false - xy: 462, 225 + xy: 490, 225 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 dagger-base rotate: false - xy: 476, 225 + xy: 504, 225 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 delta-mech-base rotate: false - xy: 476, 225 + xy: 504, 225 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 dagger-leg rotate: false - xy: 490, 225 + xy: 518, 225 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 drone rotate: false - xy: 560, 225 + xy: 207, 263 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 unit-icon-drone rotate: false - xy: 560, 225 + xy: 207, 263 size: 12, 12 orig: 12, 12 offset: 0, 0 @@ -6335,14 +6335,14 @@ titan-leg index: -1 interceptor rotate: false - xy: 193, 221 + xy: 193, 193 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 unit-icon-interceptor rotate: false - xy: 193, 221 + xy: 193, 193 size: 12, 12 orig: 12, 12 offset: 0, 0 @@ -6370,63 +6370,63 @@ power-cell index: -1 blaster-equip rotate: false - xy: 123, 62 + xy: 448, 225 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 bomber-equip rotate: false - xy: 123, 48 + xy: 462, 225 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 missiles-equip rotate: false - xy: 123, 48 + xy: 462, 225 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 chain-blaster-equip rotate: false - xy: 448, 225 + xy: 476, 225 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 flakgun-equip rotate: false - xy: 207, 263 + xy: 191, 235 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 flamethrower-equip rotate: false - xy: 191, 249 + xy: 205, 249 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 heal-blaster-equip rotate: false - xy: 205, 249 + xy: 193, 221 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 shockgun-equip rotate: false - xy: 221, 229 + xy: 221, 201 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 swarmer-equip rotate: false - xy: 221, 173 + xy: 235, 257 size: 12, 12 orig: 12, 12 offset: 0, 0 diff --git a/core/assets/sprites/sprites.png b/core/assets/sprites/sprites.png index dde2310302..3d718905d4 100644 Binary files a/core/assets/sprites/sprites.png and b/core/assets/sprites/sprites.png differ diff --git a/core/src/io/anuke/mindustry/content/AmmoTypes.java b/core/src/io/anuke/mindustry/content/AmmoTypes.java index abb351a528..e3c4f6baa5 100644 --- a/core/src/io/anuke/mindustry/content/AmmoTypes.java +++ b/core/src/io/anuke/mindustry/content/AmmoTypes.java @@ -119,7 +119,6 @@ public class AmmoTypes implements ContentList{ bulletDenseBig = new AmmoType(Items.densealloy, StandardBullets.denseBig, 1){{ shootEffect = ShootFx.shootBig; smokeEffect = ShootFx.shootBigSmoke; - reloadMultiplier = 0.6f; }}; bulletThoriumBig = new AmmoType(Items.thorium, StandardBullets.thoriumBig, 1){{ diff --git a/core/src/io/anuke/mindustry/content/blocks/TurretBlocks.java b/core/src/io/anuke/mindustry/content/blocks/TurretBlocks.java index 9315d8fe30..e759fdb96e 100644 --- a/core/src/io/anuke/mindustry/content/blocks/TurretBlocks.java +++ b/core/src/io/anuke/mindustry/content/blocks/TurretBlocks.java @@ -197,6 +197,8 @@ public class TurretBlocks extends BlockList implements ContentList{ rotatespeed = 10f; inaccuracy = 13f; shootCone = 30f; + + health = 145 * size * size; }}; fuse = new ItemTurret("fuse"){{ @@ -208,20 +210,25 @@ public class TurretBlocks extends BlockList implements ContentList{ recoil = 5f; restitution = 0.1f; size = 3; + + health = 155 * size * size; }}; spectre = new DoubleTurret("spectre"){{ ammoTypes = new AmmoType[]{AmmoTypes.bulletDenseBig, AmmoTypes.bulletPyratiteBig, AmmoTypes.bulletThoriumBig}; - reload = 3f; + reload = 4f; restitution = 0.03f; ammoUseEffect = ShootFx.shellEjectMedium; range = 200f; - recoil = 2f; + recoil = 3f; xRand = 3f; shotWidth = 4f; - shootShake = 1.5f; + shootShake = 2f; shots = 2; size = 4; + shootCone = 24f; + + health = 155 * size * size; }}; meltdown = new PowerTurret("meltdown"){{ diff --git a/core/src/io/anuke/mindustry/content/bullets/StandardBullets.java b/core/src/io/anuke/mindustry/content/bullets/StandardBullets.java index ffc662e615..57c888aa47 100644 --- a/core/src/io/anuke/mindustry/content/bullets/StandardBullets.java +++ b/core/src/io/anuke/mindustry/content/bullets/StandardBullets.java @@ -77,30 +77,30 @@ public class StandardBullets extends BulletList implements ContentList{ } }; - denseBig = new BasicBulletType(10f, 36, "bullet"){ + denseBig = new BasicBulletType(7f, 42, "bullet"){ { - bulletWidth = 16f; + bulletWidth = 15f; bulletHeight = 21f; armorPierce = 0.2f; } }; - thoriumBig = new BasicBulletType(11f, 58, "bullet"){ + thoriumBig = new BasicBulletType(8f, 65, "bullet"){ { - bulletWidth = 17f; + bulletWidth = 16f; bulletHeight = 23f; armorPierce = 0.5f; } }; - tracerBig = new BasicBulletType(9f, 22, "bullet"){ + tracerBig = new BasicBulletType(7f, 38, "bullet"){ { - bulletWidth = 17f; + bulletWidth = 16f; bulletHeight = 21f; frontColor = Palette.lightishOrange; backColor = Palette.lightOrange; incendSpread = 3f; - incendAmount = 1; + incendAmount = 2; incendChance = 0.3f; } };