Merge remote-tracking branch 'refs/remotes/shiftos-game/master'

2 files changed, 17 insertions, 0 deletions

diff --git a/ShiftOS.Objects/ClientSave.cs b/ShiftOS.Objects/ClientSave.cs
index edbb7dc..fbe1044 100644
--- a/ShiftOS.Objects/ClientSave.cs
+++ b/ShiftOS.Objects/ClientSave.cs
@@ -34,5 +34,14 @@ namespace ShiftOS.Objects
     {
         public string Username { get; set; }
         public string Password { get; set; }
+        public UserPermissions Permissions { get; set; }
+    }
+
+    public enum UserPermissions
+    {
+        Root,
+        Admin,
+        User,
+        Guest
     }
 }
diff --git a/ShiftOS.Objects/Save.cs b/ShiftOS.Objects/Save.cs
index ef512eb..4f91db7 100644
--- a/ShiftOS.Objects/Save.cs
+++ b/ShiftOS.Objects/Save.cs
@@ -34,7 +34,11 @@ namespace ShiftOS.Objects
     //Better to store this stuff server-side so we can do some neat stuff with hacking...
     public class Save
     {
+
+        [Obsolete("This save variable is no longer used in Beta 2.4 and above of ShiftOS. Please use ShiftOS.Engine.SaveSystem.CurrentUser.Username to access the current user's username.")]
         public string Username { get; set; }
+
+
         public long Codepoints { get; set; }
         public Dictionary<string, bool> Upgrades { get; set; }
         public int StoryPosition { get; set; }
@@ -45,6 +49,8 @@ namespace ShiftOS.Objects
         public int MinorVersion { get; set; }
         public int Revision { get; set; }
 
+        public string UniteAuthToken { get; set; }
+
         public bool IsPatreon { get; set; }
 
         public UserClass Class { get; set; }
@@ -91,6 +97,8 @@ namespace ShiftOS.Objects
             }
             return count;
         }
+
+        public List<ClientSave> Users = new List<ClientSave>();
     }
 
     public class SettingsObject : DynamicObject