From 2fa56446be7a049994786931e9145043362e8adb Mon Sep 17 00:00:00 2001 From: EverythingWindows Date: Sun, 20 Nov 2022 16:43:01 +0700 Subject: [PATCH] Guide command, MathQuiz App, ShiftOS About, and more --- ShiftOS-TheRevival/API/TerminalAPI.vb | 10 + .../InGame/LoreManager/IntroStoryTell.vb | 3 +- .../Functions/InGame/ROMs/Strings.vb | 2 + .../InGame/StoreManager/Shiftoriums.vb | 154 +++++++------ .../OutGame}/SaveLoadSystem.vb | 8 + .../{ => Applications}/Console.Designer.vb | 0 .../MainForms/{ => Applications}/Console.resx | 0 .../MainForms/{ => Applications}/Console.vb | 0 .../MainForms/ShiftOSAbout.Designer.vb | 209 ++++++++++++++++++ .../MainForms/ShiftOSAbout.resx | 120 ++++++++++ ShiftOS-TheRevival/MainForms/ShiftOSAbout.vb | 25 +++ .../MainForms/ShiftOSMenu.Designer.vb | 6 +- ShiftOS-TheRevival/MainForms/ShiftOSMenu.vb | 3 +- .../My Project/Resources.Designer.vb | 21 +- ShiftOS-TheRevival/My Project/Resources.resx | 3 + .../Resources/man Manuals/zip.txt | 11 + ShiftOS-TheRevival/ShiftOS-TheRevival.vbproj | 21 +- .../External/MathQuiz/App_MathQuiz.vb | 58 +++++ .../External/TerminalExternalApps.vb | 7 + .../Internal/Com_Guide.vb | 97 ++++++++ .../TerminalApplications/Internal/Com_Help.vb | 15 ++ .../Internal/Com_Manual.vb | 12 + .../Internal/Com_Unzip.vb | 3 +- .../TerminalApplications/Internal/Com_Zip.vb | 3 + 24 files changed, 713 insertions(+), 78 deletions(-) rename ShiftOS-TheRevival/{MainForms => Functions/OutGame}/SaveLoadSystem.vb (93%) rename ShiftOS-TheRevival/MainForms/{ => Applications}/Console.Designer.vb (100%) rename ShiftOS-TheRevival/MainForms/{ => Applications}/Console.resx (100%) rename ShiftOS-TheRevival/MainForms/{ => Applications}/Console.vb (100%) create mode 100644 ShiftOS-TheRevival/MainForms/ShiftOSAbout.Designer.vb create mode 100644 ShiftOS-TheRevival/MainForms/ShiftOSAbout.resx create mode 100644 ShiftOS-TheRevival/MainForms/ShiftOSAbout.vb create mode 100644 ShiftOS-TheRevival/Resources/man Manuals/zip.txt create mode 100644 ShiftOS-TheRevival/TerminalApplications/External/MathQuiz/App_MathQuiz.vb create mode 100644 ShiftOS-TheRevival/TerminalApplications/Internal/Com_Guide.vb diff --git a/ShiftOS-TheRevival/API/TerminalAPI.vb b/ShiftOS-TheRevival/API/TerminalAPI.vb index 76f46fa..700e0cc 100644 --- a/ShiftOS-TheRevival/API/TerminalAPI.vb +++ b/ShiftOS-TheRevival/API/TerminalAPI.vb @@ -211,6 +211,10 @@ Module TerminalAPI AdvancedCommand = False NormalCommand() 'Undeveloped() + Case "guide" + Guide() + AdvancedCommand = False + NormalCommand() Case "help" Help() AdvancedCommand = False @@ -219,6 +223,12 @@ Module TerminalAPI If Strings.AvailableFeature(4) = 1 Then NewLine(My.Resources.man_infobar) End If + Case "mathquiz" + If Strings.AvailableFeature(34) = 1 Then + MQ_Start() + AdvancedCommand = False + NormalCommand() + End If Case "pwd" If Strings.AvailableFeature(16) = 1 Then Pwd() diff --git a/ShiftOS-TheRevival/Functions/InGame/LoreManager/IntroStoryTell.vb b/ShiftOS-TheRevival/Functions/InGame/LoreManager/IntroStoryTell.vb index 61381de..84db026 100644 --- a/ShiftOS-TheRevival/Functions/InGame/LoreManager/IntroStoryTell.vb +++ b/ShiftOS-TheRevival/Functions/InGame/LoreManager/IntroStoryTell.vb @@ -25,7 +25,8 @@ ResetLine("Installing ShiftOS...") Case 550 ResetLine("ShiftOS Installed, The computer will restart in a few seconds") - Case 600 + NewLine("To get the definitive guide on using ShiftOS, you can type 'guide' on ShiftOS") + Case 650 Console.StoryOnlyTimer.Stop() Console.TextBox1.Text = Nothing Console.TextBox1.ReadOnly = False diff --git a/ShiftOS-TheRevival/Functions/InGame/ROMs/Strings.vb b/ShiftOS-TheRevival/Functions/InGame/ROMs/Strings.vb index 25794b5..678ae87 100644 --- a/ShiftOS-TheRevival/Functions/InGame/ROMs/Strings.vb +++ b/ShiftOS-TheRevival/Functions/InGame/ROMs/Strings.vb @@ -82,6 +82,7 @@ '31 = Rename support [Ability to rename files in ShiftOS] (default : 0) '32 = Zip command [Ability to compress file in a zip file] (default : 0) '33 = Unzip command [Ability to extract file in a zip file] (default : 0) + '34 = MathQuiz [Simple arithmatical question game to get codepoint] (default : 0) ' 'Features bought hierarchy : 'ShiftOS Key (KEY) (5 CP) @@ -108,6 +109,7 @@ '>>>>>>>>>TextPad (100 CP) '>>>>>>>>>>ShiftOS Batch Script Support (BATCHSCRIPT) (100 CP) '>>Basic Calculator (BC) (55 CP) + '>>>MathQuiz (MATHQUIZ) (60 CP) '>>Time by Seconds (TIME, STIME) (10 CP) '>>>Time by Minutes (TIME, MTIME) (20 CP) '>>>>Time by Hours (Time, HTIME) (30 CP) diff --git a/ShiftOS-TheRevival/Functions/InGame/StoreManager/Shiftoriums.vb b/ShiftOS-TheRevival/Functions/InGame/StoreManager/Shiftoriums.vb index af57f18..5dd7222 100644 --- a/ShiftOS-TheRevival/Functions/InGame/StoreManager/Shiftoriums.vb +++ b/ShiftOS-TheRevival/Functions/InGame/StoreManager/Shiftoriums.vb @@ -6,57 +6,57 @@ 'Only AvailableFeature that are in the value of 0 can be displayed in the list NewLine("Shiftorium Available Feature(s)") NewLine(Nothing) - If Strings.AvailableFeature(11) = "0" Then + If Strings.AvailableFeature(11) = 0 Then NewLine("(key | 5 CP) ShiftOS Key") Else - If Strings.AvailableFeature(0) = "0" Then + If Strings.AvailableFeature(0) = 0 Then NewLine("(man | 10 CP) ShiftOS Help Manual") Else - If Strings.AvailableFeature(19) = "0" Then + If Strings.AvailableFeature(19) = 0 Then NewLine("(username | 15 CP) Custom Username") End If - If Strings.AvailableFeature(20) = "0" Then + If Strings.AvailableFeature(20) = 0 Then NewLine("(hostname | 15 CP) Custom hostname") End If End If - If Strings.AvailableFeature(1) = "0" Then + If Strings.AvailableFeature(1) = 0 Then NewLine("(clear | 20 CP) Clear Terminal Screen") Else - If Strings.AvailableFeature(2) = "0" Then + If Strings.AvailableFeature(2) = 0 Then NewLine("(print | 25 CP) Print Terminal Screen") Else - If Strings.AvailableFeature(3) = "0" Then + If Strings.AvailableFeature(3) = 0 Then NewLine("(termdspdrv | 40 CP) Terminal Display Driver") Else - If Strings.AvailableFeature(4) = "0" Then + If Strings.AvailableFeature(4) = 0 Then NewLine("(infobar | 50 CP) Terminal InfoBar") End If - If Strings.AvailableFeature(8) = "0" Then + If Strings.AvailableFeature(8) = 0 Then NewLine("(shiftfetch | 55 CP) Shiftfetch") End If - If Strings.AvailableFeature(10) = "0" Then + If Strings.AvailableFeature(10) = 0 Then NewLine("(2bitcolor | 60 CP) 2-bit Color Support") Else - If Strings.AvailableFeature(13) = "0" Then + If Strings.AvailableFeature(13) = 0 Then NewLine("(rgb | 70 CP) Red, Green, and Blue") Else - If Strings.AvailableFeature(14) = "0" Then + If Strings.AvailableFeature(14) = 0 Then NewLine("(rgb2 | 75 CP) RGB Variant") Else - If Strings.AvailableFeature(15) = "0" Then + If Strings.AvailableFeature(15) = 0 Then NewLine("(4bitcolor | 80 CP) 4-bit Color Support") Else - If Strings.AvailableFeature(16) = "0" Then + If Strings.AvailableFeature(16) = 0 Then NewLine("(romdriver | 90 CP) Terminal Read-Only Memory Support") Else - If Strings.AvailableFeature(17) = "0" Then + If Strings.AvailableFeature(17) = 0 Then NewLine("(textpad | 100 CP) TextPad") Else - If Strings.AvailableFeature(30) = "0" Then + If Strings.AvailableFeature(30) = 0 Then NewLine("(batchscript | 100 CP) ShiftOS Batch Script Support") End If End If - If Strings.AvailableFeature(31) = "0" Then + If Strings.AvailableFeature(31) = 0 Then NewLine("(rename | 95 CP) Rename command") End If If Strings.AvailableFeature(32) = 0 Then @@ -71,48 +71,48 @@ End If End If End If - If Strings.AvailableFeature(18) = "0" Then + If Strings.AvailableFeature(18) = 0 Then NewLine("(shiftkey | 45 CP) ShiftKey") End If - If Strings.AvailableFeature(21) = "0" Then + If Strings.AvailableFeature(21) = 0 Then NewLine("(rev | 30 CP) Reverse String") Else - If Strings.AvailableFeature(22) = "0" Then + If Strings.AvailableFeature(22) = 0 Then NewLine("(cowsay | 50 CP) Cowsay") End If End If End If - If Strings.AvailableFeature(5) = "0" Then + If Strings.AvailableFeature(5) = 0 Then NewLine("(stime | 10 CP) Time by Seconds") Else - If Strings.AvailableFeature(6) = "0" Then + If Strings.AvailableFeature(6) = 0 Then NewLine("(mtime | 20 CP) Time by Minutes") Else - If Strings.AvailableFeature(7) = "0" Then + If Strings.AvailableFeature(7) = 0 Then NewLine("(htime | 30 CP) Time by Hours") Else - If Strings.AvailableFeature(12) = "0" Then + If Strings.AvailableFeature(12) = 0 Then NewLine("(pmam | 40 CP) PM and AM") Else - If Strings.AvailableFeature(23) = "0" Then + If Strings.AvailableFeature(23) = 0 Then NewLine("(hhmm | 50 CP) Time by Hours and Minutes") Else - If Strings.AvailableFeature(24) = "0" Then + If Strings.AvailableFeature(24) = 0 Then NewLine("(date | 70 CP) Date command") Else - If Strings.AvailableFeature(25) = "0" Then + If Strings.AvailableFeature(25) = 0 Then NewLine("(woy | 75 CP) Date by week of year") Else - If Strings.AvailableFeature(26) = "0" Then + If Strings.AvailableFeature(26) = 0 Then NewLine("(moy | 80 CP) Date by month of year") Else - If Strings.AvailableFeature(27) = "0" Then + If Strings.AvailableFeature(27) = 0 Then NewLine("(year | 85 CP) Date by year") Else - If Strings.AvailableFeature(28) = "0" Then + If Strings.AvailableFeature(28) = 0 Then NewLine("(mmyyyy | 90 CP) Date by month and year") Else - If Strings.AvailableFeature(29) = "0" Then + If Strings.AvailableFeature(29) = 0 Then NewLine("(generaldate | 95 CP) Date by general format") End If End If @@ -125,8 +125,12 @@ End If End If End If - If Strings.AvailableFeature(9) = "0" Then + If Strings.AvailableFeature(9) = 0 Then NewLine("(bc | 55 CP) Basic Calculator") + Else + If Strings.AvailableFeature(34) = 0 Then + NewLine("(mathquiz | 60 CP) MathQuiz") + End If End If End If End If @@ -139,7 +143,7 @@ ManHeader(1) = "Cost: " Select Case prompt Case "man" - If Strings.AvailableFeature(0) = "0" Then + If Strings.AvailableFeature(0) = 0 Then ManHeader(0) = "ShiftOS Help Manual (command: man)" ManHeader(1) = "10 CP" NewLine(ManHeader(0)) @@ -150,168 +154,168 @@ NormalCommand() End If Case "clear" - If Strings.AvailableFeature(1) = "0" Then + If Strings.AvailableFeature(1) = 0 Then ManHeader(0) = "Clear Terminal Screen (command: clear)" ManHeader(1) = "20 CP" Console.TextBox1.Text = Console.TextBox1.Text & Environment.NewLine & ManHeader(0) & Environment.NewLine & Environment.NewLine & "Clears the terminal screen" & Environment.NewLine & Environment.NewLine & ManHeader(1) NormalCommand() End If Case "print" - If Strings.AvailableFeature(2) = "0" Then + If Strings.AvailableFeature(2) = 0 Then ManHeader(0) = "Print Command (command: print)" ManHeader(1) = "25 CP" Console.TextBox1.Text = Console.TextBox1.Text & Environment.NewLine & ManHeader(0) & Environment.NewLine & Environment.NewLine & "Prints a corresponding text entered in the command" & Environment.NewLine & Environment.NewLine & ManHeader(1) NormalCommand() End If Case "termdspdrv" - If Strings.AvailableFeature(3) = "0" Then + If Strings.AvailableFeature(3) = 0 Then ManHeader(0) = "Terminal Display Driver" ManHeader(1) = "40 CP" Console.TextBox1.Text = Console.TextBox1.Text & Environment.NewLine & ManHeader(0) & Environment.NewLine & Environment.NewLine & "Display driver for ShiftOS' Terminal to utilize advantages such as Infobar, ASCII-based applications" & Environment.NewLine & Environment.NewLine & ManHeader(1) NormalCommand() End If Case "infobar" - If Strings.AvailableFeature(4) = "0" Then + If Strings.AvailableFeature(4) = 0 Then ManHeader(0) = "Terminal InfoBar" ManHeader(1) = "50 CP" Console.TextBox1.Text = Console.TextBox1.Text & Environment.NewLine & ManHeader(0) & Environment.NewLine & Environment.NewLine & "Panel bar at the bottom of the terminal to display basic informations" & Environment.NewLine & Environment.NewLine & ManHeader(1) NormalCommand() End If Case "stime" - If Strings.AvailableFeature(5) = "0" Then + If Strings.AvailableFeature(5) = 0 Then ManHeader(0) = "Time by Seconds" ManHeader(1) = "10 CP" Console.TextBox1.Text = Console.TextBox1.Text & Environment.NewLine & ManHeader(0) & Environment.NewLine & Environment.NewLine & "Shows time in seconds form since midnight" & Environment.NewLine & Environment.NewLine & ManHeader(1) NormalCommand() End If Case "stime" - If Strings.AvailableFeature(6) = "0" Then + If Strings.AvailableFeature(6) = 0 Then ManHeader(0) = "Time by Minutes" ManHeader(1) = "20 CP" Console.TextBox1.Text = Console.TextBox1.Text & Environment.NewLine & ManHeader(0) & Environment.NewLine & Environment.NewLine & "Shows time in minutes form since midnight" & Environment.NewLine & Environment.NewLine & ManHeader(1) NormalCommand() End If Case "htime" - If Strings.AvailableFeature(7) = "0" Then + If Strings.AvailableFeature(7) = 0 Then ManHeader(0) = "Time by Hours" ManHeader(1) = "30 CP" Console.TextBox1.Text = Console.TextBox1.Text & Environment.NewLine & ManHeader(0) & Environment.NewLine & Environment.NewLine & "Shows time in hours form since midnight" & Environment.NewLine & Environment.NewLine & ManHeader(1) NormalCommand() End If Case "shiftfetch" - If Strings.AvailableFeature(8) = "0" Then + If Strings.AvailableFeature(8) = 0 Then ManHeader(0) = "Shiftfetch" ManHeader(1) = "55 CP" Console.TextBox1.Text = Console.TextBox1.Text & Environment.NewLine & ManHeader(0) & Environment.NewLine & Environment.NewLine & "ShiftOS port of Neofetch, A command-line system information tool" & Environment.NewLine & Environment.NewLine & ManHeader(1) NormalCommand() End If Case "bc" - If Strings.AvailableFeature(9) = "0" Then + If Strings.AvailableFeature(9) = 0 Then ManHeader(0) = "Basic Calculator" ManHeader(1) = "55 CP" Console.TextBox1.Text = Console.TextBox1.Text & Environment.NewLine & ManHeader(0) & Environment.NewLine & Environment.NewLine & "Basic Calculator for simple calculation" & Environment.NewLine & Environment.NewLine & ManHeader(1) NormalCommand() End If Case "2bitcolor" - If Strings.AvailableFeature(10) = "0" Then + If Strings.AvailableFeature(10) = 0 Then ManHeader(0) = "2-bit Color Support" ManHeader(1) = "60 CP" Console.TextBox1.Text = Console.TextBox1.Text & Environment.NewLine & ManHeader(0) & Environment.NewLine & Environment.NewLine & "Adds 2 colours (Dark Gray, Light Gray) supports to the terminal" & Environment.NewLine & Environment.NewLine & ManHeader(1) NormalCommand() End If Case "key" - If Strings.AvailableFeature(11) = "0" Then + If Strings.AvailableFeature(11) = 0 Then ManHeader(0) = "ShiftOS Key" ManHeader(1) = "5 CP" Console.TextBox1.Text = Console.TextBox1.Text & Environment.NewLine & ManHeader(0) & Environment.NewLine & Environment.NewLine & "An encryption key to unlock advanced terminal feature for ShiftOS" & Environment.NewLine & Environment.NewLine & ManHeader(1) NormalCommand() End If Case "pmam" - If Strings.AvailableFeature(12) = "0" Then + If Strings.AvailableFeature(12) = 0 Then ManHeader(0) = "PM and AM" ManHeader(1) = "40 CP" Console.TextBox1.Text = Console.TextBox1.Text & Environment.NewLine & ManHeader(0) & Environment.NewLine & Environment.NewLine & "Shows time in PM and AM format" & Environment.NewLine & Environment.NewLine & ManHeader(1) NormalCommand() End If Case "rgb" - If Strings.AvailableFeature(13) = "0" Then + If Strings.AvailableFeature(13) = 0 Then ManHeader(0) = "Red, Green, and Blue" ManHeader(1) = "70 CP" Console.TextBox1.Text = Console.TextBox1.Text & Environment.NewLine & ManHeader(0) & Environment.NewLine & Environment.NewLine & "Adds Red, Green, and Blue support to the Display Driver" & Environment.NewLine & Environment.NewLine & ManHeader(1) NormalCommand() End If Case "rgb2" - If Strings.AvailableFeature(14) = "0" Then + If Strings.AvailableFeature(14) = 0 Then ManHeader(0) = "RGB Variant" ManHeader(1) = "75 CP" Console.TextBox1.Text = Console.TextBox1.Text & Environment.NewLine & ManHeader(0) & Environment.NewLine & Environment.NewLine & "Adds lighter or darker variant of Red, Green, and Blue" & Environment.NewLine & Environment.NewLine & ManHeader(1) NormalCommand() End If Case "4bitcolor" - If Strings.AvailableFeature(15) = "0" Then + If Strings.AvailableFeature(15) = 0 Then ManHeader(0) = "4-bit Color Display" ManHeader(1) = "80 CP" Console.TextBox1.Text = Console.TextBox1.Text & Environment.NewLine & ManHeader(0) & Environment.NewLine & Environment.NewLine & "Adds to 16 colours support to the Display Driver" & Environment.NewLine & Environment.NewLine & ManHeader(1) NormalCommand() End If Case "romdriver" - If Strings.AvailableFeature(16) = "0" Then + If Strings.AvailableFeature(16) = 0 Then ManHeader(0) = "Terminal Read-Only Memory Driver" ManHeader(1) = "90 CP" Console.TextBox1.Text = Console.TextBox1.Text & Environment.NewLine & ManHeader(0) & Environment.NewLine & Environment.NewLine & "ShiftOS Read-Only Memory support for ShiftOS such as writing and reading permanent memory such as HDD, SDD, etc." & Environment.NewLine & Environment.NewLine & ManHeader(1) NormalCommand() End If Case "textpad" - If Strings.AvailableFeature(17) = "0" Then + If Strings.AvailableFeature(17) = 0 Then ManHeader(0) = "TextPad" ManHeader(1) = "100 CP" Console.TextBox1.Text = Console.TextBox1.Text & Environment.NewLine & ManHeader(0) & Environment.NewLine & Environment.NewLine & "A simple text-editor for ShiftOS" & Environment.NewLine & Environment.NewLine & ManHeader(1) NormalCommand() End If Case "shiftkey" - If Strings.AvailableFeature(18) = "0" Then + If Strings.AvailableFeature(18) = 0 Then ManHeader(0) = "ShiftKey" ManHeader(1) = "45 CP" Console.TextBox1.Text = Console.TextBox1.Text & Environment.NewLine & ManHeader(0) & Environment.NewLine & Environment.NewLine & "Recall the previous command on terminal" & Environment.NewLine & Environment.NewLine & ManHeader(1) NormalCommand() End If Case "username" - If Strings.AvailableFeature(19) = "0" Then + If Strings.AvailableFeature(19) = 0 Then ManHeader(0) = "Custom Username" ManHeader(1) = "15 CP" Console.TextBox1.Text = Console.TextBox1.Text & Environment.NewLine & ManHeader(0) & Environment.NewLine & Environment.NewLine & "Set custom username for ShfitOS" & Environment.NewLine & Environment.NewLine & ManHeader(1) NormalCommand() End If Case "hostname" - If Strings.AvailableFeature(20) = "0" Then + If Strings.AvailableFeature(20) = 0 Then ManHeader(0) = "Custom Hostname" ManHeader(1) = "15 CP" Console.TextBox1.Text = Console.TextBox1.Text & Environment.NewLine & ManHeader(0) & Environment.NewLine & Environment.NewLine & "Set custom hostname/computer name for ShfitOS" & Environment.NewLine & Environment.NewLine & ManHeader(1) NormalCommand() End If Case "rev" - If Strings.AvailableFeature(21) = "0" Then + If Strings.AvailableFeature(21) = 0 Then ManHeader(0) = "Reverse String" ManHeader(1) = "30 CP" Console.TextBox1.Text = Console.TextBox1.Text & Environment.NewLine & ManHeader(0) & Environment.NewLine & Environment.NewLine & "Reverse any text you entered in the terminal" & Environment.NewLine & Environment.NewLine & ManHeader(1) NormalCommand() End If Case "cowsay" - If Strings.AvailableFeature(22) = "0" Then + If Strings.AvailableFeature(22) = 0 Then ManHeader(0) = "Cowsay" ManHeader(1) = "50 CP" Console.TextBox1.Text = Console.TextBox1.Text & Environment.NewLine & ManHeader(0) & Environment.NewLine & Environment.NewLine & "Make the ASCII cow say anything you want to" & Environment.NewLine & Environment.NewLine & ManHeader(1) NormalCommand() End If Case "hhmm" - If Strings.AvailableFeature(23) = "0" Then + If Strings.AvailableFeature(23) = 0 Then ManHeader(0) = "Time by Hours and Minutes" ManHeader(1) = "50 CP" Console.TextBox1.Text = Console.TextBox1.Text & Environment.NewLine & ManHeader(0) & Environment.NewLine & Environment.NewLine & "Shows time in Hours and Minutes format" & Environment.NewLine & Environment.NewLine & ManHeader(1) NormalCommand() End If Case "date" - If Strings.AvailableFeature(24) = "0" Then + If Strings.AvailableFeature(24) = 0 Then ManHeader(0) = "Date command" ManHeader(1) = "70 CP" NewLine(ManHeader(0)) @@ -322,7 +326,7 @@ NormalCommand() End If Case "woy" - If Strings.AvailableFeature(25) = "0" Then + If Strings.AvailableFeature(25) = 0 Then ManHeader(0) = "Date by week of year" ManHeader(1) = "75 CP" NewLine(ManHeader(0)) @@ -333,7 +337,7 @@ NormalCommand() End If Case "moy" - If Strings.AvailableFeature(26) = "0" Then + If Strings.AvailableFeature(26) = 0 Then ManHeader(0) = "Date by month of year" ManHeader(1) = "80 CP" NewLine(ManHeader(0)) @@ -344,7 +348,7 @@ NormalCommand() End If Case "year" - If Strings.AvailableFeature(27) = "0" Then + If Strings.AvailableFeature(27) = 0 Then ManHeader(0) = "Date by year" ManHeader(1) = "85 CP" NewLine(ManHeader(0)) @@ -355,7 +359,7 @@ NormalCommand() End If Case "mmyyyy" - If Strings.AvailableFeature(28) = "0" Then + If Strings.AvailableFeature(28) = 0 Then ManHeader(0) = "Date by month and year" ManHeader(1) = "90 CP" NewLine(ManHeader(0)) @@ -366,7 +370,7 @@ NormalCommand() End If Case "generaldate" - If Strings.AvailableFeature(29) = "0" Then + If Strings.AvailableFeature(29) = 0 Then ManHeader(0) = "Date by general format" ManHeader(1) = "95 CP" NewLine(ManHeader(0)) @@ -377,7 +381,7 @@ NormalCommand() End If Case "batchscript" - If Strings.AvailableFeature(30) = "0" Then + If Strings.AvailableFeature(30) = 0 Then ManHeader(0) = "ShiftOS Batch Script Support" ManHeader(1) = "100 CP" NewLine(ManHeader(0)) @@ -388,7 +392,7 @@ NormalCommand() End If Case "rename" - If Strings.AvailableFeature(31) = "0" Then + If Strings.AvailableFeature(31) = 0 Then ManHeader(0) = "Rename command" ManHeader(1) = "95 CP" NewLine(ManHeader(0)) @@ -399,7 +403,7 @@ NormalCommand() End If Case "zip" - If Strings.AvailableFeature(32) = "0" Then + If Strings.AvailableFeature(32) = 0 Then ManHeader(0) = "Zip command" ManHeader(1) = "95 CP" NewLine(ManHeader(0)) @@ -410,7 +414,7 @@ NormalCommand() End If Case "unzip" - If Strings.AvailableFeature(33) = "0" Then + If Strings.AvailableFeature(33) = 0 Then ManHeader(0) = "Unzip command" ManHeader(1) = "95 CP" NewLine(ManHeader(0)) @@ -420,6 +424,17 @@ NewLine(ManHeader(1)) NormalCommand() End If + Case "mathquiz" + If Strings.AvailableFeature(34) = 0 Then + ManHeader(0) = "MathQuiz" + ManHeader(1) = "60 CP" + NewLine(ManHeader(0)) + NewLine(Nothing) + NewLine("Simple puzzle game to solve simple arithmatical question to get codepoints") + NewLine(Nothing) + NewLine(ManHeader(1)) + NormalCommand() + End If Case Else NormalCommand() Console.TextBox1.Text = Console.TextBox1.Text & Environment.NewLine & "Shiftorium: Bad command or not available" @@ -531,6 +546,9 @@ Case "unzip" Shiftorium_InstallFeatures(True, "unzip", 33, 95) NormalCommand() + Case "mathquiz" + Shiftorium_InstallFeatures(True, "mathquiz", 34, 60) + NormalCommand() Case Else NormalCommand() NewLine("Shiftorium: Bad command or not available") @@ -591,6 +609,7 @@ success = True Case "bc" Strings.AvailableFeature(9) = "1" + Strings.AvailableFeature(34) = "0" success = True Case "2bitcolor" Strings.AvailableFeature(10) = "1" @@ -690,6 +709,9 @@ Case "unzip" Strings.AvailableFeature(33) = "1" success = True + Case "mathquiz" + Strings.AvailableFeature(34) = "1" + success = True End Select If success = False Then If IsCLI = True Then diff --git a/ShiftOS-TheRevival/MainForms/SaveLoadSystem.vb b/ShiftOS-TheRevival/Functions/OutGame/SaveLoadSystem.vb similarity index 93% rename from ShiftOS-TheRevival/MainForms/SaveLoadSystem.vb rename to ShiftOS-TheRevival/Functions/OutGame/SaveLoadSystem.vb index 6404c76..69adc94 100644 --- a/ShiftOS-TheRevival/MainForms/SaveLoadSystem.vb +++ b/ShiftOS-TheRevival/Functions/OutGame/SaveLoadSystem.vb @@ -5,8 +5,10 @@ Module SaveLoadSystem Public Sub NewGameMode() 'Sets all features to 2 (Unavailable for Shiftorium) except ShiftOS Key (AvailableFeatures(11)) Directory.Delete(Environment.GetFolderPath(Environment.SpecialFolder.ApplicationData) & "\ShiftOS\ShiftFS", True) + Directory.Delete(Environment.GetFolderPath(Environment.SpecialFolder.ApplicationData) & "\ShiftOS\SysShiftFS", True) Directory.Delete(Environment.GetFolderPath(Environment.SpecialFolder.ApplicationData) & "\ShiftOS\saved", True) Directory.CreateDirectory(Environment.GetFolderPath(Environment.SpecialFolder.ApplicationData) & "\ShiftOS\ShiftFS") + Directory.CreateDirectory(Environment.GetFolderPath(Environment.SpecialFolder.ApplicationData) & "\ShiftOS\SysShiftFS") Directory.CreateDirectory(Environment.GetFolderPath(Environment.SpecialFolder.ApplicationData) & "\ShiftOS\saved") Strings.ComputerInfo(0) = "shiftos" Strings.ComputerInfo(1) = "user" @@ -49,6 +51,8 @@ Module SaveLoadSystem Strings.AvailableFeature(31) = "2" Strings.AvailableFeature(32) = "2" Strings.AvailableFeature(33) = "2" + '0.2.7 Features + Strings.AvailableFeature(34) = "2" End Sub Public Sub FreeRoamMode() @@ -94,6 +98,8 @@ Module SaveLoadSystem Strings.AvailableFeature(31) = "1" Strings.AvailableFeature(32) = "1" Strings.AvailableFeature(33) = "1" + '0.2.7 Features + Strings.AvailableFeature(34) = "1" End Sub Public Sub GodMode() @@ -138,6 +144,8 @@ Module SaveLoadSystem Strings.AvailableFeature(31) = "2" Strings.AvailableFeature(32) = "2" Strings.AvailableFeature(33) = "2" + '0.2.7 Features + Strings.AvailableFeature(34) = "2" End Sub Public Sub SaveGame() diff --git a/ShiftOS-TheRevival/MainForms/Console.Designer.vb b/ShiftOS-TheRevival/MainForms/Applications/Console.Designer.vb similarity index 100% rename from ShiftOS-TheRevival/MainForms/Console.Designer.vb rename to ShiftOS-TheRevival/MainForms/Applications/Console.Designer.vb diff --git a/ShiftOS-TheRevival/MainForms/Console.resx b/ShiftOS-TheRevival/MainForms/Applications/Console.resx similarity index 100% rename from ShiftOS-TheRevival/MainForms/Console.resx rename to ShiftOS-TheRevival/MainForms/Applications/Console.resx diff --git a/ShiftOS-TheRevival/MainForms/Console.vb b/ShiftOS-TheRevival/MainForms/Applications/Console.vb similarity index 100% rename from ShiftOS-TheRevival/MainForms/Console.vb rename to ShiftOS-TheRevival/MainForms/Applications/Console.vb diff --git a/ShiftOS-TheRevival/MainForms/ShiftOSAbout.Designer.vb b/ShiftOS-TheRevival/MainForms/ShiftOSAbout.Designer.vb new file mode 100644 index 0000000..e4455e5 --- /dev/null +++ b/ShiftOS-TheRevival/MainForms/ShiftOSAbout.Designer.vb @@ -0,0 +1,209 @@ + _ +Partial Class ShiftOSAbout + Inherits System.Windows.Forms.Form + + 'Form overrides dispose to clean up the component list. + _ + Protected Overrides Sub Dispose(ByVal disposing As Boolean) + Try + If disposing AndAlso components IsNot Nothing Then + components.Dispose() + End If + Finally + MyBase.Dispose(disposing) + End Try + End Sub + + 'Required by the Windows Form Designer + Private components As System.ComponentModel.IContainer + + 'NOTE: The following procedure is required by the Windows Form Designer + 'It can be modified using the Windows Form Designer. + 'Do not modify it using the code editor. + _ + Private Sub InitializeComponent() + Me.Label1 = New System.Windows.Forms.Label() + Me.Label2 = New System.Windows.Forms.Label() + Me.Button1 = New System.Windows.Forms.Button() + Me.Label3 = New System.Windows.Forms.Label() + Me.Label4 = New System.Windows.Forms.Label() + Me.Label5 = New System.Windows.Forms.Label() + Me.LinkLabel1 = New System.Windows.Forms.LinkLabel() + Me.LinkLabel2 = New System.Windows.Forms.LinkLabel() + Me.LinkLabel3 = New System.Windows.Forms.LinkLabel() + Me.LinkLabel4 = New System.Windows.Forms.LinkLabel() + Me.Label6 = New System.Windows.Forms.Label() + Me.SuspendLayout() + ' + 'Label1 + ' + Me.Label1.AutoSize = True + Me.Label1.Font = New System.Drawing.Font("Consolas", 48.0!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + Me.Label1.ForeColor = System.Drawing.Color.White + Me.Label1.Location = New System.Drawing.Point(12, 9) + Me.Label1.Name = "Label1" + Me.Label1.Size = New System.Drawing.Size(277, 75) + Me.Label1.TabIndex = 0 + Me.Label1.Text = "ShiftOS" + ' + 'Label2 + ' + Me.Label2.AutoSize = True + Me.Label2.Font = New System.Drawing.Font("Consolas", 12.0!, System.Drawing.FontStyle.Italic) + Me.Label2.ForeColor = System.Drawing.Color.White + Me.Label2.Location = New System.Drawing.Point(295, 53) + Me.Label2.Name = "Label2" + Me.Label2.Size = New System.Drawing.Size(162, 19) + Me.Label2.TabIndex = 1 + Me.Label2.Text = "Shift it your way" + ' + 'Button1 + ' + Me.Button1.FlatStyle = System.Windows.Forms.FlatStyle.Flat + Me.Button1.Font = New System.Drawing.Font("Consolas", 10.0!) + Me.Button1.ForeColor = System.Drawing.Color.White + Me.Button1.Location = New System.Drawing.Point(675, 518) + Me.Button1.Name = "Button1" + Me.Button1.Size = New System.Drawing.Size(97, 31) + Me.Button1.TabIndex = 2 + Me.Button1.Text = "Close" + Me.Button1.UseVisualStyleBackColor = True + ' + 'Label3 + ' + Me.Label3.AutoSize = True + Me.Label3.Font = New System.Drawing.Font("Consolas", 12.0!) + Me.Label3.ForeColor = System.Drawing.Color.White + Me.Label3.Location = New System.Drawing.Point(21, 84) + Me.Label3.Name = "Label3" + Me.Label3.Size = New System.Drawing.Size(81, 19) + Me.Label3.TabIndex = 3 + Me.Label3.Text = "Version " + ' + 'Label4 + ' + Me.Label4.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle + Me.Label4.Font = New System.Drawing.Font("Consolas", 10.0!) + Me.Label4.ForeColor = System.Drawing.Color.White + Me.Label4.Location = New System.Drawing.Point(21, 115) + Me.Label4.Name = "Label4" + Me.Label4.Size = New System.Drawing.Size(436, 393) + Me.Label4.TabIndex = 4 + Me.Label4.Text = "This project is not possible without the initiation from :" & Global.Microsoft.VisualBasic.ChrW(13) & Global.Microsoft.VisualBasic.ChrW(10) & "Philip Adams (OSFirst" & + "Timer)" & Global.Microsoft.VisualBasic.ChrW(13) & Global.Microsoft.VisualBasic.ChrW(10) & "MichaelTheShifter (acidiclights)" & Global.Microsoft.VisualBasic.ChrW(13) & Global.Microsoft.VisualBasic.ChrW(10) & Global.Microsoft.VisualBasic.ChrW(13) & Global.Microsoft.VisualBasic.ChrW(10) & "ShiftOS-TheRevival Developers :" & Global.Microsoft.VisualBasic.ChrW(13) & Global.Microsoft.VisualBasic.ChrW(10) & "Eve" & + "rything Windows (DevX) - Main Developer" + ' + 'Label5 + ' + Me.Label5.AutoSize = True + Me.Label5.Font = New System.Drawing.Font("Consolas", 12.0!) + Me.Label5.ForeColor = System.Drawing.Color.White + Me.Label5.Location = New System.Drawing.Point(475, 115) + Me.Label5.Name = "Label5" + Me.Label5.Size = New System.Drawing.Size(234, 19) + Me.Label5.TabIndex = 3 + Me.Label5.Text = "More information about us" + ' + 'LinkLabel1 + ' + Me.LinkLabel1.AutoSize = True + Me.LinkLabel1.Font = New System.Drawing.Font("Consolas", 10.0!) + Me.LinkLabel1.LinkColor = System.Drawing.Color.White + Me.LinkLabel1.Location = New System.Drawing.Point(476, 152) + Me.LinkLabel1.Name = "LinkLabel1" + Me.LinkLabel1.Size = New System.Drawing.Size(56, 17) + Me.LinkLabel1.TabIndex = 5 + Me.LinkLabel1.TabStop = True + Me.LinkLabel1.Text = "GitHub" + Me.LinkLabel1.VisitedLinkColor = System.Drawing.Color.Gray + ' + 'LinkLabel2 + ' + Me.LinkLabel2.AutoSize = True + Me.LinkLabel2.Font = New System.Drawing.Font("Consolas", 10.0!) + Me.LinkLabel2.LinkColor = System.Drawing.Color.White + Me.LinkLabel2.Location = New System.Drawing.Point(476, 172) + Me.LinkLabel2.Name = "LinkLabel2" + Me.LinkLabel2.Size = New System.Drawing.Size(64, 17) + Me.LinkLabel2.TabIndex = 5 + Me.LinkLabel2.TabStop = True + Me.LinkLabel2.Text = "itch.io" + Me.LinkLabel2.VisitedLinkColor = System.Drawing.Color.Gray + ' + 'LinkLabel3 + ' + Me.LinkLabel3.AutoSize = True + Me.LinkLabel3.Font = New System.Drawing.Font("Consolas", 10.0!) + Me.LinkLabel3.LinkColor = System.Drawing.Color.White + Me.LinkLabel3.Location = New System.Drawing.Point(476, 192) + Me.LinkLabel3.Name = "LinkLabel3" + Me.LinkLabel3.Size = New System.Drawing.Size(120, 17) + Me.LinkLabel3.TabIndex = 5 + Me.LinkLabel3.TabStop = True + Me.LinkLabel3.Text = "Discord Server" + Me.LinkLabel3.VisitedLinkColor = System.Drawing.Color.Gray + ' + 'LinkLabel4 + ' + Me.LinkLabel4.AutoSize = True + Me.LinkLabel4.Font = New System.Drawing.Font("Consolas", 10.0!) + Me.LinkLabel4.LinkColor = System.Drawing.Color.White + Me.LinkLabel4.Location = New System.Drawing.Point(476, 212) + Me.LinkLabel4.Name = "LinkLabel4" + Me.LinkLabel4.Size = New System.Drawing.Size(128, 17) + Me.LinkLabel4.TabIndex = 5 + Me.LinkLabel4.TabStop = True + Me.LinkLabel4.Text = "YouTube Channel" + Me.LinkLabel4.VisitedLinkColor = System.Drawing.Color.Gray + ' + 'Label6 + ' + Me.Label6.Font = New System.Drawing.Font("Consolas", 12.0!) + Me.Label6.ForeColor = System.Drawing.Color.White + Me.Label6.Location = New System.Drawing.Point(475, 250) + Me.Label6.Name = "Label6" + Me.Label6.Size = New System.Drawing.Size(297, 46) + Me.Label6.TabIndex = 3 + Me.Label6.Text = "ShiftOS-TheRevival is licensed under the GNU GPL v3 License." + ' + 'ShiftOSAbout + ' + Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!) + Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font + Me.BackColor = System.Drawing.Color.Black + Me.ClientSize = New System.Drawing.Size(784, 561) + Me.Controls.Add(Me.LinkLabel4) + Me.Controls.Add(Me.LinkLabel3) + Me.Controls.Add(Me.LinkLabel2) + Me.Controls.Add(Me.LinkLabel1) + Me.Controls.Add(Me.Label4) + Me.Controls.Add(Me.Label6) + Me.Controls.Add(Me.Label5) + Me.Controls.Add(Me.Label3) + Me.Controls.Add(Me.Button1) + Me.Controls.Add(Me.Label2) + Me.Controls.Add(Me.Label1) + Me.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedSingle + Me.MaximizeBox = False + Me.Name = "ShiftOSAbout" + Me.ShowIcon = False + Me.ShowInTaskbar = False + Me.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen + Me.Text = "About ShiftOS" + Me.ResumeLayout(False) + Me.PerformLayout() + + End Sub + + Friend WithEvents Label1 As Label + Friend WithEvents Label2 As Label + Friend WithEvents Button1 As Button + Friend WithEvents Label3 As Label + Friend WithEvents Label4 As Label + Friend WithEvents Label5 As Label + Friend WithEvents LinkLabel1 As LinkLabel + Friend WithEvents LinkLabel2 As LinkLabel + Friend WithEvents LinkLabel3 As LinkLabel + Friend WithEvents LinkLabel4 As LinkLabel + Friend WithEvents Label6 As Label +End Class diff --git a/ShiftOS-TheRevival/MainForms/ShiftOSAbout.resx b/ShiftOS-TheRevival/MainForms/ShiftOSAbout.resx new file mode 100644 index 0000000..1af7de1 --- /dev/null +++ b/ShiftOS-TheRevival/MainForms/ShiftOSAbout.resx @@ -0,0 +1,120 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + \ No newline at end of file diff --git a/ShiftOS-TheRevival/MainForms/ShiftOSAbout.vb b/ShiftOS-TheRevival/MainForms/ShiftOSAbout.vb new file mode 100644 index 0000000..ba9b4ee --- /dev/null +++ b/ShiftOS-TheRevival/MainForms/ShiftOSAbout.vb @@ -0,0 +1,25 @@ +Public Class ShiftOSAbout + Private Sub Button1_Click(sender As Object, e As EventArgs) Handles Button1.Click + Close() + End Sub + + Private Sub LinkLabel1_LinkClicked(sender As Object, e As LinkLabelLinkClickedEventArgs) Handles LinkLabel1.LinkClicked + Process.Start("https://github.com/EverythingWindows/ShiftOS-TheRevival") + End Sub + + Private Sub LinkLabel2_LinkClicked(sender As Object, e As LinkLabelLinkClickedEventArgs) Handles LinkLabel2.LinkClicked + Process.Start("https://shiftos-therevival.itch.io/shiftos-therevival") + End Sub + + Private Sub LinkLabel3_LinkClicked(sender As Object, e As LinkLabelLinkClickedEventArgs) Handles LinkLabel3.LinkClicked + Process.Start("https://discord.gg/5QXxWJRM6R") + End Sub + + Private Sub LinkLabel4_LinkClicked(sender As Object, e As LinkLabelLinkClickedEventArgs) Handles LinkLabel4.LinkClicked + Process.Start("https://www.youtube.com/@ShiftOS_") + End Sub + + Private Sub ShiftOSAbout_Load(sender As Object, e As EventArgs) Handles MyBase.Load + Label3.Text = Label3.Text & My.Resources.CurrentVersion + End Sub +End Class \ No newline at end of file diff --git a/ShiftOS-TheRevival/MainForms/ShiftOSMenu.Designer.vb b/ShiftOS-TheRevival/MainForms/ShiftOSMenu.Designer.vb index 41cce27..3414552 100644 --- a/ShiftOS-TheRevival/MainForms/ShiftOSMenu.Designer.vb +++ b/ShiftOS-TheRevival/MainForms/ShiftOSMenu.Designer.vb @@ -71,7 +71,7 @@ Partial Class ShiftOSMenu Me.btn_Aboot.Name = "btn_Aboot" Me.btn_Aboot.Size = New System.Drawing.Size(224, 40) Me.btn_Aboot.TabIndex = 3 - Me.btn_Aboot.Text = "About" & Global.Microsoft.VisualBasic.ChrW(13) & Global.Microsoft.VisualBasic.ChrW(10) + Me.btn_Aboot.Text = "About" Me.btn_Aboot.UseVisualStyleBackColor = True ' 'lbl_BuildString @@ -155,7 +155,7 @@ Partial Class ShiftOSMenu Me.btn_Chapter5.Location = New System.Drawing.Point(22, 296) Me.btn_Chapter5.Name = "btn_Chapter5" Me.btn_Chapter5.Size = New System.Drawing.Size(224, 40) - Me.btn_Chapter5.TabIndex = 4 + Me.btn_Chapter5.TabIndex = 5 Me.btn_Chapter5.Text = "Chapter 5" & Global.Microsoft.VisualBasic.ChrW(13) & Global.Microsoft.VisualBasic.ChrW(10) & "Praeter sensum" Me.btn_Chapter5.UseVisualStyleBackColor = True Me.btn_Chapter5.Visible = False @@ -168,7 +168,7 @@ Partial Class ShiftOSMenu Me.btn_Back.Location = New System.Drawing.Point(22, 342) Me.btn_Back.Name = "btn_Back" Me.btn_Back.Size = New System.Drawing.Size(224, 40) - Me.btn_Back.TabIndex = 4 + Me.btn_Back.TabIndex = 6 Me.btn_Back.Text = "Back" Me.btn_Back.UseVisualStyleBackColor = True Me.btn_Back.Visible = False diff --git a/ShiftOS-TheRevival/MainForms/ShiftOSMenu.vb b/ShiftOS-TheRevival/MainForms/ShiftOSMenu.vb index 8a65f59..e43b6ae 100644 --- a/ShiftOS-TheRevival/MainForms/ShiftOSMenu.vb +++ b/ShiftOS-TheRevival/MainForms/ShiftOSMenu.vb @@ -78,12 +78,13 @@ Public Class ShiftOSMenu btn_Back.Visible = True Case "Chapter 1" & Environment.NewLine & "Hijacked!" Epilepsy.Show() - DebugWindow.ShouldDebug = True End Select End Sub Private Sub btn_Aboot_Click(sender As Object, e As EventArgs) Handles btn_Aboot.Click Select Case btn_Aboot.Text + Case "About" + ShiftOSAbout.ShowDialog() Case "Back" btn_StoryMode.Text = "Story Mode" btn_FreeRoam.Text = "Free Roam Mode" diff --git a/ShiftOS-TheRevival/My Project/Resources.Designer.vb b/ShiftOS-TheRevival/My Project/Resources.Designer.vb index 98c9ecb..c89bfdd 100644 --- a/ShiftOS-TheRevival/My Project/Resources.Designer.vb +++ b/ShiftOS-TheRevival/My Project/Resources.Designer.vb @@ -61,7 +61,7 @@ Namespace My.Resources End Property ''' - ''' Looks up a localized string similar to 0.2.4. + ''' Looks up a localized string similar to 0.2.6. ''' Friend ReadOnly Property CurrentVersion() As String Get @@ -381,6 +381,25 @@ Namespace My.Resources End Get End Property + ''' + ''' Looks up a localized string similar to Compress file or directory into a zip file + ''' + '''[CONTENT TYPE] Type of content you want to add into the archive + '''-D Adding a directory into the archive + '''-F Adding a file into the archive + ''' + '''[FILENAME.ZIP] Filename of the archive you want to make + ''' + '''[CONTENT NAME] The name of file or directory you want to archive + ''' + '''example: zip -f 'lorem.zip' 'ipsum.txt'. + ''' + Friend ReadOnly Property man_zip() As String + Get + Return ResourceManager.GetString("man_zip", resourceCulture) + End Get + End Property + ''' ''' Looks up a localized resource of type System.Drawing.Bitmap. ''' diff --git a/ShiftOS-TheRevival/My Project/Resources.resx b/ShiftOS-TheRevival/My Project/Resources.resx index 9bbc6f2..78650ad 100644 --- a/ShiftOS-TheRevival/My Project/Resources.resx +++ b/ShiftOS-TheRevival/My Project/Resources.resx @@ -202,6 +202,9 @@ ..\resources\man manuals\ver.txt;System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;utf-8 + + ..\resources\man manuals\zip.txt;System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;utf-8 + ..\Resources\Menu Picture\ShiftOS_MenuBanner1.jpg;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a diff --git a/ShiftOS-TheRevival/Resources/man Manuals/zip.txt b/ShiftOS-TheRevival/Resources/man Manuals/zip.txt new file mode 100644 index 0000000..6e22504 --- /dev/null +++ b/ShiftOS-TheRevival/Resources/man Manuals/zip.txt @@ -0,0 +1,11 @@ +Compress file or directory into a zip file + +[CONTENT TYPE] Type of content you want to add into the archive +-D Adding a directory into the archive +-F Adding a file into the archive + +[FILENAME.ZIP] Filename of the archive you want to make + +[CONTENT NAME] The name of file or directory you want to archive + +example: zip -f 'lorem.zip' 'ipsum.txt' \ No newline at end of file diff --git a/ShiftOS-TheRevival/ShiftOS-TheRevival.vbproj b/ShiftOS-TheRevival/ShiftOS-TheRevival.vbproj index cd26b45..679c04c 100644 --- a/ShiftOS-TheRevival/ShiftOS-TheRevival.vbproj +++ b/ShiftOS-TheRevival/ShiftOS-TheRevival.vbproj @@ -138,8 +138,14 @@ Form - + + + ShiftOSAbout.vb + + + Form + Form @@ -154,16 +160,17 @@ Form - + Console.vb - + Form + @@ -175,6 +182,7 @@ + @@ -230,10 +238,13 @@ IntroStory.vb + + ShiftOSAbout.vb + ShiftOSUpdater.vb - + Console.vb @@ -261,7 +272,6 @@ - @@ -277,6 +287,7 @@ + diff --git a/ShiftOS-TheRevival/TerminalApplications/External/MathQuiz/App_MathQuiz.vb b/ShiftOS-TheRevival/TerminalApplications/External/MathQuiz/App_MathQuiz.vb new file mode 100644 index 0000000..235664f --- /dev/null +++ b/ShiftOS-TheRevival/TerminalApplications/External/MathQuiz/App_MathQuiz.vb @@ -0,0 +1,58 @@ +Module App_MathQuiz + Public MQ_1stNum As Integer + Public MQ_2ndNum As Integer + Public MQ_Operation As String + Public MQ_ShouldResult As Integer + Public OperationChooser As Integer + + Public Sub MQ_Start() + Console.DefaultPrompt = "> " + ResetLine("MathQuiz for ShiftOS") + NewLine("Answer basic arithmatical question and you'll get codepoints based on the answer") + NewLine(Nothing) + MQ_GiveQuestion() + Console.CurrentInterpreter = "mathquiz" + Console.ShouldChange = True + Console_Interpreters() + End Sub + + Public Sub MQ_GiveQuestion() + Dim RandomNum As New Random + MQ_1stNum = RandomNum.Next(1, 10) + MQ_2ndNum = RandomNum.Next(1, 10) + OperationChooser = RandomNum.Next(1, 5) + Select Case OperationChooser + Case 1 + MQ_Operation = " + " + MQ_ShouldResult = MQ_1stNum + MQ_2ndNum + Case 2 + While MQ_2ndNum > MQ_1stNum + MQ_2ndNum = RandomNum.Next(1, 10) + End While + MQ_Operation = " - " + MQ_ShouldResult = MQ_1stNum - MQ_2ndNum + Case 3 + MQ_Operation = " * " + MQ_ShouldResult = MQ_1stNum * MQ_2ndNum + Case 4 + MQ_Operation = " / " + MQ_ShouldResult = MQ_1stNum / MQ_2ndNum + Case Else + MQ_Operation = " + " + MQ_ShouldResult = MQ_1stNum + MQ_2ndNum + End Select + NewLine("What is " & MQ_1stNum & MQ_Operation & MQ_2ndNum & " ?") + End Sub + + Public Sub MQ_CheckAnswer() + Dim TheAnswer As Integer = command + If TheAnswer = MQ_ShouldResult Then + NewLine("You got the right answer! You got " & MQ_ShouldResult & " Codepoint(s)") + ChangeCP(True, MQ_ShouldResult) + MQ_GiveQuestion() + Else + NewLine("You got the wrong answer! Try again") + MQ_GiveQuestion() + End If + End Sub +End Module diff --git a/ShiftOS-TheRevival/TerminalApplications/External/TerminalExternalApps.vb b/ShiftOS-TheRevival/TerminalApplications/External/TerminalExternalApps.vb index 3148ded..6e8c7bd 100644 --- a/ShiftOS-TheRevival/TerminalApplications/External/TerminalExternalApps.vb +++ b/ShiftOS-TheRevival/TerminalApplications/External/TerminalExternalApps.vb @@ -105,6 +105,13 @@ Module TerminalExternalApps Case Else BC_Calculate() End Select + Case "mathquiz" + Select Case command + Case "exit" + TerminateApp(Nothing) + Case Else + MQ_CheckAnswer() + End Select End Select End Sub diff --git a/ShiftOS-TheRevival/TerminalApplications/Internal/Com_Guide.vb b/ShiftOS-TheRevival/TerminalApplications/Internal/Com_Guide.vb new file mode 100644 index 0000000..116ba22 --- /dev/null +++ b/ShiftOS-TheRevival/TerminalApplications/Internal/Com_Guide.vb @@ -0,0 +1,97 @@ +Module Com_Guide + Public Sub Guide() + NewLine("The Definitive Guide on ShiftOS") + NewLine(Nothing) + NewLine("ShiftOS is an experimental operating system set to revolutionize personal computing in a progressive way you can think of") + Select Case Strings.ComputerInfo(3) + Case 0 + NewLine("You are now in a command-line interface phase of ShiftOS. You can only do one program/task at one time.") + End Select + NewLine(Nothing) + NewLine("To get a list of features available to purchase of ShiftOS, you can type 'shiftorium list'") + NewLine("And you can buy a features on ShiftOS by typing 'shiftorium install ' and then type the codename of the feature") + NewLine(Nothing) + NewLine("Type 'help' to get a list of all commands available in ShiftOS") + If Strings.AvailableFeature(0) = 1 Then + NewLine("To get any help for each command in the operating system, you can type 'man' and the name of the feature") + NewLine(Nothing) + End If + If Strings.AvailableFeature(5) = 1 Then + NewLine("Time is displayed by seconds since 0:00 format such as 660 seconds since midnight is 0:11") + ElseIf Strings.AvailableFeature(5) = 3 Then + If Strings.AvailableFeature(6) = 1 Then + NewLine("Time is displayed by minutes since 0:00 format such as 69 minutes since midnight is 1:09") + ElseIf Strings.AvailableFeature(6) = 3 Then + If Strings.AvailableFeature(7) = 1 Then + NewLine("Time is displayed by hours since 0:00 format such as 19 hours since midnight is 19:00") + ElseIf Strings.AvailableFeature(7) = 3 Then + If Strings.AvailableFeature(12) = 1 Then + NewLine("Time is displayed by PM and AM format, eg: 9 AM, 4 PM") + ElseIf Strings.AvailableFeature(12) = 3 Then + If Strings.AvailableFeature(23) = 1 Then + NewLine("Time is displayed by HH:MM format, eg: 4:20") + End If + End If + End If + End If + End If + If Strings.AvailableFeature(24) = 1 Then + NewLine("Date is displayed in days since first day of the year format, such as 32 days since first day of the year is 1 February") + ElseIf Strings.AvailableFeature(24) = 3 Then + If Strings.AvailableFeature(25) = 1 Then + NewLine("Date is displayed in weeks since first week of the year format, such as 10 weeks since first week of the year is approximately first week of March") + ElseIf Strings.AvailableFeature(25) = 3 Then + If Strings.AvailableFeature(26) = 1 Then + NewLine("Date is displayed in months since first month of the year format, such as 8 months since first month of the year is August") + ElseIf Strings.AvailableFeature(26) = 3 Then + If Strings.AvailableFeature(27) = 1 Then + NewLine("Date is displayed in year format, eg: 2022") + ElseIf Strings.AvailableFeature(27) = 3 Then + If Strings.AvailableFeature(28) = 1 Then + NewLine("Date is displayed in MM/YYYY format, eg: 11/2022") + ElseIf Strings.AvailableFeature(28) = 3 Then + If Strings.AvailableFeature(29) = 1 Then + NewLine("Date is displayed in DD/MM/YYYY format, eg: 20/11/2022") + End If + End If + End If + End If + End If + End If + NewLine("This operating system supports ") + If Strings.AvailableFeature(10) = 1 Then + If Strings.AvailableFeature(13) = 1 Then + If Strings.AvailableFeature(14) = 1 Then + If Strings.AvailableFeature(15) = 1 Then + AddLine("16 colors") + Else + AddLine("Black, Dark and Light Gray, White, as well as Red, Green, and Blue with their darker/brighter variant") + End If + Else + AddLine("Black, Dark and Light Gray, White, as well as Red, Green, and Blue") + End If + Else + AddLine("only in Black, Dark Gray, Light Gray, and White") + End If + Else + AddLine("only 2 colors, Black and White") + End If + AddLine(". For more information, you can type 'colors' to get the list of supported colors.") + NewLine(Nothing) + If Strings.AvailableFeature(19) = 1 Then + NewLine("You can change your username by typing 'username ' and the name of your username") + End If + If Strings.AvailableFeature(20) = 1 Then + NewLine("You can change your computer name by typing 'hostname ' and the name of your hostname") + End If + NewLine(Nothing) + NewLine("You can get more codepoints by guessing the correct number with 'guess'") + If Strings.AvailableFeature(17) = 1 Then + AddLine(", writing a text document in 'textpad'") + End If + If Strings.AvailableFeature(34) = 1 Then + AddLine(", answer basic arithmatical question on 'mathquiz'") + End If + AddLine(".") + End Sub +End Module diff --git a/ShiftOS-TheRevival/TerminalApplications/Internal/Com_Help.vb b/ShiftOS-TheRevival/TerminalApplications/Internal/Com_Help.vb index 67d0d41..020ab7b 100644 --- a/ShiftOS-TheRevival/TerminalApplications/Internal/Com_Help.vb +++ b/ShiftOS-TheRevival/TerminalApplications/Internal/Com_Help.vb @@ -3,6 +3,7 @@ NewLine("ShiftOS Help Manual") NewLine(Nothing) NewLine("You can type 'help' to get all available commands and its corresponding action.") + NewLine("Type 'guide' to get the rough definitive guide on using ShiftOS") If Strings.AvailableFeature(0) = 1 Then NewLine("To get help on each command, you can type 'man [command]'") NewLine(Nothing) @@ -52,6 +53,7 @@ NewLine("DIR Displays subdirectories And files In a directory") End If NewLine("GUESS Runs 'Guess the Number' application") + NewLine("GUIDE Shows the definitive guide on using ShiftOS") NewLine("HELP Shows all commands available and its corresponding action") If Strings.AvailableFeature(20) = 1 Then NewLine("HOSTNAME Sets the name of current hostname/computer name with a new one") @@ -62,6 +64,9 @@ If Strings.AvailableFeature(0) = 1 Then NewLine("MAN Shows a command, its corresponding action, and its example usage") End If + If Strings.AvailableFeature(34) = 1 Then + NewLine("MATHQUIZ A simple puzzle game to answer simpla arithmatical questions") + End If If Strings.AvailableFeature(16) = 1 Then NewLine("MKDIR Creating a directory") End If @@ -98,6 +103,10 @@ ElseIf Strings.AvailableFeature(7) = 3 Then If Strings.AvailableFeature(12) = 1 Then NewLine("TIME Display the current time in the form of PM and AM format") + ElseIf Strings.AvailableFeature(12) = 3 Then + If Strings.AvailableFeature(23) = 1 Then + NewLine("TIME Display the current time in the form of HH:MM") + End If End If End If End If @@ -105,6 +114,12 @@ If Strings.AvailableFeature(20) = 1 Then NewLine("USERNAME Sets the name of current user with a new one") End If + If Strings.AvailableFeature(33) = 1 Then + NewLine("UNZIP Extract any files from a zip file") + End If NewLine("VER Printing current version of ShiftOS TheRevival") + If Strings.AvailableFeature(32) = 1 Then + NewLine("ZIP Compress selected file/directory into a zip file") + End If End Sub End Module diff --git a/ShiftOS-TheRevival/TerminalApplications/Internal/Com_Manual.vb b/ShiftOS-TheRevival/TerminalApplications/Internal/Com_Manual.vb index 3ba13f5..a4bc2cc 100644 --- a/ShiftOS-TheRevival/TerminalApplications/Internal/Com_Manual.vb +++ b/ShiftOS-TheRevival/TerminalApplications/Internal/Com_Manual.vb @@ -149,10 +149,22 @@ Console.TextBox1.Text = Console.TextBox1.Text & TempUsage & Environment.NewLine & Environment.NewLine & My.Resources.man_username & Environment.NewLine NormalCommand() End If + Case "unzip" + If Strings.AvailableFeature(33) = "1" Then + TempUsage = TempUsage & "unzip [FILENAME.ZIP]" + Console.TextBox1.Text = Console.TextBox1.Text & TempUsage & Environment.NewLine & Environment.NewLine & My.Resources.man_unzip & Environment.NewLine + NormalCommand() + End If Case "ver" TempUsage = TempUsage & "ver" Console.TextBox1.Text = Console.TextBox1.Text & TempUsage & Environment.NewLine & Environment.NewLine & My.Resources.man_ver & Environment.NewLine NormalCommand() + Case "zip" + If Strings.AvailableFeature(32) = "1" Then + TempUsage = TempUsage & "zip [CONTENT TYPE] '[FILENAME.ZIP]' '[CONTENT NAME]'" + Console.TextBox1.Text = Console.TextBox1.Text & TempUsage & Environment.NewLine & Environment.NewLine & My.Resources.man_zip & Environment.NewLine + NormalCommand() + End If Case Else NewLine("MAN : Invalid command") End Select diff --git a/ShiftOS-TheRevival/TerminalApplications/Internal/Com_Unzip.vb b/ShiftOS-TheRevival/TerminalApplications/Internal/Com_Unzip.vb index 8dcc8c6..c08bc08 100644 --- a/ShiftOS-TheRevival/TerminalApplications/Internal/Com_Unzip.vb +++ b/ShiftOS-TheRevival/TerminalApplications/Internal/Com_Unzip.vb @@ -28,7 +28,7 @@ Module Com_Unzip End If End If - If UnzipString Like "-h '*.zip'" Then + If UnzipString Like "-f '*.zip'" Then Dim UnzipEXE() As String = UnzipString.Split("''") NewLine(UnzipEXE(1)) If File.Exists(Console.CurrentDirectory & "\" & UnzipEXE(1)) = True Then @@ -77,6 +77,7 @@ Module Com_Unzip ' if Overwrite = false, copy the file only if it does not exist ' this is done to avoid an IOException if a file already exists ' this way the other files can be copied anyway... + NewLine("Copying " & ChildFile.Name & "...") If Not File.Exists(Path.Combine(DestDir.FullName, ChildFile.Name)) Then ChildFile.CopyTo(Path.Combine(DestDir.FullName, ChildFile.Name), False) End If diff --git a/ShiftOS-TheRevival/TerminalApplications/Internal/Com_Zip.vb b/ShiftOS-TheRevival/TerminalApplications/Internal/Com_Zip.vb index b48d2ae..27d55de 100644 --- a/ShiftOS-TheRevival/TerminalApplications/Internal/Com_Zip.vb +++ b/ShiftOS-TheRevival/TerminalApplications/Internal/Com_Zip.vb @@ -3,6 +3,7 @@ Imports System.IO.Compression Module Com_Zip Public ZipString As String + Public NothingIn As Boolean = True Public Sub Zip() ZipString = RawCommand.Substring(4) @@ -20,6 +21,7 @@ Module Com_Zip ZipFile.CreateFromDirectory(Environment.GetFolderPath(Environment.SpecialFolder.ApplicationData) & "\ShiftOS\SysShiftFS\ZIP" & ZipRandomInt, Console.CurrentDirectory & "\" & ZipEXE(1)) NewLine("Removing temporary place of the file...") Directory.Delete(Environment.GetFolderPath(Environment.SpecialFolder.ApplicationData) & "\ShiftOS\SysShiftFS\ZIP" & ZipRandomInt, True) + NothingIn = False Else End If @@ -29,6 +31,7 @@ Module Com_Zip If Directory.Exists(Console.CurrentDirectory & "\" & ZipEXE(3)) = True Then NewLine("Compressing the directory into a zip file...") ZipFile.CreateFromDirectory(Console.CurrentDirectory & "\" & ZipEXE(3), Console.CurrentDirectory & "\" & ZipEXE(1)) + NothingIn = False Else End If