From 65ec57d27b0eb81969d07abcd34f0c2fcbba29a6 Mon Sep 17 00:00:00 2001 From: JappaWakka Date: Thu, 4 Apr 2024 17:52:47 +0200 Subject: [PATCH] Change RoamingID from int to str --- P3D/Pokemon/Monster/RoamingPokemon.vb | 6 +++--- P3D/World/ActionScript/V2/ScriptLibrary.vb | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/P3D/Pokemon/Monster/RoamingPokemon.vb b/P3D/Pokemon/Monster/RoamingPokemon.vb index 02af541cd..faf52d4ac 100644 --- a/P3D/Pokemon/Monster/RoamingPokemon.vb +++ b/P3D/Pokemon/Monster/RoamingPokemon.vb @@ -1,6 +1,6 @@ Public Class RoamingPokemon - Public RoamerID As Integer = -1 + Public RoamerID As String = "" Public WorldID As Integer = -1 Public LevelFile As String = "" Public MusicLoop As String = "" @@ -10,7 +10,7 @@ Public Class RoamingPokemon Public Sub New(ByVal DataLine As String) Dim data() As String = DataLine.Split(CChar("|")) - Me.RoamerID = CInt(data(0)) + Me.RoamerID = data(0) Me.PokemonReference = Pokemon.GetPokemonByData(data(6)) Me.WorldID = CInt(data(3)) @@ -23,7 +23,7 @@ Public Class RoamingPokemon End Sub Public Function CompareData() As String - Return Me.RoamerID.ToString & "|" & PokemonForms.GetPokemonDataFileName(Me.PokemonReference.Number, Me.PokemonReference.AdditionalData, True) & "|" & Me.PokemonReference.Level.ToString() & "|" & Me.WorldID.ToString() & "|" + Return Me.RoamerID & "|" & PokemonForms.GetPokemonDataFileName(Me.PokemonReference.Number, Me.PokemonReference.AdditionalData, True) & "|" & Me.PokemonReference.Level.ToString() & "|" & Me.WorldID.ToString() & "|" End Function Public Function GetPokemon() As Pokemon diff --git a/P3D/World/ActionScript/V2/ScriptLibrary.vb b/P3D/World/ActionScript/V2/ScriptLibrary.vb index 523af31ee..77be2dddc 100644 --- a/P3D/World/ActionScript/V2/ScriptLibrary.vb +++ b/P3D/World/ActionScript/V2/ScriptLibrary.vb @@ -804,7 +804,7 @@ Namespace ScriptVersion2 New ScriptArgument("location", ScriptArgument.ArgumentTypes.Str)}.ToList(), "Sets the Catch Location of a Pokémon in the player's party.")) r(New ScriptCommand("pokemon", "setstatus", {New ScriptArgument("pokemonIndex", ScriptArgument.ArgumentTypes.Int), New ScriptArgument("status", ScriptArgument.ArgumentTypes.Str, {"brn", "frz", "prz", "psn", "bpsn", "slp", "fnt"})}.ToList(), "Sets the status of a Pokémon in the player's party. Setting that to ""fnt"" (Fainted) will also set the Pokémon's HP to 0.")) - r(New ScriptCommand("pokemon", "newroaming", {New ScriptArgument("roamerID", ScriptArgument.ArgumentTypes.Int), + r(New ScriptCommand("pokemon", "newroaming", {New ScriptArgument("roamerID", ScriptArgument.ArgumentTypes.Str), New ScriptArgument("pokemonID", ScriptArgument.ArgumentTypes.Str), New ScriptArgument("level", ScriptArgument.ArgumentTypes.Int), New ScriptArgument("regionID", ScriptArgument.ArgumentTypes.Int),