CanMuteMusic = CanMuteAudio & other tweaks

- CanMuteMusic property in source code renamed to CanMuteAudio

- Old New Game intro and Localization errors (made by me) fixed

P3D/Battle/BattleSystemV2/BattleScreen.vb

@@ -144,7 +144,7 @@
             Me.MouseVisible = True
             Me.CanChat = True
             Me.CanDrawDebug = True
-            Me.CanMuteMusic = True
+            Me.CanMuteAudio = True
             Me.CanTakeScreenshot = True
 
             Screen.TextBox.Showing = False

P3D/Core/MainGameFunctions.vb

@@ -23,7 +23,7 @@
             End If
         ElseIf KeyBoardHandler.KeyPressed(KeyBindings.FullScreenKey) AndAlso Core.CurrentScreen.CanGoFullscreen Then
             ToggleFullScreen()
-        ElseIf KeyBoardHandler.KeyPressed(KeyBindings.MuteAudioKey) AndAlso Core.CurrentScreen.CanMuteMusic Then
+        ElseIf KeyBoardHandler.KeyPressed(KeyBindings.MuteAudioKey) AndAlso Core.CurrentScreen.CanMuteAudio Then
             If MusicManager.Muted Then
                 MusicManager.Muted = False
                 SoundManager.Muted = False

P3D/Input/UI/MessageBox.vb

@@ -28,7 +28,7 @@
             CanChat = False
             CanDrawDebug = True
             CanGoFullscreen = True
-            CanMuteMusic = True
+            CanMuteAudio = True
             CanTakeScreenshot = True
             MouseVisible = True
         End Sub

P3D/Network/ChatScreen.vb

@@ -40,7 +40,7 @@ Public Class ChatScreen
         Me.PreScreen = currentScreen
         Me.Identification = Identifications.ChatScreen
         Me.CanBePaused = True
-        Me.CanMuteMusic = False
+        Me.CanMuteAudio = False
         Me.CanChat = False
         Me.MouseVisible = True
     End Sub

P3D/Network/GameJolt/GTS/GTSInboxScreen.vb

@@ -23,7 +23,7 @@
             Me.CanBePaused = False
             Me.CanChat = False
             Me.CanDrawDebug = True
-            Me.CanMuteMusic = True
+            Me.CanMuteAudio = True
             Me.CanTakeScreenshot = True
             Me.MouseVisible = True
 

P3D/Network/GameJolt/GTS/GTSMainScreen.vb

@@ -22,7 +22,7 @@
             Me.CanBePaused = False
             Me.CanChat = False
             Me.CanDrawDebug = True
-            Me.CanMuteMusic = True
+            Me.CanMuteAudio = True
             Me.CanTakeScreenshot = True
             Me.MouseVisible = True
 

P3D/Network/GameJolt/GTS/GTSSearchScreen.vb

@@ -22,7 +22,7 @@
             Me.CanBePaused = False
             Me.CanChat = False
             Me.CanDrawDebug = True
-            Me.CanMuteMusic = True
+            Me.CanMuteAudio = True
             Me.CanTakeScreenshot = True
             Me.MouseVisible = True
         End Sub
@@ -462,7 +462,7 @@
                 Me.CanBePaused = False
                 Me.CanChat = False
                 Me.CanDrawDebug = True
-                Me.CanMuteMusic = True
+                Me.CanMuteAudio = True
                 Me.CanTakeScreenshot = True
                 Me.MouseVisible = True
             End Sub
@@ -589,7 +589,7 @@
                 Me.CanBePaused = False
                 Me.CanChat = False
                 Me.CanDrawDebug = True
-                Me.CanMuteMusic = True
+                Me.CanMuteAudio = True
                 Me.CanTakeScreenshot = True
                 Me.MouseVisible = True
 
@@ -793,7 +793,7 @@
                 Me.CanBePaused = False
                 Me.CanChat = False
                 Me.CanDrawDebug = True
-                Me.CanMuteMusic = True
+                Me.CanMuteAudio = True
                 Me.CanTakeScreenshot = True
                 Me.MouseVisible = True
             End Sub
@@ -889,7 +889,7 @@
                 Me.CanBePaused = False
                 Me.CanChat = False
                 Me.CanDrawDebug = True
-                Me.CanMuteMusic = True
+                Me.CanMuteAudio = True
                 Me.CanTakeScreenshot = True
                 Me.MouseVisible = True
             End Sub

P3D/Network/GameJolt/GTS/GTSSetupScreen.vb

@@ -18,7 +18,7 @@
             Me.CanBePaused = False
             Me.CanChat = False
             Me.CanDrawDebug = True
-            Me.CanMuteMusic = True
+            Me.CanMuteAudio = True
             Me.CanTakeScreenshot = True
             Me.MouseVisible = True
         End Sub
