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

13 files changed, 47 insertions, 24 deletions

diff --git a/ShiftOS.WinForms/Resources/Ambient1.mp3 b/ShiftOS.WinForms/Resources/Ambient1.mp3
new file mode 100644
index 0000000..d623b29
--- /dev/null
+++ b/ShiftOS.WinForms/Resources/Ambient1.mp3
diff --git a/ShiftOS.WinForms/Resources/Ambient2.mp3 b/ShiftOS.WinForms/Resources/Ambient2.mp3
new file mode 100644
index 0000000..b16e72f
--- /dev/null
+++ b/ShiftOS.WinForms/Resources/Ambient2.mp3
diff --git a/ShiftOS.WinForms/Resources/Ambient3.mp3 b/ShiftOS.WinForms/Resources/Ambient3.mp3
new file mode 100644
index 0000000..cf06069
--- /dev/null
+++ b/ShiftOS.WinForms/Resources/Ambient3.mp3
diff --git a/ShiftOS.WinForms/Resources/Ambient4.mp3 b/ShiftOS.WinForms/Resources/Ambient4.mp3
new file mode 100644
index 0000000..7813b4f
--- /dev/null
+++ b/ShiftOS.WinForms/Resources/Ambient4.mp3
diff --git a/ShiftOS.WinForms/Resources/Ambient5.mp3 b/ShiftOS.WinForms/Resources/Ambient5.mp3
new file mode 100644
index 0000000..521330e
--- /dev/null
+++ b/ShiftOS.WinForms/Resources/Ambient5.mp3
diff --git a/ShiftOS.WinForms/Resources/Ambient6.mp3 b/ShiftOS.WinForms/Resources/Ambient6.mp3
new file mode 100644
index 0000000..86cb4a4
--- /dev/null
+++ b/ShiftOS.WinForms/Resources/Ambient6.mp3
diff --git a/ShiftOS.WinForms/Resources/Ambient7.mp3 b/ShiftOS.WinForms/Resources/Ambient7.mp3
new file mode 100644
index 0000000..9c5047a
--- /dev/null
+++ b/ShiftOS.WinForms/Resources/Ambient7.mp3
diff --git a/ShiftOS.WinForms/Resources/Ambient8.mp3 b/ShiftOS.WinForms/Resources/Ambient8.mp3
new file mode 100644
index 0000000..ac908b6
--- /dev/null
+++ b/ShiftOS.WinForms/Resources/Ambient8.mp3
diff --git a/ShiftOS.WinForms/Resources/Ambient9.mp3 b/ShiftOS.WinForms/Resources/Ambient9.mp3
new file mode 100644
index 0000000..46cb670
--- /dev/null
+++ b/ShiftOS.WinForms/Resources/Ambient9.mp3
diff --git a/ShiftOS.WinForms/Resources/ShiftnetServices.txt b/ShiftOS.WinForms/Resources/ShiftnetServices.txt
index d8582b6..fa3988b 100644
--- a/ShiftOS.WinForms/Resources/ShiftnetServices.txt
+++ b/ShiftOS.WinForms/Resources/ShiftnetServices.txt
@@ -11,21 +11,22 @@ With Freebie Solutions from ShiftSoft, you'll be able to traverse the Shiftnet w
 	{
 		Company: "Shiftcast",
 		Name: "NetXtreme Hyper Edition",
-		CostPerMonth: 1500,
+		CostPerMonth: 150,
 		DownloadSpeed: 524288, //512 kb/s
 		Description: "It's time to supercharge your Shiftnet experience. With all the multimedia available, fast download speeds are a must on the Shiftnet. Start your subscription today for the low price of 1500 Codepoints and become a hyper-traveller today."
 	},
 	{
-		Company: "Plumb Corp.",
-		Name: "youConnect",
-		CostPerMonth: 6000,
+		Company: "Bit Communications",
+		Name: "EncoderNet",
+		CostPerMonth: 600,
 		DownloadSpeed: 1048576, //1 mb/s
+		Description: "The most reliable service provider on the Shiftnet."
 	},
 	{
-		Company: "theCorp",
-		Name: "theNet",
-		CostPerMonth: 3000,
+		Company: "SOL Communications",
+		Name: "ShiftOS Online",
+		CostPerMonth: 300,
 		DownloadSpeed: 786342, //768 kb/s
-		Description: "theNet is not *just* a Shiftnet service provider. It is theGateway to all of theShiftnet and your needs. It is also theValue service provider with theGreatest price and download speed."
+		Description: "SOL is the Shiftnet."
 	},
 ]
