From a1fa66f787a9298a67ab824303fd70f2b1bc5f79 Mon Sep 17 00:00:00 2001
From: Michael <Michael@some.where>
Date: Sat, 20 May 2017 08:27:05 -0400
Subject: document scripting

---
 ShiftOS_TheReturn/Scripting.cs | 251 ++++++++++++++++++++++++++++++++++++++---
 1 file changed, 234 insertions(+), 17 deletions(-)

(limited to 'ShiftOS_TheReturn/Scripting.cs')

diff --git a/ShiftOS_TheReturn/Scripting.cs b/ShiftOS_TheReturn/Scripting.cs
index d96bc98..dd5acfd 100644
--- a/ShiftOS_TheReturn/Scripting.cs
+++ b/ShiftOS_TheReturn/Scripting.cs
@@ -38,31 +38,65 @@ using System.Net;
 
 namespace ShiftOS.Engine.Scripting
 {
+    /// <summary>
+    /// Brings some C# goodies to the Lua system.
+    /// </summary>
     [Exposed("strutils")]
     public class StringUtils
     {
+        /// <summary>
+        /// Checks if a string ends with a specified string.
+        /// </summary>
+        /// <param name="operand">The string to operate on</param>
+        /// <param name="value">The string to check for</param>
+        /// <returns>Whether <paramref name="operand"/> ends with <paramref name="value"/>.</returns>
         public bool endswith(string operand, string value)
         {
             return operand.EndsWith(value);
         }
 
+
+        /// <summary>
+        /// Checks if a string starts with a specified string.
+        /// </summary>
+        /// <param name="operand">The string to operate on</param>
+        /// <param name="value">The string to check for</param>
+        /// <returns>Whether <paramref name="operand"/> starts with <paramref name="value"/>.</returns>
         public bool startswith(string operand, string value)
         {
             return operand.StartsWith(value);
         }
 
+        /// <summary>
+        /// Checks if a string contains a specified string.
+        /// </summary>
+        /// <param name="operand">The string to operate on</param>
+        /// <param name="value">The string to check for</param>
+        /// <returns>Whether <paramref name="operand"/> contains <paramref name="value"/>.</returns>
         public bool contains(string operand, string value)
         {
             return operand.Contains(value);
         }
     }
 
-
+    /// <summary>
+    /// DynamicLua wrapper for the ShiftOS engine.
+    /// </summary>
     public class LuaInterpreter
     {
+        /// <summary>
+        /// The DynamicLua backend.
+        /// </summary>
         public dynamic Lua = new DynamicLua.DynamicLua();
+
+        /// <summary>
+        /// Boolean representing whether the script is running.
+        /// </summary>
         public bool Running = true;
 
+        /// <summary>
+        /// Static constructor for the <see cref="LuaInterpreter"/> class. 
+        /// </summary>
         static LuaInterpreter()
         {
             ServerManager.MessageReceived += (msg) =>
@@ -83,12 +117,21 @@ namespace ShiftOS.Engine.Scripting
             };
         }
 
+        /// <summary>
+        /// Create a .SFT representation of a Lua script.
+        /// </summary>
+        /// <param name="lua">The Lua code to convert</param>
+        /// <returns>Base64 SFT representation.</returns>
         public static string CreateSft(string lua)
         {
             byte[] bytes = Encoding.UTF8.GetBytes(lua);
             return Convert.ToBase64String(bytes);
         }
 
+        /// <summary>
+        /// Run a compressed .SFT file as a lua script.
+        /// </summary>
+        /// <param name="sft">The .sft file to run.</param>
         public static void RunSft(string sft)
         {
             if (Utils.FileExists(sft))
@@ -108,8 +151,14 @@ namespace ShiftOS.Engine.Scripting
             }
         }
 
+        /// <summary>
+        /// Get the current working directory of the script.
+        /// </summary>
         public static string CurrentDirectory { get; private set; }
 
+        /// <summary>
+        /// Creates a new instance of the <see cref="LuaInterpreter"/> class. 
+        /// </summary>
         public LuaInterpreter()
         {
             Lua(@"function totable(clrlist)
@@ -128,6 +177,9 @@ end");
             };
         }
 
+        /// <summary>
+        /// Scans the engine, frontend, and all mods for Lua-exposed classes and functions.
+        /// </summary>
         public void SetupAPIs()
         {
             Lua.currentdir = (string.IsNullOrWhiteSpace(CurrentDirectory)) ? "0:" : CurrentDirectory;
@@ -233,7 +285,10 @@ end");
             });
         }
 
-        
+        /// <summary>
+        /// Executes the specified file as an uncompressed Lua script.
+        /// </summary>
+        /// <param name="file">The file to execute.</param>
         public void ExecuteFile(string file)
         {
             if (Utils.FileExists(file))
@@ -247,6 +302,10 @@ end");
             }
         }
 
+        /// <summary>
+        /// Executes the specified string as a Lua script.
+        /// </summary>
+        /// <param name="lua">The Lua code to execute.</param>
         public void Execute(string lua)
         {
             try
@@ -279,24 +338,46 @@ end");
         }
     }
 
+    /// <summary>
+    /// Lua functions for .sft files.
+    /// </summary>
     [Exposed("sft")]
     public class SFTFunctions
     {
+        /// <summary>
+        /// Make a .sft file from a lua code string
+        /// </summary>
+        /// <param name="lua">The Lua code</param>
+        /// <returns>The resulting .sft string</returns>
         public string make(string lua)
         {
             return LuaInterpreter.CreateSft(lua);
         }
 
+        /// <summary>
+        /// Make a .sft string and save to a specified file.
+        /// </summary>
+        /// <param name="lua">The Lua code to compress</param>
+        /// <param name="outpath">The path to save the compressed .sft file to.</param>
         public void makefile(string lua, string outpath)
         {
             Utils.WriteAllText(outpath, make(lua));
         }
 
+        /// <summary>
+        /// Run a compressed .sft file in the <see cref="LuaInterpreter"/>. 
+        /// </summary>
+        /// <param name="inpath">The .sft file to run.</param>
         public void run(string inpath)
         {
             LuaInterpreter.RunSft(inpath);
         }
 
+        /// <summary>
+        /// Reads the specified .sft file and decompresses to it's Lua form.
+        /// </summary>
+        /// <param name="sft">The .sft file to uncompress</param>
+        /// <returns>The resulting Lua code.</returns>
         public string unmake(string sft)
         {
             if (Utils.FileExists(sft))
@@ -310,9 +391,17 @@ end");
         }
     }
 
