tyler.durden
/
P3D-Legacy
mirror of https://github.com/P3D-Legacy/P3D-Legacy.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix form names

This commit is contained in:
JappaWakka 2023-07-09 11:55:07 +02:00
parent 6764062c79
commit d2d937e336
1 changed files with 24 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
P3D/Pokemon/Monster/Pokemon.vb
View File

@ -2280,10 +2280,19 @@ Public Class Pokemon
Return "Egg" Return "Egg"
Else Else
If Me.NickName = "" Then If Me.NickName = "" Then
If Localization.TokenExists("pokemon_name_" & Me.Name) = True Then If PokemonForms.GetFormName(Me) <> "" Then
Return Localization.GetString("pokemon_name_" & Me.Name) Dim FormName As String = PokemonForms.GetFormName(Me)
If Localization.TokenExists("pokemon_name_" & FormName) = True Then
Return Localization.GetString("pokemon_name_" & FormName)
Else
Return FormName
End If
Else Else
Return Me.Name If Localization.TokenExists("pokemon_name_" & Me.Name) = True Then
Return Localization.GetString("pokemon_name_" & Me.Name)
Else
Return Me.Name
End If
End If End If
Else Else
Return Me.NickName Return Me.NickName
@ -2295,10 +2304,19 @@ Public Class Pokemon
''' Returns the properly translated name of a Pokémon if defined in the language files. ''' Returns the properly translated name of a Pokémon if defined in the language files.
''' </summary> ''' </summary>
Public Function GetName() As String Public Function GetName() As String
If Localization.TokenExists("pokemon_name_" & Me.Name) = True Then If PokemonForms.GetFormName(Me) <> "" Then
Return Localization.GetString("pokemon_name_" & Me.Name) Dim FormName As String = PokemonForms.GetFormName(Me)
If Localization.TokenExists("pokemon_name_" & FormName) = True Then
Return Localization.GetString("pokemon_name_" & FormName)
Else
Return FormName
End If
Else Else
Return Me.Name If Localization.TokenExists("pokemon_name_" & Me.Name) = True Then
Return Localization.GetString("pokemon_name_" & Me.Name)
Else
Return Me.Name
End If
End If End If
End Function End Function