calc update 3

3 files changed, 26 insertions, 6 deletions

diff --git a/ShiftOS.WinForms/Applications/Calculator.Designer.cs b/ShiftOS.WinForms/Applications/Calculator.Designer.cs
index d505e1a..f7a6e52 100644
--- a/ShiftOS.WinForms/Applications/Calculator.Designer.cs
+++ b/ShiftOS.WinForms/Applications/Calculator.Designer.cs
@@ -193,7 +193,7 @@ namespace ShiftOS.WinForms.Applications
             this.Controls.Add(this.button1);
             this.Controls.Add(this.numBox);
             this.Name = "Calculator";
-            this.Size = new System.Drawing.Size(150, 149);
+            this.Size = new System.Drawing.Size(186, 190);
             this.Load += new System.EventHandler(this.Template_Load);
             this.ResumeLayout(false);
             this.PerformLayout();
diff --git a/ShiftOS.WinForms/Applications/Calculator.cs b/ShiftOS.WinForms/Applications/Calculator.cs
index ac09567..f7eed4a 100644
--- a/ShiftOS.WinForms/Applications/Calculator.cs
+++ b/ShiftOS.WinForms/Applications/Calculator.cs
@@ -62,17 +62,17 @@ namespace ShiftOS.WinForms.Applications
 
         public void OnLoad()
         {
-            throw new NotImplementedException();
+            
         }
 
         public void OnSkinLoad()
         {
-            throw new NotImplementedException();
+            
         }
 
         public bool OnUnload()
         {
-            throw new NotImplementedException();
+            return true;
         }
 
         public void OnUpgrade()
@@ -82,7 +82,7 @@ namespace ShiftOS.WinForms.Applications
 
         private void button1_Click(object sender, EventArgs e)
         {
-            numBox.Text = "" + "1";
+            numBox.Text = numBox.Text + "1";
         }
     }
 }
diff --git a/ShiftOS.WinForms/Resources/Shiftorium.txt b/ShiftOS.WinForms/Resources/Shiftorium.txt
index c75372e..b81e469 100644
--- a/ShiftOS.WinForms/Resources/Shiftorium.txt
+++ b/ShiftOS.WinForms/Resources/Shiftorium.txt
@@ -700,6 +700,26 @@
        Cost: 2500,
        Dependencies: "shiftorium_gui",
        Description: "In the shiftorium GUI but dont know what you can spend because you can't see how many code points are on hand? Well shop easy, because with this upgrade that is now possible! You have to restart the shiftorium for it to work."
-    }
+    },
+
+		// CALCULATOR UPGRADES
+	{
+		Name: "Calculator",
+		Cost: 1000,
+		Dependencies: "wm_free_placement;desktop",
+		Description: "Crazy math problems getting you down? Well, this calculator will take care of that!"
+	},
+	{
+		Name: "AL Calculator",
+		Cost: 350,
+		Dependencies: "calculator;app_launcher",
+		Description: "Add an App Launcher Entry for the Calculator!"
+	},
+	{
+		Name: "Calc Equals Button",
+		Cost: 600,
+		Dependencies: "calculator",
+		Description: "Right now, you can only type numbers, but this equals button opens the door to solving equations!"
+	}
 	
 ]
\ No newline at end of file