+    /// <summary>
+    /// Network functions for Lua.
+    /// </summary>
     [Exposed("net")]
     public class NetFunctions
     {
+        /// <summary>
+        /// Submit a GET request to the specified URL.
+        /// </summary>
+        /// <param name="url">The URL to open</param>
+        /// <returns>The result from the server</returns>
         public string get(string url)
         {
             return new WebClient().DownloadString(url);
@@ -320,26 +409,48 @@ end");
         
     }
 
+    /// <summary>
+    /// Console functions for Lua.
+    /// </summary>
     [Exposed("console")]
     public class ConsoleFunctions
     {
+        /// <summary>
+        /// Write text to the console.
+        /// </summary>
+        /// <param name="text">The text to write.</param>
         public void write(dynamic text)
         {
             Console.Write(text.ToString());
         }
 
+        /// <summary>
+        /// Write text to the console, followed by a new line.
+        /// </summary>
+        /// <param name="text">The text to write.</param>
         public void writeLine(dynamic text)
         {
             Console.WriteLine(text.ToString());
         }
     }
 
+    /// <summary>
+    /// The main ShiftOS API.
+    /// </summary>
     [Exposed("sos")]
     public class SystemFunctions
     {
+        /// <summary>
+        /// Retrieves the user's Codepoints from the save file.
+        /// </summary>
+        /// <returns>The user's Codepoints.</returns>
         public long getCodepoints() { return SaveSystem.CurrentSave.Codepoints; }
 
-
+        /// <summary>
+        /// Run a command in the Terminal.
+        /// </summary>
+        /// <param name="cmd">The command to run, using regular ShiftOS syntax.</param>
+        /// <returns>Whether the command was found and ran.</returns>
         public bool runCommand(string cmd)
         {
             var args = TerminalBackend.GetArgs(ref cmd);
@@ -347,6 +458,10 @@ end");
             return TerminalBackend.RunClient(cmd, args);
         }
 
+        /// <summary>
+        /// Adds the specified amount of Codepoints to the save flie.
+        /// </summary>
+        /// <param name="cp">The codepoints to add.</param>
         public void addCodepoints(int cp)
         {
             if (cp > 100 || cp <= 0)
@@ -361,128 +476,227 @@ end");
         }
     }
     
-    [Exposed("mud")]
-    public class MUDFunctions
-    {
-        public void sendDiagnostic(string src, string cat, object val)
-        {
-            ServerManager.SendMessage("diag_log", $"[{src}] <{cat}>: {val}");
-        }
-    }
-
+    /// <summary>
+    /// User information API.
+    /// </summary>
     [Exposed("userinfo")]
     public class UserInfoFunctions
     {
+        /// <summary>
+        /// Gets the user name of the currently logged in user.
+        /// </summary>
+        /// <returns>The user's username.</returns>
         public string getUsername()
         {
-            return SaveSystem.CurrentSave.Username;
+            return SaveSystem.CurrentUser.Username;
         }
 
+        /// <summary>
+        /// Retrieves the user's system name.
+        /// </summary>
+        /// <returns>The user's system name.</returns>
         public string getSysname()
         {
             return SaveSystem.CurrentSave.SystemName;
         }
 
+        /// <summary>
+        /// Gets the user's ShiftOS email (username@sysname).
+        /// </summary>
+        /// <returns>The user's email.</returns>
         public string getEmail()
         {
             return getUsername() + "@" + getSysname();
         }
     }
 
-
+    /// <summary>
+    /// Infobox API for Lua.
+    /// </summary>
     [Exposed("infobox")]
     public class InfoboxFunctions
     {
+        /// <summary>
+        /// Show a message to the user in an Infobox.
+        /// </summary>
+        /// <param name="title">The title of the Infobox</param>
+        /// <param name="message">The infobox's message</param>
+        /// <param name="callback">A function to run when the user clicks "OK"</param>
         public void show(string title, string message, Action callback = null)
         {
             Infobox.Show(title, message, callback);
         }
 
+        /// <summary>
+        /// Ask a simple yes/no question to the user using an Infobox.
+        /// </summary>
+        /// <param name="title">The title of the Infobox</param>
+        /// <param name="message">The infobox's message</param>
+        /// <param name="callback">A function to run when they choose an option. The boolean argument will be true if the user clicks Yes, and false if they click No.</param>
         public void question(string title, string message, Action<bool> callback)
         {
             Infobox.PromptYesNo(title, message, callback);
         }
 
-        public void input(string title, string message, Action<string> callback)
+        /// <summary>
+        /// Prompt the user for text using an Infobox.
+        /// </summary>
+        /// <param name="title">The infobox's title</param>
+        /// <param name="message">The infobox's message</param>
+        /// <param name="callback">A function to run when the user clicks "OK". The string value is the text entered by the user.</param>
+        /// <param name="isPassword">Whether the text box should hide its characters as if it were a password box.</param>
+        public void input(string title, string message, Action<string> callback, bool isPassword = false)
         {
-            Infobox.PromptText(title, message, callback);
+            Infobox.PromptText(title, message, callback, isPassword);
         }
     }
 
+    /// <summary>
+    /// File Skimmer API for Lua.
+    /// </summary>
     [Exposed("fileskimmer")]
     public class FileSkimmerFunctions
     {
+        /// <summary>
+        /// Opens a File Skimmer "Open File" dialog.
+        /// </summary>
+        /// <param name="extensions">Semicolon-separated list of file extensions that the opener should let through the filter.</param>
+        /// <param name="callback">Function to be called when the user chooses a file. The string value is the file's path.</param>
         public void openFile(string extensions, Action<string> callback)
         {
             FileSkimmerBackend.GetFile(extensions.Split(new[] { ";" }, StringSplitOptions.RemoveEmptyEntries), FileOpenerStyle.Open, callback);
         }
 
+        /// <summary>
+        /// Opens a File Skimmer "Save File" dialog.
+        /// </summary>
+        /// <param name="extensions">Semicolon-separated list of file extensions that the opener should let through the filter.</param>
+        /// <param name="callback">Function to be called when the user chooses a file. The string value is the file's path.</param>
         public void saveFile(string extensions, Action<string> callback)
         {
             FileSkimmerBackend.GetFile(extensions.Split(new[] { ";" }, StringSplitOptions.RemoveEmptyEntries), FileOpenerStyle.Save, callback);
         }
     }
 
+    /// <summary>
+    /// ShiftFS API for Lua.
+    /// </summary>
     [Exposed("fs")]
     public class ShiftFSFunctions
     {
+        /// <summary>
+        /// Read all text in a file to a string.
+        /// </summary>
+        /// <param name="path">The file path to read</param>
+        /// <returns>The string containing the file's contents.</returns>
         public string readAllText(string path)
         {
             return Utils.ReadAllText(path);
         }
 
+        /// <summary>
+        /// Copy a file from one place to another.
+        /// </summary>
+        /// <param name="i">The source file</param>
+        /// <param name="o">The destination path</param>
         public void copy(string i, string o)
         {
             Utils.WriteAllBytes(o, Utils.ReadAllBytes(i));
         }
 
+        /// <summary>
+        /// Gets all files in the specified directory.
+        /// </summary>
+        /// <param name="dir">The directory to search</param>
+        /// <returns>A string array containing all file paths in the directory.</returns>
         public string[] getFiles(string dir)
         {
             return Utils.GetFiles(dir);
         }
 
+        /// <summary>
+        /// Gets all directories inside a directory.
+        /// </summary>
+        /// <param name="dir">The directory to search</param>
+        /// <returns>A string array containing all directory paths in the directory.</returns>
         public string[] getDirectories(string dir)
         {
             return Utils.GetDirectories(dir);
         }
 
+        /// <summary>
+        /// Read the binary contents of a file to a <see cref="byte"/> array. 
+        /// </summary>
+        /// <param name="path">The file path to read.</param>
+        /// <returns>The resulting byte array.</returns>
         public byte[] readAllBytes(string path)
         {
             return Utils.ReadAllBytes(path);
         }
 
+        /// <summary>
+        /// Writes the specified text to a file.
+        /// </summary>
+        /// <param name="path">The file path</param>
+        /// <param name="contents">The text to write</param>
         public void writeAllText(string path, string contents)
         {
             Utils.WriteAllText(path, contents);
         }
 
+        /// <summary>
+        /// Writes the specified binary data to a file.
+        /// </summary>
+        /// <param name="path">The file path.</param>
+        /// <param name="contents">The binary data</param>
         public void writeAllBytes(string path, byte[] contents)
         {
             Utils.WriteAllBytes(path, contents);
         }
 
+        /// <summary>
+        /// Determines whether the specified path exists and is a file.
+        /// </summary>
+        /// <param name="path">The path to search</param>
+        /// <returns>The result of the search.</returns>
         public bool fileExists(string path)
         {
             return Utils.FileExists(path);
         }
 
+        /// <summary>
+        /// Determines whether the specified path exists and is a directory.
+        /// </summary>
+        /// <param name="path">The path to search</param>
+        /// <returns>The result of the search.</returns>
         public bool directoryExists(string path)
         {
             return Utils.DirectoryExists(path);
         }
 
+        /// <summary>
+        /// Deletes the file/directory at the specified path.
+        /// </summary>
+        /// <param name="path">The path to delete</param>
         public void delete(string path)
         {
             Utils.Delete(path);
         }
 
+        /// <summary>
+        /// Creates a new directory at the specified path.
+        /// </summary>
+        /// <param name="path">The path to create</param>
         public void createDirectory(string path)
         {
             Utils.CreateDirectory(path);
         }
     }
 
-
+    /// <summary>
+    /// Marks the specified class as a Lua API object.
+    /// </summary>
+    [AttributeUsage(AttributeTargets.Class, AllowMultiple = false)]
     public class ExposedAttribute : Attribute
     {
         /// <summary>
@@ -494,6 +708,9 @@ end");
             Name = name;
         }
 
+        /// <summary>
+        /// The API object's name
+        /// </summary>
         public string Name { get; private set; }
     }
 }
