diff --git a/core/assets-raw/sprites/blocks/extra/cross-4.png b/core/assets-raw/sprites/blocks/extra/cross-4.png new file mode 100644 index 0000000000..5c24f39694 Binary files /dev/null and b/core/assets-raw/sprites/blocks/extra/cross-4.png differ diff --git a/core/assets-raw/sprites/blocks/power/coalgenerator.png b/core/assets-raw/sprites/blocks/power/coalgenerator.png deleted file mode 100644 index 7500e84951..0000000000 Binary files a/core/assets-raw/sprites/blocks/power/coalgenerator.png and /dev/null differ diff --git a/core/assets-raw/sprites/blocks/power/coalgenerator-top.png b/core/assets-raw/sprites/blocks/power/combustiongenerator-top.png similarity index 100% rename from core/assets-raw/sprites/blocks/power/coalgenerator-top.png rename to core/assets-raw/sprites/blocks/power/combustiongenerator-top.png diff --git a/core/assets-raw/sprites/blocks/power/combustiongenerator.png b/core/assets-raw/sprites/blocks/power/combustiongenerator.png index 968b4224a7..116811b8e1 100644 Binary files a/core/assets-raw/sprites/blocks/power/combustiongenerator.png and b/core/assets-raw/sprites/blocks/power/combustiongenerator.png differ diff --git a/core/assets-raw/sprites/blocks/power/liquidcombustiongenerator.png b/core/assets-raw/sprites/blocks/power/liquidcombustiongenerator.png new file mode 100644 index 0000000000..5d49000258 Binary files /dev/null and b/core/assets-raw/sprites/blocks/power/liquidcombustiongenerator.png differ diff --git a/core/assets-raw/sprites/blocks/power/powernode.png b/core/assets-raw/sprites/blocks/power/powernode.png index 5d0ce18461..64a3c9e719 100644 Binary files a/core/assets-raw/sprites/blocks/power/powernode.png and b/core/assets-raw/sprites/blocks/power/powernode.png differ diff --git a/core/assets-raw/sprites/blocks/power/powernodelarge.png b/core/assets-raw/sprites/blocks/power/powernodelarge.png new file mode 100644 index 0000000000..31550c2d17 Binary files /dev/null and b/core/assets-raw/sprites/blocks/power/powernodelarge.png differ diff --git a/core/assets-raw/sprites/blocks/power/rtgenerator.png b/core/assets-raw/sprites/blocks/power/rtgenerator.png index b0a625ba7b..87ef28aa4a 100644 Binary files a/core/assets-raw/sprites/blocks/power/rtgenerator.png and b/core/assets-raw/sprites/blocks/power/rtgenerator.png differ diff --git a/core/assets-raw/sprites/blocks/power/thermalgenerator.png b/core/assets-raw/sprites/blocks/power/thermalgenerator.png index 62ce54ca84..fa3c593150 100644 Binary files a/core/assets-raw/sprites/blocks/power/thermalgenerator.png and b/core/assets-raw/sprites/blocks/power/thermalgenerator.png differ diff --git a/core/assets/sprites/sprites.atlas b/core/assets/sprites/sprites.atlas index b14ec7adf1..30622cc878 100644 --- a/core/assets/sprites/sprites.atlas +++ b/core/assets/sprites/sprites.atlas @@ -13,189 +13,189 @@ background index: -1 conduit-bottom rotate: false - xy: 670, 289 + xy: 558, 197 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 conduit-top rotate: false - xy: 680, 289 + xy: 581, 230 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 conduittunnel rotate: false - xy: 757, 438 + xy: 548, 171 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 conveyor rotate: false - xy: 571, 230 + xy: 677, 343 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 conveyormove rotate: false - xy: 581, 230 + xy: 677, 333 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 conveyortunnel rotate: false - xy: 634, 273 + xy: 687, 347 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 core rotate: false - xy: 450, 170 + xy: 797, 453 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 junction rotate: false - xy: 857, 433 + xy: 786, 387 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 liquidjunction rotate: false - xy: 917, 433 + xy: 796, 387 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 liquidrouter rotate: false - xy: 927, 433 + xy: 806, 397 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 liquidrouter-bottom rotate: false - xy: 937, 433 + xy: 816, 407 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 liquidrouter-liquid rotate: false - xy: 947, 433 + xy: 826, 417 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 liquidrouter-top rotate: false - xy: 957, 433 + xy: 836, 427 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 liquidtank-bottom rotate: false - xy: 875, 453 + xy: 901, 453 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 liquidtank-liquid rotate: false - xy: 901, 453 + xy: 927, 453 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 liquidtank-top rotate: false - xy: 927, 453 + xy: 953, 453 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 multiplexer rotate: false - xy: 152, 68 + xy: 206, 68 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 poweredconveyor rotate: false - xy: 766, 423 + xy: 836, 417 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 poweredconveyormove rotate: false - xy: 766, 413 + xy: 846, 427 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 pulseconduit-bottom rotate: false - xy: 786, 423 + xy: 826, 397 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 pulseconduit-top rotate: false - xy: 766, 393 + xy: 836, 407 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 router rotate: false - xy: 766, 373 + xy: 866, 427 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 sortedunloader rotate: false - xy: 846, 413 + xy: 906, 427 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 sorter rotate: false - xy: 856, 423 + xy: 856, 367 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 splitter rotate: false - xy: 816, 373 + xy: 866, 377 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 steelconveyor rotate: false - xy: 826, 383 + xy: 876, 387 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 steelconveyormove rotate: false - xy: 836, 393 + xy: 886, 397 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -209,7 +209,7 @@ teleporter-top index: -1 unloader rotate: false - xy: 866, 373 + xy: 926, 397 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -223,14 +223,14 @@ vault index: -1 vault-icon rotate: false - xy: 876, 383 + xy: 936, 407 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 weaponfactory rotate: false - xy: 141, 12 + xy: 177, 14 size: 16, 16 orig: 16, 16 offset: 0, 0 @@ -272,532 +272,532 @@ blackstone3 index: -1 blackstoneblock1 rotate: false - xy: 149, 2 + xy: 492, 197 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blackstoneblock2 rotate: false - xy: 223, 1 + xy: 561, 233 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blackstoneblock3 rotate: false - xy: 233, 1 + xy: 149, 1 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blackstoneedge rotate: false - xy: 138, 62 + xy: 979, 465 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 coal1 rotate: false - xy: 492, 197 + xy: 219, 1 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 coal2 rotate: false - xy: 561, 233 + xy: 229, 1 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 coal3 rotate: false - xy: 650, 299 + xy: 239, 1 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 deepwater rotate: false - xy: 634, 253 + xy: 697, 347 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 dirt1 rotate: false - xy: 677, 343 + xy: 697, 337 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 dirt2 rotate: false - xy: 677, 333 + xy: 766, 422 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 dirt3 rotate: false - xy: 687, 347 + xy: 766, 412 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 dirtedge rotate: false - xy: 138, 48 + xy: 979, 451 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 grass1 rotate: false - xy: 777, 443 + xy: 646, 265 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 grass2 rotate: false - xy: 787, 443 + xy: 646, 255 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 grass3 rotate: false - xy: 797, 443 + xy: 656, 265 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 grassblock1 rotate: false - xy: 807, 443 + xy: 646, 245 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 grassblock2 rotate: false - xy: 817, 443 + xy: 656, 255 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 grassedge rotate: false - xy: 345, 127 + xy: 1011, 443 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 ice1 rotate: false - xy: 827, 443 + xy: 666, 265 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ice2 rotate: false - xy: 837, 443 + xy: 656, 245 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ice3 rotate: false - xy: 847, 443 + xy: 666, 255 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 iceedge rotate: false - xy: 359, 130 + xy: 1011, 429 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 icerock1 rotate: false - xy: 857, 443 + xy: 666, 245 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 icerock2 rotate: false - xy: 867, 443 + xy: 680, 275 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 icerockshadow1 rotate: false - xy: 877, 443 + xy: 676, 265 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 rockshadow1 rotate: false - xy: 877, 443 + xy: 676, 265 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 icerockshadow2 rotate: false - xy: 887, 443 + xy: 676, 255 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 rockshadow2 rotate: false - xy: 887, 443 + xy: 676, 255 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 iron1 rotate: false - xy: 897, 443 + xy: 676, 245 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 iron2 rotate: false - xy: 907, 443 + xy: 375, 132 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 iron3 rotate: false - xy: 917, 443 + xy: 278, 83 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 lava rotate: false - xy: 867, 433 + xy: 796, 397 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 lavaedge rotate: false - xy: 283, 99 + xy: 138, 62 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 lead1 rotate: false - xy: 887, 433 + xy: 816, 417 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 lead2 rotate: false - xy: 897, 433 + xy: 826, 427 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 lead3 rotate: false - xy: 907, 433 + xy: 776, 367 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 mossblock rotate: false - xy: 977, 433 + xy: 796, 377 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 oil rotate: false - xy: 987, 433 + xy: 806, 387 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 oiledge rotate: false - xy: 301, 111 + xy: 138, 48 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 rock1 rotate: false - xy: 796, 413 + xy: 846, 407 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 rock2 rotate: false - xy: 806, 423 + xy: 856, 417 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 sand1 rotate: false - xy: 796, 403 + xy: 836, 387 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 sand2 rotate: false - xy: 806, 413 + xy: 846, 397 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 sand3 rotate: false - xy: 816, 423 + xy: 856, 407 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 sandblock1 rotate: false - xy: 776, 373 + xy: 866, 417 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 sandblock2 rotate: false - xy: 786, 383 + xy: 876, 427 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 sandblock3 rotate: false - xy: 796, 393 + xy: 826, 367 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 sandedge rotate: false - xy: 315, 111 + xy: 965, 439 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 shrub rotate: false - xy: 836, 423 + xy: 856, 387 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 shrubshadow rotate: false - xy: 796, 373 + xy: 866, 397 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 snow1 rotate: false - xy: 826, 403 + xy: 896, 427 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 snow2 rotate: false - xy: 836, 413 + xy: 846, 367 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 snow3 rotate: false - xy: 846, 423 + xy: 856, 377 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 snowblock1 rotate: false - xy: 806, 373 + xy: 866, 387 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 snowblock2 rotate: false - xy: 816, 383 + xy: 876, 397 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 snowblock3 rotate: false - xy: 826, 393 + xy: 886, 407 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 snowedge rotate: false - xy: 325, 97 + xy: 516, 193 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 stone1 rotate: false - xy: 836, 383 + xy: 876, 377 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 stone2 rotate: false - xy: 846, 393 + xy: 886, 387 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 stone3 rotate: false - xy: 856, 403 + xy: 896, 397 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 stoneblock1 rotate: false - xy: 866, 413 + xy: 906, 407 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 stoneblock2 rotate: false - xy: 876, 423 + xy: 916, 417 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 stoneblock3 rotate: false - xy: 836, 373 + xy: 926, 427 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 stoneedge rotate: false - xy: 401, 137 + xy: 530, 179 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 thorium1 rotate: false - xy: 886, 423 + xy: 916, 407 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 thorium2 rotate: false - xy: 846, 373 + xy: 926, 417 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 thorium3 rotate: false - xy: 856, 383 + xy: 936, 427 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 titanium1 rotate: false - xy: 866, 393 + xy: 886, 367 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 titanium2 rotate: false - xy: 876, 403 + xy: 896, 377 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 titanium3 rotate: false - xy: 886, 413 + xy: 906, 387 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 water rotate: false - xy: 906, 413 + xy: 916, 377 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 wateredge rotate: false - xy: 415, 137 + xy: 544, 193 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 block-middle rotate: false - xy: 273, 1 + xy: 365, 127 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 pump-liquid rotate: false - xy: 273, 1 + xy: 365, 127 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 conduit-liquid rotate: false - xy: 680, 299 + xy: 571, 230 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 cross-1 rotate: false - xy: 634, 263 + xy: 687, 337 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -811,35 +811,42 @@ cross-2 index: -1 cross-3 rotate: false - xy: 797, 453 + xy: 823, 453 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 +cross-4 + rotate: false + xy: 1, 8 + size: 32, 32 + orig: 32, 32 + offset: 0, 0 + index: -1 enemyspawn rotate: false - xy: 278, 75 + xy: 650, 275 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 playerspawn rotate: false - xy: 1007, 433 + xy: 826, 407 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ripples rotate: false - xy: 481, 128 + xy: 283, 103 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 shadow rotate: false - xy: 493, 128 + xy: 295, 105 size: 10, 10 orig: 10, 10 offset: 0, 0 @@ -853,39 +860,39 @@ battery index: -1 batterylarge rotate: false - xy: 372, 169 + xy: 398, 169 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 -coalgenerator - rotate: false - xy: 660, 299 - size: 8, 8 - orig: 8, 8 - offset: 0, 0 - index: -1 -coalgenerator-top - rotate: false - xy: 670, 299 - size: 8, 8 - orig: 8, 8 - offset: 0, 0 - index: -1 combustiongenerator rotate: false - xy: 650, 289 + xy: 249, 1 + size: 8, 8 + orig: 8, 8 + offset: 0, 0 + index: -1 +combustiongenerator-top + rotate: false + xy: 259, 1 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 largesolarpanel rotate: false - xy: 849, 453 + xy: 875, 453 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 +liquidcombustiongenerator + rotate: false + xy: 786, 377 + size: 8, 8 + orig: 8, 8 + offset: 0, 0 + index: -1 nuclearreactor rotate: false xy: 651, 327 @@ -909,56 +916,63 @@ nuclearreactor-lights index: -1 powerinfinite rotate: false - xy: 776, 423 + xy: 796, 367 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 powernode rotate: false - xy: 766, 403 + xy: 806, 377 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 +powernodelarge + rotate: false + xy: 242, 59 + size: 16, 16 + orig: 16, 16 + offset: 0, 0 + index: -1 powervoid rotate: false - xy: 776, 413 + xy: 816, 387 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 rtgenerator rotate: false - xy: 776, 383 + xy: 816, 367 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 rtgenerator-top rotate: false - xy: 786, 393 + xy: 826, 377 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 shieldgenerator rotate: false - xy: 786, 373 + xy: 866, 407 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 shieldprojector rotate: false - xy: 224, 59 + xy: 170, 50 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 solarpanel rotate: false - xy: 836, 403 + xy: 896, 417 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -972,7 +986,7 @@ teleporter index: -1 thermalgenerator rotate: false - xy: 876, 413 + xy: 906, 397 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -1084,91 +1098,91 @@ cultivator-top index: -1 extractor rotate: false - xy: 278, 65 + xy: 660, 275 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 fluxpump rotate: false - xy: 767, 443 + xy: 670, 275 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 irondrill rotate: false - xy: 927, 443 + xy: 278, 73 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 irondrill-rotator rotate: false - xy: 937, 443 + xy: 278, 63 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 titaniumdrill-rotator rotate: false - xy: 937, 443 + xy: 278, 63 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 irondrill-top rotate: false - xy: 947, 443 + xy: 776, 427 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 itemsource rotate: false - xy: 837, 433 + xy: 816, 427 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 itemvoid rotate: false - xy: 847, 433 + xy: 776, 377 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 laserdrill rotate: false - xy: 616, 248 + xy: 170, 86 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 laserdrill-rotator rotate: false - xy: 669, 309 + xy: 188, 86 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 laserdrill-top rotate: false - xy: 152, 86 + xy: 206, 86 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 lavasmelter rotate: false - xy: 877, 433 + xy: 806, 407 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 melter rotate: false - xy: 967, 433 + xy: 786, 367 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -1231,245 +1245,245 @@ oilextractor-top index: -1 oilrefinery rotate: false - xy: 997, 433 + xy: 816, 397 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 plasmadrill rotate: false - xy: 1, 8 + xy: 35, 8 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 plasmadrill-rim rotate: false - xy: 35, 8 + xy: 763, 453 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 plasmadrill-rotator rotate: false - xy: 763, 453 + xy: 806, 479 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 plasmadrill-top rotate: false - xy: 806, 479 + xy: 840, 479 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 plasticformer rotate: false - xy: 170, 68 + xy: 224, 77 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 plasticformer-top rotate: false - xy: 188, 68 + xy: 242, 77 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 poweralloysmelter rotate: false - xy: 206, 68 + xy: 260, 77 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 poweralloysmelter-top rotate: false - xy: 224, 77 + xy: 224, 59 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 powersmelter rotate: false - xy: 242, 77 + xy: 260, 59 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 powersmelter-top rotate: false - xy: 260, 77 + xy: 152, 50 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 siliconsmelter-top rotate: false - xy: 260, 77 + xy: 152, 50 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 pulverizer rotate: false - xy: 776, 403 + xy: 846, 417 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 pulverizer-rotator rotate: false - xy: 786, 413 + xy: 856, 427 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 pump rotate: false - xy: 796, 423 + xy: 806, 367 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 reinforceddrill rotate: false - xy: 766, 383 + xy: 816, 377 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 reinforceddrill-rotator rotate: false - xy: 776, 393 + xy: 826, 387 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 reinforceddrill-top rotate: false - xy: 786, 403 + xy: 836, 397 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 separator rotate: false - xy: 806, 403 + xy: 836, 377 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 separator-liquid rotate: false - xy: 816, 413 + xy: 846, 387 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 siliconextractor rotate: false - xy: 806, 383 + xy: 876, 407 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 siliconsmelter rotate: false - xy: 242, 59 + xy: 188, 50 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 smelter rotate: false - xy: 816, 393 + xy: 886, 417 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 steeldrill rotate: false - xy: 846, 403 + xy: 896, 407 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 steeldrill-rotator rotate: false - xy: 856, 413 + xy: 906, 417 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 steeldrill-top rotate: false - xy: 866, 423 + xy: 916, 427 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 stonedrill rotate: false - xy: 846, 383 + xy: 876, 367 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 stoneformer rotate: false - xy: 856, 393 + xy: 886, 377 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 titaniumdrill rotate: false - xy: 896, 423 + xy: 916, 397 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 titaniumdrill-top rotate: false - xy: 856, 373 + xy: 926, 407 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 waterextractor rotate: false - xy: 170, 50 + xy: 141, 12 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 waterextractor-liquid rotate: false - xy: 188, 50 + xy: 159, 32 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 waterextractor-rotator rotate: false - xy: 206, 50 + xy: 159, 14 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 waterextractor-top rotate: false - xy: 141, 30 + xy: 177, 32 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 block-1 rotate: false - xy: 263, 1 + xy: 351, 115 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -1490,14 +1504,14 @@ block-2-top index: -1 block-3 rotate: false - xy: 398, 169 + xy: 424, 170 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 block-3-top rotate: false - xy: 424, 170 + xy: 466, 196 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -1511,7 +1525,7 @@ chainturret index: -1 doubleturret rotate: false - xy: 697, 337 + xy: 766, 382 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -1525,77 +1539,77 @@ flakturret index: -1 flameturret rotate: false - xy: 1012, 489 + xy: 512, 167 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 fornaxcannon rotate: false - xy: 823, 453 + xy: 849, 453 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 gatlingturret rotate: false - xy: 1012, 477 + xy: 524, 167 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 laserturret rotate: false - xy: 445, 128 + xy: 329, 117 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 magmaturret rotate: false - xy: 170, 86 + xy: 152, 68 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 megarepairturret rotate: false - xy: 188, 86 + xy: 170, 68 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 missileturret rotate: false - xy: 206, 86 + xy: 188, 68 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 railgunturret rotate: false - xy: 457, 128 + xy: 341, 125 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 repairturret rotate: false - xy: 469, 128 + xy: 353, 125 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 shotgunturret rotate: false - xy: 638, 304 + xy: 307, 105 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 teslaturret rotate: false - xy: 638, 292 + xy: 319, 105 size: 10, 10 orig: 10, 10 offset: 0, 0 @@ -1651,14 +1665,14 @@ walkerfactory-top-open index: -1 compositewall rotate: false - xy: 660, 289 + xy: 269, 1 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 door rotate: false - xy: 687, 337 + xy: 766, 402 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -1679,14 +1693,14 @@ door-large-open index: -1 door-open rotate: false - xy: 697, 347 + xy: 766, 392 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 duriumwall rotate: false - xy: 278, 85 + xy: 766, 372 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -1700,49 +1714,49 @@ duriumwall-large index: -1 ironwall rotate: false - xy: 957, 443 + xy: 776, 417 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 steelwall rotate: false - xy: 826, 373 + xy: 866, 367 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 steelwall-large rotate: false - xy: 260, 59 + xy: 206, 50 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 stonewall rotate: false - xy: 866, 403 + xy: 896, 387 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 titaniumshieldwall rotate: false - xy: 866, 383 + xy: 936, 417 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 titaniumwall rotate: false - xy: 876, 393 + xy: 946, 427 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 titaniumwall-large rotate: false - xy: 152, 50 + xy: 141, 30 size: 16, 16 orig: 16, 16 offset: 0, 0 @@ -1756,28 +1770,28 @@ blank index: -1 bullet rotate: false - xy: 283, 1 + xy: 283, 93 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 chainbullet rotate: false - xy: 638, 283 + xy: 502, 170 size: 8, 7 orig: 8, 7 offset: 0, 0 index: -1 enemyarrow rotate: false - xy: 634, 244 + xy: 766, 363 size: 8, 7 orig: 8, 7 offset: 0, 0 index: -1 laser rotate: false - xy: 590, 244 + xy: 1020, 499 size: 1, 12 orig: 1, 12 offset: 0, 0 @@ -1798,126 +1812,126 @@ laserfull index: -1 shell rotate: false - xy: 826, 423 + xy: 856, 397 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 shot rotate: false - xy: 816, 403 + xy: 836, 367 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 shot-long rotate: false - xy: 826, 413 + xy: 846, 377 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 titanshell rotate: false - xy: 886, 403 + xy: 896, 367 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 item-biomatter rotate: false - xy: 967, 443 + xy: 786, 427 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 item-coal rotate: false - xy: 977, 443 + xy: 776, 407 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 item-densealloy rotate: false - xy: 987, 443 + xy: 786, 417 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 item-iron rotate: false - xy: 997, 443 + xy: 796, 427 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 item-lead rotate: false - xy: 1007, 443 + xy: 776, 397 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 item-plastic rotate: false - xy: 767, 433 + xy: 786, 407 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 item-sand rotate: false - xy: 777, 433 + xy: 796, 417 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 item-silicon rotate: false - xy: 787, 433 + xy: 806, 427 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 item-steel rotate: false - xy: 797, 433 + xy: 776, 387 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 item-stone rotate: false - xy: 807, 433 + xy: 786, 397 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 item-thorium rotate: false - xy: 817, 433 + xy: 796, 407 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 item-titanium rotate: false - xy: 827, 433 + xy: 806, 417 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 standard-mech rotate: false - xy: 373, 137 + xy: 516, 179 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 standard-ship rotate: false - xy: 387, 137 + xy: 530, 193 size: 12, 12 orig: 12, 12 offset: 0, 0 @@ -1974,7 +1988,7 @@ border index: -1 button rotate: false - xy: 986, 471 + xy: 680, 383 size: 24, 40 split: 10, 10, 6, 10 orig: 24, 40 @@ -1998,7 +2012,7 @@ button-over index: -1 button-map rotate: false - xy: 960, 471 + xy: 994, 471 size: 24, 40 split: 10, 10, 5, 10 orig: 24, 40 @@ -2022,7 +2036,7 @@ button-map-over index: -1 button-select rotate: false - xy: 466, 196 + xy: 450, 170 size: 24, 24 split: 4, 4, 4, 4 orig: 24, 24 @@ -2030,35 +2044,35 @@ button-select index: -1 check-off rotate: false - xy: 840, 479 + xy: 874, 479 size: 28, 32 orig: 28, 32 offset: 0, 0 index: -1 check-on rotate: false - xy: 870, 479 + xy: 904, 479 size: 28, 32 orig: 28, 32 offset: 0, 0 index: -1 check-on-over rotate: false - xy: 900, 479 + xy: 934, 479 size: 28, 32 orig: 28, 32 offset: 0, 0 index: -1 check-over rotate: false - xy: 930, 479 + xy: 964, 479 size: 28, 32 orig: 28, 32 offset: 0, 0 index: -1 clear rotate: false - xy: 1012, 501 + xy: 544, 181 size: 10, 10 orig: 10, 10 offset: 0, 0 @@ -2107,7 +2121,7 @@ icon-add index: -1 icon-admin rotate: false - xy: 159, 34 + xy: 195, 34 size: 14, 14 orig: 14, 14 offset: 0, 0 @@ -2121,42 +2135,42 @@ icon-admin-small index: -1 icon-areaDelete rotate: false - xy: 429, 140 + xy: 159, 2 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-arrow rotate: false - xy: 159, 18 + xy: 195, 18 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-arrow-down rotate: false - xy: 441, 140 + xy: 171, 2 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-arrow-left rotate: false - xy: 453, 140 + xy: 183, 2 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-arrow-right rotate: false - xy: 465, 140 + xy: 195, 6 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-arrow-up rotate: false - xy: 477, 140 + xy: 207, 6 size: 10, 10 orig: 10, 10 offset: 0, 0 @@ -2170,28 +2184,28 @@ icon-back index: -1 icon-ban rotate: false - xy: 175, 34 + xy: 211, 34 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-cancel rotate: false - xy: 175, 18 + xy: 211, 18 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-chat rotate: false - xy: 489, 140 + xy: 536, 167 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-check rotate: false - xy: 191, 34 + xy: 734, 378 size: 14, 14 orig: 14, 14 offset: 0, 0 @@ -2219,77 +2233,77 @@ icon-close-over index: -1 icon-crafting rotate: false - xy: 502, 195 + xy: 638, 304 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-cursor rotate: false - xy: 502, 183 + xy: 638, 292 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-defense rotate: false - xy: 514, 195 + xy: 650, 297 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-dev-builds rotate: false - xy: 191, 18 + xy: 734, 362 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-discord rotate: false - xy: 207, 34 + xy: 293, 141 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-distribution rotate: false - xy: 502, 171 + xy: 662, 297 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-donate rotate: false - xy: 207, 18 + xy: 309, 141 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-dots rotate: false - xy: 224, 43 + xy: 325, 141 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-editor rotate: false - xy: 240, 43 + xy: 750, 414 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-exit rotate: false - xy: 256, 43 + xy: 750, 398 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-file-text rotate: false - xy: 223, 27 + xy: 750, 382 size: 14, 14 orig: 14, 14 offset: 0, 0 @@ -2303,413 +2317,413 @@ icon-fill index: -1 icon-floppy rotate: false - xy: 239, 27 + xy: 750, 366 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-folder rotate: false - xy: 255, 27 + xy: 227, 43 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-folder-parent rotate: false - xy: 223, 11 + xy: 227, 27 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-github rotate: false - xy: 239, 11 + xy: 243, 43 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-google-play rotate: false - xy: 255, 11 + xy: 243, 27 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-grid rotate: false - xy: 372, 151 + xy: 398, 151 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-hold rotate: false - xy: 514, 183 + xy: 674, 297 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-holdDelete rotate: false - xy: 526, 195 + xy: 638, 280 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-home rotate: false - xy: 750, 414 + xy: 259, 43 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-host rotate: false - xy: 750, 398 + xy: 259, 27 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-info rotate: false - xy: 514, 171 + xy: 650, 285 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-itch.io rotate: false - xy: 734, 378 + xy: 227, 11 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-line rotate: false - xy: 390, 151 + xy: 651, 309 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-link rotate: false - xy: 750, 382 + xy: 243, 11 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-liquid rotate: false - xy: 526, 183 + xy: 662, 285 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-load rotate: false - xy: 734, 362 + xy: 259, 11 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-load-image rotate: false - xy: 408, 151 + xy: 229, 95 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-load-map rotate: false - xy: 426, 152 + xy: 247, 95 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-loading rotate: false - xy: 444, 152 + xy: 265, 95 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-logic rotate: false - xy: 538, 195 + xy: 674, 285 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-menu rotate: false - xy: 526, 171 + xy: 634, 268 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-menu-large rotate: false - xy: 462, 152 + xy: 993, 453 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-none rotate: false - xy: 538, 183 + xy: 634, 256 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-pause rotate: false - xy: 550, 195 + xy: 634, 244 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-pencil rotate: false - xy: 480, 152 + xy: 993, 435 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-pencil-small rotate: false - xy: 750, 366 + xy: 341, 137 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-pick rotate: false - xy: 953, 453 + xy: 598, 248 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-play rotate: false - xy: 538, 171 + xy: 281, 127 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-play-2 rotate: false - xy: 293, 141 + xy: 357, 137 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-players rotate: false - xy: 550, 183 + xy: 281, 115 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-power rotate: false - xy: 550, 171 + xy: 293, 129 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-production rotate: false - xy: 373, 125 + xy: 293, 117 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-quit rotate: false - xy: 309, 141 + xy: 373, 142 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-redo rotate: false - xy: 971, 453 + xy: 616, 248 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-refresh rotate: false - xy: 325, 141 + xy: 757, 432 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-rename rotate: false - xy: 272, 43 + xy: 773, 437 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-resize rotate: false - xy: 989, 453 + xy: 416, 151 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-rotate rotate: false - xy: 271, 27 + xy: 789, 437 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-rotate-arrow rotate: false - xy: 271, 11 + xy: 805, 437 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-rotate-left rotate: false - xy: 159, 2 + xy: 821, 437 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-rotate-right rotate: false - xy: 175, 2 + xy: 837, 437 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-save rotate: false - xy: 191, 2 + xy: 853, 437 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-save-image rotate: false - xy: 1007, 453 + xy: 434, 152 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-save-map rotate: false - xy: 651, 309 + xy: 452, 152 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-settings rotate: false - xy: 385, 125 + xy: 305, 129 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-terrain rotate: false - xy: 229, 95 + xy: 470, 152 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-tools rotate: false - xy: 207, 2 + xy: 869, 437 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-touch rotate: false - xy: 397, 125 + xy: 305, 117 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-touchDelete rotate: false - xy: 409, 125 + xy: 317, 129 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-trash rotate: false - xy: 281, 123 + xy: 885, 437 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-trash-16 rotate: false - xy: 247, 95 + xy: 488, 152 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-trello rotate: false - xy: 297, 125 + xy: 901, 437 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-tutorial rotate: false - xy: 313, 125 + xy: 917, 437 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-undo rotate: false - xy: 265, 95 + xy: 669, 309 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-units rotate: false - xy: 421, 125 + xy: 329, 129 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-weapon rotate: false - xy: 433, 128 + xy: 317, 117 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-wiki rotate: false - xy: 329, 125 + xy: 933, 437 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-zoom rotate: false - xy: 598, 248 + xy: 152, 86 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-zoom-small rotate: false - xy: 341, 141 + xy: 949, 437 size: 14, 14 orig: 14, 14 offset: 0, 0 @@ -2739,7 +2753,7 @@ pane-button index: -1 scroll rotate: false - xy: 346, 158 + xy: 372, 158 size: 24, 35 split: 10, 10, 6, 5 orig: 24, 35 @@ -2764,7 +2778,7 @@ scroll-knob-horizontal index: -1 scroll-knob-vertical rotate: false - xy: 706, 385 + xy: 346, 153 size: 24, 40 split: 10, 10, 6, 10 orig: 24, 40 @@ -2772,7 +2786,7 @@ scroll-knob-vertical index: -1 scroll-knob-vertical-black rotate: false - xy: 680, 383 + xy: 706, 385 size: 24, 40 split: 10, 10, 6, 10 orig: 24, 40 @@ -2882,42 +2896,42 @@ window-empty index: -1 flier rotate: false - xy: 357, 144 + xy: 1011, 457 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 scout rotate: false - xy: 329, 111 + xy: 979, 437 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 scout-base rotate: false - xy: 297, 97 + xy: 502, 193 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 standard-mech-base rotate: false - xy: 297, 97 + xy: 502, 193 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 scout-leg rotate: false - xy: 311, 97 + xy: 502, 179 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 standard-mech-leg rotate: false - xy: 311, 97 + xy: 502, 179 size: 12, 12 orig: 12, 12 offset: 0, 0 @@ -2938,70 +2952,70 @@ beam-equip index: -1 blaster rotate: false - xy: 243, 1 + xy: 331, 107 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blaster-equip rotate: false - xy: 253, 1 + xy: 341, 115 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 clustergun rotate: false - xy: 281, 113 + xy: 341, 105 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 clustergun-equip rotate: false - xy: 291, 113 + xy: 351, 105 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 shockgun rotate: false - xy: 796, 383 + xy: 876, 417 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 shockgun-equip rotate: false - xy: 806, 393 + xy: 886, 427 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 triblaster rotate: false - xy: 896, 413 + xy: 906, 377 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 triblaster-equip rotate: false - xy: 906, 423 + xy: 916, 387 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 vulcan rotate: false - xy: 886, 393 + xy: 946, 417 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 vulcan-equip rotate: false - xy: 896, 403 + xy: 906, 367 size: 8, 8 orig: 8, 8 offset: 0, 0 diff --git a/core/assets/sprites/sprites.png b/core/assets/sprites/sprites.png index 438db03d31..774088334d 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 9562894511..f939b800ca 100644 --- a/core/assets/version.properties +++ b/core/assets/version.properties @@ -1,7 +1,7 @@ #Autogenerated file. Do not modify. -#Sat Mar 31 15:29:43 EDT 2018 +#Sat Mar 31 17:19:49 EDT 2018 version=release -androidBuildCode=766 +androidBuildCode=773 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 fc520ad0c9..b49644c371 100644 --- a/core/src/io/anuke/mindustry/content/Recipes.java +++ b/core/src/io/anuke/mindustry/content/Recipes.java @@ -86,16 +86,17 @@ public class Recipes { new Recipe(production, ProductionBlocks.waterextractor, stack(Items.titanium, 40), stack(Items.densealloy, 40)), new Recipe(production, ProductionBlocks.oilextractor, stack(Items.titanium, 40), stack(Items.densealloy, 40)), - new Recipe(power, PowerBlocks.coalgenerator, stack(Items.iron, 30)), - new Recipe(power, PowerBlocks.thermalgenerator, stack(Items.steel, 30)), - new Recipe(power, PowerBlocks.combustiongenerator, stack(Items.iron, 30)), - 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.rtgenerator, stack(Items.titanium, 20), stack(Items.steel, 20)), - new Recipe(power, PowerBlocks.nuclearReactor, stack(Items.titanium, 40), stack(Items.densealloy, 40), stack(Items.steel, 50)), new Recipe(power, PowerBlocks.powernode, stack(Items.steel, 3), stack(Items.iron, 3)), + new Recipe(power, PowerBlocks.powernodelarge, stack(Items.steel, 3), stack(Items.iron, 3)), new Recipe(power, PowerBlocks.battery, stack(Items.steel, 5), stack(Items.iron, 5)), new Recipe(power, PowerBlocks.batteryLarge, stack(Items.steel, 5), stack(Items.iron, 5)), + new Recipe(power, PowerBlocks.combustiongenerator, stack(Items.iron, 30)), + new Recipe(power, PowerBlocks.liquidcombustiongenerator, stack(Items.iron, 30)), + new Recipe(power, PowerBlocks.thermalgenerator, stack(Items.steel, 30)), + new Recipe(power, PowerBlocks.rtgenerator, stack(Items.titanium, 20), stack(Items.steel, 20)), + 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.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 6f58e095f2..3548239f0d 100644 --- a/core/src/io/anuke/mindustry/content/blocks/PowerBlocks.java +++ b/core/src/io/anuke/mindustry/content/blocks/PowerBlocks.java @@ -10,8 +10,7 @@ import io.anuke.mindustry.world.blocks.types.power.*; public class PowerBlocks { public static final Block - coalgenerator = new BurnerGenerator("coalgenerator") {{ - //generateItem = Items.coal; + combustiongenerator = new BurnerGenerator("combustiongenerator") {{ powerOutput = 0.04f; powerCapacity = 40f; }}, @@ -23,17 +22,16 @@ public class PowerBlocks { generateEffect = BlockFx.redgeneratespark; }}, - combustiongenerator = new LiquidBurnerGenerator("combustiongenerator") {{ + liquidcombustiongenerator = new LiquidBurnerGenerator("liquidcombustiongenerator") {{ maxLiquidGenerate = 0.4f; powerPerLiquid = 0.12f; powerCapacity = 40f; }}, - rtgenerator = new BurnerGenerator("rtgenerator") {{ - //generateItem = Items.thorium; + rtgenerator = new DecayGenerator("rtgenerator") {{ powerCapacity = 40f; - powerOutput = 0.03f; - itemDuration = 240f; + powerOutput = 0.02f; + itemDuration = 500f; }}, solarpanel = new SolarGenerator("solarpanel") {{ @@ -72,14 +70,23 @@ public class PowerBlocks { battery = new PowerGenerator("battery") {{ powerCapacity = 320f; + hasInventory = false; }}, batteryLarge = new PowerGenerator("batterylarge") {{ size = 3; powerCapacity = 2000f; + hasInventory = false; }}, powernode = new PowerDistributor("powernode"), + powernodelarge = new PowerDistributor("powernodelarge"){{ + size = 2; + powerSpeed = 1f; + maxNodes = 5; + laserRange = 6.5f; + }}, + teleporter = new Teleporter("teleporter"); } diff --git a/core/src/io/anuke/mindustry/graphics/fx/Fx.java b/core/src/io/anuke/mindustry/graphics/fx/Fx.java index 9399b9505f..e8f00aaded 100644 --- a/core/src/io/anuke/mindustry/graphics/fx/Fx.java +++ b/core/src/io/anuke/mindustry/graphics/fx/Fx.java @@ -11,7 +11,6 @@ import static io.anuke.mindustry.Vars.respawnduration; import static io.anuke.mindustry.Vars.tilesize; public class Fx{ - public static Color lightRed = Hue.mix(Color.WHITE, Color.FIREBRICK, 0.1f); public static Color lightOrange = Color.valueOf("f68021"); public static Color lighterOrange = Color.valueOf("f6e096"); public static Color whiteOrange = Hue.mix(lightOrange, Color.WHITE, 0.6f); diff --git a/core/src/io/anuke/mindustry/resource/Item.java b/core/src/io/anuke/mindustry/resource/Item.java index 33c49a86fb..f499263118 100644 --- a/core/src/io/anuke/mindustry/resource/Item.java +++ b/core/src/io/anuke/mindustry/resource/Item.java @@ -17,6 +17,8 @@ public class Item implements Comparable{ public float explosiveness = 0f; /**flammability above 0.3 makes this eleigible for item burners.*/ public float flammability = 0f; + /**how radioactive this item is. 0=none, 1=ridiculous*/ + public float radioactivity; /**how effective this item is as flux for smelting. 0 = not a flux, 0.5 = normal flux, 1 = very good*/ public float fluxiness = 0f; /**whether this material goes in the core*/ diff --git a/core/src/io/anuke/mindustry/world/Edges.java b/core/src/io/anuke/mindustry/world/Edges.java index 928e894f8d..61575ba381 100644 --- a/core/src/io/anuke/mindustry/world/Edges.java +++ b/core/src/io/anuke/mindustry/world/Edges.java @@ -12,11 +12,11 @@ public class Edges { private static final int maxRadius = 12; private static GridPoint2[][] edges = new GridPoint2[maxSize][0]; private static GridPoint2[][] edgeInside = new GridPoint2[maxSize][0]; - private static Vector2[][] polygons = new Vector2[12][0]; + private static Vector2[][] polygons = new Vector2[maxRadius*2][0]; static{ - for(int i = 0; i < maxRadius; i ++){ - polygons[i] = Geometry.pixelCircle(i + 1); + for(int i = 0; i < maxRadius*2; i ++){ + polygons[i] = Geometry.pixelCircle((i + 1)/2f); } for(int i = 0; i < maxSize; i ++){ @@ -49,9 +49,9 @@ public class Edges { } } - public static Vector2[] getPixelPolygon(int radius){ + public static Vector2[] getPixelPolygon(float radius){ if(radius < 1 || radius > maxRadius) throw new RuntimeException("Polygon size must be between 1 and " + maxRadius); - return polygons[radius - 1]; + return polygons[(int)(radius*2) - 1]; } public static synchronized GridPoint2[] getEdges(int size){ diff --git a/core/src/io/anuke/mindustry/world/blocks/types/power/BurnerGenerator.java b/core/src/io/anuke/mindustry/world/blocks/types/power/BurnerGenerator.java index a380bde896..09f4c2f746 100644 --- a/core/src/io/anuke/mindustry/world/blocks/types/power/BurnerGenerator.java +++ b/core/src/io/anuke/mindustry/world/blocks/types/power/BurnerGenerator.java @@ -19,7 +19,7 @@ import java.io.DataOutputStream; import java.io.IOException; public class BurnerGenerator extends PowerGenerator { - protected float minFlammability = 0.2f; + protected float minEfficiency = 0.2f; protected float powerOutput; protected float itemDuration = 70f; protected Effect generateEffect = BlockFx.generatespark; @@ -61,7 +61,7 @@ public class BurnerGenerator extends PowerGenerator { @Override public boolean acceptItem(Item item, Tile tile, Tile source){ - return item.flammability >= minFlammability && tile.entity.inventory.totalItems() < itemCapacity; + return getItemEfficiency(item) >= minEfficiency && tile.entity.inventory.totalItems() < itemCapacity; } @Override @@ -82,7 +82,7 @@ public class BurnerGenerator extends PowerGenerator { for(int i = 0; i < entity.inventory.items.length; i ++){ if(entity.inventory.items[i] > 0){ entity.inventory.items[i] --; - entity.efficiency = Item.getByID(i).flammability; + entity.efficiency = getItemEfficiency(Item.getByID(i)); break; } } @@ -93,6 +93,10 @@ public class BurnerGenerator extends PowerGenerator { } + protected float getItemEfficiency(Item item){ + return item.flammability; + } + @Override public TileEntity getEntity() { return new BurnerEntity(); diff --git a/core/src/io/anuke/mindustry/world/blocks/types/power/DecayGenerator.java b/core/src/io/anuke/mindustry/world/blocks/types/power/DecayGenerator.java new file mode 100644 index 0000000000..36a538e300 --- /dev/null +++ b/core/src/io/anuke/mindustry/world/blocks/types/power/DecayGenerator.java @@ -0,0 +1,15 @@ +package io.anuke.mindustry.world.blocks.types.power; + +import io.anuke.mindustry.resource.Item; + +public class DecayGenerator extends BurnerGenerator { + + public DecayGenerator(String name) { + super(name); + } + + @Override + protected float getItemEfficiency(Item item) { + return item.radioactivity; + } +} 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 c139eeeb35..6911794aae 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 @@ -35,8 +35,9 @@ public class PowerDistributor extends PowerBlock{ protected Translator t1 = new Translator(); protected Translator t2 = new Translator(); - public int laserRange = 6; - public float powerSpeed = 0.5f; + protected float laserRange = 6; + protected float powerSpeed = 0.5f; + protected int maxNodes = 3; public PowerDistributor(String name){ super(name); @@ -79,12 +80,13 @@ public class PowerDistributor extends PowerBlock{ @Override public boolean onConfigureTileTapped(Tile tile, Tile other){ + DistributorEntity entity = tile.entity(); other = other.target(); if(linkValid(tile, other)){ if(linked(tile, other)){ unlink(tile, other); - }else{ + }else if(entity.links.size < maxNodes){ link(tile, other); } return false; @@ -106,6 +108,7 @@ public class PowerDistributor extends PowerBlock{ @Override public void drawConfigure(Tile tile){ + DistributorEntity entity = tile.entity(); Draw.color("accent"); @@ -119,13 +122,14 @@ public class PowerDistributor extends PowerBlock{ Draw.color("power"); - for(int x = tile.x - laserRange; x <= tile.x + laserRange; x ++){ - for(int y = tile.y - laserRange; y <= tile.y + laserRange; y ++){ + for(int x = (int)(tile.x - laserRange); x <= tile.x + laserRange; x ++){ + for(int y = (int)(tile.y - laserRange); y <= tile.y + laserRange; y ++){ Tile link = world.tile(x, y); if(link != null) link = link.target(); if(link != tile && linkValid(tile, link)){ - if(linked(tile, link)){ + boolean linked = linked(tile, link); + if(linked){ Draw.color("place"); }else{ Draw.color(Color.SCARLET); @@ -133,6 +137,11 @@ public class PowerDistributor extends PowerBlock{ Lines.square(link.drawx(), link.drawy(), link.block().size * tilesize / 2f + 1f + Mathf.absin(Timers.time(), 4f, 1f)); + + if(entity.links.size >= maxNodes && !linked){ + Draw.color(); + Draw.rect("cross-" + link.block().size, link.drawx(), link.drawy()); + } } } } @@ -229,7 +238,7 @@ public class PowerDistributor extends PowerBlock{ if(other.block() instanceof PowerDistributor){ DistributorEntity oe = other.entity(); - if(!oe.links.contains(tile.packedPosition())){ + if(!oe.links.contains(tile.packedPosition()) ){ oe.links.add(tile.packedPosition()); } } @@ -255,10 +264,13 @@ public class PowerDistributor extends PowerBlock{ if(!(tile != link && link != null && link.block().hasPower)) return false; if(link.block() instanceof PowerDistributor){ - return Vector2.dst(tile.worldx(), tile.worldy(), link.worldx(), link.worldy()) <= Math.max(laserRange * tilesize, - ((PowerDistributor)link.block()).laserRange * tilesize) - tilesize/2f; + 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 && + oe.links.size < ((PowerDistributor)link.block()).maxNodes; }else{ - return Vector2.dst(tile.worldx(), tile.worldy(), link.worldx(), link.worldy()) + return Vector2.dst(tile.drawx(), tile.drawy(), link.worldx(), link.worldy()) <= laserRange * tilesize - tilesize/2f + (link.block().size-1)*tilesize; } }