tweaks here and there

4 files changed, 33 insertions, 68 deletions

diff --git a/ShiftOS.WinForms/Applications/ShiftSweeper.Designer.cs b/ShiftOS.WinForms/Applications/ShiftSweeper.Designer.cs
index 17b01b7..1df4f2e 100644
--- a/ShiftOS.WinForms/Applications/ShiftSweeper.Designer.cs
+++ b/ShiftOS.WinForms/Applications/ShiftSweeper.Designer.cs
@@ -104,7 +104,7 @@ namespace ShiftOS.WinForms.Applications
             this.easyPanel.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 11.11136F));
             this.easyPanel.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 11.11025F));
             this.easyPanel.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 11.11025F));
-            this.easyPanel.Size = new System.Drawing.Size(553, 308);
+            this.easyPanel.Size = new System.Drawing.Size(541, 308);
             this.easyPanel.TabIndex = 1;
             // 
             // buttonE
@@ -129,7 +129,7 @@ namespace ShiftOS.WinForms.Applications
             // 
             // buttonH
             // 
-            this.buttonH.Location = new System.Drawing.Point(482, 354);
+            this.buttonH.Location = new System.Drawing.Point(470, 354);
             this.buttonH.Name = "buttonH";
             this.buttonH.Size = new System.Drawing.Size(75, 23);
             this.buttonH.TabIndex = 4;
@@ -176,7 +176,7 @@ namespace ShiftOS.WinForms.Applications
             // flagButton
             // 
             this.flagButton.Image = global::ShiftOS.WinForms.Properties.Resources.SweeperTileBlock;
-            this.flagButton.Location = new System.Drawing.Point(537, 14);
+            this.flagButton.Location = new System.Drawing.Point(525, 14);
             this.flagButton.Name = "flagButton";
             this.flagButton.Size = new System.Drawing.Size(20, 20);
             this.flagButton.TabIndex = 9;
@@ -222,28 +222,29 @@ namespace ShiftOS.WinForms.Applications
             this.mediumPanel.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 6.251231F));
             this.mediumPanel.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 6.251231F));
             this.mediumPanel.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 6.251231F));
-            this.mediumPanel.Size = new System.Drawing.Size(553, 307);
+            this.mediumPanel.Size = new System.Drawing.Size(541, 307);
             this.mediumPanel.TabIndex = 2;
             // 
             // hardPanel
             // 
-            this.hardPanel.ColumnCount = 30;
-            this.hardPanel.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 6.249042F));
-            this.hardPanel.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 6.249044F));
-            this.hardPanel.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 6.249044F));
-            this.hardPanel.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 6.249044F));
-            this.hardPanel.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 6.249044F));
-            this.hardPanel.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 6.249044F));
-            this.hardPanel.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 6.249044F));
-            this.hardPanel.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 6.249044F));
-            this.hardPanel.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 6.249044F));
-            this.hardPanel.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 6.251231F));
-            this.hardPanel.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 6.251231F));
-            this.hardPanel.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 6.251231F));
-            this.hardPanel.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 6.251231F));
-            this.hardPanel.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 6.251231F));
-            this.hardPanel.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 6.251231F));
-            this.hardPanel.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 6.251231F));
+            this.hardPanel.ColumnCount = 27;
+            this.hardPanel.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 20F));
+            this.hardPanel.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 20F));
+            this.hardPanel.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 20F));
+            this.hardPanel.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 20F));
+            this.hardPanel.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 20F));
+            this.hardPanel.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 20F));
+            this.hardPanel.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 20F));
+            this.hardPanel.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 20F));
+            this.hardPanel.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 20F));
+            this.hardPanel.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 20F));
+            this.hardPanel.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 20F));
+            this.hardPanel.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 20F));
+            this.hardPanel.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 20F));
+            this.hardPanel.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 20F));
+            this.hardPanel.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 20F));
+            this.hardPanel.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 20F));
+            this.hardPanel.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 20F));
             this.hardPanel.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 20F));
             this.hardPanel.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 20F));
             this.hardPanel.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 20F));
@@ -278,7 +279,7 @@ namespace ShiftOS.WinForms.Applications
             this.hardPanel.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 6.251231F));
             this.hardPanel.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 6.251231F));
             this.hardPanel.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 6.251231F));
-            this.hardPanel.Size = new System.Drawing.Size(553, 308);
+            this.hardPanel.Size = new System.Drawing.Size(541, 308);
             this.hardPanel.TabIndex = 3;
             // 
             // ShiftSweeper
@@ -298,7 +299,7 @@ namespace ShiftOS.WinForms.Applications
             this.Controls.Add(this.easyPanel);
             this.Controls.Add(this.pictureBox1);
             this.Name = "ShiftSweeper";
-            this.Size = new System.Drawing.Size(624, 426);
+            this.Size = new System.Drawing.Size(563, 414);
             ((System.ComponentModel.ISupportInitialize)(this.pictureBox1)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.flagButton)).EndInit();
             this.ResumeLayout(false);
