aboutsummaryrefslogtreecommitdiff
path: root/ShiftOS_TheReturn
diff options
context:
space:
mode:
authorMichael <[email protected]>2017-03-07 09:18:40 -0500
committerMichael <[email protected]>2017-03-07 09:18:45 -0500
commit0ea74f3088d2b302ab796ae02fffb5dfd4bc8a4f (patch)
tree11d87e31d0d6a054165790e432f60ed0f80224f7 /ShiftOS_TheReturn
parent9c143b1249e03fa63492c7aa5283bf60f88c118b (diff)
downloadshiftos_thereturn-0ea74f3088d2b302ab796ae02fffb5dfd4bc8a4f.tar.gz
shiftos_thereturn-0ea74f3088d2b302ab796ae02fffb5dfd4bc8a4f.tar.bz2
shiftos_thereturn-0ea74f3088d2b302ab796ae02fffb5dfd4bc8a4f.zip
story stuff
Diffstat (limited to 'ShiftOS_TheReturn')
-rw-r--r--ShiftOS_TheReturn/SaveSystem.cs2
-rw-r--r--ShiftOS_TheReturn/Shiftorium.cs12
2 files changed, 10 insertions, 4 deletions
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
{