time accuracy to PM and AM and story mode fixing few bugs

8 files changed, 187 insertions, 74 deletions

diff --git a/ShiftOS-TheRevival/MainForms/SaveLoadSystem.vb b/ShiftOS-TheRevival/MainForms/SaveLoadSystem.vb
index 4a51917..7fe5613 100644
--- a/ShiftOS-TheRevival/MainForms/SaveLoadSystem.vb
+++ b/ShiftOS-TheRevival/MainForms/SaveLoadSystem.vb
@@ -3,8 +3,8 @@
     Public Sub NewGameMode()
         Strings.ComputerInfo(2) = "0"
         Strings.ComputerInfo(4) = "0"
-        Strings.AvailableFeature(0) = "0"
-        Strings.AvailableFeature(1) = "0"
+        Strings.AvailableFeature(0) = "2"
+        Strings.AvailableFeature(1) = "2"
         Strings.AvailableFeature(2) = "2"
         Strings.AvailableFeature(3) = "2"
         Strings.AvailableFeature(4) = "2"
@@ -14,11 +14,13 @@
         Strings.AvailableFeature(8) = "2"
         Strings.AvailableFeature(9) = "2"
         Strings.AvailableFeature(10) = "2"
+        Strings.AvailableFeature(11) = "0"
+        Strings.AvailableFeature(12) = "2"
     End Sub
 
     Public Sub FreeRoamMode()
         Strings.ComputerInfo(2) = "0"
-        Strings.ComputerInfo(4) = "11"
+        Strings.ComputerInfo(4) = "12"
         Strings.AvailableFeature(0) = "1"
         Strings.AvailableFeature(1) = "1"
         Strings.AvailableFeature(2) = "1"
@@ -26,17 +28,19 @@
         Strings.AvailableFeature(4) = "1"
         Strings.AvailableFeature(5) = "3"
         Strings.AvailableFeature(6) = "3"
-        Strings.AvailableFeature(7) = "1"
+        Strings.AvailableFeature(7) = "3"
         Strings.AvailableFeature(8) = "1"
         Strings.AvailableFeature(9) = "1"
         Strings.AvailableFeature(10) = "1"
+        Strings.AvailableFeature(11) = "1"
+        Strings.AvailableFeature(12) = "1"
     End Sub
 
     Public Sub GodMode()
         Strings.ComputerInfo(2) = 9999
         Strings.ComputerInfo(4) = "0"
-        Strings.AvailableFeature(0) = "0"
-        Strings.AvailableFeature(1) = "0"
+        Strings.AvailableFeature(0) = "2"
+        Strings.AvailableFeature(1) = "2"
         Strings.AvailableFeature(2) = "2"
         Strings.AvailableFeature(3) = "2"
         Strings.AvailableFeature(4) = "2"
@@ -46,5 +50,7 @@
         Strings.AvailableFeature(8) = "2"
         Strings.AvailableFeature(9) = "2"
         Strings.AvailableFeature(10) = "2"
+        Strings.AvailableFeature(11) = "0"
+        Strings.AvailableFeature(12) = "2"
     End Sub
 End Module
diff --git a/ShiftOS-TheRevival/MainForms/ShiftOSMenu.vb b/ShiftOS-TheRevival/MainForms/ShiftOSMenu.vb
index 80413c0..66766ce 100644
--- a/ShiftOS-TheRevival/MainForms/ShiftOSMenu.vb
+++ b/ShiftOS-TheRevival/MainForms/ShiftOSMenu.vb
@@ -6,6 +6,7 @@ Public Class ShiftOSMenu
     Public Shared BuildLab() As String
     Public Shared BannerUse As Integer = 1
     Public Shared TimeToChange
+    Public Shared ShouldUpdate As Boolean = False
 
     Private Sub Form1_Load(sender As Object, e As EventArgs) Handles MyBase.Load
         'Try
