diff --git a/ShiftOS.WinForms/Applications/Downloader.cs b/ShiftOS.WinForms/Applications/Downloader.cs
index 48a5cfd..da90c6d 100644
--- a/ShiftOS.WinForms/Applications/Downloader.cs
+++ b/ShiftOS.WinForms/Applications/Downloader.cs
@@ -173,28 +173,13 @@ namespace ShiftOS.WinForms.Applications
/// Download speed in bytes.
public static int GetDownloadSpeed()
{
- switch (SaveSystem.CurrentSave.ShiftnetSubscription)
- {
- case 0:
- return 256/*B*/;
- case 1:
- return 1024 * 1024/*KB*/;
- case 2:
- return 1024 * 10240/*KB*/;
- case 3:
- return 1024 * 1024 * 1024/*MB*/;
- }
- return 256;
+ return GetAllSubscriptions()[SaveSystem.CurrentSave.ShiftnetSubscription].DownloadSpeed;
}
- public static IEnumerable GetAllSubscriptions()
+ public static 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(Properties.Resources.ShiftnetServices))
- {
- yield return sub;
- }
+ return JsonConvert.DeserializeObject(Properties.Resources.ShiftnetServices);
}
public static void StartDownload(Download down)
diff --git a/ShiftOS.WinForms/Resources/ShiftnetServices.txt b/ShiftOS.WinForms/Resources/ShiftnetServices.txt
index a396849..e9c04e1 100644
--- a/ShiftOS.WinForms/Resources/ShiftnetServices.txt
+++ b/ShiftOS.WinForms/Resources/ShiftnetServices.txt
@@ -9,12 +9,22 @@ With Freebie Solutions from ShiftSoft, you'll be able to traverse the Shiftnet w
Company: "ShiftSoft"
},
{
- Company: ""
+ Company: "Shiftcast",
+ Name: "NetXtreme Hyper Edition",
+ CostPerMonth: 1500,
+ 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: 4000,
+ DownloadSpeed: 262144
},
{
-
+ Company: "theCorp",
+ Name: "theNet",
+ CostPerMonth: 2000,
+ DownloadSpeed: 1048576,
},
]
\ No newline at end of file