hang on, busy making a sad victor tran face

7 files changed, 93 insertions, 13 deletions

diff --git a/ShiftOS.Objects/EngineShiftnetSubscription.cs b/ShiftOS.Objects/EngineShiftnetSubscription.cs
new file mode 100644
index 0000000..1296a98
--- /dev/null
+++ b/ShiftOS.Objects/EngineShiftnetSubscription.cs
@@ -0,0 +1,17 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace ShiftOS.Objects
+{
+    public class EngineShiftnetSubscription
+    {
+        public string Name { get; set; }
+        public string Description { get; set; }
+        public int CostPerMonth { get; set; }
+        public int DownloadSpeed { get; set; }
+        public string Company { get; set; }
+    }
+}
diff --git a/ShiftOS.Objects/ShiftOS.Objects.csproj b/ShiftOS.Objects/ShiftOS.Objects.csproj
index 484f9df..3dc0c33 100644
--- a/ShiftOS.Objects/ShiftOS.Objects.csproj
+++ b/ShiftOS.Objects/ShiftOS.Objects.csproj
@@ -46,6 +46,7 @@
   </ItemGroup>
   <ItemGroup>
     <Compile Include="ClientSave.cs" />
+    <Compile Include="EngineShiftnetSubscription.cs" />
     <Compile Include="Job.cs" />
     <Compile Include="Legion.cs" />
     <Compile Include="MudAttributes.cs" />
diff --git a/ShiftOS.WinForms/Applications/Downloader.cs b/ShiftOS.WinForms/Applications/Downloader.cs
index b1b7ed9..48a5cfd 100644
--- a/ShiftOS.WinForms/Applications/Downloader.cs
+++ b/ShiftOS.WinForms/Applications/Downloader.cs
@@ -187,6 +187,16 @@ namespace ShiftOS.WinForms.Applications
             return 256;
         }
 