@@ -26,6 +27,7 @@ Public Class ShiftOSMenu
         '    MsgBox("Why? Because of " & ex.Message)
         'End Try
         CheckUpdate()
+        'CheckInstall()
         BannerChange.Start()
     End Sub
 
@@ -63,6 +65,7 @@ Public Class ShiftOSMenu
                 Strings.IsFree = False
                 MsgBox("This feature is in development, be sure to watch out for bugs")
                 IntroStory.Show()
+                NewGameMode()
                 Close()
         End Select
     End Sub
@@ -102,6 +105,31 @@ Public Class ShiftOSMenu
         End Try
     End Sub
 
+    Private Sub CheckInstall()
+        If Directory.Exists(My.Computer.FileSystem.SpecialDirectories.Temp & "\ShiftOS\ShiftFS") = True Then
+            Dim WhatVersion As String = File.ReadAllText(My.Computer.FileSystem.SpecialDirectories.Temp & "\ShiftOS\version.txt")
+            If WhatVersion = My.Resources.CurrentVersion Then
+
+            Else
+                btn_Aboot.Enabled = False
+                btn_Exit.Enabled = False
+                btn_FreeRoam.Enabled = False
+                btn_StoryMode.Enabled = False
+                ShouldUpdate = True
+                ShiftOSUpdater.Show()
+            End If
+        Else
+            If Directory.Exists(My.Computer.FileSystem.SpecialDirectories.Temp & "\ShiftOS") = True Then
+                If Directory.Exists(My.Computer.FileSystem.SpecialDirectories.Temp & "\ShiftOS\ShiftFS") = True Then
+                    Directory.CreateDirectory(My.Computer.FileSystem.GetTempFileName & "\ShiftOS\ShiftFS")
+                End If
+            Else
+                Directory.CreateDirectory(My.Computer.FileSystem.GetTempFileName & "\ShiftOS")
+                Directory.CreateDirectory(My.Computer.FileSystem.GetTempFileName & "\ShiftOS\ShiftFS")
+            End If
+        End If
+    End Sub
+
     Private Sub Label1_Click(sender As Object, e As EventArgs) Handles Label1.Click
         Label2.Text = "Debug it your way"
     End Sub
diff --git a/ShiftOS-TheRevival/MainForms/ShiftOSUpdater.Designer.vb b/ShiftOS-TheRevival/MainForms/ShiftOSUpdater.Designer.vb
index 7e5453e..2800ec2 100644
--- a/ShiftOS-TheRevival/MainForms/ShiftOSUpdater.Designer.vb
+++ b/ShiftOS-TheRevival/MainForms/ShiftOSUpdater.Designer.vb
@@ -25,7 +25,6 @@ Partial Class ShiftOSUpdater
         Me.Label1 = New System.Windows.Forms.Label()
         Me.Label2 = New System.Windows.Forms.Label()
         Me.Button1 = New System.Windows.Forms.Button()
-        Me.ProgressBar1 = New System.Windows.Forms.ProgressBar()
         Me.Button2 = New System.Windows.Forms.Button()
         Me.SuspendLayout()
         '
@@ -51,31 +50,22 @@ Partial Class ShiftOSUpdater
         '
         'Button1
         '
+        Me.Button1.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
         Me.Button1.FlatStyle = System.Windows.Forms.FlatStyle.Flat
         Me.Button1.Font = New System.Drawing.Font("Consolas", 10.0!)
-        Me.Button1.Location = New System.Drawing.Point(286, 220)
+        Me.Button1.Location = New System.Drawing.Point(286, 149)
         Me.Button1.Name = "Button1"
         Me.Button1.Size = New System.Drawing.Size(86, 29)
         Me.Button1.TabIndex = 2
         Me.Button1.Text = "Cancel"
         Me.Button1.UseVisualStyleBackColor = True
         '
