diff --git a/core/assets-raw/sprites/blocks/power/fusionreactor-bottom.png b/core/assets-raw/sprites/blocks/power/fusionreactor-bottom.png new file mode 100644 index 0000000000..a7688ed12d Binary files /dev/null and b/core/assets-raw/sprites/blocks/power/fusionreactor-bottom.png differ diff --git a/core/assets-raw/sprites/blocks/power/fusionreactor-light.png b/core/assets-raw/sprites/blocks/power/fusionreactor-light.png new file mode 100644 index 0000000000..deabd2752f Binary files /dev/null and b/core/assets-raw/sprites/blocks/power/fusionreactor-light.png differ diff --git a/core/assets-raw/sprites/blocks/power/fusionreactor-plasma-0.png b/core/assets-raw/sprites/blocks/power/fusionreactor-plasma-0.png new file mode 100644 index 0000000000..13efbdd207 Binary files /dev/null and b/core/assets-raw/sprites/blocks/power/fusionreactor-plasma-0.png differ diff --git a/core/assets-raw/sprites/blocks/power/fusionreactor-plasma-1.png b/core/assets-raw/sprites/blocks/power/fusionreactor-plasma-1.png new file mode 100644 index 0000000000..820e15bde2 Binary files /dev/null and b/core/assets-raw/sprites/blocks/power/fusionreactor-plasma-1.png differ diff --git a/core/assets-raw/sprites/blocks/power/fusionreactor-plasma-2.png b/core/assets-raw/sprites/blocks/power/fusionreactor-plasma-2.png new file mode 100644 index 0000000000..a1032085ff Binary files /dev/null and b/core/assets-raw/sprites/blocks/power/fusionreactor-plasma-2.png differ diff --git a/core/assets-raw/sprites/blocks/power/fusionreactor-plasma-3.png b/core/assets-raw/sprites/blocks/power/fusionreactor-plasma-3.png new file mode 100644 index 0000000000..2b22128700 Binary files /dev/null and b/core/assets-raw/sprites/blocks/power/fusionreactor-plasma-3.png differ diff --git a/core/assets-raw/sprites/blocks/power/fusionreactor-top.png b/core/assets-raw/sprites/blocks/power/fusionreactor-top.png new file mode 100644 index 0000000000..165f77c739 Binary files /dev/null and b/core/assets-raw/sprites/blocks/power/fusionreactor-top.png differ diff --git a/core/assets-raw/sprites/blocks/power/fusionreactor.png b/core/assets-raw/sprites/blocks/power/fusionreactor.png new file mode 100644 index 0000000000..11aaf95ad7 Binary files /dev/null and b/core/assets-raw/sprites/blocks/power/fusionreactor.png differ diff --git a/core/assets/sprites/sprites.atlas b/core/assets/sprites/sprites.atlas index 30622cc878..0b17fb434c 100644 --- a/core/assets/sprites/sprites.atlas +++ b/core/assets/sprites/sprites.atlas @@ -13,805 +13,805 @@ background index: -1 conduit-bottom rotate: false - xy: 558, 197 + xy: 959, 417 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 conduit-top rotate: false - xy: 581, 230 + xy: 657, 219 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 conduittunnel rotate: false - xy: 548, 171 + xy: 667, 219 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 conveyor rotate: false - xy: 677, 343 + xy: 656, 209 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 conveyormove rotate: false - xy: 677, 333 + xy: 666, 209 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 conveyortunnel rotate: false - xy: 687, 347 + xy: 656, 199 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 core rotate: false - xy: 797, 453 + xy: 875, 453 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 junction rotate: false - xy: 786, 387 + xy: 776, 385 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 liquidjunction rotate: false - xy: 796, 387 + xy: 443, 144 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 liquidrouter rotate: false - xy: 806, 397 + xy: 433, 134 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 liquidrouter-bottom rotate: false - xy: 816, 407 + xy: 453, 144 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 liquidrouter-liquid rotate: false - xy: 826, 417 + xy: 433, 124 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 liquidrouter-top rotate: false - xy: 836, 427 + xy: 443, 134 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 liquidtank-bottom rotate: false - xy: 901, 453 + xy: 979, 453 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 liquidtank-liquid rotate: false - xy: 927, 453 + xy: 656, 353 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 liquidtank-top rotate: false - xy: 953, 453 + xy: 651, 327 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 multiplexer rotate: false - xy: 206, 68 + xy: 720, 400 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 poweredconveyor rotate: false - xy: 836, 417 + xy: 433, 104 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 poweredconveyormove rotate: false - xy: 846, 427 + xy: 443, 114 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 pulseconduit-bottom rotate: false - xy: 826, 397 + xy: 443, 104 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 pulseconduit-top rotate: false - xy: 836, 407 + xy: 453, 114 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 router rotate: false - xy: 866, 427 + xy: 473, 114 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 sortedunloader rotate: false - xy: 906, 427 + xy: 533, 103 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 sorter rotate: false - xy: 856, 367 + xy: 543, 145 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 splitter rotate: false - xy: 866, 377 + xy: 543, 135 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 steelconveyor rotate: false - xy: 876, 387 + xy: 553, 145 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 steelconveyormove rotate: false - xy: 886, 397 + xy: 553, 135 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 teleporter-top rotate: false - xy: 229, 113 + xy: 110, 39 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 unloader rotate: false - xy: 926, 397 + xy: 236, 81 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 vault rotate: false - xy: 572, 258 + xy: 95, 13 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 vault-icon rotate: false - xy: 936, 407 + xy: 266, 101 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 weaponfactory rotate: false - xy: 177, 14 + xy: 522, 153 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 blackrock1 rotate: false - xy: 99, 1 + xy: 149, 2 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blackrockshadow1 rotate: false - xy: 109, 1 + xy: 159, 2 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blackstone1 rotate: false - xy: 119, 1 + xy: 582, 216 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blackstone2 rotate: false - xy: 129, 1 + xy: 224, 103 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blackstone3 rotate: false - xy: 139, 1 + xy: 789, 417 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blackstoneblock1 rotate: false - xy: 492, 197 + xy: 799, 417 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blackstoneblock2 rotate: false - xy: 561, 233 + xy: 809, 417 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blackstoneblock3 rotate: false - xy: 149, 1 + xy: 819, 417 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blackstoneedge rotate: false - xy: 979, 465 + xy: 1010, 499 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 coal1 rotate: false - xy: 219, 1 + xy: 899, 417 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 coal2 rotate: false - xy: 229, 1 + xy: 909, 417 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 coal3 rotate: false - xy: 239, 1 + xy: 919, 417 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 deepwater rotate: false - xy: 697, 347 + xy: 716, 389 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 dirt1 rotate: false - xy: 697, 337 + xy: 726, 390 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 dirt2 rotate: false - xy: 766, 422 + xy: 736, 390 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 dirt3 rotate: false - xy: 766, 412 + xy: 746, 390 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 dirtedge rotate: false - xy: 979, 451 + xy: 1010, 485 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 grass1 rotate: false - xy: 646, 265 + xy: 393, 113 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 grass2 rotate: false - xy: 646, 255 + xy: 403, 113 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 grass3 rotate: false - xy: 656, 265 + xy: 413, 113 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 grassblock1 rotate: false - xy: 646, 245 + xy: 363, 103 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 grassblock2 rotate: false - xy: 656, 255 + xy: 373, 104 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 grassedge rotate: false - xy: 1011, 443 + xy: 706, 399 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 ice1 rotate: false - xy: 666, 265 + xy: 383, 104 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ice2 rotate: false - xy: 656, 245 + xy: 393, 103 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ice3 rotate: false - xy: 666, 255 + xy: 403, 103 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 iceedge rotate: false - xy: 1011, 429 + xy: 221, 113 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 icerock1 rotate: false - xy: 666, 245 + xy: 413, 103 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 icerock2 rotate: false - xy: 680, 275 + xy: 572, 161 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 icerockshadow1 rotate: false - xy: 676, 265 + xy: 582, 165 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 rockshadow1 rotate: false - xy: 676, 265 + xy: 582, 165 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 icerockshadow2 rotate: false - xy: 676, 255 + xy: 572, 151 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 rockshadow2 rotate: false - xy: 676, 255 + xy: 572, 151 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 iron1 rotate: false - xy: 676, 245 + xy: 582, 155 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 iron2 rotate: false - xy: 375, 132 + xy: 592, 160 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 iron3 rotate: false - xy: 278, 83 + xy: 592, 150 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 lava rotate: false - xy: 796, 397 + xy: 423, 143 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 lavaedge rotate: false - xy: 138, 62 + xy: 579, 226 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 lead1 rotate: false - xy: 816, 417 + xy: 423, 123 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 lead2 rotate: false - xy: 826, 427 + xy: 423, 113 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 lead3 rotate: false - xy: 776, 367 + xy: 423, 103 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 mossblock rotate: false - xy: 796, 377 + xy: 433, 114 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 oil rotate: false - xy: 806, 387 + xy: 443, 124 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 oiledge rotate: false - xy: 138, 48 + xy: 171, 14 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 rock1 rotate: false - xy: 846, 407 + xy: 483, 134 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 rock2 rotate: false - xy: 856, 417 + xy: 463, 104 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 sand1 rotate: false - xy: 836, 387 + xy: 473, 104 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 sand2 rotate: false - xy: 846, 397 + xy: 483, 114 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 sand3 rotate: false - xy: 856, 407 + xy: 493, 124 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 sandblock1 rotate: false - xy: 866, 417 + xy: 483, 104 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 sandblock2 rotate: false - xy: 876, 427 + xy: 493, 114 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 sandblock3 rotate: false - xy: 826, 367 + xy: 493, 104 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 sandedge rotate: false - xy: 965, 439 + xy: 185, 14 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 shrub rotate: false - xy: 856, 387 + xy: 523, 133 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 shrubshadow rotate: false - xy: 866, 397 + xy: 513, 113 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 snow1 rotate: false - xy: 896, 427 + xy: 503, 103 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 snow2 rotate: false - xy: 846, 367 + xy: 513, 103 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 snow3 rotate: false - xy: 856, 377 + xy: 523, 103 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 snowblock1 rotate: false - xy: 866, 387 + xy: 533, 143 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 snowblock2 rotate: false - xy: 876, 397 + xy: 533, 133 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 snowblock3 rotate: false - xy: 886, 407 + xy: 533, 123 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 snowedge rotate: false - xy: 516, 193 + xy: 592, 210 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 stone1 rotate: false - xy: 876, 377 + xy: 553, 115 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 stone2 rotate: false - xy: 886, 387 + xy: 553, 105 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 stone3 rotate: false - xy: 896, 397 + xy: 681, 231 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 stoneblock1 rotate: false - xy: 906, 407 + xy: 650, 189 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 stoneblock2 rotate: false - xy: 916, 417 + xy: 660, 189 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 stoneblock3 rotate: false - xy: 926, 427 + xy: 670, 189 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 stoneedge rotate: false - xy: 530, 179 + xy: 592, 182 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 thorium1 rotate: false - xy: 916, 407 + xy: 678, 179 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 thorium2 rotate: false - xy: 926, 417 + xy: 171, 4 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 thorium3 rotate: false - xy: 936, 427 + xy: 181, 4 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 titanium1 rotate: false - xy: 886, 367 + xy: 191, 4 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 titanium2 rotate: false - xy: 896, 377 + xy: 201, 4 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 titanium3 rotate: false - xy: 906, 387 + xy: 211, 4 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 water rotate: false - xy: 916, 377 + xy: 276, 101 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 wateredge rotate: false - xy: 544, 193 + xy: 606, 196 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 block-middle rotate: false - xy: 365, 127 + xy: 859, 417 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 pump-liquid rotate: false - xy: 365, 127 + xy: 859, 417 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 conduit-liquid rotate: false - xy: 571, 230 + xy: 969, 417 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 cross-1 rotate: false - xy: 687, 337 + xy: 666, 199 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 cross-2 rotate: false - xy: 732, 412 + xy: 543, 225 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 cross-3 rotate: false - xy: 823, 453 + xy: 901, 453 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -825,175 +825,231 @@ cross-4 index: -1 enemyspawn rotate: false - xy: 650, 275 + xy: 363, 113 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 playerspawn rotate: false - xy: 826, 407 + xy: 473, 144 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ripples rotate: false - xy: 283, 103 + xy: 713, 309 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 shadow rotate: false - xy: 295, 105 + xy: 713, 297 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 battery rotate: false - xy: 69, 1 + xy: 129, 1 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 batterylarge rotate: false - xy: 398, 169 + xy: 466, 196 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 combustiongenerator rotate: false - xy: 249, 1 + xy: 929, 417 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 combustiongenerator-top rotate: false - xy: 259, 1 + xy: 939, 417 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 +fusionreactor + rotate: false + xy: 35, 8 + size: 32, 32 + orig: 32, 32 + offset: 0, 0 + index: -1 +fusionreactor-bottom + rotate: false + xy: 763, 453 + size: 32, 32 + orig: 32, 32 + offset: 0, 0 + index: -1 +fusionreactor-light + rotate: false + xy: 806, 479 + size: 32, 32 + orig: 32, 32 + offset: 0, 0 + index: -1 +fusionreactor-plasma-0 + rotate: false + xy: 840, 479 + size: 32, 32 + orig: 32, 32 + offset: 0, 0 + index: -1 +fusionreactor-plasma-1 + rotate: false + xy: 874, 479 + size: 32, 32 + orig: 32, 32 + offset: 0, 0 + index: -1 +fusionreactor-plasma-2 + rotate: false + xy: 908, 479 + size: 32, 32 + orig: 32, 32 + offset: 0, 0 + index: -1 +fusionreactor-plasma-3 + rotate: false + xy: 942, 479 + size: 32, 32 + orig: 32, 32 + offset: 0, 0 + index: -1 +fusionreactor-top + rotate: false + xy: 976, 479 + size: 32, 32 + orig: 32, 32 + offset: 0, 0 + index: -1 largesolarpanel rotate: false - xy: 875, 453 + xy: 953, 453 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 liquidcombustiongenerator rotate: false - xy: 786, 377 + xy: 433, 144 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 nuclearreactor rotate: false - xy: 651, 327 + xy: 855, 427 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 nuclearreactor-center rotate: false - xy: 682, 357 + xy: 881, 427 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 nuclearreactor-lights rotate: false - xy: 708, 359 + xy: 907, 427 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 powerinfinite rotate: false - xy: 796, 367 + xy: 453, 124 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 powernode rotate: false - xy: 806, 377 + xy: 463, 134 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 powernodelarge rotate: false - xy: 242, 59 + xy: 677, 291 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 powervoid rotate: false - xy: 816, 387 + xy: 483, 144 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 rtgenerator rotate: false - xy: 816, 367 + xy: 483, 124 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 rtgenerator-top rotate: false - xy: 826, 377 + xy: 493, 134 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 shieldgenerator rotate: false - xy: 866, 407 + xy: 523, 143 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 shieldprojector rotate: false - xy: 170, 50 + xy: 504, 171 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 solarpanel rotate: false - xy: 896, 417 + xy: 533, 113 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 teleporter rotate: false - xy: 203, 104 + xy: 84, 39 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 thermalgenerator rotate: false - xy: 906, 397 + xy: 680, 189 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 alloysmelter rotate: false - xy: 277, 139 + xy: 129, 11 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -1007,42 +1063,42 @@ biomattercompressor index: -1 biomattercompressor-frame0 rotate: false - xy: 721, 430 + xy: 489, 225 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 biomattercompressor-frame1 rotate: false - xy: 489, 225 + xy: 131, 112 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 biomattercompressor-frame2 rotate: false - xy: 598, 266 + xy: 985, 435 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 biomattercompressor-liquid rotate: false - xy: 84, 47 + xy: 680, 381 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 biomattercompressor-top rotate: false - xy: 739, 430 + xy: 566, 292 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 centrifuge rotate: false - xy: 102, 47 + xy: 584, 292 size: 16, 16 orig: 16, 16 offset: 0, 0 @@ -1056,434 +1112,434 @@ centrifuge-liquid index: -1 cryofluidmixer-bottom rotate: false - xy: 732, 394 + xy: 185, 112 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 cryofluidmixer-liquid rotate: false - xy: 492, 207 + xy: 203, 112 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 cryofluidmixer-top rotate: false - xy: 510, 207 + xy: 121, 21 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 cultivator rotate: false - xy: 528, 207 + xy: 492, 207 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 cultivator-middle rotate: false - xy: 546, 207 + xy: 510, 207 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 cultivator-top rotate: false - xy: 120, 47 + xy: 528, 207 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 extractor rotate: false - xy: 660, 275 + xy: 373, 114 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 fluxpump rotate: false - xy: 670, 275 + xy: 383, 114 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 irondrill rotate: false - xy: 278, 73 + xy: 582, 145 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 irondrill-rotator rotate: false - xy: 278, 63 + xy: 592, 140 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 titaniumdrill-rotator rotate: false - xy: 278, 63 + xy: 592, 140 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 irondrill-top rotate: false - xy: 776, 427 + xy: 677, 281 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 itemsource rotate: false - xy: 816, 427 + xy: 777, 405 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 itemvoid rotate: false - xy: 776, 377 + xy: 776, 395 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 laserdrill rotate: false - xy: 170, 86 + xy: 677, 309 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 laserdrill-rotator rotate: false - xy: 188, 86 + xy: 698, 381 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 laserdrill-top rotate: false - xy: 206, 86 + xy: 700, 363 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 lavasmelter rotate: false - xy: 806, 407 + xy: 423, 133 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 melter rotate: false - xy: 786, 367 + xy: 463, 144 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 nucleardrill rotate: false - xy: 225, 139 + xy: 751, 422 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 nucleardrill-rim rotate: false - xy: 251, 139 + xy: 777, 427 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 nucleardrill-rotator rotate: false - xy: 476, 170 + xy: 803, 427 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 nucleardrill-top rotate: false - xy: 656, 353 + xy: 829, 427 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 oilextractor rotate: false - xy: 586, 284 + xy: 933, 427 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 oilextractor-liquid rotate: false - xy: 612, 284 + xy: 959, 427 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 oilextractor-rotator rotate: false - xy: 151, 104 + xy: 680, 399 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 oilextractor-top rotate: false - xy: 177, 104 + xy: 651, 301 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 oilrefinery rotate: false - xy: 816, 397 + xy: 453, 134 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 plasmadrill rotate: false - xy: 35, 8 + xy: 234, 161 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 plasmadrill-rim rotate: false - xy: 763, 453 + xy: 268, 161 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 plasmadrill-rotator rotate: false - xy: 806, 479 + xy: 302, 161 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 plasmadrill-top rotate: false - xy: 840, 479 + xy: 336, 161 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 plasticformer rotate: false - xy: 224, 77 + xy: 738, 400 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 plasticformer-top rotate: false - xy: 242, 77 + xy: 756, 404 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 poweralloysmelter rotate: false - xy: 260, 77 + xy: 985, 417 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 poweralloysmelter-top rotate: false - xy: 224, 59 + xy: 1003, 421 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 powersmelter rotate: false - xy: 260, 59 + xy: 695, 291 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 powersmelter-top rotate: false - xy: 152, 50 + xy: 504, 189 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 siliconsmelter-top rotate: false - xy: 152, 50 + xy: 504, 189 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 pulverizer rotate: false - xy: 846, 417 + xy: 463, 124 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 pulverizer-rotator rotate: false - xy: 856, 427 + xy: 473, 134 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 pump rotate: false - xy: 806, 367 + xy: 493, 144 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 reinforceddrill rotate: false - xy: 816, 377 + xy: 453, 104 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 reinforceddrill-rotator rotate: false - xy: 826, 387 + xy: 463, 114 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 reinforceddrill-top rotate: false - xy: 836, 397 + xy: 473, 124 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 separator rotate: false - xy: 836, 377 + xy: 503, 143 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 separator-liquid rotate: false - xy: 846, 387 + xy: 513, 143 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 siliconextractor rotate: false - xy: 876, 407 + xy: 523, 123 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 siliconsmelter rotate: false - xy: 188, 50 + xy: 522, 189 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 smelter rotate: false - xy: 886, 417 + xy: 523, 113 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 steeldrill rotate: false - xy: 896, 407 + xy: 543, 125 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 steeldrill-rotator rotate: false - xy: 906, 417 + xy: 543, 115 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 steeldrill-top rotate: false - xy: 916, 427 + xy: 553, 125 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 stonedrill rotate: false - xy: 876, 367 + xy: 648, 179 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 stoneformer rotate: false - xy: 886, 377 + xy: 658, 179 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 titaniumdrill rotate: false - xy: 916, 397 + xy: 221, 4 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 titaniumdrill-top rotate: false - xy: 926, 407 + xy: 231, 4 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 waterextractor rotate: false - xy: 141, 12 + xy: 540, 171 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 waterextractor-liquid rotate: false - xy: 159, 32 + xy: 558, 189 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 waterextractor-rotator rotate: false - xy: 159, 14 + xy: 558, 171 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 waterextractor-top rotate: false - xy: 177, 32 + xy: 504, 153 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 block-1 rotate: false - xy: 351, 115 + xy: 849, 417 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -1497,266 +1553,266 @@ block-2 index: -1 block-2-top rotate: false - xy: 616, 266 + xy: 149, 112 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 block-3 rotate: false - xy: 424, 170 + xy: 797, 453 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 block-3-top rotate: false - xy: 466, 196 + xy: 823, 453 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 chainturret rotate: false - xy: 543, 225 + xy: 167, 112 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 doubleturret rotate: false - xy: 766, 382 + xy: 1003, 411 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 flakturret rotate: false - xy: 87, 11 + xy: 564, 207 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 flameturret rotate: false - xy: 512, 167 + xy: 81, 1 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 fornaxcannon rotate: false - xy: 849, 453 + xy: 927, 453 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 gatlingturret rotate: false - xy: 524, 167 + xy: 93, 1 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 laserturret rotate: false - xy: 329, 117 + xy: 669, 229 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 magmaturret rotate: false - xy: 152, 68 + xy: 700, 345 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 megarepairturret rotate: false - xy: 170, 68 + xy: 695, 327 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 missileturret rotate: false - xy: 188, 68 + xy: 695, 309 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 railgunturret rotate: false - xy: 341, 125 + xy: 713, 333 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 repairturret rotate: false - xy: 353, 125 + xy: 713, 321 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 shotgunturret rotate: false - xy: 307, 105 + xy: 713, 285 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 teslaturret rotate: false - xy: 319, 105 + xy: 777, 415 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 titancannon rotate: false - xy: 255, 113 + xy: 69, 13 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 flierfactory rotate: false - xy: 105, 29 + xy: 134, 94 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 walkerfactory rotate: false - xy: 105, 29 + xy: 134, 94 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 flierfactory-top rotate: false - xy: 105, 11 + xy: 134, 76 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 walkerfactory-top rotate: false - xy: 105, 11 + xy: 134, 76 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 flierfactory-top-open rotate: false - xy: 123, 29 + xy: 152, 94 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 walkerfactory-top-open rotate: false - xy: 123, 29 + xy: 152, 94 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 compositewall rotate: false - xy: 269, 1 + xy: 949, 417 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 door rotate: false - xy: 766, 402 + xy: 756, 394 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 door-large rotate: false - xy: 69, 29 + xy: 546, 207 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 door-large-open rotate: false - xy: 69, 11 + xy: 682, 363 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 door-open rotate: false - xy: 766, 392 + xy: 766, 394 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 duriumwall rotate: false - xy: 766, 372 + xy: 1013, 411 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 duriumwall-large rotate: false - xy: 87, 29 + xy: 561, 225 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 ironwall rotate: false - xy: 776, 417 + xy: 687, 281 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 steelwall rotate: false - xy: 866, 367 + xy: 543, 105 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 steelwall-large rotate: false - xy: 206, 50 + xy: 522, 171 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 stonewall rotate: false - xy: 896, 387 + xy: 668, 179 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 titaniumshieldwall rotate: false - xy: 936, 417 + xy: 236, 101 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 titaniumwall rotate: false - xy: 946, 427 + xy: 246, 101 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 titaniumwall-large rotate: false - xy: 141, 30 + xy: 540, 189 size: 16, 16 orig: 16, 16 offset: 0, 0 @@ -1770,168 +1826,168 @@ blank index: -1 bullet rotate: false - xy: 283, 93 + xy: 869, 417 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 chainbullet rotate: false - xy: 502, 170 + xy: 582, 207 size: 8, 7 orig: 8, 7 offset: 0, 0 index: -1 enemyarrow rotate: false - xy: 766, 363 + xy: 644, 256 size: 8, 7 orig: 8, 7 offset: 0, 0 index: -1 laser rotate: false - xy: 1020, 499 + xy: 674, 287 size: 1, 12 orig: 1, 12 offset: 0, 0 index: -1 laser-end rotate: false - xy: 566, 290 + xy: 1005, 459 size: 18, 18 orig: 18, 18 offset: 0, 0 index: -1 laserfull rotate: false - xy: 131, 110 + xy: 1005, 439 size: 18, 18 orig: 18, 18 offset: 0, 0 index: -1 shell rotate: false - xy: 856, 397 + xy: 503, 133 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 shot rotate: false - xy: 836, 367 + xy: 503, 113 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 shot-long rotate: false - xy: 846, 377 + xy: 513, 123 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 titanshell rotate: false - xy: 896, 367 + xy: 236, 91 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 item-biomatter rotate: false - xy: 786, 427 + xy: 697, 281 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 item-coal rotate: false - xy: 776, 407 + xy: 677, 219 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 item-densealloy rotate: false - xy: 786, 417 + xy: 676, 209 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 item-iron rotate: false - xy: 796, 427 + xy: 676, 199 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 item-lead rotate: false - xy: 776, 397 + xy: 620, 190 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 item-plastic rotate: false - xy: 786, 407 + xy: 630, 190 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 item-sand rotate: false - xy: 796, 417 + xy: 640, 190 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 item-silicon rotate: false - xy: 806, 427 + xy: 756, 384 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 item-steel rotate: false - xy: 776, 387 + xy: 766, 384 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 item-stone rotate: false - xy: 786, 397 + xy: 618, 180 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 item-thorium rotate: false - xy: 796, 407 + xy: 628, 180 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 item-titanium rotate: false - xy: 806, 417 + xy: 638, 180 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 standard-mech rotate: false - xy: 516, 179 + xy: 592, 196 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 standard-ship rotate: false - xy: 530, 193 + xy: 606, 210 size: 12, 12 orig: 12, 12 offset: 0, 0 @@ -1988,7 +2044,7 @@ border index: -1 button rotate: false - xy: 680, 383 + xy: 426, 154 size: 24, 40 split: 10, 10, 6, 10 orig: 24, 40 @@ -2012,7 +2068,7 @@ button-over index: -1 button-map rotate: false - xy: 994, 471 + xy: 400, 153 size: 24, 40 split: 10, 10, 5, 10 orig: 24, 40 @@ -2036,7 +2092,7 @@ button-map-over index: -1 button-select rotate: false - xy: 450, 170 + xy: 849, 453 size: 24, 24 split: 4, 4, 4, 4 orig: 24, 24 @@ -2044,35 +2100,35 @@ button-select index: -1 check-off rotate: false - xy: 874, 479 + xy: 370, 161 size: 28, 32 orig: 28, 32 offset: 0, 0 index: -1 check-on rotate: false - xy: 904, 479 + xy: 225, 127 size: 28, 32 orig: 28, 32 offset: 0, 0 index: -1 check-on-over rotate: false - xy: 934, 479 + xy: 255, 127 size: 28, 32 orig: 28, 32 offset: 0, 0 index: -1 check-over rotate: false - xy: 964, 479 + xy: 285, 127 size: 28, 32 orig: 28, 32 offset: 0, 0 index: -1 clear rotate: false - xy: 544, 181 + xy: 69, 1 size: 10, 10 orig: 10, 10 offset: 0, 0 @@ -2100,28 +2156,28 @@ discord-banner-over index: -1 controller-cursor rotate: false - xy: 572, 240 + xy: 602, 292 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-about rotate: false - xy: 277, 149 + xy: 540, 155 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-add rotate: false - xy: 134, 94 + xy: 556, 155 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-admin rotate: false - xy: 195, 34 + xy: 235, 111 size: 14, 14 orig: 14, 14 offset: 0, 0 @@ -2135,77 +2191,77 @@ icon-admin-small index: -1 icon-areaDelete rotate: false - xy: 159, 2 + xy: 105, 1 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-arrow rotate: false - xy: 195, 18 + xy: 251, 111 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-arrow-down rotate: false - xy: 171, 2 + xy: 117, 1 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-arrow-left rotate: false - xy: 183, 2 + xy: 572, 244 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-arrow-right rotate: false - xy: 195, 6 + xy: 620, 212 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-arrow-up rotate: false - xy: 207, 6 + xy: 606, 184 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-back rotate: false - xy: 123, 11 + xy: 152, 76 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-ban rotate: false - xy: 211, 34 + xy: 267, 111 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-cancel rotate: false - xy: 211, 18 + xy: 283, 111 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-chat rotate: false - xy: 536, 167 + xy: 620, 200 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-check rotate: false - xy: 734, 378 + xy: 299, 111 size: 14, 14 orig: 14, 14 offset: 0, 0 @@ -2233,497 +2289,497 @@ icon-close-over index: -1 icon-crafting rotate: false - xy: 638, 304 + xy: 632, 212 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-cursor rotate: false - xy: 638, 292 + xy: 632, 200 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-defense rotate: false - xy: 650, 297 + xy: 644, 212 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-dev-builds rotate: false - xy: 734, 362 + xy: 315, 107 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-discord rotate: false - xy: 293, 141 + xy: 331, 107 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-distribution rotate: false - xy: 662, 297 + xy: 644, 200 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-donate rotate: false - xy: 309, 141 + xy: 347, 107 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-dots rotate: false - xy: 325, 141 + xy: 584, 240 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-editor rotate: false - xy: 750, 414 + xy: 600, 240 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-exit rotate: false - xy: 750, 398 + xy: 616, 240 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-file-text rotate: false - xy: 750, 382 + xy: 632, 240 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-fill rotate: false - xy: 134, 76 + xy: 170, 94 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-floppy rotate: false - xy: 750, 366 + xy: 593, 224 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-folder rotate: false - xy: 227, 43 + xy: 609, 224 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-folder-parent rotate: false - xy: 227, 27 + xy: 625, 224 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-github rotate: false - xy: 243, 43 + xy: 641, 224 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-google-play rotate: false - xy: 243, 27 + xy: 576, 191 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-grid rotate: false - xy: 398, 151 + xy: 170, 76 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-hold rotate: false - xy: 674, 297 + xy: 224, 91 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-holdDelete rotate: false - xy: 638, 280 + xy: 224, 79 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-home rotate: false - xy: 259, 43 + xy: 576, 175 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-host rotate: false - xy: 259, 27 + xy: 136, 60 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-info rotate: false - xy: 650, 285 + xy: 592, 170 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-itch.io rotate: false - xy: 227, 11 + xy: 136, 44 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-line rotate: false - xy: 651, 309 + xy: 188, 94 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-link rotate: false - xy: 243, 11 + xy: 152, 60 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-liquid rotate: false - xy: 662, 285 + xy: 638, 304 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-load rotate: false - xy: 259, 11 + xy: 152, 44 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-load-image rotate: false - xy: 229, 95 + xy: 188, 76 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-load-map rotate: false - xy: 247, 95 + xy: 206, 94 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-loading rotate: false - xy: 265, 95 + xy: 206, 76 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-logic rotate: false - xy: 674, 285 + xy: 638, 292 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-menu rotate: false - xy: 634, 268 + xy: 650, 289 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-menu-large rotate: false - xy: 993, 453 + xy: 572, 274 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-none rotate: false - xy: 634, 256 + xy: 662, 289 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-pause rotate: false - xy: 634, 244 + xy: 644, 277 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-pencil rotate: false - xy: 993, 435 + xy: 572, 256 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-pencil-small rotate: false - xy: 341, 137 + xy: 168, 60 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-pick rotate: false - xy: 598, 248 + xy: 590, 274 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-play rotate: false - xy: 281, 127 + xy: 644, 265 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-play-2 rotate: false - xy: 357, 137 + xy: 168, 44 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-players rotate: false - xy: 281, 115 + xy: 656, 277 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-power rotate: false - xy: 293, 129 + xy: 656, 265 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-production rotate: false - xy: 293, 117 + xy: 654, 253 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-quit rotate: false - xy: 373, 142 + xy: 184, 60 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-redo rotate: false - xy: 616, 248 + xy: 590, 256 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-refresh rotate: false - xy: 757, 432 + xy: 184, 44 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-rename rotate: false - xy: 773, 437 + xy: 200, 60 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-resize rotate: false - xy: 416, 151 + xy: 608, 274 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-rotate rotate: false - xy: 789, 437 + xy: 200, 44 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-rotate-arrow rotate: false - xy: 805, 437 + xy: 139, 28 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-rotate-left rotate: false - xy: 821, 437 + xy: 155, 28 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-rotate-right rotate: false - xy: 837, 437 + xy: 171, 28 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-save rotate: false - xy: 853, 437 + xy: 187, 28 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-save-image rotate: false - xy: 434, 152 + xy: 608, 256 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-save-map rotate: false - xy: 452, 152 + xy: 620, 292 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-settings rotate: false - xy: 305, 129 + xy: 648, 241 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-terrain rotate: false - xy: 470, 152 + xy: 626, 274 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-tools rotate: false - xy: 869, 437 + xy: 203, 28 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-touch rotate: false - xy: 305, 117 + xy: 660, 241 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-touchDelete rotate: false - xy: 317, 129 + xy: 657, 229 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-trash rotate: false - xy: 885, 437 + xy: 216, 60 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-trash-16 rotate: false - xy: 488, 152 + xy: 626, 256 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-trello rotate: false - xy: 901, 437 + xy: 216, 44 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-tutorial rotate: false - xy: 917, 437 + xy: 219, 28 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-undo rotate: false - xy: 669, 309 + xy: 682, 345 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-units rotate: false - xy: 329, 129 + xy: 666, 253 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-weapon rotate: false - xy: 317, 117 + xy: 672, 241 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-wiki rotate: false - xy: 933, 437 + xy: 139, 12 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-zoom rotate: false - xy: 152, 86 + xy: 677, 327 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-zoom-small rotate: false - xy: 949, 437 + xy: 155, 12 size: 14, 14 orig: 14, 14 offset: 0, 0 @@ -2737,7 +2793,7 @@ logotext index: -1 pane rotate: false - xy: 320, 157 + xy: 341, 123 size: 24, 36 split: 10, 10, 5, 5 orig: 24, 36 @@ -2745,7 +2801,7 @@ pane index: -1 pane-button rotate: false - xy: 294, 157 + xy: 315, 123 size: 24, 36 split: 10, 10, 5, 5 orig: 24, 36 @@ -2753,7 +2809,7 @@ pane-button index: -1 scroll rotate: false - xy: 372, 158 + xy: 367, 124 size: 24, 35 split: 10, 10, 6, 5 orig: 24, 35 @@ -2778,7 +2834,7 @@ scroll-knob-horizontal index: -1 scroll-knob-vertical rotate: false - xy: 346, 153 + xy: 478, 154 size: 24, 40 split: 10, 10, 6, 10 orig: 24, 40 @@ -2786,7 +2842,7 @@ scroll-knob-vertical index: -1 scroll-knob-vertical-black rotate: false - xy: 706, 385 + xy: 452, 154 size: 24, 40 split: 10, 10, 6, 10 orig: 24, 40 @@ -2794,14 +2850,14 @@ scroll-knob-vertical-black index: -1 selection rotate: false - xy: 131, 107 + xy: 763, 487 size: 1, 1 orig: 1, 1 offset: 0, 0 index: -1 slider rotate: false - xy: 287, 139 + xy: 774, 412 size: 1, 8 orig: 1, 8 offset: 0, 0 @@ -2829,7 +2885,7 @@ slider-knob-over index: -1 slider-vertical rotate: false - xy: 721, 427 + xy: 224, 76 size: 8, 1 orig: 8, 1 offset: 0, 0 @@ -2857,7 +2913,7 @@ text-sides-over index: -1 textfield rotate: false - xy: 264, 165 + xy: 721, 418 size: 28, 28 split: 6, 6, 6, 6 orig: 28, 28 @@ -2865,7 +2921,7 @@ textfield index: -1 textfield-over rotate: false - xy: 234, 165 + xy: 393, 123 size: 28, 28 split: 2, 2, 2, 2 orig: 28, 28 @@ -2896,126 +2952,126 @@ window-empty index: -1 flier rotate: false - xy: 1011, 457 + xy: 706, 413 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 scout rotate: false - xy: 979, 437 + xy: 199, 14 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 scout-base rotate: false - xy: 502, 193 + xy: 213, 14 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 standard-mech-base rotate: false - xy: 502, 193 + xy: 213, 14 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 scout-leg rotate: false - xy: 502, 179 + xy: 227, 14 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 standard-mech-leg rotate: false - xy: 502, 179 + xy: 227, 14 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 beam rotate: false - xy: 79, 1 + xy: 492, 197 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 beam-equip rotate: false - xy: 89, 1 + xy: 139, 2 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blaster rotate: false - xy: 331, 107 + xy: 829, 417 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blaster-equip rotate: false - xy: 341, 115 + xy: 839, 417 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 clustergun rotate: false - xy: 341, 105 + xy: 879, 417 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 clustergun-equip rotate: false - xy: 351, 105 + xy: 889, 417 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 shockgun rotate: false - xy: 876, 417 + xy: 503, 123 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 shockgun-equip rotate: false - xy: 886, 427 + xy: 513, 133 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 triblaster rotate: false - xy: 906, 377 + xy: 256, 101 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 triblaster-equip rotate: false - xy: 916, 387 + xy: 246, 91 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 vulcan rotate: false - xy: 946, 417 + xy: 256, 91 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 vulcan-equip rotate: false - xy: 906, 367 + xy: 246, 81 size: 8, 8 orig: 8, 8 offset: 0, 0 diff --git a/core/assets/sprites/sprites.png b/core/assets/sprites/sprites.png index 774088334d..3b60569b1b 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 f939b800ca..e9edee44c0 100644 --- a/core/assets/version.properties +++ b/core/assets/version.properties @@ -1,7 +1,7 @@ #Autogenerated file. Do not modify. -#Sat Mar 31 17:19:49 EDT 2018 +#Sat Mar 31 22:36:10 EDT 2018 version=release -androidBuildCode=773 +androidBuildCode=804 name=Mindustry code=3.4 build=custom build diff --git a/core/src/io/anuke/mindustry/content/Recipes.java b/core/src/io/anuke/mindustry/content/Recipes.java index b49644c371..a7da9a22b6 100644 --- a/core/src/io/anuke/mindustry/content/Recipes.java +++ b/core/src/io/anuke/mindustry/content/Recipes.java @@ -97,6 +97,7 @@ public class Recipes { new Recipe(power, PowerBlocks.solarpanel, stack(Items.iron, 30), stack(Items.silicon, 20)), new Recipe(power, PowerBlocks.largesolarpanel, stack(Items.iron, 30), stack(Items.silicon, 20)), new Recipe(power, PowerBlocks.nuclearReactor, stack(Items.titanium, 40), stack(Items.densealloy, 40), stack(Items.steel, 50)), + new Recipe(power, PowerBlocks.fusionReactor, stack(Items.titanium, 40), stack(Items.densealloy, 40), stack(Items.steel, 50)), new Recipe(power, PowerBlocks.shieldgenerator, stack(Items.titanium, 30), stack(Items.densealloy, 30)), diff --git a/core/src/io/anuke/mindustry/content/blocks/PowerBlocks.java b/core/src/io/anuke/mindustry/content/blocks/PowerBlocks.java index 3548239f0d..7284ca5c77 100644 --- a/core/src/io/anuke/mindustry/content/blocks/PowerBlocks.java +++ b/core/src/io/anuke/mindustry/content/blocks/PowerBlocks.java @@ -49,6 +49,12 @@ public class PowerBlocks { breaktime *= 2.3f; }}, + fusionReactor = new FusionReactor("fusionreactor") {{ + size = 4; + health = 600; + breaktime *= 4f; + }}, + repairturret = new RepairTurret("repairturret") {{ range = 30; reload = 20f; @@ -85,7 +91,7 @@ public class PowerBlocks { size = 2; powerSpeed = 1f; maxNodes = 5; - laserRange = 6.5f; + laserRange = 7.5f; }}, teleporter = new Teleporter("teleporter"); diff --git a/core/src/io/anuke/mindustry/world/Placement.java b/core/src/io/anuke/mindustry/world/Placement.java index 523b2ab1a7..8eabe2e81e 100644 --- a/core/src/io/anuke/mindustry/world/Placement.java +++ b/core/src/io/anuke/mindustry/world/Placement.java @@ -5,7 +5,6 @@ import com.badlogic.gdx.math.Vector2; import com.badlogic.gdx.utils.Array; import io.anuke.mindustry.content.Recipes; import io.anuke.mindustry.content.blocks.Blocks; -import io.anuke.mindustry.entities.Player; import io.anuke.mindustry.entities.Units; import io.anuke.mindustry.game.Team; import io.anuke.mindustry.graphics.fx.Fx; @@ -101,15 +100,16 @@ public class Placement { Vector2 offset = type.getPlaceOffset(); rect.setCenter(offset.x + x * tilesize, offset.y + y * tilesize); + if(type.solid || type.solidifes) synchronized (Entities.entityLock) { - rect.setSize(tilesize*2f).setCenter(x*tilesize, y*tilesize); + rect.setSize(tilesize*2f).setCenter(x*tilesize + type.getPlaceOffset().x, y*tilesize + type.getPlaceOffset().y); boolean[] result = {false}; Units.getNearby(rect, e -> { if (e == null) return; //not sure why this happens? Rectangle rect = e.hitbox.getRect(e.x, e.y); - if (Placement.rect.overlaps(rect)) { + if (Placement.rect.overlaps(rect) && !e.isFlying()) { result[0] = true; } }); @@ -117,14 +117,6 @@ public class Placement { if(result[0]) return false; } - if(type.solid || type.solidifes) { - for (Player player : playerGroup.all()) { - if (!player.mech.flying && rect.overlaps(player.hitbox.getRect(player.x, player.y))) { - return false; - } - } - } - Tile tile = world.tile(x, y); if(tile == null || (isSpawnPoint(tile) && (type.solidifes || type.solid))) return false; diff --git a/core/src/io/anuke/mindustry/world/blocks/types/power/FusionReactor.java b/core/src/io/anuke/mindustry/world/blocks/types/power/FusionReactor.java new file mode 100644 index 0000000000..11e335ddd7 --- /dev/null +++ b/core/src/io/anuke/mindustry/world/blocks/types/power/FusionReactor.java @@ -0,0 +1,100 @@ +package io.anuke.mindustry.world.blocks.types.power; + +import com.badlogic.gdx.graphics.Color; +import com.badlogic.gdx.graphics.g2d.TextureRegion; +import io.anuke.mindustry.content.Liquids; +import io.anuke.mindustry.entities.TileEntity; +import io.anuke.mindustry.resource.Liquid; +import io.anuke.mindustry.world.Tile; +import io.anuke.mindustry.world.blocks.types.production.GenericCrafter.GenericCrafterEntity; +import io.anuke.ucore.core.Graphics; +import io.anuke.ucore.core.Timers; +import io.anuke.ucore.graphics.Draw; +import io.anuke.ucore.util.Mathf; + +public class FusionReactor extends PowerGenerator { + protected int plasmas = 4; + protected float powerUsage = 0.5f; + protected float maxPowerProduced = 1.5f; + protected float liquidUsage = 1f; + protected Liquid inputLiquid = Liquids.water; + protected float warmupSpeed = 0.001f; + + public FusionReactor(String name) { + super(name); + hasPower = true; + hasLiquids = true; + powerCapacity = 100f; + liquidCapacity = 30f; + hasInventory = true; + } + + @Override + public void update(Tile tile){ + FusionReactorEntity entity = tile.entity(); + + float powerUse = Math.min(powerCapacity, powerUsage * Timers.delta()); + float liquidUse = Math.min(liquidCapacity, liquidUsage * Timers.delta()); + + if(entity.power.amount >= powerUse && entity.liquid.amount >= liquidUse){ + entity.power.amount -= powerUse; + entity.liquid.amount -= liquidUse; + entity.warmup = Mathf.lerpDelta(entity.warmup, 1f, warmupSpeed); + }else{ + entity.warmup = Mathf.lerpDelta(entity.warmup, 0f, 0.01f); + } + + float powerAdded = Math.min(powerCapacity - entity.power.amount, maxPowerProduced * Mathf.pow(entity.warmup, 3f) * Timers.delta()); + entity.power.amount += powerAdded; + entity.totalProgress += entity.warmup * Timers.delta(); + } + + @Override + public void draw(Tile tile) { + FusionReactorEntity entity = tile.entity(); + + Draw.rect(name + "-bottom", tile.drawx(), tile.drawy()); + + Graphics.setAdditiveBlending(); + + for(int i = 0; i < plasmas; i ++){ + float r = 29f + Mathf.absin(Timers.time(), 2f + i*1f, 5f - i*0.5f); + + Draw.color(Color.valueOf("ffd06b"), Color.valueOf("ff361b"), (float)i/plasmas); + Draw.alpha((0.3f + Mathf.absin(Timers.time(), 2f+i*2f, 0.3f+i*0.05f)) * entity.warmup); + Draw.rect(name + "-plasma-" + i, tile.drawx(), tile.drawy(), r, r, Timers.time()*(12+i*6f) * entity.warmup); + } + + Draw.color(); + + Graphics.setNormalBlending(); + + Draw.rect(name, tile.drawx(), tile.drawy()); + + Draw.rect(name + "-top", tile.drawx(), tile.drawy()); + + Draw.color(Color.valueOf("858585"), Color.valueOf("fea080"), entity.warmup + Mathf.absin(entity.totalProgress, 3f, entity.warmup*0.5f)); + Draw.rect(name + "-light", tile.drawx(), tile.drawy()); + + Draw.color(); + } + + @Override + public TextureRegion[] getIcon() { + return new TextureRegion[]{Draw.region(name + "-bottom"), Draw.region(name), Draw.region(name + "-top")}; + } + + @Override + public TileEntity getEntity() { + return new FusionReactorEntity(); + } + + @Override + public boolean acceptLiquid(Tile tile, Tile source, Liquid liquid, float amount) { + return super.acceptLiquid(tile, source, liquid, amount) && liquid == inputLiquid; + } + + public static class FusionReactorEntity extends GenericCrafterEntity{ + + } +} diff --git a/core/src/io/anuke/mindustry/world/blocks/types/power/PowerDistributor.java b/core/src/io/anuke/mindustry/world/blocks/types/power/PowerDistributor.java index 6911794aae..b185a14df3 100644 --- a/core/src/io/anuke/mindustry/world/blocks/types/power/PowerDistributor.java +++ b/core/src/io/anuke/mindustry/world/blocks/types/power/PowerDistributor.java @@ -191,12 +191,9 @@ public class PowerDistributor extends PowerBlock{ return added; } - protected boolean shouldDistribute(Tile tile, Tile other){ - if(other.block() instanceof PowerDistributor){ - return other.entity.power.amount / other.block().powerCapacity < - tile.entity.power.amount / powerCapacity; - } - return true; + protected boolean shouldDistribute(Tile tile, Tile other) { + return !(other.block() instanceof PowerDistributor) + || other.entity.power.amount / other.block().powerCapacity < tile.entity.power.amount / powerCapacity; } protected void distributeLaserPower(Tile tile){ @@ -266,11 +263,12 @@ public class PowerDistributor extends PowerBlock{ if(link.block() instanceof PowerDistributor){ DistributorEntity oe = link.entity(); - return Vector2.dst(tile.drawx(), tile.drawy(), link.worldx(), link.worldy()) <= Math.max(laserRange * tilesize, - ((PowerDistributor)link.block()).laserRange * tilesize) - tilesize/2f && + return Vector2.dst(tile.drawx(), tile.drawy(), link.drawx(), link.drawy()) <= Math.max(laserRange * tilesize, + ((PowerDistributor)link.block()).laserRange * tilesize) - tilesize/2f + + (link.block().size-1)*tilesize/2f + (tile.block().size-1)*tilesize/2f && oe.links.size < ((PowerDistributor)link.block()).maxNodes; }else{ - return Vector2.dst(tile.drawx(), tile.drawy(), link.worldx(), link.worldy()) + return Vector2.dst(tile.drawx(), tile.drawy(), link.drawx(), link.drawy()) <= laserRange * tilesize - tilesize/2f + (link.block().size-1)*tilesize; } } diff --git a/core/src/io/anuke/mindustry/world/blocks/types/production/GenericCrafter.java b/core/src/io/anuke/mindustry/world/blocks/types/production/GenericCrafter.java index 7e66c8a831..743dad3d58 100644 --- a/core/src/io/anuke/mindustry/world/blocks/types/production/GenericCrafter.java +++ b/core/src/io/anuke/mindustry/world/blocks/types/production/GenericCrafter.java @@ -18,6 +18,10 @@ import io.anuke.ucore.graphics.Draw; import io.anuke.ucore.util.Mathf; import io.anuke.ucore.util.Strings; +import java.io.DataInputStream; +import java.io.DataOutputStream; +import java.io.IOException; + public class GenericCrafter extends Block{ protected final int timerDump = timers++; @@ -132,6 +136,17 @@ public class GenericCrafter extends Block{ public float progress; public float totalProgress; public float warmup; - public float craftTime; + + @Override + public void write(DataOutputStream stream) throws IOException { + stream.writeFloat(progress); + stream.writeFloat(warmup); + } + + @Override + public void read(DataInputStream stream) throws IOException { + progress = stream.readFloat(); + warmup = stream.readFloat(); + } } } diff --git a/core/src/io/anuke/mindustry/world/blocks/types/production/Separator.java b/core/src/io/anuke/mindustry/world/blocks/types/production/Separator.java index 7426eaeeff..2a850d4a92 100644 --- a/core/src/io/anuke/mindustry/world/blocks/types/production/Separator.java +++ b/core/src/io/anuke/mindustry/world/blocks/types/production/Separator.java @@ -49,7 +49,7 @@ public class Separator extends Block { Draw.color(Color.valueOf("858585")); Lines.stroke(spinnerThickness); - Lines.spikes(tile.drawx(), tile.drawy(), spinnerRadius, spinnerLength, 3, entity.craftTime*spinnerSpeed); + Lines.spikes(tile.drawx(), tile.drawy(), spinnerRadius, spinnerLength, 3, entity.totalProgress*spinnerSpeed); Draw.reset(); } @@ -62,7 +62,7 @@ public class Separator extends Block { float liquidUsed = Math.min(liquidCapacity, liquidUse * Timers.delta()); float powerUsed = Math.min(powerCapacity, powerUse * Timers.delta()); - entity.craftTime += entity.warmup*Timers.delta(); + entity.totalProgress += entity.warmup*Timers.delta(); if(entity.liquid.amount >= liquidUsed && entity.inventory.hasItem(item) && (!hasPower || entity.power.amount >= powerUsed)){