From 4805bb28362620d807e17b72d1472e2c194181f6 Mon Sep 17 00:00:00 2001
From: JappaWakka <jjlspeelman@outlook.com>
Date: Sun, 4 Jun 2023 18:18:33 +0200
Subject: [PATCH] Made NPC Trade CatchMethod & Location localizable
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Also fixed catchlocation with Pokémon add commands
---
 P3D/World/ActionScript/Script.vb                   | 14 ++++++++++++--
 .../ActionScript/V2/ScriptCommands/DoPokemon.vb    |  4 ++--
 2 files changed, 14 insertions(+), 4 deletions(-)

diff --git a/P3D/World/ActionScript/Script.vb b/P3D/World/ActionScript/Script.vb
index b98860812..887406716 100644
--- a/P3D/World/ActionScript/Script.vb
+++ b/P3D/World/ActionScript/Script.vb
@@ -273,8 +273,18 @@
             oppPokemon.Item = Item.GetItemByID(itemID)
         End If
 
-        oppPokemon.CatchLocation = Script.SaveNPCTrade(10)
-        oppPokemon.CatchMethod = Script.SaveNPCTrade(11)
+        Dim catchLocationLocalization As String = Script.SaveNPCTrade(10)
+        If Script.SaveNPCTrade(10).StartsWith("<system.token(") AndAlso Script.SaveNPCTrade(10).EndsWith(")>") Then
+            catchLocationLocalization = Localization.GetString(catchLocationLocalization.Remove(0, "<system.token(".Length).Remove(Script.SaveNPCTrade(10).Length - 2, 2))
+        End If
+
+        Dim catchMethodLocalization As String = Script.SaveNPCTrade(11)
+        If Script.SaveNPCTrade(11).StartsWith("<system.token(") AndAlso Script.SaveNPCTrade(11).EndsWith(")>") Then
+            catchMethodLocalization = Localization.GetString(catchMethodLocalization.Remove(0, "<system.token(".Length).Remove(Script.SaveNPCTrade(11).Length - 2, 2))
+        End If
+
+        oppPokemon.CatchLocation = catchLocationLocalization
+        oppPokemon.CatchMethod = catchMethodLocalization
         oppPokemon.NickName = Script.SaveNPCTrade(12)
 
         Dim message1 As String = Script.SaveNPCTrade(13)
diff --git a/P3D/World/ActionScript/V2/ScriptCommands/DoPokemon.vb b/P3D/World/ActionScript/V2/ScriptCommands/DoPokemon.vb
index 9e65dcd19..16d46983c 100644
--- a/P3D/World/ActionScript/V2/ScriptCommands/DoPokemon.vb
+++ b/P3D/World/ActionScript/V2/ScriptCommands/DoPokemon.vb
@@ -74,7 +74,7 @@
                         If commas > 3 Then
                             Dim catchLocationLocalization As String = argument.GetSplit(4)
                             If argument.GetSplit(4).StartsWith("<system.token(") AndAlso argument.GetSplit(4).EndsWith(")>") Then
-                                catchLocationLocalization = Localization.GetString(catchLocationLocalization.Remove(0, "<system.token(".Length).Remove(argument.GetSplit(2).Length - 2, 2))
+                                catchLocationLocalization = Localization.GetString(catchLocationLocalization.Remove(0, "<system.token(".Length).Remove(argument.GetSplit(4).Length - 2, 2))
                             End If
                             catchLocation = catchLocationLocalization
                         End If
@@ -793,7 +793,7 @@
                         If commas > 3 Then
                             Dim catchLocationLocalization As String = argument.GetSplit(4)
                             If argument.GetSplit(4).StartsWith("<system.token(") AndAlso argument.GetSplit(4).EndsWith(")>") Then
-                                catchLocationLocalization = Localization.GetString(catchLocationLocalization.Remove(0, "<system.token(".Length).Remove(argument.GetSplit(2).Length - 2, 2))
+                                catchLocationLocalization = Localization.GetString(catchLocationLocalization.Remove(0, "<system.token(".Length).Remove(argument.GetSplit(4).Length - 2, 2))
                             End If
                             catchLocation = catchLocationLocalization
                         End If