@@ -414,7 +414,7 @@
                 Me.CanBePaused = False
                 Me.CanChat = False
                 Me.CanDrawDebug = True
-                Me.CanMuteMusic = True
+                Me.CanMuteAudio = True
                 Me.CanTakeScreenshot = True
                 Me.MouseVisible = True
             End Sub
@@ -863,7 +863,7 @@
                     Me.CanBePaused = False
                     Me.CanChat = False
                     Me.CanDrawDebug = True
-                    Me.CanMuteMusic = True
+                    Me.CanMuteAudio = True
                     Me.CanTakeScreenshot = True
                     Me.MouseVisible = True
 
@@ -1063,7 +1063,7 @@
                     Me.CanBePaused = False
                     Me.CanChat = False
                     Me.CanDrawDebug = True
-                    Me.CanMuteMusic = True
+                    Me.CanMuteAudio = True
                     Me.CanTakeScreenshot = True
                     Me.MouseVisible = True
                 End Sub
@@ -1182,7 +1182,7 @@
                     Me.CanBePaused = False
                     Me.CanChat = False
                     Me.CanDrawDebug = True
-                    Me.CanMuteMusic = True
+                    Me.CanMuteAudio = True
                     Me.CanTakeScreenshot = True
                     Me.MouseVisible = True
                 End Sub
@@ -1282,7 +1282,7 @@
                     Me.CanBePaused = False
                     Me.CanChat = False
                     Me.CanDrawDebug = True
-                    Me.CanMuteMusic = True
+                    Me.CanMuteAudio = True
                     Me.CanTakeScreenshot = True
                     Me.MouseVisible = True
                 End Sub
@@ -1377,7 +1377,7 @@
                     Me.CanBePaused = False
                     Me.CanChat = False
                     Me.CanDrawDebug = True
-                    Me.CanMuteMusic = True
+                    Me.CanMuteAudio = True
                     Me.CanTakeScreenshot = True
                     Me.MouseVisible = True
 

P3D/Network/GameJolt/GTS/GTSTradeScreen.vb

@@ -17,7 +17,7 @@
             Me.CanBePaused = False
             Me.CanChat = False
             Me.CanDrawDebug = True
-            Me.CanMuteMusic = True
+            Me.CanMuteAudio = True
             Me.CanTakeScreenshot = True
             Me.MouseVisible = True
 
@@ -325,7 +325,7 @@
                 Me.CanBePaused = False
                 Me.CanChat = False
                 Me.CanDrawDebug = True
-                Me.CanMuteMusic = True
+                Me.CanMuteAudio = True
                 Me.CanTakeScreenshot = True
                 Me.MouseVisible = True
 

P3D/Network/GameJolt/LogInScreen.vb

@@ -38,7 +38,7 @@ Namespace GameJolt
             Me.MouseVisible = True
             Me.CanBePaused = False
             Me.CanChat = False
-            Me.CanMuteMusic = False
+            Me.CanMuteAudio = False
 
             Me.UserName = New JoltTextBox(FontManager.MainFont, Color.Black, Color.White)
             UserName.Size = New Size(400, 30)

P3D/Screens/Credits/CreditsScreen.vb

@@ -26,7 +26,7 @@ Public Class CreditsScreen
         Me.MouseVisible = False
         Me.CanChat = False
         Me.CanDrawDebug = True
-        Me.CanMuteMusic = True
+        Me.CanMuteAudio = True
         Me.CanTakeScreenshot = True
 
         Screen.TextBox.Showing = False

P3D/Screens/GUI/InputScreen.vb

@@ -51,7 +51,7 @@
         Me.Identification = Identifications.InputScreen
         Me.CanBePaused = True
         Me.CanChat = False
-        Me.CanMuteMusic = False
+        Me.CanMuteAudio = False
         Me.MouseVisible = True
 
         If Me.MaxChars < 0 Then

P3D/Screens/MainMenu/AddServerScreen.vb

@@ -23,7 +23,7 @@
 
         Me.CanBePaused = False
         Me.CanChat = False
-        Me.CanMuteMusic = False
+        Me.CanMuteAudio = False
         Me.MouseVisible = True
 
         Me.NewServer = NewServer

P3D/Screens/MainMenu/IntroScreen.vb

@@ -18,7 +18,7 @@
     Public Sub New()
         Me.Identification = Identifications.IntroScreen
         Me.CanBePaused = False
-        Me.CanMuteMusic = False
+        Me.CanMuteAudio = False
         Me.CanChat = False
         Me.CanTakeScreenshot = False
         Me.CanDrawDebug = False

P3D/Screens/MainMenu/OfflineGameWarningScreen.vb

@@ -10,7 +10,7 @@
         Me.CanChat = False
         Me.CanDrawDebug = True
         Me.CanGoFullscreen = True