-        'ProgressBar1
-        '
-        Me.ProgressBar1.BackColor = System.Drawing.Color.Black
-        Me.ProgressBar1.Cursor = System.Windows.Forms.Cursors.AppStarting
-        Me.ProgressBar1.ForeColor = System.Drawing.Color.White
-        Me.ProgressBar1.Location = New System.Drawing.Point(20, 98)
-        Me.ProgressBar1.Name = "ProgressBar1"
-        Me.ProgressBar1.Size = New System.Drawing.Size(352, 29)
-        Me.ProgressBar1.Style = System.Windows.Forms.ProgressBarStyle.Marquee
-        Me.ProgressBar1.TabIndex = 3
-        '
         'Button2
         '
+        Me.Button2.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
         Me.Button2.FlatStyle = System.Windows.Forms.FlatStyle.Flat
         Me.Button2.Font = New System.Drawing.Font("Consolas", 10.0!)
-        Me.Button2.Location = New System.Drawing.Point(194, 220)
+        Me.Button2.Location = New System.Drawing.Point(194, 149)
         Me.Button2.Name = "Button2"
         Me.Button2.Size = New System.Drawing.Size(86, 29)
         Me.Button2.TabIndex = 2
@@ -87,9 +77,8 @@ Partial Class ShiftOSUpdater
         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(384, 261)
+        Me.ClientSize = New System.Drawing.Size(380, 186)
         Me.ControlBox = False
-        Me.Controls.Add(Me.ProgressBar1)
         Me.Controls.Add(Me.Button2)
         Me.Controls.Add(Me.Button1)
         Me.Controls.Add(Me.Label2)
@@ -110,6 +99,5 @@ Partial Class ShiftOSUpdater
     Friend WithEvents Label1 As Label
     Friend WithEvents Label2 As Label
     Friend WithEvents Button1 As Button
-    Friend WithEvents ProgressBar1 As ProgressBar
     Friend WithEvents Button2 As Button
 End Class
diff --git a/ShiftOS-TheRevival/MainForms/ShiftOSUpdater.vb b/ShiftOS-TheRevival/MainForms/ShiftOSUpdater.vb
index 0bc5374..ba2ec12 100644
--- a/ShiftOS-TheRevival/MainForms/ShiftOSUpdater.vb
+++ b/ShiftOS-TheRevival/MainForms/ShiftOSUpdater.vb
@@ -6,6 +6,14 @@ Public Class ShiftOSUpdater
     Public NewVersion As String
     Public WithEvents Download As WebClient
     Private Sub Button1_Click(sender As Object, e As EventArgs) Handles Button1.Click
+        If ShiftOSMenu.ShouldUpdate = True Then
+
+        Else
+            ShiftOSMenu.btn_Aboot.Enabled = True
+            ShiftOSMenu.btn_Exit.Enabled = True
+            ShiftOSMenu.btn_FreeRoam.Enabled = True
+            ShiftOSMenu.btn_StoryMode.Enabled = True
+        End If
         Close()
     End Sub
 
@@ -31,12 +39,17 @@ Public Class ShiftOSUpdater
                 ShiftOSMenu.btn_StoryMode.Enabled = True
                 Button2.Text = "Saved"
             End If
+        ElseIf Button2.Text = "Update" Then
+            Label2.Text = "Updating ShiftOS from" & My.Resources.CurrentVersion & " to " & NewVersion
+
         Else
 
         End If
     End Sub
     Private Sub ShiftOSUpdate_Load(sender As Object, e As EventArgs) Handles MyBase.Load
-
+        If ShiftOSMenu.ShouldUpdate = True Then
+            Button1.Text = "Update"
+        End If
     End Sub
 
     'Will revisit this later
diff --git a/ShiftOS-TheRevival/MainForms/Shiftoriums.vb b/ShiftOS-TheRevival/MainForms/Shiftoriums.vb
index e5713b9..6ef2cc6 100644
--- a/ShiftOS-TheRevival/MainForms/Shiftoriums.vb
+++ b/ShiftOS-TheRevival/MainForms/Shiftoriums.vb
@@ -3,42 +3,50 @@
 
     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 & "(man | 20 CP) ShiftOS Help Manual"
