Update Aurora message to use settings

Arkhorse · Jun 7, 2023 · e3e24ba · e3e24ba
1 parent 50078de
commit e3e24ba
Show file tree

Hide file tree

Showing 7 changed files with 6 additions and 12 deletions.
diff --git a/.vs/AuroraMonitor/FileContentIndex/0fc2399f-611c-4432-97a9-a99224603567.vsidx b/.vs/AuroraMonitor/FileContentIndex/0fc2399f-611c-4432-97a9-a99224603567.vsidx
diff --git a/.vs/AuroraMonitor/FileContentIndex/48f0336d-89cd-47cb-ac4a-d6ad206dc08f.vsidx b/.vs/AuroraMonitor/FileContentIndex/48f0336d-89cd-47cb-ac4a-d6ad206dc08f.vsidx
diff --git a/.vs/AuroraMonitor/FileContentIndex/8bb30e34-3b3a-4f57-9a99-7c49b5ebc547.vsidx b/.vs/AuroraMonitor/FileContentIndex/8bb30e34-3b3a-4f57-9a99-7c49b5ebc547.vsidx
diff --git a/.vs/AuroraMonitor/v17/.suo b/.vs/AuroraMonitor/v17/.suo
diff --git a/VisualStudio/Patches/GameManager_Update.cs b/VisualStudio/Patches/GameManager_Update.cs
@@ -7,7 +7,7 @@ private static void Postfix()
         {
             if (GameManager.GetAuroraManager().GetNormalizedAlpha() > 0f)
             {
-                Utilities.AuroraMonitorMessage("Active");
+                Utilities.AuroraMonitorMessage("Aurora Active", Settings.Instance.AuroraNotificationTime);
             }
             if (GameManager.GetAuroraManager().GetNormalizedAlpha() == 0f && AuroraMonitor.AuroraActive)
             {

diff --git a/VisualStudio/Patches/WeatherTransition_ChooseNextWeatherSet.cs b/VisualStudio/Patches/WeatherTransition_ChooseNextWeatherSet.cs
@@ -5,7 +5,7 @@ internal class WeatherTransition_ChooseNextWeatherSet
     {
         private static void Postfix()
         {
-            GearMessage.AddMessage("ico_journal", "Aurora Monitor", $"Next Weather Set: {GameManager.GetWeatherComponent().GetWeatherStage()}", 15f, false, true);
+            Utilities.AuroraMonitorMessage($"Next Weather: {GameManager.GetWeatherComponent().GetWeatherStage()}", Settings.Instance.WeatherStageNotificationTime);
         }
     }
 }
diff --git a/VisualStudio/Utilities/Utilities.cs b/VisualStudio/Utilities/Utilities.cs
@@ -36,25 +36,19 @@ internal class Utilities
 
         // Aurora Monitor Utils
 
-        public static void AuroraMonitorMessage(string message, bool log = false)
+        public static void AuroraMonitorMessage(string message, float messageTime, bool log = false)
         {
             if (message == null)            return;
             if (AuroraMonitor.AuroraActive) return;
             AuroraMonitor.AuroraActive = true;
             if (log) Log($"Aurora {message}");
-            GearMessage.AddMessage("ico_journal", "Aurora Monitor", $"Aurora {message}", 15f, false, true);
+            GearMessage.AddMessage("ico_journal", "Aurora Monitor", $"{message}", messageTime, false, true);
         }
 
         public static void UpdateAuroraColor()
         {
-            if (Settings.Instance.AuroraColour == Settings.AuroraColourSettings.Cinematic)
-            {
-                GameManager.GetAuroraManager().SetCinematicColours(true);
-            }
-            else
-            {
-                GameManager.GetAuroraManager().SetCinematicColours(false);
-            }
+            if (Settings.Instance.AuroraColour == Settings.AuroraColourSettings.Cinematic) GameManager.GetAuroraManager().SetCinematicColours(true);
+            else GameManager.GetAuroraManager().SetCinematicColours(false);
         }
     }
 }