diff --git a/core/assets-raw/sprites/blocks/extra/conduitliquid.png b/core/assets-raw/sprites/blocks/extra/conduit-liquid.png similarity index 100% rename from core/assets-raw/sprites/blocks/extra/conduitliquid.png rename to core/assets-raw/sprites/blocks/extra/conduit-liquid.png diff --git a/core/assets-raw/sprites/blocks/production/cryofluidmixer-bottom.png b/core/assets-raw/sprites/blocks/production/cryofluidmixer-bottom.png new file mode 100644 index 0000000000..51037d3e26 Binary files /dev/null and b/core/assets-raw/sprites/blocks/production/cryofluidmixer-bottom.png differ diff --git a/core/assets-raw/sprites/blocks/production/cryofluidmixer-liquid.png b/core/assets-raw/sprites/blocks/production/cryofluidmixer-liquid.png new file mode 100644 index 0000000000..47ab49a42f Binary files /dev/null and b/core/assets-raw/sprites/blocks/production/cryofluidmixer-liquid.png differ diff --git a/core/assets-raw/sprites/blocks/production/cryofluidmixer-top.png b/core/assets-raw/sprites/blocks/production/cryofluidmixer-top.png new file mode 100644 index 0000000000..64ffa52a5b Binary files /dev/null and b/core/assets-raw/sprites/blocks/production/cryofluidmixer-top.png differ diff --git a/core/assets-raw/sprites/blocks/production/nuclearreactor-center.png b/core/assets-raw/sprites/blocks/production/nuclearreactor-center.png index b6894c4638..bebf831aea 100644 Binary files a/core/assets-raw/sprites/blocks/production/nuclearreactor-center.png and b/core/assets-raw/sprites/blocks/production/nuclearreactor-center.png differ diff --git a/core/assets/sprites/sprites.atlas b/core/assets/sprites/sprites.atlas index d9729ce024..34371be525 100644 --- a/core/assets/sprites/sprites.atlas +++ b/core/assets/sprites/sprites.atlas @@ -13,56 +13,56 @@ background index: -1 blackrock1 rotate: false - xy: 610, 199 + xy: 520, 61 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blackrockshadow1 rotate: false - xy: 620, 213 + xy: 530, 61 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blackstone1 rotate: false - xy: 630, 213 + xy: 714, 300 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blackstone2 rotate: false - xy: 620, 203 + xy: 724, 305 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blackstone3 rotate: false - xy: 630, 203 + xy: 734, 305 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blackstoneblock1 rotate: false - xy: 640, 208 + xy: 744, 305 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blackstoneblock2 rotate: false - xy: 650, 208 + xy: 711, 290 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blackstoneblock3 rotate: false - xy: 726, 305 + xy: 711, 280 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -76,483 +76,483 @@ blackstoneedge index: -1 coal1 rotate: false - xy: 746, 285 + xy: 453, 49 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 coal2 rotate: false - xy: 723, 275 + xy: 463, 49 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 coal3 rotate: false - xy: 723, 265 + xy: 473, 49 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 deepwater rotate: false - xy: 545, 77 + xy: 493, 41 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 dirt1 rotate: false - xy: 559, 85 + xy: 503, 41 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 dirt2 rotate: false - xy: 569, 85 + xy: 513, 41 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 dirt3 rotate: false - xy: 579, 85 + xy: 523, 41 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 dirtedge rotate: false - xy: 309, 55 + xy: 357, 55 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 grass1 rotate: false - xy: 827, 430 + xy: 620, 203 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 grass2 rotate: false - xy: 785, 416 + xy: 630, 203 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 grass3 rotate: false - xy: 785, 406 + xy: 640, 208 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 grassblock1 rotate: false - xy: 795, 416 + xy: 650, 208 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 grassblock2 rotate: false - xy: 785, 396 + xy: 539, 87 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 grassedge rotate: false - xy: 323, 55 + xy: 371, 55 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 ice1 rotate: false - xy: 795, 406 + xy: 549, 87 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ice2 rotate: false - xy: 785, 386 + xy: 541, 77 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ice3 rotate: false - xy: 795, 396 + xy: 551, 77 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 iceedge rotate: false - xy: 337, 55 + xy: 385, 55 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 icerock1 rotate: false - xy: 785, 376 + xy: 562, 85 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 icerock2 rotate: false - xy: 795, 386 + xy: 572, 85 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 icerockshadow1 rotate: false - xy: 785, 366 + xy: 582, 85 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 rockshadow1 rotate: false - xy: 785, 366 + xy: 582, 85 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 icerockshadow2 rotate: false - xy: 795, 376 + xy: 592, 85 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 rockshadow2 rotate: false - xy: 795, 376 + xy: 592, 85 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 iron1 rotate: false - xy: 795, 366 + xy: 602, 85 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 iron2 rotate: false - xy: 805, 416 + xy: 561, 75 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 iron3 rotate: false - xy: 805, 406 + xy: 571, 75 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 lava rotate: false - xy: 680, 198 + xy: 731, 285 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 lavaedge rotate: false - xy: 351, 55 + xy: 399, 55 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 mossblock rotate: false - xy: 700, 208 + xy: 721, 245 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 oil rotate: false - xy: 700, 198 + xy: 731, 255 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 oiledge rotate: false - xy: 393, 57 + xy: 213, 40 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 rock1 rotate: false - xy: 760, 331 + xy: 756, 321 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 rock2 rotate: false - xy: 756, 321 + xy: 773, 352 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 sand1 rotate: false - xy: 756, 281 + xy: 751, 281 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 sand2 rotate: false - xy: 753, 271 + xy: 751, 271 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 sand3 rotate: false - xy: 753, 261 + xy: 751, 261 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 sandblock1 rotate: false - xy: 175, 30 + xy: 751, 251 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 sandblock2 rotate: false - xy: 185, 32 + xy: 751, 241 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 sandblock3 rotate: false - xy: 175, 20 + xy: 751, 231 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 sandedge rotate: false - xy: 407, 57 + xy: 227, 39 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 shrub rotate: false - xy: 541, 57 + xy: 175, 20 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 shrubshadow rotate: false - xy: 555, 75 + xy: 185, 32 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 snow1 rotate: false - xy: 595, 75 + xy: 791, 428 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 snow2 rotate: false - xy: 551, 65 + xy: 801, 428 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 snow3 rotate: false - xy: 561, 65 + xy: 811, 432 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 snowblock1 rotate: false - xy: 571, 65 + xy: 821, 432 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 snowblock2 rotate: false - xy: 581, 65 + xy: 831, 432 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 snowblock3 rotate: false - xy: 591, 65 + xy: 543, 57 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 snowedge rotate: false - xy: 435, 57 + xy: 255, 39 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 stone1 rotate: false - xy: 857, 431 + xy: 650, 188 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 stone2 rotate: false - xy: 785, 356 + xy: 659, 228 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 stone3 rotate: false - xy: 795, 356 + xy: 657, 218 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 stoneblock1 rotate: false - xy: 805, 356 + xy: 669, 228 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 stoneblock2 rotate: false - xy: 783, 346 + xy: 667, 218 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 stoneblock3 rotate: false - xy: 793, 346 + xy: 660, 208 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 stoneedge rotate: false - xy: 477, 57 + xy: 297, 39 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 titanium1 rotate: false - xy: 815, 400 + xy: 660, 188 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 titanium2 rotate: false - xy: 825, 410 + xy: 670, 198 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 titanium3 rotate: false - xy: 835, 420 + xy: 670, 188 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 uranium1 rotate: false - xy: 835, 390 + xy: 690, 198 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 uranium2 rotate: false - xy: 815, 360 + xy: 690, 188 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 uranium3 rotate: false - xy: 825, 370 + xy: 697, 218 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 water rotate: false - xy: 630, 173 + xy: 710, 200 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 wateredge rotate: false - xy: 491, 57 + xy: 311, 39 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 block-middle rotate: false - xy: 746, 305 + xy: 711, 240 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 pump-liquid rotate: false - xy: 746, 305 + xy: 711, 240 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 -conduitliquid +conduit-liquid rotate: false - xy: 773, 352 + xy: 801, 438 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 cross-1 rotate: false - xy: 549, 87 + xy: 483, 39 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -566,21 +566,21 @@ cross-2 index: -1 enemyspawn rotate: false - xy: 803, 426 + xy: 620, 213 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 playerspawn rotate: false - xy: 618, 183 + xy: 741, 255 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 shadow rotate: false - xy: 853, 441 + xy: 430, 59 size: 10, 10 orig: 10, 10 offset: 0, 0 @@ -594,56 +594,77 @@ alloysmelter index: -1 coaldrill rotate: false - xy: 733, 275 + xy: 483, 49 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 coalextractor rotate: false - xy: 733, 265 + xy: 493, 51 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 coalgenerator rotate: false - xy: 743, 275 + xy: 503, 51 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 coalgenerator-top rotate: false - xy: 743, 265 + xy: 513, 51 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 combustiongenerator rotate: false - xy: 640, 198 + xy: 523, 51 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 -cultivator +cryofluidmixer-bottom rotate: false xy: 641, 270 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 +cryofluidmixer-liquid + rotate: false + xy: 659, 274 + size: 16, 16 + orig: 16, 16 + offset: 0, 0 + index: -1 +cryofluidmixer-top + rotate: false + xy: 641, 252 + size: 16, 16 + orig: 16, 16 + offset: 0, 0 + index: -1 +cultivator + rotate: false + xy: 659, 256 + size: 16, 16 + orig: 16, 16 + offset: 0, 0 + index: -1 fluxpump rotate: false - xy: 817, 430 + xy: 630, 213 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 irondrill rotate: false - xy: 805, 396 + xy: 581, 75 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -657,14 +678,14 @@ largesolarpanel index: -1 laserdrill rotate: false - xy: 467, 87 + xy: 521, 87 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 lavasmelter rotate: false - xy: 689, 228 + xy: 721, 265 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -706,154 +727,154 @@ oilextractor-liquid index: -1 oilrefinery rotate: false - xy: 620, 193 + xy: 741, 265 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 omnidrill rotate: false - xy: 630, 193 + xy: 731, 245 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 powerbooster rotate: false - xy: 628, 183 + xy: 741, 245 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 pulverizer rotate: false - xy: 763, 341 + xy: 760, 341 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 pump rotate: false - xy: 773, 342 + xy: 760, 331 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 quartzextractor rotate: false - xy: 584, 175 + xy: 249, 69 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 rtgenerator rotate: false - xy: 756, 301 + xy: 754, 301 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 rtgenerator-top rotate: false - xy: 756, 291 + xy: 754, 291 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 siliconextractor rotate: false - xy: 565, 75 + xy: 185, 22 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 smelter rotate: false - xy: 575, 75 + xy: 195, 36 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 smelter-middle rotate: false - xy: 585, 75 + xy: 195, 26 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 solarpanel rotate: false - xy: 551, 55 + xy: 543, 47 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 stonedrill rotate: false - xy: 803, 346 + xy: 679, 228 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 stoneformer rotate: false - xy: 815, 420 + xy: 677, 218 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 thermalgenerator rotate: false - xy: 825, 420 + xy: 670, 208 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 titaniumdrill rotate: false - xy: 815, 390 + xy: 680, 208 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 titaniumextractor rotate: false - xy: 825, 400 + xy: 680, 198 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 uraniumdrill rotate: false - xy: 835, 380 + xy: 707, 220 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 uraniumextractor rotate: false - xy: 825, 360 + xy: 700, 208 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 waterextractor rotate: false - xy: 321, 69 + xy: 375, 69 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 waterextractor-liquid rotate: false - xy: 339, 69 + xy: 393, 69 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 battery rotate: false - xy: 711, 252 + xy: 490, 61 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -874,42 +895,42 @@ batterylarge-base index: -1 conduit-bottom rotate: false - xy: 753, 351 + xy: 791, 438 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 conduit-top rotate: false - xy: 763, 351 + xy: 433, 39 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 conduittunnel rotate: false - xy: 195, 48 + xy: 443, 39 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 conveyor rotate: false - xy: 195, 38 + xy: 453, 39 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 conveyormove rotate: false - xy: 535, 77 + xy: 463, 39 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 conveyortunnel rotate: false - xy: 539, 87 + xy: 473, 39 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -923,49 +944,49 @@ core index: -1 junction rotate: false - xy: 670, 198 + xy: 721, 285 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 laser-base rotate: false - xy: 680, 208 + xy: 721, 275 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 liquidjunction rotate: false - xy: 687, 218 + xy: 731, 275 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 liquidrouter rotate: false - xy: 699, 230 + xy: 741, 285 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 liquidrouter-bottom rotate: false - xy: 690, 208 + xy: 721, 255 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 liquidrouter-liquid rotate: false - xy: 690, 198 + xy: 731, 265 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 liquidrouter-top rotate: false - xy: 697, 218 + xy: 741, 275 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -993,70 +1014,70 @@ liquidtank-top index: -1 multiplexer rotate: false - xy: 563, 140 + xy: 231, 69 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 poweredconveyor rotate: false - xy: 640, 188 + xy: 640, 198 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 poweredconveyormove rotate: false - xy: 650, 188 + xy: 650, 198 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 powerinfinite rotate: false - xy: 660, 188 + xy: 721, 235 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 powerlaser rotate: false - xy: 670, 188 + xy: 731, 235 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 powerlasercorner rotate: false - xy: 680, 188 + xy: 741, 235 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 powerlaserrouter rotate: false - xy: 690, 188 + xy: 753, 351 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 powervoid rotate: false - xy: 700, 188 + xy: 750, 341 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 pulseconduit-bottom rotate: false - xy: 753, 341 + xy: 750, 331 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 pulseconduit-top rotate: false - xy: 750, 331 + xy: 763, 351 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -1070,49 +1091,49 @@ router index: -1 shieldgenerator rotate: false - xy: 195, 28 + xy: 823, 442 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 shieldprojector rotate: false - xy: 213, 70 + xy: 267, 69 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 sortedunloader rotate: false - xy: 561, 55 + xy: 543, 37 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 sorter rotate: false - xy: 571, 55 + xy: 620, 193 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 splitter rotate: false - xy: 581, 55 + xy: 630, 193 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 steelconveyor rotate: false - xy: 591, 55 + xy: 618, 183 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 steelconveyormove rotate: false - xy: 837, 430 + xy: 628, 183 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -1133,7 +1154,7 @@ teleporter-top index: -1 unloader rotate: false - xy: 825, 380 + xy: 690, 208 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -1147,21 +1168,21 @@ vault index: -1 vault-icon rotate: false - xy: 835, 370 + xy: 700, 198 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 weaponfactory rotate: false - xy: 357, 69 + xy: 411, 69 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 block-1 rotate: false - xy: 736, 295 + xy: 711, 250 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -1203,14 +1224,14 @@ doubleturret index: -1 flakturret rotate: false - xy: 677, 274 + xy: 677, 256 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 flameturret rotate: false - xy: 505, 59 + xy: 325, 41 size: 10, 10 orig: 10, 10 offset: 0, 0 @@ -1224,70 +1245,70 @@ fornaxcannon index: -1 gatlingturret rotate: false - xy: 517, 59 + xy: 337, 41 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 laserturret rotate: false - xy: 805, 436 + xy: 574, 95 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 magmaturret rotate: false - xy: 485, 87 + xy: 563, 140 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 megarepairturret rotate: false - xy: 503, 87 + xy: 584, 175 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 missileturret rotate: false - xy: 521, 87 + xy: 213, 70 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 plasmaturret rotate: false - xy: 817, 440 + xy: 586, 95 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 railgunturret rotate: false - xy: 829, 440 + xy: 598, 95 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 repairturret rotate: false - xy: 841, 441 + xy: 421, 43 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 shotgunturret rotate: false - xy: 714, 298 + xy: 442, 59 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 teslaturret rotate: false - xy: 714, 286 + xy: 454, 59 size: 10, 10 orig: 10, 10 offset: 0, 0 @@ -1301,112 +1322,112 @@ titancannon index: -1 titancannon-icon rotate: false - xy: 711, 274 + xy: 466, 59 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 turret rotate: false - xy: 711, 262 + xy: 478, 59 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 compositewall rotate: false - xy: 650, 198 + xy: 533, 51 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 door rotate: false - xy: 589, 85 + xy: 533, 41 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 door-large rotate: false - xy: 659, 274 + xy: 677, 274 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 door-large-open rotate: false - xy: 641, 252 + xy: 641, 234 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 door-open rotate: false - xy: 599, 85 + xy: 610, 209 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 duriumwall rotate: false - xy: 793, 426 + xy: 610, 199 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 duriumwall-large rotate: false - xy: 659, 256 + xy: 659, 238 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 ironwall rotate: false - xy: 805, 386 + xy: 591, 75 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 steelwall rotate: false - xy: 847, 431 + xy: 640, 188 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 steelwall-large rotate: false - xy: 231, 69 + xy: 285, 69 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 stonewall rotate: false - xy: 815, 410 + xy: 660, 198 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 titaniumshieldwall rotate: false - xy: 835, 410 + xy: 680, 188 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 titaniumwall rotate: false - xy: 815, 380 + xy: 689, 228 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 titaniumwall-large rotate: false - xy: 303, 69 + xy: 357, 69 size: 16, 16 orig: 16, 16 offset: 0, 0 @@ -1420,7 +1441,7 @@ blank index: -1 bullet rotate: false - xy: 746, 295 + xy: 781, 434 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -1441,7 +1462,7 @@ enemyarrow index: -1 laser rotate: false - xy: 711, 290 + xy: 427, 55 size: 1, 12 orig: 1, 12 offset: 0, 0 @@ -1462,28 +1483,28 @@ laserfull index: -1 shell rotate: false - xy: 185, 22 + xy: 813, 442 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 shot rotate: false - xy: 195, 8 + xy: 853, 443 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 shot-long rotate: false - xy: 541, 67 + xy: 175, 30 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 titanshell rotate: false - xy: 825, 390 + xy: 687, 218 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -1497,77 +1518,77 @@ blastenemy-t1 index: -1 blastenemy-t2 rotate: false - xy: 375, 71 + xy: 429, 71 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 blastenemy-t3 rotate: false - xy: 391, 71 + xy: 445, 71 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 empenemy-t1 rotate: false - xy: 407, 71 + xy: 461, 71 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 empenemy-t2 rotate: false - xy: 423, 71 + xy: 477, 71 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 empenemy-t3 rotate: false - xy: 439, 71 + xy: 493, 71 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 fastenemy-t1 rotate: false - xy: 455, 71 + xy: 509, 71 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 fastenemy-t2 rotate: false - xy: 471, 71 + xy: 525, 71 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 fastenemy-t3 rotate: false - xy: 487, 71 + xy: 580, 159 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 flamerenemy-t1 rotate: false - xy: 503, 71 + xy: 581, 143 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 flamerenemy-t2 rotate: false - xy: 519, 71 + xy: 724, 315 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 flamerenemy-t3 rotate: false - xy: 580, 159 + xy: 641, 218 size: 14, 14 orig: 14, 14 offset: 0, 0 @@ -1595,231 +1616,231 @@ fortressenemy-t3 index: -1 healerenemy-t1 rotate: false - xy: 581, 143 + xy: 753, 409 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 healerenemy-t2 rotate: false - xy: 724, 315 + xy: 753, 393 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 healerenemy-t3 rotate: false - xy: 641, 218 + xy: 753, 377 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 mortarenemy-t1 rotate: false - xy: 546, 97 + xy: 179, 42 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 mortarenemy-t2 rotate: false - xy: 602, 177 + xy: 213, 54 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 mortarenemy-t3 rotate: false - xy: 183, 58 + xy: 229, 53 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 rapidenemy-t1 rotate: false - xy: 179, 42 + xy: 245, 53 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 rapidenemy-t2 rotate: false - xy: 213, 54 + xy: 261, 53 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 rapidenemy-t3 rotate: false - xy: 229, 53 + xy: 277, 53 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 standardenemy-t1 rotate: false - xy: 245, 53 + xy: 293, 53 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 targetenemy-t1 rotate: false - xy: 245, 53 + xy: 293, 53 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 standardenemy-t2 rotate: false - xy: 449, 57 + xy: 269, 39 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 standardenemy-t3 rotate: false - xy: 463, 57 + xy: 283, 39 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 tankenemy-t1 rotate: false - xy: 261, 53 + xy: 309, 53 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 tankenemy-t2 rotate: false - xy: 277, 53 + xy: 325, 53 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 tankenemy-t3 rotate: false - xy: 293, 53 + xy: 341, 53 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 titanenemy-t1 rotate: false - xy: 249, 69 + xy: 303, 69 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 titanenemy-t2 rotate: false - xy: 267, 69 + xy: 321, 69 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 titanenemy-t3 rotate: false - xy: 285, 69 + xy: 339, 69 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 item-biomatter rotate: false - xy: 805, 376 + xy: 601, 75 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 item-coal rotate: false - xy: 805, 366 + xy: 541, 67 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 item-dirium rotate: false - xy: 659, 228 + xy: 551, 67 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 item-glass rotate: false - xy: 657, 218 + xy: 561, 65 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 item-iron rotate: false - xy: 669, 228 + xy: 571, 65 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 item-quartz rotate: false - xy: 667, 218 + xy: 581, 65 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 item-silicon rotate: false - xy: 660, 208 + xy: 591, 65 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 item-steel rotate: false - xy: 679, 228 + xy: 601, 65 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 item-stone rotate: false - xy: 677, 218 + xy: 724, 295 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 item-titanium rotate: false - xy: 660, 198 + xy: 734, 295 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 item-uranium rotate: false - xy: 670, 208 + xy: 744, 295 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 mech-standard rotate: false - xy: 365, 55 + xy: 413, 55 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 mech-standard-icon rotate: false - xy: 379, 57 + xy: 199, 46 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 ship-standard rotate: false - xy: 421, 57 + xy: 241, 39 size: 12, 12 orig: 12, 12 offset: 0, 0 @@ -1967,7 +1988,7 @@ clear index: -1 cursor rotate: false - xy: 781, 426 + xy: 610, 193 size: 4, 4 orig: 4, 4 offset: 0, 0 @@ -1981,21 +2002,21 @@ controller-cursor index: -1 icon-about rotate: false - xy: 753, 409 + xy: 753, 361 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-add rotate: false - xy: 753, 393 + xy: 769, 410 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-admin rotate: false - xy: 753, 377 + xy: 769, 394 size: 14, 14 orig: 14, 14 offset: 0, 0 @@ -2016,7 +2037,7 @@ icon-areaDelete index: -1 icon-arrow rotate: false - xy: 753, 361 + xy: 769, 378 size: 14, 14 orig: 14, 14 offset: 0, 0 @@ -2037,49 +2058,49 @@ icon-arrow-left index: -1 icon-arrow-right rotate: false - xy: 965, 439 + xy: 349, 41 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-arrow-up rotate: false - xy: 977, 439 + xy: 361, 43 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-back rotate: false - xy: 641, 234 + xy: 677, 238 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-ban rotate: false - xy: 769, 410 + xy: 769, 362 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-cancel rotate: false - xy: 769, 394 + xy: 698, 304 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-chat rotate: false - xy: 989, 439 + xy: 373, 43 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-check rotate: false - xy: 769, 378 + xy: 695, 288 size: 14, 14 orig: 14, 14 offset: 0, 0 @@ -2107,434 +2128,434 @@ icon-close-over index: -1 icon-crafting rotate: false - xy: 1001, 439 + xy: 385, 43 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-cursor rotate: false - xy: 1013, 435 + xy: 397, 43 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-defense rotate: false - xy: 588, 119 + xy: 409, 43 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-discord rotate: false - xy: 769, 362 + xy: 695, 272 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-distribution rotate: false - xy: 595, 131 + xy: 965, 439 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-donate rotate: false - xy: 698, 304 + xy: 695, 256 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-dots rotate: false - xy: 695, 288 + xy: 695, 240 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-editor rotate: false - xy: 695, 272 + xy: 740, 315 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-file-text rotate: false - xy: 695, 256 + xy: 869, 463 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-fill rotate: false - xy: 659, 238 + xy: 233, 87 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-floppy rotate: false - xy: 695, 240 + xy: 885, 463 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-folder rotate: false - xy: 740, 315 + xy: 901, 463 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-folder-parent rotate: false - xy: 869, 463 + xy: 917, 463 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-grid rotate: false - xy: 677, 256 + xy: 251, 87 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-hold rotate: false - xy: 600, 119 + xy: 977, 439 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-holdDelete rotate: false - xy: 169, 6 + xy: 989, 439 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-home rotate: false - xy: 885, 463 + xy: 869, 447 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-host rotate: false - xy: 901, 463 + xy: 885, 447 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-info rotate: false - xy: 596, 163 + xy: 1001, 439 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-line rotate: false - xy: 677, 238 + xy: 269, 87 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-liquid rotate: false - xy: 608, 165 + xy: 1013, 435 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-load rotate: false - xy: 917, 463 + xy: 901, 447 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-load-image rotate: false - xy: 233, 87 + xy: 287, 87 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-load-map rotate: false - xy: 251, 87 + xy: 305, 87 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-loading rotate: false - xy: 269, 87 + xy: 323, 87 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-logic rotate: false - xy: 597, 151 + xy: 588, 119 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-menu rotate: false - xy: 609, 153 + xy: 595, 131 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-none rotate: false - xy: 529, 59 + xy: 600, 119 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-pause rotate: false - xy: 564, 107 + xy: 169, 6 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-pencil rotate: false - xy: 287, 87 + xy: 341, 87 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-pencil-small rotate: false - xy: 869, 447 + xy: 917, 447 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-pick rotate: false - xy: 305, 87 + xy: 359, 87 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-play rotate: false - xy: 576, 107 + xy: 596, 163 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-play-2 rotate: false - xy: 885, 447 + xy: 933, 460 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-players rotate: false - xy: 588, 107 + xy: 608, 165 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-power rotate: false - xy: 600, 107 + xy: 597, 151 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-production rotate: false - xy: 562, 95 + xy: 609, 153 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-quit rotate: false - xy: 901, 447 + xy: 949, 460 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-redo rotate: false - xy: 323, 87 + xy: 377, 87 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-refresh rotate: false - xy: 917, 447 + xy: 933, 444 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-rename rotate: false - xy: 933, 460 + xy: 949, 444 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-resize rotate: false - xy: 341, 87 + xy: 395, 87 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-rotate rotate: false - xy: 949, 460 + xy: 965, 467 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-rotate-arrow rotate: false - xy: 933, 444 + xy: 965, 451 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-rotate-left rotate: false - xy: 949, 444 + xy: 981, 467 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-rotate-right rotate: false - xy: 965, 467 + xy: 981, 451 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-save rotate: false - xy: 965, 451 + xy: 997, 467 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-save-image rotate: false - xy: 359, 87 + xy: 413, 87 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-save-map rotate: false - xy: 377, 87 + xy: 431, 87 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-settings rotate: false - xy: 574, 95 + xy: 564, 107 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-terrain rotate: false - xy: 395, 87 + xy: 449, 87 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-tools rotate: false - xy: 981, 467 + xy: 997, 451 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-touch rotate: false - xy: 586, 95 + xy: 576, 107 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-touchDelete rotate: false - xy: 598, 95 + xy: 588, 107 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-trash rotate: false - xy: 981, 451 + xy: 546, 97 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-trash-16 rotate: false - xy: 413, 87 + xy: 467, 87 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-tutorial rotate: false - xy: 997, 467 + xy: 602, 177 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-undo rotate: false - xy: 431, 87 + xy: 485, 87 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-units rotate: false - xy: 781, 432 + xy: 600, 107 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-weapon rotate: false - xy: 793, 436 + xy: 562, 95 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-zoom rotate: false - xy: 449, 87 + xy: 503, 87 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-zoom-small rotate: false - xy: 997, 451 + xy: 183, 58 size: 14, 14 orig: 14, 14 offset: 0, 0 @@ -2612,7 +2633,7 @@ selection index: -1 slider rotate: false - xy: 750, 347 + xy: 559, 87 size: 1, 8 orig: 1, 8 offset: 0, 0 @@ -2640,7 +2661,7 @@ slider-knob-over index: -1 slider-vertical rotate: false - xy: 610, 196 + xy: 781, 431 size: 8, 1 orig: 8, 1 offset: 0, 0 @@ -2707,84 +2728,84 @@ window-empty index: -1 beam rotate: false - xy: 711, 242 + xy: 500, 61 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 beam-equip rotate: false - xy: 610, 209 + xy: 510, 61 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blaster rotate: false - xy: 726, 295 + xy: 711, 270 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blaster-equip rotate: false - xy: 736, 305 + xy: 711, 260 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 clustergun rotate: false - xy: 726, 285 + xy: 433, 49 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 clustergun-equip rotate: false - xy: 736, 285 + xy: 443, 49 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 shockgun rotate: false - xy: 195, 18 + xy: 833, 442 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 shockgun-equip rotate: false - xy: 185, 12 + xy: 843, 443 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 triblaster rotate: false - xy: 835, 400 + xy: 699, 230 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 triblaster-equip rotate: false - xy: 815, 370 + xy: 709, 230 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 vulcan rotate: false - xy: 835, 360 + xy: 700, 188 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 vulcan-equip rotate: false - xy: 620, 173 + xy: 710, 210 size: 8, 8 orig: 8, 8 offset: 0, 0 diff --git a/core/assets/sprites/sprites.png b/core/assets/sprites/sprites.png index 6e9b61dd24..b77326b83e 100644 Binary files a/core/assets/sprites/sprites.png and b/core/assets/sprites/sprites.png differ diff --git a/core/assets/version.properties b/core/assets/version.properties index c37e55bbef..fa3f84764e 100644 --- a/core/assets/version.properties +++ b/core/assets/version.properties @@ -1,7 +1,7 @@ #Autogenerated file. Do not modify. -#Tue Mar 13 11:22:58 EDT 2018 +#Tue Mar 13 18:52:30 EDT 2018 version=release -androidBuildCode=479 +androidBuildCode=489 name=Mindustry code=3.4 build=custom build diff --git a/core/src/io/anuke/mindustry/resource/Liquid.java b/core/src/io/anuke/mindustry/resource/Liquid.java index 9378073928..2c6507dea4 100644 --- a/core/src/io/anuke/mindustry/resource/Liquid.java +++ b/core/src/io/anuke/mindustry/resource/Liquid.java @@ -13,7 +13,7 @@ public class Liquid { none = new Liquid("none", Color.CLEAR), water = new Liquid("water", Color.ROYAL){ { - heatCapacity = 0.7f; + heatCapacity = 0.4f; } }, plasma = new Liquid("plasma", Color.CORAL){ @@ -38,8 +38,8 @@ public class Liquid { }, cryofluid = new Liquid("cryofluid", Color.SKY){ { - heatCapacity = 0.8f; - temperature = 0.1f; + heatCapacity = 0.75f; + temperature = 0.5f; } }, sulfuricAcid = new Liquid("sulfuricAcid", Color.YELLOW){ diff --git a/core/src/io/anuke/mindustry/resource/Recipes.java b/core/src/io/anuke/mindustry/resource/Recipes.java index 79a78866b4..e9615f1618 100644 --- a/core/src/io/anuke/mindustry/resource/Recipes.java +++ b/core/src/io/anuke/mindustry/resource/Recipes.java @@ -56,6 +56,7 @@ public class Recipes { new Recipe(crafting, ProductionBlocks.stoneformer, stack(Item.steel, 10), stack(Item.iron, 10)), new Recipe(crafting, ProductionBlocks.lavasmelter, stack(Item.steel, 30), stack(Item.titanium, 15)), new Recipe(crafting, ProductionBlocks.siliconextractor, stack(Item.steel, 30), stack(Item.titanium, 15)), + new Recipe(crafting, ProductionBlocks.cryofluidmixer, stack(Item.steel, 30), stack(Item.titanium, 15)), new Recipe(crafting, ProductionBlocks.weaponFactory, stack(Item.steel, 60), stack(Item.iron, 60)).setDesktop(), //new Recipe(crafting, ProductionBlocks.centrifuge, stack(Item.steel, 30), stack(Item.iron, 30)), diff --git a/core/src/io/anuke/mindustry/world/blocks/BaseBlock.java b/core/src/io/anuke/mindustry/world/blocks/BaseBlock.java index c1bc767970..d9999b12c0 100644 --- a/core/src/io/anuke/mindustry/world/blocks/BaseBlock.java +++ b/core/src/io/anuke/mindustry/world/blocks/BaseBlock.java @@ -91,7 +91,7 @@ public abstract class BaseBlock { if(ofract > fract) return; - float flow = Math.min((fract - ofract) * liquidCapacity/2f, + float flow = Math.min((fract - ofract) * (liquidCapacity/(1.3f + tile.entity.liquid.liquid.viscosity)), Math.min(tile.entity.liquid.amount/liquidFlowFactor * Math.max(Timers.delta(), 1f), tile.entity.liquid.amount)); if(flow <= 0f || tile.entity.liquid.amount < flow) return; diff --git a/core/src/io/anuke/mindustry/world/blocks/DistributionBlocks.java b/core/src/io/anuke/mindustry/world/blocks/DistributionBlocks.java index 36770853a0..aa079e3d2c 100644 --- a/core/src/io/anuke/mindustry/world/blocks/DistributionBlocks.java +++ b/core/src/io/anuke/mindustry/world/blocks/DistributionBlocks.java @@ -1,7 +1,6 @@ package io.anuke.mindustry.world.blocks; import io.anuke.mindustry.world.Block; -import io.anuke.mindustry.world.blocks.types.LiquidBlock; import io.anuke.mindustry.world.blocks.types.distribution.*; import io.anuke.mindustry.world.blocks.types.storage.SortedUnloader; import io.anuke.mindustry.world.blocks.types.storage.Unloader; @@ -11,11 +10,11 @@ public class DistributionBlocks{ public static final Block - conduit = new LiquidBlock("conduit"){{ + conduit = new Conduit("conduit"){{ health = 45; }}, - pulseconduit = new LiquidBlock("pulseconduit"){{ + pulseconduit = new Conduit("pulseconduit"){{ liquidCapacity = 16f; liquidFlowFactor = 4.9f; health = 65; @@ -23,12 +22,10 @@ public class DistributionBlocks{ liquidrouter = new LiquidRouter("liquidrouter"){{ liquidCapacity = 40f; - liquidRegion = "liquidrouter-liquid"; }}, liquidtank = new LiquidRouter("liquidtank"){{ size = 3; - liquidRegion = "liquidtank-liquid"; liquidCapacity = 1500f; }}, diff --git a/core/src/io/anuke/mindustry/world/blocks/ProductionBlocks.java b/core/src/io/anuke/mindustry/world/blocks/ProductionBlocks.java index 5d54afc166..552e09ed1f 100644 --- a/core/src/io/anuke/mindustry/world/blocks/ProductionBlocks.java +++ b/core/src/io/anuke/mindustry/world/blocks/ProductionBlocks.java @@ -61,6 +61,19 @@ public class ProductionBlocks{ size = 2;*/ } }, + + cryofluidmixer = new LiquidMixer("cryofluidmixer"){ + { + health = 200; + inputLiquid = Liquid.water; + outputLiquid = Liquid.cryofluid; + inputItem = Item.titanium; + liquidPerItem = 70f; + itemCapacity = 50; + powerUse = 0.1f; + size = 2; + } + }, coalextractor = new LiquidCrafter("coalextractor"){ { @@ -181,9 +194,9 @@ public class ProductionBlocks{ laserdrill = new GenericDrill("laserdrill"){ { - drillTime = 240; + drillTime = 200; size = 2; - powerUse = 0.08f; + powerUse = 0.2f; hasPower = true; } }, diff --git a/core/src/io/anuke/mindustry/world/blocks/types/LiquidBlock.java b/core/src/io/anuke/mindustry/world/blocks/types/LiquidBlock.java index 9520b0a9ce..34941e0713 100644 --- a/core/src/io/anuke/mindustry/world/blocks/types/LiquidBlock.java +++ b/core/src/io/anuke/mindustry/world/blocks/types/LiquidBlock.java @@ -8,8 +8,7 @@ import io.anuke.mindustry.world.blocks.types.modules.LiquidModule; import io.anuke.ucore.graphics.Draw; public class LiquidBlock extends Block{ - protected final int timerFlow = timers++; - protected String liquidRegion = "conduitliquid"; + protected String liquidRegion = name() + "-liquid"; public LiquidBlock(String name) { super(name); @@ -31,22 +30,15 @@ public class LiquidBlock extends Block{ int rotation = rotate ? tile.getRotation() * 90 : 0; - Draw.rect(name() + "-bottom", tile.worldx(), tile.worldy(), rotation); + Draw.rect(name() + "-bottom", tile.drawx(), tile.drawy(), rotation); - if(mod.amount > 0.01f){ + if(mod.amount > 0.001f){ Draw.color(mod.liquid.color); Draw.alpha(mod.amount / liquidCapacity); - Draw.rect(liquidRegion, tile.worldx(), tile.worldy(), rotation); + Draw.rect(liquidRegion, tile.drawx(), tile.drawy(), rotation); Draw.color(); } - Draw.rect(name() + "-top", tile.worldx(), tile.worldy(), rotation); - } - - @Override - public void update(Tile tile){ - if(tile.entity.liquid.amount > 0.01f && tile.entity.timer.get(timerFlow, 1)){ - tryMoveLiquid(tile, tile.getNearby(tile.getRotation())); - } + Draw.rect(name() + "-top", tile.drawx(), tile.drawy(), rotation); } } diff --git a/core/src/io/anuke/mindustry/world/blocks/types/distribution/Conduit.java b/core/src/io/anuke/mindustry/world/blocks/types/distribution/Conduit.java new file mode 100644 index 0000000000..6d725345f0 --- /dev/null +++ b/core/src/io/anuke/mindustry/world/blocks/types/distribution/Conduit.java @@ -0,0 +1,33 @@ +package io.anuke.mindustry.world.blocks.types.distribution; + +import com.badlogic.gdx.graphics.g2d.TextureRegion; +import io.anuke.mindustry.resource.Liquid; +import io.anuke.mindustry.world.Tile; +import io.anuke.mindustry.world.blocks.types.LiquidBlock; +import io.anuke.ucore.graphics.Draw; + +public class Conduit extends LiquidBlock { + protected final int timerFlow = timers++; + + public Conduit(String name) { + super(name); + liquidRegion = "conduit-liquid"; + } + + @Override + public void update(Tile tile){ + if(tile.entity.liquid.amount > 0.001f && tile.entity.timer.get(timerFlow, 1)){ + tryMoveLiquid(tile, tile.getNearby(tile.getRotation())); + } + } + + @Override + public TextureRegion[] getIcon(){ + return new TextureRegion[]{Draw.region(name() + "-bottom"), Draw.region(name() + "-top")}; + } + + @Override + public boolean acceptLiquid(Tile tile, Tile source, Liquid liquid, float amount) { + return super.acceptLiquid(tile, source, liquid, amount) && ((2 + source.relativeTo(tile.x, tile.y)) % 4 != tile.getRotation()); + } +} diff --git a/core/src/io/anuke/mindustry/world/blocks/types/generation/NuclearReactor.java b/core/src/io/anuke/mindustry/world/blocks/types/generation/NuclearReactor.java index 4a6ce480bb..5bed41b3fe 100644 --- a/core/src/io/anuke/mindustry/world/blocks/types/generation/NuclearReactor.java +++ b/core/src/io/anuke/mindustry/world/blocks/types/generation/NuclearReactor.java @@ -33,7 +33,7 @@ public class NuclearReactor extends LiquidPowerGenerator{ protected int fuelUseTime = 130; //time to consume 1 fuel protected float powerMultiplier = 0.45f; //power per frame, depends on full capacity protected float heating = 0.007f; //heating per frame - protected float coolantPower = 0.007f; //how much heat decreases per coolant unit + protected float coolantPower = 0.015f; //how much heat decreases per coolant unit protected float smokeThreshold = 0.3f; //threshold at which block starts smoking protected int explosionRadius = 19; protected int explosionDamage = 135; @@ -85,12 +85,17 @@ public class NuclearReactor extends LiquidPowerGenerator{ } if(entity.liquid.amount > 0){ - //TODO proper coolant usage - float coolDirection = Mathf.clamp(10f * (0.6f - entity.liquid.liquid.temperature), -2f, 2f); - float maxCool = entity.liquid.amount * coolantPower * entity.liquid.liquid.heatCapacity; - entity.heat -= maxCool * coolDirection; //TODO steam when cooling large amounts? - entity.heat = Mathf.clamp(entity.heat); - entity.liquid.amount -= Math.min(entity.liquid.amount, entity.heat / coolantPower); + //TODO steam when cooling large amounts? + float liquidPower = 1f; + + if(liquidPower > 0){ //is coolant + float pow = coolantPower * entity.liquid.liquid.heatCapacity; + float maxCool = Math.min(entity.liquid.amount, entity.heat / pow); //max that can be cooled in terms of liquid + entity.heat -= maxCool * pow; + entity.liquid.amount -= maxCool; + }else{ //is heater + //TODO + } } if(entity.heat > smokeThreshold){ diff --git a/core/src/io/anuke/mindustry/world/blocks/types/production/LiquidMixer.java b/core/src/io/anuke/mindustry/world/blocks/types/production/LiquidMixer.java index 9f3f97cdb9..c4d0a0aded 100644 --- a/core/src/io/anuke/mindustry/world/blocks/types/production/LiquidMixer.java +++ b/core/src/io/anuke/mindustry/world/blocks/types/production/LiquidMixer.java @@ -1,10 +1,66 @@ package io.anuke.mindustry.world.blocks.types.production; +import io.anuke.mindustry.entities.TileEntity; +import io.anuke.mindustry.resource.Item; +import io.anuke.mindustry.resource.Liquid; +import io.anuke.mindustry.world.Tile; import io.anuke.mindustry.world.blocks.types.LiquidBlock; +import io.anuke.ucore.core.Timers; public class LiquidMixer extends LiquidBlock{ + protected Liquid inputLiquid = Liquid.none; + protected Liquid outputLiquid = Liquid.none; + protected Item inputItem = null; + protected float liquidPerItem = 50f; + protected float powerUse = 0f; public LiquidMixer(String name) { super(name); + hasInventory = true; + hasPower = true; + rotate = false; + liquidRegion = name() + "-liquid"; + solid = true; + } + + @Override + public void update(Tile tile){ + if(tile.entity.liquid.amount > 0.001f){ + tryDumpLiquid(tile); + } + + tile.entity.power.amount -= Math.min(Timers.delta() * powerUse, tile.entity.power.amount); + } + + @Override + public void handleLiquid(Tile tile, Tile source, Liquid liquid, float amount) { + LiquidMixerEntity entity = tile.entity(); + entity.accumulator += amount; + int items = (int)(entity.accumulator / liquidPerItem); + entity.inventory.removeItem(inputItem, items); + entity.accumulator %= liquidPerItem; + entity.liquid.liquid = outputLiquid; + entity.liquid.amount += amount; + } + + @Override + public boolean acceptItem(Item item, Tile tile, Tile source) { + return item == inputItem && tile.entity.inventory.getItem(item) < itemCapacity; + } + + @Override + public boolean acceptLiquid(Tile tile, Tile source, Liquid liquid, float amount) { + return liquid == inputLiquid && tile.entity.liquid.amount + amount <= liquidCapacity && + tile.entity.inventory.hasItem(inputItem, (int)((tile.entity().accumulator + amount)/amount)) && + tile.entity.power.amount >= powerUse; + } + + @Override + public TileEntity getEntity() { + return new LiquidMixerEntity(); + } + + static class LiquidMixerEntity extends TileEntity { + float accumulator; } }