Merge pull request #73 from P3D-Legacy/mainmenu-rework

Main Menu Rework

P3D/Content/Localization/Tokens_en.dat

@@ -112,8 +112,8 @@ LanguageScreen:
 language_menu_apply,Apply
 language_menu_back,Back
 PacksScreen:
-pack_menu_up,Up
-pack_menu_down,Down
+pack_menu_up,Move Up
+pack_menu_down,Move Down
 pack_menu_toggle_on,Enabled
 pack_menu_toggle_off,Disabled
 pack_menu_information,Information

P3D/Core/GameOptions.vb

@@ -15,6 +15,7 @@
     Public MaxOffsetLevel As Integer = 0
     Public UpdateDisabled As Boolean = False
     Public Extras As New List(Of String)
+    Public ChangedPack As Boolean = False
 
     Public Sub LoadOptions()
         KeyBindings.CreateKeySave(False)

P3D/Overworld/OverworldScreen.vb

@@ -407,6 +407,11 @@ Public Class OverworldScreen
         c.ResetCursor()
         Player.Temp.IsInBattle = False
 
+        If Core.GameOptions.ChangedPack = True Then
+            Screen.Level.Load(Screen.Level.LevelFile)
+            Core.GameOptions.ChangedPack = False
+        End If
+
         'Set to correct music:
         If TrainerEncountered = False Then
             Dim x = 0

P3D/Resources/GameModeManager.vb

@@ -558,7 +558,7 @@ Public Class GameMode
         Dim SkinNames As List(Of String) = {"Ethan", "Lyra", "Nate", "Rosa", "Hilbert", "Hilda"}.ToList()
 
         Dim gameMode As New GameMode("Pokemon 3D", "The normal game mode.", GameController.GAMEVERSION, "Kolben Games", "\Content\Data\maps\", "\Content\Data\Scripts\", "\Content\Data\maps\poke\", "\Content\Pokemon\Data\", "\Content\", "\Content\Localization\", New List(Of GameRule),
-                                     "newgame\intro0.dat", New Vector3(1.0F, 0.1F, 3.0F), MathHelper.PiOver2, "Your Room", "", New Color(59, 123, 165), "0", "welcome", "0", SkinColors, SkinFiles, SkinNames)
+                                     "newgame\intro0.dat", New Vector3(1.0F, 0.1F, 3.0F), MathHelper.PiOver2, "Your Room", "", New Color(59, 123, 165), "0", "welcome", "1", SkinColors, SkinFiles, SkinNames)
 
         Dim gameRules As New List(Of GameRule)
         gameRules.Add(New GameRule("MaxLevel", "100"))

P3D/Screens/NewMenuScreen.vb

@@ -257,8 +257,10 @@
             End If
         End If
 
-        If Controls.Dismiss() = True Then
-            Core.SetScreen(PreScreen)
+        If CurrentScreen.Identification = Identifications.MenuScreen Then
+            If Controls.Dismiss() = True Then
+                Core.SetScreen(PreScreen)
+            End If
         End If
     End Sub