hang on, busy making a sad victor tran face

This commit is contained in:
Michael 2017-03-05 08:02:30 -05:00
parent eb37ab1ac4
commit fc55d4feec
7 changed files with 96 additions and 16 deletions

View file

@ -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; }
}
}

View file

@ -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" />

View file

@ -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(() =>

View file

@ -913,24 +913,52 @@ namespace ShiftOS.WinForms.Properties {
/// <summary>
/// Looks up a localized string similar to [
/// {
/// 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;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;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;AL Calculator&quot;,
/// Cost: 150,
/// Dependencies: &quot;calculator;app_launcher&quot;,
/// Description: &quot;Add an App Launcher Entry for the Calculator!&quot;
/// },
/// {
/// 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 {

View file

@ -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>

View file

@ -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: ""
},
{
},
{
},
]

View file

@ -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" />