\ No newline at end of file
diff --git a/ShiftOS.WinForms/Resources/Shiftorium.txt b/ShiftOS.WinForms/Resources/Shiftorium.txt
index b528c72..1a6d8c2 100644
--- a/ShiftOS.WinForms/Resources/Shiftorium.txt
+++ b/ShiftOS.WinForms/Resources/Shiftorium.txt
@@ -8,6 +8,41 @@
 		Category: "Enhancements",
 	},
 	{
+		Name: "Icon Manager",
+		Cost: 450,
+		Description: "This tool allows you to add and edit application icons within ShiftOS for the small prive of 450 Codepoints!",
+		Dependencies: "skinning",
+		Category: "Application"
+	},
+	{
+		Name: "AL Icon Manager",
+		Costs: 150,
+		Description: "Add an App Launcher entry for the Icon Manager.",
+		Dependencies: "icon_manager;app_launcher",
+		Category: "Customization"
+	},
+	{
+		Name: "Shift Progress Bar",
+		Cost: 150,
+		Description: "Want to customize the look of all ShiftOS Progress Bars? Buy this upgrade today and you'll get the ability to set the foreground and background color of the progress bar, and many more things!.",
+		Dependencies: "shifter;shift_buttons",
+		Category: "Customization"
+	},
+	{
+		Name: "Shift Buttons",
+		Cost: 150,
+		Description: "Want to customize the look of all ShiftOS buttons? This Shifter upgrade gives you a new \"Buttons\" category in the System category to do just that.",
+		Dependencies: "shifter",
+		Category: "Customization"
+	},
+	{
+		Name: "GUI Based Login Screen",
+		Cost: 500,
+		Description: "Tired of using the text-based login screen in ShiftOS? Well, we have a functioning window manager, and a functioning desktop, why not use these tools to create a functioning and awesome-looking login screen?",
+		Dependencies: "skinning;desktop;wm_free_placement",
+		Category: "Kernel & System"
+	},
+	{
 		Name: "Shift Screensavers",
 		Cost: 100,
 		Description: "This Shifter upgrade will allow you to customize the screensaver.",
@@ -131,13 +166,6 @@
 
 	// SHIFTLETTERS AND WORDLISTS
 	{
-		Name: "ShiftLetters",
-		Cost: 150,
-		Dependencies: null,
-		Category: "Applications",
-		Description: "Sick and tired of playing Pong? Buy this upgrade to get a whole new game!"
-	},
-	{
 		Name: "AL ShiftLetters",
 		Cost: 150,
 		Dependencies: "app_launcher;shiftletters",
@@ -269,7 +297,7 @@
 		Name: "AL Widget Manager",
 		Cost: 125,
 		Description: "Desktop Widgets are a huge advancement in ShiftOS technology, allowing access to system information, and quick control of your system, without even opening a window. However, we still need to be able to modify each widget. This upgrade adds an App Launcher entry for the Desktop Widget Manager.",
-		Description: "app_launcher;desktop_widgets",
+		Dependencies: "app_launcher;desktop_widgets",
 		Category: "GUI"
 	},
 	{
@@ -690,7 +718,8 @@
 		Name: "Artpad",
 		Cost: 7500,
 		Category: "Applications",
-		Description: "ArtPad is a very extensible tool that allows you to draw images within ShiftOS. Buy this upgrade to gain access to it through win.open{}!"
+		Description: "ArtPad is a very extensible tool that allows you to draw images within ShiftOS. Buy this upgrade to gain access to it through win.open{}!",
+		Dependencies: "color_depth_8_bits"
 	},
 	{
 		Name: "AL Artpad",
@@ -1008,13 +1037,6 @@
 	// SHIFTSWEEPER
 
 	{
-		Name: "ShiftSweeper",
-		Cost: 800,
-		Dependencies: "shiftletters",
-		Category: "Applications",
-		Description: "Getting bored with Pong and ShiftLetters? Try this BRAND NEW game called ShiftSweeper!"
-	},
-	{
 		Name: "AL ShiftSweeper",
 		Cost: 100,
 		Dependencies: "app_launcher;shiftsweeper",
diff --git a/ShiftOS.WinForms/Resources/iconSpeaker.bmp b/ShiftOS.WinForms/Resources/iconSpeaker.bmp
new file mode 100644
index 0000000..ec2defb
--- /dev/null
+++ b/ShiftOS.WinForms/Resources/iconSpeaker.bmp
diff --git a/ShiftOS.WinForms/Resources/notestate_connection_full.bmp b/ShiftOS.WinForms/Resources/notestate_connection_full.bmp
new file mode 100644
index 0000000..a4e15b3
--- /dev/null
+++ b/ShiftOS.WinForms/Resources/notestate_connection_full.bmp