-- 
cgit v1.2.3


From c7ba7d733c756d196f98dd4533289a1ef4db715f Mon Sep 17 00:00:00 2001
From: Rylan/wowmom98 <youarenotgonnagetanemailoutofme@lolnope.com.net.org.fm>
Date: Sun, 28 May 2017 14:44:08 -0400
Subject: un obsoleting

---
 ShiftOS.Server/Core.cs                            |  3 ++-
 ShiftOS.WinForms/Applications/MUDControlCentre.cs | 16 ++++++++--------
 ShiftOS.WinForms/Applications/Skin Loader.cs      |  2 +-
 ShiftOS.WinForms/HackerCommands.cs                |  8 ++++----
 ShiftOS.WinForms/Oobe.cs                          |  2 +-
 ShiftOS.WinForms/Stories/LegionStory.cs           |  2 +-
 ShiftOS_TheReturn/Commands.cs                     |  2 +-
 ShiftOS_TheReturn/Scripting.cs                    |  2 +-
 ShiftOS_TheReturn/ServerManager.cs                |  4 ++--
 ShiftOS_TheReturn/TerminalBackend.cs              |  8 ++++----
 10 files changed, 25 insertions(+), 24 deletions(-)

(limited to 'ShiftOS_TheReturn/Scripting.cs')

diff --git a/ShiftOS.Server/Core.cs b/ShiftOS.Server/Core.cs
index 7bb5b1d..a53a5bc 100644
--- a/ShiftOS.Server/Core.cs
+++ b/ShiftOS.Server/Core.cs
@@ -32,6 +32,7 @@ using NetSockets;
 using Newtonsoft.Json;
 using System.IO;
 using static ShiftOS.Server.Program;
+using ShiftOS.Engine
 
 
 namespace ShiftOS.Server
@@ -180,7 +181,7 @@ namespace ShiftOS.Server
                     if (sve.EndsWith(".save"))
                     {
                         var save = JsonConvert.DeserializeObject<Save>(File.ReadAllText(sve));
-                        accs.Add($"{save.Username}@{save.SystemName}");
+                        accs.Add($"{ShiftOS.Engine.SaveSytem.CurrentUser.Username}@{save.SystemName}");
                     }
 
                 }
diff --git a/ShiftOS.WinForms/Applications/MUDControlCentre.cs b/ShiftOS.WinForms/Applications/MUDControlCentre.cs
index ab89ffd..97212e7 100644
--- a/ShiftOS.WinForms/Applications/MUDControlCentre.cs
+++ b/ShiftOS.WinForms/Applications/MUDControlCentre.cs
@@ -100,7 +100,7 @@ namespace ShiftOS.WinForms.Applications
                                     {
                                         ServerManager.SendMessage("shop_removeowned", JsonConvert.SerializeObject(new
                                         {
-                                            username = SaveSystem.CurrentSave.Username
+                                            username = SaveSystem.CurrentUser.Username
                                         }));
                                         ShowCreateShop();
                                     }
@@ -290,7 +290,7 @@ namespace ShiftOS.WinForms.Applications
                 creatingShop = true;
                 editingShop.Name = "My shop";
                 editingShop.Description = "My shop has lots of awesome items. You should buy from my shop.";
-                editingShop.Owner = SaveSystem.CurrentSave.Username;
+                editingShop.Owner = SaveSystem.CurrentUser.Username;
                 editingShop.Items = new List<ShopItem>();
                 shop_editor.BringToFront();
                 PopulateShopEditor();
@@ -402,7 +402,7 @@ namespace ShiftOS.WinForms.Applications
                 lbprice.Text = $"Cost: {item.Cost} CP";
                 btnbuy.Show();
             };
-            if(shop.Owner == SaveSystem.CurrentSave.Username)
+            if(shop.Owner == SaveSystem.CurrentUser.Username)
             {
                 btneditshop.Show();
             }
@@ -560,7 +560,7 @@ namespace ShiftOS.WinForms.Applications
 
             you_systemstatus.BringToFront();
 
-            lblsysstatus.Text = $@"Username: {SaveSystem.CurrentSave.Username}
+            lblsysstatus.Text = $@"Username: {SaveSystem.CurrentUser.Username}
 System name: {SaveSystem.CurrentSave.SystemName}
 
 Codepoints: {SaveSystem.CurrentSave.Codepoints}
@@ -591,7 +591,7 @@ Current legions: {legionname}";
         private void tsMemos_Click(object sender, EventArgs e)
         {
             ServerManager.SendMessage("get_memos_for_user", $@"{{
-    username: ""{SaveSystem.CurrentSave.Username}""                
+    username: ""{SaveSystem.CurrentUser.Username}""                
 }}");
             you_memos.BringToFront();
         }
@@ -812,7 +812,7 @@ Current legions: {legionname}";
         {
             ServerManager.SendMessage("user_shop_check", JsonConvert.SerializeObject(new
             {
-                username = SaveSystem.CurrentSave.Username
+                username = SaveSystem.CurrentUser.Username
             }));
         }
 
@@ -895,7 +895,7 @@ Current legions: {legionname}";
 
         private void myShopToolStripMenuItem_Click(object sender, EventArgs e)
         {
-            ServerManager.SendMessage("user_get_shop", SaveSystem.CurrentSave.Username);
+            ServerManager.SendMessage("user_get_shop", SaveSystem.CurrentUser.Username);
         }
 
         private void btneditshop_Click(object sender, EventArgs e)
