diff --git a/P3D/Battle/BattleSystemV2/BattleScreen.vb b/P3D/Battle/BattleSystemV2/BattleScreen.vb
index 7feaa4d86..d7cec07ae 100644
--- a/P3D/Battle/BattleSystemV2/BattleScreen.vb
+++ b/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
diff --git a/P3D/Core/MainGameFunctions.vb b/P3D/Core/MainGameFunctions.vb
index 05c3916bc..8a0024dd9 100644
--- a/P3D/Core/MainGameFunctions.vb
+++ b/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
diff --git a/P3D/Input/UI/MessageBox.vb b/P3D/Input/UI/MessageBox.vb
index 3a3b508cb..4595b756e 100644
--- a/P3D/Input/UI/MessageBox.vb
+++ b/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
diff --git a/P3D/Network/ChatScreen.vb b/P3D/Network/ChatScreen.vb
index 3d10ba278..0df0de558 100644
--- a/P3D/Network/ChatScreen.vb
+++ b/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
diff --git a/P3D/Network/GameJolt/GTS/GTSInboxScreen.vb b/P3D/Network/GameJolt/GTS/GTSInboxScreen.vb
index d38c874cd..23158e8e2 100644
--- a/P3D/Network/GameJolt/GTS/GTSInboxScreen.vb
+++ b/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
diff --git a/P3D/Network/GameJolt/GTS/GTSMainScreen.vb b/P3D/Network/GameJolt/GTS/GTSMainScreen.vb
index d32a9e813..1c5a6c373 100644
--- a/P3D/Network/GameJolt/GTS/GTSMainScreen.vb
+++ b/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
diff --git a/P3D/Network/GameJolt/GTS/GTSSearchScreen.vb b/P3D/Network/GameJolt/GTS/GTSSearchScreen.vb
index d6622aba9..7615d36d9 100644
--- a/P3D/Network/GameJolt/GTS/GTSSearchScreen.vb
+++ b/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
diff --git a/P3D/Network/GameJolt/GTS/GTSSetupScreen.vb b/P3D/Network/GameJolt/GTS/GTSSetupScreen.vb
index 084a4eee2..0319b61e5 100644
--- a/P3D/Network/GameJolt/GTS/GTSSetupScreen.vb
+++ b/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
diff --git a/P3D/Network/GameJolt/GTS/GTSTradeScreen.vb b/P3D/Network/GameJolt/GTS/GTSTradeScreen.vb
index 6fc8c734f..447441da7 100644
--- a/P3D/Network/GameJolt/GTS/GTSTradeScreen.vb
+++ b/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
diff --git a/P3D/Network/GameJolt/LogInScreen.vb b/P3D/Network/GameJolt/LogInScreen.vb
index 4365d61cf..ab0abd51d 100644
--- a/P3D/Network/GameJolt/LogInScreen.vb
+++ b/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)
diff --git a/P3D/Screens/Credits/CreditsScreen.vb b/P3D/Screens/Credits/CreditsScreen.vb
index f560711cb..d09b21dd8 100644
--- a/P3D/Screens/Credits/CreditsScreen.vb
+++ b/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
diff --git a/P3D/Screens/GUI/InputScreen.vb b/P3D/Screens/GUI/InputScreen.vb
index a435f9113..46dae1f42 100644
--- a/P3D/Screens/GUI/InputScreen.vb
+++ b/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
diff --git a/P3D/Screens/MainMenu/AddServerScreen.vb b/P3D/Screens/MainMenu/AddServerScreen.vb
index 8591aa24d..3de7971ef 100644
--- a/P3D/Screens/MainMenu/AddServerScreen.vb
+++ b/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
diff --git a/P3D/Screens/MainMenu/IntroScreen.vb b/P3D/Screens/MainMenu/IntroScreen.vb
index 753dc811e..98dee2ca3 100644
--- a/P3D/Screens/MainMenu/IntroScreen.vb
+++ b/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
diff --git a/P3D/Screens/MainMenu/OfflineGameWarningScreen.vb b/P3D/Screens/MainMenu/OfflineGameWarningScreen.vb
index 56c1e1f8a..9e1913480 100644
--- a/P3D/Screens/MainMenu/OfflineGameWarningScreen.vb
+++ b/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
diff --git a/P3D/Screens/MainMenu/PressStartScreen.vb b/P3D/Screens/MainMenu/PressStartScreen.vb
index c92f96033..d9177c645 100644
--- a/P3D/Screens/MainMenu/PressStartScreen.vb
+++ b/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
diff --git a/P3D/Screens/MainMenu/SplashScreen.vb b/P3D/Screens/MainMenu/SplashScreen.vb
index 93142a863..fe82b338e 100644
--- a/P3D/Screens/MainMenu/SplashScreen.vb
+++ b/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
diff --git a/P3D/Screens/MapPreview/MapPreviewScreen.vb b/P3D/Screens/MapPreview/MapPreviewScreen.vb
index e4445e228..67cc59818 100644
--- a/P3D/Screens/MapPreview/MapPreviewScreen.vb
+++ b/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)
diff --git a/P3D/Screens/NewGameScreen.vb b/P3D/Screens/NewGameScreen.vb
index 9a01a0a1e..eb3f09807 100644
--- a/P3D/Screens/NewGameScreen.vb
+++ b/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)
diff --git a/P3D/Screens/PC/MailSystemScreen.vb b/P3D/Screens/PC/MailSystemScreen.vb
index 621886de7..0f2f0badd 100644
--- a/P3D/Screens/PC/MailSystemScreen.vb
+++ b/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
diff --git a/P3D/Screens/PC/StorageSystemScreen.vb b/P3D/Screens/PC/StorageSystemScreen.vb
index c7fd9ff71..f7c5499e9 100644
--- a/P3D/Screens/PC/StorageSystemScreen.vb
+++ b/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()
diff --git a/P3D/Screens/Pokedex/PokedexScreen.vb b/P3D/Screens/Pokedex/PokedexScreen.vb
index 10217478d..f91aca218 100644
--- a/P3D/Screens/Pokedex/PokedexScreen.vb
+++ b/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
diff --git a/P3D/Screens/Pokemon/ChooseAttackScreen.vb b/P3D/Screens/Pokemon/ChooseAttackScreen.vb
index e6f6fe373..3170e9f10 100644
--- a/P3D/Screens/Pokemon/ChooseAttackScreen.vb
+++ b/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
diff --git a/P3D/Screens/Pokemon/EvolutionScreen.vb b/P3D/Screens/Pokemon/EvolutionScreen.vb
index 22dad2a0d..afa65616a 100644
--- a/P3D/Screens/Pokemon/EvolutionScreen.vb
+++ b/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
diff --git a/P3D/Screens/Pokemon/NameObjectScreen.vb b/P3D/Screens/Pokemon/NameObjectScreen.vb
index 273065593..aecf291f2 100644
--- a/P3D/Screens/Pokemon/NameObjectScreen.vb
+++ b/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
diff --git a/P3D/Screens/Pokemon/TeachMovesScreen.vb b/P3D/Screens/Pokemon/TeachMovesScreen.vb
index d9e33d1c2..08bca3f44 100644
--- a/P3D/Screens/Pokemon/TeachMovesScreen.vb
+++ b/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
diff --git a/P3D/Screens/Screen.vb b/P3D/Screens/Screen.vb
index 51270f401..ba3b5bbda 100644
--- a/P3D/Screens/Screen.vb
+++ b/P3D/Screens/Screen.vb
@@ -174,7 +174,7 @@ Public MustInherit Class Screen
'''
''' Wether the game can be muted by pressing M (default).
'''
- Public Property CanMuteMusic() As Boolean = True
+ Public Property CanMuteAudio() As Boolean = True
'''
''' 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
diff --git a/P3D/Screens/StatisticsScreen.vb b/P3D/Screens/StatisticsScreen.vb
index 8ed1cf95c..ecb045a83 100644
--- a/P3D/Screens/StatisticsScreen.vb
+++ b/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
diff --git a/P3D/Screens/TradeScreen.vb b/P3D/Screens/TradeScreen.vb
index 522f9f501..40a5016a4 100644
--- a/P3D/Screens/TradeScreen.vb
+++ b/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