From 12115e7d5111fe8d0d85467239f2a54978bd4306 Mon Sep 17 00:00:00 2001 From: JappaWakka Date: Thu, 22 May 2025 19:34:55 +0200 Subject: [PATCH] Map Screen fixes, Translatability + Fly dialogue --- P3D/Content/Localization/Tokens_de.dat | 5 ++++ P3D/Content/Localization/Tokens_en.dat | 5 ++++ P3D/Content/Localization/Tokens_es.dat | 5 ++++ P3D/Content/Localization/Tokens_fr.dat | 5 ++++ P3D/Content/Localization/Tokens_nl.dat | 5 ++++ P3D/Content/Localization/Tokens_pl.dat | 5 ++++ P3D/Content/Localization/Tokens_ptbr.dat | 5 ++++ P3D/Screens/MapScreen.vb | 32 ++++++++++++------------ P3D/Screens/Pokemon/PartyScreen.vb | 2 +- 9 files changed, 52 insertions(+), 17 deletions(-) diff --git a/P3D/Content/Localization/Tokens_de.dat b/P3D/Content/Localization/Tokens_de.dat index 85c5f3347..95f63bd8a 100644 --- a/P3D/Content/Localization/Tokens_de.dat +++ b/P3D/Content/Localization/Tokens_de.dat @@ -187,6 +187,9 @@ fieldmove_dig_used,used~Dig! fieldmove_teleport_CannotUse,Cannot use Teleport here. fieldmove_teleport_used,used~Teleport! + +fieldmove_fly_CannotUse,You cannot Fly~from here! +fieldmove_fly_used,used~Fly! --- GameInteractions: game_interaction_interact,Untersuchen @@ -399,6 +402,8 @@ map_screen_cities,Städte map_screen_routes,Routen map_screen_places,Orte map_screen_roaming,Wanderpokemon +map_screen_PokemonAtPlace,[NAME] at [PLACE] +map_screen_RegionSwitchHint,(Press the Shift Key/Shoulder Triggers to switch between regions.) --- Trainer Card Screen: trainer_screen_title,Trainerpass diff --git a/P3D/Content/Localization/Tokens_en.dat b/P3D/Content/Localization/Tokens_en.dat index f89198009..6e9828d86 100644 --- a/P3D/Content/Localization/Tokens_en.dat +++ b/P3D/Content/Localization/Tokens_en.dat @@ -188,6 +188,9 @@ fieldmove_dig_used,used~Dig! fieldmove_teleport_CannotUse,Cannot use Teleport here. fieldmove_teleport_used,used~Teleport! + +fieldmove_fly_CannotUse,You cannot Fly~from here! +fieldmove_fly_used,used~Fly! --- GameInteractions: game_interaction_interact,Interact @@ -399,6 +402,8 @@ map_screen_cities,Cities map_screen_routes,Routes map_screen_places,Places map_screen_roaming,Roaming Pokes +map_screen_PokemonAtPlace,[NAME] at [PLACE] +map_screen_RegionSwitchHint,(Press the Shift Key/Shoulder Triggers to switch between regions.) --- Trainer Card Screen: trainer_screen_title,Trainer Card diff --git a/P3D/Content/Localization/Tokens_es.dat b/P3D/Content/Localization/Tokens_es.dat index e6ef168c8..57f6ac2de 100644 --- a/P3D/Content/Localization/Tokens_es.dat +++ b/P3D/Content/Localization/Tokens_es.dat @@ -188,6 +188,9 @@ fieldmove_dig_used,used~Dig! fieldmove_teleport_CannotUse,Cannot use Teleport here. fieldmove_teleport_used,used~Teleport! + +fieldmove_fly_CannotUse,You cannot Fly~from here! +fieldmove_fly_used,used~Fly! --- GameInteractions: game_interaction_interact,Interactuar @@ -400,6 +403,8 @@ map_screen_cities,Ciudades map_screen_routes,Rutas map_screen_places,Lugares map_screen_roaming,Pokémons errantes +map_screen_PokemonAtPlace,[NAME] at [PLACE] +map_screen_RegionSwitchHint,(Press the Shift Key/Shoulder Triggers to switch between regions.) --- Trainer Card Screen: diff --git a/P3D/Content/Localization/Tokens_fr.dat b/P3D/Content/Localization/Tokens_fr.dat index 117baca4e..57657aa71 100644 --- a/P3D/Content/Localization/Tokens_fr.dat +++ b/P3D/Content/Localization/Tokens_fr.dat @@ -186,6 +186,9 @@ fieldmove_dig_used,used~Dig! fieldmove_teleport_CannotUse,Cannot use Teleport here. fieldmove_teleport_used,used~Teleport! + +fieldmove_fly_CannotUse,You cannot Fly~from here! +fieldmove_fly_used,used~Fly! --- GameInteractions: game_interaction_interact,Interact @@ -397,6 +400,8 @@ map_screen_cities,Ville map_screen_routes,Routes map_screen_places,Places map_screen_roaming,Roaming Pokes +map_screen_PokemonAtPlace,[NAME] at [PLACE] +map_screen_RegionSwitchHint,(Press the Shift Key/Shoulder Triggers to switch between regions.) --- Trainer Card Screen: trainer_screen_title,Trainer Card diff --git a/P3D/Content/Localization/Tokens_nl.dat b/P3D/Content/Localization/Tokens_nl.dat index 828651399..bb676556f 100644 --- a/P3D/Content/Localization/Tokens_nl.dat +++ b/P3D/Content/Localization/Tokens_nl.dat @@ -187,6 +187,9 @@ fieldmove_dig_used,gebruikte~Graaf! fieldmove_teleport_CannotUse,Kan hier niet Teleporteer~gebruiken. fieldmove_teleport_used,gebruikte~Teleporteer! + +fieldmove_fly_CannotUse,Je kunt niet Vliegen~vanaf hier! +fieldmove_fly_used,gebruikte~Vlieg! --- GameInteractions: game_interaction_interact,Actie @@ -387,6 +390,8 @@ map_screen_cities,Steden map_screen_routes,Routes map_screen_places,Plaatsen map_screen_roaming,Dwalende Pokémon +map_screen_PokemonAtPlace,[NAME] bij [PLACE] +map_screen_RegionSwitchHint,(Druk op de Shift-toets/Schouderknoppen om tussen regio's te schakelen.) --- Trainer Card Screen: trainer_screen_title,Trainerkaart diff --git a/P3D/Content/Localization/Tokens_pl.dat b/P3D/Content/Localization/Tokens_pl.dat index a6c8e6f6c..020aa05ce 100644 --- a/P3D/Content/Localization/Tokens_pl.dat +++ b/P3D/Content/Localization/Tokens_pl.dat @@ -188,6 +188,9 @@ fieldmove_dig_used,used~Dig! fieldmove_teleport_CannotUse,Cannot use Teleport here. fieldmove_teleport_used,used~Teleport! + +fieldmove_fly_CannotUse,You cannot Fly~from here! +fieldmove_fly_used,used~Fly! --- GameInteractions: game_interaction_interact,Interact @@ -399,6 +402,8 @@ map_screen_cities,Cities map_screen_routes,Routes map_screen_places,Places map_screen_roaming,Roaming Pokes +map_screen_PokemonAtPlace,[NAME] at [PLACE] +map_screen_RegionSwitchHint,(Press the Shift Key/Shoulder Triggers to switch between regions.) --- Trainer Card Screen: trainer_screen_title,Trainer Card diff --git a/P3D/Content/Localization/Tokens_ptbr.dat b/P3D/Content/Localization/Tokens_ptbr.dat index 60b1ed1ba..236ff65bb 100644 --- a/P3D/Content/Localization/Tokens_ptbr.dat +++ b/P3D/Content/Localization/Tokens_ptbr.dat @@ -186,6 +186,9 @@ fieldmove_dig_used,usou~Dig! fieldmove_teleport_CannotUse,Não dá para usar Teleport aqui. fieldmove_teleport_used,usou~Teleport! + +fieldmove_fly_CannotUse,You cannot Fly~from here! +fieldmove_fly_used,used~Fly! --- GameInteractions: game_interaction_interact,Interagir @@ -398,6 +401,8 @@ map_screen_cities,Cidades map_screen_routes,Rotas map_screen_places,Lugares map_screen_roaming,Pokémons na área +map_screen_PokemonAtPlace,[NAME] at [PLACE] +map_screen_RegionSwitchHint,(Press the Shift Key/Shoulder Triggers to switch between regions.) --- Trainer Card Screen: trainer_screen_title,Cartão do Treinador diff --git a/P3D/Screens/MapScreen.vb b/P3D/Screens/MapScreen.vb index c3923e1c3..5fbbf3d77 100644 --- a/P3D/Screens/MapScreen.vb +++ b/P3D/Screens/MapScreen.vb @@ -533,7 +533,7 @@ Private Sub UpdateSwitch() For i = 0 To 3 - Dim r As New Rectangle(Core.windowSize.Width - 208, 100 + i * 30, 90, 30) + Dim r As New Rectangle(Core.windowSize.Width - 240, 100 + i * 30, 240, 30) If Controls.Accept(True, True, True) = True Then If r.Contains(New Point(CInt(MouseHandler.MousePosition.X), CInt(MouseHandler.MousePosition.Y))) = True Then Me.drawObjects(i) = Not Me.drawObjects(i) @@ -688,7 +688,7 @@ End If If Me.hoverText <> "" And Me.pokehoverText <> "" Then - Dim hoverString As String = Localization.GetString("pokemon_name_" & Me.pokehoverText) & " at " & Localization.GetString("Places_" & Me.hoverText) + Dim hoverString As String = Localization.GetString("map_screen_PokemonAtPlace", "[NAME] at [PLACE]").Replace("[NAME]", Localization.GetString("pokemon_name_" & Me.pokehoverText)).Replace("[PLACE]", Localization.GetString("Places_" & Me.hoverText)) Core.SpriteBatch.DrawRectangle(New Rectangle(CInt(Me.CursorPosition.X + 32 - 2), CInt(Me.CursorPosition.Y - 32 + 2), CInt(FontManager.MainFont.MeasureString(hoverString).X + 2 + 4), CInt(FontManager.MainFont.MeasureString(hoverString).Y)), New Color(0, 0, 0, 0.6F)) Core.SpriteBatch.DrawString(FontManager.MainFont, hoverString, New Vector2(CInt(Me.CursorPosition.X + 32 + 2), CInt(Me.CursorPosition.Y - 32 + 2)), Color.Black) Core.SpriteBatch.DrawString(FontManager.MainFont, hoverString, New Vector2(CInt(Me.CursorPosition.X + 32), CInt(Me.CursorPosition.Y - 32)), Color.White) @@ -701,7 +701,7 @@ Dim regionString As String = Localization.GetString(Me.currentRegion(0).ToString().ToUpper() & Me.currentRegion.Remove(0, 1)) If Me.regions.Count > 1 Then - regionString &= " (Press the Shift Key/Shoulder Triggers to switch between regions.)" + regionString &= " " & Localization.GetString("map_screen_RegionSwitchHint", "(Press the Shift Key/Shoulder Triggers to switch between regions.)") End If Core.SpriteBatch.DrawString(FontManager.InGameFont, regionString, New Vector2(MapScreen.mapOffsetX + 2, MapScreen.mapOffsetY - 31), Color.Black) @@ -717,33 +717,33 @@ If drawObjects(0) = False Then r = New Rectangle(116, 0, 12, 12) End If - Core.SpriteBatch.Draw(Me.objectsTexture, New Rectangle(Core.windowSize.Width - 240, 100, 24, 24), r, New Color(255, 255, 255, 220)) - Core.SpriteBatch.DrawString(FontManager.MainFont, Localization.GetString("map_screen_cities"), New Vector2(Core.windowSize.Width - 192 + 2, 100 + 2), Color.Black) - Core.SpriteBatch.DrawString(FontManager.MainFont, Localization.GetString("map_screen_cities"), New Vector2(Core.windowSize.Width - 192, 100), Color.White) + Core.SpriteBatch.Draw(Me.objectsTexture, New Rectangle(Core.windowSize.Width - 256 - 48, 100, 24, 24), r, New Color(255, 255, 255, 220)) + Core.SpriteBatch.DrawString(FontManager.MainFont, Localization.GetString("map_screen_cities"), New Vector2(Core.windowSize.Width - 256 + 2, 100 + 2), Color.Black) + Core.SpriteBatch.DrawString(FontManager.MainFont, Localization.GetString("map_screen_cities"), New Vector2(Core.windowSize.Width - 256, 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 - 240, 130, 24, 24), r, New Color(255, 255, 255, 220)) - Core.SpriteBatch.DrawString(FontManager.MainFont, Localization.GetString("map_screen_routes"), New Vector2(Core.windowSize.Width - 192 + 2, 130 + 2), Color.Black) - Core.SpriteBatch.DrawString(FontManager.MainFont, Localization.GetString("map_screen_routes"), New Vector2(Core.windowSize.Width - 192, 130), Color.White) + Core.SpriteBatch.Draw(Me.objectsTexture, New Rectangle(Core.windowSize.Width - 256 - 48, 130, 24, 24), r, New Color(255, 255, 255, 220)) + Core.SpriteBatch.DrawString(FontManager.MainFont, Localization.GetString("map_screen_routes"), New Vector2(Core.windowSize.Width - 256 + 2, 130 + 2), Color.Black) + Core.SpriteBatch.DrawString(FontManager.MainFont, Localization.GetString("map_screen_routes"), New Vector2(Core.windowSize.Width - 256, 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 - 240, 160, 24, 24), r, New Color(255, 255, 255, 220)) - Core.SpriteBatch.DrawString(FontManager.MainFont, Localization.GetString("map_screen_places"), New Vector2(Core.windowSize.Width - 192 + 2, 160 + 2), Color.Black) - Core.SpriteBatch.DrawString(FontManager.MainFont, Localization.GetString("map_screen_places"), New Vector2(Core.windowSize.Width - 192, 160), Color.White) + Core.SpriteBatch.Draw(Me.objectsTexture, New Rectangle(Core.windowSize.Width - 256 - 48, 160, 24, 24), r, New Color(255, 255, 255, 220)) + Core.SpriteBatch.DrawString(FontManager.MainFont, Localization.GetString("map_screen_places"), New Vector2(Core.windowSize.Width - 256 + 2, 160 + 2), Color.Black) + Core.SpriteBatch.DrawString(FontManager.MainFont, Localization.GetString("map_screen_places"), New Vector2(Core.windowSize.Width - 256, 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 - 240, 187, 28, 28), r, New Color(255, 255, 255, 220)) - Core.SpriteBatch.DrawString(FontManager.MainFont, Localization.GetString("map_screen_roaming"), New Vector2(Core.windowSize.Width - 192 + 2, 190 + 2), Color.Black) - Core.SpriteBatch.DrawString(FontManager.MainFont, Localization.GetString("map_screen_roaming"), New Vector2(Core.windowSize.Width - 192, 190), Color.White) + Core.SpriteBatch.Draw(Me.objectsTexture, New Rectangle(Core.windowSize.Width - 256 - 48, 187, 28, 28), r, New Color(255, 255, 255, 220)) + Core.SpriteBatch.DrawString(FontManager.MainFont, Localization.GetString("map_screen_roaming"), New Vector2(Core.windowSize.Width - 256 + 2, 190 + 2), Color.Black) + Core.SpriteBatch.DrawString(FontManager.MainFont, Localization.GetString("map_screen_roaming"), New Vector2(Core.windowSize.Width - 256, 190), Color.White) End Sub Private Sub DrawCursor() @@ -775,7 +775,7 @@ End If Dim s As String = "version=2" & Environment.NewLine & - "@text.show(" & p.GetDisplayName() & " used~Fly.)" & Environment.NewLine + "@text.show(" & p.GetDisplayName() & " " & Localization.GetString("fieldmove_fly_used", "used~Fly!") & ")" & Environment.NewLine If CType(Screen.Camera, OverworldCamera).ThirdPerson = False Then s &= "@camera.activateThirdPerson" & Environment.NewLine diff --git a/P3D/Screens/Pokemon/PartyScreen.vb b/P3D/Screens/Pokemon/PartyScreen.vb index c5262f031..2a433fdd3 100644 --- a/P3D/Screens/Pokemon/PartyScreen.vb +++ b/P3D/Screens/Pokemon/PartyScreen.vb @@ -1014,7 +1014,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("You cannot Fly~from here!", {}, True, False) + TextBox.Show(Localization.GetString("fieldmove_fly_CannotUse", "You cannot Fly~from here!"), {}, True, False) End If End Sub