-        Me.CanMuteMusic = True
+        Me.CanMuteAudio = True
         Me.CanTakeScreenshot = True
         Me.MouseVisible = True
     End Sub

P3D/Screens/MainMenu/PressStartScreen.vb

@@ -1346,6 +1346,7 @@ Public Class NewMainMenuScreen
                     Else
                         If _gameModeExists Then
                             GameModeManager.SetGameModePointer(_gameMode)
+                            Localization.ReloadGameModeTokens()
                             World.IsMainMenu = False
                             If _isGameJolt Then
                                 Core.Player.IsGameJoltSave = True
@@ -1405,7 +1406,7 @@ Public Class GameModeSelectionScreen
         CanChat = False
         CanDrawDebug = True
         CanGoFullscreen = True
-        CanMuteMusic = True
+        CanMuteAudio = True
         CanTakeScreenshot = True
 
         PreScreen = currentScreen

P3D/Screens/MainMenu/SplashScreen.vb

@@ -26,7 +26,7 @@ Friend Class SplashScreen
         _game = GameReference
 
         CanBePaused = False
-        CanMuteMusic = True
+        CanMuteAudio = True
         CanChat = False
         CanTakeScreenshot = True
         CanDrawDebug = False

P3D/Screens/MapPreview/MapPreviewScreen.vb

@@ -23,7 +23,7 @@
         Me.CanBePaused = False
         Me.CanDrawDebug = True
         Me.CanGoFullscreen = True
-        Me.CanMuteMusic = False
+        Me.CanMuteAudio = False
         Me.CanTakeScreenshot = True
 
         Effect = New BasicEffect(Core.GraphicsDevice)

P3D/Screens/NewGameScreen.vb

@@ -366,10 +366,10 @@
     End Sub
 
     Private Sub UpdateTextbox()
-        CanMuteMusic = False
+        CanMuteAudio = False
 
         If ControllerHandler.ButtonPressed(Buttons.X) = True Then