-        End If
-        If Strings.AvailableFeature(1) = "0" Then
-            Terminal.TextBox1.Text = Terminal.TextBox1.Text & Environment.NewLine & "(clear | 25 CP) Clear Terminal Screen"
+        If Strings.AvailableFeature(11) = "0" Then
+            Terminal.TextBox1.Text = Terminal.TextBox1.Text & Environment.NewLine & "(key | 5 CP) ShiftOS Key"
         Else
-            If Strings.AvailableFeature(2) = "0" Then
-                Terminal.TextBox1.Text = Terminal.TextBox1.Text & Environment.NewLine & "(print | 30 CP) Print Terminal Screen"
+            If Strings.AvailableFeature(0) = "0" Then
+                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 | 25 CP) Clear Terminal Screen"
             Else
-                If Strings.AvailableFeature(3) = "0" Then
-                    Terminal.TextBox1.Text = Terminal.TextBox1.Text & Environment.NewLine & "(termdspdrv | 50 CP) Terminal Display Driver"
+                If Strings.AvailableFeature(2) = "0" Then
+                    Terminal.TextBox1.Text = Terminal.TextBox1.Text & Environment.NewLine & "(print | 30 CP) Print Terminal Screen"
                 Else
-                    If Strings.AvailableFeature(4) = "0" Then
-                        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"
+                    If Strings.AvailableFeature(3) = "0" Then
+                        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 & "(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
-            End If
-            If Strings.AvailableFeature(5) = "0" Then
-                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 & "(mtime | 20 CP) Time by Minutes"
+                If Strings.AvailableFeature(5) = "0" Then
+                    Terminal.TextBox1.Text = Terminal.TextBox1.Text & Environment.NewLine & "(stime | 10 CP) Time by Seconds"
                 Else
-                    If Strings.AvailableFeature(7) = "0" Then
-                        Terminal.TextBox1.Text = Terminal.TextBox1.Text & Environment.NewLine & "(htime | 40 CP) Time by Hours"
+                    If Strings.AvailableFeature(6) = "0" Then
+                        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 & "(htime | 40 CP) Time by Hours"
+                        Else
+                            If Strings.AvailableFeature(12) = "0" Then
+                                Terminal.TextBox1.Text = Terminal.TextBox1.Text & Environment.NewLine & "(pmam | 60 CP) PM and AM"
+                            End If
+                        End If
                     End If
                 End If
-            End If
-            If Strings.AvailableFeature(9) = "0" Then
-                Terminal.TextBox1.Text = Terminal.TextBox1.Text & Environment.NewLine & "(bc | 10 CP) Basic Calculator"
-            End If
-            If Strings.AvailableFeature(10) = "0" Then
-                Terminal.TextBox1.Text = Terminal.TextBox1.Text & Environment.NewLine & "(2bitcolor | 100 CP) 2-bit Color Support"
+                If Strings.AvailableFeature(9) = "0" Then
+                    Terminal.TextBox1.Text = Terminal.TextBox1.Text & Environment.NewLine & "(bc | 10 CP) Basic Calculator"
+                End If
+                If Strings.AvailableFeature(10) = "0" Then
+                    Terminal.TextBox1.Text = Terminal.TextBox1.Text & Environment.NewLine & "(2bitcolor | 100 CP) 2-bit Color Support"
+                End If
             End If
         End If
     End Sub
@@ -126,6 +134,20 @@
                     Terminal.TextBox1.Text = Terminal.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)
                     Terminal.BadCommand = False
                 End If
