diff --git a/ShiftOS-TheRevival/MainForms/SaveLoadSystem.vb b/ShiftOS-TheRevival/MainForms/SaveLoadSystem.vb index b6e5816..caaf46a 100644 --- a/ShiftOS-TheRevival/MainForms/SaveLoadSystem.vb +++ b/ShiftOS-TheRevival/MainForms/SaveLoadSystem.vb @@ -1,6 +1,8 @@ Module SaveLoadSystem Public Sub NewGameMode() + Strings.ComputerInfo(2) = "0" + Strings.ComputerInfo(4) = "0" Strings.AvailableFeature(0) = "0" Strings.AvailableFeature(1) = "0" Strings.AvailableFeature(2) = "2" @@ -9,9 +11,12 @@ Strings.AvailableFeature(5) = "2" Strings.AvailableFeature(6) = "2" Strings.AvailableFeature(7) = "2" + Strings.AvailableFeature(8) = "2" End Sub Public Sub FreeRoamMode() + Strings.ComputerInfo(2) = "0" + Strings.ComputerInfo(4) = "9" Strings.AvailableFeature(0) = "1" Strings.AvailableFeature(1) = "1" Strings.AvailableFeature(2) = "1" @@ -20,10 +25,12 @@ Strings.AvailableFeature(5) = "3" Strings.AvailableFeature(6) = "3" Strings.AvailableFeature(7) = "1" + Strings.AvailableFeature(8) = "1" End Sub Public Sub GodMode() Strings.ComputerInfo(2) = 9999 + Strings.ComputerInfo(4) = "0" Strings.AvailableFeature(0) = "0" Strings.AvailableFeature(1) = "0" Strings.AvailableFeature(2) = "2" @@ -32,5 +39,6 @@ Strings.AvailableFeature(5) = "2" Strings.AvailableFeature(6) = "2" Strings.AvailableFeature(7) = "2" + Strings.AvailableFeature(8) = "2" End Sub End Module diff --git a/ShiftOS-TheRevival/MainForms/Shiftoriums.vb b/ShiftOS-TheRevival/MainForms/Shiftoriums.vb index 20b1d86..18a213a 100644 --- a/ShiftOS-TheRevival/MainForms/Shiftoriums.vb +++ b/ShiftOS-TheRevival/MainForms/Shiftoriums.vb @@ -4,30 +4,33 @@ Public Sub Shiftorium_ListFeatures() Terminal.TextBox1.Text = Terminal.TextBox1.Text & Environment.NewLine & "Shiftorium Available Feature(s)" & Environment.NewLine If Strings.AvailableFeature(0) = "0" Then - Terminal.TextBox1.Text = Terminal.TextBox1.Text & Environment.NewLine & "ShiftOS Help Manual (man | 20 CP)" + Terminal.TextBox1.Text = Terminal.TextBox1.Text & Environment.NewLine & "(man | 20 CP) ShiftOS Help Manual" End If If Strings.AvailableFeature(1) = "0" Then - Terminal.TextBox1.Text = Terminal.TextBox1.Text & Environment.NewLine & "Clear Terminal Screen (clear | 25 CP)" + Terminal.TextBox1.Text = Terminal.TextBox1.Text & Environment.NewLine & "(clear | 25 CP) Clear Terminal Screen" Else If Strings.AvailableFeature(2) = "0" Then - Terminal.TextBox1.Text = Terminal.TextBox1.Text & Environment.NewLine & "Print Terminal Screen (print | 30 CP)" + Terminal.TextBox1.Text = Terminal.TextBox1.Text & Environment.NewLine & "(print | 30 CP) Print Terminal Screen" Else If Strings.AvailableFeature(3) = "0" Then - Terminal.TextBox1.Text = Terminal.TextBox1.Text & Environment.NewLine & "Terminal Display Driver (termdspdrv | 50 CP)" + Terminal.TextBox1.Text = Terminal.TextBox1.Text & Environment.NewLine & "(termdspdrv | 50 CP) Terminal Display Driver" Else If Strings.AvailableFeature(4) = "0" Then - Terminal.TextBox1.Text = Terminal.TextBox1.Text & Environment.NewLine & "Terminal InfoBar (infobar | 55 CP)" + Terminal.TextBox1.Text = Terminal.TextBox1.Text & Environment.NewLine & "(infobar | 55 CP) Terminal InfoBar" + End If + If Strings.AvailableFeature(8) = "0" Then + Terminal.TextBox1.Text = Terminal.TextBox1.Text & Environment.NewLine & "(shiftfetch | 75 CP) Shiftfetch" End If End If End If If Strings.AvailableFeature(5) = "0" Then - Terminal.TextBox1.Text = Terminal.TextBox1.Text & Environment.NewLine & "Time by Seconds (stime | 10 CP)" + Terminal.TextBox1.Text = Terminal.TextBox1.Text & Environment.NewLine & "(stime | 10 CP) Time by Seconds" Else If Strings.AvailableFeature(6) = "0" Then - Terminal.TextBox1.Text = Terminal.TextBox1.Text & Environment.NewLine & "Time by Minutes (mtime | 20 CP)" + Terminal.TextBox1.Text = Terminal.TextBox1.Text & Environment.NewLine & "(mtime | 20 CP) Time by Minutes" Else If Strings.AvailableFeature(7) = "0" Then - Terminal.TextBox1.Text = Terminal.TextBox1.Text & Environment.NewLine & "Time by Hours (htime | 40 CP)" + Terminal.TextBox1.Text = Terminal.TextBox1.Text & Environment.NewLine & "(htime | 40 CP) Time by Hours" End If End If End If @@ -96,6 +99,13 @@ Terminal.TextBox1.Text = Terminal.TextBox1.Text & Environment.NewLine & ManHeader(0) & Environment.NewLine & Environment.NewLine & "Shows time in hours form since midnight" & Environment.NewLine & Environment.NewLine & ManHeader(1) Terminal.BadCommand = False End If + Case "shiftfetch" + If Strings.AvailableFeature(8) = "0" Then + ManHeader(0) = "Shiftfetch" + ManHeader(1) = "75 CP" + Terminal.TextBox1.Text = Terminal.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) + Terminal.BadCommand = False + End If Case Else Terminal.BadCommand = False Terminal.TextBox1.Text = Terminal.TextBox1.Text & Environment.NewLine & "Shiftorium: Bad command or not available" @@ -129,6 +139,9 @@ Case "htime" Shiftorium_InstallFeatures(True, "htime", 7, 40) Terminal.BadCommand = False + Case "shiftfetch" + Shiftorium_InstallFeatures(True, "shiftfetch", 8, 75) + Terminal.BadCommand = False Case Else Terminal.BadCommand = False Terminal.TextBox1.Text = Terminal.TextBox1.Text & Environment.NewLine & "Shiftorium: Bad command or not available" @@ -157,6 +170,7 @@ Case "termdspdrv" Strings.AvailableFeature(3) = "1" Strings.AvailableFeature(4) = "0" + Strings.AvailableFeature(8) = "0" success = True Case "infobar" Strings.AvailableFeature(4) = "1" @@ -174,12 +188,16 @@ Strings.AvailableFeature(6) = "3" Strings.AvailableFeature(7) = "1" success = True + Case "shiftfetch" + Strings.AvailableFeature(8) = "1" + success = True End Select If success = False Then If IsCLI = True Then Terminal.TextBox1.Text = Terminal.TextBox1.Text & Environment.NewLine & "Shiftorium: Invalid command or feature already installed" End If Else + Strings.ComputerInfo(4) = Strings.ComputerInfo(4) + 1 TempCP = TempCP - Codepoint Strings.ComputerInfo(2) = Convert.ToString(TempCP) If IsCLI = True Then diff --git a/ShiftOS-TheRevival/MainForms/Strings.vb b/ShiftOS-TheRevival/MainForms/Strings.vb index cbf28c6..89980bd 100644 --- a/ShiftOS-TheRevival/MainForms/Strings.vb +++ b/ShiftOS-TheRevival/MainForms/Strings.vb @@ -1,9 +1,9 @@ Public Class Strings Public Shared OSInfo() As String - Public Shared ComputerInfo(3) As String + Public Shared ComputerInfo(4) As String Public Shared IsFree As Boolean Public Shared OnceInfo(0) As String - Public Shared AvailableFeature(7) As String + Public Shared AvailableFeature(8) As String Public Shared CLIInterpreter As String Public Shared SaveFile As String @@ -34,6 +34,7 @@ '1 = Username (0.1) (default : user) '2 = Codepoint (0.2) (default : 0) '3 = Story Chapter (0.2) (default : 0 for New Game) + '4 = Installed Packages (0.2.3) (default : 0 for New Game) ' 'AvailableFeature (Default is defined on the Story Mode, Free Mode automatically assigns every available feature to 1, Unavailable in the Shiftorium assigned as 2, Upgraded assigned as 3) Strings: '0 = MAN command [Manual on each command] (0.2) (default : 0) @@ -44,6 +45,7 @@ '5 = Time by Second [Showing time in seconds form since midnight] (0.2.2) (default : 0) '6 = Time by Minutes [Showing time in minutes form since midnight] (0.2.2) (default : 0) '7 = Time by Hours [Showing time in hours form since midnight] (0.2.2) (default : 0) + '8 = Shiftfetch [ShiftOS port of Neofetch, A command-line system information tool] (0.2.3) (default : 0) ' 'Features bought hierarchy : 'ShiftOS Help Manual (MAN) (20 CP) @@ -51,6 +53,7 @@ '>Terminal Print (PRINT) (30 CP) '>>Terminal Display Driver (50 CP) '>>>Terminal InfoBar (55 CP) + '>>>Shiftfetch (75 CP) '>Time by Seconds (TIME, STIME) (10 CP) '>>Time by Minutes (TIME, MTIME) (20 CP) '>>>Time by Hours (Time, HTIME) (40 CP) diff --git a/ShiftOS-TheRevival/MainForms/Terminal.vb b/ShiftOS-TheRevival/MainForms/Terminal.vb index abf395a..a6840e3 100644 --- a/ShiftOS-TheRevival/MainForms/Terminal.vb +++ b/ShiftOS-TheRevival/MainForms/Terminal.vb @@ -10,6 +10,7 @@ Public Class Terminal Public StoryToTell As String Public ChangeInterpreter As Boolean = False Public CurrentInterpreter As String = "terminal" + Public CommandCache(4) As String Private Sub Terminal_Load(sender As Object, e As EventArgs) Handles MyBase.Load FormBorderStyle = FormBorderStyle.None @@ -179,6 +180,43 @@ Public Class Terminal End If AdvancedCommand = False BadCommand = False + Case "shiftfetch" + If Strings.AvailableFeature(8) = "1" Then + If Strings.OnceInfo(0) = "Yes" Then + TextBox1.Text = TextBox1.Text & Environment.NewLine & Environment.NewLine & " :^!7?JJJJJ?7!^: root@shiftos" + Else + TextBox1.Text = TextBox1.Text & Environment.NewLine & Environment.NewLine & " :^!7?JJJJJ?7!^: user@shiftos" + End If + TextBox1.Text = TextBox1.Text & Environment.NewLine & " .~?PB###BGP555PGB###BP?~. ----------------------" + TextBox1.Text = TextBox1.Text & Environment.NewLine & " .!P#&B57^..::^~~!!~^::~7YG!. OS: ShiftOS TheRevival" + TextBox1.Text = TextBox1.Text & Environment.NewLine & " .?#@G7: .^ :^::!5&#?. Host: " & Environment.MachineName + TextBox1.Text = TextBox1.Text & Environment.NewLine & " .?#@5^ ! .^!!..J&#? Kernel: " & My.Resources.CurrentVersion + TextBox1.Text = TextBox1.Text & Environment.NewLine & " ^B@G^ .J :7?..J@G: Uptime: N/A" + TextBox1.Text = TextBox1.Text & Environment.NewLine & " ~&@Y 7 ~PB&#Y:. ~G7 ~&&^ Packages: " & Strings.ComputerInfo(4) + TextBox1.Text = TextBox1.Text & Environment.NewLine & " ^&@Y Y 5#5??YB@&B~ .GJ :&&: Shell: sos-justshell" + TextBox1.Text = TextBox1.Text & Environment.NewLine & " G@B ? 5P ^YB! .#! ~@G Window Manager: -" + TextBox1.Text = TextBox1.Text & Environment.NewLine & " ^@@! : @Y .:::^~:. 7# Y@^ Window Manager Theme: -" + TextBox1.Text = TextBox1.Text & Environment.NewLine & " 7@@: ! B@&BBBBGPPB@#Y. :&^ ^@? Terminal: shiftos-terminal" + TextBox1.Text = TextBox1.Text & Environment.NewLine & " ?@@: 7 :??7~:. 5@@5 :&^ .&? Terminal Font: Consolas, 11pt" + TextBox1.Text = TextBox1.Text & Environment.NewLine & " ~@@! !@ G#&B!. Y@@B 7#. Y~ CPU: N/A" + TextBox1.Text = TextBox1.Text & Environment.NewLine & " B@G B@J ...~&G. 7@@@? .#? 7 GPU: N/A" + TextBox1.Text = TextBox1.Text & Environment.NewLine & " ~&@? ^@Y !G#57~~!YB@#Y^ .GP .. Memory: " & (My.Computer.Info.TotalPhysicalMemory / 1024 / 1024 / 1024) & " GB" + TextBox1.Text = TextBox1.Text & Environment.NewLine & " !@@7 ~#J 5#&&BG57^ ~BY Codepoint: " & Strings.ComputerInfo(2) + TextBox1.Text = TextBox1.Text & Environment.NewLine & " ~#@Y .5P~ ^5G~ " + TextBox1.Text = TextBox1.Text & Environment.NewLine & " .J&#! ^JY!:. ^?P5! " + TextBox1.Text = TextBox1.Text & Environment.NewLine & " :J&B?..!JYY7!~::...::~!7Y5Y7: " + TextBox1.Text = TextBox1.Text & Environment.NewLine & " .7PBP?^::~!?JJJJJJJ?7~: " + TextBox1.Text = TextBox1.Text & Environment.NewLine & " .~?55Y?!^:... " + TextBox1.Text = TextBox1.Text & Environment.NewLine & " .:~~^~^^::. " + AdvancedCommand = False + BadCommand = False + End If + Case "shiftoriumfx" + 'ChangeInterpreter = True + 'AppHost("shiftoriumfx") + AdvancedCommand = False + BadCommand = False + Undeveloped() Case "shutdown", "shut down" ShiftOSMenu.Show() Close() diff --git a/ShiftOS-TheRevival/MainForms/TerminalApps.vb b/ShiftOS-TheRevival/MainForms/TerminalApps.vb index 8d1dd25..b493118 100644 --- a/ShiftOS-TheRevival/MainForms/TerminalApps.vb +++ b/ShiftOS-TheRevival/MainForms/TerminalApps.vb @@ -21,6 +21,12 @@ Terminal.CurrentInterpreter = "guess" GTN_GenerateNumber() ShouldChange = True + Case "shiftoriumfx" + Terminal.DefaultPrompt = "Navigate> " + Terminal.CurrentInterpreter = "shiftoriumfx" + ShiftoriumFX_DisplayPackages() + Terminal.TextBox1.Text = Terminal.TextBox1.Text & Environment.NewLine & Environment.NewLine & "Type any package you want to investigate" + ShouldChange = True End Select If ShouldChange = True Then Terminal.ChangeInterpreter = True @@ -48,6 +54,16 @@ Terminal.TextBox1.Text = Terminal.TextBox1.Text & Environment.NewLine & "Invalid value!" End Try End Select + Case "shiftoriumfx" + Select Case Terminal.command + Case "" + + Case "exit" + TerminateApp() + Case Else + ShiftoriumFX_DisplayPackages() + Terminal.TextBox1.Text = Terminal.TextBox1.Text & Environment.NewLine & Environment.NewLine & "Type any package you want to investigate" & Environment.NewLine & "Invalid package or bad command" + End Select End Select End Sub @@ -74,4 +90,9 @@ End If End If End Sub + + Public Sub ShiftoriumFX_DisplayPackages() + Terminal.TextBox1.Text = "Shiftorium FX!" & Environment.NewLine & "The place to shiftisize the ShiftOS" & Environment.NewLine & Environment.NewLine & "Available Package(s)" + Shiftorium_ListFeatures() + End Sub End Module diff --git a/ShiftOS-TheRevival/My Project/AssemblyInfo.vb b/ShiftOS-TheRevival/My Project/AssemblyInfo.vb index d897939..72918ab 100644 --- a/ShiftOS-TheRevival/My Project/AssemblyInfo.vb +++ b/ShiftOS-TheRevival/My Project/AssemblyInfo.vb @@ -31,5 +31,5 @@ Imports System.Runtime.InteropServices ' by using the '*' as shown below: ' - - + + diff --git a/ShiftOS-TheRevival/Resources/CurrentVersion.txt b/ShiftOS-TheRevival/Resources/CurrentVersion.txt index 7dff5b8..f477849 100644 --- a/ShiftOS-TheRevival/Resources/CurrentVersion.txt +++ b/ShiftOS-TheRevival/Resources/CurrentVersion.txt @@ -1 +1 @@ -0.2.1 \ No newline at end of file +0.2.2 \ No newline at end of file