+        public static IEnumerable<ShiftOS.Objects.EngineShiftnetSubscription> GetAllSubscriptions()
+        {
+            //For now we'll have them hard-coded into the client but in future they'll be in the MUD.
+
+            foreach(var sub in JsonConvert.DeserializeObject<ShiftOS.Objects.EngineShiftnetSubscription[]>(Properties.Resources.ShiftnetServices))
+            {
+                yield return sub;
+            }
+        }
+
         public static void StartDownload(Download down)
         {
             var t = new Thread(() =>
diff --git a/ShiftOS.WinForms/Properties/Resources.Designer.cs b/ShiftOS.WinForms/Properties/Resources.Designer.cs
index 9262790..2df6f11 100644
--- a/ShiftOS.WinForms/Properties/Resources.Designer.cs
+++ b/ShiftOS.WinForms/Properties/Resources.Designer.cs
@@ -913,24 +913,52 @@ namespace ShiftOS.WinForms.Properties {
         
         /// <summary>
         ///   Looks up a localized string similar to [
-        ///// CALCULATOR UPGRADES
         ///	{
-        ///		Name: &quot;Calculator&quot;,
-        ///		Cost: 1000,
-        ///		Dependencies: &quot;wm_free_placement;desktop&quot;,
-        ///		Description: &quot;Crazy math problems getting you down? Well, this calculator will take care of that!&quot;
+        ///		Name: &quot;Freebie Solutions&quot;,
+        ///		DownloadSpeed: 256,
+        ///		CostPerMonth: 0,
+        ///		Description: &quot;The Shiftnet is a wonderful place full of apps, games, websites and skins for ShiftOS.
+        ///		
+        ///With Freebie Solutions from ShiftSoft, you&apos;ll be able to traverse the Shiftnet without any worry about monthly fees.&quot;,
+        ///		Company: &quot;ShiftSoft&quot;
+        ///	},
+        ///	{
+        ///		Company: &quot;&quot;
+        ///	},
+        ///	{
+        ///	
+        ///	},
+        ///	{
+        ///	
+        ///	},
+        ///].
+        /// </summary>
+        internal static string ShiftnetServices {
+            get {
+                return ResourceManager.GetString("ShiftnetServices", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to [
+        ///// SCREENSAVER
+        ///	{
+        ///		Name: &quot;Screensavers&quot;,
+        ///		Cost: 750,
+        ///		Description: &quot;Like to leave your PC idle for long periods of time? Save some energy and keep your screen from being tired by hiding the desktop behind a black screen with an image on it.&quot;,
+        ///		Dependencies: &quot;desktop&quot;
         ///	},
         ///	{
-        ///		Name: &quot;AL Calculator&quot;,
-        ///		Cost: 150,
-        ///		Dependencies: &quot;calculator;app_launcher&quot;,
-        ///		Description: &quot;Add an App Launcher Entry for the Calculator!&quot;
+        ///		Name: &quot;Shift Screensavers&quot;,
+        ///		Cost: 100,
+        ///		Description: &quot;This Shifter upgrade will allow you to customize the screensaver.&quot;,
+        ///		Dependencies: &quot;screensavers;shifter&quot;
         ///	},
+        ///
+        ///
+        ///// CALCULATOR UPGRADES
         ///	{
-        ///		Name: &quot;Calc Equals Button&quot;,
-        ///		Cost: 600,
-        ///		Dependencies: &quot;calculator&quot;,
-        ///		Description: &quot;Right now, you can only type numbers, [rest of string was truncated]&quot;;.
+        ///		Name: &quot;Calcul [rest of string was truncated]&quot;;.
         /// </summary>
         internal static string Shiftorium {
             get {
diff --git a/ShiftOS.WinForms/Properties/Resources.resx b/ShiftOS.WinForms/Properties/Resources.resx
index a5e2d4e..5100329 100644
--- a/ShiftOS.WinForms/Properties/Resources.resx
+++ b/ShiftOS.WinForms/Properties/Resources.resx
@@ -472,4 +472,7 @@
   <data name="SnakeyTailU" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\SnakeyTailU.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
+  <data name="ShiftnetServices" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\ShiftnetServices.txt;System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;Windows-1252</value>
+  </data>
 </root>
\ No newline at end of file
diff --git a/ShiftOS.WinForms/Resources/ShiftnetServices.txt b/ShiftOS.WinForms/Resources/ShiftnetServices.txt
new file mode 100644
index 0000000..a396849
--- /dev/null
+++ b/ShiftOS.WinForms/Resources/ShiftnetServices.txt
@@ -0,0 +1,20 @@
+[
+	{
+		Name: "Freebie Solutions",
+		DownloadSpeed: 256,
+		CostPerMonth: 0,
+		Description: "The Shiftnet is a wonderful place full of apps, games, websites and skins for ShiftOS.
+		
+With Freebie Solutions from ShiftSoft, you'll be able to traverse the Shiftnet without any worry about monthly fees.",
+		Company: "ShiftSoft"
+	},
+	{
+		Company: ""
+	},
+	{
+	
+	},
+	{
+	
+	},
+]
\ No newline at end of file
diff --git a/ShiftOS.WinForms/ShiftOS.WinForms.csproj b/ShiftOS.WinForms/ShiftOS.WinForms.csproj
index 9c39845..7d4f0d3 100644
--- a/ShiftOS.WinForms/ShiftOS.WinForms.csproj
+++ b/ShiftOS.WinForms/ShiftOS.WinForms.csproj
@@ -565,6 +565,7 @@
     <None Include="Resources\SnakeyHeadL.png" />
     <None Include="Resources\SnakeyHeadR.png" />
     <None Include="Resources\SnakeyFruit.png" />
+    <None Include="Resources\ShiftnetServices.txt" />
     <Content Include="SystemIcons\iconArtpad.png" />
     <Content Include="SystemIcons\iconAudioPlayer.png" />
     <Content Include="SystemIcons\iconBitnoteDigger.png" />