+            Case "key"
+                If Strings.AvailableFeature(11) = "0" Then
+                    ManHeader(0) = "ShiftOS Key"
+                    ManHeader(1) = "5 CP"
+                    Terminal.TextBox1.Text = Terminal.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)
+                    Terminal.BadCommand = False
+                End If
+            Case "pmam"
+                If Strings.AvailableFeature(12) = "0" Then
+                    ManHeader(0) = "PM and AM"
+                    ManHeader(1) = "60 CP"
+                    Terminal.TextBox1.Text = Terminal.TextBox1.Text & Environment.NewLine & ManHeader(0) & Environment.NewLine & Environment.NewLine & "Shows time in PM and AM format" & 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"
@@ -168,6 +190,12 @@
             Case "2bitcolor"
                 Shiftorium_InstallFeatures(True, "2bitcolor", 10, 100)
                 Terminal.BadCommand = False
+            Case "key"
+                Shiftorium_InstallFeatures(True, "key", 11, 5)
+                Terminal.BadCommand = False
+            Case "pmam"
+                Shiftorium_InstallFeatures(True, "pmam", 12, 60)
+                Terminal.BadCommand = False
             Case Else
                 Terminal.BadCommand = False
                 Terminal.TextBox1.Text = Terminal.TextBox1.Text & Environment.NewLine & "Shiftorium: Bad command or not available"
@@ -215,12 +243,26 @@
                         Case "htime"
                             Strings.AvailableFeature(6) = "3"
                             Strings.AvailableFeature(7) = "1"
+                            Strings.AvailableFeature(12) = "0"
                             success = True
                         Case "shiftfetch"
                             Strings.AvailableFeature(8) = "1"
+                            success = True
                         Case "bc"
                             Strings.AvailableFeature(9) = "1"
                             success = True
+                        Case "2bitcolor"
+                            Strings.AvailableFeature(10) = "1"
+                            success = True
+                        Case "key"
+                            Strings.AvailableFeature(11) = "1"
+                            Strings.AvailableFeature(0) = "0"
+                            Strings.AvailableFeature(1) = "0"
+                            success = True
+                        Case "pmam"
+                            Strings.AvailableFeature(7) = "3"
+                            Strings.AvailableFeature(12) = "1"
+                            'Strings.AvailableFeature(13) = "0"
                     End Select
                     If success = False Then
                         If IsCLI = True Then
diff --git a/ShiftOS-TheRevival/MainForms/Strings.vb b/ShiftOS-TheRevival/MainForms/Strings.vb
index 2665ae7..b742ece 100644
--- a/ShiftOS-TheRevival/MainForms/Strings.vb
+++ b/ShiftOS-TheRevival/MainForms/Strings.vb
@@ -2,8 +2,8 @@
     Public Shared OSInfo() As String
     Public Shared ComputerInfo(4) As String
     Public Shared IsFree As Boolean
-    Public Shared OnceInfo(0) As String
-    Public Shared AvailableFeature(10) As String
+    Public Shared OnceInfo(1) As String
+    Public Shared AvailableFeature(12) As String
     Public Shared CLIInterpreter As String
     Public Shared SaveFile As String
 
@@ -49,17 +49,21 @@
     '8 = Shiftfetch [ShiftOS port of Neofetch, A command-line system information tool] (0.2.3) (default : 0)
     '9 = bc [Basic Calculator for ShiftOS] (0.2.3) (default : 0)
     '10 = 2-bit Color Display [Adds Dark Gray and Light Gray support to the Display Driver] (0.2.3) (default : 0)
+    '11 = ShiftOS Key [A key to unlock advanced features on ShiftOS] (0.2.3) (default : 0)
+    '12 = Time by PM and AM [Showing time in hours form since midnight] (0.2.3) (default : 0)
     '
     'Features bought hierarchy :
