From b4dad32b2bf13b733f0a8d460f5a4f4a30cd3798 Mon Sep 17 00:00:00 2001 From: Anuken Date: Sat, 5 Jun 2021 11:10:26 -0400 Subject: [PATCH] Status effect particle color pass --- core/src/mindustry/content/Fx.java | 4 ++-- core/src/mindustry/type/StatusEffect.java | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/core/src/mindustry/content/Fx.java b/core/src/mindustry/content/Fx.java index 519a142088..792bae65df 100644 --- a/core/src/mindustry/content/Fx.java +++ b/core/src/mindustry/content/Fx.java @@ -963,7 +963,7 @@ public class Fx{ }), overdriven = new Effect(20f, e -> { - color(Pal.accent); + color(e.color); randLenVectors(e.id, 2, 1f + e.fin() * 2f, (x, y) -> { Fill.square(e.x + x, e.y + y, e.fout() * 2.3f + 0.5f); @@ -971,7 +971,7 @@ public class Fx{ }), overclocked = new Effect(50f, e -> { - color(Pal.accent); + color(e.color); Fill.square(e.x, e.y, e.fslope() * 2f, 45f); }), diff --git a/core/src/mindustry/type/StatusEffect.java b/core/src/mindustry/type/StatusEffect.java index c173492ab6..6d4c332a37 100644 --- a/core/src/mindustry/type/StatusEffect.java +++ b/core/src/mindustry/type/StatusEffect.java @@ -120,7 +120,7 @@ public class StatusEffect extends UnlockableContent{ if(effect != Fx.none && Mathf.chanceDelta(effectChance)){ Tmp.v1.rnd(Mathf.range(unit.type.hitSize/2f)); - effect.at(unit.x + Tmp.v1.x, unit.y + Tmp.v1.y); + effect.at(unit.x + Tmp.v1.x, unit.y + Tmp.v1.y, color); } }