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

2 files changed, 202 insertions, 42 deletions

diff --git a/ShiftOS.WinForms/Stories/DevXSkinningStory.cs b/ShiftOS.WinForms/Stories/DevXSkinningStory.cs
new file mode 100644
index 0000000..09dfd7f
--- /dev/null
+++ b/ShiftOS.WinForms/Stories/DevXSkinningStory.cs
@@ -0,0 +1,99 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading;
+using System.Threading.Tasks;
+using ShiftOS.Engine;
+
+namespace ShiftOS.WinForms.Stories
+{
+    public class DevXSkinningStory
+    {
+        [Story("devx_1000_codepoints")]
+        public static void DevX1000CPStory()
+        {
+            Desktop.InvokeOnWorkerThread(() =>
+            {
+                var t = new Applications.Terminal();
+                AppearanceManager.SetupWindow(t);
+            });
+            TerminalBackend.InStory = true;
+            TerminalBackend.PrefixEnabled = false;
+            Thread.Sleep(3000);
+            Engine.AudioManager.PlayStream(Properties.Resources._3beepvirus);
+            Console.WriteLine("devx@anon_127420: Connection established.");
+            Thread.Sleep(1500);
+            Console.WriteLine("DevX: Hello, " + SaveSystem.CurrentUser.Username + "@" + SaveSystem.CurrentSave.SystemName + "! I see you've gotten a decent amount of Codepoints.");
+            Thread.Sleep(2000);
+            Console.WriteLine("DevX: Have you gotten a chance to install my \"Shifter\" application yet?");
+            Thread.Sleep(1500);
+            if (!Shiftorium.UpgradeInstalled("shifter"))
+            {
+                Console.WriteLine("You: Not yet. What's it for?");
+                Thread.Sleep(2000);
+                Console.WriteLine("DevX: The Shifter is a very effective way to make ShiftOS look however you want it to.");
+                Thread.Sleep(2000);
+                Console.WriteLine("DevX: It can even be adapted to support other applications, features and upgrades.");
+                Thread.Sleep(2000);
+            }
+            else
+            {
+                Console.WriteLine("You: Yeah. Just seems kinda lackluster to me. What is it supposed to do?");
+                Thread.Sleep(2000);
+                Console.WriteLine("DevX: The Shifter is a very effective way to make ShiftOS look however you want it to.");
+                Thread.Sleep(2000);
+                Console.WriteLine("DevX: It can even be adapted to support other applications, features and upgrades.");
+                Thread.Sleep(2000);
+                Console.WriteLine("DevX: I haven't finished it just yet. Keep upgrading it and you'll notice it gets a lot better.");
+                Thread.Sleep(2000);
+            }
+            Console.WriteLine("DevX: I'd also recommend going for the Skin Loader, that way you can save your creations to the disk. Also, go for the Skinning upgrade - which will allow more rich customization of certain elements.");
+            Thread.Sleep(2000);
+            Console.WriteLine("You: This still ain't gonna help me get back to my old system and out of this stupid Digital Society, is it?");
+            Thread.Sleep(2000);
+            Console.WriteLine("DevX: How the...How do you know about the Digital Societ....Who the hell talked!?");
+            Thread.Sleep(2000);
+            Console.WriteLine("You: Whoa! Just... calm down, will ya? I heard about it in the news, shortly before I got infected by this damn virus of an operating system.");
+            Thread.Sleep(2000);
+            Console.WriteLine("DevX: Whatever. That doesn't matter yet. Just focus on upgrading ShiftOS and earning Codepoints. I'll let you know when we're done. I've gotta go...work on something else.");
+            Thread.Sleep(1500);
+            Console.WriteLine("User disconnected.");
+            Thread.Sleep(2000);
+            Console.WriteLine("You: Something doesn't seem right about DevX. I wonder what he's really up to.");
+
+            if (Shiftorium.UpgradeInstalled("shifter"))
+                PushObjectives();
+            else
+                Story.PushObjective("Buy the Shifter.", "The Shifter is a super-effective way to earn more Codepoints. It is an essential buy if you haven't already bought it. Save up for the Shifter, and buy it using shiftorium.buy{upgrade:\"shifter\"}.", () =>
+                {
+                    return Shiftorium.UpgradeInstalled("shifter");
+                }, () =>
+                {
+                    PushObjectives();
+                });
+            Story.Context.AutoComplete = false;
+            TerminalBackend.InStory = false;
+            TerminalBackend.PrefixEnabled = false;
+            TerminalBackend.PrintPrompt();
+        }
+
+        public static void PushObjectives()
+        {
+            Story.PushObjective("Buy the Skinning upgrade", "The Skinning upgrade will allow you to set pictures in place of solid colors for most UI elements. If you want richer customization and more Codepoints, this upgrade is a necessity.", () =>
+            {
+                return Shiftorium.UpgradeInstalled("skinning");
+            }, ()=>
+            {
+                Story.PushObjective("Buy the Skin Loader.", "The Skin Loader is an application that allows you to save and load .skn files containing Shifter skin data. These files can be loaded in to the Skin Loader and applied to the system to give ShiftOS a completely different feel. It's Shiftorium upgrade ID is \"skin_loader\".", () =>
+                {
+                    return Shiftorium.UpgradeInstalled("skin_loader");
+                },
+                () =>
+                {
+                    Story.Context.MarkComplete();
+                });
+            });
+        }
+    }
+}
diff --git a/ShiftOS.WinForms/Stories/LegionStory.cs b/ShiftOS.WinForms/Stories/LegionStory.cs
index 9b4966f..056fe85 100644
--- a/ShiftOS.WinForms/Stories/LegionStory.cs
+++ b/ShiftOS.WinForms/Stories/LegionStory.cs
@@ -16,8 +16,8 @@ namespace ShiftOS.WinForms.Stories
         [Story("victortran_shiftnet")]
         public static void ShiftnetStoryFeaturingTheBlueSmileyFaceHolyFuckThisFunctionNameIsLong()
         {
-            CharacterName = "victor_tran";
-            SysName = "theos";
+            CharacterName = "aiden";
+            SysName = "appscape_main";
             bool waiting = false;
             var installer = new Applications.Installer();
             installer.InstallCompleted += () =>
@@ -35,47 +35,107 @@ namespace ShiftOS.WinForms.Stories
                 AppearanceManager.SetupWindow(term);
             }
 
