From bd4c45f316d11e124fe5d21d9c5f66e21149fc5d Mon Sep 17 00:00:00 2001 From: EverythingWindows Date: Mon, 14 Nov 2022 13:50:43 +0700 Subject: [PATCH] More organized --- .../{MainForms => API}/ConsoleAPI.vb | 0 .../{MainForms => API}/TerminalAPI.vb | 0 .../InGame}/DirectoryManagements.vb | 0 .../InGame}/FileManagement.vb | 0 .../InGame}/Shiftoriums.vb | 26 +++++++++++++++++++ .../InGame}/Strings.vb | 4 ++- .../InGame}/TerminalColorSystem.vb | 0 .../InGame}/TerminalExternalApps.vb | 0 .../InGame}/TerminalInternalApps.vb | 0 .../OutGame}/TheUpdater.vb | 0 .../MainForms/SaveLoadSystem.vb | 9 +++++++ ShiftOS-TheRevival/ShiftOS-TheRevival.vbproj | 20 +++++++------- 12 files changed, 48 insertions(+), 11 deletions(-) rename ShiftOS-TheRevival/{MainForms => API}/ConsoleAPI.vb (100%) rename ShiftOS-TheRevival/{MainForms => API}/TerminalAPI.vb (100%) rename ShiftOS-TheRevival/{MainForms => Functions/InGame}/DirectoryManagements.vb (100%) rename ShiftOS-TheRevival/{MainForms => Functions/InGame}/FileManagement.vb (100%) rename ShiftOS-TheRevival/{MainForms => Functions/InGame}/Shiftoriums.vb (96%) rename ShiftOS-TheRevival/{MainForms => Functions/InGame}/Strings.vb (96%) rename ShiftOS-TheRevival/{MainForms => Functions/InGame}/TerminalColorSystem.vb (100%) rename ShiftOS-TheRevival/{MainForms => Functions/InGame}/TerminalExternalApps.vb (100%) rename ShiftOS-TheRevival/{MainForms => Functions/InGame}/TerminalInternalApps.vb (100%) rename ShiftOS-TheRevival/{MainForms => Functions/OutGame}/TheUpdater.vb (100%) diff --git a/ShiftOS-TheRevival/MainForms/ConsoleAPI.vb b/ShiftOS-TheRevival/API/ConsoleAPI.vb similarity index 100% rename from ShiftOS-TheRevival/MainForms/ConsoleAPI.vb rename to ShiftOS-TheRevival/API/ConsoleAPI.vb diff --git a/ShiftOS-TheRevival/MainForms/TerminalAPI.vb b/ShiftOS-TheRevival/API/TerminalAPI.vb similarity index 100% rename from ShiftOS-TheRevival/MainForms/TerminalAPI.vb rename to ShiftOS-TheRevival/API/TerminalAPI.vb diff --git a/ShiftOS-TheRevival/MainForms/DirectoryManagements.vb b/ShiftOS-TheRevival/Functions/InGame/DirectoryManagements.vb similarity index 100% rename from ShiftOS-TheRevival/MainForms/DirectoryManagements.vb rename to ShiftOS-TheRevival/Functions/InGame/DirectoryManagements.vb diff --git a/ShiftOS-TheRevival/MainForms/FileManagement.vb b/ShiftOS-TheRevival/Functions/InGame/FileManagement.vb similarity index 100% rename from ShiftOS-TheRevival/MainForms/FileManagement.vb rename to ShiftOS-TheRevival/Functions/InGame/FileManagement.vb diff --git a/ShiftOS-TheRevival/MainForms/Shiftoriums.vb b/ShiftOS-TheRevival/Functions/InGame/Shiftoriums.vb similarity index 96% rename from ShiftOS-TheRevival/MainForms/Shiftoriums.vb rename to ShiftOS-TheRevival/Functions/InGame/Shiftoriums.vb index d9317e0..89a1e77 100644 --- a/ShiftOS-TheRevival/MainForms/Shiftoriums.vb +++ b/ShiftOS-TheRevival/Functions/InGame/Shiftoriums.vb @@ -2,6 +2,8 @@ Public prompt As String Public Sub Shiftorium_ListFeatures() + 'Shows available installable feature on Shiftorium + '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 @@ -53,6 +55,9 @@ If Strings.AvailableFeature(30) = "0" Then NewLine("(batchscript | 100 CP) ShiftOS Batch Script Support") End If + If Strings.AvailableFeature(31) = "0" Then + NewLine("(clipboard | 100 CP) Clipboard support") + End If End If End If End If @@ -376,6 +381,17 @@ NewLine(ManHeader(1)) Console.BadCommand = False End If + Case "clipboard" + If Strings.AvailableFeature(31) = "0" Then + ManHeader(0) = "Clipboard Support" + ManHeader(1) = "100 CP" + NewLine(ManHeader(0)) + NewLine(Nothing) + NewLine("Adds the supports for clipboard") + NewLine(Nothing) + NewLine(ManHeader(1)) + Console.BadCommand = False + End If Case Else Console.BadCommand = False Console.TextBox1.Text = Console.TextBox1.Text & Environment.NewLine & "Shiftorium: Bad command or not available" @@ -478,6 +494,9 @@ Case "batchscript" Shiftorium_InstallFeatures(True, "batchscript", 30, 100) Console.BadCommand = False + Case "clipboard" + Shiftorium_InstallFeatures(True, "clipboard", 31, 100) + Console.BadCommand = False Case Else Console.BadCommand = False NewLine("Shiftorium: Bad command or not available") @@ -485,7 +504,9 @@ End Sub Public Sub Shiftorium_InstallFeatures(IsCLI As Boolean, Feature As String, FeatureRow As Integer, Codepoint As Integer) + 'Import the current CP as an Integer Dim TempCP As Integer = Convert.ToInt32(Strings.ComputerInfo(2)) + 'See what feature that are going to be installed Select Case Strings.AvailableFeature(FeatureRow) Case "0" If TempCP >= Codepoint Then @@ -570,6 +591,7 @@ Case "textpad" Strings.AvailableFeature(17) = "1" Strings.AvailableFeature(30) = "0" + Strings.AvailableFeature(31) = "0" success = True Case "shiftkey" Strings.AvailableFeature(18) = "1" @@ -623,12 +645,16 @@ Case "batchscript" Strings.AvailableFeature(30) = "1" success = True + Case "clipboard" + Strings.AvailableFeature(31) = "1" + success = True End Select If success = False Then If IsCLI = True Then NewLine("Shiftorium: Invalid command or feature already installed") End If Else + 'It will deduct the current codepoint to the modified codepoint and exporting it back to ComputerInfo(2) Strings.ComputerInfo(4) = Strings.ComputerInfo(4) + 1 TempCP = TempCP - Codepoint Strings.ComputerInfo(2) = Convert.ToString(TempCP) diff --git a/ShiftOS-TheRevival/MainForms/Strings.vb b/ShiftOS-TheRevival/Functions/InGame/Strings.vb similarity index 96% rename from ShiftOS-TheRevival/MainForms/Strings.vb rename to ShiftOS-TheRevival/Functions/InGame/Strings.vb index 41dcbe9..0bbada4 100644 --- a/ShiftOS-TheRevival/MainForms/Strings.vb +++ b/ShiftOS-TheRevival/Functions/InGame/Strings.vb @@ -3,7 +3,7 @@ Public Shared ComputerInfo(6) As String Public Shared IsFree As Boolean Public Shared OnceInfo(8) As String - Public Shared AvailableFeature(30) As String + Public Shared AvailableFeature(31) As String Public Shared CLIInterpreter As String Public Shared SaveFile As String Public Shared Achievement As String @@ -79,6 +79,7 @@ '28 = Date by month and year [Shows date in MM/YYYY format] (0.2.5) (default : 0) '29 = Date by general [Shows date in general DD/MM/YYYY format] (0.2.5) (default : 0) '30 = Batch-file support for ShiftOS [Gives execution support for ShiftOS Script File (.scr)] (0.2.5) (default : 0) + '31 = Clipboard support for ShiftOS [Gives clipboard support for copy-pasting in ShiftOS] (0.2.6) (default : 0) ' 'Features bought hierarchy : 'ShiftOS Key (KEY) (5 CP) @@ -100,6 +101,7 @@ '>>>>>>>4-bit Color Display (4BITCOLOR) (80 CP) '>>>>>>>>Terminal Read-Only Memory Driver (ROMDRIVER, DIR, MKDIR, RMDIR, CD, PWD) (90 CP) '>>>>>>>>>TextPad (100 CP) + '>>>>>>>>>>Clipboard support (CLIPBOARD) (100 CP) '>>>>>>>>>>ShiftOS Batch Script Support (BATCHSCRIPT) (100 CP) '>>Basic Calculator (BC) (55 CP) '>>Time by Seconds (TIME, STIME) (10 CP) diff --git a/ShiftOS-TheRevival/MainForms/TerminalColorSystem.vb b/ShiftOS-TheRevival/Functions/InGame/TerminalColorSystem.vb similarity index 100% rename from ShiftOS-TheRevival/MainForms/TerminalColorSystem.vb rename to ShiftOS-TheRevival/Functions/InGame/TerminalColorSystem.vb diff --git a/ShiftOS-TheRevival/MainForms/TerminalExternalApps.vb b/ShiftOS-TheRevival/Functions/InGame/TerminalExternalApps.vb similarity index 100% rename from ShiftOS-TheRevival/MainForms/TerminalExternalApps.vb rename to ShiftOS-TheRevival/Functions/InGame/TerminalExternalApps.vb diff --git a/ShiftOS-TheRevival/MainForms/TerminalInternalApps.vb b/ShiftOS-TheRevival/Functions/InGame/TerminalInternalApps.vb similarity index 100% rename from ShiftOS-TheRevival/MainForms/TerminalInternalApps.vb rename to ShiftOS-TheRevival/Functions/InGame/TerminalInternalApps.vb diff --git a/ShiftOS-TheRevival/MainForms/TheUpdater.vb b/ShiftOS-TheRevival/Functions/OutGame/TheUpdater.vb similarity index 100% rename from ShiftOS-TheRevival/MainForms/TheUpdater.vb rename to ShiftOS-TheRevival/Functions/OutGame/TheUpdater.vb diff --git a/ShiftOS-TheRevival/MainForms/SaveLoadSystem.vb b/ShiftOS-TheRevival/MainForms/SaveLoadSystem.vb index 5b7f77e..bd61679 100644 --- a/ShiftOS-TheRevival/MainForms/SaveLoadSystem.vb +++ b/ShiftOS-TheRevival/MainForms/SaveLoadSystem.vb @@ -3,6 +3,7 @@ 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\saved", True) Directory.CreateDirectory(Environment.GetFolderPath(Environment.SpecialFolder.ApplicationData) & "\ShiftOS\ShiftFS") @@ -44,9 +45,12 @@ Module SaveLoadSystem Strings.AvailableFeature(28) = "2" Strings.AvailableFeature(29) = "2" Strings.AvailableFeature(30) = "2" + '0.2.6 Features + Strings.AvailableFeature(31) = "2" End Sub Public Sub FreeRoamMode() + 'Sets all features to as bought Strings.ComputerInfo(0) = "shiftos" Strings.ComputerInfo(1) = "user" Strings.ComputerInfo(2) = "0" @@ -84,9 +88,12 @@ Module SaveLoadSystem Strings.AvailableFeature(28) = "3" Strings.AvailableFeature(29) = "1" Strings.AvailableFeature(30) = "1" + '0.2.6 Features + Strings.AvailableFeature(31) = "1" End Sub Public Sub GodMode() + 'Same as new game but codepoints automatically assigned to 9999 and not saved into the FS Strings.ComputerInfo(0) = "shiftos" Strings.ComputerInfo(1) = "user" Strings.ComputerInfo(2) = 9999 @@ -123,6 +130,8 @@ Module SaveLoadSystem Strings.AvailableFeature(28) = "2" Strings.AvailableFeature(29) = "2" Strings.AvailableFeature(30) = "2" + '0.2.6 Features + Strings.AvailableFeature(31) = "2" End Sub Public Sub SaveGame() diff --git a/ShiftOS-TheRevival/ShiftOS-TheRevival.vbproj b/ShiftOS-TheRevival/ShiftOS-TheRevival.vbproj index e499099..c7756c3 100644 --- a/ShiftOS-TheRevival/ShiftOS-TheRevival.vbproj +++ b/ShiftOS-TheRevival/ShiftOS-TheRevival.vbproj @@ -111,14 +111,14 @@ Form - + Epilepsy.vb Form - + IntroStory.vb @@ -126,7 +126,7 @@ Form - + Form @@ -140,19 +140,19 @@ Form - + Console.vb Form - - - - - - + + + + + + True