diff --git a/core/assets-raw/sprites/blocks/distribution/bridgeconduit-arrow.png b/core/assets-raw/sprites/blocks/distribution/bridgeconduit-arrow.png new file mode 100644 index 0000000000..3c2ab9921e Binary files /dev/null and b/core/assets-raw/sprites/blocks/distribution/bridgeconduit-arrow.png differ diff --git a/core/assets-raw/sprites/blocks/distribution/bridgeconduit-bridge.png b/core/assets-raw/sprites/blocks/distribution/bridgeconduit-bridge.png new file mode 100644 index 0000000000..fb5633fc6e Binary files /dev/null and b/core/assets-raw/sprites/blocks/distribution/bridgeconduit-bridge.png differ diff --git a/core/assets-raw/sprites/blocks/distribution/bridgeconduit-end.png b/core/assets-raw/sprites/blocks/distribution/bridgeconduit-end.png new file mode 100644 index 0000000000..2392bdb67b Binary files /dev/null and b/core/assets-raw/sprites/blocks/distribution/bridgeconduit-end.png differ diff --git a/core/assets-raw/sprites/blocks/distribution/bridgeconduit.png b/core/assets-raw/sprites/blocks/distribution/bridgeconduit.png index 60dd3b840c..f7cfdd55ad 100644 Binary files a/core/assets-raw/sprites/blocks/distribution/bridgeconduit.png and b/core/assets-raw/sprites/blocks/distribution/bridgeconduit.png differ diff --git a/core/assets-raw/sprites/blocks/distribution/laserconduit-bridge.png b/core/assets-raw/sprites/blocks/distribution/laserconduit-bridge.png index e6b4160901..ac872ea093 100644 Binary files a/core/assets-raw/sprites/blocks/distribution/laserconduit-bridge.png and b/core/assets-raw/sprites/blocks/distribution/laserconduit-bridge.png differ diff --git a/core/assets-raw/sprites/blocks/distribution/laserconduit-end.png b/core/assets-raw/sprites/blocks/distribution/laserconduit-end.png index 37167be42a..60719560ce 100644 Binary files a/core/assets-raw/sprites/blocks/distribution/laserconduit-end.png and b/core/assets-raw/sprites/blocks/distribution/laserconduit-end.png differ diff --git a/core/assets/sprites/sprites.atlas b/core/assets/sprites/sprites.atlas index 36784c6d49..c54c9a8900 100644 --- a/core/assets/sprites/sprites.atlas +++ b/core/assets/sprites/sprites.atlas @@ -18,76 +18,97 @@ bridgeconduit orig: 8, 8 offset: 0, 0 index: -1 -bridgeconveyor +bridgeconduit-arrow rotate: false xy: 633, 198 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 -bridgeconveyor-arrow +bridgeconduit-bridge rotate: false xy: 643, 198 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 -bridgeconveyor-bridge +bridgeconduit-end rotate: false xy: 592, 188 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 -bridgeconveyor-end +bridgeconveyor rotate: false xy: 592, 178 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 +bridgeconveyor-arrow + rotate: false + xy: 602, 188 + size: 8, 8 + orig: 8, 8 + offset: 0, 0 + index: -1 +bridgeconveyor-bridge + rotate: false + xy: 592, 168 + size: 8, 8 + orig: 8, 8 + offset: 0, 0 + index: -1 +bridgeconveyor-end + rotate: false + xy: 602, 178 + size: 8, 8 + orig: 8, 8 + offset: 0, 0 + index: -1 conduit-bottom - rotate: false - xy: 602, 158 - size: 8, 8 - orig: 8, 8 - offset: 0, 0 - index: -1 -conduit-top - rotate: false - xy: 622, 178 - size: 8, 8 - orig: 8, 8 - offset: 0, 0 - index: -1 -conduittunnel rotate: false xy: 632, 188 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 -conveyor - rotate: false - xy: 612, 158 - size: 8, 8 - orig: 8, 8 - offset: 0, 0 - index: -1 -conveyormove +conduit-top rotate: false xy: 622, 168 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 -conveyortunnel +conduittunnel rotate: false xy: 632, 178 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 +conveyor + rotate: false + xy: 642, 188 + size: 8, 8 + orig: 8, 8 + offset: 0, 0 + index: -1 +conveyormove + rotate: false + xy: 622, 158 + size: 8, 8 + orig: 8, 8 + offset: 0, 0 + index: -1 +conveyortunnel + rotate: false + xy: 632, 168 + size: 8, 8 + orig: 8, 8 + offset: 0, 0 + index: -1 core rotate: false xy: 875, 453 @@ -97,98 +118,98 @@ core index: -1 junction rotate: false - xy: 473, 134 + xy: 473, 124 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 laserconduit rotate: false - xy: 483, 144 + xy: 483, 134 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 laserconduit-arrow rotate: false - xy: 463, 114 + xy: 493, 144 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 laserconduit-bridge rotate: false - xy: 473, 124 + xy: 473, 114 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 laserconduit-end rotate: false - xy: 483, 134 + xy: 483, 124 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 laserconveyor rotate: false - xy: 493, 144 + xy: 493, 134 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 laserconveyor-arrow rotate: false - xy: 473, 114 + xy: 483, 114 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 laserconveyor-bridge rotate: false - xy: 483, 124 + xy: 493, 124 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 laserconveyor-end rotate: false - xy: 493, 134 + xy: 493, 114 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 liquidjunction rotate: false - xy: 503, 123 + xy: 513, 123 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 liquidrouter rotate: false - xy: 513, 133 + xy: 523, 133 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 liquidrouter-bottom rotate: false - xy: 523, 143 + xy: 533, 143 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 liquidrouter-liquid rotate: false - xy: 513, 123 + xy: 523, 123 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 liquidrouter-top rotate: false - xy: 523, 133 + xy: 533, 133 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -223,77 +244,77 @@ multiplexer index: -1 overflowgate rotate: false - xy: 563, 133 + xy: 513, 113 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 poweredconveyor rotate: false - xy: 503, 113 + xy: 533, 113 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 poweredconveyormove rotate: false - xy: 513, 113 + xy: 543, 113 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 pulseconduit-bottom rotate: false - xy: 553, 113 + xy: 573, 136 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 pulseconduit-top rotate: false - xy: 563, 113 + xy: 573, 126 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 router rotate: false - xy: 596, 148 + xy: 626, 148 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 sortedunloader rotate: false - xy: 786, 385 + xy: 806, 395 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 sorter rotate: false - xy: 796, 395 + xy: 806, 385 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 splitter rotate: false - xy: 806, 395 + xy: 816, 385 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 steelconveyor rotate: false - xy: 806, 385 + xy: 826, 395 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 steelconveyormove rotate: false - xy: 816, 395 + xy: 826, 385 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -307,7 +328,7 @@ teleporter-top index: -1 unloader rotate: false - xy: 947, 407 + xy: 977, 407 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -321,7 +342,7 @@ vault index: -1 vault-icon rotate: false - xy: 957, 407 + xy: 987, 407 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -398,49 +419,49 @@ blackstoneedge index: -1 coal1 rotate: false - xy: 602, 178 + xy: 602, 168 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 coal2 rotate: false - xy: 612, 188 + xy: 612, 178 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 coal3 rotate: false - xy: 592, 158 + xy: 622, 188 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 deepwater rotate: false - xy: 622, 158 + xy: 632, 158 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 dirt1 rotate: false - xy: 632, 168 + xy: 642, 168 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 dirt2 rotate: false - xy: 642, 178 + xy: 642, 158 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 dirt3 rotate: false - xy: 632, 158 + xy: 363, 113 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -454,35 +475,35 @@ dirtedge index: -1 grass1 rotate: false - xy: 413, 113 + xy: 677, 281 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 grass2 rotate: false - xy: 346, 59 + xy: 687, 281 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 grass3 rotate: false - xy: 356, 59 + xy: 697, 281 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 grassblock1 rotate: false - xy: 677, 281 + xy: 756, 384 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 grassblock2 rotate: false - xy: 687, 281 + xy: 766, 384 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -496,21 +517,21 @@ grassedge index: -1 ice1 rotate: false - xy: 697, 281 + xy: 653, 198 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ice2 rotate: false - xy: 756, 384 + xy: 652, 188 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ice3 rotate: false - xy: 766, 384 + xy: 652, 178 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -524,70 +545,70 @@ iceedge index: -1 icerock1 rotate: false - xy: 653, 198 + xy: 652, 168 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 icerock2 rotate: false - xy: 652, 188 + xy: 652, 158 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 icerockshadow1 rotate: false - xy: 652, 178 + xy: 366, 59 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 rockshadow1 rotate: false - xy: 652, 178 + xy: 366, 59 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 icerockshadow2 rotate: false - xy: 652, 168 + xy: 423, 143 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 rockshadow2 rotate: false - xy: 652, 168 + xy: 423, 143 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 iron1 rotate: false - xy: 366, 59 + xy: 423, 123 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 iron2 rotate: false - xy: 423, 143 + xy: 423, 113 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 iron3 rotate: false - xy: 423, 133 + xy: 433, 144 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 lava rotate: false - xy: 483, 114 + xy: 503, 143 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -601,63 +622,63 @@ lavaedge index: -1 lead1 rotate: false - xy: 493, 114 + xy: 513, 143 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 lead2 rotate: false - xy: 503, 143 + xy: 503, 123 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 lead3 rotate: false - xy: 503, 133 + xy: 513, 133 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 metalfloor1 rotate: false - xy: 533, 133 + xy: 543, 133 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 metalfloor2 rotate: false - xy: 543, 143 + xy: 553, 143 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 metalfloor3 rotate: false - xy: 533, 123 + xy: 543, 123 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 metalfloor4 rotate: false - xy: 543, 133 + xy: 553, 133 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 metalfloor5 rotate: false - xy: 553, 143 + xy: 563, 143 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 metalfloor6 rotate: false - xy: 543, 123 + xy: 553, 123 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -671,14 +692,14 @@ metalflooredge index: -1 mossblock rotate: false - xy: 553, 133 + xy: 563, 133 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 oil rotate: false - xy: 563, 143 + xy: 563, 123 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -692,56 +713,56 @@ oiledge index: -1 rock1 rotate: false - xy: 583, 126 + xy: 606, 148 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 rock2 rotate: false - xy: 583, 116 + xy: 616, 148 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 sand1 rotate: false - xy: 626, 148 + xy: 656, 148 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 sand2 rotate: false - xy: 636, 148 + xy: 777, 405 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 sand3 rotate: false - xy: 646, 148 + xy: 787, 405 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 sandblock1 rotate: false - xy: 656, 148 + xy: 797, 405 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 sandblock2 rotate: false - xy: 777, 405 + xy: 807, 405 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 sandblock3 rotate: false - xy: 787, 405 + xy: 817, 405 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -755,56 +776,56 @@ sandedge index: -1 shrub rotate: false - xy: 857, 405 + xy: 887, 405 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 shrubshadow rotate: false - xy: 867, 405 + xy: 897, 405 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 snow1 rotate: false - xy: 897, 405 + xy: 927, 405 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 snow2 rotate: false - xy: 907, 405 + xy: 776, 395 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 snow3 rotate: false - xy: 917, 405 + xy: 776, 385 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 snowblock1 rotate: false - xy: 927, 405 + xy: 786, 395 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 snowblock2 rotate: false - xy: 776, 395 + xy: 786, 385 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 snowblock3 rotate: false - xy: 776, 385 + xy: 796, 395 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -818,7 +839,7 @@ snowedge index: -1 space rotate: false - xy: 796, 385 + xy: 816, 395 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -832,42 +853,42 @@ spaceedge index: -1 stone1 rotate: false - xy: 836, 385 + xy: 856, 395 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 stone2 rotate: false - xy: 846, 395 + xy: 856, 385 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 stone3 rotate: false - xy: 846, 385 + xy: 866, 395 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 stoneblock1 rotate: false - xy: 856, 395 + xy: 866, 385 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 stoneblock2 rotate: false - xy: 856, 385 + xy: 876, 395 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 stoneblock3 rotate: false - xy: 866, 395 + xy: 876, 385 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -881,49 +902,49 @@ stoneedge index: -1 thorium1 rotate: false - xy: 886, 385 + xy: 906, 395 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 thorium2 rotate: false - xy: 896, 395 + xy: 906, 385 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 thorium3 rotate: false - xy: 896, 385 + xy: 916, 395 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 titanium1 rotate: false - xy: 906, 395 + xy: 916, 385 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 titanium2 rotate: false - xy: 906, 385 + xy: 926, 395 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 titanium3 rotate: false - xy: 916, 395 + xy: 926, 385 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 water rotate: false - xy: 987, 407 + xy: 593, 136 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -951,14 +972,14 @@ pump-liquid index: -1 conduit-liquid rotate: false - xy: 612, 168 + xy: 612, 158 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 cross-1 rotate: false - xy: 642, 188 + xy: 642, 178 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -986,14 +1007,14 @@ cross-4 index: -1 enemyspawn rotate: false - xy: 383, 114 + xy: 413, 113 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 playerspawn rotate: false - xy: 563, 123 + xy: 523, 113 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -1028,14 +1049,14 @@ batterylarge index: -1 combustiongenerator rotate: false - xy: 602, 168 + xy: 602, 158 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 combustiongenerator-top rotate: false - xy: 612, 178 + xy: 612, 168 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -1105,7 +1126,7 @@ largesolarpanel index: -1 liquidcombustiongenerator rotate: false - xy: 513, 143 + xy: 523, 143 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -1133,14 +1154,14 @@ nuclearreactor-lights index: -1 powerinfinite rotate: false - xy: 523, 113 + xy: 553, 113 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 powernode rotate: false - xy: 533, 113 + xy: 563, 113 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -1154,28 +1175,28 @@ powernodelarge index: -1 powervoid rotate: false - xy: 543, 113 + xy: 576, 146 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 rtgenerator rotate: false - xy: 606, 148 + xy: 636, 148 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 rtgenerator-top rotate: false - xy: 616, 148 + xy: 646, 148 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 shieldgenerator rotate: false - xy: 817, 405 + xy: 847, 405 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -1189,7 +1210,7 @@ shieldprojector index: -1 solarpanel rotate: false - xy: 786, 395 + xy: 796, 385 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -1210,7 +1231,7 @@ teleporter-top index: -1 thermalgenerator rotate: false - xy: 886, 395 + xy: 896, 385 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -1322,63 +1343,63 @@ cultivator-top index: -1 extractor rotate: false - xy: 393, 113 + xy: 346, 59 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 fluxpump rotate: false - xy: 403, 113 + xy: 356, 59 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 incinerator rotate: false - xy: 652, 158 + xy: 423, 133 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 irondrill rotate: false - xy: 423, 123 + xy: 433, 134 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 irondrill-rotator rotate: false - xy: 423, 113 + xy: 443, 144 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 titaniumdrill-rotator rotate: false - xy: 423, 113 + xy: 443, 144 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 irondrill-top rotate: false - xy: 433, 144 + xy: 433, 124 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 itemsource rotate: false - xy: 453, 114 + xy: 483, 144 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 itemvoid rotate: false - xy: 463, 124 + xy: 463, 114 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -1406,21 +1427,21 @@ laserdrill-top index: -1 lavasmelter rotate: false - xy: 493, 124 + xy: 503, 133 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 liquidsource rotate: false - xy: 533, 143 + xy: 543, 143 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 melter rotate: false - xy: 523, 123 + xy: 533, 123 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -1483,7 +1504,7 @@ oilextractor-top index: -1 oilrefinery rotate: false - xy: 553, 123 + xy: 503, 113 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -1567,63 +1588,63 @@ siliconsmelter-top index: -1 pulverizer rotate: false - xy: 576, 146 + xy: 573, 116 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 pulverizer-rotator rotate: false - xy: 573, 136 + xy: 586, 146 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 pump rotate: false - xy: 573, 126 + xy: 583, 136 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 reinforceddrill rotate: false - xy: 573, 116 + xy: 583, 126 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 reinforceddrill-rotator rotate: false - xy: 586, 146 + xy: 583, 116 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 reinforceddrill-top rotate: false - xy: 583, 136 + xy: 596, 148 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 separator rotate: false - xy: 797, 405 + xy: 827, 405 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 separator-liquid rotate: false - xy: 807, 405 + xy: 837, 405 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 siliconextractor rotate: false - xy: 877, 405 + xy: 907, 405 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -1637,56 +1658,56 @@ siliconsmelter index: -1 smelter rotate: false - xy: 887, 405 + xy: 917, 405 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 steeldrill rotate: false - xy: 816, 385 + xy: 836, 395 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 steeldrill-rotator rotate: false - xy: 826, 395 + xy: 836, 385 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 steeldrill-top rotate: false - xy: 826, 385 + xy: 846, 395 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 stonedrill rotate: false - xy: 866, 385 + xy: 886, 395 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 stoneformer rotate: false - xy: 876, 395 + xy: 886, 385 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 titaniumdrill rotate: false - xy: 916, 385 + xy: 937, 405 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 titaniumdrill-top rotate: false - xy: 926, 395 + xy: 936, 395 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -1763,7 +1784,7 @@ chainturret index: -1 doubleturret rotate: false - xy: 363, 113 + xy: 393, 113 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -1959,14 +1980,14 @@ walkerfactory-top-open index: -1 compositewall rotate: false - xy: 622, 188 + xy: 622, 178 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 door rotate: false - xy: 642, 168 + xy: 373, 114 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -1987,14 +2008,14 @@ door-large-open index: -1 door-open rotate: false - xy: 642, 158 + xy: 383, 114 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 duriumwall rotate: false - xy: 373, 114 + xy: 403, 113 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -2008,14 +2029,14 @@ duriumwall-large index: -1 ironwall rotate: false - xy: 433, 134 + xy: 443, 134 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 steelwall rotate: false - xy: 836, 395 + xy: 846, 385 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -2029,21 +2050,21 @@ steelwall-large index: -1 stonewall rotate: false - xy: 876, 385 + xy: 896, 395 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 titaniumshieldwall rotate: false - xy: 926, 385 + xy: 936, 385 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 titaniumwall rotate: false - xy: 937, 405 + xy: 947, 407 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -2127,91 +2148,91 @@ shell-back index: -1 shot rotate: false - xy: 847, 405 + xy: 877, 405 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 item-biomatter rotate: false - xy: 443, 144 + xy: 453, 144 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 item-coal rotate: false - xy: 433, 124 + xy: 433, 114 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 item-densealloy rotate: false - xy: 443, 134 + xy: 443, 124 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 item-iron rotate: false - xy: 453, 144 + xy: 453, 134 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 item-lead rotate: false - xy: 433, 114 + xy: 463, 144 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 item-plastic rotate: false - xy: 443, 124 + xy: 443, 114 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 item-sand rotate: false - xy: 453, 134 + xy: 453, 124 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 item-silicon rotate: false - xy: 463, 144 + xy: 463, 134 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 item-steel rotate: false - xy: 443, 114 + xy: 473, 144 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 item-stone rotate: false - xy: 453, 124 + xy: 453, 114 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 item-thorium rotate: false - xy: 463, 134 + xy: 463, 124 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 item-titanium rotate: false - xy: 473, 144 + xy: 473, 134 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -3267,56 +3288,56 @@ blaster-equip index: -1 clustergun rotate: false - xy: 602, 188 + xy: 612, 188 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 clustergun-equip rotate: false - xy: 592, 168 + xy: 592, 158 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 shockgun rotate: false - xy: 827, 405 + xy: 857, 405 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 shockgun-equip rotate: false - xy: 837, 405 + xy: 867, 405 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 triblaster rotate: false - xy: 936, 395 + xy: 957, 407 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 triblaster-equip rotate: false - xy: 936, 385 + xy: 967, 407 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 vulcan rotate: false - xy: 967, 407 + xy: 573, 106 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 vulcan-equip rotate: false - xy: 977, 407 + xy: 583, 106 size: 8, 8 orig: 8, 8 offset: 0, 0 diff --git a/core/assets/sprites/sprites.png b/core/assets/sprites/sprites.png index 97736563ac..24294f5a75 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 28ce3f36d3..adcac5ced0 100644 --- a/core/assets/version.properties +++ b/core/assets/version.properties @@ -1,7 +1,7 @@ #Autogenerated file. Do not modify. -#Wed Apr 11 21:11:23 EDT 2018 +#Wed Apr 11 21:39:29 EDT 2018 version=release -androidBuildCode=908 +androidBuildCode=913 name=Mindustry code=3.5 build=custom build diff --git a/core/src/io/anuke/mindustry/content/Recipes.java b/core/src/io/anuke/mindustry/content/Recipes.java index c2a73026ea..0aad0e5dbf 100644 --- a/core/src/io/anuke/mindustry/content/Recipes.java +++ b/core/src/io/anuke/mindustry/content/Recipes.java @@ -109,6 +109,7 @@ public class Recipes { new Recipe(liquid, LiquidBlocks.liquidtank, stack(Items.steel, 2)), new Recipe(liquid, LiquidBlocks.liquidjunction, stack(Items.steel, 2)), new Recipe(liquid, LiquidBlocks.bridgeconduit, stack(Items.titanium, 2), stack(Items.steel, 2)), + new Recipe(liquid, LiquidBlocks.laserconduit, stack(Items.titanium, 2), stack(Items.steel, 2)), new Recipe(liquid, LiquidBlocks.pump, stack(Items.steel, 10)), new Recipe(liquid, LiquidBlocks.fluxpump, stack(Items.steel, 10), stack(Items.densealloy, 5)), diff --git a/core/src/io/anuke/mindustry/content/blocks/LiquidBlocks.java b/core/src/io/anuke/mindustry/content/blocks/LiquidBlocks.java index f6e9acfc17..553b5efd10 100644 --- a/core/src/io/anuke/mindustry/content/blocks/LiquidBlocks.java +++ b/core/src/io/anuke/mindustry/content/blocks/LiquidBlocks.java @@ -36,8 +36,9 @@ public class LiquidBlocks { liquidjunction = new LiquidJunction("liquidjunction"), - bridgeconduit = new LiquidBridge("bridgeconduit"){{ + bridgeconduit = new LiquidExtendingBridge("bridgeconduit"){{ range = 3; + hasPower = false; }}, laserconduit = new LiquidBridge("laserconduit"){{ diff --git a/core/src/io/anuke/mindustry/world/blocks/types/distribution/BufferedItemBridge.java b/core/src/io/anuke/mindustry/world/blocks/types/distribution/BufferedItemBridge.java index f8cef21570..078e66d6bf 100644 --- a/core/src/io/anuke/mindustry/world/blocks/types/distribution/BufferedItemBridge.java +++ b/core/src/io/anuke/mindustry/world/blocks/types/distribution/BufferedItemBridge.java @@ -4,20 +4,13 @@ import io.anuke.mindustry.entities.TileEntity; import io.anuke.mindustry.resource.Item; import io.anuke.mindustry.world.ItemBuffer; import io.anuke.mindustry.world.Tile; -import io.anuke.ucore.graphics.CapStyle; -import io.anuke.ucore.graphics.Draw; -import io.anuke.ucore.graphics.Lines; -import io.anuke.ucore.util.Geometry; import io.anuke.ucore.util.Mathf; import java.io.DataInputStream; import java.io.DataOutputStream; import java.io.IOException; -import static io.anuke.mindustry.Vars.tilesize; -import static io.anuke.mindustry.Vars.world; - -public class BufferedItemBridge extends ItemBridge { +public class BufferedItemBridge extends ExtendingItemBridge { protected int timerAccept = timers ++; protected float speed = 40f; @@ -46,47 +39,6 @@ public class BufferedItemBridge extends ItemBridge { } } - @Override - public void drawLayer(Tile tile) { - BufferedItemBridgeEntity entity = tile.entity(); - - Tile other = world.tile(entity.link); - if(!linkValid(tile, other)) return; - - int i = tile.absoluteRelativeTo(other.x, other.y); - - float ex = other.worldx() - tile.worldx(), - ey = other.worldy() - tile.worldy(); - - ex *= entity.uptime; - ey *= entity.uptime; - - Lines.stroke(8f); - Lines.line(Draw.region(name + "-bridge"), - tile.worldx(), - tile.worldy(), - tile.worldx() + ex, - tile.worldy() + ey, CapStyle.none, -tilesize/2f); - - Draw.rect(name + "-end", tile.drawx(), tile.drawy(), i*90 + 90); - Draw.rect(name + "-end", tile.worldx() + ex, tile.worldy() + ey, i*90 + 270); - - int dist = Math.max(Math.abs(other.x - tile.x), Math.abs(other.y - tile.y)); - - int arrows = (dist)*tilesize/6-1; - - Draw.color(); - - for(int a = 0; a < arrows; a ++){ - Draw.alpha(Mathf.absin(a/(float)arrows - entity.time/100f, 0.1f, 1f) * entity.uptime); - Draw.rect(name + "-arrow", - tile.worldx() + Geometry.d4[i].x*(tilesize/2f + a*6f + 2) * entity.uptime, - tile.worldy() + Geometry.d4[i].y*(tilesize/2f + a*6f + 2) * entity.uptime, - i*90f); - } - Draw.reset(); - } - @Override public TileEntity getEntity() { return new BufferedItemBridgeEntity(); diff --git a/core/src/io/anuke/mindustry/world/blocks/types/distribution/ExtendingItemBridge.java b/core/src/io/anuke/mindustry/world/blocks/types/distribution/ExtendingItemBridge.java new file mode 100644 index 0000000000..70171486e1 --- /dev/null +++ b/core/src/io/anuke/mindustry/world/blocks/types/distribution/ExtendingItemBridge.java @@ -0,0 +1,61 @@ +package io.anuke.mindustry.world.blocks.types.distribution; + +import io.anuke.mindustry.world.Tile; +import io.anuke.ucore.graphics.CapStyle; +import io.anuke.ucore.graphics.Draw; +import io.anuke.ucore.graphics.Lines; +import io.anuke.ucore.util.Geometry; +import io.anuke.ucore.util.Mathf; + +import static io.anuke.mindustry.Vars.tilesize; +import static io.anuke.mindustry.Vars.world; + +public class ExtendingItemBridge extends ItemBridge { + + public ExtendingItemBridge(String name) { + super(name); + } + + @Override + public void drawLayer(Tile tile) { + ItemBridgeEntity entity = tile.entity(); + + Tile other = world.tile(entity.link); + if(!linkValid(tile, other)) return; + + int i = tile.absoluteRelativeTo(other.x, other.y); + + float ex = other.worldx() - tile.worldx() - Geometry.d4[i].x*tilesize/2f, + ey = other.worldy() - tile.worldy() - Geometry.d4[i].y*tilesize/2f; + + ex *= entity.uptime; + ey *= entity.uptime; + + Lines.stroke(8f); + Lines.line(Draw.region(name + "-bridge"), + tile.worldx() + Geometry.d4[i].x*tilesize/2f, + tile.worldy() + Geometry.d4[i].y*tilesize/2f, + tile.worldx() + ex, + tile.worldy() + ey, CapStyle.none, 0f); + + Draw.rect(name + "-end", tile.drawx(), tile.drawy(), i*90 + 90); + Draw.rect(name + "-end", + tile.worldx() + ex + Geometry.d4[i].x*tilesize/2f, + tile.worldy() + ey + Geometry.d4[i].y*tilesize/2f, i*90 + 270); + + int dist = Math.max(Math.abs(other.x - tile.x), Math.abs(other.y - tile.y)); + + int arrows = (dist)*tilesize/6-1; + + Draw.color(); + + for(int a = 0; a < arrows; a ++){ + Draw.alpha(Mathf.absin(a/(float)arrows - entity.time/100f, 0.1f, 1f) * entity.uptime); + Draw.rect(name + "-arrow", + tile.worldx() + Geometry.d4[i].x*(tilesize/2f + a*6f + 2) * entity.uptime, + tile.worldy() + Geometry.d4[i].y*(tilesize/2f + a*6f + 2) * entity.uptime, + i*90f); + } + Draw.reset(); + } +} diff --git a/core/src/io/anuke/mindustry/world/blocks/types/distribution/LiquidBridge.java b/core/src/io/anuke/mindustry/world/blocks/types/distribution/LiquidBridge.java index a8d1009ab4..494a265f8e 100644 --- a/core/src/io/anuke/mindustry/world/blocks/types/distribution/LiquidBridge.java +++ b/core/src/io/anuke/mindustry/world/blocks/types/distribution/LiquidBridge.java @@ -8,7 +8,6 @@ import io.anuke.ucore.util.Mathf; import static io.anuke.mindustry.Vars.world; public class LiquidBridge extends ItemBridge { - protected float transportSpeed = 0.5f; public LiquidBridge(String name) { super(name); diff --git a/core/src/io/anuke/mindustry/world/blocks/types/distribution/LiquidExtendingBridge.java b/core/src/io/anuke/mindustry/world/blocks/types/distribution/LiquidExtendingBridge.java new file mode 100644 index 0000000000..7d8977867a --- /dev/null +++ b/core/src/io/anuke/mindustry/world/blocks/types/distribution/LiquidExtendingBridge.java @@ -0,0 +1,53 @@ +package io.anuke.mindustry.world.blocks.types.distribution; + +import io.anuke.mindustry.resource.Item; +import io.anuke.mindustry.world.Tile; +import io.anuke.ucore.core.Timers; +import io.anuke.ucore.util.Mathf; + +import static io.anuke.mindustry.Vars.world; + +public class LiquidExtendingBridge extends ExtendingItemBridge { + + public LiquidExtendingBridge(String name) { + super(name); + hasInventory = false; + hasLiquids = true; + } + + @Override + public void update(Tile tile) { + ItemBridgeEntity entity = tile.entity(); + + entity.time += entity.cycleSpeed* Timers.delta(); + entity.time2 += (entity.cycleSpeed-1f)*Timers.delta(); + + Tile other = world.tile(entity.link); + if(!linkValid(tile, other)){ + tryDumpLiquid(tile); + }else{ + float use = Math.min(powerCapacity, powerUse * Timers.delta()); + + if(!hasPower || entity.power.amount >= use){ + entity.uptime = Mathf.lerpDelta(entity.uptime, 1f, 0.04f); + if(hasPower) entity.power.amount -= use; + }else{ + entity.uptime = Mathf.lerpDelta(entity.uptime, 0f, 0.02f); + } + + if(entity.uptime >= 0.5f){ + + if(tryMoveLiquid(tile, other) > 0.1f){ + entity.cycleSpeed = Mathf.lerpDelta(entity.cycleSpeed, 4f, 0.05f); + }else{ + entity.cycleSpeed = Mathf.lerpDelta(entity.cycleSpeed, 1f, 0.01f); + } + } + } + } + + @Override + public boolean acceptItem(Item item, Tile tile, Tile source) { + return false; + } +}