@@ -923,7 +923,7 @@ Current legions: {legionname}";
                         {
                             ServerManager.SendMessage("delete_save", JsonConvert.SerializeObject(new ClientSave
                             {
-                                Username = SaveSystem.CurrentSave.Username,
+                                Username = SaveSystem.CurrentUser.Username,
                                 Password = SaveSystem.CurrentSave.Password
                             }));
 
diff --git a/ShiftOS.WinForms/Applications/Skin Loader.cs b/ShiftOS.WinForms/Applications/Skin Loader.cs
index 90b05a1..e4f0597 100644
--- a/ShiftOS.WinForms/Applications/Skin Loader.cs	
+++ b/ShiftOS.WinForms/Applications/Skin Loader.cs	
@@ -306,7 +306,7 @@ namespace ShiftOS.WinForms.Applications
                      System.IO.Directory.CreateDirectory(Paths.SharedFolder + "\\skins");
                  }
 
-                 string path = Paths.SharedFolder + "\\skins\\" + SaveSystem.CurrentSave.Username + "-" + fname;
+                 string path = Paths.SharedFolder + "\\skins\\" + SaveSystem.CurrentUser.Username + "-" + fname;
                  System.IO.File.WriteAllText(path, JsonConvert.SerializeObject(LoadedSkin));
                   
              })));
diff --git a/ShiftOS.WinForms/HackerCommands.cs b/ShiftOS.WinForms/HackerCommands.cs
index 86981f4..47b486d 100644
--- a/ShiftOS.WinForms/HackerCommands.cs
+++ b/ShiftOS.WinForms/HackerCommands.cs
@@ -107,7 +107,7 @@ namespace ShiftOS.WinForms
                 Thread.Sleep(2000);
                 writeSlow($"Hello there, fellow multi-user domain user.");
                 writeSlow("My name, as you can tell, is hacker101.");
-                writeSlow("And yours must be... don't say it... it's " + SaveSystem.CurrentSave.Username + "@" + SaveSystem.CurrentSave.SystemName + ", right?");
+                writeSlow("And yours must be... don't say it... it's " + SaveSystem.CurrentUser.Username + "@" + SaveSystem.CurrentSave.SystemName + ", right?");
                 writeSlow("Of course it is.");
                 writeSlow("And I bet you 10,000 Codepoints that you have... " + SaveSystem.CurrentSave.Codepoints.ToString() + " Codepoints.");
                 writeSlow("Oh, and how much upgrades have you installed since you first started using ShiftOS?");
@@ -135,7 +135,7 @@ namespace ShiftOS.WinForms
                 Console.Write(" ..done");
                 TerminalBackend.InStory = false;
                 TerminalBackend.PrefixEnabled = true;
-                Console.Write($"{SaveSystem.CurrentSave.Username}@{SaveSystem.CurrentSave.SystemName}:~$ ");
+                Console.Write($"{SaveSystem.CurrentUser.Username}@{SaveSystem.CurrentSave.SystemName}:~$ ");
                 StartHackerTutorial();
                 TerminalBackend.PrefixEnabled = true;
                 TerminalBackend.PrintPrompt();
@@ -454,7 +454,7 @@ namespace ShiftOS.WinForms
                     var sve = JsonConvert.DeserializeObject<Save>(msg.Contents);
                     if(sve.Password == pass)
                     {
-                        Console.WriteLine("Username: " + sve.Username);
+                        Console.WriteLine("Username: " + SaveSystem.CurrentUser.Username);
                         Console.WriteLine("Password: " + sve.Password);
                         Console.WriteLine("System name: " + sve.SystemName);
                         Console.WriteLine();
@@ -531,7 +531,7 @@ namespace ShiftOS.WinForms
                         }
 
                         sve.Codepoints -= amount;
-                        SaveSystem.TransferCodepointsFrom(sve.Username, amount);
+                        SaveSystem.TransferCodepointsFrom(SaveSystem.CurrentUser.Username, amount);
                         ServerManager.SendMessage("mud_save_allow_dead", JsonConvert.SerializeObject(sve));
                         SaveSystem.SaveGame();
                     }
diff --git a/ShiftOS.WinForms/Oobe.cs b/ShiftOS.WinForms/Oobe.cs
index 9182b4b..90395a7 100644
--- a/ShiftOS.WinForms/Oobe.cs
+++ b/ShiftOS.WinForms/Oobe.cs
@@ -302,7 +302,7 @@ namespace ShiftOS.WinForms
 
             var client = new UniteClient("http://getshiftos.ml", token);
             var sve = new Save();
-            sve.Username = client.GetEmail();
+            SaveSystem.CurrentUser.Username = client.GetEmail();
             sve.Password = Guid.NewGuid().ToString();
             sve.SystemName = client.GetSysName();
             sve.UniteAuthToken = token;
