From cee683452eb2416489c90a08a7fb133014381232 Mon Sep 17 00:00:00 2001 From: JappaWakka Date: Sun, 16 Feb 2025 10:51:54 +0100 Subject: [PATCH] =?UTF-8?q?Pok=C3=A9mon=20Properties=20translatable?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * Summary Screen * Catch Method & Location * Ability Names & Descriptions --- P3D/Battle/BattleSystemV2/BattleMenu.vb | 6 +- P3D/Content/Localization/Tokens_de.dat | 58 +++++++++++++----- P3D/Content/Localization/Tokens_en.dat | 59 ++++++++++++++----- P3D/Content/Localization/Tokens_fr.dat | 58 +++++++++++++----- P3D/Content/Localization/Tokens_nl.dat | 58 +++++++++++++----- P3D/Content/Localization/Tokens_ptbr.dat | 58 +++++++++++++----- P3D/Network/GameJolt/GTS/GTSInboxScreen.vb | 2 +- P3D/Network/GameJolt/GTS/GTSSearchScreen.vb | 2 +- P3D/Network/GameJolt/GTS/GTSSetupScreen.vb | 2 +- P3D/Network/GameJolt/GTS/WonderTradeScreen.vb | 2 +- P3D/Pokemon/Attacks/Normal/Entrainment.vb | 2 +- P3D/Pokemon/Attacks/Psychic/RolePlay.vb | 2 +- P3D/Screens/Battle/BattleCatchScreen.vb | 2 +- P3D/Screens/Pokemon/Daycare.vb | 2 +- P3D/Screens/Pokemon/EvolutionScreen.vb | 4 +- P3D/Screens/Pokemon/PartyScreen.vb | 2 +- P3D/Screens/Pokemon/SummaryScreen.vb | 58 +++++++++--------- P3D/World/ActionScript/V1/ScriptV1.vb | 4 +- .../V2/ScriptCommands/DoPokemon.vb | 4 +- 19 files changed, 268 insertions(+), 117 deletions(-) diff --git a/P3D/Battle/BattleSystemV2/BattleMenu.vb b/P3D/Battle/BattleSystemV2/BattleMenu.vb index 4a4f11356..f687d25f4 100644 --- a/P3D/Battle/BattleSystemV2/BattleMenu.vb +++ b/P3D/Battle/BattleSystemV2/BattleMenu.vb @@ -111,7 +111,7 @@ Core.SpriteBatch.Draw(TextureManager.GetTexture("GUI\Battle\Interface"), New Rectangle(CInt(pos.X) + 14, CInt(pos.Y) + 14, 182, 42), New Rectangle(0, 0, 91, 21), shinyHue) 'Name: - Dim nameInformation As String = p.GetDisplayName() & " Lv. " & p.Level.ToString() + Dim nameInformation As String = p.GetDisplayName() & " " & Localization.GetString("property_Lv.", "Lv.") & " " & p.Level.ToString() Core.SpriteBatch.DrawString(FontManager.MainFont, nameInformation, New Vector2(pos.X + 2, pos.Y + 2), New Color(0, 0, 0, _moveMenuAlpha)) Core.SpriteBatch.DrawString(FontManager.MainFont, nameInformation, New Vector2(pos.X, pos.Y), shinyHue) @@ -168,7 +168,7 @@ Core.SpriteBatch.Draw(TextureManager.GetTexture("GUI\Battle\Interface"), New Rectangle(CInt(pos.X) + 14, CInt(pos.Y) + 14, 182, 32), New Rectangle(0, 21, 91, 16), shinyHue) 'Name: - Dim nameInformation As String = p.GetDisplayName() & " Lv. " & p.Level.ToString() + Dim nameInformation As String = p.GetDisplayName() & " " & Localization.GetString("property_Lv.", "Lv.") & " " & p.Level.ToString() Core.SpriteBatch.DrawString(FontManager.MainFont, nameInformation, New Vector2(pos.X + 2, pos.Y + 2), New Color(0, 0, 0, _moveMenuAlpha)) Core.SpriteBatch.DrawString(FontManager.MainFont, nameInformation, New Vector2(pos.X, pos.Y), shinyHue) @@ -843,7 +843,7 @@ End If If Trapped = True Then - Screen.TextBox.Show(Localization.GetString("battle_cannot_run_ability", "Failed to run away because of~") & op.Ability.Name & ".", {}, True, False) + Screen.TextBox.Show(Localization.GetString("battle_cannot_run_ability", "Failed to run away because of~") & Localization.GetString("ability_name_" & op.Ability.ID.ToString, op.Ability.Name) & ".", {}, True, False) Else BattleScreen.BattleQuery.Clear() BattleScreen.BattleQuery.Add(BattleScreen.FocusBattle()) diff --git a/P3D/Content/Localization/Tokens_de.dat b/P3D/Content/Localization/Tokens_de.dat index d40ba07cd..c4e488222 100644 --- a/P3D/Content/Localization/Tokens_de.dat +++ b/P3D/Content/Localization/Tokens_de.dat @@ -20,6 +20,7 @@ global_save,Speichern global_apply,Anwenden global_close,Schließen global_back,Zurück +global_quit,Quit global_on,Ein global_off,Aus global_enabled,Aktiviert @@ -77,20 +78,49 @@ global_pokemon_move_teleport,Teleport global_pokemon_move_dig,Schaufler global_used,Benutzt --- -General: -HP,KP -PP,AP -Lv.,Lv. -No.,Nr. -Level,Level -MaxHP,Max KP -Attack,Angriff -Defense,Verteidigung -Special_Attack,Spezial Angr. -Sp_Attack,Sp. Angr. -Special_Defense,Spezial Vert. -Sp_Defense,Sp. Vert. -Speed,Initiative +Pokémon & Attack Properties: +property_HP,KP +property_PP,AP +property_Lv.,Lv. +property_No.,Nr. +property_Level,Level +property_MaxHP,Max KP +property_Attack,Angriff +property_Defense,Verteidigung +property_Special_Attack,Spezial Angr. +property_Sp_Attack,Sp. Angr. +property_Special_Defense,Spezial Vert. +property_Sp_Defense,Sp. Vert. +property_Speed,Initiative +property_Ability,Ability +property_Type,Type +property_Nature,Nature +property_DexNo.,Dex No. +property_IDNo.,ID No. +property_CatchMethod,Catch Method +property_ExpPoints,Exp. Points +property_Category,Category +property_Power,Power +property_Accuracy,Accuracy +--- +Summary Screen: + +summary_hint_ViewMoves,View Moves: [] / Down +summary_hint_ViewInfo,View Info: [] / Up +summary_EVsIVs,EVs / IVs +summary_ExpToNextLv,To Next Lv. +summary_TheEggWatch,The Egg Watch +summary_EggHatch_LongTime,It looks like this Egg will take a long time to hatch. +summary_EggHatch_MediumTime,It's getting warmer and moves a little. It will hatch soon. +summary_EggHatch_ShortTime,There is strong movement noticeable. It will hatch soon! +--- +Catch Method & Location: + +CatchMethod_Empty,Somehow obtained at +CatchMethod_Caught,Caught at +CatchMethod_Obtained,Obtained at + +CatchLocation_Empty,an unknown place --- Keyboard Keys: diff --git a/P3D/Content/Localization/Tokens_en.dat b/P3D/Content/Localization/Tokens_en.dat index fbfb0f237..6b49b0938 100644 --- a/P3D/Content/Localization/Tokens_en.dat +++ b/P3D/Content/Localization/Tokens_en.dat @@ -20,6 +20,7 @@ global_save,Save global_apply,Apply global_close,Close global_back,Back +global_quit,Quit global_on,On global_off,Off global_enabled,Enabled @@ -76,21 +77,51 @@ global_pokemon_move_cut,Cut global_pokemon_move_teleport,Teleport global_pokemon_move_dig,Dig global_used,Used +global_none,None --- -General: -HP,HP -PP,PP -Lv.,Lv. -No.,No. -Level,Level -MaxHP,Max HP -Attack,Attack -Defense,Defense -Special_Attack,Special Attack -Sp_Attack,Sp. Attack -Special_Defense,Special Defense -Sp_Defense,Sp. Defense -Speed,Speed +Pokémon & Attack Properties: +property_HP,HP +property_PP,PP +property_No.,No. +property_Lv.,Lv. +property_Level,Level +property_MaxHP,Max HP +property_Attack,Attack +property_Defense,Defense +property_Special_Attack,Special Attack +property_Sp_Attack,Sp. Attack +property_Special_Defense,Special Defense +property_Sp_Defense,Sp. Defense +property_Speed,Speed +property_Ability,Ability +property_Type,Type +property_Nature,Nature +property_DexNo.,Dex No. +property_IDNo.,ID No. +property_CatchMethod,Catch Method +property_ExpPoints,Exp. Points +property_Category,Category +property_Power,Power +property_Accuracy,Accuracy +--- +Summary Screen: + +summary_hint_ViewMoves,View Moves: [] / Down +summary_hint_ViewInfo,View Info: [] / Up +summary_EVsIVs,EVs / IVs +summary_ExpToNextLv,To Next Lv. +summary_TheEggWatch,The Egg Watch +summary_EggHatch_LongTime,It looks like this Egg will take a long time to hatch. +summary_EggHatch_MediumTime,It's getting warmer and moves a little. It will hatch soon. +summary_EggHatch_ShortTime,There is strong movement noticeable. It will hatch soon! +--- +Catch Method & Location: + +CatchMethod_Empty,Somehow obtained at +CatchMethod_Caught,Caught at +CatchMethod_Obtained,Obtained at + +CatchLocation_Empty,an unknown place --- Keyboard Keys: diff --git a/P3D/Content/Localization/Tokens_fr.dat b/P3D/Content/Localization/Tokens_fr.dat index 696333789..fb036c5d0 100644 --- a/P3D/Content/Localization/Tokens_fr.dat +++ b/P3D/Content/Localization/Tokens_fr.dat @@ -19,6 +19,7 @@ global_save,Sauvegarder global_apply,Appliquer global_close,Fermer global_back,Retour +global_quit,Quit global_on,On global_off,Off global_enabled,Activé @@ -76,20 +77,49 @@ global_pokemon_move_teleport,Teleport global_pokemon_move_dig,Tunnel global_used,Utilisé --- -General: -HP,HP -PP,PP -Lv.,Lv. -No.,No. -Level,Niveau -MaxHP,Max HP -Attack,Attaque -Defense,Defense -Special_Attack,Attaque spécial -Sp_Attack,Attaque spé. -Special_Defense,Défense spécial -Sp_Defense,Défense spé. -Speed,Vitesse +Pokémon & Attack Properties: +property_HP,HP +property_PP,PP +property_Lv.,Lv. +property_No.,No. +property_Level,Niveau +property_MaxHP,Max HP +property_Attack,Attaque +property_Defense,Defense +property_Special_Attack,Attaque spécial +property_Sp_Attack,Attaque spé. +property_Special_Defense,Défense spécial +property_Sp_Defense,Défense spé. +property_Speed,Vitesse +property_Ability,Ability +property_Type,Type +property_Nature,Nature +property_DexNo.,Dex No. +property_IDNo.,ID No. +property_CatchMethod,Catch Method +property_ExpPoints,Exp. Points +property_Category,Category +property_Power,Power +property_Accuracy,Accuracy +--- +Summary Screen: + +summary_hint_ViewMoves,View Moves: [] / Down +summary_hint_ViewInfo,View Info: [] / Up +summary_EVsIVs,EVs / IVs +summary_ExpToNextLv,To Next Lv. +summary_TheEggWatch,The Egg Watch +summary_EggHatch_LongTime,It looks like this Egg will take a long time to hatch. +summary_EggHatch_MediumTime,It's getting warmer and moves a little. It will hatch soon. +summary_EggHatch_ShortTime,There is strong movement noticeable. It will hatch soon! +--- +Catch Method & Location: + +CatchMethod_Empty,Somehow obtained at +CatchMethod_Caught,Caught at +CatchMethod_Obtained,Obtained at + +CatchLocation_Empty,an unknown place --- Keyboard Keys: diff --git a/P3D/Content/Localization/Tokens_nl.dat b/P3D/Content/Localization/Tokens_nl.dat index 8ec735ea5..b0f361314 100644 --- a/P3D/Content/Localization/Tokens_nl.dat +++ b/P3D/Content/Localization/Tokens_nl.dat @@ -20,6 +20,7 @@ global_save,Sla op global_apply,Pas toe global_close,Sluit global_back,Terug +global_quit,Verlaat global_on,Aan global_off,Uit global_enabled,Actief @@ -77,20 +78,49 @@ global_pokemon_move_teleport,Teleporteer global_pokemon_move_dig,Graaf global_used,Gebruikt --- -General: -HP,IP -PP,KP -Lv.,Nv. -No.,Nr. -Level,Niveau -MaxHP,Max IP -Attack,Aanval -Defense,Verdediging -Special_Attack,Speciale Aanval -Sp_Attack,Sp. Aanval -Special_Defense,Speciale Verdediging -Sp_Defense,Sp. Verdediging -Speed,Snelheid +Pokémon & Attack Properties: +property_HP,IP +property_PP,KP +property_No.,Nr. +property_Lv.,Nv. +property_Level,Niveau +property_MaxHP,Max IP +property_Attack,Aanval +property_Defense,Verdediging +property_Special_Attack,Speciale Aanval +property_Sp_Attack,Sp. Aanval +property_Special_Defense,Speciale Verdediging +property_Sp_Defense,Sp. Verdediging +property_Speed,Snelheid +property_Ability,Ability +property_Type,Type +property_Nature,Nature +property_DexNo.,Dex No. +property_IDNo.,ID No. +property_CatchMethod,Catch Method +property_ExpPoints,Exp. Points +property_Category,Category +property_Power,Power +property_Accuracy,Accuracy +--- +Summary Screen: + +summary_hint_ViewMoves,View Moves: [] / Down +summary_hint_ViewInfo,View Info: [] / Up +summary_EVsIVs,EVs / IVs +summary_ExpToNextLv,To Next Lv. +summary_TheEggWatch,The Egg Watch +summary_EggHatch_LongTime,It looks like this Egg will take a long time to hatch. +summary_EggHatch_MediumTime,It's getting warmer and moves a little. It will hatch soon. +summary_EggHatch_ShortTime,There is strong movement noticeable. It will hatch soon! +--- +Catch Method & Location: + +CatchMethod_Empty,Somehow obtained at +CatchMethod_Caught,Caught at +CatchMethod_Obtained,Obtained at + +CatchLocation_Empty,an unknown place --- Keyboard Keys: diff --git a/P3D/Content/Localization/Tokens_ptbr.dat b/P3D/Content/Localization/Tokens_ptbr.dat index dbf34ebea..86058f70c 100644 --- a/P3D/Content/Localization/Tokens_ptbr.dat +++ b/P3D/Content/Localization/Tokens_ptbr.dat @@ -19,6 +19,7 @@ global_save,Salvar global_apply,Aplicar global_close,Fechar global_back,Voltar +global_quit,Quit global_on,Ligado global_off,Desligado global_enabled,Ativado @@ -76,20 +77,49 @@ global_pokemon_move_teleport,Teleport global_pokemon_move_dig,Dig global_used,Usou --- -General: -HP,HP -PP,PP -Lv.,Nv. -No.,Nº. -Level,Nível -MaxHP,HP Máximo -Attack,Ataque -Defense,Defesa -Special_Attack,Super Ataque -Sp_Attack,Sp. Ataque -Special_Defense,Super Defesa -Sp_Defense,Sp. Defesa -Speed,Velocidade +Pokémon & Attack Properties: +property_HP,HP +property_PP,PP +property_Lv.,Nv. +property_No.,Nº. +property_Level,Nível +property_MaxHP,HP Máximo +property_Attack,Ataque +property_Defense,Defesa +property_Special_Attack,Super Ataque +property_Sp_Attack,Sp. Ataque +property_Special_Defense,Super Defesa +property_Sp_Defense,Sp. Defesa +property_Speed,Velocidade +property_Ability,Ability +property_Type,Type +property_Nature,Nature +property_DexNo.,Dex No. +property_IDNo.,ID No. +property_CatchMethod,Catch Method +property_ExpPoints,Exp. Points +property_Category,Category +property_Power,Power +property_Accuracy,Accuracy +--- +Summary Screen: + +summary_hint_ViewMoves,View Moves: [] / Down +summary_hint_ViewInfo,View Info: [] / Up +summary_EVsIVs,EVs / IVs +summary_ExpToNextLv,To Next Lv. +summary_TheEggWatch,The Egg Watch +summary_EggHatch_LongTime,It looks like this Egg will take a long time to hatch. +summary_EggHatch_MediumTime,It's getting warmer and moves a little. It will hatch soon. +summary_EggHatch_ShortTime,There is strong movement noticeable. It will hatch soon! +--- +Catch Method & Location: + +CatchMethod_Empty,Somehow obtained at +CatchMethod_Caught,Caught at +CatchMethod_Obtained,Obtained at + +CatchLocation_Empty,an unknown place --- Keyboard Keys: diff --git a/P3D/Network/GameJolt/GTS/GTSInboxScreen.vb b/P3D/Network/GameJolt/GTS/GTSInboxScreen.vb index 861f01de5..01a67546e 100644 --- a/P3D/Network/GameJolt/GTS/GTSInboxScreen.vb +++ b/P3D/Network/GameJolt/GTS/GTSInboxScreen.vb @@ -232,7 +232,7 @@ Core.SpriteBatch.Draw(D.Pokemon.GetMenuTexture(), New Rectangle(116, Y + 16, 64, 64), C) Core.SpriteBatch.DrawString(FontManager.MiniFont, D.Pokemon.GetDisplayName(), New Vector2(198, Y + 37), Color.Black) - Core.SpriteBatch.DrawString(FontManager.MiniFont, "Lv. " & D.Pokemon.Level, New Vector2(360, Y + 37), Color.Black) + Core.SpriteBatch.DrawString(FontManager.MiniFont, Localization.GetString("property_Lv.", "Lv.") & " " & D.Pokemon.Level, New Vector2(360, Y + 37), Color.Black) End If Next Else diff --git a/P3D/Network/GameJolt/GTS/GTSSearchScreen.vb b/P3D/Network/GameJolt/GTS/GTSSearchScreen.vb index 895c8fbc0..af07ac34e 100644 --- a/P3D/Network/GameJolt/GTS/GTSSearchScreen.vb +++ b/P3D/Network/GameJolt/GTS/GTSSearchScreen.vb @@ -141,7 +141,7 @@ Core.SpriteBatch.Draw(D.Pokemon.GetMenuTexture(), New Rectangle(116, Y + 16, 64, 64), C) Core.SpriteBatch.DrawString(FontManager.MiniFont, D.Pokemon.GetDisplayName(), New Vector2(198, Y + 37), Color.Black) - Core.SpriteBatch.DrawString(FontManager.MiniFont, "Lv. " & D.Pokemon.Level, New Vector2(360, Y + 37), Color.Black) + Core.SpriteBatch.DrawString(FontManager.MiniFont, Localization.GetString("property_Lv.", "Lv.") & " " & D.Pokemon.Level, New Vector2(360, Y + 37), Color.Black) End If Next End If diff --git a/P3D/Network/GameJolt/GTS/GTSSetupScreen.vb b/P3D/Network/GameJolt/GTS/GTSSetupScreen.vb index 36a050f50..857721f41 100644 --- a/P3D/Network/GameJolt/GTS/GTSSetupScreen.vb +++ b/P3D/Network/GameJolt/GTS/GTSSetupScreen.vb @@ -66,7 +66,7 @@ Core.SpriteBatch.Draw(D.Pokemon.GetMenuTexture(), New Rectangle(116, Y + 16, 64, 64), C) Core.SpriteBatch.DrawString(FontManager.MiniFont, D.Pokemon.GetDisplayName(), New Vector2(198, Y + 37), Color.Black) - Core.SpriteBatch.DrawString(FontManager.MiniFont, "Lv. " & D.Pokemon.Level, New Vector2(360, Y + 37), Color.Black) + Core.SpriteBatch.DrawString(FontManager.MiniFont, Localization.GetString("property_Lv.", "Lv.") & " " & D.Pokemon.Level, New Vector2(360, Y + 37), Color.Black) End If Next Else diff --git a/P3D/Network/GameJolt/GTS/WonderTradeScreen.vb b/P3D/Network/GameJolt/GTS/WonderTradeScreen.vb index 3c9eec004..63d44043f 100644 --- a/P3D/Network/GameJolt/GTS/WonderTradeScreen.vb +++ b/P3D/Network/GameJolt/GTS/WonderTradeScreen.vb @@ -138,7 +138,7 @@ Core.SpriteBatch.Draw(TextureManager.GetTexture("GUI\Menus\Menu"), New Rectangle(CInt(Core.windowSize.Width / 2 - 100), 358, 12, 20), New Rectangle(96, 0, 6, 10), Color.White) End If - Core.SpriteBatch.DrawString(FontManager.MainFont, "Lv. " & p.Level, New Vector2(CInt(Core.windowSize.Width / 2 - 50), 355), Color.White) + Core.SpriteBatch.DrawString(FontManager.MainFont, Localization.GetString("property_Lv.", "Lv.") & " " & p.Level, New Vector2(CInt(Core.windowSize.Width / 2 - 50), 355), Color.White) If p.Item Is Nothing Then Core.SpriteBatch.DrawString(FontManager.MainFont, "None", New Vector2(CInt(Core.windowSize.Width / 2 + 60), 355), Color.White) diff --git a/P3D/Pokemon/Attacks/Normal/Entrainment.vb b/P3D/Pokemon/Attacks/Normal/Entrainment.vb index a8d4c8752..bc780a519 100644 --- a/P3D/Pokemon/Attacks/Normal/Entrainment.vb +++ b/P3D/Pokemon/Attacks/Normal/Entrainment.vb @@ -66,7 +66,7 @@ If bannedAbilitiesOpp.Contains(op.Ability.Name.ToLower()) = False AndAlso bannedAbilitiesOwn.Contains(p.Ability.Name.ToLower()) = False Then op.Ability = Ability.GetAbilityByID(p.Ability.ID) - BattleScreen.BattleQuery.Add(New TextQueryObject(op.GetDisplayName() & " acquired " & op.Ability.Name() & "!")) + BattleScreen.BattleQuery.Add(New TextQueryObject(op.GetDisplayName() & " acquired " & Localization.GetString("ability_name_" & op.Ability.ID.ToString, op.Ability.Name()) & "!")) Else BattleScreen.BattleQuery.Add(New TextQueryObject(Me.Name & " failed!")) End If diff --git a/P3D/Pokemon/Attacks/Psychic/RolePlay.vb b/P3D/Pokemon/Attacks/Psychic/RolePlay.vb index c0ec49b37..115861379 100644 --- a/P3D/Pokemon/Attacks/Psychic/RolePlay.vb +++ b/P3D/Pokemon/Attacks/Psychic/RolePlay.vb @@ -65,7 +65,7 @@ Namespace BattleSystem.Moves.Psychic p.Ability = New Ability(op.Ability.ID, op.Ability.Name, op.Ability.Description) - BattleScreen.BattleQuery.Add(New TextQueryObject(p.GetDisplayName() & " copies " & op.Ability.Name & " from " & op.GetDisplayName() & ".")) + BattleScreen.BattleQuery.Add(New TextQueryObject(p.GetDisplayName() & " copies " & Localization.GetString("ability_name_" & op.Ability.ID.ToString, op.Ability.Name) & " from " & op.GetDisplayName() & ".")) End Sub End Class diff --git a/P3D/Screens/Battle/BattleCatchScreen.vb b/P3D/Screens/Battle/BattleCatchScreen.vb index 37dcab56d..c8d93a9a1 100644 --- a/P3D/Screens/Battle/BattleCatchScreen.vb +++ b/P3D/Screens/Battle/BattleCatchScreen.vb @@ -332,7 +332,7 @@ nextIndex: End If End If - p.SetCatchInfos(Me.Ball, "caught at") + p.SetCatchInfos(Me.Ball, Localization.GetString("CatchMethod_Caught", "Caught at")) MusicManager.Pause() MusicManager.Play("wild_defeat", False, 0.0F) diff --git a/P3D/Screens/Pokemon/Daycare.vb b/P3D/Screens/Pokemon/Daycare.vb index edad4f359..17357a724 100644 --- a/P3D/Screens/Pokemon/Daycare.vb +++ b/P3D/Screens/Pokemon/Daycare.vb @@ -74,7 +74,7 @@ p.Generate(1, True, OptionalAdditionalData) p.EggSteps = 1 - p.SetCatchInfos(Item.GetItemByID(5.ToString), "obtained at") + p.SetCatchInfos(Item.GetItemByID(5.ToString), Localization.GetString("CatchMethod_Obtained", "Obtained at")) p.CatchBall = Item.GetItemByID(GetEggPokeballID({parent1, parent2}.ToList())) p.ReloadDefinitions() diff --git a/P3D/Screens/Pokemon/EvolutionScreen.vb b/P3D/Screens/Pokemon/EvolutionScreen.vb index 84040e2ac..58aa9b918 100644 --- a/P3D/Screens/Pokemon/EvolutionScreen.vb +++ b/P3D/Screens/Pokemon/EvolutionScreen.vb @@ -431,10 +431,10 @@ evolvedPokemon.CatchBall = currentPokemon.CatchBall If currentPokemon.CatchMethod = "" Then - currentPokemon.CatchMethod = "Somehow obtained at" + currentPokemon.CatchMethod = Localization.GetString("CatchMethod_Empty", "Somehow obtained at") End If If currentPokemon.CatchLocation = "" Then - currentPokemon.CatchLocation = "an unknown place" + currentPokemon.CatchLocation = Localization.GetString("CatchLocation_Empty", "an unknown place") End If evolvedPokemon.CatchLocation = currentPokemon.CatchLocation evolvedPokemon.CatchMethod = currentPokemon.CatchMethod diff --git a/P3D/Screens/Pokemon/PartyScreen.vb b/P3D/Screens/Pokemon/PartyScreen.vb index 10b0a4230..a2838eb5d 100644 --- a/P3D/Screens/Pokemon/PartyScreen.vb +++ b/P3D/Screens/Pokemon/PartyScreen.vb @@ -346,7 +346,7 @@ Public Class PartyScreen End Select 'Level: - GetFontRenderer().DrawString(FontManager.MainFont, "Lv. " & p.Level.ToString(), New Vector2(position.X + 4, position.Y + 50), New Color(255, 255, 255, CInt(255 * _interfaceFade))) + GetFontRenderer().DrawString(FontManager.MainFont, Localization.GetString("property_Lv.", "Lv.") & " " & p.Level.ToString(), New Vector2(position.X + 4, position.Y + 50), New Color(255, 255, 255, CInt(255 * _interfaceFade))) 'HP Bar: SpriteBatch.Draw(_menuTexture, New Rectangle(CInt(position.X) + 102, CInt(position.Y) + 32, 111, 15), New Rectangle(16, 32, 74, 10), New Color(255, 255, 255, CInt(255 * _interfaceFade))) diff --git a/P3D/Screens/Pokemon/SummaryScreen.vb b/P3D/Screens/Pokemon/SummaryScreen.vb index 1a232ffb3..b4a1f2e8e 100644 --- a/P3D/Screens/Pokemon/SummaryScreen.vb +++ b/P3D/Screens/Pokemon/SummaryScreen.vb @@ -221,7 +221,7 @@ SpriteBatch.DrawString(FontManager.MainFont, GetPokemon().GetDisplayName(), New Vector2(DeltaX + 10, DeltaY + 16), New Color(255, 255, 255, CInt(220 * _fadeIn))) If GetPokemon().IsEgg() = False Then - SpriteBatch.DrawString(FontManager.MainFont, "Lv. " & GetPokemon().Level, New Vector2(DeltaX + 50, DeltaY + 48), New Color(255, 255, 255, CInt(220 * _fadeIn))) + SpriteBatch.DrawString(FontManager.MainFont, Localization.GetString("property_Lv.", "Lv.") & " " & GetPokemon().Level, New Vector2(DeltaX + 50, DeltaY + 48), New Color(255, 255, 255, CInt(220 * _fadeIn))) 'Draw status condition Dim StatusTexture As Texture2D = BattleStats.GetStatImage(GetPokemon().Status) @@ -261,15 +261,15 @@ Canvas.DrawRectangle(New Rectangle(DeltaX, DeltaY + 490, 264, 32), New Color(0, 0, 0, CInt(70 * _interfaceFade))) Canvas.DrawGradient(New Rectangle(DeltaX + 264, DeltaY + 490, 50, 32), New Color(0, 0, 0, CInt(70 * _interfaceFade)), New Color(0, 0, 0, 0), True, -1) - SpriteBatch.DrawString(FontManager.MainFont, "Type", New Vector2(DeltaX + 10, DeltaY + 330 + 4), New Color(255, 255, 255, CInt(220 * _interfaceFade))) - SpriteBatch.DrawString(FontManager.MainFont, "Item", New Vector2(DeltaX + 10, DeltaY + 362 + 4), New Color(255, 255, 255, CInt(220 * _interfaceFade))) - SpriteBatch.DrawString(FontManager.MainFont, "Nature", New Vector2(DeltaX + 10, DeltaY + 394 + 4), New Color(255, 255, 255, CInt(220 * _interfaceFade))) - SpriteBatch.DrawString(FontManager.MainFont, "Dex No.", New Vector2(DeltaX + 10, DeltaY + 426 + 4), New Color(255, 255, 255, CInt(220 * _interfaceFade))) + SpriteBatch.DrawString(FontManager.MainFont, Localization.GetString("property_Type", "Type"), New Vector2(DeltaX + 10, DeltaY + 330 + 4), New Color(255, 255, 255, CInt(220 * _interfaceFade))) + SpriteBatch.DrawString(FontManager.MainFont, Localization.GetString("global_item", "Item"), New Vector2(DeltaX + 10, DeltaY + 362 + 4), New Color(255, 255, 255, CInt(220 * _interfaceFade))) + SpriteBatch.DrawString(FontManager.MainFont, Localization.GetString("property_Nature", "Nature"), New Vector2(DeltaX + 10, DeltaY + 394 + 4), New Color(255, 255, 255, CInt(220 * _interfaceFade))) + SpriteBatch.DrawString(FontManager.MainFont, Localization.GetString("property_DexNo.", "Dex No."), New Vector2(DeltaX + 10, DeltaY + 426 + 4), New Color(255, 255, 255, CInt(220 * _interfaceFade))) - SpriteBatch.DrawString(FontManager.MainFont, "OT", New Vector2(DeltaX + 10, DeltaY + 458 + 4), New Color(255, 255, 255, CInt(220 * _interfaceFade))) + SpriteBatch.DrawString(FontManager.MainFont, Localization.GetString("global_ot", "OT"), New Vector2(DeltaX + 10, DeltaY + 458 + 4), New Color(255, 255, 255, CInt(220 * _interfaceFade))) SpriteBatch.DrawString(FontManager.MainFont, GetPokemon().CatchTrainerName, New Vector2(DeltaX + 96 + 8, DeltaY + 458 + 4), New Color(255, 255, 255, CInt(220 * _fadeIn))) - SpriteBatch.DrawString(FontManager.MainFont, "ID No.", New Vector2(DeltaX + 10, DeltaY + 490 + 4), New Color(255, 255, 255, CInt(220 * _interfaceFade))) + SpriteBatch.DrawString(FontManager.MainFont, Localization.GetString("property_IDNo.", "ID No."), New Vector2(DeltaX + 10, DeltaY + 490 + 4), New Color(255, 255, 255, CInt(220 * _interfaceFade))) SpriteBatch.DrawString(FontManager.MainFont, GetPokemon().OT, New Vector2(DeltaX + 96 + 8, DeltaY + 490 + 4), New Color(255, 255, 255, CInt(220 * _fadeIn))) @@ -287,7 +287,7 @@ SpriteBatch.Draw(GetPokemon().Item.Texture, New Rectangle(DeltaX + 96 + 8, DeltaY + 366, 24, 24), New Color(255, 255, 255, CInt(220 * _fadeIn))) SpriteBatch.DrawString(FontManager.MainFont, GetPokemon().Item.Name, New Vector2(DeltaX + 96 + 8 + 24, DeltaY + 366), New Color(255, 255, 255, CInt(220 * _fadeIn))) Else - SpriteBatch.DrawString(FontManager.MainFont, "None", New Vector2(DeltaX + 96 + 8, DeltaY + 366), New Color(255, 255, 255, CInt(220 * _fadeIn))) + SpriteBatch.DrawString(FontManager.MainFont, Localization.GetString("global_none", "None"), New Vector2(DeltaX + 96 + 8, DeltaY + 366), New Color(255, 255, 255, CInt(220 * _fadeIn))) End If 'Nature SpriteBatch.DrawString(FontManager.MainFont, GetPokemon().Nature.ToString, New Vector2(DeltaX + 96 + 8, DeltaY + 398), New Color(255, 255, 255, CInt(220 * _fadeIn))) @@ -324,7 +324,7 @@ With GetPokemon() 'Draw stats: Dim colors As Color() = {New Color(120, 239, 155), New Color(241, 227, 154), New Color(255, 178, 114), New Color(151, 217, 205), New Color(137, 154, 255), New Color(213, 128, 255)} - Dim statNames As String() = {"HP", "Attack", "Defense", "Sp. Atk", "Sp. Def", "Speed"} + Dim statNames As String() = {Localization.GetString("property_HP", "HP"), Localization.GetString("property_Attack", "Attack"), Localization.GetString("property_Defense", "Defense"), Localization.GetString("property_Sp_Attack", "Sp. Atk"), Localization.GetString("property_Sp_Defense", "Sp. Def"), Localization.GetString("property_Speed", "Speed")} Dim statValues As String() = { .HP & " / " & .MaxHP, CStr(.Attack), CStr(.Defense), CStr(.SpAttack), CStr(.SpDefense), CStr(.Speed)} Dim evStats As Single() = { .EVHP, .EVAttack, .EVDefense, .EVSpAttack, .EVSpDefense, .EVSpeed} Dim ivStats As Single() = { .IVHP, .IVAttack, .IVDefense, .IVSpAttack, .IVSpDefense, .IVSpeed} @@ -396,21 +396,21 @@ Canvas.DrawRectangle(New Rectangle(DeltaX + 350, DeltaY + 362 - 64, 300 + 48, 32), New Color(0, 0, 0, CInt(100 * _interfaceFade * _pageFade))) Canvas.DrawRectangle(New Rectangle(DeltaX + 350, DeltaY + 394 - 64, 300 + 48, 64 + 12), New Color(0, 0, 0, CInt(70 * _interfaceFade * _pageFade))) - SpriteBatch.DrawString(FontManager.MainFont, "Ability", New Vector2(DeltaX + 360, DeltaY + 366 - 64), New Color(255, 255, 255, CInt(220 * _interfaceFade * _pageFade))) - SpriteBatch.DrawString(FontManager.MainFont, .Ability.Name, New Vector2(DeltaX + 440 + 24, DeltaY + 366 - 64), New Color(255, 255, 255, CInt(220 * _fadeIn * _pageFade))) - SpriteBatch.DrawString(FontManager.MainFont, .Ability.Description.CropStringToWidth(FontManager.MainFont, 1.0F, 300 + 32), New Vector2(DeltaX + 358, DeltaY + 336), New Color(255, 255, 255, CInt(220 * _fadeIn * _pageFade))) + SpriteBatch.DrawString(FontManager.MainFont, Localization.GetString("property_Ability", "Ability"), New Vector2(DeltaX + 360, DeltaY + 366 - 64), New Color(255, 255, 255, CInt(220 * _interfaceFade * _pageFade))) + SpriteBatch.DrawString(FontManager.MainFont, Localization.GetString("ability_name_" & .Ability.ID.ToString, .Ability.Name), New Vector2(DeltaX + 440 + 24, DeltaY + 366 - 64), New Color(255, 255, 255, CInt(220 * _fadeIn * _pageFade))) + SpriteBatch.DrawString(FontManager.MainFont, Localization.GetString("ability_desc_" & .Ability.ID.ToString, .Ability.Description).CropStringToWidth(FontManager.MainFont, 1.0F, 300 + 32), New Vector2(DeltaX + 358, DeltaY + 336), New Color(255, 255, 255, CInt(220 * _fadeIn * _pageFade))) 'Catch Method: Canvas.DrawRectangle(New Rectangle(DeltaX + 350, DeltaY + 362 + 64, 300 + 24, 32), New Color(0, 0, 0, CInt(100 * _interfaceFade * _pageFade))) Canvas.DrawRectangle(New Rectangle(DeltaX + 350, DeltaY + 394 + 64, 300 + 24, 64), New Color(0, 0, 0, CInt(70 * _interfaceFade * _pageFade))) - SpriteBatch.DrawString(FontManager.MainFont, "Catch Method", New Vector2(DeltaX + 360, DeltaY + 366 + 64), New Color(255, 255, 255, CInt(220 * _interfaceFade * _pageFade))) + SpriteBatch.DrawString(FontManager.MainFont, Localization.GetString("property_CatchMethod", "Catch Method"), New Vector2(DeltaX + 360, DeltaY + 366 + 64), New Color(255, 255, 255, CInt(220 * _interfaceFade * _pageFade))) If .CatchMethod = "" Then - .CatchMethod = "Somehow obtained at" + .CatchMethod = Localization.GetString("CatchMethod_Empty", "Somehow obtained at") End If If .CatchLocation = "" Then - .CatchLocation = "an unknown place" + .CatchLocation = Localization.GetString("CatchLocation_Empty", "an unknown place") End If Dim text As String = .CatchMethod.Replace(.CatchMethod(0), Char.ToUpper(.CatchMethod(0))) & " " & .CatchLocation & "." @@ -421,7 +421,7 @@ Canvas.DrawRectangle(New Rectangle(DeltaX + 734 - 12, DeltaY + 362 - 64, 300 + 48, 32), New Color(0, 0, 0, CInt(100 * _interfaceFade * _pageFade))) Canvas.DrawRectangle(New Rectangle(DeltaX + 734 - 12, DeltaY + 394 - 64, 300 + 48, 64 + 12), New Color(0, 0, 0, CInt(70 * _interfaceFade * _pageFade))) - SpriteBatch.DrawString(FontManager.MainFont, "EVs / IVs", New Vector2(DeltaX + 734 + 8, DeltaY + 366 - 64), New Color(255, 255, 255, CInt(220 * _interfaceFade * _pageFade))) + SpriteBatch.DrawString(FontManager.MainFont, Localization.GetString("summary_EVsIVs", "EVs / IVs"), New Vector2(DeltaX + 734 + 8, DeltaY + 366 - 64), New Color(255, 255, 255, CInt(220 * _interfaceFade * _pageFade))) For i = 0 To 5 SpriteBatch.DrawString(FontManager.MainFont, evStats(i).ToString, New Vector2(DeltaX + 734 + 24 + i * 56 - CInt(FontManager.MainFont.MeasureString(evStats(i).ToString).X * 0.5), DeltaY + 336), New Color(255, 255, 255, CInt(220 * _interfaceFade * _pageFade))) @@ -430,12 +430,12 @@ 'EXP: Canvas.DrawRectangle(New Rectangle(DeltaX + 734 - 12, DeltaY + 362 + 64, 300 + 24, 32), New Color(0, 0, 0, CInt(100 * _interfaceFade * _pageFade))) - SpriteBatch.DrawString(FontManager.MainFont, "Exp. Points", New Vector2(DeltaX + 744, DeltaY + 366 + 64), New Color(255, 255, 255, CInt(220 * _interfaceFade * _pageFade))) + SpriteBatch.DrawString(FontManager.MainFont, Localization.GetString("property_ExpPoints", "Exp. Points"), New Vector2(DeltaX + 744, DeltaY + 366 + 64), New Color(255, 255, 255, CInt(220 * _interfaceFade * _pageFade))) SpriteBatch.DrawString(FontManager.MainFont, .Experience.ToString(), New Vector2(DeltaX + 898 - 12, DeltaY + 366 + 64), New Color(255, 255, 255, CInt(220 * _fadeIn * _pageFade))) If .Level < CInt(GameModeManager.GetGameRuleValue("MaxLevel", "100")) Then Canvas.DrawRectangle(New Rectangle(DeltaX + 734 - 12, DeltaY + 394 + 64, 300 + 24, 64), New Color(0, 0, 0, CInt(70 * _interfaceFade * _pageFade))) - SpriteBatch.DrawString(FontManager.MainFont, "To Next Lv.", New Vector2(DeltaX + 744 - 12, DeltaY + 398 + 64), New Color(255, 255, 255, CInt(220 * _interfaceFade * _pageFade))) + SpriteBatch.DrawString(FontManager.MainFont, Localization.GetString("summary_ExpToNextLv", "To Next Lv."), New Vector2(DeltaX + 744 - 12, DeltaY + 398 + 64), New Color(255, 255, 255, CInt(220 * _interfaceFade * _pageFade))) If .NeedExperience(.Level + 1) - .Experience > 0 Then SpriteBatch.DrawString(FontManager.MainFont, CStr(.NeedExperience(.Level + 1) - .Experience), New Vector2(DeltaX + 898 - 12, DeltaY + 398 + 64), New Color(255, 255, 255, CInt(220 * _fadeIn * _pageFade))) @@ -493,7 +493,7 @@ 'Switch Page Hint Canvas.DrawRectangle(New Rectangle(DeltaX + 350, DeltaY + 6, 300 + 24, 32), New Color(0, 0, 0, CInt(50 * _interfaceFade * _pageFade))) - SpriteBatch.DrawString(FontManager.MainFont, ScriptVersion2.ScriptCommander.Parse("View Moves: [] / Down").ToString, New Vector2(DeltaX + 350 + 22, DeltaY + 10), New Color(255, 255, 255, CInt(220 * _interfaceFade * _pageFade))) + SpriteBatch.DrawString(FontManager.MainFont, ScriptVersion2.ScriptCommander.Parse(Localization.GetString("summary_hint_ViewMoves", "View Moves: [] / Down")).ToString, New Vector2(DeltaX + 350 + 22, DeltaY + 10), New Color(255, 255, 255, CInt(220 * _interfaceFade * _pageFade))) End With End Sub @@ -535,17 +535,17 @@ Canvas.DrawRectangle(New Rectangle(DeltaX + 700, DeltaY + 76 + 32 * 5, 350, 160), New Color(0, 0, 0, CInt(70 * _interfaceFade * _pageFade * _moveFade))) 'Type: - SpriteBatch.DrawString(FontManager.MainFont, "Type:", New Vector2(DeltaX + 710, DeltaY + 80), New Color(255, 255, 255, CInt(220 * _interfaceFade * _pageFade * _moveFade))) + SpriteBatch.DrawString(FontManager.MainFont, Localization.GetString("property_Type", "Type") & ":", New Vector2(DeltaX + 710, DeltaY + 80), New Color(255, 255, 255, CInt(220 * _interfaceFade * _pageFade * _moveFade))) Core.SpriteBatch.Draw(TextureManager.GetTexture(Element.GetElementTexturePath()), New Rectangle(DeltaX + 840, DeltaY + 86, 48, 16), .Attacks(_moveIndex).Type.GetElementImage(), New Color(255, 255, 255, CInt(255 * _fadeIn * _pageFade * _moveFade))) - SpriteBatch.DrawString(FontManager.MainFont, "PP:", New Vector2(DeltaX + 710, DeltaY + 114), New Color(255, 255, 255, CInt(220 * _interfaceFade * _pageFade * _moveFade))) + SpriteBatch.DrawString(FontManager.MainFont, Localization.GetString("property_PP", "PP") & ":", New Vector2(DeltaX + 710, DeltaY + 114), New Color(255, 255, 255, CInt(220 * _interfaceFade * _pageFade * _moveFade))) SpriteBatch.DrawString(FontManager.MainFont, .Attacks(_moveIndex).CurrentPP & " / " & .Attacks(_moveIndex).MaxPP, New Vector2(DeltaX + 840, DeltaY + 114), New Color(255, 255, 255, CInt(220 * _fadeIn * _pageFade * _moveFade))) 'Stats: - SpriteBatch.DrawString(FontManager.MainFont, "Category:", New Vector2(DeltaX + 710, DeltaY + 144), New Color(255, 255, 255, CInt(220 * _interfaceFade * _pageFade * _moveFade))) + SpriteBatch.DrawString(FontManager.MainFont, Localization.GetString("property_Category", "Category") & ":", New Vector2(DeltaX + 710, DeltaY + 144), New Color(255, 255, 255, CInt(220 * _interfaceFade * _pageFade * _moveFade))) Core.SpriteBatch.Draw(.Attacks(_moveIndex).GetDamageCategoryImage(), New Rectangle(DeltaX + 840, DeltaY + 145, 48, 24), New Color(255, 255, 255, CInt(255 * _fadeIn * _pageFade * _moveFade))) - SpriteBatch.DrawString(FontManager.MainFont, "Power:", New Vector2(DeltaX + 710, DeltaY + 176), New Color(255, 255, 255, CInt(220 * _interfaceFade * _pageFade * _moveFade))) + SpriteBatch.DrawString(FontManager.MainFont, Localization.GetString("property_Power", "Power") & ":", New Vector2(DeltaX + 710, DeltaY + 176), New Color(255, 255, 255, CInt(220 * _interfaceFade * _pageFade * _moveFade))) Dim power As String = .Attacks(_moveIndex).Power.ToString() If .Attacks(_moveIndex).Power <= 0 Then @@ -558,7 +558,7 @@ accuracy = "-" End If - SpriteBatch.DrawString(FontManager.MainFont, "Accuracy:", New Vector2(DeltaX + 710, DeltaY + 208), New Color(255, 255, 255, CInt(220 * _interfaceFade * _pageFade * _moveFade))) + SpriteBatch.DrawString(FontManager.MainFont, Localization.GetString("property_Accuracy", "Accuracy") & ":", New Vector2(DeltaX + 710, DeltaY + 208), New Color(255, 255, 255, CInt(220 * _interfaceFade * _pageFade * _moveFade))) SpriteBatch.DrawString(FontManager.MainFont, accuracy, New Vector2(DeltaX + 840, DeltaY + 208), New Color(255, 255, 255, CInt(220 * _fadeIn * _pageFade * _moveFade))) 'Description: @@ -566,7 +566,7 @@ 'Switch Page Hint Canvas.DrawRectangle(New Rectangle(DeltaX + 350, DeltaY + 6, 300 + 24, 32), New Color(0, 0, 0, CInt(50 * _interfaceFade * _pageFade))) - SpriteBatch.DrawString(FontManager.MainFont, ScriptVersion2.ScriptCommander.Parse("View Info: [] / Up").ToString, New Vector2(DeltaX + 350 + 22, DeltaY + 10), New Color(255, 255, 255, CInt(220 * _interfaceFade * _pageFade))) + SpriteBatch.DrawString(FontManager.MainFont, ScriptVersion2.ScriptCommander.Parse(Localization.GetString("summary_hint_ViewInfo", "View Info: [] / Up")).ToString, New Vector2(DeltaX + 350 + 22, DeltaY + 10), New Color(255, 255, 255, CInt(220 * _interfaceFade * _pageFade))) End With End Sub @@ -575,17 +575,17 @@ Dim s As String = "" Dim percent As Integer = CInt((GetPokemon().EggSteps / GetPokemon().BaseEggSteps) * 100) If percent <= 33 Then - s = "It looks like this Egg will take a long time to hatch." + s = Localization.GetString("summary_EggHatch_LongTime", "It looks like this Egg will take a long time to hatch.") ElseIf percent > 33 And percent <= 66 Then - s = "It's getting warmer and moves a little. It will hatch soon." + s = Localization.GetString("summary_EggHatch_MediumTime", "It's getting warmer and moves a little. It will hatch soon.") Else - s = "There is strong movement noticeable. It will hatch soon!" + s = Localization.GetString("summary_EggHatch_ShortTime", "There is strong movement noticeable. It will hatch soon!") End If Canvas.DrawRectangle(New Rectangle(DeltaX + 400, DeltaY + 76, 350, 32), New Color(0, 0, 0, CInt(100 * _fadeIn))) Canvas.DrawRectangle(New Rectangle(DeltaX + 400, DeltaY + 108, 350, 96), New Color(0, 0, 0, CInt(70 * _fadeIn))) - SpriteBatch.DrawString(FontManager.MainFont, "The Egg Watch", New Vector2(DeltaX + 410, DeltaY + 80), New Color(255, 255, 255, CInt(220 * _fadeIn))) + SpriteBatch.DrawString(FontManager.MainFont, Localization.GetString("summary_TheEggWatch", "The Egg Watch"), New Vector2(DeltaX + 410, DeltaY + 80), New Color(255, 255, 255, CInt(220 * _fadeIn))) SpriteBatch.DrawString(FontManager.MainFont, s.CropStringToWidth(FontManager.MainFont, 1.0F, 330), New Vector2(DeltaX + 410, DeltaY + 108 + 48 - FontManager.MainFont.MeasureString(s.CropStringToWidth(FontManager.MainFont, 1.0F, 330)).Y / 2), New Color(255, 255, 255, CInt(220 * _fadeIn))) End Sub diff --git a/P3D/World/ActionScript/V1/ScriptV1.vb b/P3D/World/ActionScript/V1/ScriptV1.vb index d253809e8..cabfd254e 100644 --- a/P3D/World/ActionScript/V1/ScriptV1.vb +++ b/P3D/World/ActionScript/V1/ScriptV1.vb @@ -676,7 +676,7 @@ If isEgg = True Then Pokemon.EggSteps = 1 - Pokemon.SetCatchInfos(Item.GetItemByID(5.ToString), "obtained at") + Pokemon.SetCatchInfos(Item.GetItemByID(5.ToString), Localization.GetString("CatchMethod_Obtained", "Obtained at")) Else Pokemon.EggSteps = 0 End If @@ -1128,7 +1128,7 @@ If isEgg = True Then Pokemon.EggSteps = 1 - Pokemon.SetCatchInfos(Item.GetItemByID(5.ToString), "obtained at") + Pokemon.SetCatchInfos(Item.GetItemByID(5.ToString), Localization.GetString("CatchMethod_Obtained", "Obtained at")) Else Pokemon.EggSteps = 0 End If diff --git a/P3D/World/ActionScript/V2/ScriptCommands/DoPokemon.vb b/P3D/World/ActionScript/V2/ScriptCommands/DoPokemon.vb index 3cbc77c06..ea52f692c 100644 --- a/P3D/World/ActionScript/V2/ScriptCommands/DoPokemon.vb +++ b/P3D/World/ActionScript/V2/ScriptCommands/DoPokemon.vb @@ -126,7 +126,7 @@ If isEgg = True Then Pokemon.EggSteps = 1 - Pokemon.SetCatchInfos(Item.GetItemByID(5.ToString), "obtained at") + Pokemon.SetCatchInfos(Item.GetItemByID(5.ToString), Localization.GetString("CatchMethod_Obtained", "Obtained at")) Else Pokemon.EggSteps = 0 End If @@ -992,7 +992,7 @@ If isEgg = True Then Pokemon.EggSteps = 1 - Pokemon.SetCatchInfos(Item.GetItemByID(5.ToString), "obtained at") + Pokemon.SetCatchInfos(Item.GetItemByID(5.ToString), Localization.GetString("CatchMethod_Obtained", "Obtained at")) Else Pokemon.EggSteps = 0 End If