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

Some better catchmethod and catchlocation grabbing

Browse Source
This commit is contained in:
JappaWakka 2025-03-28 14:32:03 +01:00
parent e6c32dc8a1
commit dab71b95f7
9 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
P3D/Content/Localization/Tokens_de.dat
View File

@ -120,6 +120,7 @@ Catch Method & Location:
CatchMethod_Empty,Somehow obtained at CatchMethod_Empty,Somehow obtained at
CatchMethod_Caught,Caught at CatchMethod_Caught,Caught at
CatchMethod_Obtained,Obtained at CatchMethod_Obtained,Obtained at
CatchMethod_Appeared,Appeared at
CatchLocation_Empty,an unknown place CatchLocation_Empty,an unknown place
--- ---

1
P3D/Content/Localization/Tokens_en.dat
View File

@ -121,6 +121,7 @@ Catch Method & Location:
CatchMethod_Empty,Somehow obtained at CatchMethod_Empty,Somehow obtained at
CatchMethod_Caught,Caught at CatchMethod_Caught,Caught at
CatchMethod_Obtained,Obtained at CatchMethod_Obtained,Obtained at
CatchMethod_Appeared,Appeared at
CatchLocation_Empty,an unknown place CatchLocation_Empty,an unknown place
--- ---

1
P3D/Content/Localization/Tokens_es.dat
View File

@ -121,6 +121,7 @@ Catch Method & Location:
CatchMethod_Empty,Somehow obtained at CatchMethod_Empty,Somehow obtained at
CatchMethod_Caught,Caught at CatchMethod_Caught,Caught at
CatchMethod_Obtained,Obtained at CatchMethod_Obtained,Obtained at
CatchMethod_Appeared,Appeared at
CatchLocation_Empty,an unknown place CatchLocation_Empty,an unknown place
--- ---

1
P3D/Content/Localization/Tokens_fr.dat
View File

@ -119,6 +119,7 @@ Catch Method & Location:
CatchMethod_Empty,Somehow obtained at CatchMethod_Empty,Somehow obtained at
CatchMethod_Caught,Caught at CatchMethod_Caught,Caught at
CatchMethod_Obtained,Obtained at CatchMethod_Obtained,Obtained at
CatchMethod_Appeared,Appeared at
CatchLocation_Empty,an unknown place CatchLocation_Empty,an unknown place
--- ---

1
P3D/Content/Localization/Tokens_nl.dat
View File

@ -120,6 +120,7 @@ Catch Method & Location:
CatchMethod_Empty,Zomaar ontvangen bij CatchMethod_Empty,Zomaar ontvangen bij
CatchMethod_Caught,Gevangen bij CatchMethod_Caught,Gevangen bij
CatchMethod_Obtained,Ontvangen bij CatchMethod_Obtained,Ontvangen bij
CatchMethod_Appeared,Verschenen bij
CatchLocation_Empty,een onbekende plek CatchLocation_Empty,een onbekende plek
--- ---

1
P3D/Content/Localization/Tokens_pl.dat
View File

@ -121,6 +121,7 @@ Catch Method & Location:
CatchMethod_Empty,Jakoś otrzymano w: CatchMethod_Empty,Jakoś otrzymano w:
CatchMethod_Caught,Złapano w: CatchMethod_Caught,Złapano w:
CatchMethod_Obtained,Otrzymano w: CatchMethod_Obtained,Otrzymano w:
CatchMethod_Appeared,Appeared at
CatchLocation_Empty,nieznanym miejscu CatchLocation_Empty,nieznanym miejscu
--- ---

1
P3D/Content/Localization/Tokens_ptbr.dat
View File

@ -119,6 +119,7 @@ Catch Method & Location:
CatchMethod_Empty,Somehow obtained at CatchMethod_Empty,Somehow obtained at
CatchMethod_Caught,Caught at CatchMethod_Caught,Caught at
CatchMethod_Obtained,Obtained at CatchMethod_Obtained,Obtained at
CatchMethod_Appeared,Appeared at
CatchLocation_Empty,an unknown place CatchLocation_Empty,an unknown place
--- ---

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

@ -420,8 +420,6 @@ Public Class Pokemon
Get Get
If _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)) Return Localization.GetString(_catchLocation.Remove(_catchLocation.Length - 2, 2).Remove(0, "<system.token(".Length))
ElseIf Localization.TokenExists(Localization.GetString("Places_" & _catchLocation, _catchLocation)) Then
Return Localization.GetString("Places_" & _catchLocation, _catchLocation)
Else Else
Return Me._catchLocation Return Me._catchLocation
End If End If
@ -2846,7 +2844,7 @@ Public Class Pokemon
''' <param name="Ball">The Pokéball this Pokémon got captured in.</param> ''' <param name="Ball">The Pokéball this Pokémon got captured in.</param>
''' <param name="Method">The capture method.</param> ''' <param name="Method">The capture method.</param>
Public Sub SetCatchInfos(ByVal Ball As Item, ByVal Method As String) Public Sub SetCatchInfos(ByVal Ball As Item, ByVal Method As String)
Me.CatchLocation = Screen.Level.MapName Me.CatchLocation = Localization.GetString("Places_" & Screen.Level.MapName, Screen.Level.MapName)
Me.CatchTrainerName = Core.Player.Name Me.CatchTrainerName = Core.Player.Name
Me.OT = Core.Player.OT Me.OT = Core.Player.OT

4
P3D/Pokemon/Monster/Shedinja.vb
View File

@ -31,8 +31,8 @@ Public Class Shedinja
'Set base infos: 'Set base infos:
p.OT = Ninjask.OT p.OT = Ninjask.OT
p.CatchTrainerName = Ninjask.CatchTrainerName p.CatchTrainerName = Ninjask.CatchTrainerName
p.CatchMethod = "appeared at" p.CatchMethod = Localization.GetString("CatchMethod_Appeared", "Appeared at")
p.CatchLocation = Screen.Level.MapName p.CatchLocation = Localization.GetString("Places_" & Screen.Level.MapName, Screen.Level.MapName)
p.IsShiny = Ninjask.IsShiny p.IsShiny = Ninjask.IsShiny
p.Nature = Ninjask.Nature p.Nature = Ninjask.Nature