diff --git a/ShiftOS-TheRevival/API/TerminalAPI.vb b/ShiftOS-TheRevival/API/TerminalAPI.vb index bf95389..10a6214 100644 --- a/ShiftOS-TheRevival/API/TerminalAPI.vb +++ b/ShiftOS-TheRevival/API/TerminalAPI.vb @@ -29,9 +29,6 @@ Module TerminalAPI StayAtChapter = False InitializeTerminal() Else - If Strings.AvailableFeature(35) = 0 Then - MsgBox("Fuck you!") - End If Terminal_CheckFeature() Terminal_PrintPrompt() Terminal_AssignPrompt() @@ -192,6 +189,12 @@ Module TerminalAPI Case "05tray" _05tray() NewLine("you cheater!") + Case "applist" + If IsStartG = True Then + AppList() + AdvancedCommand = False + NormalCommand() + End If Case "bc" If Strings.AvailableFeature(9) = "1" Then Console.ChangeInterpreter = True diff --git a/ShiftOS-TheRevival/Functions/InGame/LoreManager/IntroStoryTell.vb b/ShiftOS-TheRevival/Functions/InGame/LoreManager/IntroStoryTell.vb index ff69a3e..7df91e0 100644 --- a/ShiftOS-TheRevival/Functions/InGame/LoreManager/IntroStoryTell.vb +++ b/ShiftOS-TheRevival/Functions/InGame/LoreManager/IntroStoryTell.vb @@ -54,7 +54,7 @@ Case 1 Select Case Timestamp Case 5 - ResetLine(" Connected") + ResetLine("Connected to ") Case 25 NewLine(" : Hmmm, you've got your terminal explored enough, ay?") Case 75 diff --git a/ShiftOS-TheRevival/Functions/InGame/ROMs/GUISCustomizations.vb b/ShiftOS-TheRevival/Functions/InGame/ROMs/GUISCustomizations.vb new file mode 100644 index 0000000..0ee26e4 --- /dev/null +++ b/ShiftOS-TheRevival/Functions/InGame/ROMs/GUISCustomizations.vb @@ -0,0 +1,4 @@ +Public Class GUISCustomizations + 'Desktop Stuff + Public Shared DesktopColor As Color +End Class diff --git a/ShiftOS-TheRevival/Functions/OutGame/SaveLoadSystem.vb b/ShiftOS-TheRevival/Functions/OutGame/SaveLoadSystem.vb index 5747e1d..34cc3f7 100644 --- a/ShiftOS-TheRevival/Functions/OutGame/SaveLoadSystem.vb +++ b/ShiftOS-TheRevival/Functions/OutGame/SaveLoadSystem.vb @@ -172,11 +172,15 @@ Module SaveLoadSystem Public Sub SaveGame() If Strings.OnceInfo(6) = "story" Then - If Strings.AvailableFeature(35) = 0 Then - MsgBox("Fuck you!!") - End If File.WriteAllLines(Environment.GetFolderPath(Environment.SpecialFolder.ApplicationData) & "\ShiftOS\saved\ComputerInfo.sos", Strings.ComputerInfo) File.WriteAllLines(Environment.GetFolderPath(Environment.SpecialFolder.ApplicationData) & "\ShiftOS\saved\AvailableFeature.sos", Strings.AvailableFeature) + If Strings.AvailableFeature(35) Then + Select Case Strings.ComputerInfo(7) + Case 1 + Dim DesktopColor As Integer = GUISCustomizations.DesktopColor.ToArgb() + File.WriteAllText(Environment.GetFolderPath(Environment.SpecialFolder.ApplicationData) & "\ShiftOS\saved\Shifter_Desktop.sos", DesktopColor.ToString) + End Select + End If End If End Sub @@ -184,6 +188,18 @@ Module SaveLoadSystem If Strings.OnceInfo(6) = "story" Then Strings.ComputerInfo = File.ReadAllLines(Environment.GetFolderPath(Environment.SpecialFolder.ApplicationData) & "\ShiftOS\saved\ComputerInfo.sos") Strings.AvailableFeature = File.ReadAllLines(Environment.GetFolderPath(Environment.SpecialFolder.ApplicationData) & "\ShiftOS\saved\AvailableFeature.sos") + If Strings.AvailableFeature(35) Then + Select Case Strings.ComputerInfo(7) + Case 1 + Dim DesktopColor As Integer + If File.Exists(Environment.GetFolderPath(Environment.SpecialFolder.ApplicationData) & "\ShiftOS\saved\Shifter_Desktop.sos") = True Then + DesktopColor = File.ReadAllText(Environment.GetFolderPath(Environment.SpecialFolder.ApplicationData) & "\ShiftOS\saved\Shifter_Desktop.sos") + GUISCustomizations.DesktopColor = Color.FromArgb(DesktopColor) + Else + GUISCustomizations.DesktopColor = Color.Black + End If + End Select + End If End If End Sub End Module \ No newline at end of file diff --git a/ShiftOS-TheRevival/Functions/OutGame/TheUpdater.vb b/ShiftOS-TheRevival/Functions/OutGame/TheUpdater.vb index 28b827e..b8b66ec 100644 --- a/ShiftOS-TheRevival/Functions/OutGame/TheUpdater.vb +++ b/ShiftOS-TheRevival/Functions/OutGame/TheUpdater.vb @@ -109,6 +109,18 @@ Module TheUpdater Strings.AvailableFeature(32) = 2 Strings.AvailableFeature(33) = 2 End If + If Strings.AvailableFeature(9) = 1 Then + Strings.AvailableFeature(34) = 0 + Else + Strings.AvailableFeature(34) = 2 + End If + Strings.AvailableFeature(35) = 2 + Strings.AvailableFeature(36) = 2 + Strings.AvailableFeature(37) = 2 + Strings.AvailableFeature(38) = 2 + Strings.AvailableFeature(39) = 2 + Strings.AvailableFeature(40) = 2 + Strings.AvailableFeature(41) = 2 Strings.ComputerInfo(0) = ComputerInfoHere(0) Strings.ComputerInfo(1) = ComputerInfoHere(1) Strings.ComputerInfo(2) = ComputerInfoHere(2) @@ -163,6 +175,78 @@ Module TheUpdater Strings.AvailableFeature(32) = 2 Strings.AvailableFeature(33) = 2 End If + If Strings.AvailableFeature(9) = 1 Then + Strings.AvailableFeature(34) = 0 + Else + Strings.AvailableFeature(34) = 2 + End If + Strings.AvailableFeature(35) = 2 + Strings.AvailableFeature(36) = 2 + Strings.AvailableFeature(37) = 2 + Strings.AvailableFeature(38) = 2 + Strings.AvailableFeature(39) = 2 + Strings.AvailableFeature(40) = 2 + Strings.AvailableFeature(41) = 2 + Strings.ComputerInfo(0) = ComputerInfoHere(0) + Strings.ComputerInfo(1) = ComputerInfoHere(1) + Strings.ComputerInfo(2) = ComputerInfoHere(2) + Strings.ComputerInfo(3) = ComputerInfoHere(3) + Strings.ComputerInfo(4) = ComputerInfoHere(4) + Strings.ComputerInfo(5) = "0F" + Strings.ComputerInfo(6) = "F0" + If Directory.Exists(Environment.GetFolderPath(Environment.SpecialFolder.ApplicationData) & "\ShiftOS\SysShiftFS") = True Then + + Else + Directory.CreateDirectory(Environment.GetFolderPath(Environment.SpecialFolder.ApplicationData) & "\ShiftOS\SysShiftFS") + End If + ShiftOSUpdater.Button2.Text = "Updated!" + Case "0.2.6" + Strings.AvailableFeature(0) = AvailableFeatureHere(0) + Strings.AvailableFeature(1) = AvailableFeatureHere(1) + Strings.AvailableFeature(2) = AvailableFeatureHere(2) + Strings.AvailableFeature(3) = AvailableFeatureHere(3) + Strings.AvailableFeature(4) = AvailableFeatureHere(4) + Strings.AvailableFeature(5) = AvailableFeatureHere(5) + Strings.AvailableFeature(6) = AvailableFeatureHere(6) + Strings.AvailableFeature(7) = AvailableFeatureHere(7) + Strings.AvailableFeature(8) = AvailableFeatureHere(8) + Strings.AvailableFeature(9) = AvailableFeatureHere(9) + Strings.AvailableFeature(10) = AvailableFeatureHere(10) + Strings.AvailableFeature(11) = AvailableFeatureHere(11) + Strings.AvailableFeature(12) = AvailableFeatureHere(12) + Strings.AvailableFeature(13) = AvailableFeatureHere(13) + Strings.AvailableFeature(14) = AvailableFeatureHere(14) + Strings.AvailableFeature(15) = AvailableFeatureHere(15) + Strings.AvailableFeature(16) = AvailableFeatureHere(16) + Strings.AvailableFeature(17) = AvailableFeatureHere(17) + Strings.AvailableFeature(18) = AvailableFeatureHere(18) + Strings.AvailableFeature(19) = AvailableFeatureHere(19) + Strings.AvailableFeature(20) = AvailableFeatureHere(20) + Strings.AvailableFeature(21) = AvailableFeatureHere(21) + Strings.AvailableFeature(22) = AvailableFeatureHere(22) + Strings.AvailableFeature(23) = AvailableFeatureHere(23) + Strings.AvailableFeature(24) = AvailableFeatureHere(24) + Strings.AvailableFeature(25) = AvailableFeatureHere(25) + Strings.AvailableFeature(26) = AvailableFeatureHere(26) + Strings.AvailableFeature(27) = AvailableFeatureHere(27) + Strings.AvailableFeature(28) = AvailableFeatureHere(28) + Strings.AvailableFeature(29) = AvailableFeatureHere(29) + Strings.AvailableFeature(30) = AvailableFeatureHere(30) + Strings.AvailableFeature(31) = AvailableFeatureHere(31) + Strings.AvailableFeature(32) = AvailableFeatureHere(32) + Strings.AvailableFeature(33) = AvailableFeatureHere(33) + If Strings.AvailableFeature(9) = 1 Then + Strings.AvailableFeature(34) = 0 + Else + Strings.AvailableFeature(34) = 2 + End If + Strings.AvailableFeature(35) = 2 + Strings.AvailableFeature(36) = 2 + Strings.AvailableFeature(37) = 2 + Strings.AvailableFeature(38) = 2 + Strings.AvailableFeature(39) = 2 + Strings.AvailableFeature(40) = 2 + Strings.AvailableFeature(41) = 2 Strings.ComputerInfo(0) = ComputerInfoHere(0) Strings.ComputerInfo(1) = ComputerInfoHere(1) Strings.ComputerInfo(2) = ComputerInfoHere(2) diff --git a/ShiftOS-TheRevival/MainForms/Applications/DuWM/Shifter/Categories/DuWM_Shifter_Desktop.vb b/ShiftOS-TheRevival/MainForms/Applications/DuWM/Shifter/Categories/DuWM_Shifter_Desktop.vb index d7f5b26..1c105e0 100644 --- a/ShiftOS-TheRevival/MainForms/Applications/DuWM/Shifter/Categories/DuWM_Shifter_Desktop.vb +++ b/ShiftOS-TheRevival/MainForms/Applications/DuWM/Shifter/Categories/DuWM_Shifter_Desktop.vb @@ -55,6 +55,30 @@ DuWM_Shifter_Configs.DesktopBackColor = Color.Silver Case "Dark Gray" DuWM_Shifter_Configs.DesktopBackColor = Color.Gray + Case "Red" + DuWM_Shifter_Configs.DesktopBackColor = Color.Red + Case "Dark Red" + DuWM_Shifter_Configs.DesktopBackColor = Color.Maroon + Case "Green" + DuWM_Shifter_Configs.DesktopBackColor = Color.Green + Case "Light Green" + DuWM_Shifter_Configs.DesktopBackColor = Color.Lime + Case "Blue" + DuWM_Shifter_Configs.DesktopBackColor = Color.Navy + Case "Dark Blue" + DuWM_Shifter_Configs.DesktopBackColor = Color.Blue + Case "Yellow" + DuWM_Shifter_Configs.DesktopBackColor = Color.Yellow + Case "Dark Yellow" + DuWM_Shifter_Configs.DesktopBackColor = Color.Brown + Case "Purple" + DuWM_Shifter_Configs.DesktopBackColor = Color.Magenta + Case "Light Purple" + DuWM_Shifter_Configs.DesktopBackColor = Color.Fuchsia + Case "Aqua" + DuWM_Shifter_Configs.DesktopBackColor = Color.Aqua + Case "Light Aqua" + DuWM_Shifter_Configs.DesktopBackColor = Color.Cyan End Select End Sub End Class diff --git a/ShiftOS-TheRevival/MainForms/Applications/DuWM/Shifter/DuWM_Shifter.vb b/ShiftOS-TheRevival/MainForms/Applications/DuWM/Shifter/DuWM_Shifter.vb index 06b35c6..04f68e6 100644 --- a/ShiftOS-TheRevival/MainForms/Applications/DuWM/Shifter/DuWM_Shifter.vb +++ b/ShiftOS-TheRevival/MainForms/Applications/DuWM/Shifter/DuWM_Shifter.vb @@ -54,9 +54,19 @@ End Sub Private Sub btn_Apply_Click(sender As Object, e As EventArgs) Handles Button1.Click + Apply() + End Sub + + Private Sub Apply() Select Case lst_Features.SelectedItem Case "Desktop" Desktop.BackColor = DuWM_Shifter_Configs.DesktopBackColor + GUISCustomizations.DesktopColor = Desktop.BackColor End Select End Sub + + Private Sub Button3_Click(sender As Object, e As EventArgs) Handles Button3.Click + Apply() + Close() + End Sub End Class \ No newline at end of file diff --git a/ShiftOS-TheRevival/MainForms/WindowManager/DualWindowManager/DuWM_Main.vb b/ShiftOS-TheRevival/MainForms/WindowManager/DualWindowManager/DuWM_Main.vb index bfef5c7..4efefb6 100644 --- a/ShiftOS-TheRevival/MainForms/WindowManager/DualWindowManager/DuWM_Main.vb +++ b/ShiftOS-TheRevival/MainForms/WindowManager/DualWindowManager/DuWM_Main.vb @@ -8,7 +8,7 @@ Public Sub DuWM_Initiate() Strings.ProcessID(0) = 0 Strings.ProcessID(1) = 0 - 'DuWM_SingleWindowSet(Console) + Desktop.BackColor = GUISCustomizations.DesktopColor DuWM_NewProcess(Console) End Sub diff --git a/ShiftOS-TheRevival/Resources/CurrentVersion.txt b/ShiftOS-TheRevival/Resources/CurrentVersion.txt index a53741c..967b33f 100644 --- a/ShiftOS-TheRevival/Resources/CurrentVersion.txt +++ b/ShiftOS-TheRevival/Resources/CurrentVersion.txt @@ -1 +1 @@ -0.2.6 \ No newline at end of file +0.2.7 \ No newline at end of file diff --git a/ShiftOS-TheRevival/ShiftOS-TheRevival.vbproj b/ShiftOS-TheRevival/ShiftOS-TheRevival.vbproj index bbeeccb..862cb6b 100644 --- a/ShiftOS-TheRevival/ShiftOS-TheRevival.vbproj +++ b/ShiftOS-TheRevival/ShiftOS-TheRevival.vbproj @@ -96,6 +96,7 @@ + @@ -219,6 +220,7 @@ + diff --git a/ShiftOS-TheRevival/TerminalApplications/Internal/Com_Applist.vb b/ShiftOS-TheRevival/TerminalApplications/Internal/Com_Applist.vb new file mode 100644 index 0000000..63941a1 --- /dev/null +++ b/ShiftOS-TheRevival/TerminalApplications/Internal/Com_Applist.vb @@ -0,0 +1,13 @@ +Module Com_Applist + Public Sub AppList() + NewLine("ShiftOS Graphical Application List") + NewLine("To run a program, you can type 'app ' and the name of the program listed below (along with its underscore or any symbols included)") + NewLine(Nothing) + If Strings.AvailableFeature(37) = 1 Then + NewLine("KNOWLEDGE_INPUT Simple puzzle game where you guess as many things as you can") + End If + If Strings.AvailableFeature(36) = 1 Then + NewLine("SHIFTER Graphical customization program for ShiftOS") + End If + End Sub +End Module diff --git a/ShiftOS-TheRevival/TerminalApplications/Internal/Com_Guide.vb b/ShiftOS-TheRevival/TerminalApplications/Internal/Com_Guide.vb index 116ba22..da1bbeb 100644 --- a/ShiftOS-TheRevival/TerminalApplications/Internal/Com_Guide.vb +++ b/ShiftOS-TheRevival/TerminalApplications/Internal/Com_Guide.vb @@ -15,6 +15,17 @@ 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) + Else + NewLine(Nothing) + End If + If Strings.ComputerInfo(7) IsNot "0" Then + NewLine("You can run a graphical user Interface With its installed window manager And desktop environment by typing 'startg', and stopping it by typing 'stopg'") + If IsStartG = True Then + NewLine("To run a program, type 'app ' and the program's name, and 'applist' for getting list of available applications") + NewLine(Nothing) + Else + NewLine(Nothing) + End If 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") @@ -92,6 +103,11 @@ If Strings.AvailableFeature(34) = 1 Then AddLine(", answer basic arithmatical question on 'mathquiz'") End If + If IsStartG = True Then + If Strings.AvailableFeature(37) = 1 Then + AddLine(", guess as many things as you can in 'knowledge_input'") + End If + 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 020ab7b..be415f6 100644 --- a/ShiftOS-TheRevival/TerminalApplications/Internal/Com_Help.vb +++ b/ShiftOS-TheRevival/TerminalApplications/Internal/Com_Help.vb @@ -4,12 +4,19 @@ 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 IsStartG = True Then + NewLine("To get lists of available applications, you can type 'applist'") + End If If Strings.AvailableFeature(0) = 1 Then NewLine("To get help on each command, you can type 'man [command]'") NewLine(Nothing) Else NewLine(Nothing) End If + If IsStartG = True Then + NewLine("APP Running graphical application") + NewLine("APPLIST Shows lists of available graphical applications") + End If If Strings.AvailableFeature(9) = 1 Then NewLine("BC Basic Calculator for simple calculation") End If @@ -88,7 +95,15 @@ End If NewLine("SHIFTORIUM A software center for upgrading features on ShiftOS") NewLine("SHUTDOWN Terminate ShiftOS session") + If IsStartG = False Then + NewLine("STARTG Starts Graphical User Interface for ShiftOS") + Else + NewLine("STOPG Stops Graphical User Interface for ShiftOS") + End If NewLine("SU Runs terminal as super user") + If IsStartG = True Then + NewLine("TASKKILL Kills or closes application") + End If If Strings.AvailableFeature(17) = 1 Then NewLine("TEXTPAD Simple text-editor for ShiftOS") End If