From 78d08856cfd54442a6217203e2d0cb0f48b71d18 Mon Sep 17 00:00:00 2001
From: Jenny Crowe <jakobwcrowe@berkeley.edu>
Date: Thu, 17 Feb 2022 05:11:06 -0700
Subject: [PATCH] BTSDS: Implemented upscale hit graphic. Tweezers: Added
 background color events.

---
 Assets/Resources/Games/rhythmTweezers.prefab  |   1 +
 .../Materials/Effects/EffectsLine01.png       | Bin 180 -> 5694 bytes
 .../Games/RhythmTweezers/RhythmTweezers.cs    |  35 ++++++++++++++++++
 Assets/Scripts/Minigames.cs                   |   9 +++++
 4 files changed, 45 insertions(+)

diff --git a/Assets/Resources/Games/rhythmTweezers.prefab b/Assets/Resources/Games/rhythmTweezers.prefab
index d30196df..8384d608 100644
--- a/Assets/Resources/Games/rhythmTweezers.prefab
+++ b/Assets/Resources/Games/rhythmTweezers.prefab
@@ -2185,6 +2185,7 @@ MonoBehaviour:
   Vegetable: {fileID: 6331401567023014501}
   VegetableDupe: {fileID: 9096051369561297840}
   VegetableAnimator: {fileID: 3603513546661280919}
+  bg: {fileID: 5813499711658895221}
   Tweezers: {fileID: 3391455012319192365}
   hairBase: {fileID: 4104508031135416673}
   longHairBase: {fileID: 2904820922900361117}
diff --git a/Assets/Resources/Sprites/Games/BuiltToScaleDS/Materials/Effects/EffectsLine01.png b/Assets/Resources/Sprites/Games/BuiltToScaleDS/Materials/Effects/EffectsLine01.png
index c9817b2fd768f23c4d8642cc13e7751e8951fea5..e3ad893dc797989fefe8af65c921a5864106b431 100644
GIT binary patch
literal 5694
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
WVNJ@3W`F<w>oUJ$bGgPC5&wU}E5|JW

literal 180
zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`)t)YnAr*7B_T1(>pupqw^}qcs
zPHyhirPC$OJFj+FnJOr@B`j*~^WWU_o)<jiP5G^Ls@P%52bQAR*y9cS5_)M0m#@E-
z_+V_@S|ecmM?=8(rP8m4CU(&x-xI|eDGxo$cr^0#XUH}mJaMW{v>{?sjKZcxjtrZb
d+*4(=W!6r%7d)uIIs@no22WQ%mvv4FO#pjBK=A+o

diff --git a/Assets/Scripts/Games/RhythmTweezers/RhythmTweezers.cs b/Assets/Scripts/Games/RhythmTweezers/RhythmTweezers.cs
index 145246e0..4e19c973 100644
--- a/Assets/Scripts/Games/RhythmTweezers/RhythmTweezers.cs
+++ b/Assets/Scripts/Games/RhythmTweezers/RhythmTweezers.cs
@@ -17,6 +17,7 @@ namespace RhythmHeavenMania.Games.RhythmTweezers
         public SpriteRenderer Vegetable;
         public SpriteRenderer VegetableDupe;
         public Animator VegetableAnimator;
+        public SpriteRenderer bg;
         public Tweezers Tweezers;
         public GameObject hairBase;
         public GameObject longHairBase;
@@ -42,6 +43,7 @@ namespace RhythmHeavenMania.Games.RhythmTweezers
 
         Tween transitionTween;
         bool transitioning = false;
+        Tween bgColorTween;
 
         private static Color _defaultOnionColor;
         public static Color defaultOnionColor
@@ -63,6 +65,16 @@ namespace RhythmHeavenMania.Games.RhythmTweezers
             }
         }
 
+        private static Color _defaultBgColor;
+        public static Color defaultBgColor
+        {
+            get
+            {
+                ColorUtility.TryParseHtmlString("#D8FFC1", out _defaultBgColor);
+                return _defaultBgColor;
+            }
+        }
+
         public static RhythmTweezers instance { get; set; }
 
         private void Awake()
@@ -171,6 +183,29 @@ namespace RhythmHeavenMania.Games.RhythmTweezers
             VegetableDupe.color = newColor;
         }
 
+        public void ChangeBackgroundColor(Color color, float beats)
+        {
+            var seconds = Conductor.instance.secPerBeat * beats;
+
+            if (bgColorTween != null)
+                bgColorTween.Kill(true);
+
+            if (seconds == 0)
+            {
+                bg.color = color;
+            }
+            else
+            {
+                bgColorTween = bg.DOColor(color, seconds);
+            }
+        }
+
+        public void FadeBackgroundColor(Color start, Color end, float beats)
+        {
+            ChangeBackgroundColor(start, 0f);
+            ChangeBackgroundColor(end, beats);
+        }
+
         private void Update()
         {
             if (!Conductor.instance.isPlaying && !Conductor.instance.isPaused && intervalStarted)
diff --git a/Assets/Scripts/Minigames.cs b/Assets/Scripts/Minigames.cs
index 6fb61843..bb90f923 100644
--- a/Assets/Scripts/Minigames.cs
+++ b/Assets/Scripts/Minigames.cs
@@ -216,6 +216,15 @@ namespace RhythmHeavenMania
                     } ),
                     new GameAction("set tweezer delay",     delegate { RhythmTweezers.instance.tweezerBeatOffset = eventCaller.currentEntity.length; }, 1f, true),
                     new GameAction("reset tweezer delay",   delegate { RhythmTweezers.instance.tweezerBeatOffset = 0f; }, 0.5f),
+                    new GameAction("set background color",        delegate { var e = eventCaller.currentEntity; RhythmTweezers.instance.ChangeBackgroundColor(e.colorA, 0f); }, 0.5f, false, new List<Param>() 
+                    {
+                        new Param("colorA", RhythmTweezers.defaultBgColor, "Background Color")
+                    } ),
+                    new GameAction("fade background color",        delegate { var e = eventCaller.currentEntity; RhythmTweezers.instance.FadeBackgroundColor(e.colorA, e.colorB, e.length); }, 1f, true, new List<Param>() 
+                    {
+                        new Param("colorA", Color.white, "Start Color"),
+                        new Param("colorB", RhythmTweezers.defaultBgColor, "End Color")
+                    } ),
                 }),
                 
                 new Minigame("rhythmRally", "Rhythm Rally \n<color=#eb5454>[WIP don't use]</color>", "B888F8", true, false, new List<GameAction>()