diff --git a/core/assets-raw/sprites/blocks/extra/rubble-1-0.png b/core/assets-raw/sprites/blocks/extra/rubble-1-0.png new file mode 100644 index 0000000000..17b9eb5217 Binary files /dev/null and b/core/assets-raw/sprites/blocks/extra/rubble-1-0.png differ diff --git a/core/assets-raw/sprites/blocks/extra/rubble-1-1.png b/core/assets-raw/sprites/blocks/extra/rubble-1-1.png new file mode 100644 index 0000000000..f1b7ddf37d Binary files /dev/null and b/core/assets-raw/sprites/blocks/extra/rubble-1-1.png differ diff --git a/core/assets-raw/sprites/blocks/extra/rubble-2-0.png b/core/assets-raw/sprites/blocks/extra/rubble-2-0.png new file mode 100644 index 0000000000..9ec79ce03a Binary files /dev/null and b/core/assets-raw/sprites/blocks/extra/rubble-2-0.png differ diff --git a/core/assets-raw/sprites/blocks/extra/rubble-2-1.png b/core/assets-raw/sprites/blocks/extra/rubble-2-1.png new file mode 100644 index 0000000000..b62e1931c6 Binary files /dev/null and b/core/assets-raw/sprites/blocks/extra/rubble-2-1.png differ diff --git a/core/assets/sprites/sprites.atlas b/core/assets/sprites/sprites.atlas index c54c9a8900..0815432157 100644 --- a/core/assets/sprites/sprites.atlas +++ b/core/assets/sprites/sprites.atlas @@ -13,399 +13,399 @@ background index: -1 bridgeconduit rotate: false - xy: 623, 198 + xy: 787, 305 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 bridgeconduit-arrow rotate: false - xy: 633, 198 + xy: 787, 295 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 bridgeconduit-bridge rotate: false - xy: 643, 198 + xy: 765, 286 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 bridgeconduit-end rotate: false - xy: 592, 188 + xy: 849, 441 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 bridgeconveyor rotate: false - xy: 592, 178 + xy: 849, 431 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 bridgeconveyor-arrow rotate: false - xy: 602, 188 + xy: 849, 421 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 bridgeconveyor-bridge rotate: false - xy: 592, 168 + xy: 859, 443 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 bridgeconveyor-end rotate: false - xy: 602, 178 + xy: 869, 443 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 conduit-bottom rotate: false - xy: 632, 188 + xy: 879, 423 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 conduit-top rotate: false - xy: 622, 168 + xy: 909, 443 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 conduittunnel rotate: false - xy: 632, 178 + xy: 889, 423 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 conveyor rotate: false - xy: 642, 188 + xy: 899, 433 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 conveyormove rotate: false - xy: 622, 158 + xy: 919, 443 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 conveyortunnel rotate: false - xy: 632, 168 + xy: 899, 423 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 core rotate: false - xy: 875, 453 + xy: 931, 453 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 junction rotate: false - xy: 473, 124 + xy: 1009, 417 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 laserconduit rotate: false - xy: 483, 134 + xy: 848, 401 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 laserconduit-arrow rotate: false - xy: 493, 144 + xy: 848, 391 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 laserconduit-bridge rotate: false - xy: 473, 114 + xy: 848, 381 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 laserconduit-end rotate: false - xy: 483, 124 + xy: 844, 371 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 laserconveyor rotate: false - xy: 493, 134 + xy: 844, 361 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 laserconveyor-arrow rotate: false - xy: 483, 114 + xy: 363, 113 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 laserconveyor-bridge rotate: false - xy: 493, 124 + xy: 373, 114 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 laserconveyor-end rotate: false - xy: 493, 114 + xy: 383, 114 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 liquidjunction rotate: false - xy: 513, 123 + xy: 393, 103 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 liquidrouter rotate: false - xy: 523, 133 + xy: 403, 103 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 liquidrouter-bottom rotate: false - xy: 533, 143 + xy: 413, 103 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 liquidrouter-liquid rotate: false - xy: 523, 123 + xy: 522, 165 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 liquidrouter-top rotate: false - xy: 533, 133 + xy: 532, 165 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 liquidtank-bottom rotate: false - xy: 979, 453 + xy: 651, 327 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 liquidtank-liquid rotate: false - xy: 656, 353 + xy: 586, 284 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 liquidtank-top rotate: false - xy: 651, 327 + xy: 612, 284 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 multiplexer rotate: false - xy: 677, 291 + xy: 794, 397 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 overflowgate rotate: false - xy: 513, 113 + xy: 670, 207 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 poweredconveyor rotate: false - xy: 533, 113 + xy: 670, 197 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 poweredconveyormove rotate: false - xy: 543, 113 + xy: 680, 207 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 pulseconduit-bottom rotate: false - xy: 573, 136 + xy: 832, 347 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 pulseconduit-top rotate: false - xy: 573, 126 + xy: 677, 281 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 router rotate: false - xy: 626, 148 + xy: 694, 271 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 sortedunloader rotate: false - xy: 806, 395 + xy: 690, 191 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 sorter rotate: false - xy: 806, 385 + xy: 700, 201 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 splitter rotate: false - xy: 816, 385 + xy: 700, 191 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 steelconveyor rotate: false - xy: 826, 395 + xy: 710, 201 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 steelconveyormove rotate: false - xy: 826, 385 + xy: 710, 191 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 teleporter-top rotate: false - xy: 110, 39 + xy: 175, 104 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 unloader rotate: false - xy: 977, 407 + xy: 724, 181 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 vault rotate: false - xy: 121, 13 + xy: 186, 78 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 vault-icon rotate: false - xy: 987, 407 + xy: 724, 171 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 weaponfactory rotate: false - xy: 154, 58 + xy: 504, 171 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 blackrock1 rotate: false - xy: 153, 4 + xy: 767, 326 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blackrockshadow1 rotate: false - xy: 716, 389 + xy: 767, 316 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blackstone1 rotate: false - xy: 726, 390 + xy: 767, 306 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blackstone2 rotate: false - xy: 736, 390 + xy: 777, 337 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blackstone3 rotate: false - xy: 746, 390 + xy: 777, 327 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blackstoneblock1 rotate: false - xy: 756, 394 + xy: 777, 317 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blackstoneblock2 rotate: false - xy: 766, 394 + xy: 777, 307 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blackstoneblock3 rotate: false - xy: 1003, 411 + xy: 767, 296 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -419,49 +419,49 @@ blackstoneedge index: -1 coal1 rotate: false - xy: 602, 168 + xy: 859, 423 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 coal2 rotate: false - xy: 612, 178 + xy: 869, 433 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 coal3 rotate: false - xy: 622, 188 + xy: 889, 443 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 deepwater rotate: false - xy: 632, 158 + xy: 929, 443 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 dirt1 rotate: false - xy: 642, 168 + xy: 909, 423 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 dirt2 rotate: false - xy: 642, 158 + xy: 919, 433 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 dirt3 rotate: false - xy: 363, 113 + xy: 939, 443 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -475,525 +475,525 @@ dirtedge index: -1 grass1 rotate: false - xy: 677, 281 + xy: 949, 433 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 grass2 rotate: false - xy: 687, 281 + xy: 969, 443 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 grass3 rotate: false - xy: 697, 281 + xy: 949, 423 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 grassblock1 rotate: false - xy: 756, 384 + xy: 959, 433 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 grassblock2 rotate: false - xy: 766, 384 + xy: 979, 443 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 grassedge rotate: false - xy: 706, 399 + xy: 790, 359 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 ice1 rotate: false - xy: 653, 198 + xy: 959, 423 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ice2 rotate: false - xy: 652, 188 + xy: 969, 433 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ice3 rotate: false - xy: 652, 178 + xy: 989, 443 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 iceedge rotate: false - xy: 221, 113 + xy: 790, 345 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 icerock1 rotate: false - xy: 652, 168 + xy: 999, 443 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 icerock2 rotate: false - xy: 652, 158 + xy: 969, 423 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 icerockshadow1 rotate: false - xy: 366, 59 + xy: 979, 433 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 rockshadow1 rotate: false - xy: 366, 59 + xy: 979, 433 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 icerockshadow2 rotate: false - xy: 423, 143 + xy: 979, 423 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 rockshadow2 rotate: false - xy: 423, 143 + xy: 979, 423 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 iron1 rotate: false - xy: 423, 123 + xy: 989, 423 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 iron2 rotate: false - xy: 423, 113 + xy: 999, 433 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 iron3 rotate: false - xy: 433, 144 + xy: 1009, 437 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 lava rotate: false - xy: 503, 143 + xy: 393, 113 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 lavaedge rotate: false - xy: 579, 226 + xy: 202, 48 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 lead1 rotate: false - xy: 513, 143 + xy: 413, 113 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 lead2 rotate: false - xy: 503, 123 + xy: 363, 103 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 lead3 rotate: false - xy: 513, 133 + xy: 373, 104 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 metalfloor1 rotate: false - xy: 543, 133 + xy: 520, 155 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 metalfloor2 rotate: false - xy: 553, 143 + xy: 530, 155 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 metalfloor3 rotate: false - xy: 543, 123 + xy: 540, 155 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 metalfloor4 rotate: false - xy: 553, 133 + xy: 550, 155 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 metalfloor5 rotate: false - xy: 563, 143 + xy: 650, 204 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 metalfloor6 rotate: false - xy: 553, 123 + xy: 650, 194 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 metalflooredge rotate: false - xy: 147, 26 + xy: 205, 34 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 mossblock rotate: false - xy: 563, 133 + xy: 650, 184 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 oil rotate: false - xy: 563, 123 + xy: 660, 207 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 oiledge rotate: false - xy: 161, 28 + xy: 205, 20 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 rock1 rotate: false - xy: 606, 148 + xy: 674, 261 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 rock2 rotate: false - xy: 616, 148 + xy: 684, 261 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 sand1 rotate: false - xy: 656, 148 + xy: 684, 251 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 sand2 rotate: false - xy: 777, 405 + xy: 694, 261 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 sand3 rotate: false - xy: 787, 405 + xy: 704, 271 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 sandblock1 rotate: false - xy: 797, 405 + xy: 684, 241 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 sandblock2 rotate: false - xy: 807, 405 + xy: 694, 251 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 sandblock3 rotate: false - xy: 817, 405 + xy: 704, 261 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 sandedge rotate: false - xy: 309, 93 + xy: 570, 168 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 shrub rotate: false - xy: 887, 405 + xy: 704, 241 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 shrubshadow rotate: false - xy: 897, 405 + xy: 714, 251 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 snow1 rotate: false - xy: 927, 405 + xy: 714, 231 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 snow2 rotate: false - xy: 776, 395 + xy: 690, 221 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 snow3 rotate: false - xy: 776, 385 + xy: 690, 211 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 snowblock1 rotate: false - xy: 786, 395 + xy: 700, 221 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 snowblock2 rotate: false - xy: 786, 385 + xy: 690, 201 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 snowblock3 rotate: false - xy: 796, 395 + xy: 700, 211 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 snowedge rotate: false - xy: 304, 79 + xy: 626, 168 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 space rotate: false - xy: 816, 395 + xy: 710, 211 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 spaceedge rotate: false - xy: 304, 65 + xy: 640, 168 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 stone1 rotate: false - xy: 856, 395 + xy: 854, 351 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 stone2 rotate: false - xy: 856, 385 + xy: 654, 174 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 stone3 rotate: false - xy: 866, 395 + xy: 664, 177 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 stoneblock1 rotate: false - xy: 866, 385 + xy: 674, 177 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 stoneblock2 rotate: false - xy: 876, 395 + xy: 654, 164 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 stoneblock3 rotate: false - xy: 876, 385 + xy: 664, 167 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 stoneedge rotate: false - xy: 332, 79 + xy: 818, 367 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 thorium1 rotate: false - xy: 906, 395 + xy: 694, 171 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 thorium2 rotate: false - xy: 906, 385 + xy: 704, 181 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 thorium3 rotate: false - xy: 916, 395 + xy: 704, 171 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 titanium1 rotate: false - xy: 916, 385 + xy: 714, 181 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 titanium2 rotate: false - xy: 926, 395 + xy: 714, 171 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 titanium3 rotate: false - xy: 926, 385 + xy: 694, 161 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 water rotate: false - xy: 593, 136 + xy: 423, 133 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 wateredge rotate: false - xy: 332, 65 + xy: 818, 353 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 block-middle rotate: false - xy: 613, 198 + xy: 787, 315 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 pump-liquid rotate: false - xy: 613, 198 + xy: 787, 315 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 conduit-liquid rotate: false - xy: 612, 158 + xy: 889, 433 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 cross-1 rotate: false - xy: 642, 178 + xy: 909, 433 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 cross-2 rotate: false - xy: 543, 225 + xy: 777, 435 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 cross-3 rotate: false - xy: 901, 453 + xy: 957, 453 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -1007,35 +1007,63 @@ cross-4 index: -1 enemyspawn rotate: false - xy: 413, 113 + xy: 939, 433 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 playerspawn rotate: false - xy: 523, 113 + xy: 660, 187 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ripples rotate: false - xy: 897, 415 + xy: 743, 298 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 +rubble-1-0 + rotate: false + xy: 87, 3 + size: 16, 16 + orig: 16, 16 + offset: 0, 0 + index: -1 +rubble-1-1 + rotate: false + xy: 105, 3 + size: 16, 16 + orig: 16, 16 + offset: 0, 0 + index: -1 +rubble-2-0 + rotate: false + xy: 797, 451 + size: 26, 26 + orig: 26, 26 + offset: 0, 0 + index: -1 +rubble-2-1 + rotate: false + xy: 825, 451 + size: 26, 26 + orig: 26, 26 + offset: 0, 0 + index: -1 shadow rotate: false - xy: 909, 415 + xy: 755, 310 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 battery rotate: false - xy: 955, 417 + xy: 69, 1 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -1049,14 +1077,14 @@ batterylarge index: -1 combustiongenerator rotate: false - xy: 602, 158 + xy: 869, 423 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 combustiongenerator-top rotate: false - xy: 612, 168 + xy: 879, 433 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -1119,378 +1147,378 @@ fusionreactor-top index: -1 largesolarpanel rotate: false - xy: 953, 453 + xy: 656, 353 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 liquidcombustiongenerator rotate: false - xy: 523, 143 + xy: 383, 104 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 nuclearreactor rotate: false - xy: 855, 427 + xy: 572, 258 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 nuclearreactor-center rotate: false - xy: 881, 427 + xy: 598, 258 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 nuclearreactor-lights rotate: false - xy: 907, 427 + xy: 572, 232 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 powerinfinite rotate: false - xy: 553, 113 + xy: 670, 187 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 powernode rotate: false - xy: 563, 113 + xy: 680, 197 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 powernodelarge rotate: false - xy: 522, 171 + xy: 87, 21 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 powervoid rotate: false - xy: 576, 146 + xy: 680, 187 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 rtgenerator rotate: false - xy: 636, 148 + xy: 674, 251 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 rtgenerator-top rotate: false - xy: 646, 148 + xy: 674, 241 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 shieldgenerator rotate: false - xy: 847, 405 + xy: 694, 241 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 shieldprojector rotate: false - xy: 558, 189 + xy: 123, 3 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 solarpanel rotate: false - xy: 796, 385 + xy: 710, 221 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 teleporter rotate: false - xy: 84, 39 + xy: 149, 104 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 teleporter-top rotate: false - xy: 69, 13 + xy: 134, 78 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 thermalgenerator rotate: false - xy: 896, 385 + xy: 694, 181 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 alloysmelter rotate: false - xy: 945, 417 + xy: 706, 417 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 biomattercompressor rotate: false - xy: 66, 47 + xy: 131, 112 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 biomattercompressor-frame0 rotate: false - xy: 489, 225 + xy: 680, 381 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 biomattercompressor-frame1 rotate: false - xy: 131, 112 + xy: 489, 225 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 biomattercompressor-frame2 rotate: false - xy: 985, 435 + xy: 201, 112 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 biomattercompressor-liquid rotate: false - xy: 680, 381 + xy: 507, 225 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 biomattercompressor-top rotate: false - xy: 566, 292 + xy: 525, 225 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 centrifuge rotate: false - xy: 584, 292 + xy: 510, 207 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 centrifuge-liquid rotate: false - xy: 525, 225 + xy: 528, 207 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 cryofluidmixer-bottom rotate: false - xy: 185, 112 + xy: 795, 433 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 cryofluidmixer-liquid rotate: false - xy: 203, 112 + xy: 813, 433 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 cryofluidmixer-top rotate: false - xy: 492, 207 + xy: 831, 433 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 cultivator rotate: false - xy: 510, 207 + xy: 777, 417 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 cultivator-middle rotate: false - xy: 528, 207 + xy: 795, 415 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 cultivator-top rotate: false - xy: 546, 207 + xy: 813, 415 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 extractor rotate: false - xy: 346, 59 + xy: 959, 443 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 fluxpump rotate: false - xy: 356, 59 + xy: 939, 423 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 incinerator rotate: false - xy: 423, 133 + xy: 989, 433 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 irondrill rotate: false - xy: 433, 134 + xy: 999, 423 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 irondrill-rotator rotate: false - xy: 443, 144 + xy: 1009, 427 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 titaniumdrill-rotator rotate: false - xy: 443, 144 + xy: 1009, 427 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 irondrill-top rotate: false - xy: 433, 124 + xy: 849, 411 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 itemsource rotate: false - xy: 483, 144 + xy: 989, 413 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 itemvoid rotate: false - xy: 463, 114 + xy: 999, 413 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 laserdrill rotate: false - xy: 695, 327 + xy: 734, 382 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 laserdrill-rotator rotate: false - xy: 695, 309 + xy: 736, 364 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 laserdrill-top rotate: false - xy: 720, 400 + xy: 736, 346 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 lavasmelter rotate: false - xy: 503, 133 + xy: 403, 113 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 liquidsource rotate: false - xy: 543, 143 + xy: 542, 165 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 melter rotate: false - xy: 533, 123 + xy: 552, 165 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 nucleardrill rotate: false - xy: 751, 422 + xy: 86, 39 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 nucleardrill-rim rotate: false - xy: 777, 427 + xy: 112, 39 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 nucleardrill-rotator rotate: false - xy: 803, 427 + xy: 751, 422 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 nucleardrill-top rotate: false - xy: 829, 427 + xy: 680, 399 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 oilextractor rotate: false - xy: 933, 427 + xy: 598, 232 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 oilextractor-liquid rotate: false - xy: 959, 427 + xy: 624, 258 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 oilextractor-rotator rotate: false - xy: 680, 399 + xy: 624, 232 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -1504,7 +1532,7 @@ oilextractor-top index: -1 oilrefinery rotate: false - xy: 503, 113 + xy: 660, 197 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -1539,539 +1567,539 @@ plasmadrill-top index: -1 plasticformer rotate: false - xy: 695, 291 + xy: 812, 397 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 plasticformer-top rotate: false - xy: 504, 189 + xy: 830, 397 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 poweralloysmelter rotate: false - xy: 504, 171 + xy: 772, 365 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 poweralloysmelter-top rotate: false - xy: 522, 189 + xy: 772, 347 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 powersmelter rotate: false - xy: 540, 189 + xy: 105, 21 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 powersmelter-top rotate: false - xy: 540, 171 + xy: 123, 21 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 siliconsmelter-top rotate: false - xy: 540, 171 + xy: 123, 21 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 pulverizer rotate: false - xy: 573, 116 + xy: 687, 281 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 pulverizer-rotator rotate: false - xy: 586, 146 + xy: 697, 281 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 pump rotate: false - xy: 583, 136 + xy: 707, 281 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 reinforceddrill rotate: false - xy: 583, 126 + xy: 717, 281 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 reinforceddrill-rotator rotate: false - xy: 583, 116 + xy: 674, 271 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 reinforceddrill-top rotate: false - xy: 596, 148 + xy: 684, 271 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 separator rotate: false - xy: 827, 405 + xy: 714, 271 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 separator-liquid rotate: false - xy: 837, 405 + xy: 684, 231 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 siliconextractor rotate: false - xy: 907, 405 + xy: 704, 231 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 siliconsmelter rotate: false - xy: 558, 171 + xy: 677, 291 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 smelter rotate: false - xy: 917, 405 + xy: 714, 241 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 steeldrill rotate: false - xy: 836, 395 + xy: 1009, 407 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 steeldrill-rotator rotate: false - xy: 836, 385 + xy: 854, 371 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 steeldrill-top rotate: false - xy: 846, 395 + xy: 854, 361 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 stonedrill rotate: false - xy: 886, 395 + xy: 674, 167 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 stoneformer rotate: false - xy: 886, 385 + xy: 684, 177 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 titaniumdrill rotate: false - xy: 937, 405 + xy: 704, 161 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 titaniumdrill-top rotate: false - xy: 936, 395 + xy: 714, 161 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 waterextractor rotate: false - xy: 540, 153 + xy: 309, 105 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 waterextractor-liquid rotate: false - xy: 558, 153 + xy: 327, 105 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 waterextractor-rotator rotate: false - xy: 136, 58 + xy: 345, 105 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 waterextractor-top rotate: false - xy: 136, 40 + xy: 504, 189 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 block-1 rotate: false - xy: 603, 198 + xy: 787, 325 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-2 rotate: false - xy: 507, 225 + xy: 543, 225 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 block-2-top rotate: false - xy: 149, 112 + xy: 492, 207 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 block-3 rotate: false - xy: 797, 453 + xy: 853, 453 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 block-3-top rotate: false - xy: 823, 453 + xy: 879, 453 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 chainturret rotate: false - xy: 167, 112 + xy: 546, 207 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 doubleturret rotate: false - xy: 393, 113 + xy: 949, 443 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 flakturret rotate: false - xy: 134, 94 + xy: 600, 214 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 flakturret-heat rotate: false - xy: 134, 76 + xy: 618, 214 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 flakturret-panel-left rotate: false - xy: 152, 94 + xy: 636, 214 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 flakturret-panel-right rotate: false - xy: 152, 76 + xy: 69, 11 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 flameturret rotate: false - xy: 81, 1 + xy: 141, 2 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 flameturret-shoot rotate: false - xy: 93, 1 + xy: 153, 2 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 fornaxcannon rotate: false - xy: 927, 453 + xy: 983, 453 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 gatlingturret rotate: false - xy: 105, 1 + xy: 165, 2 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 gatlingturret-heat rotate: false - xy: 117, 1 + xy: 177, 2 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 laserturret rotate: false - xy: 837, 415 + xy: 743, 334 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 laserturret-heat rotate: false - xy: 849, 415 + xy: 755, 334 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 liquidturret rotate: false - xy: 738, 400 + xy: 752, 382 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 liquidturret-liquid rotate: false - xy: 756, 404 + xy: 754, 364 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 megarepairturret rotate: false - xy: 985, 417 + xy: 754, 346 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 missileturret rotate: false - xy: 1003, 421 + xy: 776, 399 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 railgunturret rotate: false - xy: 861, 415 + xy: 743, 322 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 railgunturret-heat rotate: false - xy: 873, 415 + xy: 743, 310 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 repairturret rotate: false - xy: 885, 415 + xy: 755, 322 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 teslaturret rotate: false - xy: 921, 415 + xy: 755, 298 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 teslaturret-heat rotate: false - xy: 933, 415 + xy: 731, 285 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 titancannon rotate: false - xy: 95, 13 + xy: 160, 78 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 flierfactory rotate: false - xy: 170, 94 + xy: 682, 345 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 walkerfactory rotate: false - xy: 170, 94 + xy: 682, 345 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 flierfactory-top rotate: false - xy: 170, 76 + xy: 677, 327 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 walkerfactory-top rotate: false - xy: 170, 76 + xy: 677, 327 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 flierfactory-top-open rotate: false - xy: 188, 94 + xy: 677, 309 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 walkerfactory-top-open rotate: false - xy: 188, 94 + xy: 677, 309 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 compositewall rotate: false - xy: 622, 178 + xy: 899, 443 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 door rotate: false - xy: 373, 114 + xy: 919, 423 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 door-large rotate: false - xy: 682, 363 + xy: 831, 415 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 door-large-open rotate: false - xy: 561, 225 + xy: 564, 214 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 door-open rotate: false - xy: 383, 114 + xy: 929, 433 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 duriumwall rotate: false - xy: 403, 113 + xy: 929, 423 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 duriumwall-large rotate: false - xy: 564, 207 + xy: 582, 214 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 ironwall rotate: false - xy: 443, 134 + xy: 859, 413 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 steelwall rotate: false - xy: 846, 385 + xy: 844, 351 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 steelwall-large rotate: false - xy: 504, 153 + xy: 695, 291 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 stonewall rotate: false - xy: 896, 395 + xy: 684, 167 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 titaniumshieldwall rotate: false - xy: 936, 385 + xy: 720, 221 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 titaniumwall rotate: false - xy: 947, 407 + xy: 720, 211 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 titaniumwall-large rotate: false - xy: 522, 153 + xy: 713, 291 size: 16, 16 orig: 16, 16 offset: 0, 0 @@ -2085,28 +2113,28 @@ blank index: -1 bullet rotate: false - xy: 492, 196 + xy: 561, 232 size: 9, 9 orig: 9, 9 offset: 0, 0 index: -1 bullet-back rotate: false - xy: 224, 102 + xy: 492, 196 size: 9, 9 orig: 9, 9 offset: 0, 0 index: -1 casing rotate: false - xy: 220, 70 + xy: 800, 375 size: 2, 4 orig: 2, 4 offset: 0, 0 index: -1 enemyarrow rotate: false - xy: 235, 102 + xy: 650, 232 size: 8, 7 orig: 8, 7 offset: 0, 0 @@ -2120,133 +2148,133 @@ laser index: -1 laser-end rotate: false - xy: 1005, 459 + xy: 566, 290 size: 18, 18 orig: 18, 18 offset: 0, 0 index: -1 laserfull rotate: false - xy: 1005, 439 + xy: 66, 45 size: 18, 18 orig: 18, 18 offset: 0, 0 index: -1 shell rotate: false - xy: 582, 215 + xy: 743, 287 size: 9, 9 orig: 9, 9 offset: 0, 0 index: -1 shell-back rotate: false - xy: 582, 204 + xy: 754, 287 size: 9, 9 orig: 9, 9 offset: 0, 0 index: -1 shot rotate: false - xy: 877, 405 + xy: 694, 231 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 item-biomatter rotate: false - xy: 453, 144 + xy: 869, 413 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 item-coal rotate: false - xy: 433, 114 + xy: 879, 413 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 item-densealloy rotate: false - xy: 443, 124 + xy: 889, 413 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 item-iron rotate: false - xy: 453, 134 + xy: 899, 413 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 item-lead rotate: false - xy: 463, 144 + xy: 909, 413 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 item-plastic rotate: false - xy: 443, 114 + xy: 919, 413 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 item-sand rotate: false - xy: 453, 124 + xy: 929, 413 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 item-silicon rotate: false - xy: 463, 134 + xy: 939, 413 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 item-steel rotate: false - xy: 473, 144 + xy: 949, 413 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 item-stone rotate: false - xy: 453, 114 + xy: 959, 413 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 item-thorium rotate: false - xy: 463, 124 + xy: 969, 413 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 item-titanium rotate: false - xy: 473, 134 + xy: 979, 413 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 standard-mech rotate: false - xy: 318, 79 + xy: 804, 367 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 standard-ship rotate: false - xy: 318, 65 + xy: 804, 353 size: 12, 12 orig: 12, 12 offset: 0, 0 @@ -2351,7 +2379,7 @@ button-map-over index: -1 button-select rotate: false - xy: 849, 453 + xy: 905, 453 size: 24, 24 split: 4, 4, 4, 4 orig: 24, 24 @@ -2387,7 +2415,7 @@ check-over index: -1 clear rotate: false - xy: 69, 1 + xy: 134, 66 size: 10, 10 orig: 10, 10 offset: 0, 0 @@ -2415,28 +2443,28 @@ discord-banner-over index: -1 controller-cursor rotate: false - xy: 602, 292 + xy: 682, 363 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-about rotate: false - xy: 154, 42 + xy: 1009, 463 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-add rotate: false - xy: 172, 60 + xy: 1009, 447 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-admin rotate: false - xy: 188, 60 + xy: 69, 29 size: 14, 14 orig: 14, 14 offset: 0, 0 @@ -2450,77 +2478,77 @@ icon-admin-small index: -1 icon-areaDelete rotate: false - xy: 129, 1 + xy: 189, 2 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-arrow rotate: false - xy: 204, 60 + xy: 760, 406 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-arrow-down rotate: false - xy: 141, 1 + xy: 832, 369 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-arrow-left rotate: false - xy: 572, 244 + xy: 832, 357 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-arrow-right rotate: false - xy: 147, 14 + xy: 804, 341 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-arrow-up rotate: false - xy: 346, 81 + xy: 816, 341 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-back rotate: false - xy: 188, 76 + xy: 698, 381 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-ban rotate: false - xy: 235, 111 + xy: 770, 383 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-cancel rotate: false - xy: 251, 111 + xy: 522, 191 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-chat rotate: false - xy: 346, 69 + xy: 638, 304 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-check rotate: false - xy: 267, 111 + xy: 504, 155 size: 14, 14 orig: 14, 14 offset: 0, 0 @@ -2548,504 +2576,504 @@ icon-close-over index: -1 icon-crafting rotate: false - xy: 358, 81 + xy: 638, 292 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-cursor rotate: false - xy: 358, 69 + xy: 650, 289 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-defense rotate: false - xy: 638, 304 + xy: 662, 289 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-dev-builds rotate: false - xy: 283, 111 + xy: 522, 175 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-discord rotate: false - xy: 299, 111 + xy: 538, 191 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-distribution rotate: false - xy: 638, 292 + xy: 650, 277 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-donate rotate: false - xy: 315, 107 + xy: 538, 175 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-dots rotate: false - xy: 331, 107 + xy: 554, 191 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-editor rotate: false - xy: 347, 107 + xy: 554, 175 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-egg rotate: false - xy: 584, 240 + xy: 570, 198 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-exit rotate: false - xy: 600, 240 + xy: 570, 182 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-file-text rotate: false - xy: 616, 240 + xy: 586, 198 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-fill rotate: false - xy: 206, 94 + xy: 700, 363 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-floppy rotate: false - xy: 632, 240 + xy: 586, 182 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-folder rotate: false - xy: 224, 86 + xy: 602, 198 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-folder-parent rotate: false - xy: 224, 70 + xy: 602, 182 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-github rotate: false - xy: 245, 95 + xy: 618, 198 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-google-play rotate: false - xy: 261, 95 + xy: 618, 182 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-grid rotate: false - xy: 206, 76 + xy: 700, 345 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-hold rotate: false - xy: 650, 289 + xy: 662, 277 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-holdDelete rotate: false - xy: 662, 289 + xy: 650, 265 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-home rotate: false - xy: 277, 95 + xy: 634, 198 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-host rotate: false - xy: 293, 95 + xy: 634, 182 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-info rotate: false - xy: 220, 58 + xy: 650, 253 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-itch.io rotate: false - xy: 240, 79 + xy: 146, 62 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-line rotate: false - xy: 572, 274 + xy: 695, 327 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-link rotate: false - xy: 256, 79 + xy: 162, 62 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-liquid rotate: false - xy: 644, 277 + xy: 662, 265 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-load rotate: false - xy: 272, 79 + xy: 178, 62 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-load-image rotate: false - xy: 572, 256 + xy: 695, 309 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-load-map rotate: false - xy: 590, 274 + xy: 706, 399 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-loading rotate: false - xy: 590, 256 + xy: 724, 400 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-logic rotate: false - xy: 644, 265 + xy: 650, 241 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-menu rotate: false - xy: 656, 277 + xy: 662, 253 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-menu-large rotate: false - xy: 608, 274 + xy: 716, 381 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-none rotate: false - xy: 656, 265 + xy: 662, 241 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-pause rotate: false - xy: 713, 333 + xy: 660, 229 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-pencil rotate: false - xy: 608, 256 + xy: 718, 363 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-pencil-small rotate: false - xy: 288, 79 + xy: 194, 62 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-pick rotate: false - xy: 620, 292 + xy: 718, 345 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-play rotate: false - xy: 713, 321 + xy: 205, 8 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-play-2 rotate: false - xy: 240, 63 + xy: 800, 381 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-players rotate: false - xy: 713, 309 + xy: 654, 217 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-power rotate: false - xy: 713, 297 + xy: 666, 217 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-production rotate: false - xy: 713, 285 + xy: 672, 229 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-quit rotate: false - xy: 256, 63 + xy: 816, 381 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-redo rotate: false - xy: 626, 274 + xy: 713, 327 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-refresh rotate: false - xy: 272, 63 + xy: 832, 381 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-rename rotate: false - xy: 288, 63 + xy: 138, 46 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-resize rotate: false - xy: 626, 256 + xy: 713, 309 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-rotate rotate: false - xy: 593, 224 + xy: 154, 46 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-rotate-arrow rotate: false - xy: 609, 224 + xy: 170, 46 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-rotate-left rotate: false - xy: 625, 224 + xy: 186, 46 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-rotate-right rotate: false - xy: 641, 224 + xy: 141, 30 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-save rotate: false - xy: 593, 208 + xy: 141, 14 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-save-image rotate: false - xy: 682, 345 + xy: 219, 109 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-save-map rotate: false - xy: 677, 327 + xy: 237, 109 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-settings rotate: false - xy: 777, 415 + xy: 678, 217 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-terrain rotate: false - xy: 677, 309 + xy: 255, 109 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-tools rotate: false - xy: 609, 208 + xy: 157, 30 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-touch rotate: false - xy: 789, 415 + xy: 731, 333 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-touchDelete rotate: false - xy: 801, 415 + xy: 731, 321 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-trash rotate: false - xy: 625, 208 + xy: 157, 14 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-trash-16 rotate: false - xy: 698, 381 + xy: 273, 109 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-trello rotate: false - xy: 641, 208 + xy: 173, 30 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-tutorial rotate: false - xy: 576, 188 + xy: 173, 14 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-undo rotate: false - xy: 700, 363 + xy: 291, 109 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-units rotate: false - xy: 813, 415 + xy: 731, 309 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-weapon rotate: false - xy: 825, 415 + xy: 731, 297 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-wiki rotate: false - xy: 576, 172 + xy: 189, 30 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-zoom rotate: false - xy: 700, 345 + xy: 742, 400 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-zoom-small rotate: false - xy: 576, 156 + xy: 189, 14 size: 14, 14 orig: 14, 14 offset: 0, 0 @@ -3116,14 +3144,14 @@ scroll-knob-vertical-black index: -1 selection rotate: false - xy: 763, 487 + xy: 66, 42 size: 1, 1 orig: 1, 1 offset: 0, 0 index: -1 slider rotate: false - xy: 774, 412 + xy: 716, 417 size: 1, 8 orig: 1, 8 offset: 0, 0 @@ -3151,7 +3179,7 @@ slider-knob-over index: -1 slider-vertical rotate: false - xy: 153, 1 + xy: 566, 287 size: 8, 1 orig: 8, 1 offset: 0, 0 @@ -3218,126 +3246,126 @@ window-empty index: -1 flier rotate: false - xy: 706, 413 + xy: 786, 383 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 scout rotate: false - xy: 323, 93 + xy: 584, 168 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 scout-base rotate: false - xy: 337, 93 + xy: 598, 168 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 standard-mech-base rotate: false - xy: 337, 93 + xy: 598, 168 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 scout-leg rotate: false - xy: 351, 93 + xy: 612, 168 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 standard-mech-leg rotate: false - xy: 351, 93 + xy: 612, 168 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 beam rotate: false - xy: 965, 417 + xy: 790, 373 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 beam-equip rotate: false - xy: 975, 417 + xy: 767, 336 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blaster rotate: false - xy: 1013, 411 + xy: 777, 297 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blaster-equip rotate: false - xy: 593, 198 + xy: 787, 335 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 clustergun rotate: false - xy: 612, 188 + xy: 859, 433 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 clustergun-equip rotate: false - xy: 592, 158 + xy: 879, 443 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 shockgun rotate: false - xy: 857, 405 + xy: 704, 251 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 shockgun-equip rotate: false - xy: 867, 405 + xy: 714, 261 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 triblaster rotate: false - xy: 957, 407 + xy: 720, 201 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 triblaster-equip rotate: false - xy: 967, 407 + xy: 720, 191 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 vulcan rotate: false - xy: 573, 106 + xy: 724, 161 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 vulcan-equip rotate: false - xy: 583, 106 + xy: 423, 143 size: 8, 8 orig: 8, 8 offset: 0, 0 diff --git a/core/assets/sprites/sprites.png b/core/assets/sprites/sprites.png index 5c894574a3..4292af6293 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 f29fa2a166..18f7b305c9 100644 --- a/core/assets/version.properties +++ b/core/assets/version.properties @@ -1,7 +1,7 @@ #Autogenerated file. Do not modify. -#Wed Apr 18 21:31:08 EDT 2018 +#Thu Apr 19 19:06:19 EDT 2018 version=release -androidBuildCode=1049 +androidBuildCode=1073 name=Mindustry code=3.5 build=custom build diff --git a/core/src/io/anuke/mindustry/Vars.java b/core/src/io/anuke/mindustry/Vars.java index 94e8a38f74..61dc33b3a5 100644 --- a/core/src/io/anuke/mindustry/Vars.java +++ b/core/src/io/anuke/mindustry/Vars.java @@ -147,7 +147,7 @@ public class Vars{ public static final EntityGroup shieldGroup = Entities.addGroup(Shield.class, false); public static final EntityGroup effectGroup = Entities.addGroup(EffectEntity.class, false); public static final EntityGroup groundEffectGroup = Entities.addGroup(EffectEntity.class, false); - public static final EntityGroup groundItemGroup = Entities.addGroup(Puddle.class, false); + public static final EntityGroup puddleGroup = Entities.addGroup(Puddle.class, false); public static final EntityGroup airItemGroup = Entities.addGroup(Fire.class, false); public static final EntityGroup[] unitGroups = new EntityGroup[Team.values().length]; diff --git a/core/src/io/anuke/mindustry/content/Items.java b/core/src/io/anuke/mindustry/content/Items.java index f124d06d00..28490e053e 100644 --- a/core/src/io/anuke/mindustry/content/Items.java +++ b/core/src/io/anuke/mindustry/content/Items.java @@ -44,7 +44,12 @@ public class Items { } }, silicon = new Item("silicon", Color.valueOf("53565c")), - plastic = new Item("plastic", Color.valueOf("e9ead3")), + plastic = new Item("plastic", Color.valueOf("e9ead3")){ + { + flammability = 0.2f; + explosiveness = 0.1f; + } + }, densealloy = new Item("densealloy", Color.valueOf("b4d5c7")), biomatter = new Item("biomatter", Color.valueOf("648b55")) { { diff --git a/core/src/io/anuke/mindustry/core/Logic.java b/core/src/io/anuke/mindustry/core/Logic.java index 4b7d19d057..c7c4dea920 100644 --- a/core/src/io/anuke/mindustry/core/Logic.java +++ b/core/src/io/anuke/mindustry/core/Logic.java @@ -126,7 +126,7 @@ public class Logic extends Module { for(EntityGroup group : unitGroups){ Entities.update(group); } - Entities.update(groundItemGroup); + Entities.update(puddleGroup); Entities.update(tileGroup); Entities.update(airItemGroup); Entities.update(shieldGroup); diff --git a/core/src/io/anuke/mindustry/core/Renderer.java b/core/src/io/anuke/mindustry/core/Renderer.java index f52b495d93..89829599c4 100644 --- a/core/src/io/anuke/mindustry/core/Renderer.java +++ b/core/src/io/anuke/mindustry/core/Renderer.java @@ -23,6 +23,7 @@ import io.anuke.mindustry.entities.units.BaseUnit; import io.anuke.mindustry.game.Team; import io.anuke.mindustry.graphics.BlockRenderer; import io.anuke.mindustry.graphics.Layer; +import io.anuke.mindustry.graphics.MinimapRenderer; import io.anuke.mindustry.graphics.Shaders; import io.anuke.mindustry.input.InputHandler; import io.anuke.mindustry.input.PlaceMode; @@ -57,6 +58,7 @@ public class Renderer extends RendererModule{ private Array shieldDraws = new Array<>(); private Rectangle rect = new Rectangle(), rect2 = new Rectangle(); private BlockRenderer blocks = new BlockRenderer(); + private MinimapRenderer minimap = new MinimapRenderer(); public Renderer() { Lines.setCircleVertices(14); @@ -203,17 +205,13 @@ public class Renderer extends RendererModule{ Graphics.surface(pixelSurface, false); else batch.begin(); - - //clears shield surface - //Graphics.surface(shieldSurface); - //Graphics.surface(); drawPadding(); blocks.drawFloor(); - Entities.draw(groundItemGroup); Entities.draw(groundEffectGroup); + Entities.draw(puddleGroup); blocks.processBlocks(); blocks.drawBlocks(Layer.overlay); @@ -275,6 +273,10 @@ public class Renderer extends RendererModule{ background.dispose(); } + public MinimapRenderer minimap() { + return minimap; + } + public void clearTiles(){ blocks.clearTiles(); } diff --git a/core/src/io/anuke/mindustry/core/World.java b/core/src/io/anuke/mindustry/core/World.java index 37a90a5709..54cb0c7f30 100644 --- a/core/src/io/anuke/mindustry/core/World.java +++ b/core/src/io/anuke/mindustry/core/World.java @@ -1,5 +1,6 @@ package io.anuke.mindustry.core; +import com.badlogic.gdx.Gdx; import com.badlogic.gdx.math.GridPoint2; import com.badlogic.gdx.math.MathUtils; import com.badlogic.gdx.utils.Array; @@ -13,7 +14,6 @@ import io.anuke.mindustry.world.Tile; import io.anuke.mindustry.world.WorldGenerator; import io.anuke.ucore.entities.Entities; import io.anuke.ucore.modules.Module; -import io.anuke.ucore.util.Log; import io.anuke.ucore.util.Mathf; import io.anuke.ucore.util.Tmp; @@ -157,7 +157,6 @@ public class World extends Module{ } public void loadMap(Map map, int seed){ - Log.info("--BEGIN LOAD MAP--"); this.currentMap = map; this.seed = seed; diff --git a/core/src/io/anuke/mindustry/entities/effect/Fire.java b/core/src/io/anuke/mindustry/entities/effect/Fire.java index bbfe07800e..fdcc9539f7 100644 --- a/core/src/io/anuke/mindustry/entities/effect/Fire.java +++ b/core/src/io/anuke/mindustry/entities/effect/Fire.java @@ -8,6 +8,7 @@ import io.anuke.mindustry.content.StatusEffects; import io.anuke.mindustry.content.fx.EnvironmentFx; import io.anuke.mindustry.entities.SerializableEntity; import io.anuke.mindustry.entities.TileEntity; +import io.anuke.mindustry.world.Block; import io.anuke.mindustry.world.Tile; import io.anuke.ucore.core.Effects; import io.anuke.ucore.core.Timers; @@ -27,6 +28,7 @@ public class Fire extends TimedEntity implements SerializableEntity, Poolable{ private int loadedPosition = -1; private Tile tile; + private Block block; private float baseFlammability = -1, puddleFlammability; /**Start a fire on the tile. If there already is a file there, refreshes its lifetime..*/ @@ -67,8 +69,9 @@ public class Fire extends TimedEntity implements SerializableEntity, Poolable{ time += Timers.delta()*8; } - if (baseFlammability < 0){ + if (baseFlammability < 0 || block != tile.block()){ baseFlammability = tile.block().getFlammability(tile); + block = tile.block(); } if(damage) { diff --git a/core/src/io/anuke/mindustry/entities/effect/Puddle.java b/core/src/io/anuke/mindustry/entities/effect/Puddle.java index c6168d6af5..057b543f59 100644 --- a/core/src/io/anuke/mindustry/entities/effect/Puddle.java +++ b/core/src/io/anuke/mindustry/entities/effect/Puddle.java @@ -27,7 +27,7 @@ import java.io.DataInputStream; import java.io.DataOutputStream; import java.io.IOException; -import static io.anuke.mindustry.Vars.groundItemGroup; +import static io.anuke.mindustry.Vars.puddleGroup; import static io.anuke.mindustry.Vars.world; public class Puddle extends Entity implements SerializableEntity, Poolable{ @@ -60,6 +60,16 @@ public class Puddle extends Entity implements SerializableEntity, Poolable{ } private static void deposit(Tile tile, Tile source, Liquid liquid, float amount, int generation){ + if(tile.floor().liquid){ + reactPuddle(tile.floor().liquidDrop, liquid, amount, tile, tile.worldx(), tile.worldy()); + + if(generation == 0 && Timers.get(tile, "ripple", 50)){ + Effects.effect(BlockFx.ripple, tile.floor().liquidDrop.color, + (tile.worldx() + source.worldx())/2f, (tile.worldy() + source.worldy())/2f); + } + return; + } + Puddle p = map.get(tile.packedPosition()); if(p == null){ Puddle puddle = Pools.obtain(Puddle.class); @@ -76,28 +86,29 @@ public class Puddle extends Entity implements SerializableEntity, Poolable{ Effects.effect(BlockFx.ripple, p.liquid.color, (tile.worldx() + source.worldx())/2f, (tile.worldy() + source.worldy())/2f); } }else{ - reactPuddle(p, liquid, amount); + p.amount -= reactPuddle(p.liquid, liquid, amount, p.tile, p.x, p.y); } } - private static void reactPuddle(Puddle p, Liquid liquid, float amount){ - if((p.liquid.flammability > 0.3f && liquid.temperature > 0.7f) || - (liquid.flammability > 0.3f && p.liquid.temperature > 0.7f)){ //flammable liquid + hot liquid - Fire.create(p.tile); + private static float reactPuddle(Liquid pliquid, Liquid liquid, float amount, Tile tile, float x, float y){ + if((pliquid.flammability > 0.3f && liquid.temperature > 0.7f) || + (liquid.flammability > 0.3f && pliquid.temperature > 0.7f)){ //flammable liquid + hot liquid + Fire.create(tile); if(Mathf.chance(0.006 * amount)){ - new Fireball(p.x, p.y, p.liquid.flameColor, Mathf.random(360f)).add(); + new Fireball(x, y, pliquid.flameColor, Mathf.random(360f)).add(); } - }else if(p.liquid.temperature > 0.7f && liquid.temperature < 0.55f){ //cold liquid poured onto hot puddle + }else if(pliquid.temperature > 0.7f && liquid.temperature < 0.55f){ //cold liquid poured onto hot puddle if(Mathf.chance(0.5f * amount)){ - Effects.effect(EnvironmentFx.steam, p.x, p.y); + Effects.effect(EnvironmentFx.steam, x, y); } - p.amount -= 0.1f * amount; - }else if(liquid.temperature > 0.7f && p.liquid.temperature < 0.55f){ //hot liquid poured onto cold puddle + return - 0.1f * amount; + }else if(liquid.temperature > 0.7f && pliquid.temperature < 0.55f){ //hot liquid poured onto cold puddle if(Mathf.chance(0.8f * amount)){ - Effects.effect(EnvironmentFx.steam, p.x, p.y); + Effects.effect(EnvironmentFx.steam, x, y); } - p.amount -= 0.4f * amount; + return - 0.4f * amount; } + return 0f; } /**Deserialization use only!*/ @@ -209,6 +220,6 @@ public class Puddle extends Entity implements SerializableEntity, Poolable{ @Override public Puddle add() { - return add(groundItemGroup); + return add(puddleGroup); } } diff --git a/core/src/io/anuke/mindustry/entities/effect/Rubble.java b/core/src/io/anuke/mindustry/entities/effect/Rubble.java new file mode 100644 index 0000000000..68f8e8115b --- /dev/null +++ b/core/src/io/anuke/mindustry/entities/effect/Rubble.java @@ -0,0 +1,35 @@ +package io.anuke.mindustry.entities.effect; + +import com.badlogic.gdx.graphics.Color; +import io.anuke.ucore.entities.TimedEntity; +import io.anuke.ucore.graphics.Draw; +import io.anuke.ucore.util.Mathf; + +import static io.anuke.mindustry.Vars.groundEffectGroup; + +public class Rubble extends TimedEntity{ + private static final Color color = Color.valueOf("52504e"); + private int size; + + public static void create(float x, float y, int size){ + Rubble rubble = new Rubble(); + rubble.size = size; + rubble.set(x + Mathf.range(1), y + Mathf.range(1)).add(); + } + + private Rubble(){ + lifetime = 7000f; + } + + @Override + public void draw(){ + Draw.color(color.r, color.g, color.b, 1f-Mathf.curve(fin(), 0.98f)); + Draw.rect("rubble-" + size + "-" + Mathf.randomSeed(id, 0, 1), x, y, Mathf.randomSeed(id, 0, 4) * 90); + Draw.color(); + } + + @Override + public Rubble add() { + return add(groundEffectGroup); + } +} diff --git a/core/src/io/anuke/mindustry/graphics/BlockRenderer.java b/core/src/io/anuke/mindustry/graphics/BlockRenderer.java index 4e31b718bd..56adb467a5 100644 --- a/core/src/io/anuke/mindustry/graphics/BlockRenderer.java +++ b/core/src/io/anuke/mindustry/graphics/BlockRenderer.java @@ -54,9 +54,6 @@ public class BlockRenderer{ requestidx = 0; lastLayer = null; - int crangex = (int) (camera.viewportWidth / (chunksize * tilesize)) + 1; - int crangey = (int) (camera.viewportHeight / (chunksize * tilesize)) + 1; - int rangex = (int) (camera.viewportWidth * camera.zoom / tilesize / 2)+2; int rangey = (int) (camera.viewportHeight * camera.zoom / tilesize / 2)+2; @@ -99,7 +96,8 @@ public class BlockRenderer{ } } } - + + //TODO this actually isn't necessary Draw.color(0, 0, 0, 0.15f); Graphics.flushSurface(); Draw.color(); diff --git a/core/src/io/anuke/mindustry/graphics/DrawLayer.java b/core/src/io/anuke/mindustry/graphics/DrawLayer.java index 2608035b1a..cf45bef95f 100644 --- a/core/src/io/anuke/mindustry/graphics/DrawLayer.java +++ b/core/src/io/anuke/mindustry/graphics/DrawLayer.java @@ -65,10 +65,10 @@ public enum DrawLayer { } protected void beginShader(){ - renderer.getBlocks().endFloor(); + //renderer.getBlocks().endFloor(); renderer.waterSurface.getBuffer().begin(); Graphics.clear(Color.CLEAR); - renderer.getBlocks().beginFloor(); + //renderer.getBlocks().beginFloor(); } public void endShader(Shader shader){ diff --git a/core/src/io/anuke/mindustry/graphics/FloorRenderer.java b/core/src/io/anuke/mindustry/graphics/FloorRenderer.java index bcf5bbb4c0..c05b218ffb 100644 --- a/core/src/io/anuke/mindustry/graphics/FloorRenderer.java +++ b/core/src/io/anuke/mindustry/graphics/FloorRenderer.java @@ -113,9 +113,8 @@ public class FloorRenderer { } public void beginDraw(){ - Gdx.gl.glEnable(GL20.GL_BLEND); - Core.atlas.getTextures().first().bind(); + Gdx.gl.glEnable(GL20.GL_BLEND); program.begin(); program.setUniformMatrix("u_projTrans", Core.camera.combined); @@ -187,6 +186,7 @@ public class FloorRenderer { int idx = chunk.idx; TextureRegion region = new TextureRegion(Core.atlas.getTextures().first()); + IntArray edges = new IntArray(); for(int tilex = cx * chunksize; tilex < (cx + 1) * chunksize; tilex++){ for(int tiley = cy * chunksize; tiley < (cy + 1) * chunksize; tiley++){ @@ -194,9 +194,9 @@ public class FloorRenderer { if(tile == null) continue; if(tile.floor().drawLayer == layer && tile.block().drawLayer != DrawLayer.walls){ - idx = drawFloor(tile, idx, region, vertices, false); - }else if(tile.floor().drawLayer.ordinal() < layer.ordinal() && tile.block().drawLayer != DrawLayer.walls){ - idx = drawFloor(tile, idx, region, vertices, true); + idx = drawFloor(tile, idx, region, vertices, false, edges); + }else if(tile.floor().drawLayer.ordinal() < layer.ordinal() && tile.block().drawLayer != DrawLayer.walls && layer != DrawLayer.walls){ + idx = drawFloor(tile, idx, region, vertices, true, edges); } if(tile.block().drawLayer == layer && layer == DrawLayer.walls){ @@ -214,7 +214,7 @@ public class FloorRenderer { chunk.idx = idx; } - private int drawFloor(Tile tile, int idx, TextureRegion region, float[] vertices, boolean edgesOnly){ + private int drawFloor(Tile tile, int idx, TextureRegion region, float[] vertices, boolean edgesOnly, IntArray edges){ MathUtils.random.setSeed(tile.id()); Block block = tile.floor(); diff --git a/core/src/io/anuke/mindustry/graphics/MinimapRenderer.java b/core/src/io/anuke/mindustry/graphics/MinimapRenderer.java new file mode 100644 index 0000000000..01dd13a519 --- /dev/null +++ b/core/src/io/anuke/mindustry/graphics/MinimapRenderer.java @@ -0,0 +1,29 @@ +package io.anuke.mindustry.graphics; + +import com.badlogic.gdx.graphics.Pixmap; +import com.badlogic.gdx.graphics.Texture; +import com.sun.media.jfxmediaimpl.MediaDisposer.Disposable; +import io.anuke.mindustry.world.Tile; + +public class MinimapRenderer implements Disposable{ + private Pixmap pixmap; + private Texture texture; + + public Texture getTexture(){ + return texture; + } + + public void reset(){ + + } + + public void updated(Tile tile){ + + } + + @Override + public void dispose() { + pixmap.dispose(); + texture.dispose(); + } +} diff --git a/core/src/io/anuke/mindustry/ui/fragments/BlockConfigFragment.java b/core/src/io/anuke/mindustry/ui/fragments/BlockConfigFragment.java index 4cd8ee0cf4..424eb1d68f 100644 --- a/core/src/io/anuke/mindustry/ui/fragments/BlockConfigFragment.java +++ b/core/src/io/anuke/mindustry/ui/fragments/BlockConfigFragment.java @@ -33,6 +33,7 @@ public class BlockConfigFragment implements Fragment { public void showConfig(Tile tile){ configTile = tile; + table.setVisible(true); table.clear(); tile.block().buildTable(tile, table); table.pack(); diff --git a/core/src/io/anuke/mindustry/world/Block.java b/core/src/io/anuke/mindustry/world/Block.java index fcf6b2cb39..3798e480db 100644 --- a/core/src/io/anuke/mindustry/world/Block.java +++ b/core/src/io/anuke/mindustry/world/Block.java @@ -11,6 +11,7 @@ import io.anuke.mindustry.entities.TileEntity; import io.anuke.mindustry.entities.Unit; import io.anuke.mindustry.entities.effect.DamageArea; import io.anuke.mindustry.entities.effect.Puddle; +import io.anuke.mindustry.entities.effect.Rubble; import io.anuke.mindustry.graphics.DrawLayer; import io.anuke.mindustry.graphics.Layer; import io.anuke.mindustry.graphics.Palette; @@ -264,6 +265,7 @@ public class Block extends BaseBlock { } DamageArea.dynamicExplosion(x, y, flammability, explosiveness, power, tilesize * size/2f, tempColor); + Rubble.create(tile.drawx(), tile.drawy(), size); } /**Returns the flammability of the tile. Used for fire calculations.