mirror of
https://github.com/P3D-Legacy/P3D-Legacy.git
synced 2025-04-08 18:35:09 +02:00
Some better catchmethod and catchlocation grabbing
This commit is contained in:
parent
e6c32dc8a1
commit
dab71b95f7
@ -120,6 +120,7 @@ Catch Method & Location:
|
||||
CatchMethod_Empty,Somehow obtained at
|
||||
CatchMethod_Caught,Caught at
|
||||
CatchMethod_Obtained,Obtained at
|
||||
CatchMethod_Appeared,Appeared at
|
||||
|
||||
CatchLocation_Empty,an unknown place
|
||||
---
|
||||
|
@ -121,6 +121,7 @@ Catch Method & Location:
|
||||
CatchMethod_Empty,Somehow obtained at
|
||||
CatchMethod_Caught,Caught at
|
||||
CatchMethod_Obtained,Obtained at
|
||||
CatchMethod_Appeared,Appeared at
|
||||
|
||||
CatchLocation_Empty,an unknown place
|
||||
---
|
||||
|
@ -121,6 +121,7 @@ Catch Method & Location:
|
||||
CatchMethod_Empty,Somehow obtained at
|
||||
CatchMethod_Caught,Caught at
|
||||
CatchMethod_Obtained,Obtained at
|
||||
CatchMethod_Appeared,Appeared at
|
||||
|
||||
CatchLocation_Empty,an unknown place
|
||||
---
|
||||
|
@ -119,6 +119,7 @@ Catch Method & Location:
|
||||
CatchMethod_Empty,Somehow obtained at
|
||||
CatchMethod_Caught,Caught at
|
||||
CatchMethod_Obtained,Obtained at
|
||||
CatchMethod_Appeared,Appeared at
|
||||
|
||||
CatchLocation_Empty,an unknown place
|
||||
---
|
||||
|
@ -120,6 +120,7 @@ Catch Method & Location:
|
||||
CatchMethod_Empty,Zomaar ontvangen bij
|
||||
CatchMethod_Caught,Gevangen bij
|
||||
CatchMethod_Obtained,Ontvangen bij
|
||||
CatchMethod_Appeared,Verschenen bij
|
||||
|
||||
CatchLocation_Empty,een onbekende plek
|
||||
---
|
||||
|
@ -121,6 +121,7 @@ Catch Method & Location:
|
||||
CatchMethod_Empty,Jakoś otrzymano w:
|
||||
CatchMethod_Caught,Złapano w:
|
||||
CatchMethod_Obtained,Otrzymano w:
|
||||
CatchMethod_Appeared,Appeared at
|
||||
|
||||
CatchLocation_Empty,nieznanym miejscu
|
||||
---
|
||||
|
@ -119,6 +119,7 @@ Catch Method & Location:
|
||||
CatchMethod_Empty,Somehow obtained at
|
||||
CatchMethod_Caught,Caught at
|
||||
CatchMethod_Obtained,Obtained at
|
||||
CatchMethod_Appeared,Appeared at
|
||||
|
||||
CatchLocation_Empty,an unknown place
|
||||
---
|
||||
|
@ -420,8 +420,6 @@ Public Class Pokemon
|
||||
Get
|
||||
If _catchLocation.StartsWith("<system.token(") AndAlso _catchLocation.EndsWith(")>") Then
|
||||
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
|
||||
Return Me._catchLocation
|
||||
End If
|
||||
@ -2846,7 +2844,7 @@ Public Class Pokemon
|
||||
''' <param name="Ball">The Pokéball this Pokémon got captured in.</param>
|
||||
''' <param name="Method">The capture method.</param>
|
||||
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.OT = Core.Player.OT
|
||||
|
||||
|
@ -31,8 +31,8 @@ Public Class Shedinja
|
||||
'Set base infos:
|
||||
p.OT = Ninjask.OT
|
||||
p.CatchTrainerName = Ninjask.CatchTrainerName
|
||||
p.CatchMethod = "appeared at"
|
||||
p.CatchLocation = Screen.Level.MapName
|
||||
p.CatchMethod = Localization.GetString("CatchMethod_Appeared", "Appeared at")
|
||||
p.CatchLocation = Localization.GetString("Places_" & Screen.Level.MapName, Screen.Level.MapName)
|
||||
p.IsShiny = Ninjask.IsShiny
|
||||
p.Nature = Ninjask.Nature
|
||||
|
||||
|
Loading…
x
Reference in New Issue
Block a user