From a4b49ab68b4383e84ee200f47ea21ed1b4b22ffa Mon Sep 17 00:00:00 2001
From: Michael <Michael@some.where>
Date: Wed, 8 Feb 2017 12:59:26 -0500
Subject: [PATCH] Mute the background music during OOBE

---
 ShiftOS.WinForms/Oobe.cs                 |  1 -
 ShiftOS.WinForms/ShiftOSAudioProvider.cs | 11 +++++++----
 ShiftOS.WinForms/WinformsDesktop.cs      | 11 +++++++----
 ShiftOS_TheReturn/Shiftorium.cs          |  4 ++++
 4 files changed, 18 insertions(+), 9 deletions(-)

diff --git a/ShiftOS.WinForms/Oobe.cs b/ShiftOS.WinForms/Oobe.cs
index 5ce6bff..83224b6 100644
--- a/ShiftOS.WinForms/Oobe.cs
+++ b/ShiftOS.WinForms/Oobe.cs
@@ -171,7 +171,6 @@ namespace ShiftOS.WinForms
                     TextType("Creating new user: " + MySave.Username);
                     TextType("...with 0 Codepoints, 0 installed upgrades, no legion, and no user shops...");
                     MySave.Codepoints = 0;
-                    MySave.Upgrades = new Dictionary<string, bool>();
                     MySave.CurrentLegions = new List<string>();
                     MySave.MyShop = "";
                     TextType("User created successfully.");
diff --git a/ShiftOS.WinForms/ShiftOSAudioProvider.cs b/ShiftOS.WinForms/ShiftOSAudioProvider.cs
index 52cbc92..6b3c93f 100644
--- a/ShiftOS.WinForms/ShiftOSAudioProvider.cs
+++ b/ShiftOS.WinForms/ShiftOSAudioProvider.cs
@@ -26,21 +26,24 @@ namespace ShiftOS.WinForms
             get
             {
                 if (SaveSystem.CurrentSave == null)
-                    return 1.0f;
+                    return 0.0f;
+                if (TutorialManager.IsInTutorial || SaveSystem.CurrentSave.StoryPosition < 1)
+                    return 0.0f;
                 try
                 {
                     return SaveSystem.CurrentSave.Settings.audioVolume;
                 }
                 catch
                 {
-                    SaveSystem.CurrentSave.Settings.audioVolume = 1.0f;
-                    return 1.0f;
+                    SaveSystem.CurrentSave.Settings.audioVolume = 0.45F;
+                    return 0.45F;
+                }
                 }
-            }
 
             set
             {
                 SaveSystem.CurrentSave.Settings.audioVolume = value;
+                //SaveSystem.SaveGame();
             }
         }
 
diff --git a/ShiftOS.WinForms/WinformsDesktop.cs b/ShiftOS.WinForms/WinformsDesktop.cs
index 93e290d..c940eae 100644
--- a/ShiftOS.WinForms/WinformsDesktop.cs
+++ b/ShiftOS.WinForms/WinformsDesktop.cs
@@ -99,11 +99,14 @@ namespace ShiftOS.WinForms
             };
             time.Tick += (o, a) =>
             {
-                if (SaveSystem.CurrentSave != null && TutorialManager.IsInTutorial == false)
+                if (Shiftorium.IsInitiated == true)
                 {
-                    lbtime.Text = Applications.Terminal.GetTime();
-                    lbtime.Left = desktoppanel.Width - lbtime.Width - LoadedSkin.DesktopPanelClockFromRight.X;
-                    lbtime.Top = LoadedSkin.DesktopPanelClockFromRight.Y;
+                    if (SaveSystem.CurrentSave != null && TutorialManager.IsInTutorial == false)
+                    {
+                        lbtime.Text = Applications.Terminal.GetTime();
+                        lbtime.Left = desktoppanel.Width - lbtime.Width - LoadedSkin.DesktopPanelClockFromRight.X;
+                        lbtime.Top = LoadedSkin.DesktopPanelClockFromRight.Y;
+                    }
                 }
             };
             time.Start();
diff --git a/ShiftOS_TheReturn/Shiftorium.cs b/ShiftOS_TheReturn/Shiftorium.cs
index 4e31427..8350dc3 100644
--- a/ShiftOS_TheReturn/Shiftorium.cs
+++ b/ShiftOS_TheReturn/Shiftorium.cs
@@ -30,6 +30,7 @@ using System.Reflection;
 using System.Text;
 using System.Threading.Tasks;
 using static ShiftOS.Engine.SaveSystem;
+using System.Diagnostics;
 
 namespace ShiftOS.Engine
 {
@@ -242,6 +243,9 @@ namespace ShiftOS.Engine
         public ShiftoriumUpgradeLookupException(string id) : base("A shiftorium upgrade of ID \"" + id + "\" was not found in the system.")
         {
             ID = id;
+
+            Debug.WriteLine("UpgradeNotFound: " + id);
+
         }
 
         public string ID { get; private set; }