diff --git a/core/assets-raw/sprites/blocks/turrets/teslaturret-heat.png b/core/assets-raw/sprites/blocks/turrets/teslaturret-heat.png new file mode 100644 index 0000000000..dd8046dac7 Binary files /dev/null and b/core/assets-raw/sprites/blocks/turrets/teslaturret-heat.png differ diff --git a/core/assets/sprites/sprites.atlas b/core/assets/sprites/sprites.atlas index f5a9dd9db9..df9ad0a619 100644 --- a/core/assets/sprites/sprites.atlas +++ b/core/assets/sprites/sprites.atlas @@ -13,42 +13,42 @@ background index: -1 conduit-bottom rotate: false - xy: 937, 417 + xy: 947, 417 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 conduit-top rotate: false - xy: 957, 417 + xy: 967, 417 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 conduittunnel rotate: false - xy: 967, 417 + xy: 233, 34 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 conveyor rotate: false - xy: 233, 34 + xy: 777, 407 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 conveyormove rotate: false - xy: 777, 407 + xy: 787, 407 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 conveyortunnel rotate: false - xy: 787, 407 + xy: 797, 407 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -62,42 +62,42 @@ core index: -1 junction rotate: false - xy: 1013, 411 + xy: 155, 18 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 liquidjunction rotate: false - xy: 363, 113 + xy: 373, 114 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 liquidrouter rotate: false - xy: 373, 114 + xy: 383, 114 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 liquidrouter-bottom rotate: false - xy: 383, 114 + xy: 393, 113 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 liquidrouter-liquid rotate: false - xy: 393, 113 + xy: 403, 113 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 liquidrouter-top rotate: false - xy: 403, 113 + xy: 413, 113 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -132,70 +132,70 @@ multiplexer index: -1 poweredconveyor rotate: false - xy: 756, 384 + xy: 766, 384 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 poweredconveyormove rotate: false - xy: 766, 384 + xy: 776, 387 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 pulseconduit-bottom rotate: false - xy: 806, 387 + xy: 816, 387 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 pulseconduit-top rotate: false - xy: 816, 387 + xy: 826, 387 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 router rotate: false - xy: 906, 387 + xy: 916, 387 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 sortedunloader rotate: false - xy: 483, 144 + xy: 453, 114 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 sorter rotate: false - xy: 453, 114 + xy: 463, 124 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 splitter rotate: false - xy: 463, 124 + xy: 473, 134 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 steelconveyor rotate: false - xy: 473, 134 + xy: 493, 144 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 steelconveyormove rotate: false - xy: 493, 144 + xy: 463, 114 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -209,7 +209,7 @@ teleporter-top index: -1 unloader rotate: false - xy: 563, 143 + xy: 553, 123 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -223,7 +223,7 @@ vault index: -1 vault-icon rotate: false - xy: 553, 123 + xy: 563, 133 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -237,56 +237,56 @@ weaponfactory index: -1 blackrock1 rotate: false - xy: 713, 325 + xy: 713, 315 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blackrockshadow1 rotate: false - xy: 713, 315 + xy: 713, 305 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blackstone1 rotate: false - xy: 713, 305 + xy: 713, 295 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blackstone2 rotate: false - xy: 713, 295 + xy: 777, 417 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blackstone3 rotate: false - xy: 777, 417 + xy: 787, 417 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blackstoneblock1 rotate: false - xy: 787, 417 + xy: 797, 417 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blackstoneblock2 rotate: false - xy: 797, 417 + xy: 807, 417 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blackstoneblock3 rotate: false - xy: 807, 417 + xy: 817, 417 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -300,49 +300,49 @@ blackstoneedge index: -1 coal1 rotate: false - xy: 877, 417 + xy: 887, 417 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 coal2 rotate: false - xy: 887, 417 + xy: 897, 417 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 coal3 rotate: false - xy: 897, 417 + xy: 907, 417 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 deepwater rotate: false - xy: 807, 407 + xy: 817, 407 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 dirt1 rotate: false - xy: 817, 407 + xy: 827, 407 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 dirt2 rotate: false - xy: 827, 407 + xy: 837, 407 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 dirt3 rotate: false - xy: 837, 407 + xy: 847, 407 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -356,35 +356,35 @@ dirtedge index: -1 grass1 rotate: false - xy: 917, 407 + xy: 927, 407 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 grass2 rotate: false - xy: 927, 407 + xy: 937, 407 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 grass3 rotate: false - xy: 937, 407 + xy: 947, 407 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 grassblock1 rotate: false - xy: 947, 407 + xy: 957, 407 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 grassblock2 rotate: false - xy: 957, 407 + xy: 967, 407 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -398,21 +398,21 @@ grassedge index: -1 ice1 rotate: false - xy: 967, 407 + xy: 716, 389 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ice2 rotate: false - xy: 716, 389 + xy: 726, 390 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ice3 rotate: false - xy: 726, 390 + xy: 736, 390 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -426,70 +426,70 @@ iceedge index: -1 icerock1 rotate: false - xy: 736, 390 + xy: 746, 390 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 icerock2 rotate: false - xy: 746, 390 + xy: 756, 394 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 icerockshadow1 rotate: false - xy: 756, 394 + xy: 766, 394 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 rockshadow1 rotate: false - xy: 756, 394 + xy: 766, 394 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 icerockshadow2 rotate: false - xy: 766, 394 + xy: 776, 397 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 rockshadow2 rotate: false - xy: 766, 394 + xy: 776, 397 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 iron1 rotate: false - xy: 776, 397 + xy: 786, 397 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 iron2 rotate: false - xy: 786, 397 + xy: 796, 397 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 iron3 rotate: false - xy: 796, 397 + xy: 806, 397 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 lava rotate: false - xy: 155, 18 + xy: 165, 18 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -503,35 +503,35 @@ lavaedge index: -1 lead1 rotate: false - xy: 175, 18 + xy: 185, 18 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 lead2 rotate: false - xy: 185, 18 + xy: 195, 18 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 lead3 rotate: false - xy: 195, 18 + xy: 205, 18 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 mossblock rotate: false - xy: 687, 281 + xy: 697, 281 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 oil rotate: false - xy: 697, 281 + xy: 707, 281 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -545,56 +545,56 @@ oiledge index: -1 rock1 rotate: false - xy: 886, 387 + xy: 896, 387 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 rock2 rotate: false - xy: 896, 387 + xy: 906, 387 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 sand1 rotate: false - xy: 936, 387 + xy: 946, 387 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 sand2 rotate: false - xy: 946, 387 + xy: 956, 387 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 sand3 rotate: false - xy: 956, 387 + xy: 966, 387 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 sandblock1 rotate: false - xy: 966, 387 + xy: 215, 18 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 sandblock2 rotate: false - xy: 215, 18 + xy: 423, 143 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 sandblock3 rotate: false - xy: 423, 143 + xy: 423, 133 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -608,56 +608,56 @@ sandedge index: -1 shrub rotate: false - xy: 453, 144 + xy: 433, 124 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 shrubshadow rotate: false - xy: 433, 124 + xy: 443, 134 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 snow1 rotate: false - xy: 433, 114 + xy: 443, 124 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 snow2 rotate: false - xy: 443, 124 + xy: 453, 134 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 snow3 rotate: false - xy: 453, 134 + xy: 473, 144 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 snowblock1 rotate: false - xy: 473, 144 + xy: 443, 114 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 snowblock2 rotate: false - xy: 443, 114 + xy: 453, 124 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 snowblock3 rotate: false - xy: 453, 124 + xy: 463, 134 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -671,42 +671,42 @@ snowedge index: -1 stone1 rotate: false - xy: 483, 124 + xy: 493, 134 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 stone2 rotate: false - xy: 493, 134 + xy: 483, 114 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 stone3 rotate: false - xy: 483, 114 + xy: 493, 124 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 stoneblock1 rotate: false - xy: 493, 124 + xy: 493, 114 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 stoneblock2 rotate: false - xy: 493, 114 + xy: 503, 143 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 stoneblock3 rotate: false - xy: 503, 143 + xy: 503, 133 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -720,49 +720,49 @@ stoneedge index: -1 thorium1 rotate: false - xy: 523, 143 + xy: 513, 123 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 thorium2 rotate: false - xy: 513, 123 + xy: 523, 133 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 thorium3 rotate: false - xy: 523, 133 + xy: 533, 143 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 titanium1 rotate: false - xy: 533, 143 + xy: 523, 123 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 titanium2 rotate: false - xy: 523, 123 + xy: 533, 133 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 titanium3 rotate: false - xy: 533, 133 + xy: 543, 143 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 water rotate: false - xy: 503, 113 + xy: 513, 113 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -776,28 +776,28 @@ wateredge index: -1 block-middle rotate: false - xy: 847, 417 + xy: 857, 417 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 pump-liquid rotate: false - xy: 847, 417 + xy: 857, 417 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 conduit-liquid rotate: false - xy: 947, 417 + xy: 957, 417 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 cross-1 rotate: false - xy: 797, 407 + xy: 807, 407 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -825,14 +825,14 @@ cross-4 index: -1 enemyspawn rotate: false - xy: 887, 407 + xy: 897, 407 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 playerspawn rotate: false - xy: 233, 24 + xy: 756, 384 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -867,14 +867,14 @@ batterylarge index: -1 combustiongenerator rotate: false - xy: 907, 417 + xy: 917, 417 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 combustiongenerator-top rotate: false - xy: 917, 417 + xy: 927, 417 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -944,7 +944,7 @@ largesolarpanel index: -1 liquidcombustiongenerator rotate: false - xy: 205, 18 + xy: 363, 113 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -972,14 +972,14 @@ nuclearreactor-lights index: -1 powerinfinite rotate: false - xy: 776, 387 + xy: 786, 387 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 powernode rotate: false - xy: 786, 387 + xy: 796, 387 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -993,28 +993,28 @@ powernodelarge index: -1 powervoid rotate: false - xy: 796, 387 + xy: 806, 387 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 rtgenerator rotate: false - xy: 916, 387 + xy: 926, 387 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 rtgenerator-top rotate: false - xy: 926, 387 + xy: 936, 387 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 shieldgenerator rotate: false - xy: 423, 113 + xy: 433, 144 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -1028,7 +1028,7 @@ shieldprojector index: -1 solarpanel rotate: false - xy: 463, 134 + xy: 483, 144 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -1042,7 +1042,7 @@ teleporter index: -1 thermalgenerator rotate: false - xy: 513, 133 + xy: 523, 143 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -1154,56 +1154,56 @@ cultivator-top index: -1 extractor rotate: false - xy: 897, 407 + xy: 907, 407 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 fluxpump rotate: false - xy: 907, 407 + xy: 917, 407 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 irondrill rotate: false - xy: 806, 397 + xy: 816, 397 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 irondrill-rotator rotate: false - xy: 816, 397 + xy: 826, 397 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 titaniumdrill-rotator rotate: false - xy: 816, 397 + xy: 826, 397 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 irondrill-top rotate: false - xy: 826, 397 + xy: 836, 397 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 itemsource rotate: false - xy: 966, 397 + xy: 1003, 411 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 itemvoid rotate: false - xy: 1003, 411 + xy: 1013, 411 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -1231,21 +1231,21 @@ laserdrill-top index: -1 lavasmelter rotate: false - xy: 165, 18 + xy: 175, 18 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 liquidsource rotate: false - xy: 413, 113 + xy: 677, 281 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 melter rotate: false - xy: 677, 281 + xy: 687, 281 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -1308,7 +1308,7 @@ oilextractor-top index: -1 oilrefinery rotate: false - xy: 707, 281 + xy: 233, 24 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -1392,63 +1392,63 @@ siliconsmelter-top index: -1 pulverizer rotate: false - xy: 826, 387 + xy: 836, 387 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 pulverizer-rotator rotate: false - xy: 836, 387 + xy: 846, 387 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 pump rotate: false - xy: 846, 387 + xy: 856, 387 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 reinforceddrill rotate: false - xy: 856, 387 + xy: 866, 387 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 reinforceddrill-rotator rotate: false - xy: 866, 387 + xy: 876, 387 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 reinforceddrill-top rotate: false - xy: 876, 387 + xy: 886, 387 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 separator rotate: false - xy: 423, 133 + xy: 423, 123 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 separator-liquid rotate: false - xy: 423, 123 + xy: 423, 113 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 siliconextractor rotate: false - xy: 443, 134 + xy: 463, 144 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -1462,56 +1462,56 @@ siliconsmelter index: -1 smelter rotate: false - xy: 463, 144 + xy: 433, 114 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 steeldrill rotate: false - xy: 463, 114 + xy: 473, 124 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 steeldrill-rotator rotate: false - xy: 473, 124 + xy: 483, 134 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 steeldrill-top rotate: false - xy: 483, 134 + xy: 473, 114 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 stonedrill rotate: false - xy: 503, 133 + xy: 513, 143 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 stoneformer rotate: false - xy: 513, 143 + xy: 503, 123 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 titaniumdrill rotate: false - xy: 543, 143 + xy: 533, 123 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 titaniumdrill-top rotate: false - xy: 533, 123 + xy: 543, 133 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -1546,7 +1546,7 @@ waterextractor-top index: -1 block-1 rotate: false - xy: 837, 417 + xy: 847, 417 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -1588,7 +1588,7 @@ chainturret index: -1 doubleturret rotate: false - xy: 867, 407 + xy: 877, 407 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -1726,6 +1726,13 @@ teslaturret orig: 10, 10 offset: 0, 0 index: -1 +teslaturret-heat + rotate: false + xy: 656, 265 + size: 10, 10 + orig: 10, 10 + offset: 0, 0 + index: -1 titancannon rotate: false xy: 69, 13 @@ -1777,14 +1784,14 @@ walkerfactory-top-open index: -1 compositewall rotate: false - xy: 927, 417 + xy: 937, 417 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 door rotate: false - xy: 847, 407 + xy: 857, 407 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -1805,14 +1812,14 @@ door-large-open index: -1 door-open rotate: false - xy: 857, 407 + xy: 867, 407 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 duriumwall rotate: false - xy: 877, 407 + xy: 887, 407 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -1826,14 +1833,14 @@ duriumwall-large index: -1 ironwall rotate: false - xy: 836, 397 + xy: 846, 397 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 steelwall rotate: false - xy: 473, 114 + xy: 483, 124 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -1847,21 +1854,21 @@ steelwall-large index: -1 stonewall rotate: false - xy: 503, 123 + xy: 513, 133 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 titaniumshieldwall rotate: false - xy: 543, 133 + xy: 553, 143 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 titaniumwall rotate: false - xy: 553, 143 + xy: 543, 123 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -1945,91 +1952,91 @@ shell-back index: -1 shot rotate: false - xy: 433, 134 + xy: 453, 144 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 item-biomatter rotate: false - xy: 846, 397 + xy: 856, 397 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 item-coal rotate: false - xy: 856, 397 + xy: 866, 397 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 item-densealloy rotate: false - xy: 866, 397 + xy: 876, 397 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 item-iron rotate: false - xy: 876, 397 + xy: 886, 397 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 item-lead rotate: false - xy: 886, 397 + xy: 896, 397 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 item-plastic rotate: false - xy: 896, 397 + xy: 906, 397 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 item-sand rotate: false - xy: 906, 397 + xy: 916, 397 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 item-silicon rotate: false - xy: 916, 397 + xy: 926, 397 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 item-steel rotate: false - xy: 926, 397 + xy: 936, 397 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 item-stone rotate: false - xy: 936, 397 + xy: 946, 397 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 item-thorium rotate: false - xy: 946, 397 + xy: 956, 397 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 item-titanium rotate: false - xy: 956, 397 + xy: 966, 397 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -3057,84 +3064,84 @@ standard-mech-leg index: -1 beam rotate: false - xy: 656, 267 + xy: 713, 335 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 beam-equip rotate: false - xy: 713, 335 + xy: 713, 325 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blaster rotate: false - xy: 817, 417 + xy: 827, 417 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blaster-equip rotate: false - xy: 827, 417 + xy: 837, 417 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 clustergun rotate: false - xy: 857, 417 + xy: 867, 417 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 clustergun-equip rotate: false - xy: 867, 417 + xy: 877, 417 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 shockgun rotate: false - xy: 433, 144 + xy: 443, 144 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 shockgun-equip rotate: false - xy: 443, 144 + xy: 433, 134 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 triblaster rotate: false - xy: 543, 123 + xy: 553, 133 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 triblaster-equip rotate: false - xy: 553, 133 + xy: 563, 143 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 vulcan rotate: false - xy: 563, 133 + xy: 563, 123 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 vulcan-equip rotate: false - xy: 563, 123 + xy: 503, 113 size: 8, 8 orig: 8, 8 offset: 0, 0 diff --git a/core/assets/sprites/sprites.png b/core/assets/sprites/sprites.png index d063f192e8..189aa97ef6 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 32e2dfba6e..e036ee57f8 100644 --- a/core/assets/version.properties +++ b/core/assets/version.properties @@ -1,7 +1,7 @@ #Autogenerated file. Do not modify. -#Fri Apr 06 15:12:13 EDT 2018 +#Fri Apr 06 16:57:38 EDT 2018 version=release -androidBuildCode=856 +androidBuildCode=857 name=Mindustry code=3.4 build=custom build diff --git a/core/src/io/anuke/mindustry/content/blocks/WeaponBlocks.java b/core/src/io/anuke/mindustry/content/blocks/WeaponBlocks.java index 455bc84f68..2bfa26f922 100644 --- a/core/src/io/anuke/mindustry/content/blocks/WeaponBlocks.java +++ b/core/src/io/anuke/mindustry/content/blocks/WeaponBlocks.java @@ -115,7 +115,7 @@ public class WeaponBlocks{ chargeMaxDelay = 30f; chargeEffects = 7; shootEffect = ShootFx.lightningShoot; - chargeEffect = ShootFx.lancerLaserCharge; + chargeEffect = ShootFx.lightningCharge; chargeBeginEffect = ShootFx.lancerLaserChargeBegin; heatColor = Color.RED; recoil = 3f; diff --git a/core/src/io/anuke/mindustry/content/bullets/TurretBullets.java b/core/src/io/anuke/mindustry/content/bullets/TurretBullets.java index 8aed3074bf..e3a04adb2e 100644 --- a/core/src/io/anuke/mindustry/content/bullets/TurretBullets.java +++ b/core/src/io/anuke/mindustry/content/bullets/TurretBullets.java @@ -184,7 +184,7 @@ public class TurretBullets { @Override public void init(Bullet b) { - new Lightning(b.team, hiteffect, damage, b.x, b.y, b.angle(), 40).add(); + new Lightning(b.team, hiteffect, damage, b.x, b.y, b.angle(), 30).add(); } }; diff --git a/core/src/io/anuke/mindustry/content/fx/ShootFx.java b/core/src/io/anuke/mindustry/content/fx/ShootFx.java index a703a5f8b5..8d8f7b3ada 100644 --- a/core/src/io/anuke/mindustry/content/fx/ShootFx.java +++ b/core/src/io/anuke/mindustry/content/fx/ShootFx.java @@ -188,6 +188,16 @@ public class ShootFx { Fill.circle(e.x, e.y, e.fin() * 2f); }), + lightningCharge = new Effect(38f, e -> { + Draw.color(Palette.lancerLaser); + + Angles.randLenVectors(e.id, 2, 1f + 20f * e.fout(), e.rotation, 120f, (x, y) -> { + Shapes.tri(e.x + x, e.y + y, e.fslope()*3f + 1, e.fslope()*3f + 1, Mathf.atan2(x, y)); + }); + + Draw.reset(); + }), + lightningShoot= new Effect(12f, e -> { Draw.color(Color.WHITE, Palette.lancerLaser, e.fin()); Lines.stroke(e.fout() * 1.2f + 0.5f); diff --git a/core/src/io/anuke/mindustry/world/blocks/types/distribution/Teleporter.java b/core/src/io/anuke/mindustry/world/blocks/types/distribution/Teleporter.java index b813259270..bf1fa81878 100644 --- a/core/src/io/anuke/mindustry/world/blocks/types/distribution/Teleporter.java +++ b/core/src/io/anuke/mindustry/world/blocks/types/distribution/Teleporter.java @@ -3,16 +3,22 @@ package io.anuke.mindustry.world.blocks.types.distribution; import com.badlogic.gdx.graphics.Color; import com.badlogic.gdx.utils.Array; import com.badlogic.gdx.utils.ObjectSet; +import io.anuke.mindustry.content.fx.Fx; import io.anuke.mindustry.entities.TileEntity; import io.anuke.mindustry.net.Net; import io.anuke.mindustry.resource.Item; import io.anuke.mindustry.world.BarType; import io.anuke.mindustry.world.Tile; import io.anuke.mindustry.world.blocks.types.PowerBlock; +import io.anuke.ucore.core.Effects.Effect; +import io.anuke.ucore.core.Timers; import io.anuke.ucore.graphics.Draw; +import io.anuke.ucore.graphics.Fill; +import io.anuke.ucore.graphics.Lines; import io.anuke.ucore.scene.ui.ButtonGroup; import io.anuke.ucore.scene.ui.ImageButton; import io.anuke.ucore.scene.ui.layout.Table; +import io.anuke.ucore.util.Mathf; import io.anuke.ucore.util.Strings; import java.io.DataInputStream; @@ -33,6 +39,8 @@ public class Teleporter extends PowerBlock{ private Array returns = new Array<>(); protected float powerPerItem = 5f; + protected float warmupTime = 80f; + protected Effect teleportEffect = Fx.none; static{ for(int i = 0; i < colors; i ++){ @@ -84,9 +92,21 @@ public class Teleporter extends PowerBlock{ Draw.color(colorArray[entity.color]); Draw.rect("teleporter-top", tile.drawx(), tile.drawy()); - //Draw.color(Color.WHITE); - //Draw.alpha(0.45f + Mathf.absin(Timers.time(), 7f, 0.26f)); - //Draw.rect("teleporter-top", tile.worldx(), tile.worldy()); + Draw.reset(); + + Draw.color(Color.WHITE); + + Fill.circle(tile.drawx(), tile.drawy(), 7f); + + Draw.color(Color.PURPLE); + + for(int i = 0; i < 11; i ++){ + Lines.swirl(tile.drawx(), tile.drawy(), + 3f + i/3f + Mathf.sin(Timers.time() + i *93, 20f + i, 3f), + 0.2f + Mathf.sin(Timers.time() + i *33, 10f + i, 0.1f), + Timers.time() * (1f + Mathf.randomSeedRange(i + 1, 1f)) + Mathf.randomSeedRange(i, 360f)); + } + Draw.reset(); }