diff --git a/ShiftOS.WinForms/Stories/LegionStory.cs b/ShiftOS.WinForms/Stories/LegionStory.cs
index 53d55fb..433ad2d 100644
--- a/ShiftOS.WinForms/Stories/LegionStory.cs
+++ b/ShiftOS.WinForms/Stories/LegionStory.cs
@@ -142,7 +142,7 @@ namespace ShiftOS.WinForms.Stories
             {
                 WriteLine("DevX@mud - user connecting to your system.", false);
                 Thread.Sleep(2000);
-                WriteLine($"Hello, {SaveSystem.CurrentSave.Username}. It's been a while.");
+                WriteLine($"Hello, {SaveSystem.CurrentUser.Username}. It's been a while.");
                 WriteLine("My intelligence suggests you've installed all GUI-based Shiftorium upgrades.");
                 WriteLine("Bet you're liking ShiftOS now that the terminal isn't the only way you can control it.");
                 WriteLine("Well, now it's time to introduce your next task.");
diff --git a/ShiftOS_TheReturn/Commands.cs b/ShiftOS_TheReturn/Commands.cs
index 96e5af5..b97cd1d 100644
--- a/ShiftOS_TheReturn/Commands.cs
+++ b/ShiftOS_TheReturn/Commands.cs
@@ -95,7 +95,7 @@ namespace ShiftOS.Engine
             {
                 TerminalBackend.IsForwardingConsoleWrites = forwarding;
                 TerminalBackend.ForwardGUID = (forwarding == true) ? fGuid : null;
-                Console.WriteLine($"{SaveSystem.CurrentSave.Username} says \"{result}\".");
+                Console.WriteLine($"{SaveSystem.CurrentUser.Username} says \"{result}\".");
                 TerminalBackend.IsForwardingConsoleWrites = false;
             };
             Desktop.InvokeOnWorkerThread(new Action(() =>
diff --git a/ShiftOS_TheReturn/Scripting.cs b/ShiftOS_TheReturn/Scripting.cs
index dd5acfd..61c6676 100644
--- a/ShiftOS_TheReturn/Scripting.cs
+++ b/ShiftOS_TheReturn/Scripting.cs
@@ -312,7 +312,7 @@ end");
             {
                 Console.WriteLine("");
                 Lua(lua);
-                Console.WriteLine($"{SaveSystem.CurrentSave.Username}@{SaveSystem.CurrentSave.SystemName}:~$ ");
+                Console.WriteLine($"{SaveSystem.CurrentUser.Username}@{SaveSystem.CurrentSave.SystemName}:~$ ");
             }
             catch (Exception e)
             {
diff --git a/ShiftOS_TheReturn/ServerManager.cs b/ShiftOS_TheReturn/ServerManager.cs
index f0acaa2..abb674d 100644
--- a/ShiftOS_TheReturn/ServerManager.cs
+++ b/ShiftOS_TheReturn/ServerManager.cs
@@ -148,7 +148,7 @@ Ping: {ServerManager.DigitalSocietyPing} ms
             switch(msg.Name)
             {
                 case "getguid_fromserver":
-                    if(SaveSystem.CurrentSave.Username == msg.Contents)
+                    if(SaveSystem.CurrentUser.Username == msg.Contents)
                     {
                         client.Send(new NetObject("yes_i_am", new ServerMessage
                         {
@@ -244,7 +244,7 @@ Ping: {ServerManager.DigitalSocietyPing} ms
                 else if(msg.Name == "update_your_cp")
                 {
                     var args = JsonConvert.DeserializeObject<Dictionary<string, object>>(msg.Contents);
-                    if(args["username"] as string == SaveSystem.CurrentSave.Username)
+                    if(args["username"] as string == SaveSystem.CurrentUser.Username)
                     {
                         SaveSystem.CurrentSave.Codepoints += (long)args["amount"];
                         Desktop.InvokeOnWorkerThread(new Action(() =>
diff --git a/ShiftOS_TheReturn/TerminalBackend.cs b/ShiftOS_TheReturn/TerminalBackend.cs
index 1c024eb..6104927 100644
--- a/ShiftOS_TheReturn/TerminalBackend.cs
+++ b/ShiftOS_TheReturn/TerminalBackend.cs
@@ -581,7 +581,7 @@ namespace ShiftOS.Engine
 
                     if (TerminalBackend.PrefixEnabled)
                     {
-                        text3 = text4.Remove(0, $"{SaveSystem.CurrentSave.Username}@{SaveSystem.CurrentSave.SystemName}:~$ ".Length);
+                        text3 = text4.Remove(0, $"{SaveSystem.CurrentUser.Username}@{SaveSystem.CurrentSave.SystemName}:~$ ".Length);
                     }
                     IsForwardingConsoleWrites = true;
                     if (TerminalBackend.InStory == false)
@@ -590,7 +590,7 @@ namespace ShiftOS.Engine
                     }
                     if (TerminalBackend.PrefixEnabled)
                     {
-                        Console.Write($"{SaveSystem.CurrentSave.Username}@{SaveSystem.CurrentSave.SystemName}:~$ ");
+                        Console.Write($"{SaveSystem.CurrentUser.Username}@{SaveSystem.CurrentSave.SystemName}:~$ ");
                     }
                     IsForwardingConsoleWrites = false;
                 }
@@ -605,7 +605,7 @@ namespace ShiftOS.Engine
                     string pass = a["password"] as string;
                     string sys = a["sysname"] as string;
                     string guid = msg.GUID;
-                    if (SaveSystem.CurrentSave.Username == uName && SaveSystem.CurrentSave.Password == pass && CurrentSave.SystemName == sys)
+                    if (SaveSystem.CurrentUser.Username == uName && SaveSystem.CurrentSave.Password == pass && CurrentSave.SystemName == sys)
                     {
                         ForwardGUID = guid;
                         ServerManager.SendMessage("trm_handshake_accept", $@"{{
@@ -615,7 +615,7 @@ namespace ShiftOS.Engine
 
                         IsForwardingConsoleWrites = true;
                         InvokeCommand("sos.status");
-                        Console.Write($"{SaveSystem.CurrentSave.Username}@{SaveSystem.CurrentSave.SystemName}:~$ ");
+                        Console.Write($"{SaveSystem.CurrentUser.Username}@{SaveSystem.CurrentSave.SystemName}:~$ ");
                         IsForwardingConsoleWrites = false;
                     }
                 }
-- 
cgit v1.2.3


From 37ac4c684ce3904c5ec614362ed99bb9867ca0f3 Mon Sep 17 00:00:00 2001
From: Michael <Michael@some.where>
Date: Mon, 29 May 2017 20:08:30 -0400
Subject: It's amazing what talking to Rylan can do to an integer datatype.

---
 ShiftOS.Objects/EngineShiftnetSubscription.cs       |  2 +-
 ShiftOS.Objects/Save.cs                             |  4 ++--
 ShiftOS.Objects/Shop.cs                             |  2 +-
 ShiftOS.Objects/UniteClient.cs                      | 12 ++++++------
 ShiftOS.WinForms/Applications/Pong.cs               | 20 ++++++++++----------
 ShiftOS.WinForms/Applications/ShiftLetters.cs       |  2 +-
 ShiftOS.WinForms/Applications/ShiftLotto.cs         |  4 ++--
 ShiftOS.WinForms/Applications/ShiftSweeper.cs       |  8 ++++----
 ShiftOS.WinForms/Applications/Shifter.cs            |  2 +-
 ShiftOS.WinForms/Applications/ShiftoriumFrontend.cs |  4 ++--
 ShiftOS.WinForms/Applications/ShopItemCreator.cs    |  4 ++--
 ShiftOS.WinForms/HackerCommands.cs                  |  2 +-
 ShiftOS.WinForms/JobTasks.cs                        |  4 ++--
 ShiftOS.WinForms/ShiftnetSites/AppscapeMain.cs      |  4 ++--
 ShiftOS.WinForms/WinformsDesktop.cs                 |  2 +-
 ShiftOS_TheReturn/Commands.cs                       |  4 ++--
 ShiftOS_TheReturn/SaveSystem.cs                     |  4 ++--
 ShiftOS_TheReturn/Scripting.cs                      |  4 ++--
 ShiftOS_TheReturn/ServerManager.cs                  |  2 +-
 ShiftOS_TheReturn/Shiftorium.cs                     | 10 +++++-----
 20 files changed, 50 insertions(+), 50 deletions(-)

(limited to 'ShiftOS_TheReturn/Scripting.cs')

diff --git a/ShiftOS.Objects/EngineShiftnetSubscription.cs b/ShiftOS.Objects/EngineShiftnetSubscription.cs
index 1296a98..c319f18 100644
--- a/ShiftOS.Objects/EngineShiftnetSubscription.cs
+++ b/ShiftOS.Objects/EngineShiftnetSubscription.cs
@@ -10,7 +10,7 @@ namespace ShiftOS.Objects
     {
         public string Name { get; set; }
         public string Description { get; set; }
-        public int CostPerMonth { get; set; }
+        public uint CostPerMonth { get; set; }
         public int DownloadSpeed { get; set; }
         public string Company { get; set; }
     }
diff --git a/ShiftOS.Objects/Save.cs b/ShiftOS.Objects/Save.cs
index 8675a35..0fef7b3 100644
--- a/ShiftOS.Objects/Save.cs
+++ b/ShiftOS.Objects/Save.cs
@@ -41,9 +41,9 @@ namespace ShiftOS.Objects
         [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; }
 
-        private long _cp = 0;
+        private ulong _cp = 0;
 
-        public long Codepoints
+        public ulong Codepoints
         {
             get
             {
diff --git a/ShiftOS.Objects/Shop.cs b/ShiftOS.Objects/Shop.cs
index 65f5746..c603523 100644
--- a/ShiftOS.Objects/Shop.cs
+++ b/ShiftOS.Objects/Shop.cs
@@ -42,7 +42,7 @@ namespace ShiftOS.Objects
     {
         public string Name { get; set; }
         public string Description { get; set; }
-        public int Cost { get; set; }
+        public ulong Cost { get; set; }
         public int FileType { get; set; }
         public byte[] MUDFile { get; set; }
     }
diff --git a/ShiftOS.Objects/UniteClient.cs b/ShiftOS.Objects/UniteClient.cs
index d8e34b7..ccd721b 100644
--- a/ShiftOS.Objects/UniteClient.cs
+++ b/ShiftOS.Objects/UniteClient.cs
@@ -83,9 +83,9 @@ namespace ShiftOS.Unite
         /// Get the Pong codepoint highscore for the current user.
         /// </summary>
         /// <returns>The amount of Codepoints returned by the server</returns>
-        public int GetPongCP()
+        public ulong GetPongCP()
         {
-            return Convert.ToInt32(MakeCall("/API/GetPongCP"));
+            return Convert.ToUInt64(MakeCall("/API/GetPongCP"));
         }
 
         /// <summary>
@@ -110,7 +110,7 @@ namespace ShiftOS.Unite
         /// Set the pong Codepoints record for the user
         /// </summary>
         /// <param name="value">The amount of Codepoints to set the record to</param>
-        public void SetPongCP(int value)
+        public void SetPongCP(ulong value)
         {
             MakeCall("/API/SetPongCP/" + value.ToString());
         }
@@ -182,16 +182,16 @@ namespace ShiftOS.Unite
         /// Get the user's codepoints.
         /// </summary>
         /// <returns>The amount of codepoints stored on the server for this user.</returns>
-        public long GetCodepoints()
+        public ulong GetCodepoints()
         {
-            return Convert.ToInt64(MakeCall("/API/GetCodepoints"));
+            return Convert.ToUInt64(MakeCall("/API/GetCodepoints"));
         }
 
         /// <summary>
         /// Set the user's codepoints.
         /// </summary>
         /// <param name="value">The amount of codepoints to set the user's codepoints value to.</param>
-        public void SetCodepoints(long value)
+        public void SetCodepoints(ulong value)
         {
             MakeCall("/API/SetCodepoints/" + value.ToString());
         }
diff --git a/ShiftOS.WinForms/Applications/Pong.cs b/ShiftOS.WinForms/Applications/Pong.cs
index 84177b7..6d81c64 100644
--- a/ShiftOS.WinForms/Applications/Pong.cs
+++ b/ShiftOS.WinForms/Applications/Pong.cs
@@ -58,10 +58,10 @@ namespace ShiftOS.WinForms.Applications
         double incrementy = 0.2;
         int levelxspeed = 3;
         int levelyspeed = 3;
-        int beatairewardtotal;
-        int beataireward = 1;
-        int[] levelrewards = new int[50];
-        int totalreward;
+        ulong beatairewardtotal;
+        ulong beataireward = 1;
+        ulong[] levelrewards = new ulong[50];
+        ulong totalreward;
         int countdown = 3;
 
         bool aiShouldIsbeEnabled = true;
@@ -297,11 +297,11 @@ namespace ShiftOS.WinForms.Applications
                         lblmissedout.Text = Localization.Parse("{YOU_MISSED_OUT_ON}:") + Environment.NewLine + lblstatscodepoints.Text.Replace(Localization.Parse("{CODEPOINTS}: "), "") + Localization.Parse(" {CODEPOINTS}");
                         if (ShiftoriumFrontend.UpgradeInstalled("pong_upgrade_2"))
                         {
-                            totalreward = levelrewards[level - 1] + beatairewardtotal;
+                            totalreward = (ulong)(levelrewards[level - 1] + beatairewardtotal);
                             double onePercent = (totalreward / 100);
                             lblbutyougained.Show();
                             lblbutyougained.Text = Localization.Parse("{BUT_YOU_GAINED}:") + Environment.NewLine + onePercent.ToString("") + (Localization.Parse(" {CODEPOINTS}"));
-                            SaveSystem.TransferCodepointsFrom("pong", (totalreward / 100));
+                            SaveSystem.TransferCodepointsFrom("pong", (ulong)(totalreward / 100));
                         }
                         else
                         {
@@ -715,10 +715,10 @@ namespace ShiftOS.WinForms.Applications
             {
                 if (ShiftoriumFrontend.UpgradeInstalled("pong_upgrade"))
                 {
-                    beataireward = level * 10;
+                    beataireward = (ulong)(level * 10);
                 } else
                 {
-                    beataireward = level * 5;
+                    beataireward = (ulong)(level * 5);
                 }
             }
             else
@@ -726,11 +726,11 @@ namespace ShiftOS.WinForms.Applications
                 if (ShiftoriumFrontend.UpgradeInstalled("pong_upgrade"))
                 {
                     double br = levelrewards[level - 1] / 10;
-                    beataireward = (int)Math.Round(br) * 10;
+                    beataireward = (ulong)Math.Round(br) * 10;
                 } else
                 {
                     double br = levelrewards[level - 1] / 10;
-                    beataireward = (int)Math.Round(br) * 5;
+                    beataireward = (ulong)Math.Round(br) * 5;
                 }
             }
 
diff --git a/ShiftOS.WinForms/Applications/ShiftLetters.cs b/ShiftOS.WinForms/Applications/ShiftLetters.cs
index 42e19f8..0e9f74a 100644
--- a/ShiftOS.WinForms/Applications/ShiftLetters.cs
+++ b/ShiftOS.WinForms/Applications/ShiftLetters.cs
@@ -217,7 +217,7 @@ namespace ShiftOS.WinForms.Applications
                         if (!lblword.Text.Contains("_"))
                         {
                             int oldlives = lives;
-                            int cp = (word.Length * oldlives) * 2; //drunky michael made this 5x...
+                            ulong cp = (ulong)(word.Length * oldlives) * 2; //drunky michael made this 5x...
                             SaveSystem.TransferCodepointsFrom("shiftletters", cp);
                             StartGame();
                         }
diff --git a/ShiftOS.WinForms/Applications/ShiftLotto.cs b/ShiftOS.WinForms/Applications/ShiftLotto.cs
index 5ab8154..3f940c7 100644
--- a/ShiftOS.WinForms/Applications/ShiftLotto.cs
+++ b/ShiftOS.WinForms/Applications/ShiftLotto.cs
@@ -88,7 +88,7 @@ namespace ShiftOS.WinForms.Applications
             }
             else
             {
-                if (SaveSystem.CurrentSave.Codepoints - (codePoints * difficulty) <= 0)
+                if (SaveSystem.CurrentSave.Codepoints - (ulong)(codePoints * difficulty) <= 0)
                 {
                     Infobox.Show("Not enough Codepoints", "You do not have enough Codepoints to gamble this amount!");
                 }
@@ -102,7 +102,7 @@ namespace ShiftOS.WinForms.Applications
                     int winningNumber = rnd.Next(0, difficulty);
 
                     // Multiply CodePoints * Difficulty
-                    int jackpot = codePoints * difficulty;
+                    ulong jackpot = (ulong)(codePoints * difficulty);
 
                     // Test the random ints
                     if (guessedNumber == winningNumber)
diff --git a/ShiftOS.WinForms/Applications/ShiftSweeper.cs b/ShiftOS.WinForms/Applications/ShiftSweeper.cs
index f23ed73..772ec26 100644
--- a/ShiftOS.WinForms/Applications/ShiftSweeper.cs
+++ b/ShiftOS.WinForms/Applications/ShiftSweeper.cs
@@ -300,12 +300,12 @@ namespace ShiftOS.WinForms.Applications {
         }
 
         public void winGame() {
-            int cp = 0;
-            int origminecount = gameBombCount * 10;
+            ulong cp = 0;
+            ulong origminecount = (ulong)(gameBombCount * 10);
             if (minetimer < 31) cp = (origminecount * 3);
-            else if (minetimer < 61) cp = (Int32)(origminecount * 2.5);
+            else if (minetimer < 61) cp = (ulong)(origminecount * 2.5);
             else if (minetimer < 91) cp = (origminecount * 2);
-            else if (minetimer < 121) cp = (Int32)(origminecount * 1.5);
+            else if (minetimer < 121) cp = (ulong)(origminecount * 1.5);
             else if (minetimer > 120) cp = (origminecount * 1);
             SaveSystem.TransferCodepointsFrom("shiftsweeper", cp);
             panelGameStatus.Image = Properties.Resources.SweeperWinFace;
diff --git a/ShiftOS.WinForms/Applications/Shifter.cs b/ShiftOS.WinForms/Applications/Shifter.cs
index 1a59c80..3b3a4f1 100644
--- a/ShiftOS.WinForms/Applications/Shifter.cs
+++ b/ShiftOS.WinForms/Applications/Shifter.cs
@@ -391,7 +391,7 @@ namespace ShiftOS.WinForms.Applications
         }
 
 
-        public int CodepointValue = 0;
+        public uint CodepointValue = 0;
         public List<ShifterSetting> settings = new List<ShifterSetting>();
         public Skin LoadedSkin = null;
 
diff --git a/ShiftOS.WinForms/Applications/ShiftoriumFrontend.cs b/ShiftOS.WinForms/Applications/ShiftoriumFrontend.cs
index 08e6c8f..d6b014d 100644
--- a/ShiftOS.WinForms/Applications/ShiftoriumFrontend.cs
+++ b/ShiftOS.WinForms/Applications/ShiftoriumFrontend.cs
@@ -213,9 +213,9 @@ namespace ShiftOS.WinForms.Applications
 
         private void btnbuy_Click(object sender, EventArgs e)
         {
-            long cpCost = 0;
+            ulong cpCost = 0;
             backend.Silent = true;
-            Dictionary<string, long> UpgradesToBuy = new Dictionary<string, long>(); 
+            Dictionary<string, ulong> UpgradesToBuy = new Dictionary<string, ulong>(); 
             foreach (var itm in lbupgrades.SelectedItems)
             {
                 cpCost += upgrades[itm.ToString()].Cost;
diff --git a/ShiftOS.WinForms/Applications/ShopItemCreator.cs b/ShiftOS.WinForms/Applications/ShopItemCreator.cs
index 61e7491..d2836ee 100644
--- a/ShiftOS.WinForms/Applications/ShopItemCreator.cs
+++ b/ShiftOS.WinForms/Applications/ShopItemCreator.cs
@@ -73,7 +73,7 @@ namespace ShiftOS.WinForms.Applications
                 Infobox.Show("No file chosen.", "Please select a file to sell.");
                 return;
             }
-            Item.Cost = Convert.ToInt32(txtcost.Text);
+            Item.Cost = Convert.ToUInt64(txtcost.Text);
             Item.Description = txtdescription.Text;
             Item.Name = txtitemname.Text;
             Callback?.Invoke(Item);
@@ -101,7 +101,7 @@ namespace ShiftOS.WinForms.Applications
         {
             try
             {
-                Item.Cost = Convert.ToInt32(txtcost.Text);
+                Item.Cost = Convert.ToUInt64(txtcost.Text);
             }
             catch
             {
diff --git a/ShiftOS.WinForms/HackerCommands.cs b/ShiftOS.WinForms/HackerCommands.cs
index 47b486d..f467eb2 100644
--- a/ShiftOS.WinForms/HackerCommands.cs
+++ b/ShiftOS.WinForms/HackerCommands.cs
@@ -504,7 +504,7 @@ namespace ShiftOS.WinForms
             string usr = args["user"].ToString();
             string sys = args["sys"].ToString();
             string pass = args["pass"].ToString();
-            long amount = (long)args["amount"];
+            ulong amount = (ulong)args["amount"];
             if(amount < 0)
             {
                 Console.WriteLine("--invalid codepoint amount - halting...");
diff --git a/ShiftOS.WinForms/JobTasks.cs b/ShiftOS.WinForms/JobTasks.cs
index 622e287..d862961 100644
--- a/ShiftOS.WinForms/JobTasks.cs
+++ b/ShiftOS.WinForms/JobTasks.cs
@@ -35,12 +35,12 @@ namespace ShiftOS.WinForms
 {
     public class AcquireCodepointsJobTask : JobTask
     {
-        public AcquireCodepointsJobTask(int amount)
+        public AcquireCodepointsJobTask(uint amount)
         {
             CodepointsRequired = SaveSystem.CurrentSave.Codepoints + amount;
         }
 
-        public long CodepointsRequired { get; private set; }
+        public ulong CodepointsRequired { get; private set; }
 
         public override bool IsComplete
         {
diff --git a/ShiftOS.WinForms/ShiftnetSites/AppscapeMain.cs b/ShiftOS.WinForms/ShiftnetSites/AppscapeMain.cs
index fa575f4..c7830d0 100644
--- a/ShiftOS.WinForms/ShiftnetSites/AppscapeMain.cs
+++ b/ShiftOS.WinForms/ShiftnetSites/AppscapeMain.cs
@@ -372,7 +372,7 @@ namespace ShiftOS.WinForms
     /// </summary>
     public class AppscapeEntryAttribute : RequiresUpgradeAttribute
     {
-        public AppscapeEntryAttribute(string name, string description, int downloadSize, long cost, string dependencies = "", string category = "Misc") : base(name.ToLower().Replace(' ', '_'))
+        public AppscapeEntryAttribute(string name, string description, int downloadSize, ulong cost, string dependencies = "", string category = "Misc") : base(name.ToLower().Replace(' ', '_'))
         {
             Name = name;
             Description = description;
@@ -385,7 +385,7 @@ namespace ShiftOS.WinForms
         public string Name { get; private set; }
         public string Description { get; private set; }
         public string Category { get; private set; }
-        public long Cost { get; private set; }
+        public ulong Cost { get; private set; }
         public string DependencyString { get; private set; }
         public int DownloadSize { get; private set; }
     }
diff --git a/ShiftOS.WinForms/WinformsDesktop.cs b/ShiftOS.WinForms/WinformsDesktop.cs
index 85eab55..95e7c1a 100644
--- a/ShiftOS.WinForms/WinformsDesktop.cs
+++ b/ShiftOS.WinForms/WinformsDesktop.cs
@@ -192,7 +192,7 @@ namespace ShiftOS.WinForms
                 SetupDesktop();
             };
 
-            long lastcp = 0;
+            ulong lastcp = 0;
 
             var storythread = new Thread(() =>
             {
diff --git a/ShiftOS_TheReturn/Commands.cs b/ShiftOS_TheReturn/Commands.cs
index b97cd1d..ec89539 100644
--- a/ShiftOS_TheReturn/Commands.cs
+++ b/ShiftOS_TheReturn/Commands.cs
@@ -311,7 +311,7 @@ namespace ShiftOS.Engine
             if (args.ContainsKey("amount"))
                 try
                 {
-                    long codepointsToAdd = Convert.ToInt64(args["amount"].ToString());
+                    ulong codepointsToAdd = Convert.ToUInt64(args["amount"].ToString());
                     SaveSystem.CurrentSave.Codepoints += codepointsToAdd;
                     return true;
                 }
@@ -639,7 +639,7 @@ shiftorium.buy{{upgrade:""{upg.ID}""}}");
                     cat = args["cat"].ToString();
                 }
 
-                Dictionary<string, long> upgrades = new Dictionary<string, long>();
+                Dictionary<string, ulong> upgrades = new Dictionary<string, ulong>();
                 int maxLength = 5;
 
                 IEnumerable<ShiftoriumUpgrade> upglist = Shiftorium.GetAvailable();
diff --git a/ShiftOS_TheReturn/SaveSystem.cs b/ShiftOS_TheReturn/SaveSystem.cs
index d1b92fd..395db85 100644
--- a/ShiftOS_TheReturn/SaveSystem.cs
+++ b/ShiftOS_TheReturn/SaveSystem.cs
@@ -480,7 +480,7 @@ namespace ShiftOS.Engine
         /// Deducts a set amount of Codepoints from the save file... and sends them to a place where they'll never be seen again.
         /// </summary>
         /// <param name="amount">The amount of Codepoints to deduct.</param>
-        public static void TransferCodepointsToVoid(long amount)
+        public static void TransferCodepointsToVoid(ulong amount)
         {
             if (amount < 0)
                 throw new ArgumentOutOfRangeException("We see what you did there. Trying to pull Codepoints from the void? That won't work.");
@@ -584,7 +584,7 @@ namespace ShiftOS.Engine
         /// </summary>
         /// <param name="who">The character name</param>
         /// <param name="amount">The amount of Codepoints.</param>
-        public static void TransferCodepointsFrom(string who, long amount)
+        public static void TransferCodepointsFrom(string who, ulong amount)
         {
             if (amount < 0)
                 throw new ArgumentOutOfRangeException("We see what you did there... You can't just give a fake character Codepoints like that. It's better if you transfer them to the void.");
diff --git a/ShiftOS_TheReturn/Scripting.cs b/ShiftOS_TheReturn/Scripting.cs
index 61c6676..5021f50 100644
--- a/ShiftOS_TheReturn/Scripting.cs
+++ b/ShiftOS_TheReturn/Scripting.cs
@@ -444,7 +444,7 @@ end");
         /// Retrieves the user's Codepoints from the save file.
         /// </summary>
         /// <returns>The user's Codepoints.</returns>
-        public long getCodepoints() { return SaveSystem.CurrentSave.Codepoints; }
+        public ulong getCodepoints() { return SaveSystem.CurrentSave.Codepoints; }
 
         /// <summary>
         /// Run a command in the Terminal.
@@ -462,7 +462,7 @@ end");
         /// Adds the specified amount of Codepoints to the save flie.
         /// </summary>
         /// <param name="cp">The codepoints to add.</param>
-        public void addCodepoints(int cp)
+        public void addCodepoints(uint cp)
         {
             if (cp > 100 || cp <= 0)
             {
diff --git a/ShiftOS_TheReturn/ServerManager.cs b/ShiftOS_TheReturn/ServerManager.cs
index abb674d..1439c0d 100644
--- a/ShiftOS_TheReturn/ServerManager.cs
+++ b/ShiftOS_TheReturn/ServerManager.cs
@@ -246,7 +246,7 @@ Ping: {ServerManager.DigitalSocietyPing} ms
                     var args = JsonConvert.DeserializeObject<Dictionary<string, object>>(msg.Contents);
                     if(args["username"] as string == SaveSystem.CurrentUser.Username)
                     {
-                        SaveSystem.CurrentSave.Codepoints += (long)args["amount"];
+                        SaveSystem.CurrentSave.Codepoints += (ulong)args["amount"];
                         Desktop.InvokeOnWorkerThread(new Action(() =>
                         {
                             Infobox.Show($"MUD Control Centre", $"Someone bought an item in your shop, and they have paid {args["amount"]}, and as such, you have been granted these Codepoints.");
diff --git a/ShiftOS_TheReturn/Shiftorium.cs b/ShiftOS_TheReturn/Shiftorium.cs
index bd7105f..975939f 100644
--- a/ShiftOS_TheReturn/Shiftorium.cs
+++ b/ShiftOS_TheReturn/Shiftorium.cs
@@ -112,7 +112,7 @@ namespace ShiftOS.Engine
         /// <param name="id">The upgrade ID to buy</param>
         /// <param name="cost">The amount of Codepoints to deduct</param>
         /// <returns>True if the upgrade was installed successfully, false if the user didn't have enough Codepoints or the upgrade wasn' found.</returns>
-        public static bool Buy(string id, long cost)
+        public static bool Buy(string id, ulong cost)
         {
             if (SaveSystem.CurrentSave.Codepoints >= cost)
             {
@@ -365,7 +365,7 @@ namespace ShiftOS.Engine
         /// </summary>
         /// <param name="id">The upgrade ID to search</param>
         /// <returns>The codepoint value.</returns>
-        public static long GetCPValue(string id)
+        public static ulong GetCPValue(string id)
         {
             foreach (var upg in GetDefaults())
             {
@@ -520,7 +520,7 @@ namespace ShiftOS.Engine
     {
         public string Name { get; set; }
         public string Description { get; set; }
-        public long Cost { get; set; }
+        public ulong Cost { get; set; }
         public string ID { get { return (this.Id != null ? this.Id : (Name.ToLower().Replace(" ", "_"))); } }
         public string Id { get; set; }
         public string Category { get; set; }
@@ -536,7 +536,7 @@ namespace ShiftOS.Engine
 
     public class ShiftoriumUpgradeAttribute : RequiresUpgradeAttribute
     {
-        public ShiftoriumUpgradeAttribute(string name, long cost, string desc, string dependencies, string category) : base(name.ToLower().Replace(" ", "_"))
+        public ShiftoriumUpgradeAttribute(string name, ulong cost, string desc, string dependencies, string category) : base(name.ToLower().Replace(" ", "_"))
         {
             Name = name;
             Description = desc;
@@ -547,7 +547,7 @@ namespace ShiftOS.Engine
 
         public string Name { get; private set; }
         public string Description { get; private set; }
-        public long Cost { get; private set; }
+        public ulong Cost { get; private set; }
         public string Dependencies { get; private set; }
         public string Category { get; private set; }
     }
-- 
cgit v1.2.3