-            Core.SetScreen(New InputScreen(Core.CurrentScreen, "Player", InputScreen.InputModes.Name, Me.CurrentText, 14, {TextureManager.GetTexture(TextureManager.GetTexture("Textures\NPC\" & startSkins(SkinIndex)), New Rectangle(0, 64, 32, 32))}.ToList(), AddressOf Me.ConfirmInput))
+            Core.SetScreen(New InputScreen(Core.CurrentScreen, "Player", InputScreen.InputModes.Name, Me.CurrentText, 14, {TextureManager.GetTexture(TextureManager.GetTexture("Textures\NPC\" & skinFiles(SkinIndex)), New Rectangle(0, 64, 32, 32))}.ToList(), AddressOf Me.ConfirmInput))
         Else
             KeyBindings.GetNameInput(Me.CurrentText, 14)
 
@@ -379,13 +379,13 @@
                 If CurrentText.Length > 2 And String.IsNullOrWhiteSpace(CurrentText) = False Then
                     Me.Name = CurrentText
                     Index += 1
-                    CanMuteMusic = True
                 Else
                     enterCorrectName = True
                 End If
             End If
         End If
     End Sub
+					CanMuteAudio = True
 
     Private Sub ConfirmInput(ByVal input As String)
         Me.CurrentText = CorrectChars(input)

P3D/Screens/PC/MailSystemScreen.vb

@@ -14,7 +14,7 @@
 
         Me.MouseVisible = False
         Me.CanBePaused = True
-        Me.CanMuteMusic = False
+        Me.CanMuteAudio = False
         Me.CanChat = False
     End Sub
 

P3D/Screens/PC/StorageSystemScreen.vb

@@ -82,7 +82,7 @@ Public Class StorageSystemScreen
 
         Me.CanBePaused = True
         Me.CanChat = True
-        Me.CanMuteMusic = True
+        Me.CanMuteAudio = True
 
         Me.texture = TextureManager.GetTexture("GUI\Box\storage")
         Me.menuTexture = TextureManager.GetTexture("GUI\Menus\General")
@@ -1948,7 +1948,7 @@ Public Class StorageSystemFilterScreen
         Next
 
         Me.MouseVisible = True
-        Me.CanMuteMusic = True
+        Me.CanMuteAudio = True
         Me.CanBePaused = True
 
         Me.mainMenuItems = {"Pokémon", "Type1", "Type2", "Move", "Ability", "Nature", "Gender", "HeldItem"}.ToList()

P3D/Screens/Pokedex/PokedexScreen.vb

@@ -13,7 +13,7 @@
         Me.texture = TextureManager.GetTexture("GUI\Menus\General")
 
         Me.MouseVisible = True
-        Me.CanMuteMusic = True
+        Me.CanMuteAudio = True
         Me.CanBePaused = True
 
         For Each p As Pokedex In Core.Player.Pokedexes
@@ -175,7 +175,7 @@ Public Class PokedexHabitatScreen
         Me.texture = TextureManager.GetTexture("GUI\Menus\General")
 
         Me.MouseVisible = True
-        Me.CanMuteMusic = True
+        Me.CanMuteAudio = True
         Me.CanBePaused = True
 
         For Each file As String In System.IO.Directory.GetFiles(GameController.GamePath & GameModeManager.ActiveGameMode.PokeFilePath, "*.*", IO.SearchOption.AllDirectories)
@@ -362,7 +362,7 @@ Public Class PokedexScreen
         Me.CHabitat = Habitat
 
         Me.MouseVisible = True
-        Me.CanMuteMusic = True
+        Me.CanMuteAudio = True
         Me.CanBePaused = True
 
         TempPokemonStorage.Clear()
@@ -1296,7 +1296,7 @@ Public Class PokedexViewScreen
         Me.texture = TextureManager.GetTexture("GUI\Menus\General")
 
         Me.MouseVisible = True
-        Me.CanMuteMusic = True
+        Me.CanMuteAudio = True
         Me.CanBePaused = True
         Me._transitionOut = transitionOut
 

P3D/Screens/Pokemon/ChooseAttackScreen.vb

@@ -26,7 +26,7 @@
 
         Me.MouseVisible = False
         Me.CanBePaused = True
-        Me.CanMuteMusic = True
+        Me.CanMuteAudio = True
         Me.CanChat = True
         Me.CanTakeScreenshot = True
         Me.CanDrawDebug = True

P3D/Screens/Pokemon/EvolutionScreen.vb

@@ -21,7 +21,7 @@
     '    Me.PreScreen = currentScreen
     '    Me.CanBePaused = True
     '    Me.CanChat = True
-    '    Me.CanMuteMusic = True
+    '    Me.CanMuteAudio = True
     '    Me.MouseVisible = False
 
     '    Me.FromBattle = FromBattle

P3D/Screens/Pokemon/NameObjectScreen.vb

@@ -37,7 +37,7 @@ Public Class NameObjectScreen
         Me.PreScreen = CurrentScreen
         Me.MouseVisible = True
         Me.CanChat = False
-        Me.CanMuteMusic = False
+        Me.CanMuteAudio = False
         Me.CanBePaused = False
 
         Me._pokemon = Pokemon
@@ -70,7 +70,7 @@ Public Class NameObjectScreen
         Me.MouseVisible = True
         Me.CanBePaused = True
         Me.CanChat = False
-        Me.CanMuteMusic = False
+        Me.CanMuteAudio = False
 
         Screen.PokemonImageView.Show(Texture)
     End Sub

P3D/Screens/Pokemon/TeachMovesScreen.vb

@@ -43,7 +43,7 @@
 
         Me.MouseVisible = False
         Me.CanBePaused = True
-        Me.CanMuteMusic = True
+        Me.CanMuteAudio = True
 
         LearnedMove = False
 
@@ -99,7 +99,7 @@
 
         Me.MouseVisible = False
         Me.CanBePaused = True
-        Me.CanMuteMusic = True
+        Me.CanMuteAudio = True
 
         LearnedMove = False
 

P3D/Screens/Screen.vb

@@ -174,7 +174,7 @@ Public MustInherit Class Screen
     ''' <summary>
     ''' Wether the game can be muted by pressing M (default).
     ''' </summary>
-    Public Property CanMuteMusic() As Boolean = True
+    Public Property CanMuteAudio() As Boolean = True
 
     ''' <summary>
     ''' Wether the ChatScreen can be opened by pressing T (default).
@@ -218,7 +218,7 @@ Public MustInherit Class Screen
     Protected Sub CopyFrom(ByVal scr As Screen)
         _MouseVisible = scr._MouseVisible
         _CanBePaused = scr._CanBePaused
-        _CanMuteMusic = scr._CanMuteMusic
+        _CanMuteAudio = scr._CanMuteAudio
         _CanChat = scr._CanChat
         _CanTakeScreenshot = scr._CanTakeScreenshot
         _CanDrawDebug = scr._CanDrawDebug

P3D/Screens/StatisticsScreen.vb

@@ -20,7 +20,7 @@
         Me.texture = TextureManager.GetTexture("GUI\Menus\General")
 
         Me.CanBePaused = True
-        Me.CanMuteMusic = True
+        Me.CanMuteAudio = True
 
         If Core.Player.IsGamejoltSave = True Then
             StatisticsStartIndex = 2

P3D/Screens/TradeScreen.vb

@@ -154,7 +154,7 @@ Public Class TradeScreen
         Me.texture = TextureManager.GetTexture("GUI\Menus\General")
 
         Me.MouseVisible = True
-        Me.CanMuteMusic = True
+        Me.CanMuteAudio = True
         Me.CanBePaused = True
 
         Me.CanBuyItems = canBuy