diff --git a/ShiftOS.WinForms/Applications/ShiftSweeper.cs b/ShiftOS.WinForms/Applications/ShiftSweeper.cs
index 529a7e8..c746017 100644
--- a/ShiftOS.WinForms/Applications/ShiftSweeper.cs
+++ b/ShiftOS.WinForms/Applications/ShiftSweeper.cs
@@ -35,7 +35,7 @@ using ShiftOS.Engine;
 
 namespace ShiftOS.WinForms.Applications
 {
-    [Launcher("ShiftSweeper", true, "shiftsweeper", "Games")]
+    [Launcher("ShiftSweeper", true, "al_shiftsweeper", "Games")]
     [RequiresUpgrade("shiftsweeper")]
     [WinOpen("shiftsweeper")]
     [DefaultIcon("iconShiftSweeper")]
diff --git a/ShiftOS.WinForms/Resources/Shiftorium.txt b/ShiftOS.WinForms/Resources/Shiftorium.txt
index 53cabb3..5b3ebe2 100644
--- a/ShiftOS.WinForms/Resources/Shiftorium.txt
+++ b/ShiftOS.WinForms/Resources/Shiftorium.txt
@@ -219,12 +219,6 @@
 		Dependencies: "textpad;file_skimmer",
 	},
 	{
-		Name: "TextPad Python Support",
-		Cost: 450,
-		Description: "Use TextPad to write Python scripts!",
-		Dependencies: "textpad;file_skimmer",	
-	},
-	{
 		Name: "App Launcher",
 		Cost: 7500,
 		Description: "It may be expensive, but having an easy-access menu to all your apps is very valuable.",
@@ -267,12 +261,6 @@
 		Dependencies: "name_changer",
 	},
 	{
-		Name: "{UPGRADE_DEVELOPMENT}",
-		Cost: 20000,
-		Description: "Dont buy this upgrade yet, it does nothing",
-		Dependencies: "",
-	},
-	{
 		Name: "AL Shifter",
 		Cost: 150,
 		Description: "Launch the Shifter from the app launcher.",
@@ -461,7 +449,7 @@
 		Name: "Audio Player AL",
 		Cost: 150,
 		Description: "Just another app launcher, making it easier to listen to your favorite songs!",
-		Dependencies: "desktop;wm_free_placement;wav_player"
+		Dependencies: "desktop;wm_free_placement;audio_player"
 	},
 
 	//SHIFTER SUBCATEGORIES
@@ -785,10 +773,16 @@
 	{
 		Name: "ShiftSweeper",
 		Cost: 800,
-		Dependencies: "app_launcher;shiftletters",
+		Dependencies: "shiftletters",
 		Description: "Getting bored with Pong and ShiftLetters? Try this BRAND NEW game called ShiftSweeper!"
 	},
 	{
+		Name: "AL ShiftSweeper",
+		Cost: 100,
+		Dependencies: "app_launcher;shiftsweeper",
+		Description: "Play ShiftSweeper quickly with this dandy applauncher!"
+	},
+	{
 		Name: "ShiftSweeper Medium",
 		Cost: 900,
 		Dependencies: "shiftsweeper",
diff --git a/ShiftOS_TheReturn/Resources/Shiftorium.txt b/ShiftOS_TheReturn/Resources/Shiftorium.txt
index 1f365f8..ab8e66c 100644
--- a/ShiftOS_TheReturn/Resources/Shiftorium.txt
+++ b/ShiftOS_TheReturn/Resources/Shiftorium.txt
@@ -60,30 +60,12 @@
 		Dependencies: "textpad;file_skimmer",
 	},
 	{
-		Name: "TextPad Python Support",
-		Cost: 450,
-		Description: "Use TextPad to write Python scripts!",
-		Dependencies: "textpad;file_skimmer",	
-	},
-	{
 		Name: "App Launcher",
 		Cost: 10000,
 		Description: "It may be expensive, but having an easy-access menu to all your apps is very valuable.",
 		Dependencies:"desktop;wm_unlimited_windows"
 	},
 	{
-		Name: "MUD Cracker",
-		Cost: 500,
-		Description: "An application for cracking the current multi-user domain's admin password.",
-		Dependencies: "mud_fundamentals"
-	},
-	{
-		Name: "AL MUD Cracker",
-		Cost: 100,
-		Description: "Add a launcher item for the MUD cracker.",
-		Dependencies: "mud_cracker;app_launcher"
-	},
-	{
 		Name: "Textpad",
 		Cost: 2500,
 		Description: "\"Write, save and open a text document.\"",
@@ -274,18 +256,6 @@
 		Description: "So you lost in pong, it must be sad to lose all the codepoints you've gained. With this upgrade you can save 1 percent of the loss, so at least you get something for losing!",
 		Dependencies: "mud_fundamentals;window_manager;pong_upgrade"
 	},
-	{
-		Name: "WAV Player",
-		Cost: 10000,
-		Description: "Want to listen to the greatest tunes? Well get this app asap!",
-		Dependencies: "desktop;wm_free_placement"
-	},
-	{
-		Name: "WAV Player AL",
-		Cost: 300,
-		Description: "Just another app launcher, making it easier to listen to your favorite songs!",
-		Dependencies: "desktop;wm_free_placement;wav_player"
-	},
 
 	//SHIFTER SUBCATEGORIES