-    'ShiftOS Help Manual (MAN) (20 CP)
-    'Terminal Clear (CLEAR) (25 CP)
-    '>Terminal Print (PRINT) (30 CP)
-    '>>Terminal Display Driver (TERMDSPDRV) (50 CP)
-    '>>>Terminal InfoBar (INFOBAR) (55 CP)
-    '>>>Shiftfetch (SHIFTFETCH) (75 CP)
-    '>>>2-bit Color Display (2BITCOLOR) (100 CP)
-    '>Basic Calculator (BC) (75 CP)
-    '>Time by Seconds (TIME, STIME) (10 CP)
-    '>>Time by Minutes (TIME, MTIME) (20 CP)
-    '>>>Time by Hours (Time, HTIME) (40 CP)
+    'ShiftOS Key (KEY) (5 CP)
+    '>ShiftOS Help Manual (MAN) (20 CP)
+    '>Terminal Clear (CLEAR) (25 CP)
+    '>>Terminal Print (PRINT) (30 CP)
+    '>>>Terminal Display Driver (TERMDSPDRV) (50 CP)
+    '>>>>Terminal InfoBar (INFOBAR) (55 CP)
+    '>>>>Shiftfetch (SHIFTFETCH) (75 CP)
+    '>>>>2-bit Color Display (2BITCOLOR) (100 CP)
+    '>>Basic Calculator (BC) (75 CP)
+    '>>Time by Seconds (TIME, STIME) (10 CP)
+    '>>>Time by Minutes (TIME, MTIME) (20 CP)
+    '>>>>Time by Hours (Time, HTIME) (40 CP)
+    '>>>>>PM and AM (Time, PMAM (60 CP))
 End Class
diff --git a/ShiftOS-TheRevival/MainForms/Terminal.Designer.vb b/ShiftOS-TheRevival/MainForms/Terminal.Designer.vb
index fe90c64..2c51995 100644
--- a/ShiftOS-TheRevival/MainForms/Terminal.Designer.vb
+++ b/ShiftOS-TheRevival/MainForms/Terminal.Designer.vb
@@ -58,6 +58,7 @@ Partial Class Terminal
         Me.InfoBar.TabIndex = 0
         Me.InfoBar.Text = "Infobar"
         Me.InfoBar.TextAlign = System.Windows.Forms.HorizontalAlignment.Right
+        Me.InfoBar.Visible = False
         '
         'InfoBarTimer
         '
diff --git a/ShiftOS-TheRevival/MainForms/Terminal.vb b/ShiftOS-TheRevival/MainForms/Terminal.vb
index 6f283f1..f838a54 100644
--- a/ShiftOS-TheRevival/MainForms/Terminal.vb
+++ b/ShiftOS-TheRevival/MainForms/Terminal.vb
@@ -11,6 +11,7 @@ Public Class Terminal
     Public ChangeInterpreter As Boolean = False
     Public CurrentInterpreter As String = "terminal"
     Public CurrentDirectory As String
+    Public StayAtChapter As Boolean = False
 
     Private Sub Terminal_Load(sender As Object, e As EventArgs) Handles MyBase.Load
         FormBorderStyle = FormBorderStyle.None
@@ -24,21 +25,28 @@ Public Class Terminal
         If Strings.IsFree = True Then
             Strings.ComputerInfo(0) = "shiftos"
             Strings.ComputerInfo(1) = "user"
-            'Strings.ComputerInfo(2) = 0
             CheckFeature()
             PrintPrompt()
             AssignPrompt()
         Else
-            If Strings.ComputerInfo(3) = "0" Then
-                TextBox1.ReadOnly = True
-                StoryOnlyTimer.Start()
-            Else
+            If StayAtChapter = True Then
                 Strings.ComputerInfo(0) = "shiftos"
                 Strings.ComputerInfo(1) = "user"
-                Strings.ComputerInfo(2) = 0
                 CheckFeature()
                 PrintPrompt()
                 AssignPrompt()
+            Else
+                If Strings.ComputerInfo(3) = "0" Then
+                    TextBox1.ReadOnly = True
+                    StayAtChapter = True
+                    StoryOnlyTimer.Start()
+                Else
+                    Strings.ComputerInfo(0) = "shiftos"
+                    Strings.ComputerInfo(1) = "user"
+                    CheckFeature()
+                    PrintPrompt()
+                    AssignPrompt()
+                End If
             End If
         End If
         TextBox1.Select(TextBox1.TextLength, 0)
