From 7b9a8036d01fbb63bf928b5ad938bb8ab9b9357d Mon Sep 17 00:00:00 2001
From: minenice55 <star.elementa@gmail.com>
Date: Sun, 21 Jan 2024 19:15:28 -0500
Subject: [PATCH] Revert "Merge pull request #648 from blank3times/master"

This reverts commit bb4098665d8b6ee0fe3ca0cac25ac572f892cf0c, reversing
changes made to da73d62ce74a5af651d996d169039fcdb98888b4.
---
 Assets/Scripts/Games/AirRally/AirRally.cs     | 20 +++++++++----------
 Assets/Scripts/Games/DoubleDate/DoubleDate.cs | 14 ++++++-------
 2 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/Assets/Scripts/Games/AirRally/AirRally.cs b/Assets/Scripts/Games/AirRally/AirRally.cs
index da5b2b9b..efc5df19 100644
--- a/Assets/Scripts/Games/AirRally/AirRally.cs
+++ b/Assets/Scripts/Games/AirRally/AirRally.cs
@@ -141,7 +141,7 @@ namespace HeavenStudio.Games.Loaders
                     parameters = new List<Param>()
                     {
                         new Param("start", AirRally.DayNightCycle.Day, "Start Time", "Set the time of day for the start of the event."),
-                        new Param("end", AirRally.DayNightCycle.Twilight, "End Time", "Set the time of day for the end of the event."),
+                        new Param("end", AirRally.DayNightCycle.Noon, "End Time", "Set the time of day for the end of the event."),
                         new Param("ease", EasingFunction.Ease.Linear, "Ease", "Set the easing of the action.")
                     }
                 },
@@ -337,9 +337,9 @@ namespace HeavenStudio.Games
         [SerializeField] private Material bgMat;
         [SerializeField] private Material objectMat;
         [SerializeField] private Material cloudMat;
-        [SerializeField] private Color twilightColor;
+        [SerializeField] private Color noonColor;
         [SerializeField] private Color nightColor;
-        [SerializeField] private Color twilightColorCloud;
+        [SerializeField] private Color noonColorCloud;
         [SerializeField] private Color nightColorCloud;
         private DayNightCycle lastTime = DayNightCycle.Day;
         private DayNightCycle currentTime = DayNightCycle.Day;
@@ -684,20 +684,20 @@ namespace HeavenStudio.Games
             timeEase = ease;
             objectsColorFrom = lastTime switch
             {
-                DayNightCycle.Twilight => Color.black,
+                DayNightCycle.Noon => Color.black,
                 _ => Color.white,
             };
 
             objectsColorTo = currentTime switch
             {
-                DayNightCycle.Twilight => Color.black,
+                DayNightCycle.Noon => Color.black,
                 _ => Color.white,
             };
 
             bgColorFrom = lastTime switch
             {
                 DayNightCycle.Day => Color.white,
-                DayNightCycle.Twilight => twilightColor,
+                DayNightCycle.Noon => noonColor,
                 DayNightCycle.Night => nightColor,
                 _ => throw new System.NotImplementedException()
             };
@@ -705,7 +705,7 @@ namespace HeavenStudio.Games
             bgColorTo = currentTime switch
             {
                 DayNightCycle.Day => Color.white,
-                DayNightCycle.Twilight => twilightColor,
+                DayNightCycle.Noon => noonColor,
                 DayNightCycle.Night => nightColor,
                 _ => throw new System.NotImplementedException()
             };
@@ -713,7 +713,7 @@ namespace HeavenStudio.Games
             cloudColorFrom = lastTime switch
             {
                 DayNightCycle.Day => Color.white,
-                DayNightCycle.Twilight => twilightColorCloud,
+                DayNightCycle.Noon => noonColorCloud,
                 DayNightCycle.Night => nightColorCloud,
                 _ => throw new System.NotImplementedException()
             };
@@ -721,7 +721,7 @@ namespace HeavenStudio.Games
             cloudColorTo = currentTime switch
             {
                 DayNightCycle.Day => Color.white,
-                DayNightCycle.Twilight => twilightColorCloud,
+                DayNightCycle.Noon => noonColorCloud,
                 DayNightCycle.Night => nightColorCloud,
                 _ => throw new System.NotImplementedException()
             };
@@ -759,7 +759,7 @@ namespace HeavenStudio.Games
         public enum DayNightCycle
         {
             Day = 0,
-            Twilight = 1,
+            Noon = 1,
             Night = 2
         }
 
diff --git a/Assets/Scripts/Games/DoubleDate/DoubleDate.cs b/Assets/Scripts/Games/DoubleDate/DoubleDate.cs
index de35b592..02457f1e 100644
--- a/Assets/Scripts/Games/DoubleDate/DoubleDate.cs
+++ b/Assets/Scripts/Games/DoubleDate/DoubleDate.cs
@@ -79,7 +79,7 @@ namespace HeavenStudio.Games.Loaders
                     defaultLength = 0.5f,
                     parameters = new()
                     {
-                        new("d", DoubleDate.DayTime.Sunset, "Time", "Set the time of day.")
+                        new("d", DoubleDate.DayTime.Noon, "Time", "Set the time of day.")
                     }
                 }
             },
@@ -123,7 +123,7 @@ namespace HeavenStudio.Games
 
         [Header("Variables")]
         [SerializeField] private Color _skyColor;
-        [SerializeField] private Color sunsetColor;
+        [SerializeField] private Color noonColor;
         [SerializeField] private float _animSpeed = 1.25f;
         [SerializeField] public float cloudSpeed;
         [SerializeField] public float cloudDistance;
@@ -192,7 +192,7 @@ namespace HeavenStudio.Games
         public enum DayTime
         {
             Day,
-            Sunset
+            Noon
         }
 
         private void DayTimeCheck(double beat)
@@ -206,9 +206,9 @@ namespace HeavenStudio.Games
 
         public void SetTime(int time)
         {
-            if (time == (int)DayTime.Sunset)
+            if (time == (int)DayTime.Noon)
             {
-                doubleDateCellAnim.SetColor("_Color", sunsetColor);
+                doubleDateCellAnim.SetColor("_Color", noonColor);
                 bgSquare.color = squareColor;
                 bgGradient.sprite = bgLong;
                 return;
@@ -246,7 +246,7 @@ namespace HeavenStudio.Games
         {
             instance = this;
             SetupBopRegion("doubleDate", "bop", "autoBop");
-            doubleDateCellAnim.SetColor("_Color", sunsetColor);
+            doubleDateCellAnim.SetColor("_Color", noonColor);
             squareColor = bgSquare.color;
         }
 
@@ -508,4 +508,4 @@ namespace HeavenStudio.Games
             return shadow;
         }
     }
-}
+}
\ No newline at end of file