Integrating Chapter 2 into the game and minor changes to check the story

5 files changed, 18 insertions, 10 deletions

diff --git a/ShiftOS-TheRevival/MainForms/Applications/Console.vb b/ShiftOS-TheRevival/MainForms/Applications/Console.vb
index 63d3bbd..8e34957 100644
--- a/ShiftOS-TheRevival/MainForms/Applications/Console.vb
+++ b/ShiftOS-TheRevival/MainForms/Applications/Console.vb
@@ -11,7 +11,6 @@ Public Class Console
     Public CurrentInterpreter As String                 'Shows what program is using Console
     Public CurrentDirectory As String                   'Current Directory for ShiftOS Explorer
     Public Pseudodir As String                          'Pseudo-directory for ShiftFS 
-    Public StayAtChapter As Boolean = False             'If this set to true, then intro for chapters are mostly going to be in
     Public ToolBarUse As Boolean = False                'Either any program is using ToolBar or not
     Public ReleaseCursor As Boolean = False             'Release cursor from TrackPos
     Public ShOSKey As String                            'DOSKEY tracking string for ShiftOS
diff --git a/ShiftOS-TheRevival/MainForms/Applications/Universal/Knowledge Input/Uni_KnowledgeInput.Designer.vb b/ShiftOS-TheRevival/MainForms/Applications/Universal/Knowledge Input/Uni_KnowledgeInput.Designer.vb
index dddaf86..55c7177 100644
--- a/ShiftOS-TheRevival/MainForms/Applications/Universal/Knowledge Input/Uni_KnowledgeInput.Designer.vb
+++ b/ShiftOS-TheRevival/MainForms/Applications/Universal/Knowledge Input/Uni_KnowledgeInput.Designer.vb
@@ -52,6 +52,7 @@ Partial Class Uni_KnowledgeInput
         Me.cmb_Category.Name = "cmb_Category"
         Me.cmb_Category.Size = New System.Drawing.Size(266, 31)
         Me.cmb_Category.TabIndex = 1
+        Me.cmb_Category.Text = "Select Category"
         '
         'Panel1
         '
@@ -66,14 +67,19 @@ Partial Class Uni_KnowledgeInput
         '
         'txt_InputWord
         '
+        Me.txt_InputWord.Anchor = CType(((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Left) _
+            Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
         Me.txt_InputWord.Font = New System.Drawing.Font("Comic Sans MS", 12.0!)
-        Me.txt_InputWord.Location = New System.Drawing.Point(302, 74)
+        Me.txt_InputWord.Location = New System.Drawing.Point(292, 73)
         Me.txt_InputWord.Name = "txt_InputWord"
         Me.txt_InputWord.Size = New System.Drawing.Size(470, 30)
         Me.txt_InputWord.TabIndex = 2
         '
         'lst_Guessed
         '
+        Me.lst_Guessed.Anchor = CType((((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Bottom) _
+            Or System.Windows.Forms.AnchorStyles.Left) _
+            Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
         Me.lst_Guessed.Font = New System.Drawing.Font("Comic Sans MS", 12.0!)
         Me.lst_Guessed.FormattingEnabled = True
         Me.lst_Guessed.ItemHeight = 23
diff --git a/ShiftOS-TheRevival/MainForms/Applications/Universal/Knowledge Input/Uni_KnowledgeInput.vb b/ShiftOS-TheRevival/MainForms/Applications/Universal/Knowledge Input/Uni_KnowledgeInput.vb
index f0fcfcb..b806e88 100644
--- a/ShiftOS-TheRevival/MainForms/Applications/Universal/Knowledge Input/Uni_KnowledgeInput.vb
+++ b/ShiftOS-TheRevival/MainForms/Applications/Universal/Knowledge Input/Uni_KnowledgeInput.vb
@@ -1,13 +1,15 @@
 Public Class Uni_KnowledgeInput
-    Dim PrevWidthTxt_InputWord As Integer
+    Dim PrevWidthTxt_InputWord As Integer = 470
 
     Private Sub Uni_KnowledgeInput_Load(sender As Object, e As EventArgs) Handles MyBase.Load
-        PrevWidthTxt_InputWord = txt_InputWord.Width
+        cmb_Category.Items.Remove("Animals")
     End Sub
 
-    Private Sub Uni_KnowledgeInput_Resize(sender As Object, e As EventArgs) Handles MyBase.Resize
-        'Dim Txt_InputTextWidthRatio As Double = (txt_InputWord.Width / PrevWidthTxt_InputWord)
-        'txt_InputWord.Width = txt_InputWord.Width * Txt_InputTextWidthRatio
-        'PrevWidthTxt_InputWord = txt_InputWord.Width
+    Private Sub txt_InputWord_TextChanged(sender As Object, e As KeyEventArgs) Handles txt_InputWord.KeyDown
+        Select Case e.KeyCode
+            Case Keys.Enter
+                lst_Guessed.Items.Add(txt_InputWord.Text)
+                txt_InputWord.Text = Nothing
+        End Select
     End Sub
 End Class
\ No newline at end of file
diff --git a/ShiftOS-TheRevival/MainForms/ShiftOSMenu.vb b/ShiftOS-TheRevival/MainForms/ShiftOSMenu.vb
index 6b96ee0..c7c35eb 100644
--- a/ShiftOS-TheRevival/MainForms/ShiftOSMenu.vb
+++ b/ShiftOS-TheRevival/MainForms/ShiftOSMenu.vb
@@ -28,6 +28,7 @@ Public Class ShiftOSMenu
                 Try
                     Strings.IsFree = True
                     Strings.OnceInfo(6) = "free"
+                    IsConsoleParent = True
                     FreeRoamMode()
                     Console.Show()
                     Close()
@@ -40,7 +41,8 @@ Public Class ShiftOSMenu
             Case "Continue"
                 Strings.IsFree = False
                 Strings.OnceInfo(6) = "story"
-                Console.StayAtChapter = True
+                IsConsoleParent = True
+                StayAtChapter = True
                 Console.Show()
                 Close()
             Case "No"
diff --git a/ShiftOS-TheRevival/MainForms/WindowManager/DualWindowManager/DuWM_WindowContainer.vb b/ShiftOS-TheRevival/MainForms/WindowManager/DualWindowManager/DuWM_WindowContainer.vb
index 26b9d04..9badebe 100644
--- a/ShiftOS-TheRevival/MainForms/WindowManager/DualWindowManager/DuWM_WindowContainer.vb
+++ b/ShiftOS-TheRevival/MainForms/WindowManager/DualWindowManager/DuWM_WindowContainer.vb
@@ -13,7 +13,6 @@
             Strings.ProcessID(DuWM_PID) = 0
         End If
         If Strings.ProcessID(DuWM_PID) = 0 Then
-            'MsgBox(Convert.ToString(ChildForm))
             DuWM_CurrentProcess = DuWM_CurrentProcess - 1
             DuWM_ChangeLayout = True
             DuWM_WMCheck.Stop()