Developing Chapter 2 stuff now

6 files changed, 36 insertions, 9 deletions

diff --git a/ShiftOS-TheRevival/API/TerminalAPI.vb b/ShiftOS-TheRevival/API/TerminalAPI.vb
index a8c8d63..bf95389 100644
--- a/ShiftOS-TheRevival/API/TerminalAPI.vb
+++ b/ShiftOS-TheRevival/API/TerminalAPI.vb
@@ -29,6 +29,9 @@ Module TerminalAPI
                         StayAtChapter = False
                         InitializeTerminal()
                     Else
+                        If Strings.AvailableFeature(35) = 0 Then
+                            MsgBox("Fuck you!")
+                        End If
                         Terminal_CheckFeature()
                         Terminal_PrintPrompt()
                         Terminal_AssignPrompt()
diff --git a/ShiftOS-TheRevival/Functions/InGame/ROMs/Strings.vb b/ShiftOS-TheRevival/Functions/InGame/ROMs/Strings.vb
index 761c6b2..86c30f3 100644
--- a/ShiftOS-TheRevival/Functions/InGame/ROMs/Strings.vb
+++ b/ShiftOS-TheRevival/Functions/InGame/ROMs/Strings.vb
@@ -91,6 +91,7 @@
     'Chapter 2 for ShiftOS
     '35 = Dual Window Manager [Simple Window Manager for ShiftOS] (default : 0)
     '36 = Shifter [Customization program for ShiftOS, DuWM version] (default : 0)
+    '37 = Knowledge Input [Guess how much things as many as you can] (default : 0)
     '
     'Features bought hierarchy :
     '
diff --git a/ShiftOS-TheRevival/Functions/InGame/StoreManager/Shiftoriums.vb b/ShiftOS-TheRevival/Functions/InGame/StoreManager/Shiftoriums.vb
index 9a8d6af..066b9fd 100644
--- a/ShiftOS-TheRevival/Functions/InGame/StoreManager/Shiftoriums.vb
+++ b/ShiftOS-TheRevival/Functions/InGame/StoreManager/Shiftoriums.vb
@@ -138,6 +138,10 @@
         'This is for Chapter 2 packages for ShiftOS
         If Strings.AvailableFeature(35) = 0 Then
             NewLine("(duwm | 200 CP) Dual Window Manager")
+        Else
+            If Strings.AvailableFeature(36) = 0 Then
+                NewLine("(shifter | 250 CP) Shifter")
+            End If
         End If
     End Sub
 
@@ -451,6 +455,17 @@
                     NewLine(ManHeader(1))
                     NormalCommand()
                 End If
+            Case "shifter"
+                If Strings.AvailableFeature(36) = 0 Then
+                    ManHeader(0) = "Shifter"
+                    ManHeader(1) = "250 CP"
+                    NewLine(ManHeader(0))
+                    NewLine(Nothing)
+                    NewLine("Desktop customization program for ShiftOS")
+                    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"
@@ -735,6 +750,7 @@
                         'Chapter 2 packages
                         Case "duwm"
                             Strings.AvailableFeature(35) = "1"
+                            Strings.AvailableFeature(36) = "0"
                             success = True
                     End Select
                     If success = False Then
diff --git a/ShiftOS-TheRevival/Functions/OutGame/SaveLoadSystem.vb b/ShiftOS-TheRevival/Functions/OutGame/SaveLoadSystem.vb
index a2dc8bc..be9269c 100644
--- a/ShiftOS-TheRevival/Functions/OutGame/SaveLoadSystem.vb
+++ b/ShiftOS-TheRevival/Functions/OutGame/SaveLoadSystem.vb
@@ -53,11 +53,13 @@ Module SaveLoadSystem
         Strings.AvailableFeature(33) = "2"
         '0.2.7 Features
         Strings.AvailableFeature(34) = "2"
+        Strings.AvailableFeature(35) = "2"
+        Strings.AvailableFeature(36) = "2"
     End Sub
 
     Public Sub FreeRoamMode()
         IsConsoleParent = True
-        'Sets all features to as bought
+        'Sets all features to as bought or either upgraded, Complete ShiftOS should have been like this
         Strings.ComputerInfo(0) = "shiftos"
         Strings.ComputerInfo(1) = "user"
         Strings.ComputerInfo(2) = "0"
@@ -101,6 +103,8 @@ Module SaveLoadSystem
         Strings.AvailableFeature(33) = "1"
         '0.2.7 Features
         Strings.AvailableFeature(34) = "1"
+        Strings.AvailableFeature(35) = "1"
+        Strings.AvailableFeature(36) = "1"
     End Sub
 
     Public Sub GodMode()
@@ -147,10 +151,15 @@ Module SaveLoadSystem
         Strings.AvailableFeature(33) = "2"
         '0.2.7 Features
         Strings.AvailableFeature(34) = "2"
+        Strings.AvailableFeature(35) = "2"
+        Strings.AvailableFeature(36) = "2"
     End Sub
 
     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)
         End If
diff --git a/ShiftOS-TheRevival/MainForms/DesktopEnvironment/master/DesktopManager.vb b/ShiftOS-TheRevival/MainForms/DesktopEnvironment/master/DesktopManager.vb
index 8b501ce..f772031 100644
--- a/ShiftOS-TheRevival/MainForms/DesktopEnvironment/master/DesktopManager.vb
+++ b/ShiftOS-TheRevival/MainForms/DesktopEnvironment/master/DesktopManager.vb
@@ -17,18 +17,14 @@ Module DesktopManager
 
     Public Sub StopG()
         IsStartG = False
-        'MsgBox("IsConsoleParent should be true!")
         IsConsoleParent = True
-        ''MsgBox("PID 0 0")
-        'Strings.ProcessID(0) = 0
-        ''MsgBox("PID 1 0")
-        'Strings.ProcessID(1) = 0
         TerminateWindowApps()
-        'MsgBox("Hide!")
         Cursor.Hide()
+        If Strings.OnceInfo(6) = "story" Then
+            SaveGame()
+        End If
         MsgBox("this is not a bug, this is a feature") 'Use this messagebox to hold Console to stay open, because removing this line closes Console all together for some reason
         Console.Show()
-        'MsgBox("ADIOS!")
         Desktop.Hide()
     End Sub
 
diff --git a/ShiftOS-TheRevival/TerminalApplications/Internal/Com_App.vb b/ShiftOS-TheRevival/TerminalApplications/Internal/Com_App.vb
index ce0e246..e688e9c 100644
--- a/ShiftOS-TheRevival/TerminalApplications/Internal/Com_App.vb
+++ b/ShiftOS-TheRevival/TerminalApplications/Internal/Com_App.vb
@@ -9,7 +9,9 @@
                     Case "knowledge_input"
                         DuWM_NewProcess(Uni_KnowledgeInput)
                     Case "shifter"
-                        DuWM_NewProcess(DuWM_Shifter)
+                        If Strings.AvailableFeature(36) = 0 Then
+                            DuWM_NewProcess(DuWM_Shifter)
+                        End If
                 End Select
         End Select
     End Sub