-            var t = new Thread(() =>
+            WriteLine("aiden@appscape_main - user connecting to your system.", false);
+            Thread.Sleep(2000);
+            WriteLine("Hello there! My name's Aiden Nirh.");
+            WriteLine("I run a small Shiftnet website known simply as \"Appscape\".");
+            WriteLine("Oh - wait... you don't know what the Shiftnet is...");
+            WriteLine("Well, the Shiftnet is like... a private Internet, only accessible through ShiftOS.");
+            WriteLine("It has many sites and companies on it - banks, software centres, service providers, you name it.");
+            WriteLine("Appscape is one of them. I host many applications on Appscape, from games to utilities to productivity programs, and anything in between. If it exists as a ShiftOS program, it's either on the Shiftorium or Appscape.");
+            WriteLine("I'm going to assume you're interested... and I'll install the Shiftnet just in case.");
+            WriteLine("Beginning installation of Shiftnet...");
+            //Set up an Installer.
+            waiting = true;
+            Desktop.InvokeOnWorkerThread(() =>
             {
-                WriteLine("victortran@theos - user connecting to your system.", false);
-                Thread.Sleep(2000);
-                WriteLine("Hey there - yes, I am not just a sentient being. I am indeed Victor Tran.");
-                WriteLine("I am the creator of a Linux desktop environment called theShell.");
-                WriteLine("I'm in the middle of working on a ShiftOS version of it.");
-                WriteLine("However, before I start, I feel I need to show you something.");
-                WriteLine("You have a lot of ShiftOS applications, and you can earn lots of Codepoints - and you already have lots.");
-                WriteLine("Well, you'd be a perfect candidate for me to install the Shiftnet Client on your system.");
-                WriteLine("I'll begin the installation right now.");
-                //Set up an Installer.
-                waiting = true;
-                Desktop.InvokeOnWorkerThread(() =>
-                {
-                    Story.Start("installer");
-                    AppearanceManager.SetupWindow(installer);
-                    installer.InitiateInstall(new ShiftnetInstallation());
-                });
-                while (waiting == true)
-                    Thread.Sleep(25);
+                SaveSystem.CurrentSave.StoriesExperienced.Add("installer");
+                SaveSystem.CurrentSave.StoriesExperienced.Add("downloader");
 
-                WriteLine("All installed! Once I disconnect, type win.open to see a list of your new apps.");
-                WriteLine("The Shiftnet is a vast network of websites only accessible through ShiftOS.");
-                WriteLine("Think of it as the DarkNet, but much darker, and much more secretive.");
-                WriteLine("There are lots of apps, games, skins and utilities on the Shiftnet.");
-                WriteLine("There are also lots of companies offering many services.");
-                WriteLine("I'd stay on the shiftnet/ cluster though, others may be dangerous.");
-                WriteLine("I'd also stick to the sites listed on shiftnet/shiftsoft/ping - that site is regularly updated with the most safe Shiftnet sites.");
-                WriteLine("Anyways, it was nice meeting you, hopefully someday you'll give theShell a try.");
+                while (!Shiftorium.UpgradeInstalled("installer"))
+                    Thread.Sleep(20);
+                AppearanceManager.SetupWindow(installer);
+                installer.InitiateInstall(new ShiftnetInstallation());
+            });
+            while (waiting == true)
+                Thread.Sleep(25);
 
-                TerminalBackend.PrefixEnabled = true;
+            WriteLine("All good to go! Once I disconnect, type win.open to see a list of your new apps.");
+            WriteLine("I've installed everything you need, for free.");
+            WriteLine("You've got the Downloader, a simple application to help you track Shiftnet file downloads...");
+            WriteLine("...the Installer which will help you unpack programs from .stp files and install them to your system...");
+            WriteLine("...and lastly, the Shiftnet browser itself. This program lets you browse the Shiftnet, much like you would the real Internet.");
+            WriteLine("I'd stay on the shiftnet/ cluster though, because although there are many services on the Shiftnet, some of them may try to scam you into losing loads of Codepoints, or worse, wrecking your system with viruses.");
+            WriteLine("If you want a nice list of safe Shiftnet services, head to ShiftSoft's \"Ping\" site, at shiftnet/shiftsoft/ping.");
+            WriteLine("Oh, also, the Shiftnet, much like the real internet, is not free.");
+            WriteLine("It requires a service provider. Service providers cost a fair amount of Codepoints, but if you want to get faster speeds and more reliable connections on the Shiftnet, finding a good service provider is a necessity.");
+            WriteLine("Right now, you are on ShiftSoft's free trial plan, Freebie Solutions, which gives you access to the Shiftnet however you are locked at 256 bytes per second file downloads and can't leave the shiftnet/ cluster.");
+            WriteLine("It's enough to get you started - you'll want to find a faster provider though..");
+            WriteLine("Anyways, that's all I'll say for now. Have fun on the Shiftnet. I have to go work on something.");
+            WriteLine("One of my friends'll contact you once you've gotten a new service provider.");
+
+            Story.PushObjective("Register with a new Shiftnet service provider.", "You've just unlocked the Shiftnet, which has opened up a whole new world of applications and features for ShiftOS. Before you go nuts with it, you may want to register with a better service provider than Freebie Solutions.", () =>
+            {
+                return SaveSystem.CurrentSave.ShiftnetSubscription != 0;
+            },
+            () =>
+            {
+                Story.Context.MarkComplete();
+                SaveSystem.SaveGame();
                 TerminalBackend.PrintPrompt();
+                Story.Start("hacker101_breakingbonds_1");
             });
-            t.IsBackground = true;
-            t.Start();
 
-            TerminalBackend.PrefixEnabled = false;
+                TerminalBackend.PrefixEnabled = true;
+            TerminalBackend.PrintPrompt();
+
+            Story.Context.AutoComplete = false;
+        }
+
+        [Story("hacker101_breakingbonds_1")]
+        public static void BreakingTheBondsIntro()
+        {
+            CharacterName = "hacker101";
+            SysName = "pebcak";
+            
+            if (!terminalOpen())
+            {
+                var term = new Applications.Terminal();
+                AppearanceManager.SetupWindow(term);
+            }
+
+            WriteLine("hacker101@pebcak - user connecting to your system.", false);
+            Thread.Sleep(2000);
+            WriteLine("Greetings, user.");
+            WriteLine("My name is hacker101. I have a few things to show you.");
+            WriteLine("Before I can do that, however, I need you to do a few things.");
+            WriteLine("I'll assign what I need you to do as an objective. When you're done, I'll tell you what you need to know.");
+
+            Story.PushObjective("Breaking the Bonds: Errand Boy", @"hacker101 has something he needs to show you, however before he can, you need to do the following:
+
+ - Buy ""TriWrite"" from Appscape
+ - Buy ""Address Book"" from Appscape
+ - Buy ""SimpleSRC"" from Appscape", () =>
+            {
+                bool flag1 = Shiftorium.UpgradeInstalled("address_book");
+                bool flag2 = Shiftorium.UpgradeInstalled("triwrite");
+                bool flag3 = Shiftorium.UpgradeInstalled("simplesrc");
+                return flag1 && flag2 && flag3;
+            }, () =>
+            {
+                Story.Context.MarkComplete();
+                SaveSystem.SaveGame();
+                Story.Start("hacker101_breakingbonds_2");
+            });
+
+            TerminalBackend.PrefixEnabled = true;
+            TerminalBackend.PrintPrompt();
+
+            Story.Context.AutoComplete = false;
 
         }
 
