From 09a934385e57e9dc1abcbe491727b0c9d817981a Mon Sep 17 00:00:00 2001 From: Anuken Date: Sat, 6 Nov 2021 22:21:46 -0400 Subject: [PATCH] "stuff" --- .../stack-conveyors/surge-conveyor-stack.png | Bin 298 -> 244 bytes core/src/mindustry/content/Fx.java | 7 +++++++ core/src/mindustry/graphics/EnvRenderers.java | 4 ++-- .../maps/planet/ErekirPlanetGenerator.java | 2 +- .../blocks/distribution/StackConveyor.java | 4 ++-- 5 files changed, 12 insertions(+), 5 deletions(-) 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 fa549cc0c55c3bf597aa573d5ee201dc87ac5f8d..d953c790a4439178d4308ee56d13f4342774c7d1 100644 GIT binary patch delta 203 zcmZ3*^o4PPVf{K!7srr@*5m{U*2M`+nB9^@pNX3MIj%NO?T6Irs=2>by3F*QvgoC; z`2X~TgoGV+fAzvDy<{8%7|#?*EZC;}!D~^pAGiC1DJQfueym@)vgdqlgk#%P**9V@ z&62iubIwoPQPahL#$s7h=%4>jtJW;+yw3QgfW?tL;I?3jWy3U=ge#1T`4mnuUeTH0 zQO2;=+j$S)0{1|h3T@?>z6IH(J?}agGbbEiSUW3aae_z>6GN?kq=JmD?Rf?U1_n=8 KKbLh*2~7Y?hgT*5 delta 257 zcmeyuxQc0lVf_TIbk zY+4|fB;z=R`GW59Wy&*7Y@O5C*!XZm3#%i$08>S5`}v|Ag~PA-^14f;H{NQ!%(z2m zf8Ad_KW{a)$L0EF?gBkbNxJC?2?;0WciVgZ-5=Bc&}osZ!-=Y*B-uv32#+9Nl@s$% zpIESRWslOdnR4A%Q&n6Ubq}myc9V6O9K)bFA;9}6PljYeoP?k((~Fy2`=1_Rp0uc8 zg7OK?F82IXmo>^9TRAoI_#bFFb#9y^VPG;V4M OVDNPHb6Mw<&;$TI&1e?@ 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);