From e13fce85b0dbe9bcb29617d94678bf60d7a4aaef Mon Sep 17 00:00:00 2001 From: darkfire006 Date: Sun, 6 Oct 2019 22:24:08 -0500 Subject: [PATCH] =?UTF-8?q?replace=20[]=20with=20=C2=AB=C2=BB=20for=20outp?= =?UTF-8?q?ut/input=20of=20pokemon=20data?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- P3D/World/ActionScript/V2/ScriptCommands/DoPokemon.vb | 4 ++-- P3D/World/ActionScript/V2/ScriptConstructs/DoPokemon.vb | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/P3D/World/ActionScript/V2/ScriptCommands/DoPokemon.vb b/P3D/World/ActionScript/V2/ScriptCommands/DoPokemon.vb index e5f54694b..01a25b6c5 100644 --- a/P3D/World/ActionScript/V2/ScriptCommands/DoPokemon.vb +++ b/P3D/World/ActionScript/V2/ScriptCommands/DoPokemon.vb @@ -33,7 +33,7 @@ argument = argument.Remove(0, argument.IndexOf("{")) - Dim p As Pokemon = Pokemon.GetPokemonByData(argument.Replace("§", ",")) + Dim p As Pokemon = Pokemon.GetPokemonByData(argument.Replace("§", ",").Replace("«", "[").Replace("»", "]")) Core.Player.Pokemons.Insert(insertIndex, p) Dim pokedexType As Integer = 2 @@ -710,7 +710,7 @@ argument = argument.Remove(0, argument.IndexOf("{")) - Dim p As Pokemon = Pokemon.GetPokemonByData(argument.Replace("§", ",")) + Dim p As Pokemon = Pokemon.GetPokemonByData(argument.Replace("§", ",").Replace("«", "[").Replace("»", "]")) StorageSystemScreen.DepositPokemon(p, insertIndex) Dim pokedexType As Integer = 2 diff --git a/P3D/World/ActionScript/V2/ScriptConstructs/DoPokemon.vb b/P3D/World/ActionScript/V2/ScriptConstructs/DoPokemon.vb index d081fc23a..a9f836b4b 100644 --- a/P3D/World/ActionScript/V2/ScriptConstructs/DoPokemon.vb +++ b/P3D/World/ActionScript/V2/ScriptConstructs/DoPokemon.vb @@ -16,7 +16,7 @@ Return Core.Player.Pokemons(index).Number Case "data" Dim index As Integer = int(argument.GetSplit(0)) - Return Core.Player.Pokemons(index).GetSaveData().Replace(",", "§") + Return Core.Player.Pokemons(index).GetSaveData().Replace(",", "§").Replace("[", "«").Replace("]", "»") Case "level" Dim index As Integer = int(argument.GetSplit(0)) Return Core.Player.Pokemons(index).Level @@ -274,16 +274,16 @@ Next End If - Return FrontierSpawner.GetPokemon(level, pokemon_class, IDPreset).GetSaveData().Replace(",", "§") + Return FrontierSpawner.GetPokemon(level, pokemon_class, IDPreset).GetSaveData().Replace(",", "§").Replace("[", "«").Replace("]", "»") Case "spawnwild" - Return Spawner.GetPokemon(Screen.Level.LevelFile, CType(int(argument), Spawner.EncounterMethods)).GetSaveData().Replace(",", "§") + Return Spawner.GetPokemon(Screen.Level.LevelFile, CType(int(argument), Spawner.EncounterMethods)).GetSaveData().Replace(",", "§").Replace("[", "«").Replace("]", "»") Case "spawn" Dim ID As Integer = int(argument.GetSplit(0)) Dim level As Integer = int(argument.GetSplit(1)) Dim p As Pokemon = Pokemon.GetPokemonByID(ID) p.Generate(level, True) - Return p.GetSaveData().Replace(",", "§") + Return p.GetSaveData().Replace(",", "§").Replace("[", "«").Replace("]", "»") Case "otmatch" ' Arguments: has: returns boolean, ID: returns Pokédex number, Name: returns name, maxhits: returns the maximum number of equal chars.