diff --git a/core/assets-raw/sprites/blocks/distribution/stack-conveyors/surge-conveyor-stack.png b/core/assets-raw/sprites/blocks/distribution/stack-conveyors/surge-conveyor-stack.png index fa549cc0c5..d953c790a4 100644 Binary files a/core/assets-raw/sprites/blocks/distribution/stack-conveyors/surge-conveyor-stack.png and b/core/assets-raw/sprites/blocks/distribution/stack-conveyors/surge-conveyor-stack.png differ diff --git a/core/src/mindustry/content/Fx.java b/core/src/mindustry/content/Fx.java index af6f5b8e09..b0e0047ffb 100644 --- a/core/src/mindustry/content/Fx.java +++ b/core/src/mindustry/content/Fx.java @@ -1690,6 +1690,13 @@ public class Fx{ }); }), + conveyorPoof = new Effect(35, e -> { + color(Pal.plasticBurn, Color.gray, e.fin()); + randLenVectors(e.id, 4, 3f + e.fin() * 4f, (x, y) -> { + Fill.circle(e.x + x, e.y + y, e.fout() * 1.11f); + }); + }), + pulverize = new Effect(40, e -> { randLenVectors(e.id, 5, 3f + e.fin() * 8f, (x, y) -> { color(Pal.stoneGray); diff --git a/core/src/mindustry/graphics/EnvRenderers.java b/core/src/mindustry/graphics/EnvRenderers.java index f15c748eef..5d261f7a10 100644 --- a/core/src/mindustry/graphics/EnvRenderers.java +++ b/core/src/mindustry/graphics/EnvRenderers.java @@ -19,7 +19,7 @@ public class EnvRenderers{ Rand rand = new Rand(); Core.assets.load("sprites/rays.png", Texture.class).loaded = t -> { - ((Texture)t).setFilter(TextureFilter.linear); + t.setFilter(TextureFilter.linear); }; Color particleColor = Color.valueOf("a7c1fa"); @@ -98,7 +98,7 @@ public class EnvRenderers{ } Draw.z(Layer.weather - 1); - Weather.drawNoiseLayers(tex, Color.scarlet, 1000f, 0.24f, 0.4f, 1f, 1f, 0f, + Weather.drawNoiseLayers(tex, Color.scarlet, 1000f, 0.23f, 0.4f, 1f, 1f, 0f, 4, -1.3f, 0.7f, 0.8f, 0.9f); Draw.reset(); }); diff --git a/core/src/mindustry/maps/planet/ErekirPlanetGenerator.java b/core/src/mindustry/maps/planet/ErekirPlanetGenerator.java index ab93861b33..327ccae32a 100644 --- a/core/src/mindustry/maps/planet/ErekirPlanetGenerator.java +++ b/core/src/mindustry/maps/planet/ErekirPlanetGenerator.java @@ -210,7 +210,7 @@ public class ErekirPlanetGenerator extends PlanetGenerator{ } //not allowed - state.rules.hiddenBuildItems.addAll(Items.copper, Items.titanium, Items.coal, Items.lead, Items.blastCompound, Items.pyratite, Items.sporePod, Items.metaglass); + state.rules.hiddenBuildItems.addAll(Items.copper, Items.titanium, Items.coal, Items.lead, Items.blastCompound, Items.pyratite, Items.sporePod, Items.metaglass, Items.plastanium); //it is very hot state.rules.attributes.set(Attribute.heat, 0.8f); diff --git a/core/src/mindustry/world/blocks/distribution/StackConveyor.java b/core/src/mindustry/world/blocks/distribution/StackConveyor.java index 5fc7eb716e..0f7c276553 100644 --- a/core/src/mindustry/world/blocks/distribution/StackConveyor.java +++ b/core/src/mindustry/world/blocks/distribution/StackConveyor.java @@ -37,8 +37,8 @@ public class StackConveyor extends Block implements Autotiler{ public boolean outputRouter = true; /** (minimum) amount of loading docks needed to fill a line. */ public float recharge = 2f; - public Effect loadEffect = Fx.plasticburn; - public Effect unloadEffect = Fx.plasticburn; + public Effect loadEffect = Fx.conveyorPoof; + public Effect unloadEffect = Fx.conveyorPoof; public StackConveyor(String name){ super(name);