tyler.durden/P3D-Legacy
1
0
Fork 0
mirror of https://github.com/P3D-Legacy/P3D-Legacy.git synced 2025-07-31 01:35:20 +02:00
Code Issues Packages Projects Releases Wiki Activity

Did the Pokédex entries and species the right way

Browse Source
This commit is contained in:
JappaWakka 2025-02-12 15:51:12 +01:00
parent 52bd699e34
commit e62791ca05
3 changed files with 34 additions and 56 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
P3D/Screens/Inventory/PokegearScreen.vb
View File

@ -1935,26 +1935,13 @@
Dim DexEntryText As String = p.PokedexEntry.Text Dim DexEntryText As String = p.PokedexEntry.Text
Dim DexEntrySpecies As String = p.PokedexEntry.Species Dim DexEntrySpecies As String = p.PokedexEntry.Species
If Localization.LanguageSuffix <> "en" Then Dim FormName As String = PokemonForms.GetFormName(p)
Dim dexID As String = PokemonForms.GetPokemonDataFileName(p.Number, p.AdditionalData, True)
Dim dexEntryID As String = dexID
Dim idValue As Integer = CInt(dexID.GetSplit(0, ",").GetSplit(0, "_").GetSplit(0, ";"))
Dim adValue As String = ""
If dexID.Contains(";") Then
If Pokemon.PokemonDataExists(dexEntryID) = False Then
dexEntryID = dexEntryID.GetSplit(0, ";")
End If
adValue = dexID.GetSplit(1, ";")
ElseIf dexID.Contains("_") Then
adValue = PokemonForms.GetAdditionalValueFromDataFile(dexID)
End If
If Localization.TokenExists("pokemon_desc_" & dexID) = True Then
DexEntryText = Localization.GetString("pokemon_desc_" & dexID, p.PokedexEntry.Text)
End If
If Localization.TokenExists("pokemon_species_" & dexID) = True Then
DexEntrySpecies = Localization.GetString("pokemon_species_" & dexID, p.PokedexEntry.Species)
End If
If Localization.TokenExists("pokemon_desc_" & FormName) = True Then
DexEntryText = Localization.GetString("pokemon_desc_" & FormName, p.PokedexEntry.Text)
End If
If Localization.TokenExists("pokemon_species_" & FormName) = True Then
DexEntrySpecies = Localization.GetString("pokemon_species_" & FormName, p.PokedexEntry.Species)
End If End If
output = "Welcome to the Pokédex Show! Today, we are going to look at the entry of " & p.GetName(True) & "! Its entry reads:~""" & DexEntryText & """~Wow, that is interesting! Also, " & p.GetName(True) & " is " & p.PokedexEntry.Height & "m high and weighs " & p.PokedexEntry.Weight & "kg.~Isn't that amazing?~" & p.GetName(True) & " is part of the " & DexEntrySpecies & " species.~That's all the information we have. Tune in next time!" output = "Welcome to the Pokédex Show! Today, we are going to look at the entry of " & p.GetName(True) & "! Its entry reads:~""" & DexEntryText & """~Wow, that is interesting! Also, " & p.GetName(True) & " is " & p.PokedexEntry.Height & "m high and weighs " & p.PokedexEntry.Weight & "kg.~Isn't that amazing?~" & p.GetName(True) & " is part of the " & DexEntrySpecies & " species.~That's all the information we have. Tune in next time!"

58
P3D/Screens/Pokedex/PokedexScreen.vb
View File

@ -751,8 +751,10 @@ Public Class PokedexScreen
If entryType > 1 Then If entryType > 1 Then
Dim DexEntrySpecies As String = p.PokedexEntry.Species Dim DexEntrySpecies As String = p.PokedexEntry.Species
If Localization.LanguageSuffix <> "en" AndAlso Localization.TokenExists("pokemon_species_" & dexID) = True Then Dim FormName As String = PokemonForms.GetFormName(p)
DexEntrySpecies = Localization.GetString("pokemon_species_" & dexID, p.PokedexEntry.Species)
If Localization.TokenExists("pokemon_species_" & FormName) = True Then
DexEntrySpecies = Localization.GetString("pokemon_species_" & FormName, p.PokedexEntry.Species)
End If End If
Core.SpriteBatch.DrawString(FontManager.MainFont, DexEntrySpecies, New Vector2(850, 310), Color.Black) Core.SpriteBatch.DrawString(FontManager.MainFont, DexEntrySpecies, New Vector2(850, 310), Color.Black)
@ -767,21 +769,8 @@ Public Class PokedexScreen
Dim DexEntryText As String = p.PokedexEntry.Text Dim DexEntryText As String = p.PokedexEntry.Text
If Localization.LanguageSuffix <> "en" Then If Localization.TokenExists("pokemon_desc_" & FormName) = True Then
Dim dexEntryID As String = dexID DexEntryText = Localization.GetString("pokemon_desc_" & FormName, p.PokedexEntry.Text)
Dim idValue As Integer = CInt(dexID.GetSplit(0, ",").GetSplit(0, "_").GetSplit(0, ";"))
Dim adValue As String = ""
If dexID.Contains(";") Then
If Pokemon.PokemonDataExists(dexEntryID) = False Then
dexEntryID = dexEntryID.GetSplit(0, ";")
End If
adValue = dexID.GetSplit(1, ";")
ElseIf dexID.Contains("_") Then
adValue = PokemonForms.GetAdditionalValueFromDataFile(dexID)
End If
If Localization.TokenExists("pokemon_desc_" & dexID) = True Then
DexEntryText = Localization.GetString("pokemon_desc_" & dexID, p.PokedexEntry.Text)
End If
End If End If
Core.SpriteBatch.DrawString(FontManager.MainFont, DexEntryText.CropStringToWidth(FontManager.MainFont, 448), New Vector2(688, 490), Color.Black) Core.SpriteBatch.DrawString(FontManager.MainFont, DexEntryText.CropStringToWidth(FontManager.MainFont, 448), New Vector2(688, 490), Color.Black)
@ -1779,25 +1768,24 @@ Public Class PokedexViewScreen
If EntryType > 1 Then If EntryType > 1 Then
Dim DexEntryText As String = Pokemon.PokedexEntry.Text Dim DexEntryText As String = Pokemon.PokedexEntry.Text
Dim DexEntrySpecies As String = Pokemon.PokedexEntry.Species Dim DexEntrySpecies As String = Pokemon.PokedexEntry.Species
If Localization.LanguageSuffix <> "en" Then
Dim dexID As String = PokemonForms.GetPokemonDataFileName(Pokemon.Number, Pokemon.AdditionalData, True) Dim dexID As String = PokemonForms.GetPokemonDataFileName(Pokemon.Number, Pokemon.AdditionalData, True)
Dim dexEntryID As String = dexID Dim dexEntryID As String = dexID
Dim idValue As Integer = CInt(dexID.GetSplit(0, ",").GetSplit(0, "_").GetSplit(0, ";")) Dim idValue As Integer = CInt(dexID.GetSplit(0, ",").GetSplit(0, "_").GetSplit(0, ";"))
Dim adValue As String = "" Dim adValue As String = ""
If dexID.Contains(";") Then If dexID.Contains(";") Then
If Pokemon.PokemonDataExists(dexEntryID) = False Then If Pokemon.PokemonDataExists(dexEntryID) = False Then
dexEntryID = dexEntryID.GetSplit(0, ";") dexEntryID = dexEntryID.GetSplit(0, ";")
End If
adValue = dexID.GetSplit(1, ";")
ElseIf dexID.Contains("_") Then
adValue = PokemonForms.GetAdditionalValueFromDataFile(dexID)
End If
If Localization.TokenExists("pokemon_desc_" & dexID) = True Then
DexEntryText = Localization.GetString("pokemon_desc_" & dexID, Pokemon.PokedexEntry.Text)
End If
If Localization.LanguageSuffix <> "en" AndAlso Localization.TokenExists("pokemon_species_" & dexID) = True Then
DexEntrySpecies = Localization.GetString("pokemon_species_" & dexID, Pokemon.PokedexEntry.Species)
End If End If
adValue = dexID.GetSplit(1, ";")
ElseIf dexID.Contains("_") Then
adValue = PokemonForms.GetAdditionalValueFromDataFile(dexID)
End If
If Localization.TokenExists("pokemon_desc_" & dexID) = True Then
DexEntryText = Localization.GetString("pokemon_desc_" & dexID, Pokemon.PokedexEntry.Text)
End If
If Localization.TokenExists("pokemon_species_" & dexID) = True Then
DexEntrySpecies = Localization.GetString("pokemon_species_" & dexID, Pokemon.PokedexEntry.Species)
End If End If
Core.SpriteBatch.DrawString(FontManager.MainFont, Pokemon.PokedexEntry.Height & " m", New Vector2(CInt(mV.X + 250), CInt(mV.Y - 152)), Color.Black) Core.SpriteBatch.DrawString(FontManager.MainFont, Pokemon.PokedexEntry.Height & " m", New Vector2(CInt(mV.X + 250), CInt(mV.Y - 152)), Color.Black)

7
P3D/World/ActionScript/V2/ScriptConstructs/DoPokedex.vb
View File

@ -69,8 +69,11 @@
End If End If
If Pokemon.PokemonDataExists(dexID) Then If Pokemon.PokemonDataExists(dexID) Then
If Localization.LanguageSuffix <> "en" AndAlso Localization.TokenExists("pokemon_desc_" & dexID) = True Then Dim p As Pokemon = Pokemon.GetPokemonByID(id, ad)
Return Localization.GetString("pokemon_desc_" & dexID, Pokemon.GetPokemonByID(id, ad).PokedexEntry.Text) Dim FormName As String = PokemonForms.GetFormName(p)
If Localization.LanguageSuffix <> "en" AndAlso Localization.TokenExists("pokemon_desc_" & FormName) = True Then
Return Localization.GetString("pokemon_desc_" & FormName, Pokemon.GetPokemonByID(id, ad).PokedexEntry.Text)
Else Else
Return Pokemon.GetPokemonByID(id, ad).PokedexEntry.Text Return Pokemon.GetPokemonByID(id, ad).PokedexEntry.Text
End If End If