@@ -175,6 +183,10 @@ Public Class Terminal
                     ElseIf Strings.AvailableFeature(6) = 3 Then
                         If Strings.AvailableFeature(7) = 1 Then
                             TextBox1.Text = TextBox1.Text & Environment.NewLine & "TIME        Display the current time in the form of hours since midnight"
+                        ElseIf Strings.AvailableFeature(7) = 3 Then
+                            If Strings.AvailableFeature(12) = 1 Then
+                                TextBox1.Text = TextBox1.Text & Environment.NewLine & "TIME        Display the current time in the form of PM and AM format"
+                            End If
                         End If
                     End If
                 End If
@@ -214,9 +226,11 @@ Public Class Terminal
                     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 & " ~@@! !@    G#&B!.          Y@@B         7#.  Y~  CPU: " & My.Computer.Registry.GetValue("HKEY_LOCAL_MACHINE\HARDWARE\DESCRIPTION\System\CentralProcessor\0", "ProcessorNameString", Nothing)
                     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"
+                    Dim TripleDigitRAM As String
+                    TripleDigitRAM = (My.Computer.Info.TotalPhysicalMemory / 1024 / 1024 / 1024)
+                    TextBox1.Text = TextBox1.Text & Environment.NewLine & "  ~&@? ^@Y       !G#57~~!YB@#Y^        .GP   ..   Memory: " & TripleDigitRAM.Substring(0, 4) & " 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!            "
@@ -246,6 +260,14 @@ Public Class Terminal
                     ElseIf Strings.AvailableFeature(6) = "3" Then
                         If Strings.AvailableFeature(7) = "1" Then
                             TextBox1.Text = TextBox1.Text & Environment.NewLine & Math.Floor(Date.Now.Subtract(Date.Today).TotalHours) & " hours passed since midnight"
+                        ElseIf Strings.AvailableFeature(7) = "3" Then
+                            If Strings.AvailableFeature(12) = "1" Then
+                                If Date.Now.Hour < 12 Then
+                                    TextBox1.Text = TextBox1.Text & Environment.NewLine & "The time is " & TimeOfDay.Hour & " AM"
+                                Else
+                                    TextBox1.Text = TextBox1.Text & Environment.NewLine & "The time is " & TimeOfDay.Hour - 12 & " PM"
+                                End If
+                            End If
                         End If
                     End If
                 End If
@@ -490,11 +512,12 @@ Public Class Terminal
                     Case 350
                         TextBox1.Text = "ShiftOS Installed, The computer will restart in a few seconds"
                     Case 400
+                        StoryOnlyTimer.Stop()
                         TextBox1.Text = Nothing
                         TextBox1.ReadOnly = False
                         Strings.ComputerInfo(0) = "shiftos"
                         Strings.ComputerInfo(1) = "user"
-                        Strings.ComputerInfo(2) = 0
+                        CheckFeature()
                         PrintPrompt()
                         AssignPrompt()
                         TextBox1.Select(TextBox1.TextLength, 0)
@@ -514,6 +537,14 @@ Public Class Terminal
             ElseIf Strings.AvailableFeature(6) = "3" Then
                 If Strings.AvailableFeature(7) = "1" Then
                     InfoBar.Text = InfoBar.Text & " " & Math.Floor(Date.Now.Subtract(Date.Today).TotalHours) & " |"
+                ElseIf Strings.AvailableFeature(7) = "3" Then
+                    If Strings.AvailableFeature(12) = "1" Then
+                        If Date.Now.Hour < 12 Then
+                            InfoBar.Text = InfoBar.Text & Environment.NewLine & " " & TimeOfDay.Hour & " AM |"
+                        Else
+                            InfoBar.Text = InfoBar.Text & Environment.NewLine & " " & TimeOfDay.Hour - 12 & " PM |"
+                        End If
+                    End If
                 End If
             End If
         End If