+
         private static void WriteLine(string text, bool showCharacterName=true)
         {
             Console.WriteLine();
@@ -84,21 +144,22 @@ namespace ShiftOS.WinForms.Stories
                 ConsoleEx.Bold = true;
                 ConsoleEx.ForegroundColor = ConsoleColor.DarkMagenta;
                 Console.Write(CharacterName);
+                ConsoleEx.OnFlush?.Invoke();
                 Console.ForegroundColor = ConsoleColor.White;
                 Console.Write("@");
+                ConsoleEx.OnFlush?.Invoke();
                 ConsoleEx.ForegroundColor = ConsoleColor.Yellow;
                 Console.Write(SysName + ": ");
+                ConsoleEx.OnFlush?.Invoke();
             }
             ConsoleEx.ForegroundColor = ConsoleColor.Gray;
             ConsoleEx.Bold = false;
 
-            foreach (var c in text)
+            foreach(var c in text)
             {
-                Desktop.InvokeOnWorkerThread(() =>
-                {
-                    Console.Write(c);
-                });
-                Thread.Sleep(75);
+                Console.Write(c);
+                ConsoleEx.OnFlush?.Invoke();
+                Thread.Sleep(45);
             }
             Thread.Sleep(1000);
         }
@@ -149,7 +210,7 @@ namespace ShiftOS.WinForms.Stories
             {
                 WriteLine("DevX@mud - user connecting to your system.", false);
                 Thread.Sleep(2000);
-                WriteLine($"Hello, {SaveSystem.CurrentSave.Username}. It's been a while.");
+                WriteLine($"Hello, {SaveSystem.CurrentUser.Username}. It's been a while.");
                 WriteLine("My intelligence suggests you've installed all GUI-based Shiftorium upgrades.");
                 WriteLine("Bet you're liking ShiftOS now that the terminal isn't the only way you can control it.");
                 WriteLine("Well, now it's time to introduce your next task.");
@@ -307,7 +368,7 @@ namespace ShiftOS.WinForms.Stories
                     SetProgress(i);
                     Thread.Sleep(100);
                 }
-                Story.Start("downloader");
+                SaveSystem.CurrentSave.StoriesExperienced.Add("downloader");
                 SetProgress(0);
                 SetStatus("Dependencies installed.");
                 Thread.Sleep(2000);