diff --git a/core/assets-raw/sprites/blocks/distribution/conveyors/plastanium-conveyor-7-0.png b/core/assets-raw/sprites/blocks/distribution/conveyors/plastanium-conveyor-7-0.png deleted file mode 100644 index e0df4ceb96..0000000000 Binary files a/core/assets-raw/sprites/blocks/distribution/conveyors/plastanium-conveyor-7-0.png and /dev/null differ diff --git a/core/assets/sprites/sprites.atlas b/core/assets/sprites/sprites.atlas index d581bd23a6..5061578d31 100644 --- a/core/assets/sprites/sprites.atlas +++ b/core/assets/sprites/sprites.atlas @@ -34,7 +34,7 @@ overdrive-projector-top index: -1 shock-mine rotate: false - xy: 1743, 857 + xy: 1709, 823 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -396,142 +396,135 @@ plastanium-conveyor-6-0 orig: 32, 32 offset: 0, 0 index: -1 -plastanium-conveyor-7-0 - rotate: false - xy: 1958, 959 - size: 32, 32 - orig: 32, 32 - offset: 0, 0 - index: -1 titanium-conveyor-0-1 rotate: false - xy: 1743, 823 + xy: 1709, 789 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 titanium-conveyor-0-2 rotate: false - xy: 1777, 857 + xy: 1743, 823 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 titanium-conveyor-0-3 rotate: false - xy: 1743, 789 + xy: 1777, 857 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 titanium-conveyor-1-0 rotate: false - xy: 1777, 823 + xy: 1743, 789 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 titanium-conveyor-1-1 rotate: false - xy: 1811, 857 + xy: 1777, 823 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 titanium-conveyor-1-2 rotate: false - xy: 1777, 789 + xy: 1811, 857 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 titanium-conveyor-1-3 rotate: false - xy: 1811, 823 + xy: 1777, 789 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 titanium-conveyor-2-0 rotate: false - xy: 1845, 857 + xy: 1811, 823 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 titanium-conveyor-2-1 rotate: false - xy: 1811, 789 + xy: 1845, 857 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 titanium-conveyor-2-2 rotate: false - xy: 1845, 823 + xy: 1811, 789 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 titanium-conveyor-2-3 rotate: false - xy: 1879, 857 + xy: 1845, 823 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 titanium-conveyor-3-0 rotate: false - xy: 1845, 789 + xy: 1879, 857 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 titanium-conveyor-3-1 rotate: false - xy: 1879, 823 + xy: 1845, 789 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 titanium-conveyor-3-2 rotate: false - xy: 1913, 857 + xy: 1879, 823 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 titanium-conveyor-3-3 rotate: false - xy: 1879, 789 + xy: 1913, 857 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 titanium-conveyor-4-0 rotate: false - xy: 1913, 823 + xy: 1879, 789 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 titanium-conveyor-4-1 rotate: false - xy: 1947, 857 + xy: 1913, 823 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 titanium-conveyor-4-2 rotate: false - xy: 1913, 789 + xy: 1947, 857 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 titanium-conveyor-4-3 rotate: false - xy: 1947, 823 + xy: 1913, 789 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -1098,98 +1091,98 @@ phase-conduit-end index: -1 plated-conduit-cap rotate: false - xy: 1924, 891 + xy: 1958, 959 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 plated-conduit-top-0 rotate: false - xy: 1958, 925 + xy: 1924, 891 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 plated-conduit-top-1 rotate: false - xy: 1992, 959 + xy: 1958, 925 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 plated-conduit-top-2 rotate: false - xy: 1958, 891 + xy: 1992, 959 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 plated-conduit-top-3 rotate: false - xy: 1992, 925 + xy: 1958, 891 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 plated-conduit-top-4 rotate: false - xy: 1992, 891 + xy: 1992, 925 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 plated-conduit-top-5 rotate: false - xy: 1505, 849 + xy: 1992, 891 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 plated-conduit-top-6 rotate: false - xy: 1505, 815 + xy: 1505, 849 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 pulse-conduit-top-0 rotate: false - xy: 1539, 857 + xy: 1505, 781 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 pulse-conduit-top-1 rotate: false - xy: 1539, 823 + xy: 1539, 857 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 pulse-conduit-top-2 rotate: false - xy: 1573, 857 + xy: 1539, 823 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 pulse-conduit-top-4 rotate: false - xy: 1539, 789 + xy: 1573, 857 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 pulse-conduit-top-5 rotate: false - xy: 1573, 823 + xy: 1539, 789 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 pulse-conduit-top-6 rotate: false - xy: 1607, 857 + xy: 1573, 823 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -1308,14 +1301,14 @@ impact-reactor-plasma-3 index: -1 power-source rotate: false - xy: 1505, 781 + xy: 1505, 815 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 rtg-generator-top rotate: false - xy: 1675, 857 + xy: 1641, 823 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -1462,21 +1455,21 @@ plastanium-compressor-top index: -1 pulverizer rotate: false - xy: 1573, 789 + xy: 1607, 857 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 pulverizer-rotator rotate: false - xy: 1607, 823 + xy: 1573, 789 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 pump-liquid rotate: false - xy: 1641, 857 + xy: 1607, 823 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -1532,7 +1525,7 @@ spore-press-top index: -1 unloader-center rotate: false - xy: 2015, 857 + xy: 1981, 857 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -1623,7 +1616,7 @@ salvo-panel-right index: -1 scorch-heat rotate: false - xy: 1675, 823 + xy: 1641, 789 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -1749,7 +1742,7 @@ rally-point index: -1 repair-point-base rotate: false - xy: 1641, 823 + xy: 1607, 789 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -1861,28 +1854,28 @@ scrap-wall-large4 index: -1 scrap-wall2 rotate: false - xy: 1709, 857 + xy: 1675, 823 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 scrap-wall3 rotate: false - xy: 1675, 789 + xy: 1709, 857 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 scrap-wall4 rotate: false - xy: 1709, 823 + xy: 1675, 789 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 scrap-wall5 rotate: false - xy: 1709, 823 + xy: 1675, 789 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -2036,7 +2029,7 @@ shell-back index: -1 shot rotate: false - xy: 1709, 789 + xy: 1743, 857 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -2050,7 +2043,7 @@ transfer index: -1 transfer-arrow rotate: false - xy: 1981, 857 + xy: 1947, 823 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -4647,7 +4640,7 @@ item-graphite-medium index: -1 item-graphite-small rotate: false - xy: 2007, 831 + xy: 1269, 775 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -4682,7 +4675,7 @@ item-lead-medium index: -1 item-lead-small rotate: false - xy: 1269, 775 + xy: 1295, 775 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -4717,7 +4710,7 @@ item-metaglass-medium index: -1 item-metaglass-small rotate: false - xy: 1295, 775 + xy: 1251, 315 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -4752,7 +4745,7 @@ item-phase-fabric-medium index: -1 item-phase-fabric-small rotate: false - xy: 1251, 315 + xy: 1273, 621 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -4787,7 +4780,7 @@ item-plastanium-medium index: -1 item-plastanium-small rotate: false - xy: 1273, 621 + xy: 1321, 775 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -4822,7 +4815,7 @@ item-pyratite-medium index: -1 item-pyratite-small rotate: false - xy: 1321, 775 + xy: 1303, 749 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -4857,7 +4850,7 @@ item-sand-medium index: -1 item-sand-small rotate: false - xy: 1303, 749 + xy: 1251, 289 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -4892,7 +4885,7 @@ item-scrap-medium index: -1 item-scrap-small rotate: false - xy: 1251, 289 + xy: 1273, 595 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -4927,7 +4920,7 @@ item-silicon-medium index: -1 item-silicon-small rotate: false - xy: 1273, 595 + xy: 1303, 723 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -4962,7 +4955,7 @@ item-spore-pod-medium index: -1 item-spore-pod-small rotate: false - xy: 1303, 723 + xy: 1273, 569 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -4997,7 +4990,7 @@ item-surge-alloy-medium index: -1 item-surge-alloy-small rotate: false - xy: 1273, 569 + xy: 1303, 697 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -5032,7 +5025,7 @@ item-thorium-medium index: -1 item-thorium-small rotate: false - xy: 1303, 697 + xy: 1273, 543 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -5067,14 +5060,14 @@ item-titanium-medium index: -1 item-titanium-small rotate: false - xy: 1273, 543 + xy: 1273, 517 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 item-titanium-tiny rotate: false - xy: 1299, 627 + xy: 1299, 601 size: 16, 16 orig: 16, 16 offset: 0, 0 @@ -5109,7 +5102,7 @@ liquid-cryofluid-medium index: -1 liquid-cryofluid-small rotate: false - xy: 1273, 517 + xy: 1273, 491 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -5144,7 +5137,7 @@ liquid-oil-medium index: -1 liquid-oil-small rotate: false - xy: 1273, 491 + xy: 1303, 671 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -5179,7 +5172,7 @@ liquid-slag-medium index: -1 liquid-slag-small rotate: false - xy: 1303, 671 + xy: 1299, 645 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -5214,7 +5207,7 @@ liquid-water-medium index: -1 liquid-water-small rotate: false - xy: 1299, 645 + xy: 1299, 619 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -5305,7 +5298,7 @@ meltdown index: -1 repair-point rotate: false - xy: 1607, 789 + xy: 1641, 857 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -5333,7 +5326,7 @@ scatter index: -1 scorch rotate: false - xy: 1641, 789 + xy: 1675, 857 size: 32, 32 orig: 32, 32 offset: 0, 0 diff --git a/core/assets/sprites/sprites.png b/core/assets/sprites/sprites.png index 380146c2ad..edc71bef49 100644 Binary files a/core/assets/sprites/sprites.png and b/core/assets/sprites/sprites.png differ diff --git a/core/src/mindustry/world/blocks/distribution/CraterConveyor.java b/core/src/mindustry/world/blocks/distribution/CraterConveyor.java index 02ab617ccb..969ee2ba16 100644 --- a/core/src/mindustry/world/blocks/distribution/CraterConveyor.java +++ b/core/src/mindustry/world/blocks/distribution/CraterConveyor.java @@ -34,7 +34,7 @@ public class CraterConveyor extends BaseConveyor{ } } - start = Core.atlas.find(name + "-7-0"); + start = Core.atlas.find(name + "-5-0"); end = Core.atlas.find(name + "-6-0"); crater = Core.atlas.find("crater"); }