From e9a4fb627e36b9e253fbf4d665bee88a1600f86d Mon Sep 17 00:00:00 2001 From: "Daniel S. Billing" Date: Tue, 13 Apr 2021 07:42:55 +0200 Subject: [PATCH] Renamed GetString function to Translate --- P3D/Core/MainGameFunctions.vb | 20 +-- P3D/HelperClasses/Localization.vb | 2 +- P3D/Overworld/OverworldCamera.vb | 8 +- P3D/Overworld/RouteSign.vb | 2 +- P3D/Player/Player.vb | 2 +- P3D/Pokemon/Monster/Pokemon.vb | 4 +- P3D/Resources/Sound/MusicManager.vb | 4 +- P3D/Screens/Battle/BlackOutScreen.vb | 2 +- P3D/Screens/GUI/DonationScreen.vb | 4 +- P3D/Screens/Inventory/ApricornScreen.vb | 18 +-- P3D/Screens/Inventory/NewInventoryScreen.vb | 50 +++---- P3D/Screens/MainMenu/AddServerScreen.vb | 14 +- P3D/Screens/MainMenu/JoinServerScreen.vb | 48 +++---- P3D/Screens/MainMenu/NewNewGameScreen.vb | 2 +- .../MainMenu/OfflineGameWarningScreen.vb | 8 +- P3D/Screens/MainMenu/PauseScreen.vb | 26 ++-- P3D/Screens/MainMenu/PressStartScreen.vb | 40 +++--- P3D/Screens/MapScreen.vb | 26 ++-- P3D/Screens/NewGameScreen.vb | 16 +-- P3D/Screens/NewMenuScreen.vb | 16 +-- P3D/Screens/NewOptionScreen.vb | 92 ++++++------- P3D/Screens/NewTrainerScreen.vb | 14 +- P3D/Screens/Pokedex/PokedexScreen.vb | 112 ++++++++-------- P3D/Screens/Pokemon/PartyScreen.vb | 124 +++++++++--------- P3D/Screens/Pokemon/TeachMovesScreen.vb | 2 +- P3D/Screens/SaveScreen.vb | 22 ++-- 26 files changed, 339 insertions(+), 339 deletions(-) diff --git a/P3D/Core/MainGameFunctions.vb b/P3D/Core/MainGameFunctions.vb index f386feef5..de08125f7 100644 --- a/P3D/Core/MainGameFunctions.vb +++ b/P3D/Core/MainGameFunctions.vb @@ -17,9 +17,9 @@ Core.GameOptions.SaveOptions() If Core.GameOptions.LightingEnabled Then - Core.GameMessage.ShowMessage(Localization.GetString("game_message_lighting") & ": " & Localization.GetString("global_on"), 12, FontManager.MainFont, Color.White) + Core.GameMessage.ShowMessage(Localization.Translate("game_message_lighting") & ": " & Localization.Translate("global_on"), 12, FontManager.MainFont, Color.White) Else - Core.GameMessage.ShowMessage(Localization.GetString("game_message_lighting") & ": " & Localization.GetString("global_off"), 12, FontManager.MainFont, Color.White) + Core.GameMessage.ShowMessage(Localization.Translate("game_message_lighting") & ": " & Localization.Translate("global_off"), 12, FontManager.MainFont, Color.White) End If ElseIf KeyBoardHandler.KeyPressed(KeyBindings.FullScreenKey) AndAlso Core.CurrentScreen.CanGoFullscreen Then ToggleFullScreen() @@ -27,11 +27,11 @@ If MusicManager.Muted Then MusicManager.Muted = False SoundManager.Muted = False - Core.GameMessage.ShowMessage(Localization.GetString("game_message_audio") & ": " & Localization.GetString("global_on"), 12, FontManager.MainFont, Color.White) + Core.GameMessage.ShowMessage(Localization.Translate("game_message_audio") & ": " & Localization.Translate("global_on"), 12, FontManager.MainFont, Color.White) Else MusicManager.Muted = True SoundManager.Muted = True - Core.GameMessage.ShowMessage(Localization.GetString("game_message_audio") & ": " & Localization.GetString("global_off"), 12, FontManager.MainFont, Color.White) + Core.GameMessage.ShowMessage(Localization.Translate("game_message_audio") & ": " & Localization.Translate("global_off"), 12, FontManager.MainFont, Color.White) End If Core.GameOptions.SaveOptions() @@ -54,9 +54,9 @@ If ControllerHandler.ButtonPressed(Buttons.Back, True) = True Then Core.GameOptions.GamePadEnabled = Not Core.GameOptions.GamePadEnabled If Core.GameOptions.GamePadEnabled Then - Core.GameMessage.ShowMessage(Localization.GetString("game_message_xbox_controller") & ": " & Localization.GetString("global_enabled"), 12, FontManager.MainFont, Color.White) + Core.GameMessage.ShowMessage(Localization.Translate("game_message_xbox_controller") & ": " & Localization.Translate("global_enabled"), 12, FontManager.MainFont, Color.White) Else - Core.GameMessage.ShowMessage(Localization.GetString("game_message_xbox_controller") & ": " & Localization.GetString("global_disabled"), 12, FontManager.MainFont, Color.White) + Core.GameMessage.ShowMessage(Localization.Translate("game_message_xbox_controller") & ": " & Localization.Translate("global_disabled"), 12, FontManager.MainFont, Color.White) End If Core.GameOptions.SaveOptions() End If @@ -115,10 +115,10 @@ stream.Dispose() End If - Core.GameMessage.SetupText(Localization.GetString("game_message_screenshot") & " " & fileName, FontManager.MainFont, Color.White) + Core.GameMessage.SetupText(Localization.Translate("game_message_screenshot") & " " & fileName, FontManager.MainFont, Color.White) Core.GameMessage.ShowMessage(12, Core.GraphicsDevice) Catch ex As Exception - Logger.Log(Logger.LogTypes.ErrorMessage, "Basic.vb: " & Localization.GetString("game_message_screenshot_failed") & ". More information: " & ex.Message) + Logger.Log(Logger.LogTypes.ErrorMessage, "Basic.vb: " & Localization.Translate("game_message_screenshot_failed") & ". More information: " & ex.Message) End Try End Sub @@ -142,7 +142,7 @@ Core.GraphicsManager.ToggleFullScreen() - Core.GameMessage.ShowMessage(Localization.GetString("game_message_fullscreen") & ": " & Localization.GetString("global_on"), 12, FontManager.MainFont, Color.White) + Core.GameMessage.ShowMessage(Localization.Translate("game_message_fullscreen") & ": " & Localization.Translate("global_on"), 12, FontManager.MainFont, Color.White) Else Core.GraphicsManager.PreferredBackBufferWidth = 1200 Core.GraphicsManager.PreferredBackBufferHeight = 680 @@ -152,7 +152,7 @@ Core.GraphicsManager.ToggleFullScreen() - Core.GameMessage.ShowMessage(Localization.GetString("game_message_fullscreen") & ": " & Localization.GetString("global_off"), 12, FontManager.MainFont, Color.White) + Core.GameMessage.ShowMessage(Localization.Translate("game_message_fullscreen") & ": " & Localization.Translate("global_off"), 12, FontManager.MainFont, Color.White) End If Core.GraphicsManager.ApplyChanges() diff --git a/P3D/HelperClasses/Localization.vb b/P3D/HelperClasses/Localization.vb index 1e2ee56a4..3cd99725c 100644 --- a/P3D/HelperClasses/Localization.vb +++ b/P3D/HelperClasses/Localization.vb @@ -108,7 +108,7 @@ Public Class Localization End Sub - Public Shared Function GetString(ByVal s As String, Optional ByVal DefaultValue As String = "") As String + Public Shared Function Translate(ByVal s As String, Optional ByVal DefaultValue As String = "") As String Dim resultToken As Token = Nothing s = s.Replace(" ", "_").Replace("'", "").ToLower() ' Lets format the string before finding it If LocalizationTokens.ContainsKey(s) = True Then diff --git a/P3D/Overworld/OverworldCamera.vb b/P3D/Overworld/OverworldCamera.vb index 529f29001..08f0d9124 100644 --- a/P3D/Overworld/OverworldCamera.vb +++ b/P3D/Overworld/OverworldCamera.vb @@ -240,9 +240,9 @@ Public Class OverworldCamera _freeCameraMode = Not _freeCameraMode If _freeCameraMode = False Then - Core.GameMessage.ShowMessage(Localization.GetString("game_message_free_camera") & ": " & Localization.GetString("global_off"), 12, FontManager.MainFont, Color.White) + Core.GameMessage.ShowMessage(Localization.Translate("game_message_free_camera") & ": " & Localization.Translate("global_off"), 12, FontManager.MainFont, Color.White) Else - Core.GameMessage.ShowMessage(Localization.GetString("game_message_free_camera") & ": " & Localization.GetString("global_on"), 12, FontManager.MainFont, Color.White) + Core.GameMessage.ShowMessage(Localization.Translate("game_message_free_camera") & ": " & Localization.Translate("global_on"), 12, FontManager.MainFont, Color.White) End If End If End If @@ -345,12 +345,12 @@ Public Class OverworldCamera If _thirdPerson = True Then Screen.Level.OwnPlayer.Opacity = 1.0F If showMessage = True Then - Core.GameMessage.ShowMessage(Localization.GetString("game_message_third_person") & ": " & Localization.GetString("global_on"), 12, FontManager.MainFont, Color.White) + Core.GameMessage.ShowMessage(Localization.Translate("game_message_third_person") & ": " & Localization.Translate("global_on"), 12, FontManager.MainFont, Color.White) End If Else Yaw = GetAimYawFromDirection(_playerFacing) If showMessage = True Then - Core.GameMessage.ShowMessage(Localization.GetString("game_message_third_person") & ": " & Localization.GetString("global_off"), 12, FontManager.MainFont, Color.White) + Core.GameMessage.ShowMessage(Localization.Translate("game_message_third_person") & ": " & Localization.Translate("global_off"), 12, FontManager.MainFont, Color.White) End If End If End If diff --git a/P3D/Overworld/RouteSign.vb b/P3D/Overworld/RouteSign.vb index ee3dc1c17..dc449c7d5 100644 --- a/P3D/Overworld/RouteSign.vb +++ b/P3D/Overworld/RouteSign.vb @@ -54,7 +54,7 @@ Public Class RouteSign ''' Public Sub Draw() If Me._show = True Then - Dim placeString As String = Localization.GetString("Places_" & Me._text, Me._text) + Dim placeString As String = Localization.Translate("Places_" & Me._text, Me._text) 'Get the point to render the text to. Dim pX As Integer = CInt(316 / 2) - CInt(FontManager.InGameFont.MeasureString(placeString).X / 2) diff --git a/P3D/Player/Player.vb b/P3D/Player/Player.vb index 543fe44ff..cdbde80b4 100644 --- a/P3D/Player/Player.vb +++ b/P3D/Player/Player.vb @@ -556,7 +556,7 @@ Dim outputString As String = newFilePrefix - Core.GameMessage.ShowMessage(Localization.GetString("game_message_continue_autosave") & " """ & outputString & """", 12, FontManager.MainFont, Color.White) + Core.GameMessage.ShowMessage(Localization.Translate("game_message_continue_autosave") & " """ & outputString & """", 12, FontManager.MainFont, Color.White) newFilePrefix = "" End If diff --git a/P3D/Pokemon/Monster/Pokemon.vb b/P3D/Pokemon/Monster/Pokemon.vb index ef2ebcb6b..24d921ae5 100644 --- a/P3D/Pokemon/Monster/Pokemon.vb +++ b/P3D/Pokemon/Monster/Pokemon.vb @@ -2113,7 +2113,7 @@ Public Class Pokemon Else If Me.NickName = "" Then If Localization.TokenExists("pokemon_name_" & Me.Name) = True Then - Return Localization.GetString("pokemon_name_" & Me.Name) + Return Localization.Translate("pokemon_name_" & Me.Name) Else Return Me.Name End If @@ -2128,7 +2128,7 @@ Public Class Pokemon ''' Public Function GetName() As String If Localization.TokenExists("pokemon_name_" & Me.Name) = True Then - Return Localization.GetString("pokemon_name_" & Me.Name) + Return Localization.Translate("pokemon_name_" & Me.Name) Else Return Me.Name End If diff --git a/P3D/Resources/Sound/MusicManager.vb b/P3D/Resources/Sound/MusicManager.vb index f91c8405b..61a1fb6f7 100644 --- a/P3D/Resources/Sound/MusicManager.vb +++ b/P3D/Resources/Sound/MusicManager.vb @@ -130,7 +130,7 @@ Public Class MusicManager If _muted = True Then If outputDevice IsNot Nothing Then Volume = 0.0F - Core.GameMessage.ShowMessage(Localization.GetString("game_message_audio_off"), 12, FontManager.MainFont, Color.White) + Core.GameMessage.ShowMessage(Localization.Translate("game_message_audio_off"), 12, FontManager.MainFont, Color.White) End If Else @@ -140,7 +140,7 @@ Public Class MusicManager Volume = 0.0F Else Volume = 1.0F - Core.GameMessage.ShowMessage(Localization.GetString("game_message_audio_on"), 12, FontManager.MainFont, Color.White) + Core.GameMessage.ShowMessage(Localization.Translate("game_message_audio_on"), 12, FontManager.MainFont, Color.White) End If End If End If diff --git a/P3D/Screens/Battle/BlackOutScreen.vb b/P3D/Screens/Battle/BlackOutScreen.vb index 89dcba0fc..298f830c1 100644 --- a/P3D/Screens/Battle/BlackOutScreen.vb +++ b/P3D/Screens/Battle/BlackOutScreen.vb @@ -5,7 +5,7 @@ Dim BattleScreen As BattleSystem.BattleScreen Dim index As Integer = 0 Dim textIndex As Integer = 0 - Dim Text() As String = {Localization.GetString("black_out_screen_line1"), Environment.NewLine, " ", Localization.GetString("black_out_screen_line2"), Localization.GetString("black_out_screen_line3"), Localization.GetString("black_out_screen_line4"), Localization.GetString("black_out_screen_line5")} + Dim Text() As String = {Localization.Translate("black_out_screen_line1"), Environment.NewLine, " ", Localization.Translate("black_out_screen_line2"), Localization.Translate("black_out_screen_line3"), Localization.Translate("black_out_screen_line4"), Localization.Translate("black_out_screen_line5")} Dim ready As Boolean = False Dim delay As Single = 0.2F diff --git a/P3D/Screens/GUI/DonationScreen.vb b/P3D/Screens/GUI/DonationScreen.vb index 067301d50..0b8dcb079 100644 --- a/P3D/Screens/GUI/DonationScreen.vb +++ b/P3D/Screens/GUI/DonationScreen.vb @@ -68,8 +68,8 @@ Core.SpriteBatch.DrawString(FontManager.MainFont, t, New Vector2(CInt(Core.windowSize.Width / 2) - 180, 100), Color.Black) Canvas.DrawRectangle(New Rectangle(CInt(Core.windowSize.Width / 2) - 285, 0, 570, 57), New Color(56, 56, 56)) - Core.SpriteBatch.DrawString(FontManager.MainFont, Localization.GetString("donation_donators") & ": ", New Vector2(CInt(Core.windowSize.Width / 2) - FontManager.MainFont.MeasureString(Localization.GetString("donation_donators") & ":").X / 2, 20), Color.White) - Core.SpriteBatch.DrawString(FontManager.MainFont, Localization.GetString("donation_close"), New Vector2(CInt(Core.windowSize.Width / 2) - FontManager.MainFont.MeasureString(Localization.GetString("donation_close")).X / 2, 640), Color.White) + Core.SpriteBatch.DrawString(FontManager.MainFont, Localization.Translate("donation_donators") & ": ", New Vector2(CInt(Core.windowSize.Width / 2) - FontManager.MainFont.MeasureString(Localization.Translate("donation_donators") & ":").X / 2, 20), Color.White) + Core.SpriteBatch.DrawString(FontManager.MainFont, Localization.Translate("donation_close"), New Vector2(CInt(Core.windowSize.Width / 2) - FontManager.MainFont.MeasureString(Localization.Translate("donation_close")).X / 2, 640), Color.White) End Sub End Class \ No newline at end of file diff --git a/P3D/Screens/Inventory/ApricornScreen.vb b/P3D/Screens/Inventory/ApricornScreen.vb index 100d9809b..552b874b0 100644 --- a/P3D/Screens/Inventory/ApricornScreen.vb +++ b/P3D/Screens/Inventory/ApricornScreen.vb @@ -52,16 +52,16 @@ Me.Buttons.Clear() Me.Labels.Clear() - Me.Labels.Add(New Label(Localization.GetString("apricorn_screen_apricorns"), New Vector2(80, 128), FontManager.MainFont)) + Me.Labels.Add(New Label(Localization.Translate("apricorn_screen_apricorns"), New Vector2(80, 128), FontManager.MainFont)) Select Case Me.State Case States.Wait - Me.Labels.Add(New Label(Localization.GetString("apricorn_screen_producing").Replace("~", Environment.NewLine), New Vector2(100, 200), FontManager.MainFont)) - Me.Labels.Add(New Label(Localization.GetString("apricorn_screen_backadvice"), New Vector2(100, 260), Color.DarkGray, FontManager.MainFont)) + Me.Labels.Add(New Label(Localization.Translate("apricorn_screen_producing").Replace("~", Environment.NewLine), New Vector2(100, 200), FontManager.MainFont)) + Me.Labels.Add(New Label(Localization.Translate("apricorn_screen_backadvice"), New Vector2(100, 260), Color.DarkGray, FontManager.MainFont)) Case States.CanGive Dim T As Texture2D = TextureManager.GetTexture("Items\ItemSheet") - Me.Labels.Add(New Label(Localization.GetString("apricorn_screen_choose_apricorns"), New Vector2(100, 200), FontManager.MainFont)) + Me.Labels.Add(New Label(Localization.Translate("apricorn_screen_choose_apricorns"), New Vector2(100, 200), FontManager.MainFont)) Dim RedApricorn As ButtonIcon = New ButtonIcon(AddressOf Me.GiveApricorn, "0 / " & Core.Player.Inventory.GetItemAmount(85), FontManager.MainFont, T, New Rectangle(240, 72, 24, 24), New Vector2(98, 240), New Size(48, 48), "85") Dim BlueApricorn As ButtonIcon = New ButtonIcon(AddressOf Me.GiveApricorn, "0 / " & Core.Player.Inventory.GetItemAmount(89), FontManager.MainFont, T, New Rectangle(336, 72, 24, 24), New Vector2(98, 304), New Size(48, 48), "89") Dim YellowApricorn As ButtonIcon = New ButtonIcon(AddressOf Me.GiveApricorn, "0 / " & Core.Player.Inventory.GetItemAmount(92), FontManager.MainFont, T, New Rectangle(384, 72, 24, 24), New Vector2(98, 368), New Size(48, 48), "92") @@ -70,15 +70,15 @@ Dim BlackApricorn As ButtonIcon = New ButtonIcon(AddressOf Me.GiveApricorn, "0 / " & Core.Player.Inventory.GetItemAmount(99), FontManager.MainFont, T, New Rectangle(48, 96, 24, 24), New Vector2(162, 240), New Size(48, 48), "99") Dim PinkApricorn As ButtonIcon = New ButtonIcon(AddressOf Me.GiveApricorn, "0 / " & Core.Player.Inventory.GetItemAmount(101), FontManager.MainFont, T, New Rectangle(72, 96, 24, 24), New Vector2(162, 304), New Size(48, 48), "101") - Dim GiveButton As ButtonIcon = New ButtonIcon(AddressOf Me.Give, Localization.GetString("apricorn_screen_ok"), FontManager.MainFont, mainTexture, New Rectangle(48, 128, 16, 16), New Vector2(162, 496), New Size(48, 48), "OK") + Dim GiveButton As ButtonIcon = New ButtonIcon(AddressOf Me.Give, Localization.Translate("apricorn_screen_ok"), FontManager.MainFont, mainTexture, New Rectangle(48, 128, 16, 16), New Vector2(162, 496), New Size(48, 48), "OK") GiveButton.Enabled = False - Dim ClearButton As ButtonIcon = New ButtonIcon(AddressOf Me.ClearApricorns, Localization.GetString("apricorn_screen_clear"), FontManager.MainFont, mainTexture, New Rectangle(64, 128, 16, 16), New Vector2(162, 432), New Size(48, 48), "Clear") + Dim ClearButton As ButtonIcon = New ButtonIcon(AddressOf Me.ClearApricorns, Localization.Translate("apricorn_screen_clear"), FontManager.MainFont, mainTexture, New Rectangle(64, 128, 16, 16), New Vector2(162, 432), New Size(48, 48), "Clear") Buttons.AddRange({RedApricorn, BlueApricorn, YellowApricorn, GreenApricorn, WhiteApricorn, BlackApricorn, PinkApricorn, ClearButton, GiveButton}) Case States.CanTake - Dim TakeButton As ButtonIcon = New ButtonIcon(AddressOf Me.Take, Localization.GetString("apricorn_screen_take"), FontManager.MainFont, mainTexture, New Rectangle(48, 128, 16, 16), New Vector2(98, 450), New Size(48, 48)) + Dim TakeButton As ButtonIcon = New ButtonIcon(AddressOf Me.Take, Localization.Translate("apricorn_screen_take"), FontManager.MainFont, mainTexture, New Rectangle(48, 128, 16, 16), New Vector2(98, 450), New Size(48, 48)) Buttons.AddRange({TakeButton}) - Me.Labels.Add(New Label(Localization.GetString("apricorn_screen_ready"), New Vector2(100, 200), FontManager.MainFont)) + Me.Labels.Add(New Label(Localization.Translate("apricorn_screen_ready"), New Vector2(100, 200), FontManager.MainFont)) End Select End If End Sub @@ -317,7 +317,7 @@ Private Sub Take() Me.State = States.CanGive - Dim text As String = Core.Player.Name & Localization.GetString("apricorn_screen_obtain") + Dim text As String = Core.Player.Name & Localization.Translate("apricorn_screen_obtain") If CInt(Apricorns(0)) > 0 Then Core.Player.Inventory.AddItem(159, CInt(Apricorns(0))) diff --git a/P3D/Screens/Inventory/NewInventoryScreen.vb b/P3D/Screens/Inventory/NewInventoryScreen.vb index c64531f7c..185f4bf66 100644 --- a/P3D/Screens/Inventory/NewInventoryScreen.vb +++ b/P3D/Screens/Inventory/NewInventoryScreen.vb @@ -296,14 +296,14 @@ Public Class NewInventoryScreen Canvas.DrawGradient(Core.SpriteBatch, New Rectangle(halfWidth - 400 + 384 + TabDesriptionWidth + 8, halfHeight - 200, 800 - (384 + TabDesriptionWidth), 48), New Color(0, 0, 0, CInt(TbgColor.A * 0.5)), New Color(0, 0, 0, CInt(TbgColor.A * 0.00)), True, -1) Dim TabName As String = "" Select Case _tabIndex - Case 0 : TabName = Localization.GetString("inventory_tab_standard") - Case 1 : TabName = Localization.GetString("inventory_tab_medicine") - Case 2 : TabName = Localization.GetString("inventory_tab_plants") - Case 3 : TabName = Localization.GetString("inventory_tab_pokeball") - Case 4 : TabName = Localization.GetString("inventory_tab_tm_hm") - Case 5 : TabName = Localization.GetString("inventory_tab_mail") - Case 6 : TabName = Localization.GetString("inventory_tab_battle_items") - Case 7 : TabName = Localization.GetString("inventory_tab_key_items") + Case 0 : TabName = Localization.Translate("inventory_tab_standard") + Case 1 : TabName = Localization.Translate("inventory_tab_medicine") + Case 2 : TabName = Localization.Translate("inventory_tab_plants") + Case 3 : TabName = Localization.Translate("inventory_tab_pokeball") + Case 4 : TabName = Localization.Translate("inventory_tab_tm_hm") + Case 5 : TabName = Localization.Translate("inventory_tab_mail") + Case 6 : TabName = Localization.Translate("inventory_tab_battle_items") + Case 7 : TabName = Localization.Translate("inventory_tab_key_items") End Select Dim gColor As New Color(164, 164, 164) If _closing Then @@ -332,7 +332,7 @@ Public Class NewInventoryScreen SpriteBatch.Draw(_texture, New Rectangle(halfWidth - 140, halfHeight - 232, 16, 16), New Rectangle(80, 0, 16, 16), mainBackgroundColor) SpriteBatch.Draw(_texture, New Rectangle(halfWidth - 124, halfHeight - 216, 16, 16), New Rectangle(80, 0, 16, 16), mainBackgroundColor) - SpriteBatch.DrawString(FontManager.ChatFont, Localization.GetString("inventory_title"), New Vector2(halfWidth - 390, halfHeight - 228), mainBackgroundColor) + SpriteBatch.DrawString(FontManager.ChatFont, Localization.Translate("inventory_title"), New Vector2(halfWidth - 390, halfHeight - 228), mainBackgroundColor) 'Draw background pattern: For y = 0 To CInt(_enrollY) Step 16 @@ -478,34 +478,34 @@ Public Class NewInventoryScreen If techMachine.IsTM Then 'JSON stuff 'itemSubTitle = _translation.TECH_MACHINE_TITLE(cItem.ItemType.ToString()) - itemSubTitle = Localization.GetString("inventory_item_type_tm") + itemSubTitle = Localization.Translate("inventory_item_type_tm") Else 'JSON stuff 'itemSubTitle = _translation.HIDDEN_MACHINE_TITLE(cItem.ItemType.ToString()) - itemSubTitle = Localization.GetString("inventory_item_type_hm") + itemSubTitle = Localization.Translate("inventory_item_type_hm") End If itemDescription &= Environment.NewLine & techMachine.Attack.Description Case Items.ItemTypes.Standard 'JSON stuff 'itemSubTitle = _translation.STANDARD_ITEM_TITLE(cItem.ItemType.ToString()) - itemSubTitle = cItem.ItemType.ToString() & " " & Localization.GetString("inventory_item_type_standard") + itemSubTitle = cItem.ItemType.ToString() & " " & Localization.Translate("inventory_item_type_standard") Case Items.ItemTypes.KeyItems 'JSON stuff 'itemSubTitle = _translation.KEYITEM_TITLE(cItem.ItemType.ToString()) - itemSubTitle = Localization.GetString("inventory_item_type_key_item") + itemSubTitle = Localization.Translate("inventory_item_type_key_item") Case Items.ItemTypes.Pokéballs 'JSON stuff 'itemSubTitle = _translation.POKEBALL_TITLE(cItem.ItemType.ToString()) - itemSubTitle = Localization.GetString("inventory_item_type_pokeball") + itemSubTitle = Localization.Translate("inventory_item_type_pokeball") Case Items.ItemTypes.Plants 'JSON stuff 'itemSubTitle = _translation.PLANT_TITLE(cItem.ItemType.ToString()) - itemSubTitle = Localization.GetString("inventory_item_type_plant") + itemSubTitle = Localization.Translate("inventory_item_type_plant") Case Items.ItemTypes.BattleItems 'JSON stuff 'itemSubTitle = _translation.BATTLEITEM_TITLE(cItem.ItemType.ToString()) - itemSubTitle = Localization.GetString("inventory_item_type_battle_item") + itemSubTitle = Localization.Translate("inventory_item_type_battle_item") End Select infoBatch.DrawString(FontManager.TextFont, itemTitle, New Vector2(80, 20), Color.White, 0F, Vector2.Zero, 2.0F, SpriteEffects.None, 0F) @@ -910,13 +910,13 @@ Public Class NewInventoryScreen End Sub Private Sub TossItem(ByVal cItem As Item) - Dim text As String = Localization.GetString("inventory_toss_item_question") + Dim text As String = Localization.Translate("inventory_toss_item_question") TextBox.Show(text, AddressOf Me.TossManyItems, False, False, TextBox.DefaultColor) End Sub Private Sub TossManyItems(ByVal result As Integer) If result = 0 Then - TextBox.Show(Localization.GetString("inventory_toss_item_question_amount"), {}) + TextBox.Show(Localization.Translate("inventory_toss_item_question_amount"), {}) _tossingItems = True End If End Sub @@ -945,11 +945,11 @@ Public Class NewInventoryScreen If reItem Is Nothing Then 'JSON Stuff 'ShowMessage(_translation.MESSAGE_GIVE_ITEM(Pokemon.GetDisplayName(), cItem.Name)) - ShowMessage(Localization.GetString("inventory_give_item_gave") & " " & Pokemon.GetDisplayName() & " " & Localization.GetString("inventory_give_item_a") & " " & cItem.Name & ".") + ShowMessage(Localization.Translate("inventory_give_item_gave") & " " & Pokemon.GetDisplayName() & " " & Localization.Translate("inventory_give_item_a") & " " & cItem.Name & ".") Else 'JSON Stuff 'ShowMessage(_translation.MESSAGE_SWITCH_ITEM(Pokemon.GetDisplayName(), reItem.Name, cItem.Name)) - ShowMessage(Localization.GetString("inventory_switched_item_switched") & " " & Pokemon.GetDisplayName() & "'s " & reItem.Name & " " & Localization.GetString("inventory_switched_item_with_a") & " " & cItem.Name & ".") + ShowMessage(Localization.Translate("inventory_switched_item_switched") & " " & Pokemon.GetDisplayName() & "'s " & reItem.Name & " " & Localization.Translate("inventory_switched_item_with_a") & " " & cItem.Name & ".") End If LoadItems() @@ -961,7 +961,7 @@ Public Class NewInventoryScreen Else 'JSON Stuff 'ShowMessage(_translation.MESSAGE_EGG_ERROR) - ShowMessage(Localization.GetString("inventory_eggs_cannot_hold")) + ShowMessage(Localization.Translate("inventory_eggs_cannot_hold")) End If End Sub @@ -1081,25 +1081,25 @@ Public Class NewInventoryScreen If cItem.CanBeUsed Then 'JSON Stuff '_infoItemOptions.Add(_translation.INFO_ITEM_OPTION_USE) - _infoItemOptions.Add(Localization.GetString("global_use")) + _infoItemOptions.Add(Localization.Translate("global_use")) _infoItemOptionsNormal.Add(INFO_ITEM_OPTION_USE) End If If cItem.CanBeHold Then 'JSON Stuff ' _infoItemOptions.Add(_translation.INFO_ITEM_OPTION_GIVE) - _infoItemOptions.Add(Localization.GetString("global_give")) + _infoItemOptions.Add(Localization.Translate("global_give")) _infoItemOptionsNormal.Add(INFO_ITEM_OPTION_GIVE) End If If cItem.CanBeTossed Then 'JSON Stuff '_infoItemOptions.Add(_translation.INFO_ITEM_OPTION_TOSS) - _infoItemOptions.Add(Localization.GetString("global_toss")) + _infoItemOptions.Add(Localization.Translate("global_toss")) _infoItemOptionsNormal.Add(INFO_ITEM_OPTION_TOSS) End If ElseIf _mode = ISelectionScreen.ScreenMode.Selection Then 'JSON Stuff '_infoItemOptions.Add(_translation.INFO_ITEM_OPTION_SELECT) - _infoItemOptions.Add(Localization.GetString("global_select")) + _infoItemOptions.Add(Localization.Translate("global_select")) _infoItemOptionsNormal.Add(INFO_ITEM_OPTION_SELECT) End If End Sub diff --git a/P3D/Screens/MainMenu/AddServerScreen.vb b/P3D/Screens/MainMenu/AddServerScreen.vb index ff03e9525..108be136e 100644 --- a/P3D/Screens/MainMenu/AddServerScreen.vb +++ b/P3D/Screens/MainMenu/AddServerScreen.vb @@ -54,9 +54,9 @@ Canvas.DrawRectangle(New Rectangle(0, 75, Core.windowSize.Width, 680 - 240), New Color(0, 0, 0, 128)) - Core.SpriteBatch.DrawString(FontManager.MainFont, Localization.GetString("add_server_title"), New Vector2(CSng(Core.windowSize.Width / 2 - FontManager.MainFont.MeasureString(Localization.GetString("add_server_title")).X), 14), Color.White, 0.0F, New Vector2(0), 2.0F, SpriteEffects.None, 0.0F) + Core.SpriteBatch.DrawString(FontManager.MainFont, Localization.Translate("add_server_title"), New Vector2(CSng(Core.windowSize.Width / 2 - FontManager.MainFont.MeasureString(Localization.Translate("add_server_title")).X), 14), Color.White, 0.0F, New Vector2(0), 2.0F, SpriteEffects.None, 0.0F) - Core.SpriteBatch.DrawString(FontManager.MainFont, Localization.GetString("add_server_name") & ":", New Vector2(CSng(Core.windowSize.Width / 2 - 300), 140), Color.White) + Core.SpriteBatch.DrawString(FontManager.MainFont, Localization.Translate("add_server_name") & ":", New Vector2(CSng(Core.windowSize.Width / 2 - 300), 140), Color.White) Canvas.DrawRectangle(New Rectangle(CInt(Core.windowSize.Width / 2 - 300), 170, 600, 40), New Color(40, 40, 40, 255)) If Index = 0 Then @@ -74,7 +74,7 @@ End If Core.SpriteBatch.DrawString(FontManager.MainFont, t, New Vector2(CSng(Core.windowSize.Width / 2 - 294), 175), Color.White) - Core.SpriteBatch.DrawString(FontManager.MainFont, Localization.GetString("add_server_address") & ":", New Vector2(CSng(Core.windowSize.Width / 2 - 300), 270), Color.White) + Core.SpriteBatch.DrawString(FontManager.MainFont, Localization.Translate("add_server_address") & ":", New Vector2(CSng(Core.windowSize.Width / 2 - 300), 270), Color.White) Canvas.DrawRectangle(New Rectangle(CInt(Core.windowSize.Width / 2 - 300), 300, 600, 40), New Color(40, 40, 40, 255)) If Index = 1 Then @@ -121,10 +121,10 @@ End If Dim d As New Dictionary(Of Buttons, String) - d.Add(Input.Buttons.A, Localization.GetString("global_accept")) - d.Add(Input.Buttons.B, Localization.GetString("global_cancel")) - d.Add(Input.Buttons.Y, Localization.GetString("global_edit")) - d.Add(Input.Buttons.X, Localization.GetString("global_clear")) + d.Add(Input.Buttons.A, Localization.Translate("global_accept")) + d.Add(Input.Buttons.B, Localization.Translate("global_cancel")) + d.Add(Input.Buttons.Y, Localization.Translate("global_edit")) + d.Add(Input.Buttons.X, Localization.Translate("global_clear")) Me.DrawGamePadControls(d) End Sub diff --git a/P3D/Screens/MainMenu/JoinServerScreen.vb b/P3D/Screens/MainMenu/JoinServerScreen.vb index d910b330e..d897f9459 100644 --- a/P3D/Screens/MainMenu/JoinServerScreen.vb +++ b/P3D/Screens/MainMenu/JoinServerScreen.vb @@ -88,7 +88,7 @@ Public Class JoinServerScreen Canvas.DrawRectangle(New Rectangle(0, 75, Core.ScreenSize.Width, Core.ScreenSize.Height - 240), New Color(0, 0, 0, 128), True) - Core.SpriteBatch.DrawInterfaceString(FontManager.MainFont, Localization.GetString("server_title"), New Vector2(CSng(Core.ScreenSize.Width / 2 - FontManager.MainFont.MeasureString(Localization.GetString("server_title")).X), 14), Color.White, 0.0F, New Vector2(0), 2.0F, SpriteEffects.None, 0.0F) + Core.SpriteBatch.DrawInterfaceString(FontManager.MainFont, Localization.Translate("server_title"), New Vector2(CSng(Core.ScreenSize.Width / 2 - FontManager.MainFont.MeasureString(Localization.Translate("server_title")).X), 14), Color.White, 0.0F, New Vector2(0), 2.0F, SpriteEffects.None, 0.0F) Dim endX As Integer = ServerList.Count - 1 endX = CInt(MathHelper.Clamp(endX, 0, ServersToDisplay - 1)) @@ -119,43 +119,43 @@ Public Class JoinServerScreen Dim Text As String = "" Select Case i Case 0 - Text = Localization.GetString("global_join") + Text = Localization.Translate("global_join") Dim s As Server = ServerList(selectIndex) If s.IsLocal = True Then - Text = Localization.GetString("global_play") + Text = Localization.Translate("global_play") Else If s.CanJoin() = False Then CanvasTexture = TextureManager.GetTexture("GUI\Menus\Menu", New Rectangle(48, 0, 48, 48), "") End If End If Case 1 - Text = Localization.GetString("global_refresh") + Text = Localization.Translate("global_refresh") Case 2 - Text = Localization.GetString("global_add") + Text = Localization.Translate("global_add") Case 3 - Text = Localization.GetString("global_edit") + Text = Localization.Translate("global_edit") Dim s As Server = ServerList(selectIndex) If s.IsLocal = True Then CanvasTexture = TextureManager.GetTexture("GUI\Menus\Menu", New Rectangle(48, 0, 48, 48), "") End If Case 4 - Text = Localization.GetString("global_remove") + Text = Localization.Translate("global_remove") Dim s As Server = ServerList(selectIndex) If s.IsLocal = True Then CanvasTexture = TextureManager.GetTexture("GUI\Menus\Menu", New Rectangle(48, 0, 48, 48), "") End If Case 5 - Text = Localization.GetString("global_back") + Text = Localization.Translate("global_back") End Select Canvas.DrawImageBorder(CanvasTexture, 2, New Rectangle(CInt(Core.ScreenSize.Width / 2) - 560 + i * 192, Core.ScreenSize.Height - 136, 128, 64), True) Core.SpriteBatch.DrawInterfaceString(FontManager.InGameFont, Text, New Vector2(CInt(Core.ScreenSize.Width / 2) - 542 + i * 192, Core.ScreenSize.Height - 106), Color.Black) Next - Dim vS As String = Localization.GetString("server_protocol_version") & ": " & Servers.ServersManager.PROTOCOLVERSION + Dim vS As String = Localization.Translate("server_protocol_version") & ": " & Servers.ServersManager.PROTOCOLVERSION Core.SpriteBatch.DrawInterfaceString(FontManager.MiniFont, vS, New Vector2(Core.ScreenSize.Width - FontManager.MiniFont.MeasureString(vS).X - 4, Core.ScreenSize.Height - FontManager.MiniFont.MeasureString(vS).Y - 1), Color.White) ' Draw player list tooltip after everything else. @@ -288,7 +288,7 @@ Public Class JoinServerScreen ServerList.Move(selectIndex, 1) SaveServerlist() Core.SetScreen(New OverworldScreen()) - Core.SetScreen(New ConnectScreen(ConnectScreen.Modes.Connect, Localization.GetString("server_connecting_to_server"), Localization.GetString("global_please_wait") & "...", Core.CurrentScreen)) + Core.SetScreen(New ConnectScreen(ConnectScreen.Modes.Connect, Localization.Translate("server_connecting_to_server"), Localization.Translate("global_please_wait") & "...", Core.CurrentScreen)) End If End If End Sub @@ -400,7 +400,7 @@ Public Class JoinServerScreen Public Sub Ping() If IsLocal = True Then - Me.Name = Localization.GetString("server_single_player_name") + Me.Name = Localization.Translate("server_single_player_name") Me.PingResult = 0 Me.StartedPing = True Me.Pinged = True @@ -408,7 +408,7 @@ Public Class JoinServerScreen Me.MaxPlayersOnline = 1 Me.IP = "127.0.0.1" Me.Port = "15124" - Me.ServerMessage = Localization.GetString("server_single_player_message") + Me.ServerMessage = Localization.Translate("server_single_player_message") Me.ServerProtocolVersion = Servers.ServersManager.PROTOCOLVERSION Else Dim t As New Threading.Thread(AddressOf StartPing) @@ -541,12 +541,12 @@ Public Class JoinServerScreen Public Function GetServerStatus() As String If ReceivedError = True Then - Return Localization.GetString("server_received_error") + Return Localization.Translate("server_received_error") End If If Me.Pinged = True Then - Return Localization.GetString("server_pinged") + Return Localization.Translate("server_pinged") Else - Return Localization.GetString("server_polling") & LoadingDots.Dots + Return Localization.Translate("server_polling") & LoadingDots.Dots End If End Function @@ -566,7 +566,7 @@ Public Class JoinServerScreen If New Rectangle(CInt(startPos.X) + width - 32, CInt(startPos.Y) + 3, 28, 28).Contains(MouseHandler.MousePosition) = True Then Canvas.DrawRectangle(New Rectangle(MouseHandler.MousePosition.X + 10, MouseHandler.MousePosition.Y + 10, 160, 32), Color.Black) Canvas.DrawBorder(3, New Rectangle(MouseHandler.MousePosition.X + 10, MouseHandler.MousePosition.Y + 10, 160, 32), Color.Gray) - Core.SpriteBatch.DrawInterfaceString(FontManager.MiniFont, "(" & Localization.GetString("server_no_connection") & ")", New Vector2(MouseHandler.MousePosition.X + 14, MouseHandler.MousePosition.Y + 16), Color.White) + Core.SpriteBatch.DrawInterfaceString(FontManager.MiniFont, "(" & Localization.Translate("server_no_connection") & ")", New Vector2(MouseHandler.MousePosition.X + 14, MouseHandler.MousePosition.Y + 16), Color.White) End If Else If Pinged = True Then @@ -575,10 +575,10 @@ Public Class JoinServerScreen If CanJoin() = False Then If CurrentPlayersOnline >= MaxPlayersOnline Then - message = Localization.GetString("server_full") + message = Localization.Translate("server_full") End If If ServerProtocolVersion <> Servers.ServersManager.PROTOCOLVERSION Then - message = Localization.GetString("server_version_mismatch") + message = Localization.Translate("server_version_mismatch") End If color = New Color(190, 0, 0, 255) @@ -593,17 +593,17 @@ Public Class JoinServerScreen If New Rectangle(CInt(startPos.X) + width - 32, CInt(startPos.Y) + 3, 28, 28).Contains(MouseHandler.MousePosition) = True Then Canvas.DrawRectangle(New Rectangle(MouseHandler.MousePosition.X + 10, MouseHandler.MousePosition.Y + 10, 160, 32), Color.Black) Canvas.DrawBorder(3, New Rectangle(MouseHandler.MousePosition.X + 10, MouseHandler.MousePosition.Y + 10, 160, 32), Color.Gray) - Core.SpriteBatch.DrawInterfaceString(FontManager.MiniFont, Localization.GetString("server_ping") & ": " & PingResult & " ms", New Vector2(MouseHandler.MousePosition.X + 14, MouseHandler.MousePosition.Y + 16), Color.White) + Core.SpriteBatch.DrawInterfaceString(FontManager.MiniFont, Localization.Translate("server_ping") & ": " & PingResult & " ms", New Vector2(MouseHandler.MousePosition.X + 14, MouseHandler.MousePosition.Y + 16), Color.White) End If Else Core.SpriteBatch.DrawInterface(TextureManager.GetTexture("GUI\Menus\Menu", New Rectangle(80 + 14 * CInt(Math.Floor(JoinServerScreen.BarAnimationState / 10)), 224, 14, 14), ""), New Rectangle(CInt(startPos.X) + width - 32, CInt(startPos.Y) + 3, 28, 28), Color.White) If New Rectangle(CInt(startPos.X) + width - 32, CInt(startPos.Y) + 3, 28, 28).Contains(MouseHandler.MousePosition) = True Then Canvas.DrawRectangle(New Rectangle(MouseHandler.MousePosition.X + 10, MouseHandler.MousePosition.Y + 10, 160, 32), Color.Black) Canvas.DrawBorder(3, New Rectangle(MouseHandler.MousePosition.X + 10, MouseHandler.MousePosition.Y + 10, 160, 32), Color.Gray) - Core.SpriteBatch.DrawInterfaceString(FontManager.MiniFont, Localization.GetString("server_polling") & LoadingDots.Dots, New Vector2(MouseHandler.MousePosition.X + 14, MouseHandler.MousePosition.Y + 16), Color.White) + Core.SpriteBatch.DrawInterfaceString(FontManager.MiniFont, Localization.Translate("server_polling") & LoadingDots.Dots, New Vector2(MouseHandler.MousePosition.X + 14, MouseHandler.MousePosition.Y + 16), Color.White) End If - Core.SpriteBatch.DrawInterfaceString(FontManager.MiniFont, Localization.GetString("server_polling") & LoadingDots.Dots, New Vector2(CInt(startPos.X) + 4, CInt(startPos.Y) + 30), New Color(180, 180, 180, 255), 0.0F, Vector2.Zero, 1.0F, SpriteEffects.None, 0.0F) + Core.SpriteBatch.DrawInterfaceString(FontManager.MiniFont, Localization.Translate("server_polling") & LoadingDots.Dots, New Vector2(CInt(startPos.X) + 4, CInt(startPos.Y) + 30), New Color(180, 180, 180, 255), 0.0F, Vector2.Zero, 1.0F, SpriteEffects.None, 0.0F) End If End If @@ -616,13 +616,13 @@ Public Class JoinServerScreen startPos.X = CInt(Core.ScreenSize.Width / 2 - width / 2) If Core.ScaleScreenRec(New Rectangle(CInt(startPos.X) + width - 36 - FontManager.MiniFont.MeasureString(Me.CurrentPlayersOnline & "/" & Me.MaxPlayersOnline).X.ToInteger(), CInt(startPos.Y) + 3, FontManager.MiniFont.MeasureString(Me.CurrentPlayersOnline & "/" & Me.MaxPlayersOnline).X.ToInteger(), 28)).Contains(MouseHandler.MousePosition) = True Then - Dim tooltipText As String = Localization.GetString("server_no_players") + Dim tooltipText As String = Localization.Translate("server_no_players") If PlayerList.Count > 0 Then tooltipText = PlayerList.ToArray().ArrayToString(True) End If - Dim v = FontManager.MiniFont.MeasureString(Localization.GetString("server_player_list") & Environment.NewLine & tooltipText) + Dim v = FontManager.MiniFont.MeasureString(Localization.Translate("server_player_list") & Environment.NewLine & tooltipText) Dim drawY As Integer = MouseHandler.MousePosition.Y + 10 If drawY + v.Y + 12 > Core.windowSize.Height Then @@ -635,7 +635,7 @@ Public Class JoinServerScreen Canvas.DrawRectangle(New Rectangle(MouseHandler.MousePosition.X + 10, drawY, CInt(v.X + 10), CInt(v.Y + 22)), Color.Black, True) Canvas.DrawBorder(3, New Rectangle(MouseHandler.MousePosition.X + 10, drawY, CInt(v.X + 10), CInt(v.Y + 22)), Color.Gray, True) - Core.SpriteBatch.DrawInterfaceString(FontManager.MiniFont, Localization.GetString("server_player_list"), New Vector2(MouseHandler.MousePosition.X + 14, drawY + 6), Color.LightBlue) + Core.SpriteBatch.DrawInterfaceString(FontManager.MiniFont, Localization.Translate("server_player_list"), New Vector2(MouseHandler.MousePosition.X + 14, drawY + 6), Color.LightBlue) Core.SpriteBatch.DrawInterfaceString(FontManager.MiniFont, tooltipText, New Vector2(MouseHandler.MousePosition.X + 14, drawY + 6 + 34), Color.White) End If End If diff --git a/P3D/Screens/MainMenu/NewNewGameScreen.vb b/P3D/Screens/MainMenu/NewNewGameScreen.vb index a4662572d..dc882a0e3 100644 --- a/P3D/Screens/MainMenu/NewNewGameScreen.vb +++ b/P3D/Screens/MainMenu/NewNewGameScreen.vb @@ -296,7 +296,7 @@ DrawGradients(255) - SpriteBatch.DrawString(FontManager.MainFont, Localization.GetString("new_game_select_apperance"), New Vector2(windowSize.Width / 2.0F - FontManager.MainFont.MeasureString(Localization.GetString("new_game_select_apperance")).X, 100), New Color(255, 255, 255, CInt(255 * _fadeIn)), 0F, Vector2.Zero, 2.0F, SpriteEffects.None, 0F) + SpriteBatch.DrawString(FontManager.MainFont, Localization.Translate("new_game_select_apperance"), New Vector2(windowSize.Width / 2.0F - FontManager.MainFont.MeasureString(Localization.Translate("new_game_select_apperance")).X, 100), New Color(255, 255, 255, CInt(255 * _fadeIn)), 0F, Vector2.Zero, 2.0F, SpriteEffects.None, 0F) For i = 0 To _sprites.Count - 1 Dim sprite As Texture2D = _sprites(i) diff --git a/P3D/Screens/MainMenu/OfflineGameWarningScreen.vb b/P3D/Screens/MainMenu/OfflineGameWarningScreen.vb index 0271a6029..1e2617861 100644 --- a/P3D/Screens/MainMenu/OfflineGameWarningScreen.vb +++ b/P3D/Screens/MainMenu/OfflineGameWarningScreen.vb @@ -22,16 +22,16 @@ Canvas.DrawRectangle(New Rectangle(CInt(Core.windowSize.Width / 2 - 310), 90, 620, 420), New Color(16, 16, 16)) Canvas.DrawRectangle(New Rectangle(CInt(Core.windowSize.Width / 2 - 300), 100, 600, 400), New Color(39, 39, 39)) - Core.SpriteBatch.DrawString(FontManager.InGameFont, Localization.GetString("offline_game_title"), New Vector2(CSng(Core.windowSize.Width / 2 - 280), 130), Color.White) + Core.SpriteBatch.DrawString(FontManager.InGameFont, Localization.Translate("offline_game_title"), New Vector2(CSng(Core.windowSize.Width / 2 - 280), 130), Color.White) - Dim t As String = Localization.GetString("offline_game_description") + Dim t As String = Localization.Translate("offline_game_description") t = t.CropStringToWidth(FontManager.MainFont, 450) Core.SpriteBatch.DrawString(FontManager.MainFont, t, New Vector2(CSng(Core.windowSize.Width / 2 - 310) + 50, 240), Color.White) Dim d As New Dictionary(Of Buttons, String) - d.Add(Buttons.A, Localization.GetString("global_accept")) - d.Add(Buttons.B, Localization.GetString("global_cancel")) + d.Add(Buttons.A, Localization.Translate("global_accept")) + d.Add(Buttons.B, Localization.Translate("global_cancel")) DrawGamePadControls(d, New Vector2(CSng(Core.windowSize.Width / 2) - 140, 420)) End Sub diff --git a/P3D/Screens/MainMenu/PauseScreen.vb b/P3D/Screens/MainMenu/PauseScreen.vb index 73cc03eaf..f522a3e48 100644 --- a/P3D/Screens/MainMenu/PauseScreen.vb +++ b/P3D/Screens/MainMenu/PauseScreen.vb @@ -47,9 +47,9 @@ Me.PreScreen.Draw() Canvas.DrawRectangle(New Rectangle(0, 0, Core.ScreenSize.Width, Core.ScreenSize.Height), New Color(0, 0, 0, 150)) - Dim pX As Integer = CInt(Core.ScreenSize.Width / 2) - CInt(FontManager.InGameFont.MeasureString(Localization.GetString("pause_menu_title")).X / 2) - Core.SpriteBatch.DrawInterfaceString(FontManager.InGameFont, Localization.GetString("pause_menu_title"), New Vector2(pX - 7, CInt(Core.ScreenSize.Height / 6.8) + 3), Color.Black) - Core.SpriteBatch.DrawInterfaceString(FontManager.InGameFont, Localization.GetString("pause_menu_title"), New Vector2(pX - 10, CInt(Core.ScreenSize.Height / 6.8)), Color.White) + Dim pX As Integer = CInt(Core.ScreenSize.Width / 2) - CInt(FontManager.InGameFont.MeasureString(Localization.Translate("pause_menu_title")).X / 2) + Core.SpriteBatch.DrawInterfaceString(FontManager.InGameFont, Localization.Translate("pause_menu_title"), New Vector2(pX - 7, CInt(Core.ScreenSize.Height / 6.8) + 3), Color.Black) + Core.SpriteBatch.DrawInterfaceString(FontManager.InGameFont, Localization.Translate("pause_menu_title"), New Vector2(pX - 10, CInt(Core.ScreenSize.Height / 6.8)), Color.White) If Me.menuIndex = 0 Then DrawMenu() @@ -58,15 +58,15 @@ End If If Me.canCreateAutosave = False Then - Dim text As String = Localization.GetString("pause_menu_autosave_fail") + Dim text As String = Localization.Translate("pause_menu_autosave_fail") Core.SpriteBatch.DrawInterfaceString(FontManager.InGameFont, text, New Vector2(9, Core.ScreenSize.Height - FontManager.InGameFont.MeasureString(text).Y), Color.Black) Core.SpriteBatch.DrawInterfaceString(FontManager.InGameFont, text, New Vector2(5, Core.ScreenSize.Height - FontManager.InGameFont.MeasureString(text).Y - 4), Color.White) End If Dim d As New Dictionary(Of Buttons, String) - d.Add(Buttons.A, Localization.GetString("global_accept")) - d.Add(Buttons.B, Localization.GetString("global_cancel")) + d.Add(Buttons.A, Localization.Translate("global_accept")) + d.Add(Buttons.B, Localization.Translate("global_cancel")) DrawGamePadControls(d) End Sub @@ -94,9 +94,9 @@ Dim Text As String = "" Select Case i Case 0 - Text = Localization.GetString("pause_menu_back_to_game") + Text = Localization.Translate("pause_menu_back_to_game") Case 1 - Text = Localization.GetString("pause_menu_quit_to_menu") + Text = Localization.Translate("pause_menu_quit_to_menu") End Select If i = mainIndex Then @@ -177,19 +177,19 @@ #Region "QuitMenu" Private Sub DrawQuit() - Dim pX As Integer = CInt(Core.ScreenSize.Width / 2) - CInt(FontManager.InGameFont.MeasureString(Localization.GetString("pause_menu_confirmation")).X / 2) - Core.SpriteBatch.DrawInterfaceString(FontManager.InGameFont, Localization.GetString("pause_menu_confirmation"), New Vector2(pX - 7, CInt(Core.ScreenSize.Height / 6.8) + 3 + 110), Color.Black) - Core.SpriteBatch.DrawInterfaceString(FontManager.InGameFont, Localization.GetString("pause_menu_confirmation"), New Vector2(pX - 10, CInt(Core.ScreenSize.Height / 6.8) + 110), Color.White) + Dim pX As Integer = CInt(Core.ScreenSize.Width / 2) - CInt(FontManager.InGameFont.MeasureString(Localization.Translate("pause_menu_confirmation")).X / 2) + Core.SpriteBatch.DrawInterfaceString(FontManager.InGameFont, Localization.Translate("pause_menu_confirmation"), New Vector2(pX - 7, CInt(Core.ScreenSize.Height / 6.8) + 3 + 110), Color.Black) + Core.SpriteBatch.DrawInterfaceString(FontManager.InGameFont, Localization.Translate("pause_menu_confirmation"), New Vector2(pX - 10, CInt(Core.ScreenSize.Height / 6.8) + 110), Color.White) For i = 0 To 1 Dim Text As String = "" Dim x As Integer = 0 Select Case i Case 0 - Text = Localization.GetString("global_no") + Text = Localization.Translate("global_no") x = -200 Case 1 - Text = Localization.GetString("global_yes") + Text = Localization.Translate("global_yes") x = 200 End Select diff --git a/P3D/Screens/MainMenu/PressStartScreen.vb b/P3D/Screens/MainMenu/PressStartScreen.vb index 4137669e7..ed958c63a 100644 --- a/P3D/Screens/MainMenu/PressStartScreen.vb +++ b/P3D/Screens/MainMenu/PressStartScreen.vb @@ -209,16 +209,16 @@ Public Class PressStartScreen Dim text As String = String.Empty If ControllerHandler.IsConnected() Then - text = Localization.GetString("press_start_1") & " " & Localization.GetString("press_start_2") + text = Localization.Translate("press_start.1") & " " & Localization.Translate("press_start.2") Else - text = Localization.GetString("press_start_1") & " " & KeyBindings.EnterKey1.ToString().ToUpper & " " & Localization.GetString("press_start_2") + text = Localization.Translate("press_start.1") & " " & KeyBindings.EnterKey1.ToString().ToUpper & " " & Localization.Translate("press_start.2") End If Dim textSize As Vector2 = FontManager.GameJoltFont.MeasureString(text) GetFontRenderer().DrawString(FontManager.GameJoltFont, text, New Vector2(windowSize.Width / 2.0F - textSize.X / 2.0F, windowSize.Height - textSize.Y - 50), _textColor) If ControllerHandler.IsConnected() Then - SpriteBatch.Draw(TextureManager.GetTexture("GUI\GamePad\xboxControllerButtonA"), New Rectangle(CInt(windowSize.Width / 2 - textSize.X / 2 + FontManager.GameJoltFont.MeasureString(Localization.GetString("press_start_1") & " ").X), CInt(windowSize.Height - textSize.Y - 50), 40, 40), Color.White) + SpriteBatch.Draw(TextureManager.GetTexture("GUI\GamePad\xboxControllerButtonA"), New Rectangle(CInt(windowSize.Width / 2 - textSize.X / 2 + FontManager.GameJoltFont.MeasureString(Localization.Translate("press_start_1") & " ").X), CInt(windowSize.Height - textSize.Y - 50), 40, 40), Color.White) End If End If @@ -328,7 +328,7 @@ Public Class NewMainMenuScreen End If End If End If - If Controls.Dismiss(True, False, False) Then + If Controls.Dismiss(True, False, False) Then ' Click on profiles. For x = 0 To _profiles.Count - 1 Dim xOffset As Single = _screenOffset.X + x * 180 + ((x + 1) * 100 * (1 - _fadeIn)) @@ -508,8 +508,8 @@ Public Class NewMainMenuScreen If IsCurrentScreen() Then If _loading Then - Dim textSize As Vector2 = FontManager.GameJoltFont.MeasureString(Localization.GetString("global_please_wait") & "...") - GetFontRenderer().DrawString(FontManager.GameJoltFont, Localization.GetString("global_please_wait") & LoadingDots.Dots, New Vector2(windowSize.Width / 2.0F - textSize.X / 2.0F, + Dim textSize As Vector2 = FontManager.GameJoltFont.MeasureString(Localization.Translate("global_please_wait") & "...") + GetFontRenderer().DrawString(FontManager.GameJoltFont, Localization.Translate("global_please_wait") & LoadingDots.Dots, New Vector2(windowSize.Width / 2.0F - textSize.X / 2.0F, windowSize.Height / 2.0F - textSize.Y / 2.0F + 100), Color.White) Else DrawProfiles() @@ -529,7 +529,7 @@ Public Class NewMainMenuScreen If ScaleScreenRec(New Rectangle(r.X, r.Y, 32, 32)).Contains(MouseHandler.MousePosition) = True And GameInstance.IsMouseVisible OrElse Not GameInstance.IsMouseVisible And _yIndex = 1 Then y = 16 - SpriteBatch.DrawInterfaceString(FontManager.MiniFont, Localization.GetString("press_start_change_to") & " " & Localization.GetString("global_male").ToLower, New Vector2(r.X + 64 + 4, r.Y + 4), fontColor) + SpriteBatch.DrawInterfaceString(FontManager.MiniFont, Localization.Translate("press_start_change_to") & " " & Localization.Translate("global_male").ToLower, New Vector2(r.X + 64 + 4, r.Y + 4), fontColor) End If SpriteBatch.DrawInterface(_oldMenuTexture, New Rectangle(r.X, r.Y, 32, 32), New Rectangle(144, 32 + y, 16, 16), Color.White) @@ -537,7 +537,7 @@ Public Class NewMainMenuScreen If ScaleScreenRec(New Rectangle(r.X, r.Y + 48, 32, 32)).Contains(MouseHandler.MousePosition) = True And GameInstance.IsMouseVisible OrElse Not GameInstance.IsMouseVisible And _yIndex = 2 Then y = 16 - SpriteBatch.DrawInterfaceString(FontManager.MiniFont, Localization.GetString("press_start_change_to") & " " & Localization.GetString("global_female").ToLower, New Vector2(r.X + 64 + 4, r.Y + 4 + 48), fontColor) + SpriteBatch.DrawInterfaceString(FontManager.MiniFont, Localization.Translate("press_start_change_to") & " " & Localization.Translate("global_female").ToLower, New Vector2(r.X + 64 + 4, r.Y + 4 + 48), fontColor) End If SpriteBatch.DrawInterface(_oldMenuTexture, New Rectangle(r.X, r.Y + 48, 32, 32), New Rectangle(160, 32 + y, 16, 16), Color.White) @@ -545,7 +545,7 @@ Public Class NewMainMenuScreen If ScaleScreenRec(New Rectangle(r.X, r.Y + 48 + 48, 32, 32)).Contains(MouseHandler.MousePosition) = True And GameInstance.IsMouseVisible OrElse Not GameInstance.IsMouseVisible And _yIndex = 3 Then y = 16 - SpriteBatch.DrawInterfaceString(FontManager.MiniFont, Localization.GetString("press_start_reset_save"), New Vector2(r.X + 64 + 4, r.Y + 4 + 48 + 48), fontColor) + SpriteBatch.DrawInterfaceString(FontManager.MiniFont, Localization.Translate("press_start_reset_save"), New Vector2(r.X + 64 + 4, r.Y + 4 + 48 + 48), fontColor) End If SpriteBatch.DrawInterface(_oldMenuTexture, New Rectangle(r.X, r.Y + 48 + 48, 32, 32), New Rectangle(176, 32 + y, 16, 16), Color.White) @@ -598,14 +598,14 @@ Public Class NewMainMenuScreen For i = 0 To tmpProfile.PokemonTextures.Count - 1 SpriteBatch.Draw(tmpProfile.PokemonTextures(i), New Rectangle(displayRect.X + 30 + i * 70, displayRect.Y + 70, 64, 64), Color.White) Next - GetFontRenderer().DrawString(FontManager.GameJoltFont, Localization.GetString("global_player_name") & ": " & tmpProfile.Name & Environment.NewLine & - Localization.GetString("global_gamemode") & ": " & tmpProfile.GameMode, New Vector2(displayRect.X + 30, displayRect.Y + 20), Color.White, 0F, Vector2.Zero, 0.5F, SpriteEffects.None, 0F) - GetFontRenderer().DrawString(FontManager.GameJoltFont, Localization.GetString("global_badges") & ": " & tmpProfile.Badges.ToString() & Environment.NewLine & - Localization.GetString("global_play_time") & ": " & tmpProfile.TimePlayed & Environment.NewLine & - Localization.GetString("global_location") & ": " & tmpProfile.Location, New Vector2(displayRect.X + 30, displayRect.Y + 150), Color.White, 0F, Vector2.Zero, 0.5F, SpriteEffects.None, 0F) + GetFontRenderer().DrawString(FontManager.GameJoltFont, Localization.Translate("global_player_name") & ": " & tmpProfile.Name & Environment.NewLine & + Localization.Translate("global_gamemode") & ": " & tmpProfile.GameMode, New Vector2(displayRect.X + 30, displayRect.Y + 20), Color.White, 0F, Vector2.Zero, 0.5F, SpriteEffects.None, 0F) + GetFontRenderer().DrawString(FontManager.GameJoltFont, Localization.Translate("global_badges") & ": " & tmpProfile.Badges.ToString() & Environment.NewLine & + Localization.Translate("global_play_time") & ": " & tmpProfile.TimePlayed & Environment.NewLine & + Localization.Translate("global_location") & ": " & tmpProfile.Location, New Vector2(displayRect.X + 30, displayRect.Y + 150), Color.White, 0F, Vector2.Zero, 0.5F, SpriteEffects.None, 0F) Else - GetFontRenderer().DrawString(FontManager.GameJoltFont, Localization.GetString("global_player_name") & ": " & tmpProfile.Name & Environment.NewLine & - Localization.GetString("global_gamemode") & ": " & tmpProfile.GameMode, New Vector2(displayRect.X + 30, displayRect.Y + 20), Color.White, 0F, Vector2.Zero, 0.5F, SpriteEffects.None, 0F) + GetFontRenderer().DrawString(FontManager.GameJoltFont, Localization.Translate("global_player_name") & ": " & tmpProfile.Name & Environment.NewLine & + Localization.Translate("global_gamemode") & ": " & tmpProfile.GameMode, New Vector2(displayRect.X + 30, displayRect.Y + 20), Color.White, 0F, Vector2.Zero, 0.5F, SpriteEffects.None, 0F) SpriteBatch.Draw(_menuTexture, New Rectangle(displayRect.X + 30, displayRect.Y + 70, 32, 32), New Rectangle(0, 32, 32, 32), Color.White) Dim errorText As String = "" @@ -905,7 +905,7 @@ Public Class NewMainMenuScreen End If If _isNewGameButton Then - Dim text As String = Localization.GetString("global_new") & Environment.NewLine & Localization.GetString("global_game") + Dim text As String = Localization.Translate("global_new") & Environment.NewLine & Localization.Translate("global_game") If alpha >= 250 And CurrentScreen.Identification = Identifications.MainMenuScreen Then FontRenderer.DrawString(FontManager.GameJoltFont, text, New Vector2(offset.X + 80 - (FontManager.GameJoltFont.MeasureString(text).X) / 2, @@ -944,9 +944,9 @@ Public Class NewMainMenuScreen _logoBounce = 0F End If - Dim text As String = Localization.GetString("global_login") + Dim text As String = Localization.Translate("global_login") If _isLoading Then - text = Localization.GetString("global_loading") & "..." + text = Localization.Translate("global_loading") & "..." End If SpriteBatch.Draw(_sprite, New Rectangle(CInt(offset.X + 46), CInt(offset.Y + 36 + Math.Sin(_logoBounce) * 8.0F), 68, 72), New Color(255, 255, 255, alpha)) @@ -1082,7 +1082,7 @@ Public Class GameModeSelectionScreen Public Overrides Sub Draw() PreScreen.Draw() - Dim text As String = Localization.GetString("press_start_select_gamemode_1") & Environment.NewLine & Localization.GetString("press_start_select_gamemode_2") + Dim text As String = Localization.Translate("press_start_select_gamemode_1") & Environment.NewLine & Localization.Translate("press_start_select_gamemode_2") GetFontRenderer().DrawString(FontManager.GameJoltFont, text, New Vector2(30, 30), Color.White) diff --git a/P3D/Screens/MapScreen.vb b/P3D/Screens/MapScreen.vb index 664bebf07..54b0a7e34 100644 --- a/P3D/Screens/MapScreen.vb +++ b/P3D/Screens/MapScreen.vb @@ -472,14 +472,14 @@ End If If Me.hoverText <> "" And Me.pokehoverText <> "" Then - Core.SpriteBatch.DrawString(FontManager.MiniFont, Localization.GetString("pokemon_name_" & Me.pokehoverText) & " at " & Localization.GetString("places_" & Me.hoverText), New Vector2(Me.CursorPosition.X + 30, Me.CursorPosition.Y - 31), Color.Black) - Core.SpriteBatch.DrawString(FontManager.MiniFont, Localization.GetString("pokemon_name_" & Me.pokehoverText) & " at " & Localization.GetString("places_" & Me.hoverText), New Vector2(Me.CursorPosition.X + 29, Me.CursorPosition.Y - 32), Color.White) + Core.SpriteBatch.DrawString(FontManager.MiniFont, Localization.Translate("pokemon_name_" & Me.pokehoverText) & " at " & Localization.Translate("places_" & Me.hoverText), New Vector2(Me.CursorPosition.X + 30, Me.CursorPosition.Y - 31), Color.Black) + Core.SpriteBatch.DrawString(FontManager.MiniFont, Localization.Translate("pokemon_name_" & Me.pokehoverText) & " at " & Localization.Translate("places_" & Me.hoverText), New Vector2(Me.CursorPosition.X + 29, Me.CursorPosition.Y - 32), Color.White) ElseIf Me.hoverText <> "" And Me.pokehoverText = "" Then - Core.SpriteBatch.DrawString(FontManager.MiniFont, Localization.GetString("places_" & Me.hoverText), New Vector2(Me.CursorPosition.X + 30, Me.CursorPosition.Y - 31), Color.Black) - Core.SpriteBatch.DrawString(FontManager.MiniFont, Localization.GetString("places_" & Me.hoverText), New Vector2(Me.CursorPosition.X + 29, Me.CursorPosition.Y - 32), Color.White) + Core.SpriteBatch.DrawString(FontManager.MiniFont, Localization.Translate("places_" & Me.hoverText), New Vector2(Me.CursorPosition.X + 30, Me.CursorPosition.Y - 31), Color.Black) + Core.SpriteBatch.DrawString(FontManager.MiniFont, Localization.Translate("places_" & Me.hoverText), New Vector2(Me.CursorPosition.X + 29, Me.CursorPosition.Y - 32), Color.White) End If - Dim regionString As String = Localization.GetString(Me.currentRegion(0).ToString().ToUpper() & Me.currentRegion.Remove(0, 1)) + Dim regionString As String = Localization.Translate(Me.currentRegion(0).ToString().ToUpper() & Me.currentRegion.Remove(0, 1)) If Me.regions.Count > 1 Then regionString &= " (Press the Shift/Shoulder Buttons to switch between regions.)" End If @@ -498,32 +498,32 @@ r = New Rectangle(116, 0, 12, 12) End If Core.SpriteBatch.Draw(Me.objectsTexture, New Rectangle(Core.windowSize.Width - 170, 100, 24, 24), r, New Color(255, 255, 255, 220)) - Core.SpriteBatch.DrawString(FontManager.MiniFont, Localization.GetString("map_screen_cities"), New Vector2(Core.windowSize.Width - 139, 101), Color.Black) - Core.SpriteBatch.DrawString(FontManager.MiniFont, Localization.GetString("map_screen_cities"), New Vector2(Core.windowSize.Width - 140, 100), Color.White) + Core.SpriteBatch.DrawString(FontManager.MiniFont, Localization.Translate("map_screen_cities"), New Vector2(Core.windowSize.Width - 139, 101), Color.Black) + Core.SpriteBatch.DrawString(FontManager.MiniFont, Localization.Translate("map_screen_cities"), New Vector2(Core.windowSize.Width - 140, 100), Color.White) ' Routes: r = New Rectangle(104, 12, 12, 12) If drawObjects(1) = False Then r = New Rectangle(116, 12, 12, 12) End If Core.SpriteBatch.Draw(Me.objectsTexture, New Rectangle(Core.windowSize.Width - 170, 130, 24, 24), r, New Color(255, 255, 255, 220)) - Core.SpriteBatch.DrawString(FontManager.MiniFont, Localization.GetString("map_screen_routes"), New Vector2(Core.windowSize.Width - 139, 131), Color.Black) - Core.SpriteBatch.DrawString(FontManager.MiniFont, Localization.GetString("map_screen_routes"), New Vector2(Core.windowSize.Width - 140, 130), Color.White) + Core.SpriteBatch.DrawString(FontManager.MiniFont, Localization.Translate("map_screen_routes"), New Vector2(Core.windowSize.Width - 139, 131), Color.Black) + Core.SpriteBatch.DrawString(FontManager.MiniFont, Localization.Translate("map_screen_routes"), New Vector2(Core.windowSize.Width - 140, 130), Color.White) ' Places: r = New Rectangle(104, 24, 12, 12) If drawObjects(2) = False Then r = New Rectangle(116, 24, 12, 12) End If Core.SpriteBatch.Draw(Me.objectsTexture, New Rectangle(Core.windowSize.Width - 170, 160, 24, 24), r, New Color(255, 255, 255, 220)) - Core.SpriteBatch.DrawString(FontManager.MiniFont, Localization.GetString("map_screen_places"), New Vector2(Core.windowSize.Width - 139, 161), Color.Black) - Core.SpriteBatch.DrawString(FontManager.MiniFont, Localization.GetString("map_screen_places"), New Vector2(Core.windowSize.Width - 140, 160), Color.White) + Core.SpriteBatch.DrawString(FontManager.MiniFont, Localization.Translate("map_screen_places"), New Vector2(Core.windowSize.Width - 139, 161), Color.Black) + Core.SpriteBatch.DrawString(FontManager.MiniFont, Localization.Translate("map_screen_places"), New Vector2(Core.windowSize.Width - 140, 160), Color.White) ' Roaming: r = New Rectangle(113, 65, 14, 14) If drawObjects(3) = False Then r = New Rectangle(113, 81, 14, 14) End If Core.SpriteBatch.Draw(Me.objectsTexture, New Rectangle(Core.windowSize.Width - 172, 187, 28, 28), r, New Color(255, 255, 255, 220)) - Core.SpriteBatch.DrawString(FontManager.MiniFont, Localization.GetString("map_screen_roaming"), New Vector2(Core.windowSize.Width - 139, 191), Color.Black) - Core.SpriteBatch.DrawString(FontManager.MiniFont, Localization.GetString("map_screen_roaming"), New Vector2(Core.windowSize.Width - 140, 190), Color.White) + Core.SpriteBatch.DrawString(FontManager.MiniFont, Localization.Translate("map_screen_roaming"), New Vector2(Core.windowSize.Width - 139, 191), Color.Black) + Core.SpriteBatch.DrawString(FontManager.MiniFont, Localization.Translate("map_screen_roaming"), New Vector2(Core.windowSize.Width - 140, 190), Color.White) End Sub Private Sub DrawCursor() diff --git a/P3D/Screens/NewGameScreen.vb b/P3D/Screens/NewGameScreen.vb index 7602dace4..8242cd059 100644 --- a/P3D/Screens/NewGameScreen.vb +++ b/P3D/Screens/NewGameScreen.vb @@ -107,7 +107,7 @@ End If If Me.Dialogues.Count < 3 Then Me.Dialogues.Clear() - Me.Dialogues.AddRange({Localization.GetString("new_game_oak_1"), Localization.GetString("new_game_oak_2"), Localization.GetString("new_game_oak_3")}) + Me.Dialogues.AddRange({Localization.Translate("new_game_oak_1"), Localization.Translate("new_game_oak_2"), Localization.Translate("new_game_oak_3")}) End If End Sub @@ -228,16 +228,16 @@ Select Case Index Case 5 - Core.SpriteBatch.DrawString(FontManager.MiniFont, Localization.GetString("new_game_your_name") & ":", New Vector2(TextboxPosition.X, TextboxPosition.Y - 24), Color.White) + Core.SpriteBatch.DrawString(FontManager.MiniFont, Localization.Translate("new_game_your_name") & ":", New Vector2(TextboxPosition.X, TextboxPosition.Y - 24), Color.White) DrawTextBox() If enterCorrectName = True Then - Core.SpriteBatch.DrawString(FontManager.MiniFont, Localization.GetString("new_game_name_too_short"), New Vector2(TextboxPosition.X, TextboxPosition.Y + 30), Color.DarkRed) + Core.SpriteBatch.DrawString(FontManager.MiniFont, Localization.Translate("new_game_name_too_short"), New Vector2(TextboxPosition.X, TextboxPosition.Y + 30), Color.DarkRed) End If Case 4 Canvas.DrawRectangle(New Rectangle(CInt(TextboxPosition.X - 5), CInt(TextboxPosition.Y - 24), 138, 42), New Color(0, 0, 0, 80)) - Core.SpriteBatch.DrawString(FontManager.MiniFont, Localization.GetString("new_game_choose_skin") & ":" & Environment.NewLine & skinNames(SkinIndex), New Vector2(TextboxPosition.X, TextboxPosition.Y - 24), Color.White) + Core.SpriteBatch.DrawString(FontManager.MiniFont, Localization.Translate("new_game_choose_skin") & ":" & Environment.NewLine & skinNames(SkinIndex), New Vector2(TextboxPosition.X, TextboxPosition.Y - 24), Color.White) Canvas.DrawScrollBar(New Vector2(TextboxPosition.X, TextboxPosition.Y + 48), startSkins.Count, 1, SkinIndex, New Size(128, 4), True, TextureManager.GetTexture(TextureManager.GetTexture("GUI\Menus\Menu"), New Rectangle(112, 12, 1, 1)), TextureManager.GetTexture(TextureManager.GetTexture("GUI\Menus\Menu"), New Rectangle(113, 12, 1, 1))) End Select @@ -537,13 +537,13 @@ Select Case True Case WeirdNames.Contains(name.ToLower()) - Return Localization.GetString("new_game_oak_weird_name_1") & name & Localization.GetString("new_game_oak_weird_name_2") + Return Localization.Translate("new_game_oak_weird_name_1") & name & Localization.Translate("new_game_oak_weird_name_2") Case KnownNames.Contains(name.ToLower()) - Return Localization.GetString("new_game_oak_known_name_1") & name & Localization.GetString("new_game_oak_known_name_2") + Return Localization.Translate("new_game_oak_known_name_1") & name & Localization.Translate("new_game_oak_known_name_2") Case OwnNames.Contains(name.ToLower()) - Return Localization.GetString("new_game_oak_same_name_1") & name & Localization.GetString("new_game_oak_same_name_2") + Return Localization.Translate("new_game_oak_same_name_1") & name & Localization.Translate("new_game_oak_same_name_2") End Select - Return Localization.GetString("new_game_oak_name_1") & name & Localization.GetString("new_game_oak_name_2") + Return Localization.Translate("new_game_oak_name_1") & name & Localization.Translate("new_game_oak_name_2") End Function End Class \ No newline at end of file diff --git a/P3D/Screens/NewMenuScreen.vb b/P3D/Screens/NewMenuScreen.vb index 2322ff06b..910b42849 100644 --- a/P3D/Screens/NewMenuScreen.vb +++ b/P3D/Screens/NewMenuScreen.vb @@ -46,19 +46,19 @@ If Screen.Level.IsBugCatchingContest = True Then _menuOptions.AddRange({Screen.Level.BugCatchingContestData.GetSplit(2) & " x" & Core.Player.Inventory.GetItemAmount(177), - Localization.GetString("menu_bag_title"), + Localization.Translate("menu_bag_title"), "|||" & Core.Player.Name, 'Trainer card "End Contest"}) Else If Core.Player.Pokemons.Count > 0 Then _menuOptions.Add("Pokémon") End If - _menuOptions.AddRange({Localization.GetString("menu_bag_title"), + _menuOptions.AddRange({Localization.Translate("menu_bag_title"), "|||" & Core.Player.Name, - Localization.GetString("global_save")}) + Localization.Translate("global_save")}) End If - _menuOptions.Add(Localization.GetString("option_title")) + _menuOptions.Add(Localization.Translate("option_title")) End Sub Private _blur As Resources.Blur.BlurHandler @@ -268,15 +268,15 @@ Core.SetScreen(New TransitionScreen(Core.CurrentScreen, New PokedexSelectScreen(Me), Color.White, False)) Case "Pokémon" SetScreen(New PartyScreen(Me)) - Case Localization.GetString("menu_bag_title") + Case Localization.Translate("menu_bag_title") Core.SetScreen(New NewInventoryScreen(Me)) Case "|||" & Core.Player.Name Core.SetScreen(New NewTrainerScreen(Me)) - Case Localization.GetString("global_save") + Case Localization.Translate("global_save") Core.SetScreen(New SaveScreen(Me)) - Case Localization.GetString("option_title") + Case Localization.Translate("option_title") Core.SetScreen(New NewOptionScreen(Me)) - Case Localization.GetString("global_close") + Case Localization.Translate("global_close") Core.SetScreen(PreScreen) Case Screen.Level.BugCatchingContestData.GetSplit(2) & " x" & Core.Player.Inventory.GetItemAmount(177) Me.ShowBalls() diff --git a/P3D/Screens/NewOptionScreen.vb b/P3D/Screens/NewOptionScreen.vb index a54c06811..0ce200bda 100644 --- a/P3D/Screens/NewOptionScreen.vb +++ b/P3D/Screens/NewOptionScreen.vb @@ -122,7 +122,7 @@ SpriteBatch.Draw(_texture, New Rectangle(halfWidth - 140, halfHeight - 232, 16, 16), New Rectangle(80, 0, 16, 16), mainBackgroundColor) SpriteBatch.Draw(_texture, New Rectangle(halfWidth - 124, halfHeight - 216, 16, 16), New Rectangle(80, 0, 16, 16), mainBackgroundColor) - SpriteBatch.DrawString(FontManager.ChatFont, Localization.GetString("option_title"), New Vector2(halfWidth - 390, halfHeight - 228), mainBackgroundColor) + SpriteBatch.DrawString(FontManager.ChatFont, Localization.Translate("option_title"), New Vector2(halfWidth - 390, halfHeight - 228), mainBackgroundColor) For y = 0 To CInt(_enrollY) Step 16 For x = 0 To 800 Step 16 @@ -348,81 +348,81 @@ Select Case Me.ScreenIndex Case 0 ' Main Options menu. - Me.ControlList.Add(New CommandButton(New Vector2(Delta_X + 90, Delta_Y + 80), 1, 64, Localization.GetString("option_game"), AddressOf SwitchToGame)) - Me.ControlList.Add(New CommandButton(New Vector2(Delta_X + 310, Delta_Y + 80), 1, 64, Localization.GetString("option_graphics"), AddressOf SwitchToGraphics)) - Me.ControlList.Add(New CommandButton(New Vector2(Delta_X + 530, Delta_Y + 80), 1, 64, Localization.GetString("option_battle"), AddressOf SwitchToBattle)) - Me.ControlList.Add(New CommandButton(New Vector2(Delta_X + 90, Delta_Y + 167), 1, 64, Localization.GetString("option_controls"), AddressOf SwitchToControls)) - Me.ControlList.Add(New CommandButton(New Vector2(Delta_X + 310, Delta_Y + 167), 1, 64, Localization.GetString("option_audio"), AddressOf SwitchToVolume)) - Me.ControlList.Add(New CommandButton(New Vector2(Delta_X + 530, Delta_Y + 167), 1, 64, Localization.GetString("option_advanced"), AddressOf SwitchToAdvanced)) + Me.ControlList.Add(New CommandButton(New Vector2(Delta_X + 90, Delta_Y + 80), 1, 64, Localization.Translate("option_game"), AddressOf SwitchToGame)) + Me.ControlList.Add(New CommandButton(New Vector2(Delta_X + 310, Delta_Y + 80), 1, 64, Localization.Translate("option_graphics"), AddressOf SwitchToGraphics)) + Me.ControlList.Add(New CommandButton(New Vector2(Delta_X + 530, Delta_Y + 80), 1, 64, Localization.Translate("option_battle"), AddressOf SwitchToBattle)) + Me.ControlList.Add(New CommandButton(New Vector2(Delta_X + 90, Delta_Y + 167), 1, 64, Localization.Translate("option_controls"), AddressOf SwitchToControls)) + Me.ControlList.Add(New CommandButton(New Vector2(Delta_X + 310, Delta_Y + 167), 1, 64, Localization.Translate("option_audio"), AddressOf SwitchToVolume)) + Me.ControlList.Add(New CommandButton(New Vector2(Delta_X + 530, Delta_Y + 167), 1, 64, Localization.Translate("option_advanced"), AddressOf SwitchToAdvanced)) - Me.ControlList.Add(New CommandButton(New Vector2(Delta_X + 90 + 24, Delta_Y + 327), 1, 48, Localization.GetString("global_save"), AddressOf Apply)) - Me.ControlList.Add(New CommandButton(New Vector2(Delta_X + 530 + 24, Delta_Y + 327), 1, 48, Localization.GetString("global_close"), AddressOf Close)) + Me.ControlList.Add(New CommandButton(New Vector2(Delta_X + 90 + 24, Delta_Y + 327), 1, 48, Localization.Translate("global_save"), AddressOf Apply)) + Me.ControlList.Add(New CommandButton(New Vector2(Delta_X + 530 + 24, Delta_Y + 327), 1, 48, Localization.Translate("global_close"), AddressOf Close)) Case 1 ' "Game" from the Options menu. - Me.ControlList.Add(New ScrollBar(New Vector2(Delta_X + 100, Delta_Y + 60), 400, Localization.GetString("option_game_text_speed"), Me.TextSpeed, 1, 3, AddressOf ChangeTextspeed)) + Me.ControlList.Add(New ScrollBar(New Vector2(Delta_X + 100, Delta_Y + 60), 400, Localization.Translate("option_game_text_speed"), Me.TextSpeed, 1, 3, AddressOf ChangeTextspeed)) If CBool(GameModeManager.GetGameRuleValue("LockDifficulty", "0")) = False Then Dim d As New Dictionary(Of Integer, String) - d.Add(0, Localization.GetString("option_game_difficulty_easy")) - d.Add(1, Localization.GetString("option_game_difficulty_hard")) - d.Add(2, Localization.GetString("option_game_difficulty_super_hard")) + d.Add(0, Localization.Translate("option_game_difficulty_easy")) + d.Add(1, Localization.Translate("option_game_difficulty_hard")) + d.Add(2, Localization.Translate("option_game_difficulty_super_hard")) - Me.ControlList.Add(New ScrollBar(New Vector2(Delta_X + 100, Delta_Y + 120), 400, Localization.GetString("option_game_difficulty"), Me.Difficulty, 0, 2, AddressOf ChangeDifficulty, d)) + Me.ControlList.Add(New ScrollBar(New Vector2(Delta_X + 100, Delta_Y + 120), 400, Localization.Translate("option_game_difficulty"), Me.Difficulty, 0, 2, AddressOf ChangeDifficulty, d)) End If - Me.ControlList.Add(New ToggleButton(New Vector2(Delta_X + 100, Delta_Y + 180), 3, 64, Localization.GetString("option_game_bobbing"), Me.ViewBobbing, AddressOf ToggleBobbing, {Localization.GetString("global_off"), Localization.GetString("global_on")}.ToList())) + Me.ControlList.Add(New ToggleButton(New Vector2(Delta_X + 100, Delta_Y + 180), 3, 64, Localization.Translate("option_game_bobbing"), Me.ViewBobbing, AddressOf ToggleBobbing, {Localization.Translate("global_off"), Localization.Translate("global_on")}.ToList())) - Me.ControlList.Add(New CommandButton(New Vector2(Delta_X + 530 + 24, Delta_Y + 327), 1, 48, Localization.GetString("global_back"), AddressOf SwitchToMain)) + Me.ControlList.Add(New CommandButton(New Vector2(Delta_X + 530 + 24, Delta_Y + 327), 1, 48, Localization.Translate("global_back"), AddressOf SwitchToMain)) Case 2 ' "Graphics" from the Options menu. - Me.ControlList.Add(New ScrollBar(New Vector2(Delta_X + 100, Delta_Y + 40), 400, Localization.GetString("option_graphics_fov"), CInt(Me.FOV), 45, 120, AddressOf ChangeFOV)) + Me.ControlList.Add(New ScrollBar(New Vector2(Delta_X + 100, Delta_Y + 40), 400, Localization.Translate("option_graphics_fov"), CInt(Me.FOV), 45, 120, AddressOf ChangeFOV)) Dim d As New Dictionary(Of Integer, String) - d.Add(0, Localization.GetString("option_graphics_render_distance_tiny")) - d.Add(1, Localization.GetString("option_graphics_render_distance_small")) - d.Add(2, Localization.GetString("option_graphics_render_distance_normal")) - d.Add(3, Localization.GetString("option_graphics_render_distance_far")) - d.Add(4, Localization.GetString("option_graphics_render_distance_extreme")) - Me.ControlList.Add(New ScrollBar(New Vector2(Delta_X + 100, Delta_Y + 100), 400, Localization.GetString("option_graphics_render_distance"), Me.RenderDistance, 0, 4, AddressOf ChangeRenderDistance, d)) + d.Add(0, Localization.Translate("option_graphics_render_distance_tiny")) + d.Add(1, Localization.Translate("option_graphics_render_distance_small")) + d.Add(2, Localization.Translate("option_graphics_render_distance_normal")) + d.Add(3, Localization.Translate("option_graphics_render_distance_far")) + d.Add(4, Localization.Translate("option_graphics_render_distance_extreme")) + Me.ControlList.Add(New ScrollBar(New Vector2(Delta_X + 100, Delta_Y + 100), 400, Localization.Translate("option_graphics_render_distance"), Me.RenderDistance, 0, 4, AddressOf ChangeRenderDistance, d)) Dim d1 As New Dictionary(Of Integer, String) - d1.Add(0, Localization.GetString("global_off")) - Me.ControlList.Add(New ScrollBar(New Vector2(Delta_X + 100, Delta_Y + 160), 400, Localization.GetString("option_graphics_offset_map_quality"), Me.LoadOffsetMaps, 0, 100, AddressOf ChangeOffsetMaps, d1)) + d1.Add(0, Localization.Translate("global_off")) + Me.ControlList.Add(New ScrollBar(New Vector2(Delta_X + 100, Delta_Y + 160), 400, Localization.Translate("option_graphics_offset_map_quality"), Me.LoadOffsetMaps, 0, 100, AddressOf ChangeOffsetMaps, d1)) - Me.ControlList.Add(New ToggleButton(New Vector2(Delta_X + 100, Delta_Y + 220), 3, 64, Localization.GetString("option_graphics"), CBool(Me.GraphicStyle), AddressOf ToggleGraphicsStyle, {Localization.GetString("option_graphics_fast"), Localization.GetString("option_graphics_fancy")}.ToList())) - Me.ControlList.Add(New ToggleButton(New Vector2(Delta_X + 100, Delta_Y + 300), 3, 64, Localization.GetString("option_graphics_multisampling"), Me.PreferMultiSampling, AddressOf ToggleMultiSampling, {Localization.GetString("global_off"), Localization.GetString("global_on")}.ToList())) + Me.ControlList.Add(New ToggleButton(New Vector2(Delta_X + 100, Delta_Y + 220), 3, 64, Localization.Translate("option_graphics"), CBool(Me.GraphicStyle), AddressOf ToggleGraphicsStyle, {Localization.Translate("option_graphics_fast"), Localization.Translate("option_graphics_fancy")}.ToList())) + Me.ControlList.Add(New ToggleButton(New Vector2(Delta_X + 100, Delta_Y + 300), 3, 64, Localization.Translate("option_graphics_multisampling"), Me.PreferMultiSampling, AddressOf ToggleMultiSampling, {Localization.Translate("global_off"), Localization.Translate("global_on")}.ToList())) - Me.ControlList.Add(New CommandButton(New Vector2(Delta_X + 530 + 24, Delta_Y + 327), 1, 48, Localization.GetString("global_back"), AddressOf SwitchToMain)) + Me.ControlList.Add(New CommandButton(New Vector2(Delta_X + 530 + 24, Delta_Y + 327), 1, 48, Localization.Translate("global_back"), AddressOf SwitchToMain)) Case 3 ' "Battle" from the Options menu. - Me.ControlList.Add(New ToggleButton(New Vector2(Delta_X + 100 + 20, Delta_Y + 100), 2, 64, Localization.GetString("option_battle_3d_models"), CBool(ShowModels), AddressOf ToggleShowModels, {Localization.GetString("global_off"), Localization.GetString("global_on")}.ToList())) - Me.ControlList.Add(New ToggleButton(New Vector2(Delta_X + 400 + 20, Delta_Y + 100), 2, 64, Localization.GetString("option_battle_animations"), CBool(Me.ShowBattleAnimations), AddressOf ToggleAnimations, {Localization.GetString("global_off"), Localization.GetString("global_on")}.ToList())) - Me.ControlList.Add(New ToggleButton(New Vector2(Delta_X + 100 + 20, Delta_Y + 200), 2, 64, Localization.GetString("option_battle_style"), CBool(Me.BattleStyle), AddressOf ToggleBattleStyle, {Localization.GetString("option_battle_style_shift"), Localization.GetString("option_battle_style_set")}.ToList())) + Me.ControlList.Add(New ToggleButton(New Vector2(Delta_X + 100 + 20, Delta_Y + 100), 2, 64, Localization.Translate("option_battle_3d_models"), CBool(ShowModels), AddressOf ToggleShowModels, {Localization.Translate("global_off"), Localization.Translate("global_on")}.ToList())) + Me.ControlList.Add(New ToggleButton(New Vector2(Delta_X + 400 + 20, Delta_Y + 100), 2, 64, Localization.Translate("option_battle_animations"), CBool(Me.ShowBattleAnimations), AddressOf ToggleAnimations, {Localization.Translate("global_off"), Localization.Translate("global_on")}.ToList())) + Me.ControlList.Add(New ToggleButton(New Vector2(Delta_X + 100 + 20, Delta_Y + 200), 2, 64, Localization.Translate("option_battle_style"), CBool(Me.BattleStyle), AddressOf ToggleBattleStyle, {Localization.Translate("option_battle_style_shift"), Localization.Translate("option_battle_style_set")}.ToList())) - Me.ControlList.Add(New CommandButton(New Vector2(Delta_X + 530 + 24, Delta_Y + 327), 1, 48, Localization.GetString("global_back"), AddressOf SwitchToMain)) + Me.ControlList.Add(New CommandButton(New Vector2(Delta_X + 530 + 24, Delta_Y + 327), 1, 48, Localization.Translate("global_back"), AddressOf SwitchToMain)) Case 4 ' "Controls" from the Options menu. Dim d As New Dictionary(Of Integer, String) - d.Add(1, Localization.GetString("option_controls_mouse_speed_slow")) - d.Add(12, Localization.GetString("option_controls_mouse_speed_standard")) - d.Add(38, Localization.GetString("option_controls_mouse_speed_fast")) - d.Add(50, Localization.GetString("option_controls_mouse_speed_super_fast")) - Me.ControlList.Add(New ScrollBar(New Vector2(Delta_X + 100, Delta_Y + 60), 400, Localization.GetString("option_controls_mouse_speed"), Me.MouseSpeed, 1, 50, AddressOf ChangeMouseSpeed, d)) - Me.ControlList.Add(New CommandButton(New Vector2(Delta_X + 100, Delta_Y + 200), 3, 64, Localization.GetString("option_controls_reset_key_bindings"), AddressOf ResetKeyBindings)) - Me.ControlList.Add(New ToggleButton(New Vector2(Delta_X + 100, Delta_Y + 120), 5, 64, Localization.GetString("option_controls_xbox_controler"), Me.GamePadEnabled, AddressOf ToggleXBOX360Controller, {Localization.GetString("global_disabled"), Localization.GetString("global_enabled")}.ToList())) + d.Add(1, Localization.Translate("option_controls_mouse_speed_slow")) + d.Add(12, Localization.Translate("option_controls_mouse_speed_standard")) + d.Add(38, Localization.Translate("option_controls_mouse_speed_fast")) + d.Add(50, Localization.Translate("option_controls_mouse_speed_super_fast")) + Me.ControlList.Add(New ScrollBar(New Vector2(Delta_X + 100, Delta_Y + 60), 400, Localization.Translate("option_controls_mouse_speed"), Me.MouseSpeed, 1, 50, AddressOf ChangeMouseSpeed, d)) + Me.ControlList.Add(New CommandButton(New Vector2(Delta_X + 100, Delta_Y + 200), 3, 64, Localization.Translate("option_controls_reset_key_bindings"), AddressOf ResetKeyBindings)) + Me.ControlList.Add(New ToggleButton(New Vector2(Delta_X + 100, Delta_Y + 120), 5, 64, Localization.Translate("option_controls_xbox_controler"), Me.GamePadEnabled, AddressOf ToggleXBOX360Controller, {Localization.Translate("global_disabled"), Localization.Translate("global_enabled")}.ToList())) - Me.ControlList.Add(New CommandButton(New Vector2(Delta_X + 530 + 24, Delta_Y + 327), 1, 48, Localization.GetString("global_back"), AddressOf SwitchToMain)) + Me.ControlList.Add(New CommandButton(New Vector2(Delta_X + 530 + 24, Delta_Y + 327), 1, 48, Localization.Translate("global_back"), AddressOf SwitchToMain)) Case 5 ' "Audio" from the Options menu. - Me.ControlList.Add(New ScrollBar(New Vector2(Delta_X + 100, Delta_Y + 60), 400, Localization.GetString("option_audio_music_volume"), Me.Music, 0, 100, AddressOf ChangeMusicVolume)) - Me.ControlList.Add(New ScrollBar(New Vector2(Delta_X + 100, Delta_Y + 120), 400, Localization.GetString("option_audio_sound_volume"), Me.Sound, 0, 100, AddressOf ChangeSoundVolume)) - Me.ControlList.Add(New ToggleButton(New Vector2(Delta_X + 100, Delta_Y + 200), 1, 64, Localization.GetString("option_audio_muted"), CBool(Me.Muted), AddressOf ToggleMute, {Localization.GetString("global_no"), Localization.GetString("global_yes")}.ToList())) + Me.ControlList.Add(New ScrollBar(New Vector2(Delta_X + 100, Delta_Y + 60), 400, Localization.Translate("option_audio_music_volume"), Me.Music, 0, 100, AddressOf ChangeMusicVolume)) + Me.ControlList.Add(New ScrollBar(New Vector2(Delta_X + 100, Delta_Y + 120), 400, Localization.Translate("option_audio_sound_volume"), Me.Sound, 0, 100, AddressOf ChangeSoundVolume)) + Me.ControlList.Add(New ToggleButton(New Vector2(Delta_X + 100, Delta_Y + 200), 1, 64, Localization.Translate("option_audio_muted"), CBool(Me.Muted), AddressOf ToggleMute, {Localization.Translate("global_no"), Localization.Translate("global_yes")}.ToList())) - Me.ControlList.Add(New CommandButton(New Vector2(Delta_X + 530 + 24, Delta_Y + 327), 1, 48, Localization.GetString("global_back"), AddressOf SwitchToMain)) + Me.ControlList.Add(New CommandButton(New Vector2(Delta_X + 530 + 24, Delta_Y + 327), 1, 48, Localization.Translate("global_back"), AddressOf SwitchToMain)) Case 6 ' "Advanced" from the Options menu. - Me.ControlList.Add(New CommandButton(New Vector2(Delta_X + 100, Delta_Y + 100), 3, 64, Localization.GetString("option_reset"), AddressOf Reset)) - Me.ControlList.Add(New CommandButton(New Vector2(Delta_X + 530 + 24, Delta_Y + 327), 1, 48, Localization.GetString("global_back"), AddressOf SwitchToMain)) + Me.ControlList.Add(New CommandButton(New Vector2(Delta_X + 100, Delta_Y + 100), 3, 64, Localization.Translate("option_reset"), AddressOf Reset)) + Me.ControlList.Add(New CommandButton(New Vector2(Delta_X + 530 + 24, Delta_Y + 327), 1, 48, Localization.Translate("global_back"), AddressOf SwitchToMain)) End Select diff --git a/P3D/Screens/NewTrainerScreen.vb b/P3D/Screens/NewTrainerScreen.vb index 303b9bf17..80d8329e4 100644 --- a/P3D/Screens/NewTrainerScreen.vb +++ b/P3D/Screens/NewTrainerScreen.vb @@ -112,13 +112,13 @@ DrawLevelProgress() End If - _textBatch.DrawString(FontManager.MainFont, Localization.GetString("trainer_card_title"), New Vector2(260, 100), Color.Black, 0F, Vector2.Zero, 1.5F, SpriteEffects.None, 0F) + _textBatch.DrawString(FontManager.MainFont, Localization.Translate("trainer_card_title"), New Vector2(260, 100), Color.Black, 0F, Vector2.Zero, 1.5F, SpriteEffects.None, 0F) - _textBatch.DrawString(FontManager.MainFont, Localization.GetString("global_name") & ": ", New Vector2(270, 160), Color.Black, 0F, Vector2.Zero, 1.0F, SpriteEffects.None, 0F) - _textBatch.DrawString(FontManager.MainFont, Localization.GetString("global_money") & ": ", New Vector2(270, 190), Color.Black, 0F, Vector2.Zero, 1.0F, SpriteEffects.None, 0F) + _textBatch.DrawString(FontManager.MainFont, Localization.Translate("global_name") & ": ", New Vector2(270, 160), Color.Black, 0F, Vector2.Zero, 1.0F, SpriteEffects.None, 0F) + _textBatch.DrawString(FontManager.MainFont, Localization.Translate("global_money") & ": ", New Vector2(270, 190), Color.Black, 0F, Vector2.Zero, 1.0F, SpriteEffects.None, 0F) _textBatch.DrawString(FontManager.MainFont, "OT: ", New Vector2(270, 220), Color.Black, 0F, Vector2.Zero, 1.0F, SpriteEffects.None, 0F) - _textBatch.DrawString(FontManager.MainFont, Localization.GetString("global_play_time") & ": ", New Vector2(270, 250), Color.Black, 0F, Vector2.Zero, 1.0F, SpriteEffects.None, 0F) - _textBatch.DrawString(FontManager.MainFont, Localization.GetString("global_points") & ": ", New Vector2(270, 280), Color.Black, 0F, Vector2.Zero, 1.0F, SpriteEffects.None, 0F) + _textBatch.DrawString(FontManager.MainFont, Localization.Translate("global_play_time") & ": ", New Vector2(270, 250), Color.Black, 0F, Vector2.Zero, 1.0F, SpriteEffects.None, 0F) + _textBatch.DrawString(FontManager.MainFont, Localization.Translate("global_points") & ": ", New Vector2(270, 280), Color.Black, 0F, Vector2.Zero, 1.0F, SpriteEffects.None, 0F) _textBatch.DrawString(FontManager.MiniFont, Core.Player.Name, New Vector2(390, 165), New Color(80, 80, 80), 0F, Vector2.Zero, 1.0F, SpriteEffects.None, 0F) @@ -157,7 +157,7 @@ End Sub Private Sub DrawBadges() - _textBatch.DrawString(FontManager.MiniFont, Localization.GetString("trainer_card_collected_badges") & ": " & Core.Player.Badges.Count, New Vector2(50, 360), Color.Black) + _textBatch.DrawString(FontManager.MiniFont, Localization.Translate("trainer_card_collected_badges") & ": " & Core.Player.Badges.Count, New Vector2(50, 360), Color.Black) Dim selectedRegion As String = Badge.GetRegion(_badgeRegionIndex) Dim badgesCount As Integer = Badge.GetBadgesCount(selectedRegion) @@ -167,7 +167,7 @@ Dim badgeID As Integer = Badge.GetBadgeID(selectedRegion, i) Dim c As Color = Color.White - Dim t As String = Badge.GetBadgeName(badgeID) & " " & Localization.GetString("trainer_card_badge") + Dim t As String = Badge.GetBadgeName(badgeID) & " " & Localization.Translate("trainer_card_badge") Dim shake As Single = 0F If Badge.PlayerHasBadge(badgeID) = False Then c = Color.Black diff --git a/P3D/Screens/Pokedex/PokedexScreen.vb b/P3D/Screens/Pokedex/PokedexScreen.vb index 8eeb15e6e..ed7a5407d 100644 --- a/P3D/Screens/Pokedex/PokedexScreen.vb +++ b/P3D/Screens/Pokedex/PokedexScreen.vb @@ -63,7 +63,7 @@ Canvas.DrawGradient(New Rectangle(0, 0, CInt(Core.windowSize.Width), 200), New Color(42, 167, 198), New Color(42, 167, 198, 0), False, -1) Canvas.DrawGradient(New Rectangle(0, CInt(Core.windowSize.Height - 200), CInt(Core.windowSize.Width), 200), New Color(42, 167, 198, 0), New Color(42, 167, 198), False, -1) - Core.SpriteBatch.DrawString(FontManager.MainFont, Localization.GetString("pokedex_select"), New Vector2(100, 24), Color.White, 0.0F, Vector2.Zero, 2.0F, SpriteEffects.None, 0.0F) + Core.SpriteBatch.DrawString(FontManager.MainFont, Localization.Translate("pokedex_select"), New Vector2(100, 24), Color.White, 0.0F, Vector2.Zero, 2.0F, SpriteEffects.None, 0.0F) For i = 0 To Me.Profiles.Count If i = Me.Profiles.Count Then @@ -71,7 +71,7 @@ Core.SpriteBatch.Draw(Me.texture, New Rectangle(100 + 64, 100 + i * 96, 64 * 5, 64), New Rectangle(32, 16, 16, 16), Color.White) Core.SpriteBatch.Draw(Me.texture, New Rectangle(100 + 64 * 6, 100 + i * 96, 64, 64), New Rectangle(16, 16, 16, 16), Color.White, 0.0F, Vector2.Zero, SpriteEffects.FlipHorizontally, 0.0F) - Core.SpriteBatch.DrawString(FontManager.MainFont, Localization.GetString("pokedex_habitat"), New Vector2(120, 116 + i * 96), Color.Black, 0.0F, Vector2.Zero, 1.25F, SpriteEffects.None, 0.0F) + Core.SpriteBatch.DrawString(FontManager.MainFont, Localization.Translate("pokedex_habitat"), New Vector2(120, 116 + i * 96), Color.Black, 0.0F, Vector2.Zero, 1.25F, SpriteEffects.None, 0.0F) Else Dim p As Pokedex = Me.Profiles(i).Pokedex @@ -208,7 +208,7 @@ Public Class PokedexHabitatScreen Canvas.DrawGradient(New Rectangle(0, 0, CInt(Core.windowSize.Width), 200), New Color(42, 167, 198), New Color(42, 167, 198, 0), False, -1) Canvas.DrawGradient(New Rectangle(0, CInt(Core.windowSize.Height - 200), CInt(Core.windowSize.Width), 200), New Color(42, 167, 198, 0), New Color(42, 167, 198), False, -1) - Core.SpriteBatch.DrawString(FontManager.MainFont, Localization.GetString("pokedex_habitat_select"), New Vector2(100, 24), Color.White, 0.0F, Vector2.Zero, 2.0F, SpriteEffects.None, 0.0F) + Core.SpriteBatch.DrawString(FontManager.MainFont, Localization.Translate("pokedex_habitat_select"), New Vector2(100, 24), Color.White, 0.0F, Vector2.Zero, 2.0F, SpriteEffects.None, 0.0F) For i = Scroll To Scroll + 5 If i <= Me.HabitatList.Count - 1 Then @@ -219,7 +219,7 @@ Public Class PokedexHabitatScreen Core.SpriteBatch.Draw(Me.texture, New Rectangle(100 + 64 * 9, 100 + p * 96, 64, 64), New Rectangle(16, 16, 16, 16), Color.White, 0.0F, Vector2.Zero, SpriteEffects.FlipHorizontally, 0.0F) Core.SpriteBatch.Draw(HabitatList(i).Texture, New Rectangle(120, 108 + p * 96, 64, 48), Color.White) - Core.SpriteBatch.DrawString(FontManager.MainFont, Localization.GetString("places_" & HabitatList(i).Name), New Vector2(200, 116 + p * 96), Color.Black, 0.0F, Vector2.Zero, 1.25F, SpriteEffects.None, 0.0F) + Core.SpriteBatch.DrawString(FontManager.MainFont, Localization.Translate("places_" & HabitatList(i).Name), New Vector2(200, 116 + p * 96), Color.Black, 0.0F, Vector2.Zero, 1.25F, SpriteEffects.None, 0.0F) Dim t As String = HabitatList(i).PokemonCaught.ToString() & "/" & HabitatList(i).PokemonList.Count Core.SpriteBatch.DrawString(FontManager.MainFont, t, New Vector2(680 - CSng((FontManager.MainFont.MeasureString(t).X * 1.25F) / 2.0F), 116 + p * 96), Color.Black, 0.0F, Vector2.Zero, 1.25F, SpriteEffects.None, 0.0F) @@ -506,12 +506,12 @@ Public Class PokedexScreen If CHabitat Is Nothing Then Core.SpriteBatch.DrawString(FontManager.MainFont, Profile.Pokedex.Name, New Vector2(60, 55), Color.White, 0.0F, Vector2.Zero, 1.5F, SpriteEffects.None, 0.0F) - Core.SpriteBatch.DrawString(FontManager.MainFont, Localization.GetString("pokedex_seen") & ": " & Environment.NewLine & Environment.NewLine & Localization.GetString("pokedex_obtained") & ": ", New Vector2(420, 45), Color.White) + Core.SpriteBatch.DrawString(FontManager.MainFont, Localization.Translate("pokedex_seen") & ": " & Environment.NewLine & Environment.NewLine & Localization.Translate("pokedex_obtained") & ": ", New Vector2(420, 45), Color.White) Core.SpriteBatch.DrawString(FontManager.MainFont, Profile.Seen + Profile.Obtained & Environment.NewLine & Environment.NewLine & Profile.Obtained, New Vector2(540, 45), Color.Black) Else - Core.SpriteBatch.DrawString(FontManager.MainFont, Localization.GetString("places_" & CHabitat.Name), New Vector2(60, 80), Color.White, 0.0F, Vector2.Zero, 1.5F, SpriteEffects.None, 0.0F) + Core.SpriteBatch.DrawString(FontManager.MainFont, Localization.Translate("places_" & CHabitat.Name), New Vector2(60, 80), Color.White, 0.0F, Vector2.Zero, 1.5F, SpriteEffects.None, 0.0F) Core.SpriteBatch.Draw(CHabitat.Texture, New Rectangle(60, 32, 64, 48), Color.White) - Core.SpriteBatch.DrawString(FontManager.MainFont, Localization.GetString("pokedex_available") & ": " & Environment.NewLine & Environment.NewLine & Localization.GetString("pokedex_obtained") & ": ", New Vector2(420, 45), Color.White) + Core.SpriteBatch.DrawString(FontManager.MainFont, Localization.Translate("pokedex_available") & ": " & Environment.NewLine & Environment.NewLine & Localization.Translate("pokedex_obtained") & ": ", New Vector2(420, 45), Color.White) Core.SpriteBatch.DrawString(FontManager.MainFont, CHabitat.PokemonList.Count & Environment.NewLine & Environment.NewLine & CHabitat.PokemonCaught, New Vector2(560, 45), Color.Black) Dim progressTexture As Texture2D = Me.CHabitat.ProgressTexture @@ -573,20 +573,20 @@ Public Class PokedexScreen Canvas.DrawRectangle(New Rectangle(130, 300, 404, 90), New Color(42, 167, 198, 150)) Canvas.DrawGradient(New Rectangle(534, 300, 80, 90), New Color(42, 167, 198, 150), New Color(84, 198, 216), True, -1) - Core.SpriteBatch.DrawString(FontManager.MainFont, Localization.GetString("pokedex_search_no_result"), New Vector2(50 + CInt(564 / 2) - CInt(FontManager.MainFont.MeasureString(Localization.GetString("pokedex_search_no_result")).X / 2), 330), Color.White) + Core.SpriteBatch.DrawString(FontManager.MainFont, Localization.Translate("pokedex_search_no_result"), New Vector2(50 + CInt(564 / 2) - CInt(FontManager.MainFont.MeasureString(Localization.Translate("pokedex_search_no_result")).X / 2), 330), Color.White) End If Canvas.DrawRectangle(New Rectangle(670, 30, 400, 90), New Color(42, 167, 198, 150)) - Dim orderText As String = Localization.GetString("pokedex_order_numeric") + Dim orderText As String = Localization.Translate("pokedex_order_numeric") Select Case Me.Order Case OrderType.Alphabetically - orderText = Localization.GetString("pokedex_order_a_z") + orderText = Localization.Translate("pokedex_order_a_z") Case OrderType.Height - orderText = Localization.GetString("pokedex_height") + orderText = Localization.Translate("pokedex_height") Case OrderType.Weigth - orderText = Localization.GetString("pokedex_weight") + orderText = Localization.Translate("pokedex_weight") End Select - Dim filterText As String = Localization.GetString("pokedex_filter_none") + Dim filterText As String = Localization.Translate("pokedex_filter_none") If Filters.Count > 0 Then filterText = "" For Each f As Filter In Me.Filters @@ -595,15 +595,15 @@ Public Class PokedexScreen End If Select Case f.FilterType Case FilterType.Name - filterText &= Localization.GetString("global_name") + filterText &= Localization.Translate("global_name") Case FilterType.Type1 - filterText &= Localization.GetString("pokedex_filter_type_1") + filterText &= Localization.Translate("pokedex_filter_type_1") Case FilterType.Type2 - filterText &= Localization.GetString("pokedex_filter_type_2") + filterText &= Localization.Translate("pokedex_filter_type_2") End Select Next End If - Core.SpriteBatch.DrawString(FontManager.MainFont, Localization.GetString("global_order") & ":" & Environment.NewLine & Localization.GetString("global_filter") & ":" & Environment.NewLine & Localization.GetString("pokedex_search_description"), New Vector2(685, 45), Color.White) + Core.SpriteBatch.DrawString(FontManager.MainFont, Localization.Translate("global_order") & ":" & Environment.NewLine & Localization.Translate("global_filter") & ":" & Environment.NewLine & Localization.Translate("pokedex_search_description"), New Vector2(685, 45), Color.White) Core.SpriteBatch.DrawString(FontManager.MainFont, orderText & Environment.NewLine & filterText, New Vector2(820, 45), Color.Black) If menu.Visible = True Then @@ -645,15 +645,15 @@ Public Class PokedexScreen End While If entryType = 0 Then - Core.SpriteBatch.DrawString(FontManager.MainFont, "???" & Environment.NewLine & Environment.NewLine & Localization.GetString("pokedex_number_short") & " " & no, New Vector2(830, 200), Color.White) + Core.SpriteBatch.DrawString(FontManager.MainFont, "???" & Environment.NewLine & Environment.NewLine & Localization.Translate("pokedex_number_short") & " " & no, New Vector2(830, 200), Color.White) Else - Core.SpriteBatch.DrawString(FontManager.MainFont, p.GetName() & Environment.NewLine & Environment.NewLine & Localization.GetString("pokedex_number_short") & " " & no, New Vector2(830, 200), Color.White) + Core.SpriteBatch.DrawString(FontManager.MainFont, p.GetName() & Environment.NewLine & Environment.NewLine & Localization.Translate("pokedex_number_short") & " " & no, New Vector2(830, 200), Color.White) Core.SpriteBatch.Draw(p.GetTexture(True), New Rectangle(670, 140, 128, 128), Color.White) - Core.SpriteBatch.DrawString(FontManager.MainFont, Localization.GetString("pokedex_species").ToUpper(), New Vector2(680, 310), Color.Black) - Core.SpriteBatch.DrawString(FontManager.MainFont, Localization.GetString("pokedex_type").ToUpper(), New Vector2(680, 350), Color.Black) - Core.SpriteBatch.DrawString(FontManager.MainFont, Localization.GetString("pokedex_height").ToUpper(), New Vector2(680, 390), Color.Black) - Core.SpriteBatch.DrawString(FontManager.MainFont, Localization.GetString("pokedex_weight").ToUpper(), New Vector2(680, 430), Color.Black) + Core.SpriteBatch.DrawString(FontManager.MainFont, Localization.Translate("pokedex_species").ToUpper(), New Vector2(680, 310), Color.Black) + Core.SpriteBatch.DrawString(FontManager.MainFont, Localization.Translate("pokedex_type").ToUpper(), New Vector2(680, 350), Color.Black) + Core.SpriteBatch.DrawString(FontManager.MainFont, Localization.Translate("pokedex_height").ToUpper(), New Vector2(680, 390), Color.Black) + Core.SpriteBatch.DrawString(FontManager.MainFont, Localization.Translate("pokedex_weight").ToUpper(), New Vector2(680, 430), Color.Black) Canvas.DrawRectangle(New Rectangle(670, 480, 400, 152), New Color(42, 167, 198, 150)) @@ -778,7 +778,7 @@ Public Class PokedexScreen End If If KeyBoardHandler.KeyPressed(KeyBindings.SpecialKey) = True Or ControllerHandler.ButtonPressed(Buttons.Y) = True Then - Me.menu = New SelectMenu({Localization.GetString("global_order"), Localization.GetString("global_filter"), Localization.GetString("global_reset"), Localization.GetString("global_back")}.ToList(), 0, AddressOf SelectMenu1, 3) + Me.menu = New SelectMenu({Localization.Translate("global_order"), Localization.Translate("global_filter"), Localization.Translate("global_reset"), Localization.Translate("global_back")}.ToList(), 0, AddressOf SelectMenu1, 3) End If If Controls.Dismiss(True, True, True) = True Then @@ -831,11 +831,11 @@ Public Class PokedexScreen Private Sub SelectMenu1(ByVal s As SelectMenu) Select Case s.SelectedItem - Case Localization.GetString("global_order") - Me.menu = New SelectMenu({Localization.GetString("pokedex_type"), Localization.GetString("pokedex_reverse") & ": " & Localization.GetString("global_" & Me.ReverseOrder.ToString().ToLower()), Localization.GetString("global_back")}.ToList(), 0, AddressOf SelectMenuOrder, 2) - Case Localization.GetString("global_filter") - Me.menu = New SelectMenu({Localization.GetString("global_name"), Localization.GetString("pokedex_filter_type_1"), Localization.GetString("pokedex_filter_type_2"), Localization.GetString("global_clear"), Localization.GetString("global_back")}.ToList(), 0, AddressOf SelectMenuFilter, 4) - Case Localization.GetString("global_reset") + Case Localization.Translate("global_order") + Me.menu = New SelectMenu({Localization.Translate("pokedex_type"), Localization.Translate("pokedex_reverse") & ": " & Localization.Translate("global_" & Me.ReverseOrder.ToString().ToLower()), Localization.Translate("global_back")}.ToList(), 0, AddressOf SelectMenuOrder, 2) + Case Localization.Translate("global_filter") + Me.menu = New SelectMenu({Localization.Translate("global_name"), Localization.Translate("pokedex_filter_type_1"), Localization.Translate("pokedex_filter_type_2"), Localization.Translate("global_clear"), Localization.Translate("global_back")}.ToList(), 0, AddressOf SelectMenuFilter, 4) + Case Localization.Translate("global_reset") Me.Filters.Clear() Me.ReverseOrder = False Me.Order = OrderType.Numeric @@ -845,22 +845,22 @@ Public Class PokedexScreen Private Sub SelectMenuFilter(ByVal s As SelectMenu) Select Case s.SelectedItem - Case Localization.GetString("global_name") - Me.menu = New SelectMenu({"A", "B", "C", "D", "E", "F", "G", "H", "I", "J", "K", "L", "M", "N", "O", "P", "Q", "R", "S", "T", "U", "V", "W", "X", "Y", "Z", Localization.GetString("global_back")}.ToList(), 0, AddressOf SelectMenuNameFilter, -1) - Case Localization.GetString("pokedex_filter_type_1") - Me.menu = New SelectMenu({Localization.GetString("global_pokemon_type_normal"), Localization.GetString("global_pokemon_type_fire"), Localization.GetString("global_pokemon_type_fighting"), Localization.GetString("global_pokemon_type_water"), Localization.GetString("global_pokemon_type_flying"), Localization.GetString("global_pokemon_type_grass"), Localization.GetString("global_pokemon_type_poison"), Localization.GetString("global_pokemon_type_electric"), Localization.GetString("global_pokemon_type_ground"), Localization.GetString("global_pokemon_type_psychic"), Localization.GetString("global_pokemon_type_rock"), Localization.GetString("global_pokemon_type_ice"), Localization.GetString("global_pokemon_type_bug"), Localization.GetString("global_pokemon_type_dragon"), Localization.GetString("global_pokemon_type_ghost"), Localization.GetString("global_pokemon_type_dark"), Localization.GetString("global_pokemon_type_steel"), Localization.GetString("global_pokemon_type_fairy"), Localization.GetString("global_pokemon_type_blank"), Localization.GetString("global_back")}.ToList(), 0, AddressOf SelectMenuType1Filter, -1) - Case Localization.GetString("pokedex_filter_type_2") - Me.menu = New SelectMenu({Localization.GetString("global_pokemon_type_normal"), Localization.GetString("global_pokemon_type_fire"), Localization.GetString("global_pokemon_type_fighting"), Localization.GetString("global_pokemon_type_water"), Localization.GetString("global_pokemon_type_flying"), Localization.GetString("global_pokemon_type_grass"), Localization.GetString("global_pokemon_type_poison"), Localization.GetString("global_pokemon_type_electric"), Localization.GetString("global_pokemon_type_ground"), Localization.GetString("global_pokemon_type_psychic"), Localization.GetString("global_pokemon_type_rock"), Localization.GetString("global_pokemon_type_ice"), Localization.GetString("global_pokemon_type_bug"), Localization.GetString("global_pokemon_type_dragon"), Localization.GetString("global_pokemon_type_ghost"), Localization.GetString("global_pokemon_type_dark"), Localization.GetString("global_pokemon_type_steel"), Localization.GetString("global_pokemon_type_fairy"), Localization.GetString("global_pokemon_type_blank"), Localization.GetString("global_back")}.ToList(), 0, AddressOf SelectMenuType2Filter, -1) - Case Localization.GetString("global_clear") + Case Localization.Translate("global_name") + Me.menu = New SelectMenu({"A", "B", "C", "D", "E", "F", "G", "H", "I", "J", "K", "L", "M", "N", "O", "P", "Q", "R", "S", "T", "U", "V", "W", "X", "Y", "Z", Localization.Translate("global_back")}.ToList(), 0, AddressOf SelectMenuNameFilter, -1) + Case Localization.Translate("pokedex_filter_type_1") + Me.menu = New SelectMenu({Localization.Translate("global_pokemon_type_normal"), Localization.Translate("global_pokemon_type_fire"), Localization.Translate("global_pokemon_type_fighting"), Localization.Translate("global_pokemon_type_water"), Localization.Translate("global_pokemon_type_flying"), Localization.Translate("global_pokemon_type_grass"), Localization.Translate("global_pokemon_type_poison"), Localization.Translate("global_pokemon_type_electric"), Localization.Translate("global_pokemon_type_ground"), Localization.Translate("global_pokemon_type_psychic"), Localization.Translate("global_pokemon_type_rock"), Localization.Translate("global_pokemon_type_ice"), Localization.Translate("global_pokemon_type_bug"), Localization.Translate("global_pokemon_type_dragon"), Localization.Translate("global_pokemon_type_ghost"), Localization.Translate("global_pokemon_type_dark"), Localization.Translate("global_pokemon_type_steel"), Localization.Translate("global_pokemon_type_fairy"), Localization.Translate("global_pokemon_type_blank"), Localization.Translate("global_back")}.ToList(), 0, AddressOf SelectMenuType1Filter, -1) + Case Localization.Translate("pokedex_filter_type_2") + Me.menu = New SelectMenu({Localization.Translate("global_pokemon_type_normal"), Localization.Translate("global_pokemon_type_fire"), Localization.Translate("global_pokemon_type_fighting"), Localization.Translate("global_pokemon_type_water"), Localization.Translate("global_pokemon_type_flying"), Localization.Translate("global_pokemon_type_grass"), Localization.Translate("global_pokemon_type_poison"), Localization.Translate("global_pokemon_type_electric"), Localization.Translate("global_pokemon_type_ground"), Localization.Translate("global_pokemon_type_psychic"), Localization.Translate("global_pokemon_type_rock"), Localization.Translate("global_pokemon_type_ice"), Localization.Translate("global_pokemon_type_bug"), Localization.Translate("global_pokemon_type_dragon"), Localization.Translate("global_pokemon_type_ghost"), Localization.Translate("global_pokemon_type_dark"), Localization.Translate("global_pokemon_type_steel"), Localization.Translate("global_pokemon_type_fairy"), Localization.Translate("global_pokemon_type_blank"), Localization.Translate("global_back")}.ToList(), 0, AddressOf SelectMenuType2Filter, -1) + Case Localization.Translate("global_clear") Me.Filters.Clear() Me.SetList() - Case Localization.GetString("global_back") - Me.menu = New SelectMenu({Localization.GetString("global_order"), Localization.GetString("global_filter"), Localization.GetString("global_reset"), Localization.GetString("global_back")}.ToList(), 0, AddressOf SelectMenu1, 3) + Case Localization.Translate("global_back") + Me.menu = New SelectMenu({Localization.Translate("global_order"), Localization.Translate("global_filter"), Localization.Translate("global_reset"), Localization.Translate("global_back")}.ToList(), 0, AddressOf SelectMenu1, 3) End Select End Sub Private Sub SelectMenuType1Filter(ByVal s As SelectMenu) - If s.SelectedItem <> Localization.GetString("global_back") Then + If s.SelectedItem <> Localization.Translate("global_back") Then For i = 0 To Filters.Count - 1 If Filters(i).FilterType = FilterType.Type1 Then Filters.RemoveAt(i) @@ -871,12 +871,12 @@ Public Class PokedexScreen Filters.Add(New Filter With {.FilterType = FilterType.Type1, .FilterValue = s.SelectedItem}) SetList() Else - Me.menu = New SelectMenu({Localization.GetString("global_name"), Localization.GetString("pokedex_filter_type_1"), Localization.GetString("pokedex_filter_type_2"), Localization.GetString("global_clear"), Localization.GetString("global_back")}.ToList(), 0, AddressOf SelectMenuFilter, 4) + Me.menu = New SelectMenu({Localization.Translate("global_name"), Localization.Translate("pokedex_filter_type_1"), Localization.Translate("pokedex_filter_type_2"), Localization.Translate("global_clear"), Localization.Translate("global_back")}.ToList(), 0, AddressOf SelectMenuFilter, 4) End If End Sub Private Sub SelectMenuType2Filter(ByVal s As SelectMenu) - If s.SelectedItem <> Localization.GetString("global_back") Then + If s.SelectedItem <> Localization.Translate("global_back") Then For i = 0 To Filters.Count - 1 If Filters(i).FilterType = FilterType.Type2 Then Filters.RemoveAt(i) @@ -887,12 +887,12 @@ Public Class PokedexScreen Filters.Add(New Filter With {.FilterType = FilterType.Type2, .FilterValue = s.SelectedItem}) SetList() Else - Me.menu = New SelectMenu({Localization.GetString("global_name"), Localization.GetString("pokedex_filter_type_1"), Localization.GetString("pokedex_filter_type_2"), Localization.GetString("global_clear"), Localization.GetString("global_back")}.ToList(), 0, AddressOf SelectMenuFilter, 4) + Me.menu = New SelectMenu({Localization.Translate("global_name"), Localization.Translate("pokedex_filter_type_1"), Localization.Translate("pokedex_filter_type_2"), Localization.Translate("global_clear"), Localization.Translate("global_back")}.ToList(), 0, AddressOf SelectMenuFilter, 4) End If End Sub Private Sub SelectMenuNameFilter(ByVal s As SelectMenu) - If s.SelectedItem <> Localization.GetString("global_back") Then + If s.SelectedItem <> Localization.Translate("global_back") Then For i = 0 To Filters.Count - 1 If Filters(i).FilterType = FilterType.Name Then Filters.RemoveAt(i) @@ -903,39 +903,39 @@ Public Class PokedexScreen Filters.Add(New Filter With {.FilterType = FilterType.Name, .FilterValue = s.SelectedItem}) SetList() Else - Me.menu = New SelectMenu({Localization.GetString("global_name"), Localization.GetString("pokedex_filter_type_1"), Localization.GetString("pokedex_filter_type_2"), Localization.GetString("global_clear"), Localization.GetString("global_back")}.ToList(), 0, AddressOf SelectMenuFilter, 4) + Me.menu = New SelectMenu({Localization.Translate("global_name"), Localization.Translate("pokedex_filter_type_1"), Localization.Translate("pokedex_filter_type_2"), Localization.Translate("global_clear"), Localization.Translate("global_back")}.ToList(), 0, AddressOf SelectMenuFilter, 4) End If End Sub Private Sub SelectMenuOrder(ByVal s As SelectMenu) Select Case s.SelectedItem - Case Localization.GetString("pokedex_type") - Me.menu = New SelectMenu({Localization.GetString("pokedex_order_numeric"), Localization.GetString("pokedex_order_a_z"), Localization.GetString("pokedex_weight"), Localization.GetString("pokedex_height"), Localization.GetString("global_back")}.ToList(), 0, AddressOf SelectMenuOrderType, 4) - Case Localization.GetString("pokedex_reverse") & ": " & Localization.GetString("global_" & Me.ReverseOrder.ToString().ToLower()) + Case Localization.Translate("pokedex_type") + Me.menu = New SelectMenu({Localization.Translate("pokedex_order_numeric"), Localization.Translate("pokedex_order_a_z"), Localization.Translate("pokedex_weight"), Localization.Translate("pokedex_height"), Localization.Translate("global_back")}.ToList(), 0, AddressOf SelectMenuOrderType, 4) + Case Localization.Translate("pokedex_reverse") & ": " & Localization.Translate("global_" & Me.ReverseOrder.ToString().ToLower()) Me.ReverseOrder = Not Me.ReverseOrder - Me.menu = New SelectMenu({Localization.GetString("pokedex_type"), Localization.GetString("pokedex_reverse") & ": " & Localization.GetString("global_" & Me.ReverseOrder.ToString().ToLower()), Localization.GetString("global_back")}.ToList(), 0, AddressOf SelectMenuOrder, 2) + Me.menu = New SelectMenu({Localization.Translate("pokedex_type"), Localization.Translate("pokedex_reverse") & ": " & Localization.Translate("global_" & Me.ReverseOrder.ToString().ToLower()), Localization.Translate("global_back")}.ToList(), 0, AddressOf SelectMenuOrder, 2) Me.SetList() - Case Localization.GetString("global_back") - Me.menu = New SelectMenu({Localization.GetString("global_order"), Localization.GetString("global_filter"), Localization.GetString("global_reset"), Localization.GetString("global_back")}.ToList(), 0, AddressOf SelectMenu1, 3) + Case Localization.Translate("global_back") + Me.menu = New SelectMenu({Localization.Translate("global_order"), Localization.Translate("global_filter"), Localization.Translate("global_reset"), Localization.Translate("global_back")}.ToList(), 0, AddressOf SelectMenu1, 3) End Select End Sub Private Sub SelectMenuOrderType(ByVal s As SelectMenu) Select Case s.SelectedItem - Case Localization.GetString("pokedex_order_numeric") + Case Localization.Translate("pokedex_order_numeric") Me.Order = OrderType.Numeric Me.SetList() - Case Localization.GetString("pokedex_order_a_z") + Case Localization.Translate("pokedex_order_a_z") Me.Order = OrderType.Alphabetically Me.SetList() - Case Localization.GetString("pokedex_weight") + Case Localization.Translate("pokedex_weight") Me.Order = OrderType.Weigth Me.SetList() - Case Localization.GetString("pokedex_height") + Case Localization.Translate("pokedex_height") Me.Order = OrderType.Height Me.SetList() - Case Localization.GetString("global_back") - Me.menu = New SelectMenu({"Type", "Reverse: " & Me.ReverseOrder.ToString(), Localization.GetString("global_back")}.ToList(), 0, AddressOf SelectMenuOrder, 2) + Case Localization.Translate("global_back") + Me.menu = New SelectMenu({"Type", "Reverse: " & Me.ReverseOrder.ToString(), Localization.Translate("global_back")}.ToList(), 0, AddressOf SelectMenuOrder, 2) End Select End Sub diff --git a/P3D/Screens/Pokemon/PartyScreen.vb b/P3D/Screens/Pokemon/PartyScreen.vb index 8b979f18e..825d722f2 100644 --- a/P3D/Screens/Pokemon/PartyScreen.vb +++ b/P3D/Screens/Pokemon/PartyScreen.vb @@ -143,7 +143,7 @@ Public Class PartyScreen Me.New(currentScreen, Item, ChoosePokemon, Title, canExit, True, True) End Sub Public Sub New(ByVal currentScreen As Screen) - Me.New(currentScreen, New Items.Balls.Pokeball, Nothing, Localization.GetString("party_screen_title"), True, True, True, Nothing, False) + Me.New(currentScreen, New Items.Balls.Pokeball, Nothing, Localization.Translate("party_screen_title"), True, True, True, Nothing, False) End Sub Private Sub GetPokemonList() @@ -371,11 +371,11 @@ Public Class PartyScreen 'Able/unable display (when using TM/HM) Dim AttackLabel As String = "" If LearnType > 0 Then - AttackLabel = Localization.GetString("party_screen_unable").ToUpper() + AttackLabel = Localization.Translate("party_screen_unable").ToUpper() Select Case LearnType Case 1 ' Technical/Hidden Machine If CType(moveLearnArg, Items.TechMachine).CanTeach(p) = "" Then - AttackLabel = Localization.GetString("party_screen_able").ToUpper() + AttackLabel = Localization.Translate("party_screen_able").ToUpper() End If End Select End If @@ -509,7 +509,7 @@ Public Class PartyScreen If _switchIndex <> _index Then Dim p1 As Pokemon = PokemonList(_switchIndex) Dim p2 As Pokemon = PokemonList(_index) - SoundManager.PlaySound(Localization.GetString("global_select")) + SoundManager.PlaySound(Localization.Translate("global_select")) PokemonList(_switchIndex) = p2 PokemonList(_index) = p1 End If @@ -528,7 +528,7 @@ Public Class PartyScreen used = True ExitedSub(_index) End If - SoundManager.PlaySound(Localization.GetString("global_select")) + SoundManager.PlaySound(Localization.Translate("global_select")) _closing = True End If End If @@ -539,7 +539,7 @@ Public Class PartyScreen Private Sub CreateMainMenu() If Mode = ISelectionScreen.ScreenMode.Default Then - CreateNormalMenu(Localization.GetString("global_summary")) + CreateNormalMenu(Localization.Translate("global_summary")) ElseIf Mode = ISelectionScreen.ScreenMode.Selection Then CreateSelectionMenu() End If @@ -547,16 +547,16 @@ Public Class PartyScreen Private Sub CreateSelectionMenu() Dim items As New List(Of String) - items.Add(Localization.GetString("global_select")) - items.Add(Localization.GetString("global_summary")) - items.Add(Localization.GetString("global_back")) + items.Add(Localization.Translate("global_select")) + items.Add(Localization.Translate("global_summary")) + items.Add(Localization.Translate("global_back")) _menu = New UI.SelectMenu(items, 0, AddressOf SelectSelectionMenuItem, items.Count - 1) End Sub Private Sub SelectSelectionMenuItem(ByVal selectMenu As UI.SelectMenu) Select Case selectMenu.SelectedItem - Case Localization.GetString("global_select") + Case Localization.Translate("global_select") 'When a Pokémon got selected in Selection Mode, raise the selected event and close the screen. If CanChoosePokemon(Me.PokemonList(_index)) = True Then Selected = _index @@ -564,9 +564,9 @@ Public Class PartyScreen GetPokemonList() _closing = True Else - TextBox.Show(Localization.GetString("party_screen_cannot_choose")) + TextBox.Show(Localization.Translate("party_screen_cannot_choose")) End If - Case Localization.GetString("global_summary") + Case Localization.Translate("global_summary") SetScreen(New SummaryScreen(Me, PokemonList.ToArray(), _index)) End Select End Sub @@ -602,7 +602,7 @@ Public Class PartyScreen Dim p As Pokemon = PokemonList(_index) Dim items As New List(Of String) - items.Add(Localization.GetString("global_summary")) + items.Add(Localization.Translate("global_summary")) If p.IsEgg() = False Then If CanUseMove(p, "Fly", Badge.HMMoves.Fly) Or @@ -612,17 +612,17 @@ Public Class PartyScreen CanUseMove(p, "Teleport", -1) Or CanUseMove(p, "Dig", -1) Then - items.Add(Localization.GetString("party_screen_field_move")) + items.Add(Localization.Translate("party_screen_field_move")) End If End If - items.Add(Localization.GetString("global_switch")) + items.Add(Localization.Translate("global_switch")) If p.IsEgg() = False Then - items.Add(Localization.GetString("global_item")) + items.Add(Localization.Translate("global_item")) End If - items.Add(Localization.GetString("global_back")) + items.Add(Localization.Translate("global_back")) _menu = New UI.SelectMenu(items, items.IndexOf(selectedItem), AddressOf SelectedMainMenuItem, items.Count - 1) End Sub @@ -632,25 +632,25 @@ Public Class PartyScreen Dim items As New List(Of String) If CanUseMove(p, "Fly", Badge.HMMoves.Fly) Then - items.Add(Localization.GetString("global_pokemon_move_fly")) + items.Add(Localization.Translate("global_pokemon_move_fly")) End If If CanUseMove(p, "Ride", Badge.HMMoves.Ride) Then - items.Add(Localization.GetString("global_pokemon_move_ride")) + items.Add(Localization.Translate("global_pokemon_move_ride")) End If If CanUseMove(p, "Flash", Badge.HMMoves.Flash) Then - items.Add(Localization.GetString("global_pokemon_move_flash")) + items.Add(Localization.Translate("global_pokemon_move_flash")) End If If CanUseMove(p, "Cut", Badge.HMMoves.Cut) Then - items.Add(Localization.GetString("global_pokemon_move_cut")) + items.Add(Localization.Translate("global_pokemon_move_cut")) End If If CanUseMove(p, "Teleport", -1) Then - items.Add(Localization.GetString("global_pokemon_move_teleport")) + items.Add(Localization.Translate("global_pokemon_move_teleport")) End If If CanUseMove(p, "Dig", -1) Then - items.Add(Localization.GetString("global_pokemon_move_dig")) + items.Add(Localization.Translate("global_pokemon_move_dig")) End If - items.Add(Localization.GetString("global_back")) + items.Add(Localization.Translate("global_back")) _menu = New UI.SelectMenu(items, 0, AddressOf SelectedFieldMoveMenuItem, items.Count - 1) End Sub @@ -660,11 +660,11 @@ Public Class PartyScreen Dim items As New List(Of String) - items.Add(Localization.GetString("global_give")) + items.Add(Localization.Translate("global_give")) If p.Item IsNot Nothing Then - items.Add(Localization.GetString("global_take")) + items.Add(Localization.Translate("global_take")) End If - items.Add(Localization.GetString("global_back")) + items.Add(Localization.Translate("global_back")) _menu = New UI.SelectMenu(items, 0, AddressOf SelectedItemMenuItem, items.Count - 1) End Sub @@ -695,40 +695,40 @@ Public Class PartyScreen Private Sub SelectedMainMenuItem(ByVal selectMenu As UI.SelectMenu) Select Case selectMenu.SelectedItem - Case Localization.GetString("global_summary") + Case Localization.Translate("global_summary") SetScreen(New SummaryScreen(Me, PokemonList.ToArray(), _index)) - Case Localization.GetString("party_screen_field_move") + Case Localization.Translate("party_screen_field_move") CreateFieldMoveMenu() - Case Localization.GetString("global_switch") + Case Localization.Translate("global_switch") _switchIndex = _index _isSwitching = True - Case Localization.GetString("global_item") + Case Localization.Translate("global_item") CreateItemMenu() End Select End Sub Private Sub SelectedFieldMoveMenuItem(ByVal selectMenu As UI.SelectMenu) Select Case selectMenu.SelectedItem - Case Localization.GetString("global_pokemon_move_fly") + Case Localization.Translate("global_pokemon_move_fly") UseFly() - Case Localization.GetString("global_pokemon_move_ride") + Case Localization.Translate("global_pokemon_move_ride") UseRide() - Case Localization.GetString("global_pokemon_move_flash") + Case Localization.Translate("global_pokemon_move_flash") UseFlash() - Case Localization.GetString("global_pokemon_move_cut") + Case Localization.Translate("global_pokemon_move_cut") UseCut() - Case Localization.GetString("global_pokemon_move_teleport") + Case Localization.Translate("global_pokemon_move_teleport") UseTeleport() - Case Localization.GetString("global_pokemon_move_dig") + Case Localization.Translate("global_pokemon_move_dig") UseDig() - Case Localization.GetString("global_back") - CreateNormalMenu(Localization.GetString("party_screen_field_move")) + Case Localization.Translate("global_back") + CreateNormalMenu(Localization.Translate("party_screen_field_move")) End Select End Sub Private Sub SelectedItemMenuItem(ByVal selectMenu As UI.SelectMenu) Select Case selectMenu.SelectedItem - Case Localization.GetString("global_give") + Case Localization.Translate("global_give") Dim selScreen As New NewInventoryScreen(Core.CurrentScreen) selScreen.Mode = Screens.UI.ISelectionScreen.ScreenMode.Selection @@ -737,23 +737,23 @@ Public Class PartyScreen AddHandler selScreen.SelectedObject, AddressOf GiveItemHandler Core.SetScreen(selScreen) - Case Localization.GetString("global_take") + Case Localization.Translate("global_take") Dim p As Pokemon = PokemonList(_index) If p.Item.IsMail And p.Item.AdditionalData <> "" Then - ShowMessage(Localization.GetString("party_screen_mail_taken")) + ShowMessage(Localization.Translate("party_screen_mail_taken")) Core.Player.Mails.Add(Items.MailItem.GetMailDataFromString(p.Item.AdditionalData)) p.Item = Nothing Else - ShowMessage(Localization.GetString("party_screen_take_item_1") & " " & p.Item.Name & " " & Localization.GetString("party_screen_take_item_2") & " " & p.GetDisplayName() & ".") + ShowMessage(Localization.Translate("party_screen_take_item_1") & " " & p.Item.Name & " " & Localization.Translate("party_screen_take_item_2") & " " & p.GetDisplayName() & ".") Core.Player.Inventory.AddItem(p.Item.ID, 1) p.Item = Nothing End If - Case Localization.GetString("global_back") - CreateNormalMenu(Localization.GetString("global_item")) + Case Localization.Translate("global_back") + CreateNormalMenu(Localization.Translate("global_item")) End Select End Sub @@ -779,21 +779,21 @@ Public Class PartyScreen If reItem.IsMail And reItem.AdditionalData <> "" Then Core.Player.Mails.Add(Items.MailItem.GetMailDataFromString(reItem.AdditionalData)) - message = Localization.GetString("party_screen_give_item_mail_1") & " " & i.Name & " " & Localization.GetString("party_screen_give_item_mail_2") & " " & p.GetDisplayName() & " " & Localization.GetString("party_screen_give_item_mail_3") & "." + message = Localization.Translate("party_screen_give_item_mail_1") & " " & i.Name & " " & Localization.Translate("party_screen_give_item_mail_2") & " " & p.GetDisplayName() & " " & Localization.Translate("party_screen_give_item_mail_3") & "." Else Core.Player.Inventory.AddItem(reItem.ID, 1) - message = Localization.GetString("party_screen_switched_item_1") & " " & p.GetDisplayName() & "'s " & i.Name & " " & Localization.GetString("party_screen_switched_item_2") & " " & reItem.Name & "." + message = Localization.Translate("party_screen_switched_item_1") & " " & p.GetDisplayName() & "'s " & i.Name & " " & Localization.Translate("party_screen_switched_item_2") & " " & reItem.Name & "." End If Else - message = Localization.GetString("party_screen_give_item_1") & " " & p.GetDisplayName() & " " & Localization.GetString("party_screen_give_item_2") & " " & i.Name & "." + message = Localization.Translate("party_screen_give_item_1") & " " & p.GetDisplayName() & " " & Localization.Translate("party_screen_give_item_2") & " " & i.Name & "." End If p.Item = i ShowMessage(message) Else - ShowMessage(i.Name & " " & Localization.GetString("party_screen_cannot_give") & ".") + ShowMessage(i.Name & " " & Localization.Translate("party_screen_cannot_give") & ".") End If End Sub @@ -903,18 +903,18 @@ Public Class PartyScreen End If If Screen.Level.IsDark = True Then Dim s As String = "version=2" & Environment.NewLine & - "@text.show(" & PokemonList(_index).GetDisplayName() & " " & Localization.GetString("global_used").ToLower() & " " & Localization.GetString("global_pokemon_move_flash") & "!)" & Environment.NewLine & + "@text.show(" & PokemonList(_index).GetDisplayName() & " " & Localization.Translate("global_used").ToLower() & " " & Localization.Translate("global_pokemon_move_flash") & "!)" & Environment.NewLine & "@environment.toggledarkness" & Environment.NewLine & "@sound.play(Battle\Effects\effect_thunderbolt)" & Environment.NewLine & - "@text.show(" & Localization.GetString("party_screen_flash_lit") & "!)" & Environment.NewLine & + "@text.show(" & Localization.Translate("party_screen_flash_lit") & "!)" & Environment.NewLine & ":end" PlayerStatistics.Track("Flash used", 1) CType(Core.CurrentScreen, OverworldScreen).ActionScript.StartScript(s, 2) Else Dim s As String = "version=2" & Environment.NewLine & - "@text.show(" & PokemonList(_index).GetDisplayName() & " " & Localization.GetString("global_used").ToLower() & " " & Localization.GetString("global_pokemon_move_flash") & "!)" & Environment.NewLine & + "@text.show(" & PokemonList(_index).GetDisplayName() & " " & Localization.Translate("global_used").ToLower() & " " & Localization.Translate("global_pokemon_move_flash") & "!)" & Environment.NewLine & "@sound.play(Battle\Effects\effect_thunderbolt)" & Environment.NewLine & - "@text.show(" & Localization.GetString("party_screen_flash_already_lit") & "!)" & Environment.NewLine & + "@text.show(" & Localization.Translate("party_screen_flash_already_lit") & "!)" & Environment.NewLine & ":end" CType(Core.CurrentScreen, OverworldScreen).ActionScript.StartScript(s, 2) End If @@ -936,7 +936,7 @@ Public Class PartyScreen Core.SetScreen(New TransitionScreen(Core.CurrentScreen, New MapScreen(Core.CurrentScreen, startRegion, {"Fly", PokemonList(_index)}), Color.White, False)) End If Else - TextBox.Show(Localization.GetString("party_screen_cannot_fly") & "!", {}, True, False) + TextBox.Show(Localization.Translate("party_screen_cannot_fly") & "!", {}, True, False) End If End Sub @@ -950,13 +950,13 @@ Public Class PartyScreen End If PlayerStatistics.Track("Cut used", 1) - TextBox.Show(PokemonList(_index).GetDisplayName() & "~" & Localization.GetString("global_used").ToLower() & " " & Localization.GetString("global_pokemon_move_cut") & "!", {}, True, False) + TextBox.Show(PokemonList(_index).GetDisplayName() & "~" & Localization.Translate("global_used").ToLower() & " " & Localization.Translate("global_pokemon_move_cut") & "!", {}, True, False) PokemonList(_index).PlayCry() For Each e As Entity In grassEntities Screen.Level.Entities.Remove(e) Next Else - TextBox.Show(Localization.GetString("party_screen_cannot_cut") & "!", {}, True, False) + TextBox.Show(Localization.Translate("party_screen_cannot_cut") & "!", {}, True, False) End If End Sub @@ -998,14 +998,14 @@ Public Class PartyScreen SoundManager.PlayPokemonCry(PokemonList(_index).Number) - TextBox.Show(PokemonList(_index).GetDisplayName() & "~" & Localization.GetString("global_used").ToLower() & " " & Localization.GetString("global_pokemon_move_ride") & "!", {}, True, False) + TextBox.Show(PokemonList(_index).GetDisplayName() & "~" & Localization.Translate("global_used").ToLower() & " " & Localization.Translate("global_pokemon_move_ride") & "!", {}, True, False) PlayerStatistics.Track("Ride used", 1) If Screen.Level.IsRadioOn = False OrElse GameJolt.PokegearScreen.StationCanPlay(Screen.Level.SelectedRadioStation) = False Then MusicManager.Play("ride", True) End If Else - TextBox.Show(Localization.GetString("party_screen_cannot_ride") & "!", {}, True, False) + TextBox.Show(Localization.Translate("party_screen_cannot_ride") & "!", {}, True, False) End If End If End Sub @@ -1021,7 +1021,7 @@ Public Class PartyScreen Dim setToFirstPerson As Boolean = Not CType(Screen.Camera, OverworldCamera).ThirdPerson Dim s As String = "version=2 - @text.show(" & PokemonList(_index).GetDisplayName() & "~" & Localization.GetString("global_used").ToLower() & " " & Localization.GetString("global_pokemon_move_dig") & "!) + @text.show(" & PokemonList(_index).GetDisplayName() & "~" & Localization.Translate("global_used").ToLower() & " " & Localization.Translate("global_pokemon_move_dig") & "!) @level.wait(20) @camera.activatethirdperson @camera.reset @@ -1049,7 +1049,7 @@ Public Class PartyScreen PlayerStatistics.Track("Dig used", 1) CType(Core.CurrentScreen, OverworldScreen).ActionScript.StartScript(s, 2) Else - TextBox.Show(Localization.GetString("party_screen_cannot_dig") & "!", {}, True, False) + TextBox.Show(Localization.Translate("party_screen_cannot_dig") & "!", {}, True, False) End If End Sub @@ -1066,7 +1066,7 @@ Public Class PartyScreen Dim yFinish As String = (Screen.Camera.Position.Y + 2.9F).ToString().ReplaceDecSeparator() Dim s As String = "version=2 - @text.show(" & PokemonList(_index).GetDisplayName() & "~" & Localization.GetString("global_used").ToLower() & " " & Localization.GetString("global_pokemon_move_teleport") & "!) + @text.show(" & PokemonList(_index).GetDisplayName() & "~" & Localization.Translate("global_used").ToLower() & " " & Localization.Translate("global_pokemon_move_teleport") & "!) @level.wait(20) @camera.activatethirdperson @camera.reset @@ -1094,7 +1094,7 @@ Public Class PartyScreen PlayerStatistics.Track("Teleport used", 1) CType(Core.CurrentScreen, OverworldScreen).ActionScript.StartScript(s, 2) Else - TextBox.Show(Localization.GetString("party_screen_cannot_teleport") & "!", {}, True, False) + TextBox.Show(Localization.Translate("party_screen_cannot_teleport") & "!", {}, True, False) End If End Sub diff --git a/P3D/Screens/Pokemon/TeachMovesScreen.vb b/P3D/Screens/Pokemon/TeachMovesScreen.vb index d9e33d1c2..97f975c20 100644 --- a/P3D/Screens/Pokemon/TeachMovesScreen.vb +++ b/P3D/Screens/Pokemon/TeachMovesScreen.vb @@ -168,7 +168,7 @@ c = Color.IndianRed End If - .DrawString(FontManager.MiniFont, Localization.GetString("PP") & " " & A.CurrentPP & " / " & A.MaxPP, New Vector2(p.X + 130, CInt(p.Y + 58)), c) + .DrawString(FontManager.MiniFont, Localization.Translate("PP") & " " & A.CurrentPP & " / " & A.MaxPP, New Vector2(p.X + 130, CInt(p.Y + 58)), c) .Draw(TextureManager.GetTexture("GUI\Menus\Types", A.Type.GetElementImage(), ""), New Rectangle(CInt(p.X), CInt(p.Y + 54), 48, 16), Color.White) End With diff --git a/P3D/Screens/SaveScreen.vb b/P3D/Screens/SaveScreen.vb index b538e873e..44ba5a6e3 100644 --- a/P3D/Screens/SaveScreen.vb +++ b/P3D/Screens/SaveScreen.vb @@ -25,7 +25,7 @@ Me.mainTexture = TextureManager.GetTexture("GUI\Menus\Menu") Me.menuTexture = TextureManager.GetTexture("GUI\Menus\SaveBook") - ChooseBox.Show({Localization.GetString("global_yes"), Localization.GetString("global_no")}, 0, {}) + ChooseBox.Show({Localization.Translate("global_yes"), Localization.Translate("global_no")}, 0, {}) SaveGameHelpers.ResetSaveCounter() End Sub @@ -46,7 +46,7 @@ .Draw(menuTexture, New Rectangle(Delta_X, Delta_Y, 700, 440), Color.White) If saveSessionFailed = True Then - .DrawString(FontManager.InGameFont, Localization.GetString("save_saving_failed"), New Vector2(Delta_X + 90, Delta_Y + 50), Color.Red) + .DrawString(FontManager.InGameFont, Localization.Translate("save_saving_failed"), New Vector2(Delta_X + 90, Delta_Y + 50), Color.Red) If Core.GameOptions.Extras.Contains("Backup Save Feature") Then .DrawString(FontManager.MiniFont, @@ -84,9 +84,9 @@ Dim text As String = String.Empty If ControllerHandler.IsConnected() Then - text = Localization.GetString("save_press_continue_1") & " " & Localization.GetString("save_press_continue_2") + text = Localization.Translate("save_press_continue_1") & " " & Localization.Translate("save_press_continue_2") Else - text = Localization.GetString("save_press_continue_1") & " " & KeyBindings.BackKey1.ToString() & " " & Localization.GetString("save_press_continue_2") + text = Localization.Translate("save_press_continue_1") & " " & KeyBindings.BackKey1.ToString() & " " & Localization.Translate("save_press_continue_2") End If Dim textSize As Vector2 = FontManager.GameJoltFont.MeasureString(text) @@ -94,22 +94,22 @@ GetFontRenderer().DrawString(FontManager.MiniFont, text, New Vector2(Delta_X + 610 - textSize.X / 2.0F, Delta_Y + 350 - textSize.Y / 2.0F), Color.DarkBlue) If ControllerHandler.IsConnected() Then - SpriteBatch.Draw(TextureManager.GetTexture("GUI\GamePad\xboxControllerButtonB"), New Rectangle(CInt(Delta_X + 610 - textSize.X / 2 + FontManager.MiniFont.MeasureString(Localization.GetString("save_press_continue_1") & " ").X), CInt(Delta_Y + 350 - textSize.Y / 2), 20, 20), Color.White) + SpriteBatch.Draw(TextureManager.GetTexture("GUI\GamePad\xboxControllerButtonB"), New Rectangle(CInt(Delta_X + 610 - textSize.X / 2 + FontManager.MiniFont.MeasureString(Localization.Translate("save_press_continue_1") & " ").X), CInt(Delta_Y + 350 - textSize.Y / 2), 20, 20), Color.White) End If Else If ready = True Then - .DrawString(FontManager.InGameFont, Localization.GetString("save_saved_game"), New Vector2(Delta_X + 90, Delta_Y + 50), Color.DarkBlue) + .DrawString(FontManager.InGameFont, Localization.Translate("save_saved_game"), New Vector2(Delta_X + 90, Delta_Y + 50), Color.DarkBlue) Else If SaveGameHelpers.GameJoltSaveDone() = False And savingStarted = True Then If SaveGameHelpers.StartedDownloadCheck = True Then - .DrawString(FontManager.InGameFont, Localization.GetString("save_validating") & LoadingDots.Dots, New Vector2(Delta_X + 90, Delta_Y + 50), Color.Black) + .DrawString(FontManager.InGameFont, Localization.Translate("save_validating") & LoadingDots.Dots, New Vector2(Delta_X + 90, Delta_Y + 50), Color.Black) Else - .DrawString(FontManager.InGameFont, Localization.GetString("save_saving") & LoadingDots.Dots, New Vector2(Delta_X + 77, Delta_Y + 50), Color.Black) + .DrawString(FontManager.InGameFont, Localization.Translate("save_saving") & LoadingDots.Dots, New Vector2(Delta_X + 77, Delta_Y + 50), Color.Black) End If Else - .DrawString(FontManager.InGameFont, Localization.GetString("save_title_1"), New Vector2(Delta_X + 90, Delta_Y + 50), Color.Black) - .DrawString(FontManager.InGameFont, Localization.GetString("save_title_2"), New Vector2(Delta_X + 90, Delta_Y + 80), Color.Black) + .DrawString(FontManager.InGameFont, Localization.Translate("save_title_1"), New Vector2(Delta_X + 90, Delta_Y + 50), Color.Black) + .DrawString(FontManager.InGameFont, Localization.Translate("save_title_2"), New Vector2(Delta_X + 90, Delta_Y + 80), Color.Black) End If End If @@ -123,7 +123,7 @@ End If Next - .DrawString(FontManager.MiniFont, Localization.GetString("global_player_name") & ": " & Core.Player.Name & Environment.NewLine & Environment.NewLine & Localization.GetString("global_badges") & ": " & Core.Player.Badges.Count.ToString() & Environment.NewLine & Environment.NewLine & Localization.GetString("global_money") & ": " & Core.Player.Money & Environment.NewLine & Environment.NewLine & Localization.GetString("global_play_time") & ": " & TimeHelpers.GetDisplayTime(TimeHelpers.GetCurrentPlayTime(), True), New Vector2(Delta_X + 400, Delta_Y + 215), Color.DarkBlue) + .DrawString(FontManager.MiniFont, Localization.Translate("global_player_name") & ": " & Core.Player.Name & Environment.NewLine & Environment.NewLine & Localization.Translate("global_badges") & ": " & Core.Player.Badges.Count.ToString() & Environment.NewLine & Environment.NewLine & Localization.Translate("global_money") & ": " & Core.Player.Money & Environment.NewLine & Environment.NewLine & Localization.Translate("global_play_time") & ": " & TimeHelpers.GetDisplayTime(TimeHelpers.GetCurrentPlayTime(), True), New Vector2(Delta_X + 400, Delta_Y + 215), Color.DarkBlue) End If End With Screen.ChooseBox.Draw(New Vector2(Delta_X + 115, Delta_Y + 155), False, 1.5F)