diff --git a/core/assets-raw/sprites/blocks/distribution/conveyors/plastanium-conveyor-1-0.png b/core/assets-raw/sprites/blocks/distribution/conveyors/plastanium-conveyor-1-0.png index f22c1168a3..8d8e9b1506 100644 Binary files a/core/assets-raw/sprites/blocks/distribution/conveyors/plastanium-conveyor-1-0.png and b/core/assets-raw/sprites/blocks/distribution/conveyors/plastanium-conveyor-1-0.png differ diff --git a/core/assets-raw/sprites/blocks/distribution/conveyors/plastanium-conveyor-5-0.png b/core/assets-raw/sprites/blocks/distribution/conveyors/plastanium-conveyor-5-0.png index 05e1e74829..af4ec6cf23 100644 Binary files a/core/assets-raw/sprites/blocks/distribution/conveyors/plastanium-conveyor-5-0.png and b/core/assets-raw/sprites/blocks/distribution/conveyors/plastanium-conveyor-5-0.png differ diff --git a/core/assets-raw/sprites/blocks/distribution/conveyors/plastanium-conveyor-6-0.png b/core/assets-raw/sprites/blocks/distribution/conveyors/plastanium-conveyor-6-0.png index 1bd18ff4a4..0a134bd71f 100644 Binary files a/core/assets-raw/sprites/blocks/distribution/conveyors/plastanium-conveyor-6-0.png and b/core/assets-raw/sprites/blocks/distribution/conveyors/plastanium-conveyor-6-0.png differ diff --git a/core/assets-raw/sprites/blocks/distribution/conveyors/plastanium-conveyor-8-0.png b/core/assets-raw/sprites/blocks/distribution/conveyors/plastanium-conveyor-8-0.png new file mode 100644 index 0000000000..ffbb75840e Binary files /dev/null and b/core/assets-raw/sprites/blocks/distribution/conveyors/plastanium-conveyor-8-0.png differ diff --git a/core/assets/sprites/sprites.atlas b/core/assets/sprites/sprites.atlas index 6daeb4a479..714992588d 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: 1473, 249 + xy: 1473, 215 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -403,139 +403,146 @@ plastanium-conveyor-7-0 orig: 32, 32 offset: 0, 0 index: -1 -titanium-conveyor-0-1 +plastanium-conveyor-8-0 rotate: false - xy: 1473, 215 + xy: 1337, 249 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 -titanium-conveyor-0-2 +titanium-conveyor-0-1 rotate: false xy: 1473, 181 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 -titanium-conveyor-0-3 +titanium-conveyor-0-2 rotate: false xy: 1473, 147 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 -titanium-conveyor-1-0 +titanium-conveyor-0-3 rotate: false xy: 1897, 1107 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 -titanium-conveyor-1-1 +titanium-conveyor-1-0 rotate: false xy: 1897, 1073 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 -titanium-conveyor-1-2 +titanium-conveyor-1-1 rotate: false xy: 1897, 1039 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 -titanium-conveyor-1-3 +titanium-conveyor-1-2 rotate: false xy: 1931, 1115 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 -titanium-conveyor-2-0 +titanium-conveyor-1-3 rotate: false xy: 1931, 1081 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 -titanium-conveyor-2-1 +titanium-conveyor-2-0 rotate: false xy: 1965, 1115 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 -titanium-conveyor-2-2 +titanium-conveyor-2-1 rotate: false xy: 1931, 1047 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 -titanium-conveyor-2-3 +titanium-conveyor-2-2 rotate: false xy: 1965, 1081 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 -titanium-conveyor-3-0 +titanium-conveyor-2-3 rotate: false xy: 1999, 1115 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 -titanium-conveyor-3-1 +titanium-conveyor-3-0 rotate: false xy: 1965, 1047 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 -titanium-conveyor-3-2 +titanium-conveyor-3-1 rotate: false xy: 1999, 1081 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 -titanium-conveyor-3-3 +titanium-conveyor-3-2 rotate: false xy: 1999, 1047 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 -titanium-conveyor-4-0 +titanium-conveyor-3-3 rotate: false xy: 1931, 1013 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 -titanium-conveyor-4-1 +titanium-conveyor-4-0 rotate: false xy: 1965, 1013 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 -titanium-conveyor-4-2 +titanium-conveyor-4-1 rotate: false xy: 1999, 1013 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 -titanium-conveyor-4-3 +titanium-conveyor-4-2 rotate: false xy: 1340, 847 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 +titanium-conveyor-4-3 + rotate: false + xy: 1374, 847 + size: 32, 32 + orig: 32, 32 + offset: 0, 0 + index: -1 cross rotate: false xy: 1177, 541 @@ -594,7 +601,7 @@ phase-conveyor-end index: -1 underflow-gate rotate: false - xy: 1358, 813 + xy: 1358, 779 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -1021,98 +1028,98 @@ phase-conduit-end index: -1 plated-conduit-cap rotate: false - xy: 1337, 249 + xy: 1337, 215 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 plated-conduit-top-0 rotate: false - xy: 1337, 215 + xy: 1371, 249 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 plated-conduit-top-1 rotate: false - xy: 1371, 249 + xy: 1371, 215 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 plated-conduit-top-2 rotate: false - xy: 1371, 215 + xy: 1405, 249 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 plated-conduit-top-3 rotate: false - xy: 1405, 249 + xy: 1405, 215 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 plated-conduit-top-4 rotate: false - xy: 1405, 215 + xy: 1269, 173 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 plated-conduit-top-5 rotate: false - xy: 1269, 173 + xy: 1303, 173 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 plated-conduit-top-6 rotate: false - xy: 1303, 173 + xy: 1337, 181 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 pulse-conduit-top-0 rotate: false - xy: 1371, 181 + xy: 1405, 181 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 pulse-conduit-top-1 rotate: false - xy: 1405, 181 + xy: 1439, 249 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 pulse-conduit-top-2 rotate: false - xy: 1439, 249 + xy: 1439, 215 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 pulse-conduit-top-4 rotate: false - xy: 1439, 215 + xy: 1439, 181 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 pulse-conduit-top-5 rotate: false - xy: 1439, 181 + xy: 1337, 147 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 pulse-conduit-top-6 rotate: false - xy: 1337, 147 + xy: 1371, 147 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -1301,14 +1308,14 @@ impact-reactor-plasma-3 index: -1 power-source rotate: false - xy: 1337, 181 + xy: 1371, 181 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 rtg-generator-top rotate: false - xy: 1381, 453 + xy: 1381, 419 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -1455,21 +1462,21 @@ plastanium-compressor-top index: -1 pulverizer rotate: false - xy: 1371, 147 + xy: 1405, 147 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 pulverizer-rotator rotate: false - xy: 1405, 147 + xy: 1439, 147 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 pump-liquid rotate: false - xy: 1439, 147 + xy: 1381, 521 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -1532,7 +1539,7 @@ spore-press-top index: -1 unloader-center rotate: false - xy: 1358, 779 + xy: 1358, 745 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -1623,7 +1630,7 @@ salvo-panel-right index: -1 scorch-heat rotate: false - xy: 1407, 385 + xy: 1433, 351 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -1770,7 +1777,7 @@ rally-point index: -1 repair-point-base rotate: false - xy: 1381, 487 + xy: 1381, 453 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -1882,28 +1889,28 @@ scrap-wall-large4 index: -1 scrap-wall2 rotate: false - xy: 1433, 351 + xy: 1451, 317 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 scrap-wall3 rotate: false - xy: 1451, 317 + xy: 1451, 283 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 scrap-wall4 rotate: false - xy: 1451, 283 + xy: 1473, 249 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 scrap-wall5 rotate: false - xy: 1451, 283 + xy: 1473, 249 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -2036,7 +2043,7 @@ transfer index: -1 transfer-arrow rotate: false - xy: 1374, 847 + xy: 1358, 813 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -4605,7 +4612,7 @@ item-spore-pod-medium index: -1 item-spore-pod-small rotate: false - xy: 1358, 753 + xy: 1358, 719 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -4717,7 +4724,7 @@ item-titanium-small index: -1 item-titanium-tiny rotate: false - xy: 1358, 735 + xy: 1358, 701 size: 16, 16 orig: 16, 16 offset: 0, 0 @@ -4892,7 +4899,7 @@ meltdown index: -1 repair-point rotate: false - xy: 1381, 521 + xy: 1381, 487 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -4920,7 +4927,7 @@ scatter index: -1 scorch rotate: false - xy: 1381, 419 + xy: 1407, 385 size: 32, 32 orig: 32, 32 offset: 0, 0 diff --git a/core/assets/sprites/sprites.png b/core/assets/sprites/sprites.png index 4cb1264f8b..1cc258ed98 100644 Binary files a/core/assets/sprites/sprites.png and b/core/assets/sprites/sprites.png differ diff --git a/core/assets/sprites/sprites5.png b/core/assets/sprites/sprites5.png index 4f816fe7d9..022b34e873 100644 Binary files a/core/assets/sprites/sprites5.png and b/core/assets/sprites/sprites5.png differ diff --git a/core/src/mindustry/world/blocks/distribution/CraterConveyor.java b/core/src/mindustry/world/blocks/distribution/CraterConveyor.java index 4129a0125b..d6281ad1c6 100644 --- a/core/src/mindustry/world/blocks/distribution/CraterConveyor.java +++ b/core/src/mindustry/world/blocks/distribution/CraterConveyor.java @@ -19,7 +19,7 @@ import mindustry.world.meta.*; import static mindustry.Vars.*; public class CraterConveyor extends Block implements Autotiler{ - private TextureRegion[] regions = new TextureRegion[8]; + private TextureRegion[] regions = new TextureRegion[9]; public float speed = 0f;