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

Revert "Use [ ] instead of < > for pkmn catchinfo tokens.." 

This reverts commit 2fa95df3e7.
This commit is contained in:
JappaWakka 2025-02-15 19:10:09 +01:00
parent 2fa95df3e7
commit d9b7e2258b
2 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -416,9 +416,9 @@ Public Class Pokemon
End Set
End Property
Public Property CatchLocation(Optional saveGame As Boolean = False) As String
Public Property CatchLocation() As String
Get
If saveGame = False AndAlso (_catchLocation.StartsWith("<system.token(") AndAlso _catchLocation.EndsWith(")>") OrElse _catchLocation.StartsWith("[system.token(") AndAlso _catchLocation.EndsWith(")]")) Then
If _catchLocation.StartsWith("<system.token(") AndAlso _catchLocation.EndsWith(")>") Then
Return Localization.GetString(_catchLocation.Remove(_catchLocation.Length - 2, 2).Remove(0, "<system.token(".Length))
Else
Return Me._catchLocation
@ -429,9 +429,9 @@ Public Class Pokemon
End Set
End Property
Public Property CatchTrainerName(Optional saveGame As Boolean = False) As String
Public Property CatchTrainerName() As String
Get
If saveGame = False AndAlso (_catchTrainerName.StartsWith("<system.token(") AndAlso _catchTrainerName.EndsWith(")>") OrElse _catchTrainerName.StartsWith("[system.token(") AndAlso _catchTrainerName.EndsWith(")]")) Then
If _catchTrainerName.StartsWith("<system.token(") AndAlso _catchTrainerName.EndsWith(")>") Then
Return Localization.GetString(_catchTrainerName.Remove(_catchTrainerName.Length - 2, 2).Remove(0, "<system.token(".Length))
Else
Return Me._catchTrainerName
@ -442,9 +442,9 @@ Public Class Pokemon
End Set
End Property
Public Property CatchMethod(Optional saveGame As Boolean = False) As String
Public Property CatchMethod() As String
Get
If saveGame = False AndAlso (_catchMethod.StartsWith("<system.token(") AndAlso _catchMethod.EndsWith(")>") OrElse _catchMethod.StartsWith("[system.token(") AndAlso _catchMethod.EndsWith(")]")) Then
If _catchMethod.StartsWith("<system.token(") AndAlso _catchMethod.EndsWith(")>") Then
Return Localization.GetString(_catchMethod.Remove(_catchMethod.Length - 2, 2).Remove(0, "<system.token(".Length))
Else
Return Me._catchMethod
@ -1973,10 +1973,10 @@ Public Class Pokemon
"{""Ability""[" & Me.Ability.ID & "]}" &
"{""Status""[" & SaveStatus & "]}" &
"{""Nature""[" & Me.Nature & "]}" &
"{""CatchLocation""[" & Me.CatchLocation(True) & "]}" &
"{""CatchTrainer""[" & Me.CatchTrainerName(True) & "]}" &
"{""CatchLocation""[" & Me.CatchLocation & "]}" &
"{""CatchTrainer""[" & Me.CatchTrainerName & "]}" &
"{""CatchBall""[" & Me.CatchBall.ID & "]}" &
"{""CatchMethod""[" & Me.CatchMethod(True) & "]}" &
"{""CatchMethod""[" & Me.CatchMethod & "]}" &
"{""Friendship""[" & Me.Friendship & "]}" &
"{""isShiny""[" & shinyString & "]}" &
"{""Attack1""[" & A1 & "]}" &

2
P3D/Screens/Pokemon/SummaryScreen.vb
View File

@ -413,7 +413,7 @@
.CatchLocation = "an unknown place"
End If
Dim text As String = .CatchMethod.Replace(.CatchMethod(False)(0), Char.ToUpper(.CatchMethod(False)(0))) & " " & .CatchLocation & "."
Dim text As String = .CatchMethod.Replace(.CatchMethod(0), Char.ToUpper(.CatchMethod(0))) & " " & .CatchLocation & "."
SpriteBatch.DrawString(FontManager.MainFont, text.CropStringToWidth(FontManager.MainFont, 1.0F, 300), New Vector2(DeltaX + 358, DeltaY + 336 + 128), New Color(255, 255, 255, CInt(220 * _fadeIn * _pageFade)))