From 0ea74f3088d2b302ab796ae02fffb5dfd4bc8a4f Mon Sep 17 00:00:00 2001
From: Michael <Michael@some.where>
Date: Tue, 7 Mar 2017 09:18:40 -0500
Subject: story stuff

---
 ShiftOS_TheReturn/SaveSystem.cs |  2 +-
 ShiftOS_TheReturn/Shiftorium.cs | 12 +++++++++---
 2 files changed, 10 insertions(+), 4 deletions(-)

(limited to 'ShiftOS_TheReturn')

diff --git a/ShiftOS_TheReturn/SaveSystem.cs b/ShiftOS_TheReturn/SaveSystem.cs
index 9ae18a9..9f0b9b7 100644
--- a/ShiftOS_TheReturn/SaveSystem.cs
+++ b/ShiftOS_TheReturn/SaveSystem.cs
@@ -110,7 +110,7 @@ namespace ShiftOS.Engine
                     ServerManager.GUIDReceived += (str) =>
                     {
                         guidReceived = true;
-                        Console.WriteLine("{CONNECTION_SUCCESSFUL}");
+                        Console.WriteLine("Connection successful.");
                     };
 
                     try
diff --git a/ShiftOS_TheReturn/Shiftorium.cs b/ShiftOS_TheReturn/Shiftorium.cs
index 24fa123..198dcc7 100644
--- a/ShiftOS_TheReturn/Shiftorium.cs
+++ b/ShiftOS_TheReturn/Shiftorium.cs
@@ -204,10 +204,16 @@ namespace ShiftOS.Engine
             }
             try
             {
-                if (SaveSystem.CurrentSave.StoriesExperienced.Contains(id))
-                    return true;
+                if (SaveSystem.CurrentSave == null)
+                    return false;
 
-                return SaveSystem.CurrentSave.Upgrades[id];
+                if (SaveSystem.CurrentSave.StoriesExperienced == null)
+                    SaveSystem.CurrentSave.StoriesExperienced = new List<string>();
+
+                if (!SaveSystem.CurrentSave.StoriesExperienced.Contains(id))
+                    return SaveSystem.CurrentSave.Upgrades[id];
+
+                return true;
             }
             catch
             {
-- 
cgit v1.2.3