From b79e0373f443b2d6b4fca39656f96379dd45568e Mon Sep 17 00:00:00 2001 From: Sunny Kim <58885089+sk7725@users.noreply.github.com> Date: Fri, 16 Oct 2020 20:12:54 +0900 Subject: [PATCH 1/3] Add colors to StatusEffects --- core/src/mindustry/content/StatusEffects.java | 19 ++++++++++++++++++- 1 file changed, 18 insertions(+), 1 deletion(-) diff --git a/core/src/mindustry/content/StatusEffects.java b/core/src/mindustry/content/StatusEffects.java index 4cdfadec76..16aaab95b4 100644 --- a/core/src/mindustry/content/StatusEffects.java +++ b/core/src/mindustry/content/StatusEffects.java @@ -6,6 +6,8 @@ import arc.math.*; import mindustry.ctype.*; import mindustry.game.EventType.*; import mindustry.type.*; +import mindustry.graphics.*; + import static mindustry.Vars.*; @@ -18,6 +20,7 @@ public class StatusEffects implements ContentList{ none = new StatusEffect("none"); burning = new StatusEffect("burning"){{ + color = Pal.lightFlame; damage = 0.12f; //over 8 seconds, this would be 60 damage effect = Fx.burning; @@ -32,6 +35,7 @@ public class StatusEffects implements ContentList{ }}; freezing = new StatusEffect("freezing"){{ + color = Liquids.cryofluid.color; speedMultiplier = 0.6f; healthMultiplier = 0.8f; effect = Fx.freezing; @@ -47,10 +51,12 @@ public class StatusEffects implements ContentList{ }}; unmoving = new StatusEffect("unmoving"){{ + color = Pal.gray; speedMultiplier = 0.001f; }}; slow = new StatusEffect("slow"){{ + color = Pal.lightishGray; speedMultiplier = 0.4f; }}; @@ -80,6 +86,7 @@ public class StatusEffects implements ContentList{ }}; melting = new StatusEffect("melting"){{ + color = Liquids.slag.color; speedMultiplier = 0.8f; healthMultiplier = 0.8f; damage = 0.3f; @@ -92,6 +99,7 @@ public class StatusEffects implements ContentList{ }}; sapped = new StatusEffect("sapped"){{ + color = Pal.sap; speedMultiplier = 0.7f; healthMultiplier = 0.8f; effect = Fx.sapped; @@ -99,12 +107,14 @@ public class StatusEffects implements ContentList{ }}; sporeSlowed = new StatusEffect("spore-slowed"){{ + color = Pal.spore; speedMultiplier = 0.8f; effect = Fx.sapped; effectChance = 0.04f; }}; tarred = new StatusEffect("tarred"){{ + color = Liquids.tar.color; speedMultiplier = 0.6f; effect = Fx.oily; @@ -115,6 +125,7 @@ public class StatusEffects implements ContentList{ }}; overdrive = new StatusEffect("overdrive"){{ + color = Pal.accent; healthMultiplier = 0.95f; speedMultiplier = 1.15f; damageMultiplier = 1.4f; @@ -124,6 +135,7 @@ public class StatusEffects implements ContentList{ }}; overclock = new StatusEffect("overclock"){{ + color = Pal.accent; speedMultiplier = 1.15f; damageMultiplier = 1.15f; reloadMultiplier = 1.25f; @@ -132,20 +144,25 @@ public class StatusEffects implements ContentList{ }}; shielded = new StatusEffect("shielded"){{ + color = Pal.accent; healthMultiplier = 3f; }}; boss = new StatusEffect("boss"){{ + color = Pal.health; permanent = true; damageMultiplier = 2f; healthMultiplier = 2f; }}; - shocked = new StatusEffect("shocked"); + shocked = new StatusEffect("shocked"){{ + color = Pal.lancerLaser; + }}; blasted = new StatusEffect("blasted"); corroded = new StatusEffect("corroded"){{ + color = Pal.plastanium; damage = 0.1f; }}; } From 956840b50b8bf973f08202dec9a699a0f1a06e9b Mon Sep 17 00:00:00 2001 From: Sunny Kim <58885089+sk7725@users.noreply.github.com> Date: Fri, 16 Oct 2020 20:59:40 +0900 Subject: [PATCH 2/3] oops --- core/src/mindustry/content/StatusEffects.java | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/core/src/mindustry/content/StatusEffects.java b/core/src/mindustry/content/StatusEffects.java index 16aaab95b4..dc9758d54e 100644 --- a/core/src/mindustry/content/StatusEffects.java +++ b/core/src/mindustry/content/StatusEffects.java @@ -114,7 +114,7 @@ public class StatusEffects implements ContentList{ }}; tarred = new StatusEffect("tarred"){{ - color = Liquids.tar.color; + color = Liquids.oil.color; speedMultiplier = 0.6f; effect = Fx.oily; @@ -157,9 +157,11 @@ public class StatusEffects implements ContentList{ shocked = new StatusEffect("shocked"){{ color = Pal.lancerLaser; - }}; + }}; - blasted = new StatusEffect("blasted"); + blasted = new StatusEffect("blasted"){{ + color = Items.blastCompound.color; + }}; corroded = new StatusEffect("corroded"){{ color = Pal.plastanium; From 89f04ed3e91b3e6eb5628d1862e2d22d1180b711 Mon Sep 17 00:00:00 2001 From: Sunny Kim <58885089+sk7725@users.noreply.github.com> Date: Sat, 17 Oct 2020 01:22:07 +0900 Subject: [PATCH 3/3] oh no --- core/src/mindustry/content/StatusEffects.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/core/src/mindustry/content/StatusEffects.java b/core/src/mindustry/content/StatusEffects.java index dc9758d54e..b498ccd2c0 100644 --- a/core/src/mindustry/content/StatusEffects.java +++ b/core/src/mindustry/content/StatusEffects.java @@ -35,7 +35,7 @@ public class StatusEffects implements ContentList{ }}; freezing = new StatusEffect("freezing"){{ - color = Liquids.cryofluid.color; + color = Color.valueOf("6ecdec"); speedMultiplier = 0.6f; healthMultiplier = 0.8f; effect = Fx.freezing; @@ -86,7 +86,7 @@ public class StatusEffects implements ContentList{ }}; melting = new StatusEffect("melting"){{ - color = Liquids.slag.color; + color = Color.valueOf("ffa166"); speedMultiplier = 0.8f; healthMultiplier = 0.8f; damage = 0.3f; @@ -114,7 +114,7 @@ public class StatusEffects implements ContentList{ }}; tarred = new StatusEffect("tarred"){{ - color = Liquids.oil.color; + color = Color.valueOf("313131"); speedMultiplier = 0.6f; effect = Fx.oily; @@ -160,7 +160,7 @@ public class StatusEffects implements ContentList{ }}; blasted = new StatusEffect("blasted"){{ - color = Items.blastCompound.color; + color = Color.valueOf("ff795e"); }}; corroded = new StatusEffect("corroded"){{