From e3a5e55d549d46ea4532439eabbcfb0eb16366a8 Mon Sep 17 00:00:00 2001 From: Carson Kompon Date: Sat, 26 Feb 2022 22:28:15 -0500 Subject: [PATCH] Shadow colours are much more accurate --- Assets/Scripts/Games/KarateMan/KarateJoe.cs | 2 +- Assets/Scripts/Games/KarateMan/KarateMan.cs | 8 ++++++++ Assets/Scripts/Games/KarateMan/Pot.cs | 2 +- 3 files changed, 10 insertions(+), 2 deletions(-) diff --git a/Assets/Scripts/Games/KarateMan/KarateJoe.cs b/Assets/Scripts/Games/KarateMan/KarateJoe.cs index 164fa3bf2..319b7b012 100644 --- a/Assets/Scripts/Games/KarateMan/KarateJoe.cs +++ b/Assets/Scripts/Games/KarateMan/KarateJoe.cs @@ -172,7 +172,7 @@ namespace RhythmHeavenMania.Games.KarateMan for(int i=0;i < shadows.Length; i++) { - shadows[i].color = Color.Lerp(KarateMan.instance.BGColor, new Color(35 / 255, 75 / 255, 1 / 255), 0.25f); + shadows[i].color = KarateMan.instance.GetShadowColor(); } } diff --git a/Assets/Scripts/Games/KarateMan/KarateMan.cs b/Assets/Scripts/Games/KarateMan/KarateMan.cs index 579c6810b..7e2d21314 100644 --- a/Assets/Scripts/Games/KarateMan/KarateMan.cs +++ b/Assets/Scripts/Games/KarateMan/KarateMan.cs @@ -29,6 +29,7 @@ namespace RhythmHeavenMania.Games.KarateMan public Color[] LightBulbColors; public Color[] BackgroundColors; + public static Color ShadowBlendColor = new Color(195f / 255f, 48f / 255f, 2f / 255f); const float hitVoiceOffset = 0.042f; @@ -308,5 +309,12 @@ namespace RhythmHeavenMania.Games.KarateMan shadow.transform.SetAsLastSibling(); bomb.GetComponent().shadow = shadow; } + + public Color GetShadowColor() + { + var col = Color.LerpUnclamped(KarateMan.instance.BGColor, KarateMan.ShadowBlendColor, 0.45f); + + return col; + } } } \ No newline at end of file diff --git a/Assets/Scripts/Games/KarateMan/Pot.cs b/Assets/Scripts/Games/KarateMan/Pot.cs index d622ffbda..b7021df22 100644 --- a/Assets/Scripts/Games/KarateMan/Pot.cs +++ b/Assets/Scripts/Games/KarateMan/Pot.cs @@ -118,7 +118,7 @@ namespace RhythmHeavenMania.Games.KarateMan if (Conductor.instance.songPositionInBeats >= createBeat) { spriteComp.enabled = true; - shadowSpriteComp.color = Color.Lerp(KarateMan.instance.BGColor, new Color(35 / 255, 75 / 255, 1 / 255), 0.25f); + shadowSpriteComp.color = KarateMan.instance.GetShadowColor(); } else {