diff --git a/core/assets-raw/sprites/blocks/units/fabricator-factory-top-open.png b/core/assets-raw/sprites/blocks/units/fabricator-factory-top-open.png index 25db6bb2b2..9e99b15561 100644 Binary files a/core/assets-raw/sprites/blocks/units/fabricator-factory-top-open.png and b/core/assets-raw/sprites/blocks/units/fabricator-factory-top-open.png differ diff --git a/core/assets-raw/sprites/blocks/units/fabricator-factory-top.png b/core/assets-raw/sprites/blocks/units/fabricator-factory-top.png index 2e6562c82b..373223f3cc 100644 Binary files a/core/assets-raw/sprites/blocks/units/fabricator-factory-top.png and b/core/assets-raw/sprites/blocks/units/fabricator-factory-top.png differ diff --git a/core/assets-raw/sprites/blocks/units/mechs/javelin-ship-factory-open.png b/core/assets-raw/sprites/blocks/units/mechs/javelin-ship-factory-open.png new file mode 100644 index 0000000000..2e3ed0c350 Binary files /dev/null and b/core/assets-raw/sprites/blocks/units/mechs/javelin-ship-factory-open.png differ diff --git a/core/assets-raw/sprites/blocks/units/mechs/javelin-ship-factory.png b/core/assets-raw/sprites/blocks/units/mechs/javelin-ship-factory.png new file mode 100644 index 0000000000..786be242a0 Binary files /dev/null and b/core/assets-raw/sprites/blocks/units/mechs/javelin-ship-factory.png differ diff --git a/core/assets-raw/sprites/mechs/mechs/delta-mech.png b/core/assets-raw/sprites/mechs/mechs/delta-mech.png index abf90c7fbf..20ddec3a99 100644 Binary files a/core/assets-raw/sprites/mechs/mechs/delta-mech.png and b/core/assets-raw/sprites/mechs/mechs/delta-mech.png differ diff --git a/core/assets-raw/sprites/mechs/ships/javelin-ship.png b/core/assets-raw/sprites/mechs/ships/javelin-ship.png index d0d0dd52ec..2f0f7a7e11 100644 Binary files a/core/assets-raw/sprites/mechs/ships/javelin-ship.png and b/core/assets-raw/sprites/mechs/ships/javelin-ship.png differ diff --git a/core/assets-raw/sprites/weapons/missiles-equip.png b/core/assets-raw/sprites/weapons/missiles-equip.png new file mode 100644 index 0000000000..67603de505 Binary files /dev/null and b/core/assets-raw/sprites/weapons/missiles-equip.png differ diff --git a/core/assets/bundles/bundle.properties b/core/assets/bundles/bundle.properties index b83f384f85..d7c38d0691 100644 --- a/core/assets/bundles/bundle.properties +++ b/core/assets/bundles/bundle.properties @@ -484,3 +484,29 @@ block.powerinfinite.name=Power Infinite block.unloader.name=Unloader block.sortedunloader.name=Sorted Unloader block.vault.name=Vault +block.wave.name=Wave +block.swarmer.name=Swarmer +block.salvo.name=Salvo +block.ripple.name=Ripple +block.phase-conveyor.name=Phase Conveyor +block.overflow-gate.name=Overflow Gate +block.bridge-conveyor.name=Bridge Conveyor +block.plastanium-compressor.name=Plastanium Compressor +block.pyratite-mixer.name=Pyratite Mixer +block.blast-mixer.name=Blast Mixer +block.solidifer.name=Solidifer +block.solar-panel.name=Solar Panel +block.solar-panel-large.name=Large Solar Panel +block.oil-extractor.name=Oil Extractor +block.javelin-ship-factory.name=Javelin Ship factory +block.drone-factory.name=Drone Factory +block.fabricator-factory.name=Fabricator Factory +block.repair-point.name=Repair Point +block.resupply-point.name=Resupply Point +block.pulse-conduit.name=Pulse Conduit +block.phase-conduit.name=Phase Conduit +block.liquid-router.name=Liquid Router +block.liquid-tank.name=Liquid Tank +block.liquid-junction.name=Liquid Junction +block.bridge-conduit.name=Bridge Conduit +block.rotary-pump.name=Rotary Pump diff --git a/core/assets/sprites/sprites.atlas b/core/assets/sprites/sprites.atlas index 09e1f86ea4..d1af0512ac 100644 --- a/core/assets/sprites/sprites.atlas +++ b/core/assets/sprites/sprites.atlas @@ -13,42 +13,42 @@ background index: -1 bridge-conveyor-arrow rotate: false - xy: 758, 249 + xy: 393, 63 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 bridge-conveyor-bridge rotate: false - xy: 768, 259 + xy: 393, 53 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 bridge-conveyor-end rotate: false - xy: 788, 269 + xy: 393, 43 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 phase-conveyor-arrow rotate: false - xy: 952, 275 + xy: 948, 281 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 phase-conveyor-bridge rotate: false - xy: 962, 277 + xy: 958, 283 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 phase-conveyor-end rotate: false - xy: 972, 277 + xy: 968, 283 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -90,42 +90,42 @@ blast-drill-top index: -1 carbide-drill rotate: false - xy: 758, 239 + xy: 393, 33 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 carbide-drill-rotator rotate: false - xy: 768, 249 + xy: 393, 23 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 carbide-drill-top rotate: false - xy: 778, 259 + xy: 393, 13 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 laser-drill rotate: false - xy: 949, 347 + xy: 967, 369 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 laser-drill-rotator rotate: false - xy: 949, 329 + xy: 985, 387 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 laser-drill-top rotate: false - xy: 967, 405 + xy: 967, 351 size: 16, 16 orig: 16, 16 offset: 0, 0 @@ -188,49 +188,49 @@ plasma-drill-top index: -1 tungsten-drill rotate: false - xy: 888, 215 + xy: 802, 221 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 tungsten-drill-rotator rotate: false - xy: 898, 225 + xy: 812, 231 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 tungsten-drill-top rotate: false - xy: 908, 235 + xy: 822, 241 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 water-extractor rotate: false - xy: 287, 47 + xy: 305, 11 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 water-extractor-liquid rotate: false - xy: 287, 29 + xy: 269, 5 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 water-extractor-rotator rotate: false - xy: 305, 47 + xy: 251, 2 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 water-extractor-top rotate: false - xy: 305, 29 + xy: 705, 334 size: 16, 16 orig: 16, 16 offset: 0, 0 @@ -286,595 +286,595 @@ blackstone3 index: -1 blackstoneedge rotate: false - xy: 854, 315 + xy: 647, 178 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 coal1 rotate: false - xy: 798, 269 + xy: 403, 87 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 coal2 rotate: false - xy: 768, 239 + xy: 413, 87 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 coal3 rotate: false - xy: 778, 249 + xy: 423, 87 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 dirt2 rotate: false - xy: 788, 249 + xy: 403, 57 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 dirt3 rotate: false - xy: 798, 259 + xy: 413, 67 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 dirtedge rotate: false - xy: 938, 315 + xy: 832, 311 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 grass-cliff-edge rotate: false - xy: 818, 259 + xy: 413, 37 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 grass-cliff-edge-1 rotate: false - xy: 828, 263 + xy: 403, 17 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 grass-cliff-edge-2 rotate: false - xy: 808, 239 + xy: 413, 27 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 grass-cliff-side rotate: false - xy: 818, 249 + xy: 413, 17 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 grass2 rotate: false - xy: 798, 239 + xy: 413, 47 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 grass3 rotate: false - xy: 808, 249 + xy: 403, 27 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 grassedge rotate: false - xy: 597, 192 + xy: 902, 315 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 ice-cliff-edge rotate: false - xy: 818, 239 + xy: 423, 47 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ice-cliff-edge-1 rotate: false - xy: 828, 243 + xy: 423, 37 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ice-cliff-edge-2 rotate: false - xy: 838, 253 + xy: 423, 27 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ice-cliff-side rotate: false - xy: 838, 243 + xy: 423, 17 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ice2 rotate: false - xy: 828, 253 + xy: 423, 67 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ice3 rotate: false - xy: 838, 263 + xy: 423, 57 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 iceedge rotate: false - xy: 625, 192 + xy: 930, 315 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 icerock2 rotate: false - xy: 708, 226 + xy: 413, 7 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 icerockshadow1 rotate: false - xy: 718, 226 + xy: 423, 7 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 rockshadow1 rotate: false - xy: 718, 226 + xy: 423, 7 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 icerockshadow2 rotate: false - xy: 728, 226 + xy: 431, 77 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 rockshadow2 rotate: false - xy: 728, 226 + xy: 431, 77 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 lavaedge rotate: false - xy: 639, 192 + xy: 846, 301 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 lead1 rotate: false - xy: 788, 219 + xy: 958, 293 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 lead2 rotate: false - xy: 798, 219 + xy: 968, 293 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 lead3 rotate: false - xy: 808, 219 + xy: 978, 293 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 metalfloor2 rotate: false - xy: 862, 305 + xy: 712, 256 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 metalfloor3 rotate: false - xy: 862, 295 + xy: 722, 266 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 metalfloor4 rotate: false - xy: 872, 305 + xy: 742, 276 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 metalfloor5 rotate: false - xy: 872, 295 + xy: 712, 246 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 metalfloor6 rotate: false - xy: 882, 305 + xy: 722, 256 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 metalflooredge rotate: false - xy: 653, 191 + xy: 930, 301 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 oiledge rotate: false - xy: 667, 191 + xy: 958, 303 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 rock2 rotate: false - xy: 858, 233 + xy: 697, 179 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 sand-cliff-edge rotate: false - xy: 868, 265 + xy: 707, 171 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 sand-cliff-edge-1 rotate: false - xy: 868, 255 + xy: 782, 275 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 sand-cliff-edge-2 rotate: false - xy: 878, 265 + xy: 782, 265 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 sand-cliff-side rotate: false - xy: 868, 245 + xy: 782, 255 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 sand2 rotate: false - xy: 858, 213 + xy: 709, 191 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 sand3 rotate: false - xy: 858, 203 + xy: 707, 181 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 sandedge rotate: false - xy: 967, 319 + xy: 986, 303 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 shrubshadow rotate: false - xy: 868, 235 + xy: 782, 225 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 snow-cliff-edge rotate: false - xy: 898, 265 + xy: 792, 261 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 snow-cliff-edge-1 rotate: false - xy: 868, 225 + xy: 802, 271 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 snow-cliff-edge-2 rotate: false - xy: 878, 235 + xy: 792, 251 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 snow-cliff-side rotate: false - xy: 888, 245 + xy: 802, 261 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 snow2 rotate: false - xy: 878, 245 + xy: 782, 215 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 snow3 rotate: false - xy: 888, 255 + xy: 792, 271 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 snowedge rotate: false - xy: 1009, 323 + xy: 454, 156 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 spaceedge rotate: false - xy: 315, 105 + xy: 468, 156 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 stone-cliff-edge rotate: false - xy: 868, 215 + xy: 802, 251 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 stone-cliff-edge-1 rotate: false - xy: 878, 225 + xy: 812, 261 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 stone-cliff-edge-2 rotate: false - xy: 888, 235 + xy: 822, 271 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 stone-cliff-side rotate: false - xy: 898, 245 + xy: 792, 231 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 stone2 rotate: false - xy: 898, 255 + xy: 812, 271 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 stone3 rotate: false - xy: 908, 265 + xy: 792, 241 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 stoneedge rotate: false - xy: 315, 91 + xy: 688, 265 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 thorium1 rotate: false - xy: 908, 255 + xy: 802, 241 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 thorium2 rotate: false - xy: 918, 265 + xy: 812, 251 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 thorium3 rotate: false - xy: 868, 205 + xy: 822, 261 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 titanium1 rotate: false - xy: 878, 215 + xy: 832, 271 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 titanium2 rotate: false - xy: 888, 225 + xy: 792, 221 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 titanium3 rotate: false - xy: 898, 235 + xy: 802, 231 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 tungsten1 rotate: false - xy: 918, 255 + xy: 822, 251 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 tungsten2 rotate: false - xy: 928, 265 + xy: 832, 261 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 tungsten3 rotate: false - xy: 878, 205 + xy: 842, 271 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 water-cliff-edge rotate: false - xy: 918, 245 + xy: 832, 251 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 water-cliff-edge-1 rotate: false - xy: 928, 255 + xy: 842, 261 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 water-cliff-edge-2 rotate: false - xy: 938, 265 + xy: 852, 271 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 water-cliff-side rotate: false - xy: 888, 205 + xy: 812, 221 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 wateredge rotate: false - xy: 323, 51 + xy: 697, 211 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 block-border rotate: false - xy: 285, 1 + xy: 307, 1 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-elevation rotate: false - xy: 295, 1 + xy: 317, 1 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 combustion-generator-top rotate: false - xy: 295, 1 + xy: 317, 1 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-middle rotate: false - xy: 748, 246 + xy: 383, 51 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 pump-liquid rotate: false - xy: 748, 246 + xy: 383, 51 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-slope rotate: false - xy: 748, 236 + xy: 383, 41 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 border rotate: false - xy: 758, 269 + xy: 383, 31 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 conduit-liquid rotate: false - xy: 808, 269 + xy: 411, 77 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 cross-1 rotate: false - xy: 778, 239 + xy: 403, 67 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 cross-2 rotate: false - xy: 913, 401 + xy: 895, 365 size: 16, 16 orig: 16, 16 offset: 0, 0 @@ -895,7 +895,7 @@ cross-4 index: -1 enemyspawn rotate: false - xy: 808, 259 + xy: 403, 37 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -909,49 +909,49 @@ nuclearreactor-shadow index: -1 place-arrow rotate: false - xy: 982, 277 + xy: 978, 283 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 playerspawn rotate: false - xy: 992, 277 + xy: 988, 283 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ripples rotate: false - xy: 353, 105 + xy: 367, 81 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 rubble-1-0 rotate: false - xy: 985, 351 + xy: 1003, 337 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 rubble-1-1 rotate: false - xy: 985, 333 + xy: 279, 65 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 rubble-2-0 rotate: false - xy: 1003, 391 + xy: 297, 65 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 rubble-2-1 rotate: false - xy: 1003, 373 + xy: 261, 59 size: 16, 16 orig: 16, 16 offset: 0, 0 @@ -972,7 +972,7 @@ rubble-3-1 index: -1 shadow-1 rotate: false - xy: 341, 81 + xy: 379, 81 size: 10, 10 orig: 10, 10 offset: 0, 0 @@ -1014,7 +1014,7 @@ shadow-6 index: -1 shadow-round-1 rotate: false - xy: 353, 93 + xy: 391, 93 size: 10, 10 orig: 10, 10 offset: 0, 0 @@ -1035,63 +1035,63 @@ shadow-rounded-2 index: -1 bridge-conduit-arrow rotate: false - xy: 768, 269 + xy: 383, 21 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 bridge-conduit-bridge rotate: false - xy: 758, 259 + xy: 383, 11 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 bridge-conduit-end rotate: false - xy: 778, 269 + xy: 387, 1 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 conduit-bottom rotate: false - xy: 788, 259 + xy: 401, 77 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 conduit-top rotate: false - xy: 818, 269 + xy: 421, 77 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 liquid-router rotate: false - xy: 828, 213 + xy: 712, 276 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 liquid-router-bottom rotate: false - xy: 838, 213 + xy: 722, 276 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 liquid-router-liquid rotate: false - xy: 852, 303 + xy: 712, 266 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 liquid-router-top rotate: false - xy: 852, 293 + xy: 732, 276 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -1119,35 +1119,35 @@ liquid-tank-top index: -1 phase-conduit-arrow rotate: false - xy: 922, 275 + xy: 938, 291 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 phase-conduit-bridge rotate: false - xy: 932, 275 + xy: 948, 291 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 phase-conduit-end rotate: false - xy: 942, 275 + xy: 938, 281 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 pulse-conduit-bottom rotate: false - xy: 1002, 279 + xy: 998, 283 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 pulse-conduit-top rotate: false - xy: 1012, 279 + xy: 687, 187 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -1252,7 +1252,7 @@ nuclear-reactor-lights index: -1 rtg-generator-top rotate: false - xy: 858, 223 + xy: 697, 169 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -1357,126 +1357,126 @@ block-icon-blast-mixer index: -1 centrifuge-liquid rotate: false - xy: 877, 365 + xy: 913, 401 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 cryofluidmixer-bottom rotate: false - xy: 877, 347 + xy: 913, 383 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 cryofluidmixer-liquid rotate: false - xy: 895, 365 + xy: 931, 401 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 cryofluidmixer-top rotate: false - xy: 913, 383 + xy: 895, 347 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 cultivator rotate: false - xy: 931, 401 + xy: 913, 365 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 cultivator-middle rotate: false - xy: 895, 347 + xy: 931, 383 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 cultivator-top rotate: false - xy: 913, 365 + xy: 913, 347 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 lavasmelter rotate: false - xy: 778, 219 + xy: 828, 291 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 phase-weaver rotate: false - xy: 985, 405 + xy: 985, 369 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 phase-weaver-bottom rotate: false - xy: 967, 387 + xy: 967, 333 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 phase-weaver-weave rotate: false - xy: 967, 369 + xy: 985, 351 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 plastanium-compressor-top rotate: false - xy: 985, 387 + xy: 985, 333 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 poweralloysmelter-top rotate: false - xy: 967, 351 + xy: 1003, 391 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 powersmelter-top rotate: false - xy: 985, 369 + xy: 1003, 373 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 silicon-smelter-top rotate: false - xy: 985, 369 + xy: 1003, 373 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 pulverizer rotate: false - xy: 858, 263 + xy: 687, 177 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 pulverizer-rotator rotate: false - xy: 858, 253 + xy: 687, 167 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 separator-liquid rotate: false - xy: 878, 255 + xy: 782, 245 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -1490,14 +1490,14 @@ core-open index: -1 block-1 rotate: false - xy: 753, 342 + xy: 287, 1 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-1-top rotate: false - xy: 275, 1 + xy: 297, 1 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -1574,7 +1574,7 @@ mass-driver-turret index: -1 duo rotate: false - xy: 798, 249 + xy: 413, 57 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -1595,35 +1595,35 @@ spectre index: -1 hail rotate: false - xy: 327, 65 + xy: 321, 129 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 scatter rotate: false - xy: 327, 65 + xy: 321, 129 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 hail-heat rotate: false - xy: 323, 27 + xy: 333, 129 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 lancer rotate: false - xy: 949, 383 + xy: 985, 405 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 lancer-heat rotate: false - xy: 949, 365 + xy: 967, 387 size: 16, 16 orig: 16, 16 offset: 0, 0 @@ -1651,91 +1651,91 @@ ripple-heat index: -1 salvo rotate: false - xy: 1003, 355 + xy: 251, 38 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 salvo-heat rotate: false - xy: 1003, 337 + xy: 251, 20 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 salvo-panel-left rotate: false - xy: 279, 65 + xy: 269, 41 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 salvo-panel-right rotate: false - xy: 297, 65 + xy: 269, 23 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 scorch rotate: false - xy: 365, 117 + xy: 379, 93 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 scorch-shoot rotate: false - xy: 381, 129 + xy: 391, 105 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 swarmer rotate: false - xy: 261, 59 + xy: 287, 47 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 wave rotate: false - xy: 287, 11 + xy: 723, 334 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 wave-liquid rotate: false - xy: 305, 11 + xy: 741, 334 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 drone-factory-top rotate: false - xy: 931, 347 - size: 16, 16 - orig: 16, 16 - offset: 0, 0 - index: -1 -fabricator-factory-top - rotate: false - xy: 931, 347 + xy: 129, 42 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 drone-factory-top-open rotate: false - xy: 111, 42 + xy: 106, 24 + size: 16, 16 + orig: 16, 16 + offset: 0, 0 + index: -1 +fabricator-factory-top + rotate: false + xy: 124, 24 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 fabricator-factory-top-open rotate: false - xy: 111, 42 + xy: 147, 39 size: 16, 16 orig: 16, 16 offset: 0, 0 @@ -1749,28 +1749,35 @@ mech-factory index: -1 dart-ship-factory-open rotate: false - xy: 931, 383 + xy: 931, 365 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 delta-mech-factory-open rotate: false - xy: 913, 347 + xy: 931, 347 + size: 16, 16 + orig: 16, 16 + offset: 0, 0 + index: -1 +javelin-ship-factory-open + rotate: false + xy: 967, 405 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 reconstructor-open rotate: false - xy: 967, 333 + xy: 1003, 355 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 repair-point-turret rotate: false - xy: 858, 243 + xy: 697, 189 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -1784,14 +1791,14 @@ ship-factory index: -1 door-large-open rotate: false - xy: 931, 365 + xy: 111, 42 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 door-open rotate: false - xy: 788, 239 + xy: 403, 47 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -1847,14 +1854,14 @@ clear index: -1 enemyarrow rotate: false - xy: 698, 224 + xy: 403, 8 size: 8, 7 orig: 8, 7 offset: 0, 0 index: -1 error rotate: false - xy: 261, 6 + xy: 860, 315 size: 12, 12 orig: 12, 12 offset: 0, 0 @@ -1945,21 +1952,21 @@ scorch5 index: -1 shell rotate: false - xy: 365, 106 + xy: 1014, 310 size: 9, 9 orig: 9, 9 offset: 0, 0 index: -1 shell-back rotate: false - xy: 377, 118 + xy: 1014, 299 size: 9, 9 orig: 9, 9 offset: 0, 0 index: -1 shot rotate: false - xy: 888, 265 + xy: 782, 235 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -1973,7 +1980,7 @@ transfer index: -1 transfer-arrow rotate: false - xy: 908, 245 + xy: 812, 241 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -2008,49 +2015,49 @@ block-icon-blast-drill index: -1 block-icon-bridge-conduit rotate: false - xy: 305, 1 + xy: 319, 119 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 bridge-conduit rotate: false - xy: 305, 1 + xy: 319, 119 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-icon-bridge-conveyor rotate: false - xy: 315, 1 + xy: 329, 119 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 bridge-conveyor rotate: false - xy: 315, 1 + xy: 329, 119 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-icon-carbide-drill rotate: false - xy: 828, 283 + xy: 331, 71 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-icon-carbide-wall rotate: false - xy: 828, 273 + xy: 403, 107 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 carbide-wall rotate: false - xy: 828, 273 + xy: 403, 107 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -2085,35 +2092,35 @@ centrifuge index: -1 block-icon-combustion-generator rotate: false - xy: 319, 119 + xy: 391, 83 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 combustion-generator rotate: false - xy: 319, 119 + xy: 391, 83 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-icon-conduit rotate: false - xy: 353, 83 + xy: 341, 71 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-icon-conveyor rotate: false - xy: 365, 96 + xy: 403, 97 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 conveyor rotate: false - xy: 365, 96 + xy: 403, 97 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -2169,42 +2176,42 @@ dart-ship-factory index: -1 block-icon-deepwater rotate: false - xy: 404, 131 + xy: 413, 107 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 deepwater rotate: false - xy: 404, 131 + xy: 413, 107 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-icon-deflector-wall rotate: false - xy: 414, 131 + xy: 351, 71 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 deflector-wall rotate: false - xy: 414, 131 + xy: 351, 71 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 phase-wall rotate: false - xy: 414, 131 + xy: 351, 71 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-icon-phase-wall rotate: false - xy: 414, 131 + xy: 351, 71 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -2253,28 +2260,28 @@ delta-mech-factory index: -1 block-icon-dirt rotate: false - xy: 339, 71 + xy: 413, 97 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 dirt1 rotate: false - xy: 339, 71 + xy: 413, 97 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-icon-door rotate: false - xy: 339, 61 + xy: 423, 107 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 door rotate: false - xy: 339, 61 + xy: 423, 107 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -2300,23 +2307,16 @@ block-icon-drone-factory orig: 16, 16 offset: 0, 0 index: -1 -block-icon-fabricator-factory - rotate: false - xy: 919, 419 - size: 16, 16 - orig: 16, 16 - offset: 0, 0 - index: -1 block-icon-drop-point rotate: false - xy: 337, 51 + xy: 361, 71 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 drop-point rotate: false - xy: 337, 51 + xy: 361, 71 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -2328,6 +2328,13 @@ block-icon-duo orig: 10, 10 offset: 0, 0 index: -1 +block-icon-fabricator-factory + rotate: false + xy: 937, 419 + size: 16, 16 + orig: 16, 16 + offset: 0, 0 + index: -1 block-icon-fuse rotate: false xy: 342, 167 @@ -2344,105 +2351,119 @@ block-icon-fusion-reactor index: -1 block-icon-grass rotate: false - xy: 335, 41 + xy: 423, 97 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 grass1 rotate: false - xy: 335, 41 + xy: 423, 97 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-icon-hail rotate: false - xy: 275, 11 + xy: 688, 225 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 block-icon-ice rotate: false - xy: 335, 31 + xy: 371, 71 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ice1 rotate: false - xy: 335, 31 + xy: 371, 71 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-icon-icerock rotate: false - xy: 335, 21 + xy: 381, 71 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 icerock1 rotate: false - xy: 335, 21 + xy: 381, 71 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-icon-incinerator rotate: false - xy: 388, 119 + xy: 391, 73 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 incinerator rotate: false - xy: 388, 119 + xy: 391, 73 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-icon-itemsource rotate: false - xy: 398, 120 + xy: 323, 61 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 itemsource rotate: false - xy: 398, 120 + xy: 323, 61 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-icon-itemvoid rotate: false - xy: 408, 121 + xy: 323, 51 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 itemvoid rotate: false - xy: 408, 121 + xy: 323, 51 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 +block-icon-javelin-ship-factory + rotate: false + xy: 955, 423 + size: 16, 16 + orig: 16, 16 + offset: 0, 0 + index: -1 +javelin-ship-factory + rotate: false + xy: 955, 423 + size: 16, 16 + orig: 16, 16 + offset: 0, 0 + index: -1 block-icon-junction rotate: false - xy: 418, 121 + xy: 333, 61 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 junction rotate: false - xy: 418, 121 + xy: 333, 61 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -2456,42 +2477,42 @@ block-icon-lancer index: -1 block-icon-laser-drill rotate: false - xy: 937, 419 + xy: 973, 423 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 block-icon-lava rotate: false - xy: 424, 131 + xy: 323, 41 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 lava rotate: false - xy: 424, 131 + xy: 323, 41 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-icon-liquid-junction rotate: false - xy: 428, 121 + xy: 333, 51 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 liquid-junction rotate: false - xy: 428, 121 + xy: 333, 51 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-icon-liquid-router rotate: false - xy: 349, 71 + xy: 343, 61 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -2505,14 +2526,14 @@ block-icon-liquid-tank index: -1 block-icon-liquidsource rotate: false - xy: 349, 61 + xy: 323, 31 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 liquidsource rotate: false - xy: 349, 61 + xy: 323, 31 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -2540,14 +2561,14 @@ core-top index: -1 block-icon-mechanical-pump rotate: false - xy: 347, 51 + xy: 333, 41 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 mechanical-pump rotate: false - xy: 347, 51 + xy: 333, 41 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -2561,42 +2582,42 @@ block-icon-meltdown index: -1 block-icon-melter rotate: false - xy: 345, 41 + xy: 343, 51 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 melter rotate: false - xy: 345, 41 + xy: 343, 51 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-icon-metalfloor rotate: false - xy: 345, 31 + xy: 353, 61 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 metalfloor1 rotate: false - xy: 345, 31 + xy: 353, 61 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-icon-multiplexer rotate: false - xy: 955, 423 + xy: 991, 423 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 multiplexer rotate: false - xy: 955, 423 + xy: 991, 423 size: 16, 16 orig: 16, 16 offset: 0, 0 @@ -2617,14 +2638,14 @@ nuclear-reactor index: -1 block-icon-oil rotate: false - xy: 345, 21 + xy: 323, 21 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 oil rotate: false - xy: 345, 21 + xy: 323, 21 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -2638,63 +2659,63 @@ block-icon-oil-extractor index: -1 block-icon-oilrefinery rotate: false - xy: 337, 11 + xy: 323, 11 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 oilrefinery rotate: false - xy: 337, 11 + xy: 323, 11 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-icon-overflow-gate rotate: false - xy: 337, 1 + xy: 327, 1 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 overflow-gate rotate: false - xy: 337, 1 + xy: 327, 1 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-icon-phase-conduit rotate: false - xy: 347, 11 + xy: 343, 41 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 phase-conduit rotate: false - xy: 347, 11 + xy: 343, 41 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-icon-phase-conveyor rotate: false - xy: 347, 1 + xy: 353, 51 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 phase-conveyor rotate: false - xy: 347, 1 + xy: 353, 51 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-icon-phase-weaver rotate: false - xy: 973, 423 + xy: 841, 401 size: 16, 16 orig: 16, 16 offset: 0, 0 @@ -2708,154 +2729,154 @@ block-icon-plasma-drill index: -1 block-icon-plastanium-compressor rotate: false - xy: 991, 423 + xy: 841, 383 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 plastanium-compressor rotate: false - xy: 991, 423 + xy: 841, 383 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 block-icon-power-node rotate: false - xy: 365, 86 + xy: 363, 61 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 power-node rotate: false - xy: 365, 86 + xy: 363, 61 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-icon-power-node-large rotate: false - xy: 841, 401 + xy: 859, 401 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 power-node-large rotate: false - xy: 841, 401 + xy: 859, 401 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 block-icon-powerinfinite rotate: false - xy: 688, 269 + xy: 333, 31 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 powerinfinite rotate: false - xy: 688, 269 + xy: 333, 31 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-icon-powervoid rotate: false - xy: 688, 259 + xy: 353, 41 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 powervoid rotate: false - xy: 688, 259 + xy: 353, 41 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-icon-pulse-conduit rotate: false - xy: 688, 249 + xy: 363, 51 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-icon-pulverizer rotate: false - xy: 688, 239 + xy: 373, 61 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-icon-pyratite-mixer rotate: false - xy: 841, 383 + xy: 841, 365 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 pyratite-mixer rotate: false - xy: 841, 383 + xy: 841, 365 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 block-icon-reconstructor rotate: false - xy: 859, 401 + xy: 859, 383 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 drone-factory rotate: false - xy: 859, 401 + xy: 859, 383 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 fabricator-factory rotate: false - xy: 859, 401 + xy: 859, 383 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 reconstructor rotate: false - xy: 859, 401 + xy: 859, 383 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 block-icon-repair-point rotate: false - xy: 688, 229 + xy: 333, 21 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 repair-point rotate: false - xy: 688, 229 + xy: 333, 21 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-icon-resupply-point rotate: false - xy: 698, 263 + xy: 333, 11 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 resupply-point rotate: false - xy: 698, 263 + xy: 333, 11 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -2869,56 +2890,56 @@ block-icon-ripple index: -1 block-icon-rock rotate: false - xy: 698, 253 + xy: 337, 1 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 rock1 rotate: false - xy: 698, 253 + xy: 337, 1 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-icon-rotary-pump rotate: false - xy: 841, 365 + xy: 877, 401 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 rotary-pump rotate: false - xy: 841, 365 + xy: 877, 401 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 block-icon-router rotate: false - xy: 698, 243 + xy: 363, 41 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 router rotate: false - xy: 698, 243 + xy: 363, 41 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-icon-rtg-generator rotate: false - xy: 698, 233 + xy: 373, 51 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 rtg-generator rotate: false - xy: 698, 233 + xy: 373, 51 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -2932,105 +2953,105 @@ block-icon-salvo index: -1 block-icon-sand rotate: false - xy: 708, 266 + xy: 343, 31 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 sand1 rotate: false - xy: 708, 266 + xy: 343, 31 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-icon-scorch rotate: false - xy: 315, 65 + xy: 700, 225 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 block-icon-separator rotate: false - xy: 708, 256 + xy: 373, 41 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 separator rotate: false - xy: 708, 256 + xy: 373, 41 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-icon-shrub rotate: false - xy: 718, 266 + xy: 343, 21 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 shrub rotate: false - xy: 718, 266 + xy: 343, 21 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-icon-silicon-smelter rotate: false - xy: 859, 383 + xy: 841, 347 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 silicon-smelter rotate: false - xy: 859, 383 + xy: 841, 347 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 block-icon-smelter rotate: false - xy: 708, 246 + xy: 343, 11 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 smelter rotate: false - xy: 708, 246 + xy: 343, 11 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-icon-snow rotate: false - xy: 718, 256 + xy: 347, 1 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 snow1 rotate: false - xy: 718, 256 + xy: 347, 1 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-icon-solar-panel rotate: false - xy: 728, 266 + xy: 353, 31 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 solar-panel rotate: false - xy: 728, 266 + xy: 353, 31 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -3051,56 +3072,56 @@ solar-panel-large index: -1 block-icon-solidifer rotate: false - xy: 708, 236 + xy: 353, 21 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 solidifer rotate: false - xy: 708, 236 + xy: 353, 21 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-icon-sortedunloader rotate: false - xy: 718, 246 + xy: 353, 11 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 sortedunloader rotate: false - xy: 718, 246 + xy: 353, 11 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-icon-sorter rotate: false - xy: 728, 256 + xy: 357, 1 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 sorter rotate: false - xy: 728, 256 + xy: 357, 1 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-icon-space rotate: false - xy: 738, 266 + xy: 363, 31 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 space rotate: false - xy: 738, 266 + xy: 363, 31 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -3114,28 +3135,28 @@ block-icon-spectre index: -1 block-icon-splitter rotate: false - xy: 718, 236 + xy: 363, 21 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 splitter rotate: false - xy: 718, 236 + xy: 363, 21 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-icon-stone rotate: false - xy: 728, 246 + xy: 363, 11 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 stone1 rotate: false - xy: 728, 246 + xy: 363, 11 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -3149,133 +3170,133 @@ block-icon-swarmer index: -1 block-icon-thermal-generator rotate: false - xy: 877, 401 + xy: 859, 365 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 thermal-generator rotate: false - xy: 877, 401 + xy: 859, 365 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 block-icon-thermal-pump rotate: false - xy: 841, 347 + xy: 877, 383 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 thermal-pump rotate: false - xy: 841, 347 + xy: 877, 383 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 block-icon-thorium-wall rotate: false - xy: 738, 256 + xy: 367, 1 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 thorium-wall rotate: false - xy: 738, 256 + xy: 367, 1 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-icon-thorium-wall-large rotate: false - xy: 859, 365 + xy: 895, 401 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 thorium-wall-large rotate: false - xy: 859, 365 + xy: 895, 401 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 block-icon-titanium-conveyor rotate: false - xy: 728, 236 + xy: 373, 31 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 titanium-conveyor rotate: false - xy: 728, 236 + xy: 373, 31 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-icon-tungsten-drill rotate: false - xy: 738, 246 + xy: 373, 21 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-icon-tungsten-wall rotate: false - xy: 738, 236 + xy: 373, 11 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 tungsten-wall rotate: false - xy: 738, 236 + xy: 373, 11 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-icon-tungsten-wall-large rotate: false - xy: 877, 383 + xy: 859, 347 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 tungsten-wall-large rotate: false - xy: 877, 383 + xy: 859, 347 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 block-icon-turbine-generator rotate: false - xy: 895, 401 + xy: 877, 365 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 turbine-generator rotate: false - xy: 895, 401 + xy: 877, 365 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 block-icon-unloader rotate: false - xy: 748, 266 + xy: 377, 1 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 unloader rotate: false - xy: 748, 266 + xy: 377, 1 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -3310,21 +3331,21 @@ warp-gate index: -1 block-icon-water rotate: false - xy: 748, 256 + xy: 383, 61 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 water rotate: false - xy: 748, 256 + xy: 383, 61 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-icon-water-extractor rotate: false - xy: 859, 347 + xy: 895, 383 size: 16, 16 orig: 16, 16 offset: 0, 0 @@ -3336,723 +3357,751 @@ block-icon-wave orig: 18, 18 offset: 0, 0 index: -1 +liquid-icon-cryofluid + rotate: false + xy: 702, 271 + size: 8, 8 + orig: 8, 8 + offset: 0, 0 + index: -1 +liquid-icon-lava + rotate: false + xy: 702, 261 + size: 8, 8 + orig: 8, 8 + offset: 0, 0 + index: -1 +liquid-icon-oil + rotate: false + xy: 702, 251 + size: 8, 8 + orig: 8, 8 + offset: 0, 0 + index: -1 +liquid-icon-water + rotate: false + xy: 702, 241 + size: 8, 8 + orig: 8, 8 + offset: 0, 0 + index: -1 mech-icon-alpha-mech rotate: false - xy: 758, 279 + xy: 860, 301 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 mech-icon-dart-ship rotate: false - xy: 772, 279 + xy: 874, 301 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 mech-icon-delta-mech rotate: false - xy: 786, 279 + xy: 888, 301 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 mech-icon-halberd-ship rotate: false - xy: 800, 279 - size: 12, 12 - orig: 12, 12 - offset: 0, 0 - index: -1 -mech-icon-javelin-ship - rotate: false - xy: 800, 279 + xy: 902, 301 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 mech-icon-trident-ship rotate: false - xy: 800, 279 + xy: 902, 301 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 mech-icon-omega-mech rotate: false - xy: 814, 279 + xy: 916, 301 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 mech-icon-tau-mech rotate: false - xy: 814, 279 + xy: 916, 301 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 ore-coal-grass1 rotate: false - xy: 882, 295 + xy: 732, 266 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-coal-grass2 rotate: false - xy: 892, 305 + xy: 722, 246 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-coal-grass3 rotate: false - xy: 892, 295 + xy: 732, 256 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-coal-ice1 rotate: false - xy: 902, 305 + xy: 742, 266 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-coal-ice2 rotate: false - xy: 902, 295 + xy: 732, 246 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-coal-ice3 rotate: false - xy: 912, 305 + xy: 742, 256 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-coal-sand1 rotate: false - xy: 912, 295 + xy: 742, 246 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-coal-sand2 rotate: false - xy: 922, 305 + xy: 712, 236 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-coal-sand3 rotate: false - xy: 922, 295 + xy: 712, 226 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-coal-snow1 rotate: false - xy: 932, 305 + xy: 722, 236 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-coal-snow2 rotate: false - xy: 932, 295 + xy: 722, 226 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-coal-snow3 rotate: false - xy: 942, 305 + xy: 732, 236 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-coal-stone1 rotate: false - xy: 942, 295 + xy: 732, 226 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-coal-stone2 rotate: false - xy: 952, 305 + xy: 742, 236 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-coal-stone3 rotate: false - xy: 952, 295 + xy: 742, 226 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-lead-grass1 rotate: false - xy: 852, 283 + xy: 752, 269 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-lead-grass2 rotate: false - xy: 862, 285 + xy: 752, 259 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-lead-grass3 rotate: false - xy: 872, 285 + xy: 762, 269 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-lead-ice1 rotate: false - xy: 882, 285 + xy: 752, 249 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-lead-ice2 rotate: false - xy: 892, 285 + xy: 762, 259 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-lead-ice3 rotate: false - xy: 902, 285 + xy: 752, 239 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-lead-sand1 rotate: false - xy: 912, 285 + xy: 762, 249 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-lead-sand2 rotate: false - xy: 922, 285 + xy: 752, 229 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-lead-sand3 rotate: false - xy: 932, 285 + xy: 762, 239 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-lead-snow1 rotate: false - xy: 942, 285 + xy: 762, 229 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-lead-snow2 rotate: false - xy: 952, 285 + xy: 752, 219 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-lead-snow3 rotate: false - xy: 850, 273 + xy: 762, 219 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-lead-stone1 rotate: false - xy: 848, 263 + xy: 679, 197 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-lead-stone2 rotate: false - xy: 848, 253 + xy: 677, 187 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-lead-stone3 rotate: false - xy: 848, 243 + xy: 677, 177 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-thorium-grass1 rotate: false - xy: 848, 233 + xy: 677, 167 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-thorium-grass2 rotate: false - xy: 848, 223 + xy: 709, 201 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-thorium-grass3 rotate: false - xy: 848, 213 + xy: 433, 107 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-thorium-ice1 rotate: false - xy: 962, 297 + xy: 433, 97 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-thorium-ice2 rotate: false - xy: 962, 287 + xy: 433, 87 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-thorium-ice3 rotate: false - xy: 972, 297 + xy: 441, 77 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-thorium-sand1 rotate: false - xy: 972, 287 + xy: 443, 67 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-thorium-sand2 rotate: false - xy: 982, 297 + xy: 443, 57 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-thorium-sand3 rotate: false - xy: 982, 287 + xy: 443, 47 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-thorium-snow1 rotate: false - xy: 992, 297 + xy: 443, 37 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-thorium-snow2 rotate: false - xy: 992, 287 + xy: 443, 27 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-thorium-snow3 rotate: false - xy: 1002, 299 + xy: 443, 17 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-thorium-stone1 rotate: false - xy: 1002, 289 + xy: 443, 7 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-thorium-stone2 rotate: false - xy: 1012, 299 + xy: 774, 285 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-thorium-stone3 rotate: false - xy: 1012, 289 + xy: 772, 275 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-titanium-grass1 rotate: false - xy: 478, 160 + xy: 772, 265 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-titanium-grass2 rotate: false - xy: 693, 183 + xy: 772, 255 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-titanium-grass3 rotate: false - xy: 359, 73 + xy: 772, 245 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-titanium-ice1 rotate: false - xy: 359, 63 + xy: 772, 235 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-titanium-ice2 rotate: false - xy: 369, 76 + xy: 772, 225 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-titanium-ice3 rotate: false - xy: 369, 66 + xy: 772, 215 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-titanium-sand1 rotate: false - xy: 369, 56 + xy: 798, 281 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-titanium-sand2 rotate: false - xy: 359, 53 + xy: 808, 281 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-titanium-sand3 rotate: false - xy: 369, 46 + xy: 818, 281 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-titanium-snow1 rotate: false - xy: 708, 216 + xy: 828, 281 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-titanium-snow2 rotate: false - xy: 718, 216 + xy: 838, 291 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-titanium-snow3 rotate: false - xy: 728, 216 + xy: 838, 281 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-titanium-stone1 rotate: false - xy: 738, 216 + xy: 848, 291 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-titanium-stone2 rotate: false - xy: 748, 216 + xy: 848, 281 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-titanium-stone3 rotate: false - xy: 758, 209 + xy: 858, 291 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-tungsten-grass1 rotate: false - xy: 768, 209 + xy: 858, 281 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-tungsten-grass2 rotate: false - xy: 778, 209 + xy: 868, 291 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-tungsten-grass3 rotate: false - xy: 788, 209 + xy: 868, 281 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-tungsten-ice1 rotate: false - xy: 798, 209 + xy: 878, 291 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-tungsten-ice2 rotate: false - xy: 808, 209 + xy: 878, 281 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-tungsten-ice3 rotate: false - xy: 818, 209 + xy: 888, 291 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-tungsten-sand1 rotate: false - xy: 828, 203 + xy: 888, 281 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-tungsten-sand2 rotate: false - xy: 838, 203 + xy: 898, 291 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-tungsten-sand3 rotate: false - xy: 848, 203 + xy: 898, 281 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-tungsten-snow1 rotate: false - xy: 862, 275 + xy: 908, 291 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-tungsten-snow2 rotate: false - xy: 872, 275 + xy: 908, 281 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-tungsten-snow3 rotate: false - xy: 882, 275 + xy: 918, 291 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-tungsten-stone1 rotate: false - xy: 892, 275 + xy: 918, 281 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-tungsten-stone2 rotate: false - xy: 902, 275 + xy: 928, 291 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-tungsten-stone3 rotate: false - xy: 912, 275 + xy: 928, 281 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 unit-icon-scout rotate: false - xy: 315, 77 + xy: 688, 251 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 unit-icon-titan rotate: false - xy: 269, 23 + xy: 287, 11 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 unit-icon-vtol rotate: false - xy: 1009, 309 + xy: 688, 237 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 vtol rotate: false - xy: 1009, 309 + xy: 688, 237 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 item-biomatter rotate: false - xy: 748, 226 + xy: 433, 57 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 item-blast-compound rotate: false - xy: 758, 229 + xy: 433, 47 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 item-carbide rotate: false - xy: 768, 229 + xy: 433, 37 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 item-coal rotate: false - xy: 778, 229 + xy: 433, 27 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 item-lead rotate: false - xy: 788, 229 + xy: 433, 17 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 item-phase-matter rotate: false - xy: 798, 229 + xy: 433, 7 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 item-plastanium rotate: false - xy: 808, 229 + xy: 788, 299 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 item-pyratite rotate: false - xy: 818, 229 + xy: 798, 301 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 item-sand rotate: false - xy: 828, 233 + xy: 808, 301 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 item-silicon rotate: false - xy: 838, 233 + xy: 818, 301 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 item-stone rotate: false - xy: 697, 214 + xy: 828, 301 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 item-surge-alloy rotate: false - xy: 828, 223 + xy: 788, 289 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 item-thorium rotate: false - xy: 838, 223 + xy: 798, 291 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 item-titanium rotate: false - xy: 758, 219 + xy: 808, 291 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 item-tungsten rotate: false - xy: 768, 219 + xy: 818, 291 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 liquid-icon rotate: false - xy: 818, 219 + xy: 988, 293 + size: 8, 8 + orig: 8, 8 + offset: 0, 0 + index: -1 +liquid-icon-none + rotate: false + xy: 988, 293 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -4101,84 +4150,91 @@ scout-base index: -1 alpha-mech-leg rotate: false - xy: 838, 299 + xy: 647, 192 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 omega-mech-leg rotate: false - xy: 838, 299 + xy: 647, 192 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 tau-mech-leg rotate: false - xy: 838, 299 + xy: 647, 192 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 scout-leg rotate: false - xy: 838, 299 + xy: 647, 192 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 delta-mech rotate: false - xy: 910, 315 + xy: 818, 311 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 delta-mech-leg rotate: false - xy: 924, 315 + xy: 758, 279 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 omega-mech rotate: false - xy: 681, 193 + xy: 972, 303 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 tau-mech rotate: false - xy: 681, 193 + xy: 972, 303 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 dart-ship rotate: false - xy: 896, 315 + xy: 804, 311 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 halberd-ship rotate: false - xy: 611, 192 - size: 12, 12 - orig: 12, 12 - offset: 0, 0 - index: -1 -javelin-ship - rotate: false - xy: 611, 192 + xy: 916, 315 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 trident-ship rotate: false - xy: 611, 192 + xy: 916, 315 + size: 12, 12 + orig: 12, 12 + offset: 0, 0 + index: -1 +javelin-ship + rotate: false + xy: 944, 315 + size: 12, 12 + orig: 12, 12 + offset: 0, 0 + index: -1 +mech-icon-javelin-ship + rotate: false + xy: 944, 315 size: 12, 12 orig: 12, 12 offset: 0, 0 @@ -4327,7 +4383,7 @@ check-over index: -1 clear rotate: false - xy: 323, 39 + xy: 697, 199 size: 10, 10 orig: 10, 10 offset: 0, 0 @@ -4355,7 +4411,7 @@ discord-banner-over index: -1 controller-cursor rotate: false - xy: 895, 383 + xy: 877, 347 size: 16, 16 orig: 16, 16 offset: 0, 0 @@ -4383,63 +4439,63 @@ icon-admin index: -1 icon-admin-small rotate: false - xy: 698, 273 + xy: 958, 321 size: 6, 6 orig: 6, 6 offset: 0, 0 index: -1 icon-areaDelete rotate: false - xy: 323, 15 + xy: 345, 129 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-arrow rotate: false - xy: 129, 42 + xy: 179, 36 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-arrow-16 rotate: false - xy: 129, 42 + xy: 179, 36 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-arrow-down rotate: false - xy: 325, 3 + xy: 357, 129 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-arrow-left rotate: false - xy: 706, 276 + xy: 369, 129 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-arrow-right rotate: false - xy: 718, 276 + xy: 381, 129 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-arrow-up rotate: false - xy: 730, 276 + xy: 393, 129 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-back rotate: false - xy: 106, 24 + xy: 197, 36 size: 16, 16 orig: 16, 16 offset: 0, 0 @@ -4453,49 +4509,49 @@ icon-ban index: -1 icon-break rotate: false - xy: 124, 24 + xy: 215, 36 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-cancel rotate: false - xy: 147, 39 + xy: 142, 21 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-chat rotate: false - xy: 742, 276 + xy: 405, 129 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-check rotate: false - xy: 179, 36 + xy: 113, 6 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-crafting rotate: false - xy: 966, 307 + xy: 339, 117 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-cursor rotate: false - xy: 978, 307 + xy: 351, 117 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-defense rotate: false - xy: 990, 307 + xy: 363, 117 size: 10, 10 orig: 10, 10 offset: 0, 0 @@ -4516,7 +4572,7 @@ icon-discord index: -1 icon-distribution rotate: false - xy: 838, 273 + xy: 375, 117 size: 10, 10 orig: 10, 10 offset: 0, 0 @@ -4530,511 +4586,511 @@ icon-donate index: -1 icon-dots rotate: false - xy: 705, 336 + xy: 694, 313 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-editor rotate: false - xy: 721, 336 + xy: 710, 318 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-egg rotate: false - xy: 737, 336 + xy: 726, 318 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-elevation rotate: false - xy: 197, 36 + xy: 179, 18 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-eraser rotate: false - xy: 215, 36 + xy: 197, 18 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-exit rotate: false - xy: 694, 313 + xy: 742, 318 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-file rotate: false - xy: 142, 21 + xy: 215, 18 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-file-image rotate: false - xy: 113, 6 + xy: 143, 3 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-file-text rotate: false - xy: 710, 320 + xy: 694, 297 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-fill rotate: false - xy: 179, 18 + xy: 161, 11 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-floppy rotate: false - xy: 726, 320 + xy: 710, 302 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-floppy-16 rotate: false - xy: 197, 18 + xy: 233, 54 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-folder rotate: false - xy: 742, 320 + xy: 726, 302 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-folder-parent rotate: false - xy: 694, 297 + xy: 742, 302 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-github rotate: false - xy: 710, 304 + xy: 690, 281 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-google-play rotate: false - xy: 726, 304 + xy: 583, 190 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-grid rotate: false - xy: 215, 18 + xy: 233, 36 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-hold rotate: false - xy: 454, 158 + xy: 387, 117 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-holdDelete rotate: false - xy: 466, 158 + xy: 399, 117 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-home rotate: false - xy: 742, 304 + xy: 599, 190 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-host rotate: false - xy: 690, 281 + xy: 615, 190 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-info rotate: false - xy: 681, 181 + xy: 417, 129 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-itch.io rotate: false - xy: 710, 288 + xy: 631, 190 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-items-none rotate: false - xy: 738, 226 + xy: 433, 67 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 icon-line rotate: false - xy: 143, 3 + xy: 233, 18 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-link rotate: false - xy: 726, 288 + xy: 661, 189 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-liquid rotate: false - xy: 695, 195 + xy: 411, 117 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-load rotate: false - xy: 742, 288 + xy: 710, 286 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-load-image rotate: false - xy: 161, 11 + xy: 279, 83 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-load-map rotate: false - xy: 233, 54 + xy: 297, 83 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-loading rotate: false - xy: 233, 36 + xy: 261, 77 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-locked rotate: false - xy: 233, 18 + xy: 243, 76 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-logic rotate: false - xy: 321, 129 + xy: 423, 117 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-menu rotate: false - xy: 333, 129 + xy: 331, 105 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-menu-large rotate: false - xy: 279, 83 + xy: 841, 329 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-none rotate: false - xy: 329, 117 + xy: 331, 93 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-pause rotate: false - xy: 345, 129 + xy: 343, 105 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-pencil rotate: false - xy: 297, 83 + xy: 859, 329 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-pencil-small rotate: false - xy: 245, 2 + xy: 726, 286 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-pick rotate: false - xy: 261, 77 + xy: 877, 329 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-play rotate: false - xy: 329, 105 + xy: 331, 81 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-play-2 rotate: false - xy: 758, 325 + xy: 742, 286 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-players rotate: false - xy: 341, 117 + xy: 343, 93 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-power rotate: false - xy: 357, 129 + xy: 355, 105 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-production rotate: false - xy: 329, 93 + xy: 343, 81 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-quit rotate: false - xy: 774, 325 + xy: 967, 317 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-redo rotate: false - xy: 243, 76 + xy: 895, 329 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-refresh rotate: false - xy: 758, 309 + xy: 983, 317 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-rename rotate: false - xy: 790, 325 + xy: 1003, 321 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-resize rotate: false - xy: 841, 329 + xy: 913, 329 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-rotate rotate: false - xy: 758, 293 + xy: 315, 103 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-rotate-arrow rotate: false - xy: 774, 309 + xy: 315, 87 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-rotate-left rotate: false - xy: 806, 325 + xy: 315, 71 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-rotate-right rotate: false - xy: 774, 293 + xy: 661, 173 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-save rotate: false - xy: 790, 309 + xy: 759, 325 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-save-image rotate: false - xy: 859, 329 + xy: 931, 329 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-save-map rotate: false - xy: 877, 329 + xy: 949, 401 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-settings rotate: false - xy: 341, 105 + xy: 355, 93 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-terrain rotate: false - xy: 895, 329 + xy: 949, 383 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-tools rotate: false - xy: 822, 325 + xy: 775, 325 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-touch rotate: false - xy: 353, 117 + xy: 367, 105 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-touchDelete rotate: false - xy: 369, 129 + xy: 355, 81 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-trash rotate: false - xy: 790, 293 + xy: 791, 325 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-trash-16 rotate: false - xy: 913, 329 + xy: 949, 365 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-trello rotate: false - xy: 806, 309 + xy: 807, 325 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-tutorial rotate: false - xy: 806, 293 + xy: 823, 325 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-undo rotate: false - xy: 931, 329 + xy: 949, 347 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-units rotate: false - xy: 329, 81 + xy: 367, 93 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-unlocks rotate: false - xy: 822, 309 + xy: 758, 309 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-weapon rotate: false - xy: 341, 93 + xy: 379, 105 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-wiki rotate: false - xy: 822, 293 + xy: 758, 293 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-zoom rotate: false - xy: 949, 401 + xy: 949, 329 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-zoom-small rotate: false - xy: 838, 313 + xy: 774, 309 size: 14, 14 orig: 14, 14 offset: 0, 0 @@ -5112,7 +5168,7 @@ selection index: -1 slider rotate: false - xy: 838, 331 + xy: 160, 29 size: 1, 8 orig: 1, 8 offset: 0, 0 @@ -5184,7 +5240,7 @@ textfield-over index: -1 white rotate: false - xy: 1, 1 + xy: 705, 329 size: 3, 3 orig: 3, 3 offset: 0, 0 @@ -5207,14 +5263,14 @@ window-empty index: -1 drone rotate: false - xy: 952, 315 + xy: 846, 315 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 unit-icon-drone rotate: false - xy: 952, 315 + xy: 846, 315 size: 12, 12 orig: 12, 12 offset: 0, 0 @@ -5249,70 +5305,77 @@ unit-icon-monsoon index: -1 scout rotate: false - xy: 981, 319 + xy: 1000, 307 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 titan rotate: false - xy: 251, 38 + xy: 287, 29 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 titan-base rotate: false - xy: 251, 20 + xy: 305, 47 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 titan-leg rotate: false - xy: 269, 41 + xy: 305, 29 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 vtol-flame rotate: false - xy: 393, 130 + xy: 1014, 288 size: 9, 9 orig: 9, 9 offset: 0, 0 index: -1 blaster-equip rotate: false - xy: 868, 315 + xy: 774, 295 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 chain-blaster-equip rotate: false - xy: 882, 315 + xy: 790, 311 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 flakgun-equip rotate: false - xy: 838, 285 + xy: 874, 315 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 flamethrower-equip rotate: false - xy: 583, 192 + xy: 888, 315 + size: 12, 12 + orig: 12, 12 + offset: 0, 0 + index: -1 +missiles-equip + rotate: false + xy: 944, 301 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 shockgun-equip rotate: false - xy: 995, 319 + xy: 1000, 293 size: 12, 12 orig: 12, 12 offset: 0, 0 diff --git a/core/assets/sprites/sprites.png b/core/assets/sprites/sprites.png index 00234fd21e..e6e6545549 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/Vars.java b/core/src/io/anuke/mindustry/Vars.java index af7e3ed4c9..8c987933bf 100644 --- a/core/src/io/anuke/mindustry/Vars.java +++ b/core/src/io/anuke/mindustry/Vars.java @@ -27,7 +27,7 @@ import io.anuke.ucore.util.OS; import java.util.Locale; public class Vars{ - public static final boolean testMobile = false; + public static final boolean testMobile = true; //shorthand for whether or not this is running on android or ios public static boolean mobile; public static boolean ios; diff --git a/core/src/io/anuke/mindustry/content/AmmoTypes.java b/core/src/io/anuke/mindustry/content/AmmoTypes.java index e83945afda..eb8fefb1a0 100644 --- a/core/src/io/anuke/mindustry/content/AmmoTypes.java +++ b/core/src/io/anuke/mindustry/content/AmmoTypes.java @@ -2,6 +2,7 @@ package io.anuke.mindustry.content; import com.badlogic.gdx.utils.Array; import io.anuke.mindustry.content.bullets.*; +import io.anuke.mindustry.content.fx.BulletFx; import io.anuke.mindustry.content.fx.Fx; import io.anuke.mindustry.content.fx.ShootFx; import io.anuke.mindustry.game.Content; @@ -10,7 +11,7 @@ import io.anuke.mindustry.type.ContentList; public class AmmoTypes implements ContentList { public static AmmoType bulletTungsten, bulletLead, bulletCarbide, bulletThorium, bulletSilicon, bulletPyratite, - shotgunTungsten, bombExplosive, bombIncendiary, bombOil, shellCarbide, flamerThermite, + shotgunTungsten, bombExplosive, bombIncendiary, bombOil, shellCarbide, flamerThermite, weaponMissile, flakLead, flakExplosive, flakPlastic, flakSurge, missileExplosive, missileIncindiary, missileSurge, artilleryCarbide, artilleryPlastic, artilleryHoming, artilleryIncindiary, artilleryExplosive, basicFlame, lancerLaser, lightning, spectreLaser, meltdownLaser, fuseShotgun, oil, water, lava, cryofluid; @@ -50,6 +51,12 @@ public class AmmoTypes implements ContentList { shootEffect = ShootFx.shootSmallFlame; }}; + weaponMissile = new AmmoType(Items.carbide, MissileBullets.javelin, 2) {{ + shootEffect = BulletFx.hitBulletSmall; + smokeEffect = Fx.none; + reloadMultiplier = 1.2f; + }}; + //bullets bulletLead = new AmmoType(Items.lead, StandardBullets.lead, 5) {{ diff --git a/core/src/io/anuke/mindustry/content/Mechs.java b/core/src/io/anuke/mindustry/content/Mechs.java index c4ea7a2b28..27097704dc 100644 --- a/core/src/io/anuke/mindustry/content/Mechs.java +++ b/core/src/io/anuke/mindustry/content/Mechs.java @@ -9,7 +9,7 @@ import io.anuke.mindustry.type.Mech; import io.anuke.mindustry.type.Upgrade; public class Mechs implements ContentList { - public static Mech alpha, delta, tau, omega, dart, trident, javelin, halberd; + public static Mech alpha, delta, tau, omega, dart, javelin, trident, halberd; /**These are not new mechs, just re-assignments for convenience.*/ public static Mech starterDesktop, starterMobile; @@ -57,16 +57,18 @@ public class Mechs implements ContentList { trailColor = Palette.lightTrail; }}; - trident = new Mech("trident-ship", true){{ - drillPower = 1; - speed = 0.4f; - maxSpeed = 3f; - drag = 0.1f; - }}; - javelin = new Mech("javelin-ship", true){{ drillPower = -1; speed = 0.4f; + maxSpeed = 3.6f; + drag = 0.09f; + weapon = Weapons.missiles; + trailColor = Color.valueOf("d3ddff"); + }}; + + trident = new Mech("trident-ship", true){{ + drillPower = 1; + speed = 0.4f; maxSpeed = 3f; drag = 0.1f; }}; diff --git a/core/src/io/anuke/mindustry/content/Recipes.java b/core/src/io/anuke/mindustry/content/Recipes.java index b4a270339d..b9a0a89003 100644 --- a/core/src/io/anuke/mindustry/content/Recipes.java +++ b/core/src/io/anuke/mindustry/content/Recipes.java @@ -123,7 +123,7 @@ public class Recipes implements ContentList{ new Recipe(units, UpgradeBlocks.dartFactory, new ItemStack(Items.lead, 150), new ItemStack(Items.silicon, 200), new ItemStack(Items.titanium, 240)) .setDesktop(); //dart is desktop only, because it's the starter mobile ship - new Recipe(units, UpgradeBlocks.tridentFactory, new ItemStack(Items.lead, 200), new ItemStack(Items.silicon, 250), new ItemStack(Items.titanium, 300), new ItemStack(Items.plastanium, 200)); + new Recipe(units, UpgradeBlocks.javelinFactory, new ItemStack(Items.lead, 200), new ItemStack(Items.silicon, 250), new ItemStack(Items.titanium, 300), new ItemStack(Items.plastanium, 200)); new Recipe(units, UpgradeBlocks.deltaFactory, new ItemStack(Items.carbide, 160), new ItemStack(Items.silicon, 220), new ItemStack(Items.titanium, 250)) .setDesktop(); diff --git a/core/src/io/anuke/mindustry/content/Weapons.java b/core/src/io/anuke/mindustry/content/Weapons.java index 2187a63add..5986b56bb2 100644 --- a/core/src/io/anuke/mindustry/content/Weapons.java +++ b/core/src/io/anuke/mindustry/content/Weapons.java @@ -9,7 +9,7 @@ import io.anuke.mindustry.type.Upgrade; import io.anuke.mindustry.type.Weapon; public class Weapons implements ContentList { - public static Weapon blaster, chainBlaster, shockgun, sapper, swarmer, bomber, flakgun, flamethrower; + public static Weapon blaster, chainBlaster, shockgun, sapper, swarmer, bomber, flakgun, flamethrower, missiles; @Override public void load() { @@ -22,6 +22,17 @@ public class Weapons implements ContentList { setAmmo(AmmoTypes.bulletLead); }}; + missiles = new Weapon("missiles") {{ + length = 1.5f; + reload = 40f; + shots = 2; + inaccuracy = 10f; + roundrobin = false; + roundrobin = true; + ejectEffect = Fx.none; + setAmmo(AmmoTypes.weaponMissile); + }}; + chainBlaster = new Weapon("chain-blaster") {{ length = 1.5f; reload = 20f; diff --git a/core/src/io/anuke/mindustry/content/blocks/UpgradeBlocks.java b/core/src/io/anuke/mindustry/content/blocks/UpgradeBlocks.java index 2f8a98506c..7382e726fe 100644 --- a/core/src/io/anuke/mindustry/content/blocks/UpgradeBlocks.java +++ b/core/src/io/anuke/mindustry/content/blocks/UpgradeBlocks.java @@ -5,13 +5,13 @@ import io.anuke.mindustry.world.Block; import io.anuke.mindustry.world.blocks.units.MechFactory; public class UpgradeBlocks extends BlockList { - public static Block deltaFactory, tauFactory, omegaFactory, dartFactory, tridentFactory, javelinFactory, halberdFactory; + public static Block deltaFactory, tauFactory, omegaFactory, dartFactory, javelinFactory, tridentFactory, halberdFactory; @Override public void load() { deltaFactory = new MechFactory("delta-mech-factory"){{ mech = Mechs.delta; - size = 2; + size = 2; }}; tauFactory = new MechFactory("tau-mech-factory"){{ @@ -29,13 +29,13 @@ public class UpgradeBlocks extends BlockList { size = 2; }}; - tridentFactory = new MechFactory("trident-ship-factory"){{ - mech = Mechs.trident; + javelinFactory = new MechFactory("javelin-ship-factory"){{ + mech = Mechs.javelin; size = 2; }}; - javelinFactory = new MechFactory("javelin-ship-factory"){{ - mech = Mechs.javelin; + tridentFactory = new MechFactory("trident-ship-factory"){{ + mech = Mechs.trident; size = 2; }}; diff --git a/core/src/io/anuke/mindustry/content/bullets/MissileBullets.java b/core/src/io/anuke/mindustry/content/bullets/MissileBullets.java index 2f96783b2f..f004eac290 100644 --- a/core/src/io/anuke/mindustry/content/bullets/MissileBullets.java +++ b/core/src/io/anuke/mindustry/content/bullets/MissileBullets.java @@ -7,7 +7,7 @@ import io.anuke.mindustry.graphics.Palette; import io.anuke.mindustry.type.ContentList; public class MissileBullets extends BulletList implements ContentList { - public static BulletType explosive, incindiary, surge; + public static BulletType explosive, incindiary, surge, javelin; @Override public void load() { @@ -50,5 +50,20 @@ public class MissileBullets extends BulletList implements ContentList { bulletHeight = 9f; } }; + + javelin = new MissileBulletType(2.5f, 10, "missile") { + { + bulletWidth = 8f; + bulletHeight = 8f; + bulletShrink = 0f; + drag = -0.02f; + keepVelocity = false; + splashDamageRadius = 25f; + splashDamage = 15f; + lifetime = 90f; + hiteffect = BulletFx.blastExplosion; + despawneffect = BulletFx.blastExplosion; + } + }; } } diff --git a/core/src/io/anuke/mindustry/core/Control.java b/core/src/io/anuke/mindustry/core/Control.java index d686d5629c..eba7180772 100644 --- a/core/src/io/anuke/mindustry/core/Control.java +++ b/core/src/io/anuke/mindustry/core/Control.java @@ -120,6 +120,12 @@ public class Control extends Module{ state.set(State.playing); }); + Events.on(WorldLoadGraphicsEvent.class, () -> { + if(mobile){ + Core.camera.position.set(players[0].x, players[0].y, 0); + } + }); + Events.on(ResetEvent.class, () -> { for(Player player : players){ player.reset(); diff --git a/core/src/io/anuke/mindustry/core/Renderer.java b/core/src/io/anuke/mindustry/core/Renderer.java index 093f471388..5010f0d959 100644 --- a/core/src/io/anuke/mindustry/core/Renderer.java +++ b/core/src/io/anuke/mindustry/core/Renderer.java @@ -227,15 +227,13 @@ public class Renderer extends RendererModule{ blocks.skipLayer(Layer.turret); blocks.drawBlocks(Layer.laser); - overlays.drawBottom(); - - drawAndInterpolate(playerGroup, p -> true, Player::drawBuildRequests); - drawAllTeams(true); drawAndInterpolate(bulletGroup); drawAndInterpolate(effectGroup); + overlays.drawBottom(); + drawAndInterpolate(playerGroup, p -> true, Player::drawBuildRequests); overlays.drawTop(); if(pixelate) diff --git a/core/src/io/anuke/mindustry/entities/Player.java b/core/src/io/anuke/mindustry/entities/Player.java index 767c5a1cc0..e72e9a6bb9 100644 --- a/core/src/io/anuke/mindustry/entities/Player.java +++ b/core/src/io/anuke/mindustry/entities/Player.java @@ -23,12 +23,16 @@ import io.anuke.mindustry.world.Block; import io.anuke.mindustry.world.Tile; import io.anuke.mindustry.world.blocks.Floor; import io.anuke.mindustry.world.blocks.storage.CoreBlock.CoreEntity; +import io.anuke.mindustry.world.blocks.units.MechFactory; import io.anuke.ucore.core.*; import io.anuke.ucore.entities.EntityGroup; import io.anuke.ucore.entities.trait.SolidTrait; import io.anuke.ucore.graphics.Draw; import io.anuke.ucore.graphics.Lines; -import io.anuke.ucore.util.*; +import io.anuke.ucore.util.Angles; +import io.anuke.ucore.util.Mathf; +import io.anuke.ucore.util.ThreadQueue; +import io.anuke.ucore.util.Timer; import java.io.DataInput; import java.io.DataOutput; @@ -59,7 +63,7 @@ public class Player extends Unit implements BuilderTrait, CarryTrait, ShooterTra public boolean isLocal = false; public Timer timer = new Timer(4); public TargetTrait target; - public CarriableTrait pickupTarget; + public TargetTrait moveTarget; private boolean respawning; private float walktime; @@ -551,18 +555,23 @@ public class Player extends Unit implements BuilderTrait, CarryTrait, ShooterTra float targetX = Core.camera.position.x, targetY = Core.camera.position.y; float attractDst = 15f; - if(pickupTarget != null && !pickupTarget.isDead()){ - targetX = pickupTarget.getX(); - targetY = pickupTarget.getY(); + if(moveTarget != null && !moveTarget.isDead()){ + targetX = moveTarget.getX(); + targetY = moveTarget.getY(); attractDst = 0f; - if(distanceTo(pickupTarget) < 2f){ - carry(pickupTarget); + if(distanceTo(moveTarget) < 2f){ + if(moveTarget instanceof CarriableTrait){ + carry((CarriableTrait) moveTarget); + }else if(moveTarget instanceof TileEntity && ((TileEntity) moveTarget).tile.block() instanceof MechFactory){ + Tile tile = ((TileEntity) moveTarget).tile; + tile.block().tapped(tile, this); + } - pickupTarget = null; + moveTarget = null; } }else{ - pickupTarget = null; + moveTarget = null; } movement.set(targetX - x, targetY - y).limit(mech.speed); diff --git a/core/src/io/anuke/mindustry/input/AndroidInput.java b/core/src/io/anuke/mindustry/input/AndroidInput.java index b4bfa18ba9..90fc56635c 100644 --- a/core/src/io/anuke/mindustry/input/AndroidInput.java +++ b/core/src/io/anuke/mindustry/input/AndroidInput.java @@ -542,7 +542,7 @@ public class AndroidInput extends InputHandler implements GestureListener{ Unit unit = Units.getClosest(player.getTeam(), Graphics.world(x, y).x, Graphics.world(x, y).y, 4f, u -> !u.isFlying() && u.getMass() <= player.mech.carryWeight); if(unit != null){ - player.pickupTarget = unit; + player.moveTarget = unit; Effects.effect(Fx.select, unit.getX(), unit.getY()); } } diff --git a/core/src/io/anuke/mindustry/input/InputHandler.java b/core/src/io/anuke/mindustry/input/InputHandler.java index ef3c00e2ad..7180d94c61 100644 --- a/core/src/io/anuke/mindustry/input/InputHandler.java +++ b/core/src/io/anuke/mindustry/input/InputHandler.java @@ -122,7 +122,9 @@ public abstract class InputHandler extends InputAdapter{ } //call tapped event - CallBlocks.onTileTapped(player, tile); + if(tile.getTeam() == player.getTeam()){ + CallBlocks.onTileTapped(player, tile); + } //consume tap event if necessary if(tile.getTeam() == player.getTeam() && tile.block().consumesTap){ diff --git a/core/src/io/anuke/mindustry/type/Liquid.java b/core/src/io/anuke/mindustry/type/Liquid.java index d5ca5e1c4e..b5bc5e946a 100644 --- a/core/src/io/anuke/mindustry/type/Liquid.java +++ b/core/src/io/anuke/mindustry/type/Liquid.java @@ -48,7 +48,7 @@ public class Liquid implements UnlockableContent{ @Override public void load() { - iconRegion = Draw.region("icon-liquid-" + name); + iconRegion = Draw.region("liquid-icon-" + name); } @Override diff --git a/core/src/io/anuke/mindustry/world/blocks/units/MechFactory.java b/core/src/io/anuke/mindustry/world/blocks/units/MechFactory.java index 9cdf4b7bd2..8484526dca 100644 --- a/core/src/io/anuke/mindustry/world/blocks/units/MechFactory.java +++ b/core/src/io/anuke/mindustry/world/blocks/units/MechFactory.java @@ -26,6 +26,7 @@ import java.io.DataInputStream; import java.io.DataOutputStream; import java.io.IOException; +import static io.anuke.mindustry.Vars.mobile; import static io.anuke.mindustry.Vars.tilesize; public class MechFactory extends Block{ @@ -52,6 +53,8 @@ public class MechFactory extends Block{ if(checkValidTap(tile, player)){ CallBlocks.onMechFactoryBegin(player, tile); + }else if(player.isLocal && mobile){ + player.moveTarget = tile.entity; } } diff --git a/core/src/io/anuke/mindustry/world/meta/values/LiquidFilterValue.java b/core/src/io/anuke/mindustry/world/meta/values/LiquidFilterValue.java index d574a8c590..c585a7895f 100644 --- a/core/src/io/anuke/mindustry/world/meta/values/LiquidFilterValue.java +++ b/core/src/io/anuke/mindustry/world/meta/values/LiquidFilterValue.java @@ -23,7 +23,7 @@ public class LiquidFilterValue implements StatValue { for (int i = 0; i < list.size; i++) { Liquid item = list.get(i); - table.addImage("liquid-icon").color(item.color).size(8*3).padRight(2).padLeft(2).padTop(2).padBottom(2); + table.addImage(item.getContentIcon()).size(8*3).padRight(2).padLeft(2).padTop(2).padBottom(2); if(i != list.size - 1){ table.add("/"); } diff --git a/core/src/io/anuke/mindustry/world/meta/values/LiquidValue.java b/core/src/io/anuke/mindustry/world/meta/values/LiquidValue.java index 09fb5c8cfd..20db91051a 100644 --- a/core/src/io/anuke/mindustry/world/meta/values/LiquidValue.java +++ b/core/src/io/anuke/mindustry/world/meta/values/LiquidValue.java @@ -19,6 +19,6 @@ public class LiquidValue implements ContentStatValue { @Override public void display(Table table) { - table.addImage("liquid-icon").color(liquid.color).size(8*3); + table.addImage(liquid.getContentIcon()).size(8*3); } } diff --git a/packer/src/io/anuke/mindustry/Generators.java b/packer/src/io/anuke/mindustry/Generators.java index 985bb103a3..bb1c2c72d7 100644 --- a/packer/src/io/anuke/mindustry/Generators.java +++ b/packer/src/io/anuke/mindustry/Generators.java @@ -133,7 +133,16 @@ public class Generators { context.generate("liquid-icons", () -> { for(Liquid liquid : Liquid.all()){ + Image image = context.get("liquid-icon"); + for (int x = 0; x < image.width(); x++) { + for (int y = 0; y < image.height(); y++) { + Color color = image.getColor(x, y); + color.mul(liquid.color); + image.draw(x, y, color); + } + } + image.save("liquid-icon-" + liquid.name); } });