From 7f01959438b32a1c327dfaab0a4915b3a2d0fced Mon Sep 17 00:00:00 2001 From: Anuken Date: Sun, 6 Jun 2021 21:01:47 -0400 Subject: [PATCH] Liquid turret shoot FX fixes --- core/src/mindustry/content/Fx.java | 6 +++--- .../world/blocks/defense/turrets/LiquidTurret.java | 2 ++ 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/core/src/mindustry/content/Fx.java b/core/src/mindustry/content/Fx.java index 792bae65df..56246bc02f 100644 --- a/core/src/mindustry/content/Fx.java +++ b/core/src/mindustry/content/Fx.java @@ -1231,10 +1231,10 @@ public class Fx{ }); }), - shootLiquid = new Effect(40f, 80f, e -> { - color(e.color, Color.white, e.fout() / 6f + Mathf.randomSeedRange(e.id, 0.1f)); + shootLiquid = new Effect(15f, 80f, e -> { + color(e.color); - randLenVectors(e.id, 6, e.finpow() * 60f, e.rotation, 11f, (x, y) -> { + randLenVectors(e.id, 2, e.finpow() * 15f, e.rotation, 11f, (x, y) -> { Fill.circle(e.x + x, e.y + y, 0.5f + e.fout() * 2.5f); }); }), diff --git a/core/src/mindustry/world/blocks/defense/turrets/LiquidTurret.java b/core/src/mindustry/world/blocks/defense/turrets/LiquidTurret.java index 46f94bd0ee..2a2131c6b9 100644 --- a/core/src/mindustry/world/blocks/defense/turrets/LiquidTurret.java +++ b/core/src/mindustry/world/blocks/defense/turrets/LiquidTurret.java @@ -27,6 +27,8 @@ public class LiquidTurret extends Turret{ hasLiquids = true; loopSound = Sounds.spray; shootSound = Sounds.none; + smokeEffect = Fx.none; + shootEffect = Fx.none; outlinedIcon = 1; }