diff --git a/core/assets-raw/sprites/blocks/defense/overdrive-projector-top.png b/core/assets-raw/sprites/blocks/defense/overdrive-projector-top.png new file mode 100644 index 0000000000..76e7676888 Binary files /dev/null and b/core/assets-raw/sprites/blocks/defense/overdrive-projector-top.png differ diff --git a/core/assets-raw/sprites/blocks/defense/overdrive-projector.png b/core/assets-raw/sprites/blocks/defense/overdrive-projector.png new file mode 100644 index 0000000000..6634742a1b Binary files /dev/null and b/core/assets-raw/sprites/blocks/defense/overdrive-projector.png differ diff --git a/core/assets-raw/sprites/blocks/units/mechs/dart-ship-factory.png b/core/assets-raw/sprites/blocks/mechs/dart-ship-factory.png similarity index 100% rename from core/assets-raw/sprites/blocks/units/mechs/dart-ship-factory.png rename to core/assets-raw/sprites/blocks/mechs/dart-ship-factory.png diff --git a/core/assets-raw/sprites/blocks/units/mechs/delta-mech-factory.png b/core/assets-raw/sprites/blocks/mechs/delta-mech-factory.png similarity index 100% rename from core/assets-raw/sprites/blocks/units/mechs/delta-mech-factory.png rename to core/assets-raw/sprites/blocks/mechs/delta-mech-factory.png diff --git a/core/assets-raw/sprites/blocks/units/mechs/glaive-ship-factory.png b/core/assets-raw/sprites/blocks/mechs/glaive-ship-factory.png similarity index 100% rename from core/assets-raw/sprites/blocks/units/mechs/glaive-ship-factory.png rename to core/assets-raw/sprites/blocks/mechs/glaive-ship-factory.png diff --git a/core/assets-raw/sprites/blocks/units/mechs/javelin-ship-factory.png b/core/assets-raw/sprites/blocks/mechs/javelin-ship-factory.png similarity index 100% rename from core/assets-raw/sprites/blocks/units/mechs/javelin-ship-factory.png rename to core/assets-raw/sprites/blocks/mechs/javelin-ship-factory.png diff --git a/core/assets-raw/sprites/blocks/units/mechs/omega-mech-factory.png b/core/assets-raw/sprites/blocks/mechs/omega-mech-factory.png similarity index 100% rename from core/assets-raw/sprites/blocks/units/mechs/omega-mech-factory.png rename to core/assets-raw/sprites/blocks/mechs/omega-mech-factory.png diff --git a/core/assets-raw/sprites/blocks/units/mechs/tau-mech-factory.png b/core/assets-raw/sprites/blocks/mechs/tau-mech-factory.png similarity index 100% rename from core/assets-raw/sprites/blocks/units/mechs/tau-mech-factory.png rename to core/assets-raw/sprites/blocks/mechs/tau-mech-factory.png diff --git a/core/assets-raw/sprites/blocks/units/mechs/trident-ship-factory.png b/core/assets-raw/sprites/blocks/mechs/trident-ship-factory.png similarity index 100% rename from core/assets-raw/sprites/blocks/units/mechs/trident-ship-factory.png rename to core/assets-raw/sprites/blocks/mechs/trident-ship-factory.png diff --git a/core/assets/bundles/bundle.properties b/core/assets/bundles/bundle.properties index 33dfeceb2e..94259982c2 100644 --- a/core/assets/bundles/bundle.properties +++ b/core/assets/bundles/bundle.properties @@ -623,6 +623,7 @@ block.surge-wall-large.name=Large Surge Wall block.cyclone.name=Cyclone block.fuse.name=Fuse block.shock-mine.name=Shock Mine +block.overdrive-projector.name=Overdrive Projector unit.alpha-drone.name=Alpha Drone unit.drone.name=Drone diff --git a/core/assets/sprites/sprites.atlas b/core/assets/sprites/sprites.atlas index 1ced018315..7740194c0b 100644 --- a/core/assets/sprites/sprites.atlas +++ b/core/assets/sprites/sprites.atlas @@ -6,294 +6,301 @@ filter: Nearest,Nearest repeat: none mend-projector-top rotate: false - xy: 903, 434 + xy: 921, 434 + size: 16, 16 + orig: 16, 16 + offset: 0, 0 + index: -1 +overdrive-projector-top + rotate: false + xy: 939, 434 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 bridge-conveyor-arrow rotate: false - xy: 330, 110 + xy: 601, 358 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 bridge-conveyor-bridge rotate: false - xy: 477, 191 + xy: 611, 368 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 bridge-conveyor-end rotate: false - xy: 475, 181 + xy: 621, 378 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 conveyor-0-1 rotate: false - xy: 838, 398 + xy: 651, 358 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 conveyor-0-2 rotate: false - xy: 848, 408 + xy: 661, 368 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 conveyor-0-3 rotate: false - xy: 838, 388 + xy: 671, 378 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 conveyor-1-0 rotate: false - xy: 848, 398 + xy: 641, 338 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 conveyor-1-1 rotate: false - xy: 858, 408 + xy: 651, 348 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 conveyor-1-2 rotate: false - xy: 848, 388 + xy: 661, 358 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 conveyor-1-3 rotate: false - xy: 858, 398 + xy: 671, 368 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 conveyor-2-0 rotate: false - xy: 868, 408 + xy: 681, 378 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 conveyor-2-1 rotate: false - xy: 858, 388 + xy: 651, 338 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 conveyor-2-2 rotate: false - xy: 868, 398 + xy: 661, 348 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 conveyor-2-3 rotate: false - xy: 878, 408 + xy: 671, 358 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 conveyor-3-0 rotate: false - xy: 868, 388 + xy: 681, 368 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 conveyor-3-1 rotate: false - xy: 878, 398 + xy: 691, 378 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 conveyor-3-2 rotate: false - xy: 888, 408 + xy: 661, 338 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 conveyor-3-3 rotate: false - xy: 878, 388 + xy: 671, 348 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 conveyor-4-0 rotate: false - xy: 888, 398 + xy: 681, 358 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 conveyor-4-1 rotate: false - xy: 898, 408 + xy: 691, 368 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 conveyor-4-2 rotate: false - xy: 888, 388 + xy: 701, 378 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 conveyor-4-3 rotate: false - xy: 898, 398 + xy: 671, 338 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 titanium-conveyor-0-1 rotate: false - xy: 481, 243 + xy: 210, 75 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 titanium-conveyor-0-2 rotate: false - xy: 481, 233 + xy: 144, 61 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 titanium-conveyor-0-3 rotate: false - xy: 481, 223 + xy: 144, 51 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 titanium-conveyor-1-0 rotate: false - xy: 481, 213 + xy: 154, 61 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 titanium-conveyor-1-1 rotate: false - xy: 495, 181 + xy: 144, 41 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 titanium-conveyor-1-2 rotate: false - xy: 495, 171 + xy: 154, 51 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 titanium-conveyor-1-3 rotate: false - xy: 588, 368 + xy: 164, 61 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 titanium-conveyor-2-0 rotate: false - xy: 598, 368 + xy: 154, 41 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 titanium-conveyor-2-1 rotate: false - xy: 608, 368 + xy: 164, 51 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 titanium-conveyor-2-2 rotate: false - xy: 618, 368 + xy: 174, 61 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 titanium-conveyor-2-3 rotate: false - xy: 628, 368 + xy: 164, 41 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 titanium-conveyor-3-0 rotate: false - xy: 638, 368 + xy: 174, 51 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 titanium-conveyor-3-1 rotate: false - xy: 648, 368 + xy: 184, 61 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 titanium-conveyor-3-2 rotate: false - xy: 658, 368 + xy: 174, 41 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 titanium-conveyor-3-3 rotate: false - xy: 668, 368 + xy: 184, 51 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 titanium-conveyor-4-0 rotate: false - xy: 678, 368 + xy: 184, 41 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 titanium-conveyor-4-1 rotate: false - xy: 688, 368 + xy: 194, 61 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 titanium-conveyor-4-2 rotate: false - xy: 698, 368 + xy: 194, 51 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 titanium-conveyor-4-3 rotate: false - xy: 708, 368 + xy: 194, 41 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -307,21 +314,21 @@ mass-driver-turret index: -1 phase-conveyor-arrow rotate: false - xy: 210, 75 + xy: 150, 101 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 phase-conveyor-bridge rotate: false - xy: 144, 61 + xy: 150, 91 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 phase-conveyor-end rotate: false - xy: 144, 51 + xy: 160, 101 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -363,42 +370,42 @@ blast-drill-top index: -1 laser-drill rotate: false - xy: 795, 434 + xy: 813, 434 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 laser-drill-rotator rotate: false - xy: 813, 434 + xy: 831, 434 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 laser-drill-top rotate: false - xy: 831, 434 + xy: 849, 434 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 mechanical-drill rotate: false - xy: 849, 434 + xy: 867, 434 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 mechanical-drill-rotator rotate: false - xy: 867, 434 + xy: 885, 434 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 mechanical-drill-top rotate: false - xy: 885, 434 + xy: 903, 434 size: 16, 16 orig: 16, 16 offset: 0, 0 @@ -461,49 +468,49 @@ plasma-drill-top index: -1 pneumatic-drill rotate: false - xy: 1007, 424 + xy: 564, 396 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 pneumatic-drill-rotator rotate: false - xy: 564, 414 + xy: 582, 416 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 pneumatic-drill-top rotate: false - xy: 564, 396 + xy: 582, 398 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 water-extractor rotate: false - xy: 708, 398 + xy: 726, 398 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 water-extractor-liquid rotate: false - xy: 726, 416 + xy: 744, 416 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 water-extractor-rotator rotate: false - xy: 726, 398 + xy: 744, 398 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 water-extractor-top rotate: false - xy: 744, 416 + xy: 762, 416 size: 16, 16 orig: 16, 16 offset: 0, 0 @@ -566,560 +573,560 @@ blackstoneedge index: -1 coal1 rotate: false - xy: 480, 201 + xy: 591, 338 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 coal2 rotate: false - xy: 487, 191 + xy: 601, 348 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 coal3 rotate: false - xy: 485, 181 + xy: 611, 358 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 copper1 rotate: false - xy: 908, 408 + xy: 681, 348 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 copper2 rotate: false - xy: 898, 388 + xy: 691, 358 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 copper3 rotate: false - xy: 908, 398 + xy: 701, 368 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 dirt2 rotate: false - xy: 938, 408 + xy: 691, 338 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 dirt3 rotate: false - xy: 928, 388 + xy: 701, 348 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 dirtedge rotate: false - xy: 523, 384 + xy: 499, 362 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 generic-cliff-edge rotate: false - xy: 968, 408 + xy: 741, 378 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ice-cliff-edge rotate: false - xy: 968, 408 + xy: 741, 378 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 generic-cliff-edge-1 rotate: false - xy: 958, 388 + xy: 711, 338 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ice-cliff-edge-1 rotate: false - xy: 958, 388 + xy: 711, 338 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 generic-cliff-edge-2 rotate: false - xy: 968, 398 + xy: 721, 348 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ice-cliff-edge-2 rotate: false - xy: 968, 398 + xy: 721, 348 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 generic-cliff-side rotate: false - xy: 978, 408 + xy: 731, 358 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ice-cliff-side rotate: false - xy: 978, 408 + xy: 731, 358 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 grass-cliff-edge rotate: false - xy: 978, 388 + xy: 721, 338 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 grass-cliff-edge-1 rotate: false - xy: 778, 376 + xy: 731, 348 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 grass-cliff-edge-2 rotate: false - xy: 788, 378 + xy: 741, 358 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 grass-cliff-side rotate: false - xy: 798, 378 + xy: 751, 368 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 grass2 rotate: false - xy: 968, 388 + xy: 741, 368 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 grass3 rotate: false - xy: 978, 398 + xy: 751, 378 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 grassedge rotate: false - xy: 499, 320 + xy: 513, 356 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 ice2 rotate: false - xy: 818, 378 + xy: 731, 338 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ice3 rotate: false - xy: 828, 378 + xy: 741, 348 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 iceedge rotate: false - xy: 513, 356 + xy: 513, 342 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 icerock2 rotate: false - xy: 838, 378 + xy: 751, 358 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 icerockshadow1 rotate: false - xy: 848, 378 + xy: 761, 368 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 rockshadow1 rotate: false - xy: 848, 378 + xy: 761, 368 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 icerockshadow2 rotate: false - xy: 858, 378 + xy: 771, 378 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 rockshadow2 rotate: false - xy: 858, 378 + xy: 771, 378 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 lavaedge rotate: false - xy: 513, 328 + xy: 527, 328 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 lead1 rotate: false - xy: 868, 368 + xy: 701, 328 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 lead2 rotate: false - xy: 878, 368 + xy: 711, 328 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 lead3 rotate: false - xy: 888, 368 + xy: 721, 328 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 metalfloor2 rotate: false - xy: 978, 368 + xy: 579, 298 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 metalfloor3 rotate: false - xy: 988, 410 + xy: 589, 308 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 metalfloor4 rotate: false - xy: 988, 400 + xy: 599, 318 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 metalfloor5 rotate: false - xy: 988, 390 + xy: 579, 288 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 metalfloor6 rotate: false - xy: 988, 380 + xy: 589, 298 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 metalflooredge rotate: false - xy: 541, 356 + xy: 541, 328 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 oiledge rotate: false - xy: 541, 342 + xy: 513, 314 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 rock2 rotate: false - xy: 194, 61 + xy: 160, 71 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 sand2 rotate: false - xy: 194, 41 + xy: 180, 71 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 sand3 rotate: false - xy: 204, 65 + xy: 190, 71 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 sandedge rotate: false - xy: 541, 328 + xy: 527, 314 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 shrubshadow rotate: false - xy: 354, 140 + xy: 124, 53 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 snow2 rotate: false - xy: 354, 130 + xy: 114, 43 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 snow3 rotate: false - xy: 352, 120 + xy: 134, 53 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 snowedge rotate: false - xy: 527, 314 + xy: 499, 306 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 spaceedge rotate: false - xy: 541, 314 + xy: 513, 300 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 stone-cliff-edge rotate: false - xy: 290, 104 + xy: 135, 13 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 stone-cliff-edge-1 rotate: false - xy: 300, 104 + xy: 127, 3 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 stone-cliff-edge-2 rotate: false - xy: 310, 106 + xy: 137, 3 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 stone-cliff-side rotate: false - xy: 320, 106 + xy: 202, 105 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 stone2 rotate: false - xy: 270, 111 + xy: 117, 3 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 stone3 rotate: false - xy: 280, 111 + xy: 135, 23 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 stoneedge rotate: false - xy: 499, 306 + xy: 527, 300 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 thorium1 rotate: false - xy: 330, 100 + xy: 212, 105 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 thorium2 rotate: false - xy: 340, 92 + xy: 200, 95 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 thorium3 rotate: false - xy: 350, 90 + xy: 200, 85 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 titanium1 rotate: false - xy: 482, 273 + xy: 210, 95 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 titanium2 rotate: false - xy: 481, 263 + xy: 200, 75 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 titanium3 rotate: false - xy: 481, 253 + xy: 210, 85 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 water-cliff-edge rotate: false - xy: 728, 368 + xy: 204, 55 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 water-cliff-edge-1 rotate: false - xy: 738, 368 + xy: 204, 45 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 water-cliff-edge-2 rotate: false - xy: 748, 368 + xy: 214, 65 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 water-cliff-side rotate: false - xy: 758, 368 + xy: 214, 55 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 wateredge rotate: false - xy: 342, 180 + xy: 555, 340 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 block-border rotate: false - xy: 482, 283 + xy: 459, 262 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-elevation rotate: false - xy: 471, 261 + xy: 459, 252 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 combustion-generator-top rotate: false - xy: 471, 261 + xy: 459, 252 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-middle rotate: false - xy: 465, 181 + xy: 581, 348 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 pump-liquid rotate: false - xy: 465, 181 + xy: 581, 348 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-slope rotate: false - xy: 290, 114 + xy: 591, 358 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 border rotate: false - xy: 300, 114 + xy: 601, 368 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 conduit-liquid rotate: false - xy: 818, 408 + xy: 651, 378 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 cross-1 rotate: false - xy: 918, 408 + xy: 711, 378 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 cross-2 rotate: false - xy: 405, 235 + xy: 369, 228 size: 16, 16 orig: 16, 16 offset: 0, 0 @@ -1140,7 +1147,7 @@ cross-4 index: -1 enemyspawn rotate: false - xy: 958, 398 + xy: 731, 368 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -1154,49 +1161,49 @@ nuclearreactor-shadow index: -1 place-arrow rotate: false - xy: 154, 61 + xy: 150, 81 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 playerspawn rotate: false - xy: 144, 41 + xy: 160, 91 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ripples rotate: false - xy: 459, 253 + xy: 242, 129 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 rubble-1-0 rotate: false - xy: 582, 398 + xy: 600, 398 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 rubble-1-1 rotate: false - xy: 600, 416 + xy: 618, 416 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 rubble-2-0 rotate: false - xy: 600, 398 + xy: 618, 398 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 rubble-2-1 rotate: false - xy: 618, 416 + xy: 636, 416 size: 16, 16 orig: 16, 16 offset: 0, 0 @@ -1217,7 +1224,7 @@ rubble-3-1 index: -1 shadow-1 rotate: false - xy: 459, 241 + xy: 254, 129 size: 10, 10 orig: 10, 10 offset: 0, 0 @@ -1259,14 +1266,14 @@ shadow-6 index: -1 shadow-corner rotate: false - xy: 459, 229 + xy: 266, 131 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 shadow-round-1 rotate: false - xy: 459, 217 + xy: 278, 131 size: 10, 10 orig: 10, 10 offset: 0, 0 @@ -1294,154 +1301,154 @@ shadow-rounded-2 index: -1 shadow-shock-mine rotate: false - xy: 354, 160 + xy: 104, 33 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 bridge-conduit-arrow rotate: false - xy: 310, 116 + xy: 611, 378 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 bridge-conduit-bridge rotate: false - xy: 320, 116 + xy: 581, 338 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 bridge-conduit-end rotate: false - xy: 330, 120 + xy: 591, 348 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 conduit-bottom rotate: false - xy: 788, 408 + xy: 611, 348 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 conduit-bottom-0 rotate: false - xy: 788, 398 + xy: 621, 358 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 conduit-bottom-1 rotate: false - xy: 798, 408 + xy: 631, 368 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 conduit-bottom-2 rotate: false - xy: 788, 388 + xy: 641, 378 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 conduit-bottom-3 rotate: false - xy: 798, 398 + xy: 611, 338 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 conduit-bottom-4 rotate: false - xy: 808, 408 + xy: 621, 348 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 conduit-bottom-5 rotate: false - xy: 798, 388 + xy: 631, 358 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 conduit-bottom-6 rotate: false - xy: 808, 398 + xy: 641, 368 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 conduit-top-0 rotate: false - xy: 808, 388 + xy: 621, 338 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 conduit-top-1 rotate: false - xy: 818, 398 + xy: 631, 348 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 conduit-top-2 rotate: false - xy: 828, 408 + xy: 641, 358 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 conduit-top-3 rotate: false - xy: 818, 388 + xy: 651, 368 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 conduit-top-4 rotate: false - xy: 828, 398 + xy: 661, 378 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 conduit-top-5 rotate: false - xy: 838, 408 + xy: 631, 338 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 conduit-top-6 rotate: false - xy: 828, 388 + xy: 641, 348 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 liquid-router-bottom rotate: false - xy: 948, 368 + xy: 579, 318 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 liquid-router-liquid rotate: false - xy: 958, 368 + xy: 579, 308 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 liquid-router-top rotate: false - xy: 968, 368 + xy: 589, 318 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -1469,70 +1476,70 @@ liquid-tank-top index: -1 phase-conduit-arrow rotate: false - xy: 210, 95 + xy: 172, 111 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 phase-conduit-bridge rotate: false - xy: 200, 75 + xy: 182, 111 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 phase-conduit-end rotate: false - xy: 210, 85 + xy: 192, 111 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 pulse-conduit-top-0 rotate: false - xy: 154, 51 + xy: 170, 101 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 pulse-conduit-top-1 rotate: false - xy: 164, 61 + xy: 160, 81 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 pulse-conduit-top-2 rotate: false - xy: 154, 41 + xy: 170, 91 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 pulse-conduit-top-3 rotate: false - xy: 164, 51 + xy: 180, 101 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 pulse-conduit-top-4 rotate: false - xy: 174, 61 + xy: 170, 81 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 pulse-conduit-top-5 rotate: false - xy: 164, 41 + xy: 180, 91 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 pulse-conduit-top-6 rotate: false - xy: 174, 51 + xy: 190, 101 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -1623,7 +1630,7 @@ fusion-reactor-top index: -1 rtg-generator-top rotate: false - xy: 194, 51 + xy: 170, 71 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -1644,7 +1651,7 @@ thorium-reactor-lights index: -1 turbine-generator-top rotate: false - xy: 690, 398 + xy: 708, 398 size: 16, 16 orig: 16, 16 offset: 0, 0 @@ -1763,112 +1770,112 @@ block-icon-blast-mixer index: -1 centrifuge-liquid rotate: false - xy: 351, 242 + xy: 387, 235 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 cryofluidmixer-bottom rotate: false - xy: 369, 228 + xy: 387, 217 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 cryofluidmixer-liquid rotate: false - xy: 387, 217 + xy: 405, 217 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 cryofluidmixer-top rotate: false - xy: 405, 217 + xy: 423, 295 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 cultivator rotate: false - xy: 423, 295 + xy: 423, 277 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 cultivator-middle rotate: false - xy: 423, 277 + xy: 423, 259 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 cultivator-top rotate: false - xy: 423, 259 + xy: 423, 241 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 lavasmelter rotate: false - xy: 858, 368 + xy: 691, 328 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 oilrefinery rotate: false - xy: 998, 374 + xy: 619, 308 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 phase-weaver rotate: false - xy: 921, 434 + xy: 957, 434 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 phase-weaver-bottom rotate: false - xy: 939, 434 + xy: 975, 434 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 phase-weaver-weave rotate: false - xy: 957, 434 + xy: 1007, 424 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 plastanium-compressor-top rotate: false - xy: 975, 434 + xy: 564, 414 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 pulverizer rotate: false - xy: 184, 61 + xy: 180, 81 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 pulverizer-rotator rotate: false - xy: 174, 41 + xy: 190, 91 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 separator-liquid rotate: false - xy: 354, 170 + xy: 114, 53 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -1889,21 +1896,21 @@ core-top index: -1 sortedunloader rotate: false - xy: 445, 171 + xy: 134, 33 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-1 rotate: false - xy: 482, 293 + xy: 459, 282 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-1-top rotate: false - xy: 471, 271 + xy: 459, 272 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -1973,7 +1980,7 @@ cyclone index: -1 duo rotate: false - xy: 948, 388 + xy: 721, 358 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -1987,7 +1994,7 @@ fuse index: -1 hail rotate: false - xy: 808, 378 + xy: 761, 378 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -2001,14 +2008,14 @@ hail-heat index: -1 lancer rotate: false - xy: 759, 434 + xy: 777, 434 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 lancer-heat rotate: false - xy: 777, 434 + xy: 795, 434 size: 16, 16 orig: 16, 16 offset: 0, 0 @@ -2036,49 +2043,49 @@ ripple-heat index: -1 salvo rotate: false - xy: 618, 398 + xy: 636, 398 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 salvo-heat rotate: false - xy: 636, 416 + xy: 654, 416 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 salvo-panel-left rotate: false - xy: 636, 398 + xy: 654, 398 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 salvo-panel-right rotate: false - xy: 654, 416 + xy: 672, 416 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 scatter rotate: false - xy: 214, 45 + xy: 114, 63 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 scorch rotate: false - xy: 204, 35 + xy: 104, 43 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 scorch-shoot rotate: false - xy: 214, 35 + xy: 124, 63 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -2092,77 +2099,77 @@ spectre index: -1 swarmer rotate: false - xy: 654, 398 + xy: 672, 398 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 wave rotate: false - xy: 744, 398 + xy: 762, 398 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 wave-liquid rotate: false - xy: 762, 416 + xy: 780, 416 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 dagger-pad-top rotate: false - xy: 423, 241 + xy: 423, 223 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 dagger-pad-top-open rotate: false - xy: 423, 223 + xy: 441, 295 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 drone-pad-top rotate: false - xy: 441, 259 + xy: 441, 241 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 drone-pad-top-open rotate: false - xy: 441, 241 + xy: 441, 223 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 fabricator-pad-top rotate: false - xy: 441, 223 + xy: 66, 121 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 fabricator-pad-top-open rotate: false - xy: 66, 121 + xy: 84, 121 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 interceptor-pad-top rotate: false - xy: 723, 434 + xy: 741, 434 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 interceptor-pad-top-open rotate: false - xy: 741, 434 + xy: 759, 434 size: 16, 16 orig: 16, 16 offset: 0, 0 @@ -2204,21 +2211,21 @@ titan-pad-top-open index: -1 reconstructor-open rotate: false - xy: 582, 416 + xy: 600, 416 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 repair-point-turret rotate: false - xy: 184, 51 + xy: 190, 81 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 resupply-point rotate: false - xy: 184, 41 + xy: 150, 71 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -2232,35 +2239,35 @@ titan-pad index: -1 deflector-wall rotate: false - xy: 928, 398 + xy: 721, 378 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 deflector-wall-large rotate: false - xy: 441, 295 + xy: 441, 277 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 door-large-open rotate: false - xy: 441, 277 + xy: 441, 259 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 door-open rotate: false - xy: 958, 408 + xy: 711, 348 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 beam rotate: false - xy: 551, 384 + xy: 990, 420 size: 1, 12 orig: 1, 12 offset: 0, 0 @@ -2288,7 +2295,7 @@ bullet index: -1 bullet-back rotate: false - xy: 459, 206 + xy: 423, 178 size: 9, 9 orig: 9, 9 offset: 0, 0 @@ -2309,21 +2316,21 @@ clear index: -1 command-attack rotate: false - xy: 778, 406 + xy: 621, 368 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 command-idle rotate: false - xy: 778, 396 + xy: 631, 378 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 command-retreat rotate: false - xy: 778, 386 + xy: 601, 338 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -2337,14 +2344,14 @@ enemyarrow index: -1 error rotate: false - xy: 499, 362 + xy: 499, 334 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 laser rotate: false - xy: 183, 251 + xy: 577, 382 size: 1, 12 orig: 1, 12 offset: 0, 0 @@ -2365,7 +2372,7 @@ laserfull index: -1 minelaser rotate: false - xy: 988, 420 + xy: 183, 251 size: 1, 12 orig: 1, 12 offset: 0, 0 @@ -2379,14 +2386,14 @@ minelaser-end index: -1 missile rotate: false - xy: 471, 303 + xy: 434, 178 size: 9, 9 orig: 9, 9 offset: 0, 0 index: -1 missile-back rotate: false - xy: 482, 303 + xy: 445, 178 size: 9, 9 orig: 9, 9 offset: 0, 0 @@ -2428,21 +2435,21 @@ scorch5 index: -1 shell rotate: false - xy: 471, 292 + xy: 312, 127 size: 9, 9 orig: 9, 9 offset: 0, 0 index: -1 shell-back rotate: false - xy: 471, 281 + xy: 459, 302 size: 9, 9 orig: 9, 9 offset: 0, 0 index: -1 shot rotate: false - xy: 354, 150 + xy: 134, 63 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -2456,7 +2463,7 @@ transfer index: -1 transfer-arrow rotate: false - xy: 718, 368 + xy: 204, 65 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -2484,14 +2491,14 @@ blackstone-cliff-edge-1 index: -1 blackstone-cliff-edge-2 rotate: false - xy: 554, 387 + xy: 156, 121 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blackstone-cliff-side rotate: false - xy: 156, 121 + xy: 459, 292 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -2519,28 +2526,28 @@ block-icon-blast-drill index: -1 block-icon-bridge-conduit rotate: false - xy: 471, 251 + xy: 459, 242 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 bridge-conduit rotate: false - xy: 471, 251 + xy: 459, 242 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-icon-bridge-conveyor rotate: false - xy: 471, 241 + xy: 459, 232 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 bridge-conveyor rotate: false - xy: 471, 241 + xy: 459, 232 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -2561,14 +2568,14 @@ centrifuge index: -1 block-icon-combustion-generator rotate: false - xy: 471, 231 + xy: 459, 222 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 combustion-generator rotate: false - xy: 471, 231 + xy: 459, 222 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -2589,14 +2596,14 @@ command-center index: -1 block-icon-composite-wall rotate: false - xy: 471, 221 + xy: 459, 212 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 composite-wall rotate: false - xy: 471, 221 + xy: 459, 212 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -2617,35 +2624,35 @@ composite-wall-large index: -1 block-icon-conduit rotate: false - xy: 578, 386 + xy: 470, 304 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-icon-conveyor rotate: false - xy: 588, 388 + xy: 480, 304 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 conveyor-0-0 rotate: false - xy: 588, 388 + xy: 480, 304 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-icon-copper-wall rotate: false - xy: 598, 388 + xy: 459, 202 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 copper-wall rotate: false - xy: 598, 388 + xy: 459, 202 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -2722,14 +2729,14 @@ dart-ship-factory index: -1 block-icon-deepwater rotate: false - xy: 608, 388 + xy: 455, 192 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 deepwater rotate: false - xy: 608, 388 + xy: 455, 192 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -2750,14 +2757,14 @@ delta-mech-factory index: -1 block-icon-dirt rotate: false - xy: 618, 388 + xy: 456, 182 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 dirt1 rotate: false - xy: 618, 388 + xy: 456, 182 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -2778,14 +2785,14 @@ distributor index: -1 block-icon-door rotate: false - xy: 628, 388 + xy: 465, 192 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 door rotate: false - xy: 628, 388 + xy: 465, 192 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -2813,21 +2820,21 @@ block-icon-drone-pad index: -1 block-icon-drop-point rotate: false - xy: 638, 388 + xy: 466, 182 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 drop-point rotate: false - xy: 638, 388 + xy: 466, 182 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-icon-duo rotate: false - xy: 648, 388 + xy: 230, 119 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -2869,63 +2876,63 @@ glaive-ship-factory index: -1 block-icon-grass rotate: false - xy: 658, 388 + xy: 240, 119 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 grass1 rotate: false - xy: 658, 388 + xy: 240, 119 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-icon-hail rotate: false - xy: 668, 388 + xy: 250, 119 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-icon-ice rotate: false - xy: 678, 388 + xy: 260, 119 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ice1 rotate: false - xy: 678, 388 + xy: 260, 119 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-icon-icerock rotate: false - xy: 688, 388 + xy: 270, 121 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 icerock1 rotate: false - xy: 688, 388 + xy: 270, 121 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-icon-incinerator rotate: false - xy: 698, 388 + xy: 280, 121 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 incinerator rotate: false - xy: 698, 388 + xy: 280, 121 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -2939,28 +2946,28 @@ block-icon-interceptor-pad index: -1 block-icon-itemsource rotate: false - xy: 708, 388 + xy: 290, 124 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 itemsource rotate: false - xy: 708, 388 + xy: 290, 124 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-icon-itemvoid rotate: false - xy: 718, 388 + xy: 300, 124 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 itemvoid rotate: false - xy: 718, 388 + xy: 300, 124 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -2981,14 +2988,14 @@ javelin-ship-factory index: -1 block-icon-junction rotate: false - xy: 728, 388 + xy: 456, 172 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 junction rotate: false - xy: 728, 388 + xy: 456, 172 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -3009,35 +3016,35 @@ block-icon-laser-drill index: -1 block-icon-lava rotate: false - xy: 738, 388 + xy: 466, 172 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 lava rotate: false - xy: 738, 388 + xy: 466, 172 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-icon-liquid-junction rotate: false - xy: 748, 388 + xy: 290, 114 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 liquid-junction rotate: false - xy: 748, 388 + xy: 290, 114 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-icon-liquid-router rotate: false - xy: 435, 179 + xy: 300, 114 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -3051,14 +3058,14 @@ block-icon-liquid-tank index: -1 block-icon-liquidsource rotate: false - xy: 445, 181 + xy: 310, 117 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 liquidsource rotate: false - xy: 445, 181 + xy: 310, 117 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -3086,14 +3093,14 @@ block-icon-mechanical-drill index: -1 block-icon-mechanical-pump rotate: false - xy: 455, 181 + xy: 310, 107 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 mechanical-pump rotate: false - xy: 455, 181 + xy: 310, 107 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -3107,14 +3114,14 @@ block-icon-meltdown index: -1 block-icon-melter rotate: false - xy: 230, 119 + xy: 320, 117 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 melter rotate: false - xy: 230, 119 + xy: 320, 117 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -3135,14 +3142,14 @@ mend-projector index: -1 block-icon-metalfloor rotate: false - xy: 240, 119 + xy: 320, 107 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 metalfloor1 rotate: false - xy: 240, 119 + xy: 320, 107 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -3156,14 +3163,14 @@ block-icon-monsoon-pad index: -1 block-icon-oil rotate: false - xy: 250, 119 + xy: 330, 120 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 oil rotate: false - xy: 250, 119 + xy: 330, 120 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -3189,79 +3196,93 @@ omega-mech-factory orig: 24, 24 offset: 0, 0 index: -1 +block-icon-overdrive-projector + rotate: false + xy: 445, 367 + size: 16, 16 + orig: 16, 16 + offset: 0, 0 + index: -1 +overdrive-projector + rotate: false + xy: 445, 367 + size: 16, 16 + orig: 16, 16 + offset: 0, 0 + index: -1 block-icon-overflow-gate rotate: false - xy: 260, 119 + xy: 330, 110 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 overflow-gate rotate: false - xy: 260, 119 + xy: 330, 110 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-icon-phase-conduit rotate: false - xy: 270, 121 + xy: 330, 100 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 phase-conduit rotate: false - xy: 270, 121 + xy: 330, 100 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-icon-phase-conveyor rotate: false - xy: 280, 121 + xy: 582, 388 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 phase-conveyor rotate: false - xy: 280, 121 + xy: 582, 388 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-icon-phase-wall rotate: false - xy: 290, 124 + xy: 592, 388 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 phase-wall rotate: false - xy: 290, 124 + xy: 592, 388 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-icon-phase-wall-large rotate: false - xy: 445, 367 + xy: 445, 349 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 phase-wall-large rotate: false - xy: 445, 367 + xy: 445, 349 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 block-icon-phase-weaver rotate: false - xy: 445, 349 + xy: 445, 331 size: 16, 16 orig: 16, 16 offset: 0, 0 @@ -3275,161 +3296,161 @@ block-icon-plasma-drill index: -1 block-icon-plastanium-compressor rotate: false - xy: 445, 331 + xy: 463, 368 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 plastanium-compressor rotate: false - xy: 445, 331 + xy: 463, 368 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 block-icon-pneumatic-drill rotate: false - xy: 463, 368 + xy: 463, 350 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 block-icon-power-node rotate: false - xy: 300, 124 + xy: 602, 388 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 power-node rotate: false - xy: 300, 124 + xy: 602, 388 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-icon-power-node-large rotate: false - xy: 463, 350 + xy: 463, 332 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 power-node-large rotate: false - xy: 463, 350 + xy: 463, 332 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 block-icon-powerinfinite rotate: false - xy: 471, 211 + xy: 612, 388 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 powerinfinite rotate: false - xy: 471, 211 + xy: 612, 388 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-icon-powervoid rotate: false - xy: 578, 376 + xy: 622, 388 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 powervoid rotate: false - xy: 578, 376 + xy: 622, 388 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-icon-pulse-conduit rotate: false - xy: 588, 378 + xy: 632, 388 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-icon-pulverizer rotate: false - xy: 598, 378 + xy: 642, 388 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-icon-pyratite-mixer rotate: false - xy: 463, 332 + xy: 481, 368 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 pyratite-mixer rotate: false - xy: 463, 332 + xy: 481, 368 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 block-icon-reconstructor rotate: false - xy: 481, 368 + xy: 481, 350 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 dagger-pad rotate: false - xy: 481, 368 + xy: 481, 350 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 drone-pad rotate: false - xy: 481, 368 + xy: 481, 350 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 fabricator-pad rotate: false - xy: 481, 368 + xy: 481, 350 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 interceptor-pad rotate: false - xy: 481, 368 + xy: 481, 350 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 reconstructor rotate: false - xy: 481, 368 + xy: 481, 350 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 block-icon-repair-point rotate: false - xy: 608, 378 + xy: 652, 388 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 repair-point rotate: false - xy: 608, 378 + xy: 652, 388 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -3443,182 +3464,182 @@ block-icon-ripple index: -1 block-icon-rock rotate: false - xy: 618, 378 + xy: 662, 388 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 rock1 rotate: false - xy: 618, 378 + xy: 662, 388 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-icon-rotary-pump rotate: false - xy: 481, 350 + xy: 481, 332 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 rotary-pump rotate: false - xy: 481, 350 + xy: 481, 332 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 block-icon-router rotate: false - xy: 628, 378 + xy: 672, 388 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 router rotate: false - xy: 628, 378 + xy: 672, 388 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-icon-rtg-generator rotate: false - xy: 638, 378 + xy: 682, 388 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 rtg-generator rotate: false - xy: 638, 378 + xy: 682, 388 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-icon-salvo rotate: false - xy: 481, 332 + xy: 445, 313 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 block-icon-sand rotate: false - xy: 648, 378 + xy: 692, 388 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 sand1 rotate: false - xy: 648, 378 + xy: 692, 388 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-icon-scorch rotate: false - xy: 658, 378 + xy: 702, 388 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-icon-separator rotate: false - xy: 668, 378 + xy: 712, 388 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 separator rotate: false - xy: 668, 378 + xy: 712, 388 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-icon-shock-mine rotate: false - xy: 678, 378 + xy: 722, 388 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 shock-mine rotate: false - xy: 678, 378 + xy: 722, 388 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-icon-shrub rotate: false - xy: 688, 378 + xy: 732, 388 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 shrub rotate: false - xy: 688, 378 + xy: 732, 388 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-icon-silicon-smelter rotate: false - xy: 445, 313 + xy: 463, 314 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 silicon-smelter rotate: false - xy: 445, 313 + xy: 463, 314 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 block-icon-smelter rotate: false - xy: 698, 378 + xy: 742, 388 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 smelter rotate: false - xy: 698, 378 + xy: 742, 388 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-icon-snow rotate: false - xy: 708, 378 + xy: 752, 388 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 snow1 rotate: false - xy: 708, 378 + xy: 752, 388 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-icon-solar-panel rotate: false - xy: 718, 378 + xy: 762, 388 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 solar-panel rotate: false - xy: 718, 378 + xy: 762, 388 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -3639,42 +3660,42 @@ solar-panel-large index: -1 block-icon-solidifer rotate: false - xy: 728, 378 + xy: 772, 388 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 solidifer rotate: false - xy: 728, 378 + xy: 772, 388 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-icon-sorter rotate: false - xy: 738, 378 + xy: 782, 390 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 sorter rotate: false - xy: 738, 378 + xy: 782, 390 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-icon-space rotate: false - xy: 748, 378 + xy: 792, 390 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 space rotate: false - xy: 748, 378 + xy: 792, 390 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -3688,91 +3709,91 @@ block-icon-spectre index: -1 block-icon-stone rotate: false - xy: 758, 388 + xy: 581, 378 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 stone1 rotate: false - xy: 758, 388 + xy: 581, 378 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-icon-surge-wall rotate: false - xy: 758, 378 + xy: 581, 368 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 surge-wall rotate: false - xy: 758, 378 + xy: 581, 368 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-icon-surge-wall-large rotate: false - xy: 463, 314 + xy: 481, 314 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 surge-wall-large rotate: false - xy: 463, 314 + xy: 481, 314 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 block-icon-swarmer rotate: false - xy: 481, 314 + xy: 25, 13 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 block-icon-tau-mech-factory rotate: false - xy: 25, 13 + xy: 43, 13 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 tau-mech-factory rotate: false - xy: 25, 13 + xy: 43, 13 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 block-icon-thermal-generator rotate: false - xy: 43, 13 + xy: 275, 179 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 thermal-generator rotate: false - xy: 43, 13 + xy: 275, 179 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 block-icon-thermal-pump rotate: false - xy: 275, 179 + xy: 278, 161 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 thermal-pump rotate: false - xy: 275, 179 + xy: 278, 161 size: 16, 16 orig: 16, 16 offset: 0, 0 @@ -3793,28 +3814,28 @@ thorium-reactor index: -1 block-icon-thorium-wall rotate: false - xy: 768, 390 + xy: 591, 378 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 thorium-wall rotate: false - xy: 768, 390 + xy: 591, 378 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-icon-thorium-wall-large rotate: false - xy: 278, 161 + xy: 278, 143 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 thorium-wall-large rotate: false - xy: 278, 161 + xy: 278, 143 size: 16, 16 orig: 16, 16 offset: 0, 0 @@ -3828,56 +3849,56 @@ block-icon-titan-pad index: -1 block-icon-titanium-conveyor rotate: false - xy: 768, 380 + xy: 581, 358 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 titanium-conveyor-0-0 rotate: false - xy: 768, 380 + xy: 581, 358 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-icon-trident-ship-factory rotate: false - xy: 278, 143 + xy: 387, 253 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 trident-ship-factory rotate: false - xy: 278, 143 + xy: 387, 253 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 block-icon-turbine-generator rotate: false - xy: 387, 253 + xy: 405, 253 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 turbine-generator rotate: false - xy: 387, 253 + xy: 405, 253 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 block-icon-unloader rotate: false - xy: 470, 201 + xy: 591, 368 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 unloader rotate: false - xy: 470, 201 + xy: 591, 368 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -3912,1085 +3933,1085 @@ warp-gate index: -1 block-icon-water rotate: false - xy: 467, 191 + xy: 601, 378 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 water rotate: false - xy: 467, 191 + xy: 601, 378 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-icon-water-extractor rotate: false - xy: 405, 253 + xy: 369, 246 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 block-icon-wave rotate: false - xy: 369, 246 + xy: 351, 242 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 deepwater-cliff-edge rotate: false - xy: 908, 388 + xy: 681, 338 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 deepwater-cliff-edge-1 rotate: false - xy: 918, 398 + xy: 691, 348 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 deepwater-cliff-edge-2 rotate: false - xy: 928, 408 + xy: 701, 358 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 deepwater-cliff-side rotate: false - xy: 918, 388 + xy: 711, 368 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 dirt-cliff-edge rotate: false - xy: 938, 398 + xy: 711, 358 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 dirt-cliff-edge-1 rotate: false - xy: 948, 408 + xy: 721, 368 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 dirt-cliff-edge-2 rotate: false - xy: 938, 388 + xy: 731, 378 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 dirt-cliff-side rotate: false - xy: 948, 398 + xy: 701, 338 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 lava-cliff-edge rotate: false - xy: 818, 368 + xy: 651, 328 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 lava-cliff-edge-1 rotate: false - xy: 828, 368 + xy: 661, 328 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 lava-cliff-edge-2 rotate: false - xy: 838, 368 + xy: 671, 328 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 lava-cliff-side rotate: false - xy: 848, 368 + xy: 681, 328 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 liquid-icon-cryofluid rotate: false - xy: 908, 368 + xy: 741, 328 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 liquid-icon-lava rotate: false - xy: 918, 368 + xy: 751, 328 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 liquid-icon-oil rotate: false - xy: 928, 368 + xy: 761, 328 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 liquid-icon-water rotate: false - xy: 938, 368 + xy: 771, 328 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 mech-icon-alpha-mech rotate: false - xy: 527, 342 + xy: 541, 370 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 mech-icon-dart-ship rotate: false - xy: 527, 328 + xy: 541, 356 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 mech-icon-delta-mech rotate: false - xy: 541, 370 + xy: 541, 342 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 mech-icon-omega-mech rotate: false - xy: 359, 210 + xy: 359, 194 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 mech-icon-tau-mech rotate: false - xy: 359, 194 + xy: 375, 200 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 mech-icon-trident-ship rotate: false - xy: 375, 200 + xy: 391, 201 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 trident-ship rotate: false - xy: 375, 200 + xy: 391, 201 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 metalfloor-cliff-edge rotate: false - xy: 988, 370 + xy: 599, 308 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 metalfloor-cliff-edge-1 rotate: false - xy: 998, 414 + xy: 609, 318 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 metalfloor-cliff-edge-2 rotate: false - xy: 998, 404 + xy: 589, 288 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 metalfloor-cliff-side rotate: false - xy: 1008, 414 + xy: 599, 298 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 oil-cliff-edge rotate: false - xy: 998, 394 + xy: 609, 308 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 oil-cliff-edge-1 rotate: false - xy: 1008, 404 + xy: 619, 318 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 oil-cliff-edge-2 rotate: false - xy: 998, 384 + xy: 599, 288 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 oil-cliff-side rotate: false - xy: 1008, 394 + xy: 609, 298 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-coal-blackstone1 rotate: false - xy: 1008, 384 + xy: 629, 318 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-coal-blackstone2 rotate: false - xy: 1008, 374 + xy: 609, 288 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-coal-blackstone3 rotate: false - xy: 998, 364 + xy: 619, 298 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-coal-grass1 rotate: false - xy: 1008, 364 + xy: 629, 308 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-coal-grass2 rotate: false - xy: 988, 360 + xy: 639, 318 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-coal-grass3 rotate: false - xy: 998, 354 + xy: 619, 288 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-coal-ice1 rotate: false - xy: 1008, 354 + xy: 629, 298 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-coal-ice2 rotate: false - xy: 342, 122 + xy: 639, 308 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-coal-ice3 rotate: false - xy: 340, 112 + xy: 649, 318 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-coal-sand1 rotate: false - xy: 102, 113 + xy: 629, 288 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-coal-sand2 rotate: false - xy: 112, 113 + xy: 639, 298 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-coal-sand3 rotate: false - xy: 122, 113 + xy: 649, 308 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-coal-snow1 rotate: false - xy: 132, 113 + xy: 659, 318 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-coal-snow2 rotate: false - xy: 142, 113 + xy: 639, 288 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-coal-snow3 rotate: false - xy: 100, 103 + xy: 649, 298 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-coal-stone1 rotate: false - xy: 100, 93 + xy: 659, 308 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-coal-stone2 rotate: false - xy: 110, 103 + xy: 669, 318 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-coal-stone3 rotate: false - xy: 100, 83 + xy: 649, 288 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-copper-blackstone1 rotate: false - xy: 120, 103 + xy: 659, 298 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-copper-blackstone2 rotate: false - xy: 110, 93 + xy: 669, 308 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-copper-blackstone3 rotate: false - xy: 100, 73 + xy: 679, 318 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-copper-grass1 rotate: false - xy: 130, 103 + xy: 659, 288 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-copper-grass2 rotate: false - xy: 120, 93 + xy: 669, 298 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-copper-grass3 rotate: false - xy: 110, 83 + xy: 679, 308 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-copper-ice1 rotate: false - xy: 140, 103 + xy: 689, 318 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-copper-ice2 rotate: false - xy: 130, 93 + xy: 669, 288 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-copper-ice3 rotate: false - xy: 120, 83 + xy: 679, 298 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-copper-sand1 rotate: false - xy: 110, 73 + xy: 689, 308 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-copper-sand2 rotate: false - xy: 140, 93 + xy: 699, 318 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-copper-sand3 rotate: false - xy: 130, 83 + xy: 679, 288 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-copper-snow1 rotate: false - xy: 120, 73 + xy: 689, 298 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-copper-snow2 rotate: false - xy: 140, 83 + xy: 699, 308 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-copper-snow3 rotate: false - xy: 130, 73 + xy: 709, 318 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-copper-stone1 rotate: false - xy: 140, 73 + xy: 689, 288 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-copper-stone2 rotate: false - xy: 152, 111 + xy: 699, 298 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-copper-stone3 rotate: false - xy: 162, 111 + xy: 709, 308 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-lead-blackstone1 rotate: false - xy: 172, 111 + xy: 719, 318 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-lead-blackstone2 rotate: false - xy: 182, 111 + xy: 699, 288 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-lead-blackstone3 rotate: false - xy: 192, 111 + xy: 709, 298 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-lead-grass1 rotate: false - xy: 150, 101 + xy: 719, 308 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-lead-grass2 rotate: false - xy: 150, 91 + xy: 729, 318 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-lead-grass3 rotate: false - xy: 160, 101 + xy: 709, 288 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-lead-ice1 rotate: false - xy: 150, 81 + xy: 719, 298 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-lead-ice2 rotate: false - xy: 160, 91 + xy: 729, 308 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-lead-ice3 rotate: false - xy: 170, 101 + xy: 739, 318 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-lead-sand1 rotate: false - xy: 160, 81 + xy: 719, 288 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-lead-sand2 rotate: false - xy: 170, 91 + xy: 729, 298 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-lead-sand3 rotate: false - xy: 180, 101 + xy: 739, 308 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-lead-snow1 rotate: false - xy: 170, 81 + xy: 749, 318 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-lead-snow2 rotate: false - xy: 180, 91 + xy: 729, 288 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-lead-snow3 rotate: false - xy: 190, 101 + xy: 739, 298 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-lead-stone1 rotate: false - xy: 180, 81 + xy: 749, 308 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-lead-stone2 rotate: false - xy: 190, 91 + xy: 759, 318 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-lead-stone3 rotate: false - xy: 190, 81 + xy: 739, 288 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-thorium-blackstone1 rotate: false - xy: 150, 71 + xy: 749, 298 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-thorium-blackstone2 rotate: false - xy: 160, 71 + xy: 759, 308 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-thorium-blackstone3 rotate: false - xy: 170, 71 + xy: 769, 318 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-thorium-grass1 rotate: false - xy: 180, 71 + xy: 749, 288 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-thorium-grass2 rotate: false - xy: 190, 71 + xy: 759, 298 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-thorium-grass3 rotate: false - xy: 202, 115 + xy: 769, 308 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-thorium-ice1 rotate: false - xy: 212, 115 + xy: 759, 288 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-thorium-ice2 rotate: false - xy: 104, 63 + xy: 769, 298 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-thorium-ice3 rotate: false - xy: 104, 53 + xy: 769, 288 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-thorium-sand1 rotate: false - xy: 114, 63 + xy: 102, 113 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-thorium-sand2 rotate: false - xy: 104, 43 + xy: 112, 113 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-thorium-sand3 rotate: false - xy: 124, 63 + xy: 122, 113 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-thorium-snow1 rotate: false - xy: 114, 53 + xy: 132, 113 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-thorium-snow2 rotate: false - xy: 104, 33 + xy: 142, 113 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-thorium-snow3 rotate: false - xy: 134, 63 + xy: 100, 103 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-thorium-stone1 rotate: false - xy: 124, 53 + xy: 100, 93 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-thorium-stone2 rotate: false - xy: 114, 43 + xy: 110, 103 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-thorium-stone3 rotate: false - xy: 134, 53 + xy: 100, 83 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-titanium-blackstone1 rotate: false - xy: 124, 43 + xy: 120, 103 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-titanium-blackstone2 rotate: false - xy: 114, 33 + xy: 110, 93 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-titanium-blackstone3 rotate: false - xy: 134, 43 + xy: 100, 73 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-titanium-grass1 rotate: false - xy: 124, 33 + xy: 130, 103 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-titanium-grass2 rotate: false - xy: 134, 33 + xy: 110, 83 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-titanium-grass3 rotate: false - xy: 115, 23 + xy: 120, 93 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-titanium-ice1 rotate: false - xy: 115, 13 + xy: 140, 103 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-titanium-ice2 rotate: false - xy: 125, 23 + xy: 110, 73 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-titanium-ice3 rotate: false - xy: 125, 13 + xy: 120, 83 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-titanium-sand1 rotate: false - xy: 117, 3 + xy: 130, 93 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-titanium-sand2 rotate: false - xy: 135, 23 + xy: 120, 73 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-titanium-sand3 rotate: false - xy: 135, 13 + xy: 130, 83 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-titanium-snow1 rotate: false - xy: 127, 3 + xy: 140, 93 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-titanium-snow2 rotate: false - xy: 137, 3 + xy: 130, 73 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-titanium-snow3 rotate: false - xy: 202, 105 + xy: 140, 83 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-titanium-stone1 rotate: false - xy: 212, 105 + xy: 140, 73 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-titanium-stone2 rotate: false - xy: 200, 95 + xy: 152, 111 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-titanium-stone3 rotate: false - xy: 200, 85 + xy: 162, 111 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 sand-cliff-edge rotate: false - xy: 204, 55 + xy: 202, 115 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 sand-cliff-edge-1 rotate: false - xy: 204, 45 + xy: 212, 115 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 sand-cliff-edge-2 rotate: false - xy: 214, 65 + xy: 104, 63 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 sand-cliff-side rotate: false - xy: 214, 55 + xy: 104, 53 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 snow-cliff-edge rotate: false - xy: 350, 110 + xy: 124, 43 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 snow-cliff-edge-1 rotate: false - xy: 340, 102 + xy: 114, 33 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 snow-cliff-edge-2 rotate: false - xy: 350, 100 + xy: 134, 43 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 snow-cliff-side rotate: false - xy: 435, 169 + xy: 124, 33 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 space-cliff-edge rotate: false - xy: 455, 171 + xy: 115, 23 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 space-cliff-edge-1 rotate: false - xy: 465, 171 + xy: 115, 13 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 space-cliff-edge-2 rotate: false - xy: 475, 171 + xy: 125, 23 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 space-cliff-side rotate: false - xy: 485, 171 + xy: 125, 13 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 unit-icon-dagger rotate: false - xy: 564, 382 + xy: 555, 354 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 unit-icon-titan rotate: false - xy: 708, 416 + xy: 726, 416 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 item-biomatter rotate: false - xy: 888, 378 + xy: 761, 358 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 item-blast-compound rotate: false - xy: 898, 378 + xy: 771, 368 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 item-coal rotate: false - xy: 908, 378 + xy: 751, 338 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 item-copper rotate: false - xy: 918, 378 + xy: 761, 348 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 item-dense-alloy rotate: false - xy: 928, 378 + xy: 771, 358 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 item-lead rotate: false - xy: 938, 378 + xy: 761, 338 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 item-phase-matter rotate: false - xy: 948, 378 + xy: 771, 348 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 item-plastanium rotate: false - xy: 958, 378 + xy: 771, 338 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 item-pyratite rotate: false - xy: 968, 378 + xy: 581, 328 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 item-sand rotate: false - xy: 978, 378 + xy: 591, 328 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 item-silicon rotate: false - xy: 768, 370 + xy: 601, 328 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 item-stone rotate: false - xy: 778, 366 + xy: 611, 328 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 item-surge-alloy rotate: false - xy: 788, 368 + xy: 621, 328 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 item-thorium rotate: false - xy: 798, 368 + xy: 631, 328 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 item-titanium rotate: false - xy: 808, 368 + xy: 641, 328 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 liquid-icon rotate: false - xy: 898, 368 + xy: 731, 328 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -5018,105 +5039,105 @@ alpha-mech-leg index: -1 delta-mech rotate: false - xy: 328, 130 + xy: 523, 384 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 delta-mech-leg rotate: false - xy: 509, 384 + xy: 537, 384 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 omega-mech rotate: false - xy: 391, 201 + xy: 407, 201 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 omega-mech-armor rotate: false - xy: 407, 201 + xy: 375, 184 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 omega-mech-base rotate: false - xy: 375, 184 + xy: 391, 185 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 omega-mech-leg rotate: false - xy: 391, 185 + xy: 407, 185 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 tau-mech rotate: false - xy: 423, 189 + xy: 439, 189 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 tau-mech-base rotate: false - xy: 527, 300 + xy: 563, 382 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 tau-mech-leg rotate: false - xy: 541, 300 + xy: 555, 368 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 dart-ship rotate: false - xy: 328, 144 + xy: 509, 384 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 glaive-ship rotate: false - xy: 762, 400 + xy: 780, 400 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 mech-icon-glaive-ship rotate: false - xy: 762, 400 + xy: 780, 400 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 javelin-ship rotate: false - xy: 513, 342 + xy: 513, 328 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 mech-icon-javelin-ship rotate: false - xy: 513, 342 + xy: 513, 328 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 javelin-ship-shield rotate: false - xy: 527, 356 + xy: 527, 342 size: 12, 12 orig: 12, 12 offset: 0, 0 @@ -5293,28 +5314,28 @@ discord-banner-over index: -1 controller-cursor rotate: false - xy: 387, 235 + xy: 405, 235 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-about rotate: false - xy: 780, 418 + xy: 798, 418 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-add rotate: false - xy: 796, 418 + xy: 814, 418 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-admin rotate: false - xy: 812, 418 + xy: 830, 418 size: 14, 14 orig: 14, 14 offset: 0, 0 @@ -5328,238 +5349,238 @@ icon-admin-small index: -1 icon-areaDelete rotate: false - xy: 342, 168 + xy: 551, 385 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-arrow rotate: false - xy: 84, 121 + xy: 102, 123 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-arrow-16 rotate: false - xy: 84, 121 + xy: 102, 123 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-arrow-down rotate: false - xy: 356, 182 + xy: 555, 328 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-arrow-left rotate: false - xy: 342, 156 + xy: 555, 316 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-arrow-right rotate: false - xy: 342, 144 + xy: 555, 304 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-arrow-up rotate: false - xy: 342, 132 + xy: 569, 370 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-back rotate: false - xy: 102, 123 + xy: 120, 123 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-ban rotate: false - xy: 828, 418 + xy: 846, 418 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-break rotate: false - xy: 120, 123 + xy: 138, 123 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-cancel rotate: false - xy: 138, 123 + xy: 64, 103 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-chat rotate: false - xy: 166, 121 + xy: 569, 358 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-check rotate: false - xy: 64, 103 + xy: 64, 85 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-crafting rotate: false - xy: 178, 121 + xy: 569, 346 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-cursor rotate: false - xy: 190, 121 + xy: 166, 121 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-defense rotate: false - xy: 21, 1 + xy: 178, 121 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-dev-builds rotate: false - xy: 844, 418 + xy: 862, 418 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-discord rotate: false - xy: 860, 418 + xy: 878, 418 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-distribution rotate: false - xy: 33, 1 + xy: 190, 121 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-donate rotate: false - xy: 876, 418 + xy: 894, 418 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-dots rotate: false - xy: 892, 418 + xy: 910, 418 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-editor rotate: false - xy: 908, 418 + xy: 926, 418 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-egg rotate: false - xy: 924, 418 + xy: 942, 418 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-elevation rotate: false - xy: 64, 85 + xy: 82, 103 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-eraser rotate: false - xy: 82, 103 + xy: 64, 67 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-exit rotate: false - xy: 940, 418 + xy: 958, 418 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-file rotate: false - xy: 64, 67 + xy: 82, 85 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-file-image rotate: false - xy: 82, 85 + xy: 82, 67 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-file-text rotate: false - xy: 956, 418 + xy: 974, 418 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-fill rotate: false - xy: 82, 67 + xy: 68, 49 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-floppy rotate: false - xy: 972, 418 + xy: 285, 246 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-floppy-16 rotate: false - xy: 68, 49 + xy: 86, 49 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-folder rotate: false - xy: 285, 246 + xy: 279, 230 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-folder-parent rotate: false - xy: 279, 230 + xy: 279, 214 size: 14, 14 orig: 14, 14 offset: 0, 0 @@ -5573,441 +5594,441 @@ icon-generated index: -1 icon-github rotate: false - xy: 279, 214 + xy: 279, 198 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-google-play rotate: false - xy: 279, 198 + xy: 301, 246 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-grid rotate: false - xy: 86, 49 + xy: 68, 31 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-hold rotate: false - xy: 45, 1 + xy: 569, 334 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-holdDelete rotate: false - xy: 57, 1 + xy: 567, 322 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-home rotate: false - xy: 301, 246 + xy: 317, 250 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-host rotate: false - xy: 317, 250 + xy: 295, 230 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-info rotate: false - xy: 69, 1 + xy: 567, 310 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-itch.io rotate: false - xy: 295, 230 + xy: 295, 214 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-item rotate: false - xy: 81, 1 + xy: 567, 298 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-items-none rotate: false - xy: 868, 378 + xy: 741, 338 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 icon-line rotate: false - xy: 68, 31 + xy: 86, 31 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-link rotate: false - xy: 295, 214 + xy: 295, 198 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-liquid rotate: false - xy: 93, 1 + xy: 555, 292 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-load rotate: false - xy: 295, 198 + xy: 293, 182 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-load-image rotate: false - xy: 86, 31 + xy: 61, 13 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-load-map rotate: false - xy: 61, 13 + xy: 79, 13 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-loading rotate: false - xy: 79, 13 + xy: 97, 13 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-locked rotate: false - xy: 97, 13 + xy: 423, 205 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-logic rotate: false - xy: 105, 1 + xy: 567, 286 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-map rotate: false - xy: 293, 182 + xy: 296, 166 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-menu rotate: false - xy: 206, 125 + xy: 21, 1 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-menu-large rotate: false - xy: 423, 205 + xy: 441, 205 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-missing rotate: false - xy: 218, 125 + xy: 33, 1 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-none rotate: false - xy: 230, 129 + xy: 45, 1 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-nullitem rotate: false - xy: 878, 378 + xy: 751, 348 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 icon-pause rotate: false - xy: 242, 129 + xy: 57, 1 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-pencil rotate: false - xy: 441, 205 + xy: 561, 432 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-pencil-small rotate: false - xy: 296, 166 + xy: 296, 150 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-pick rotate: false - xy: 561, 432 + xy: 579, 434 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-play rotate: false - xy: 254, 129 + xy: 69, 1 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-play-2 rotate: false - xy: 296, 150 + xy: 333, 243 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-players rotate: false - xy: 266, 131 + xy: 81, 1 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-power rotate: false - xy: 278, 131 + xy: 93, 1 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-production rotate: false - xy: 423, 177 + xy: 105, 1 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-quit rotate: false - xy: 333, 243 + xy: 317, 234 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-redo rotate: false - xy: 579, 434 + xy: 597, 434 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-refresh rotate: false - xy: 317, 234 + xy: 311, 218 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-rename rotate: false - xy: 311, 218 + xy: 311, 202 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-resize rotate: false - xy: 597, 434 + xy: 615, 434 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-rotate rotate: false - xy: 311, 202 + xy: 333, 227 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-rotate-arrow rotate: false - xy: 333, 227 + xy: 349, 226 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-rotate-left rotate: false - xy: 349, 226 + xy: 327, 211 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-rotate-right rotate: false - xy: 327, 211 + xy: 327, 195 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-save rotate: false - xy: 327, 195 + xy: 311, 186 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-save-image rotate: false - xy: 615, 434 + xy: 633, 434 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-save-map rotate: false - xy: 633, 434 + xy: 651, 434 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-settings rotate: false - xy: 312, 126 + xy: 993, 412 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-terrain rotate: false - xy: 651, 434 + xy: 669, 434 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-tools rotate: false - xy: 311, 186 + xy: 312, 170 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-touch rotate: false - xy: 459, 301 + xy: 1005, 412 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-touchDelete rotate: false - xy: 459, 289 + xy: 206, 125 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-trash rotate: false - xy: 312, 170 + xy: 312, 154 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-trash-16 rotate: false - xy: 669, 434 + xy: 687, 434 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-trello rotate: false - xy: 312, 154 + xy: 343, 210 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-tutorial rotate: false - xy: 343, 210 + xy: 343, 194 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-undo rotate: false - xy: 687, 434 + xy: 705, 434 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-units rotate: false - xy: 459, 277 + xy: 218, 125 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-unlocks rotate: false - xy: 343, 194 + xy: 296, 134 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-weapon rotate: false - xy: 459, 265 + xy: 230, 129 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-wiki rotate: false - xy: 296, 134 + xy: 312, 138 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-zoom rotate: false - xy: 705, 434 + xy: 723, 434 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-zoom-small rotate: false - xy: 312, 138 + xy: 359, 210 size: 14, 14 orig: 14, 14 offset: 0, 0 @@ -6209,42 +6230,42 @@ unit-icon-alpha-drone index: -1 dagger rotate: false - xy: 453, 191 + xy: 328, 158 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 dagger-base rotate: false - xy: 328, 172 + xy: 328, 144 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 delta-mech-base rotate: false - xy: 328, 172 + xy: 328, 144 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 dagger-leg rotate: false - xy: 328, 158 + xy: 328, 130 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 drone rotate: false - xy: 537, 384 + xy: 499, 348 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 unit-icon-drone rotate: false - xy: 537, 384 + xy: 499, 348 size: 12, 12 orig: 12, 12 offset: 0, 0 @@ -6265,14 +6286,14 @@ unit-icon-fabricator index: -1 interceptor rotate: false - xy: 527, 370 + xy: 527, 356 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 unit-icon-interceptor rotate: false - xy: 527, 370 + xy: 527, 356 size: 12, 12 orig: 12, 12 offset: 0, 0 @@ -6293,28 +6314,28 @@ unit-icon-monsoon index: -1 power-cell rotate: false - xy: 407, 185 + xy: 423, 189 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 titan rotate: false - xy: 672, 416 + xy: 690, 416 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 titan-base rotate: false - xy: 672, 398 + xy: 690, 398 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 titan-leg rotate: false - xy: 690, 416 + xy: 708, 416 size: 16, 16 orig: 16, 16 offset: 0, 0 @@ -6342,42 +6363,42 @@ missiles-equip index: -1 chain-blaster-equip rotate: false - xy: 439, 191 + xy: 328, 172 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 flakgun-equip rotate: false - xy: 499, 348 + xy: 499, 320 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 flamethrower-equip rotate: false - xy: 499, 334 + xy: 513, 370 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 heal-blaster-equip rotate: false - xy: 513, 370 + xy: 527, 370 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 shockgun-equip rotate: false - xy: 513, 314 + xy: 541, 314 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 swarmer-equip rotate: false - xy: 513, 300 + xy: 541, 300 size: 12, 12 orig: 12, 12 offset: 0, 0 diff --git a/core/assets/sprites/sprites.png b/core/assets/sprites/sprites.png index 28c4b24a97..4151395e1c 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 d0989d2234..43770c106d 100644 --- a/core/src/io/anuke/mindustry/content/Recipes.java +++ b/core/src/io/anuke/mindustry/content/Recipes.java @@ -35,6 +35,7 @@ public class Recipes implements ContentList{ //projectors new Recipe(defense, DefenseBlocks.mendProjector, new ItemStack(Items.lead, 200), new ItemStack(Items.densealloy, 150), new ItemStack(Items.titanium, 150), new ItemStack(Items.silicon, 250)); + new Recipe(defense, DefenseBlocks.overdriveProjector, new ItemStack(Items.lead, 200), new ItemStack(Items.densealloy, 150), new ItemStack(Items.titanium, 150), new ItemStack(Items.silicon, 250)); //extra blocks new Recipe(defense, DefenseBlocks.shockMine, new ItemStack(Items.lead, 50), new ItemStack(Items.silicon, 25)) diff --git a/core/src/io/anuke/mindustry/content/blocks/DefenseBlocks.java b/core/src/io/anuke/mindustry/content/blocks/DefenseBlocks.java index 7cabdfb97f..9beef09a49 100644 --- a/core/src/io/anuke/mindustry/content/blocks/DefenseBlocks.java +++ b/core/src/io/anuke/mindustry/content/blocks/DefenseBlocks.java @@ -8,7 +8,7 @@ import io.anuke.mindustry.world.blocks.defense.*; public class DefenseBlocks extends BlockList implements ContentList{ public static Block copperWall, copperWallLarge, compositeWall, compositeWallLarge, thoriumWall, thoriumWallLarge, door, doorLarge, - phaseWall, phaseWallLarge, surgeWall, surgeWallLarge, mendProjector, shockMine; + phaseWall, phaseWallLarge, surgeWall, surgeWallLarge, mendProjector, overdriveProjector, shockMine; @Override public void load(){ @@ -72,7 +72,12 @@ public class DefenseBlocks extends BlockList implements ContentList{ mendProjector = new MendProjector("mend-projector"){{ consumes.power(0.25f); - health = 100 * 4 * wallHealthMultiplier; + size = 2; + consumes.item(Items.phasematter).optional(true); + }}; + + overdriveProjector = new OverdriveProjector("overdrive-projector"){{ + consumes.power(0.25f); size = 2; consumes.item(Items.phasematter).optional(true); }}; diff --git a/core/src/io/anuke/mindustry/content/blocks/UnitBlocks.java b/core/src/io/anuke/mindustry/content/blocks/UnitBlocks.java index 6e1d090cb0..0411b4bacd 100644 --- a/core/src/io/anuke/mindustry/content/blocks/UnitBlocks.java +++ b/core/src/io/anuke/mindustry/content/blocks/UnitBlocks.java @@ -10,7 +10,7 @@ import io.anuke.mindustry.world.blocks.units.*; public class UnitBlocks extends BlockList implements ContentList{ public static Block repairPoint, dronePad, fabricatorPad, interceptorPad, monsoonPad, daggerPad, titanPad, - dropPoint, reconstructor, overdriveProjector, shieldProjector, commandCenter; + reconstructor, commandCenter; @Override public void load(){ @@ -64,11 +64,6 @@ public class UnitBlocks extends BlockList implements ContentList{ consumes.items(new ItemStack[]{new ItemStack(Items.silicon, 20), new ItemStack(Items.thorium, 30)}); }}; - dropPoint = new DropPoint("drop-point"){{ - shadow = "shadow-round-1"; - itemCapacity = 40; - }}; - repairPoint = new RepairPoint("repair-point"){{ shadow = "shadow-round-1"; repairSpeed = 0.1f; @@ -78,14 +73,6 @@ public class UnitBlocks extends BlockList implements ContentList{ size = 2; }}; - overdriveProjector = new OverdriveProjector("overdrive-projector"){{ - size = 2; - }}; - - shieldProjector = new ShieldProjector("shield-projector"){{ - size = 2; - }}; - commandCenter = new CommandCenter("command-center"){{ size = 2; }}; diff --git a/core/src/io/anuke/mindustry/core/ContentLoader.java b/core/src/io/anuke/mindustry/core/ContentLoader.java index 0f74193762..a00baf7cb0 100644 --- a/core/src/io/anuke/mindustry/core/ContentLoader.java +++ b/core/src/io/anuke/mindustry/core/ContentLoader.java @@ -1,7 +1,6 @@ package io.anuke.mindustry.core; import com.badlogic.gdx.utils.Array; -import com.badlogic.gdx.utils.IntMap; import com.badlogic.gdx.utils.ObjectMap; import com.badlogic.gdx.utils.ObjectSet; import io.anuke.mindustry.content.*; @@ -38,7 +37,7 @@ public class ContentLoader{ private ObjectMap[] contentNameMap = new ObjectMap[ContentType.values().length]; private Array[] contentMap = new Array[ContentType.values().length]; - private IntMap> temporaryMapper; + private MappableContent[][] temporaryMapper; private ObjectSet> initialization = new ObjectSet<>(); private ContentList[] content = { //effects @@ -183,7 +182,7 @@ public class ContentLoader{ contentMap[content.getContentType().ordinal()].add(content); } - public void setTemporaryMapper(IntMap> temporaryMapper){ + public void setTemporaryMapper(MappableContent[][] temporaryMapper){ this.temporaryMapper = temporaryMapper; } @@ -199,13 +198,13 @@ public class ContentLoader{ } public T getByID(ContentType type, int id){ - if(temporaryMapper != null && temporaryMapper.containsKey(type.ordinal()) && temporaryMapper.get(type.ordinal()).containsKey(id)){ - return (T)temporaryMapper.get(type.ordinal()).get(id); - } - //offset negative values by 256, as they are probably a product of byte overflow if(id < 0) id += 256; + if(temporaryMapper != null && temporaryMapper[type.ordinal()] != null){ + return (T)temporaryMapper[type.ordinal()][id]; + } + if(id >= contentMap[type.ordinal()].size || id < 0){ throw new RuntimeException("No " + type.name() + " with ID '" + id + "' found!"); } diff --git a/core/src/io/anuke/mindustry/io/SaveFileVersion.java b/core/src/io/anuke/mindustry/io/SaveFileVersion.java index a7a881bce6..178428ee07 100644 --- a/core/src/io/anuke/mindustry/io/SaveFileVersion.java +++ b/core/src/io/anuke/mindustry/io/SaveFileVersion.java @@ -1,7 +1,6 @@ package io.anuke.mindustry.io; import com.badlogic.gdx.utils.Array; -import com.badlogic.gdx.utils.IntMap; import io.anuke.mindustry.game.Content; import io.anuke.mindustry.game.Difficulty; import io.anuke.mindustry.game.MappableContent; @@ -32,19 +31,20 @@ public abstract class SaveFileVersion{ return new SaveMeta(version, time, playtime, build, sector, mode, map, wave, Difficulty.values()[difficulty]); } - public IntMap> readContentHeader(DataInputStream stream) throws IOException{ - IntMap> map = new IntMap<>(); + public MappableContent[][] readContentHeader(DataInputStream stream) throws IOException{ byte mapped = stream.readByte(); + + MappableContent[][] map = new MappableContent[mapped][0]; + for (int i = 0; i < mapped; i++) { ContentType type = ContentType.values()[stream.readByte()]; - map.put(type.ordinal(), new IntMap<>()); short total = stream.readShort(); + map[i] = new MappableContent[total]; + for (int j = 0; j < total; j++) { - int id = stream.readUnsignedByte(); String name = stream.readUTF(); - if(content.getContentMap()[type.ordinal()].size == 0) continue; - map.get(type.ordinal()).put(id, content.getByName(type, name)); + map[i][j] = content.getByName(type, name); } } @@ -69,10 +69,7 @@ public abstract class SaveFileVersion{ stream.writeByte(arr.first().getContentType().ordinal()); stream.writeShort(arr.size); for(Content c : arr){ - MappableContent m = (MappableContent)c; - if(m.id > 255) throw new RuntimeException("Content " + c + " has ID > 255!"); - stream.writeByte(m.id); - stream.writeUTF(m.getContentName()); + stream.writeUTF(((MappableContent)c).getContentName()); } } } diff --git a/core/src/io/anuke/mindustry/world/blocks/defense/OverdriveProjector.java b/core/src/io/anuke/mindustry/world/blocks/defense/OverdriveProjector.java index 5b9413f079..4f687c3625 100644 --- a/core/src/io/anuke/mindustry/world/blocks/defense/OverdriveProjector.java +++ b/core/src/io/anuke/mindustry/world/blocks/defense/OverdriveProjector.java @@ -1,10 +1,105 @@ package io.anuke.mindustry.world.blocks.defense; +import com.badlogic.gdx.graphics.Color; +import com.badlogic.gdx.graphics.g2d.TextureRegion; +import io.anuke.mindustry.content.StatusEffects; +import io.anuke.mindustry.content.fx.BlockFx; +import io.anuke.mindustry.entities.TileEntity; +import io.anuke.mindustry.entities.Units; import io.anuke.mindustry.world.Block; +import io.anuke.mindustry.world.Tile; +import io.anuke.ucore.core.Effects; +import io.anuke.ucore.core.Graphics; +import io.anuke.ucore.core.Timers; +import io.anuke.ucore.graphics.Draw; +import io.anuke.ucore.graphics.Hue; +import io.anuke.ucore.graphics.Lines; +import io.anuke.ucore.util.Mathf; -public class OverdriveProjector extends Block { +public class OverdriveProjector extends Block{ + private static Color color = Color.valueOf("feb380"); + private static Color phase = Color.valueOf("ffd59e"); - public OverdriveProjector(String name) { + protected int timerUse = timers ++; + + protected TextureRegion topRegion; + protected float reload = 250f; + protected float range = 50f; + protected float healPercent = 6f; + protected float phaseBoost = 10f; + protected float useTime = 300f; + + public OverdriveProjector(String name){ super(name); + solid = true; + update = true; + hasPower = true; + hasItems = true; + itemCapacity = 10; } -} + + @Override + public void load(){ + super.load(); + topRegion = Draw.region(name + "-top"); + } + + @Override + public void update(Tile tile){ + OverdriveEntity entity = tile.entity(); + entity.heat = Mathf.lerpDelta(entity.heat, entity.cons.valid() ? 1f : 0f, 0.08f); + entity.charge += entity.heat * Timers.delta(); + + entity.phaseHeat = Mathf.lerpDelta(entity.phaseHeat, (float)entity.items.get(consumes.item()) / itemCapacity, 0.1f); + + if(entity.timer.get(timerUse, useTime) && entity.items.total() > 0){ + entity.items.remove(consumes.item(), 1); + } + + if(entity.charge >= reload){ + float realRange = range + entity.phaseHeat * 20f; + + Effects.effect(BlockFx.commandSend, Hue.mix(color, phase, entity.phaseHeat), tile.drawx(), tile.drawy(), realRange); + Units.getNearby(tile.getTeam(), tile.drawx(), tile.drawy(), realRange, unit -> unit.applyEffect(StatusEffects.overdrive, 1f)); + entity.charge = 0f; + } + } + + @Override + public void drawSelect(Tile tile){ + Draw.color(color); + Lines.dashCircle(tile.drawx(), tile.drawy() - 1f, range); + Draw.color(); + } + + @Override + public void draw(Tile tile){ + super.draw(tile); + + OverdriveEntity entity = tile.entity(); + float f = 1f - (Timers.time() / 100f) % 1f; + + Draw.color(color, phase, entity.phaseHeat); + Draw.alpha(entity.heat * Mathf.absin(Timers.time(), 10f, 1f) * 0.5f); + Graphics.setAdditiveBlending(); + Draw.rect(topRegion, tile.drawx(), tile.drawy()); + + Graphics.setNormalBlending(); + Draw.alpha(1f); + Lines.stroke((2f * f + 0.2f)* entity.heat); + Lines.circle(tile.drawx(), tile.drawy(), (1f-f) * 9f); + + Draw.reset(); + } + + @Override + public TileEntity getEntity(){ + return new OverdriveEntity(); + } + + class OverdriveEntity extends TileEntity{ + float heat; + float charge; + float phaseHeat; + } +} \ No newline at end of file diff --git a/core/src/io/anuke/mindustry/world/blocks/units/OverdriveProjector.java b/core/src/io/anuke/mindustry/world/blocks/units/OverdriveProjector.java deleted file mode 100644 index 740f631053..0000000000 --- a/core/src/io/anuke/mindustry/world/blocks/units/OverdriveProjector.java +++ /dev/null @@ -1,12 +0,0 @@ -package io.anuke.mindustry.world.blocks.units; - -import io.anuke.mindustry.content.StatusEffects; - -public class OverdriveProjector extends Projector{ - - public OverdriveProjector(String name){ - super(name); - - status = StatusEffects.overdrive; - } -} diff --git a/core/src/io/anuke/mindustry/world/blocks/units/Projector.java b/core/src/io/anuke/mindustry/world/blocks/units/Projector.java deleted file mode 100644 index 0b05f77f7e..0000000000 --- a/core/src/io/anuke/mindustry/world/blocks/units/Projector.java +++ /dev/null @@ -1,62 +0,0 @@ -package io.anuke.mindustry.world.blocks.units; - -import io.anuke.mindustry.entities.TileEntity; -import io.anuke.mindustry.entities.Units; -import io.anuke.mindustry.graphics.Palette; -import io.anuke.mindustry.type.StatusEffect; -import io.anuke.mindustry.world.Block; -import io.anuke.mindustry.world.Tile; -import io.anuke.ucore.core.Timers; -import io.anuke.ucore.graphics.Draw; -import io.anuke.ucore.graphics.Lines; -import io.anuke.ucore.util.Mathf; - -public abstract class Projector extends Block{ - protected final int timerApply = timers++; - protected final float applyTime = 4f; - - protected float range = 80f; - - protected StatusEffect status; - protected float intensity = 1f; - - public Projector(String name){ - super(name); - hasPower = true; - update = true; - solid = true; - } - - @Override - public void drawSelect(Tile tile){ - Draw.color(Palette.accent); - Lines.dashCircle(tile.drawx(), tile.drawy(), range); - Draw.reset(); - } - - @Override - public void update(Tile tile){ - ProjectorEntity entity = tile.entity(); - - if(entity.cons.valid()){ - entity.heat = Mathf.lerpDelta(entity.heat, 1f, 0.01f); - }else{ - entity.heat = Mathf.lerpDelta(entity.heat, 0f, 0.01f); - } - - if(entity.heat > 0.6f && Timers.get(timerApply, applyTime)){ - Units.getNearby(tile.getTeam(), tile.drawx(), tile.drawy(), range, unit -> { - unit.applyEffect(status, intensity); - }); - } - } - - @Override - public TileEntity getEntity(){ - return new ProjectorEntity(); - } - - public class ProjectorEntity extends TileEntity{ - public float heat; - } -} diff --git a/core/src/io/anuke/mindustry/world/blocks/units/ShieldProjector.java b/core/src/io/anuke/mindustry/world/blocks/units/ShieldProjector.java deleted file mode 100644 index aab518b7b1..0000000000 --- a/core/src/io/anuke/mindustry/world/blocks/units/ShieldProjector.java +++ /dev/null @@ -1,12 +0,0 @@ -package io.anuke.mindustry.world.blocks.units; - -import io.anuke.mindustry.content.StatusEffects; - -public class ShieldProjector extends Projector{ - - public ShieldProjector(String name){ - super(name); - - status = StatusEffects.shielded; - } -} diff --git a/packer/src/io/anuke/mindustry/Generators.java b/packer/src/io/anuke/mindustry/Generators.java index 64c22c5bb2..e4d0bf7b10 100644 --- a/packer/src/io/anuke/mindustry/Generators.java +++ b/packer/src/io/anuke/mindustry/Generators.java @@ -3,6 +3,7 @@ package io.anuke.mindustry; import com.badlogic.gdx.graphics.Color; import com.badlogic.gdx.graphics.g2d.TextureRegion; import io.anuke.mindustry.entities.units.UnitType; +import io.anuke.mindustry.type.ContentType; import io.anuke.mindustry.type.Item; import io.anuke.mindustry.type.Liquid; import io.anuke.mindustry.type.Mech; @@ -11,6 +12,7 @@ import io.anuke.mindustry.world.blocks.Floor; import io.anuke.mindustry.world.blocks.OreBlock; import io.anuke.ucore.graphics.Draw; import io.anuke.ucore.graphics.Hue; +import static io.anuke.mindustry.Vars.*; public class Generators { @@ -71,7 +73,7 @@ public class Generators { }); context.generate("mech-icons", () -> { - for(Mech mech : Mech.all()){ + for(Mech mech : content.getBy(ContentType.mech)){ mech.load(); mech.weapon.load(); @@ -96,7 +98,7 @@ public class Generators { }); context.generate("unit-icons", () -> { - for(UnitType type : UnitType.all()){ + for(UnitType type : content.getBy(ContentType.unit)){ type.load(); type.weapon.load(); @@ -124,7 +126,7 @@ public class Generators { }); context.generate("liquid-icons", () -> { - for(Liquid liquid : Liquid.all()){ + for(Liquid liquid : content.liquids()){ Image image = context.get("liquid-icon"); for (int x = 0; x < image.width(); x++) { for (int y = 0; y < image.height(); y++) { diff --git a/packer/src/io/anuke/mindustry/ImageContext.java b/packer/src/io/anuke/mindustry/ImageContext.java index 9e6be28333..c05fc30df4 100644 --- a/packer/src/io/anuke/mindustry/ImageContext.java +++ b/packer/src/io/anuke/mindustry/ImageContext.java @@ -23,7 +23,8 @@ public class ImageContext { public void load() throws IOException{ Log.setLogger(new NoopLogHandler()); - ContentLoader.load(); + Vars.content = new ContentLoader(); + Vars.content.load(); Log.setLogger(new LogHandler()); String spritesFolder = new File("../../../assets/sprites").getAbsolutePath();