From e7d23cc119a581e49e05ccb46b0e02452aa8678f Mon Sep 17 00:00:00 2001 From: william341 Date: Sun, 18 Jun 2017 18:21:18 -0700 Subject: shiftoes easter egg --- ShiftOS.WinForms/MainMenu/MainMenu.cs | 8 ++++++++ ShiftOS.WinForms/Properties/Resources.Designer.cs | 10 ++++++++++ ShiftOS.WinForms/Properties/Resources.resx | 3 +++ ShiftOS.WinForms/Resources/shiftoes.png | Bin 0 -> 34065 bytes ShiftOS.WinForms/ShiftOS.WinForms.csproj | 1 + 5 files changed, 22 insertions(+) create mode 100644 ShiftOS.WinForms/Resources/shiftoes.png (limited to 'ShiftOS.WinForms') diff --git a/ShiftOS.WinForms/MainMenu/MainMenu.cs b/ShiftOS.WinForms/MainMenu/MainMenu.cs index f6bc833..043de0f 100644 --- a/ShiftOS.WinForms/MainMenu/MainMenu.cs +++ b/ShiftOS.WinForms/MainMenu/MainMenu.cs @@ -110,6 +110,14 @@ namespace ShiftOS.WinForms.MainMenu currentMenu = flmenu; CategoryText = Localization.Parse("{MAINMENU_TITLE}"); + //ShiftOeS easter egg + Random rnd = new Random(); + int RandomNum = rnd.Next(1,100); + if (RandomNum == 42) //if we find the answer to life, universe and everything than set the logo to shiftoes + { + shiftos.Image = Properties.Resources.shiftoes; + } + } private Random rnd = new Random(); diff --git a/ShiftOS.WinForms/Properties/Resources.Designer.cs b/ShiftOS.WinForms/Properties/Resources.Designer.cs index f56285a..cbc60b3 100644 --- a/ShiftOS.WinForms/Properties/Resources.Designer.cs +++ b/ShiftOS.WinForms/Properties/Resources.Designer.cs @@ -1122,6 +1122,16 @@ namespace ShiftOS.WinForms.Properties { } } + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + internal static System.Drawing.Bitmap shiftoes { + get { + object obj = ResourceManager.GetObject("shiftoes", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + /// /// Looks up a localized string similar to [ ///// SCREENSAVER diff --git a/ShiftOS.WinForms/Properties/Resources.resx b/ShiftOS.WinForms/Properties/Resources.resx index 5e5555b..f9b3f4a 100644 --- a/ShiftOS.WinForms/Properties/Resources.resx +++ b/ShiftOS.WinForms/Properties/Resources.resx @@ -34615,4 +34615,7 @@ ..\Resources\austmicrotrends.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\shiftoes.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + \ No newline at end of file diff --git a/ShiftOS.WinForms/Resources/shiftoes.png b/ShiftOS.WinForms/Resources/shiftoes.png new file mode 100644 index 0000000..db02b01 Binary files /dev/null and b/ShiftOS.WinForms/Resources/shiftoes.png differ diff --git a/ShiftOS.WinForms/ShiftOS.WinForms.csproj b/ShiftOS.WinForms/ShiftOS.WinForms.csproj index 32594bb..e91bdcc 100644 --- a/ShiftOS.WinForms/ShiftOS.WinForms.csproj +++ b/ShiftOS.WinForms/ShiftOS.WinForms.csproj @@ -900,6 +900,7 @@ + -- cgit v1.2.3 From d497555bda7ca99925b96ae0f47ca1bf49a475b3 Mon Sep 17 00:00:00 2001 From: william341 Date: Sun, 18 Jun 2017 18:30:28 -0700 Subject: Revert "shiftoes easter egg" This reverts commit e7d23cc119a581e49e05ccb46b0e02452aa8678f. --- ShiftOS.WinForms/MainMenu/MainMenu.cs | 8 -------- ShiftOS.WinForms/Properties/Resources.Designer.cs | 10 ---------- ShiftOS.WinForms/Properties/Resources.resx | 3 --- ShiftOS.WinForms/Resources/shiftoes.png | Bin 34065 -> 0 bytes ShiftOS.WinForms/ShiftOS.WinForms.csproj | 1 - 5 files changed, 22 deletions(-) delete mode 100644 ShiftOS.WinForms/Resources/shiftoes.png (limited to 'ShiftOS.WinForms') diff --git a/ShiftOS.WinForms/MainMenu/MainMenu.cs b/ShiftOS.WinForms/MainMenu/MainMenu.cs index 043de0f..f6bc833 100644 --- a/ShiftOS.WinForms/MainMenu/MainMenu.cs +++ b/ShiftOS.WinForms/MainMenu/MainMenu.cs @@ -110,14 +110,6 @@ namespace ShiftOS.WinForms.MainMenu currentMenu = flmenu; CategoryText = Localization.Parse("{MAINMENU_TITLE}"); - //ShiftOeS easter egg - Random rnd = new Random(); - int RandomNum = rnd.Next(1,100); - if (RandomNum == 42) //if we find the answer to life, universe and everything than set the logo to shiftoes - { - shiftos.Image = Properties.Resources.shiftoes; - } - } private Random rnd = new Random(); diff --git a/ShiftOS.WinForms/Properties/Resources.Designer.cs b/ShiftOS.WinForms/Properties/Resources.Designer.cs index cbc60b3..f56285a 100644 --- a/ShiftOS.WinForms/Properties/Resources.Designer.cs +++ b/ShiftOS.WinForms/Properties/Resources.Designer.cs @@ -1122,16 +1122,6 @@ namespace ShiftOS.WinForms.Properties { } } - /// - /// Looks up a localized resource of type System.Drawing.Bitmap. - /// - internal static System.Drawing.Bitmap shiftoes { - get { - object obj = ResourceManager.GetObject("shiftoes", resourceCulture); - return ((System.Drawing.Bitmap)(obj)); - } - } - /// /// Looks up a localized string similar to [ ///// SCREENSAVER diff --git a/ShiftOS.WinForms/Properties/Resources.resx b/ShiftOS.WinForms/Properties/Resources.resx index f9b3f4a..5e5555b 100644 --- a/ShiftOS.WinForms/Properties/Resources.resx +++ b/ShiftOS.WinForms/Properties/Resources.resx @@ -34615,7 +34615,4 @@ ..\Resources\austmicrotrends.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\shiftoes.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - \ No newline at end of file diff --git a/ShiftOS.WinForms/Resources/shiftoes.png b/ShiftOS.WinForms/Resources/shiftoes.png deleted file mode 100644 index db02b01..0000000 Binary files a/ShiftOS.WinForms/Resources/shiftoes.png and /dev/null differ diff --git a/ShiftOS.WinForms/ShiftOS.WinForms.csproj b/ShiftOS.WinForms/ShiftOS.WinForms.csproj index e91bdcc..32594bb 100644 --- a/ShiftOS.WinForms/ShiftOS.WinForms.csproj +++ b/ShiftOS.WinForms/ShiftOS.WinForms.csproj @@ -900,7 +900,6 @@ - -- cgit v1.2.3 From c2620851d390ecb3ef2ddb57696b86b1bd755a15 Mon Sep 17 00:00:00 2001 From: william341 Date: Sun, 18 Jun 2017 19:24:31 -0700 Subject: Add missing strings --- ShiftOS.WinForms/Resources/strings_en.txt | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) (limited to 'ShiftOS.WinForms') diff --git a/ShiftOS.WinForms/Resources/strings_en.txt b/ShiftOS.WinForms/Resources/strings_en.txt index 9e17f11..0a5eb3b 100644 --- a/ShiftOS.WinForms/Resources/strings_en.txt +++ b/ShiftOS.WinForms/Resources/strings_en.txt @@ -54,6 +54,7 @@ "{ERR_HIGHERPERMS}": "That user has more rights than you!", "{ERR_PASSWD_MISMATCH}": "Passwords don't match!", "{ERR_SYNTAXERROR}": "Syntax error.", + "{ERR_COMMANDNOTFOUND}": "Command not found.", //Command results "{RES_ACLUPDATED}": "User permissions updated.", @@ -242,6 +243,28 @@ "{FORMATEDITOR_VALUE_LOWER}": "value", "{FORMATEDITOR_ENTERSYNTAX}": "Enter syntax here", + //Program commands + "{WO_ABOUT}": "about", + "{WO_ADRESSBOOK}": "adress_book", + "{WO_ARTPAD}": "artpad", + "{WO_AUDIOPLAYER}": "audio_player", + "{WO_CALCULATOR}": "calculator", + "{WO_DOWNLOADER}": "downloader", + "{WO_FILESKIMMER}": "file_skimmer", + "{WO_INSTALLER}": "installer", + "{WO_MINDBLOW}": "mindblow", + "{WO_NAMECHANGER}": "name_changer", + "{WO_PONG}": "pong", + "{WO_SHIFTER}": "shifter", + "{WO_SHIFTLETTERS}": "shiftletters", + "{WO_SHIFTLOTTO}": "shiftlotto", + "{WO_SHIFTNET}": "shiftnet", + "{WO_SHIFTORIUM}": "shiftorium", + "{WO_SHIFTSWEEPER}": "shiftsweeper", + "{WO_SIMPLESRC}": "simplesrc", + "{WO_TERMINAL}": "terminal", + "{WO_TEXTPAD}": "textpad", + //BIOS screen text "{MISC_BIOSCOPYRIGHT}": "AMIBIOS (C) %year Australian Microtrends, Plc", "{MISC_BIOSVERSION}": "Shiftsoft 480-L ACPI BIOS Revision 1002", -- cgit v1.2.3 From 8a0e5946048a660a8a490a82193d7dad4fba79d4 Mon Sep 17 00:00:00 2001 From: william341 Date: Sun, 18 Jun 2017 19:32:50 -0700 Subject: derp --- ShiftOS.WinForms/Resources/strings_en.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'ShiftOS.WinForms') diff --git a/ShiftOS.WinForms/Resources/strings_en.txt b/ShiftOS.WinForms/Resources/strings_en.txt index 0a5eb3b..6fc2524 100644 --- a/ShiftOS.WinForms/Resources/strings_en.txt +++ b/ShiftOS.WinForms/Resources/strings_en.txt @@ -245,7 +245,7 @@ //Program commands "{WO_ABOUT}": "about", - "{WO_ADRESSBOOK}": "adress_book", + "{WO_ADDRESSBOOK}": "adress_book", "{WO_ARTPAD}": "artpad", "{WO_AUDIOPLAYER}": "audio_player", "{WO_CALCULATOR}": "calculator", -- cgit v1.2.3 From 65c163f6b0c0c455a920a343f57d0baac1c026ff Mon Sep 17 00:00:00 2001 From: william341 Date: Sun, 18 Jun 2017 19:42:05 -0700 Subject: Fix tutorial --- ShiftOS.WinForms/Applications/Terminal.cs | 56 +++++-------------------------- 1 file changed, 8 insertions(+), 48 deletions(-) (limited to 'ShiftOS.WinForms') diff --git a/ShiftOS.WinForms/Applications/Terminal.cs b/ShiftOS.WinForms/Applications/Terminal.cs index fbd769b..2b9a254 100644 --- a/ShiftOS.WinForms/Applications/Terminal.cs +++ b/ShiftOS.WinForms/Applications/Terminal.cs @@ -432,19 +432,9 @@ namespace ShiftOS.WinForms.Applications Thread.Sleep(2000); Console.WriteLine("Ahh, that reminds me. I suppose you don't know how to use the Terminal yet, do you..."); Thread.Sleep(2000); - Console.WriteLine("Well, the ShiftOS terminal is similar to a regular Linux terminal, however things are a bit... how you say.... primitive."); + Console.WriteLine("Well, you know what you say, things are best learned by doing them!"); Thread.Sleep(2000); - Console.WriteLine("Let's just say.... I've been focusing more on function than form with this one.... Anyways, here's how the terminal works."); - Thread.Sleep(2000); - Console.WriteLine("Each command is categorized into a \"Namespace\". All a namespace is, is a nice way of distinguishing between commands."); - Thread.Sleep(2000); - Console.WriteLine("...For example you may have a bunch of commands for managing files, and others for opening/closing programs."); - Thread.Sleep(2000); - Console.WriteLine("The three main namespaces you'll be using for the next while are the \"sos\", \"shiftorium\", and \"win\" namespaces."); - Thread.Sleep(2000); - Console.WriteLine("To run a command, simply type its namespace, followed by a period/full-stop, followed by the command name."); - Thread.Sleep(2000); - Console.WriteLine("Give it a try! Type \"sos.help\" in the following prompt to view a list of all ShiftOS commands."); + Console.WriteLine("Give it a try! Type \"help\" in the following prompt to view a list of all ShiftOS commands."); Thread.Sleep(2000); TerminalBackend.InStory = false; TerminalBackend.PrefixEnabled = true; @@ -452,7 +442,7 @@ namespace ShiftOS.WinForms.Applications bool help_entered = false; TerminalBackend.CommandProcessed += (text, args) => { - if (text.EndsWith("sos.help") && help_entered == false) + if (text.EndsWith("help") && help_entered == false) help_entered = true; }; while (help_entered == false) @@ -460,45 +450,15 @@ namespace ShiftOS.WinForms.Applications TerminalBackend.InStory = true; TerminalBackend.PrefixEnabled = false; Thread.Sleep(2000); - Console.WriteLine("Good job! Next, we will look at how to pass data to a command, such as win.open."); - Thread.Sleep(2000); - Console.WriteLine("In ShiftOS, passing data to a command is quite simple! After the command name, place an opening and closing curly brace, like so: \"win.open{}\"."); + Console.WriteLine("Good job! Next, we will look at how to pass data to a command, such as buy."); Thread.Sleep(2000); - Console.WriteLine("Everything between those two curly braces is treated as command data."); + Console.WriteLine("In ShiftOS, passing data to a command is quite simple! All you have to do is put --, and then the name of the argument! For example, you could do \"buy --upgrade \"name_of_upgrade\"\"!"); Thread.Sleep(2000); - Console.WriteLine("However, you can't just spam a bunch of 1s and 0s and call it a day, nonono!"); - Thread.Sleep(2000); - Console.WriteLine("Command data is split into a list of keys and values."); - Thread.Sleep(2000); - Console.WriteLine("The key tells the command the name of the data, and the value is what the command will see when it looks at the key."); + Console.WriteLine("However, you can't just spam a bunch of 1s and 0s and call it a day, nonono! You have to give it a value!"); Thread.Sleep(2000); Console.WriteLine("There are three main types of values. Booleans, which can be either \"true\" or \"false\", Numbers, which can be any integer number, positive or negative, and Strings - any piece of text as long as it is surrounded by double-quotes."); - Thread.Sleep(2000); - Console.WriteLine("For example, we could write every programmer's first program - by typing \"trm.echo{msg:\"Hello, world!\"}\". Running this will cause the Terminal to print, well, \"Hello, world!\""); - Thread.Sleep(2000); - Console.WriteLine("To open an application in ShiftOS, you can use this principle with the \"win.open\" command."); - Thread.Sleep(2000); - Console.WriteLine("First, type \"win.open\" with no data to see a list of all installed programs."); - Thread.Sleep(2000); - TerminalBackend.InStory = false; - bool winopenEntered = false; - TerminalBackend.PrefixEnabled = true; - TerminalBackend.PrintPrompt(); - TerminalBackend.CommandProcessed += (text, args) => - { - if (help_entered == true) - if (text.EndsWith("win.open") && winopenEntered == false) - winopenEntered = true; - }; - while (winopenEntered == false) - Thread.Sleep(10); - TerminalBackend.InStory = true; - TerminalBackend.PrefixEnabled = false; - - Thread.Sleep(2000); - Console.WriteLine("Pretty cool, it gave you a nice list of other win.open commands that will let you open each program."); - Thread.Sleep(2000); - Console.WriteLine("You've got the just of using ShiftOS. Now, for your goal."); + Thread.Sleep(10000); + Console.WriteLine("Now that you've got the gist of using ShiftOS, I have a goal for you."); Thread.Sleep(2000); Console.WriteLine("As you know, ShiftOS doesn't have very many features."); Thread.Sleep(2000); -- cgit v1.2.3 From c22370d643008e55121c0ddeaca0b81d755573ff Mon Sep 17 00:00:00 2001 From: william341 Date: Sun, 18 Jun 2017 20:05:46 -0700 Subject: fix --- ShiftOS.WinForms/Applications/Terminal.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'ShiftOS.WinForms') diff --git a/ShiftOS.WinForms/Applications/Terminal.cs b/ShiftOS.WinForms/Applications/Terminal.cs index 2b9a254..51ad42b 100644 --- a/ShiftOS.WinForms/Applications/Terminal.cs +++ b/ShiftOS.WinForms/Applications/Terminal.cs @@ -521,7 +521,7 @@ and only a few small programs to use to earn very little amounts of Codepoints. Now, let's get you your first Shiftorium upgrade!"); - Story.PushObjective("First Steps: The Shiftorium", "Buy your first Shiftorium upgrade with your new Codepoints using shiftorium.list, shiftorium.info and shiftorium.buy.", + Story.PushObjective("First Steps: The Shiftorium", "Buy your first Shiftorium upgrade with your new Codepoints using upgrades, upgradeinfo and buy.", () => { return SaveSystem.CurrentSave.CountUpgrades() > 0; -- cgit v1.2.3