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

Change RoamingID from int to str

Browse Source
This commit is contained in:
JappaWakka 2024-04-04 17:52:47 +02:00
parent f280c5718c
commit 65ec57d27b
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
P3D/Pokemon/Monster/RoamingPokemon.vb
View File

@ -1,6 +1,6 @@
Public Class RoamingPokemon Public Class RoamingPokemon
Public RoamerID As Integer = -1 Public RoamerID As String = ""
Public WorldID As Integer = -1 Public WorldID As Integer = -1
Public LevelFile As String = "" Public LevelFile As String = ""
Public MusicLoop As String = "" Public MusicLoop As String = ""
@ -10,7 +10,7 @@ Public Class RoamingPokemon
Public Sub New(ByVal DataLine As String) Public Sub New(ByVal DataLine As String)
Dim data() As String = DataLine.Split(CChar("|")) Dim data() As String = DataLine.Split(CChar("|"))
Me.RoamerID = CInt(data(0)) Me.RoamerID = data(0)
Me.PokemonReference = Pokemon.GetPokemonByData(data(6)) Me.PokemonReference = Pokemon.GetPokemonByData(data(6))
Me.WorldID = CInt(data(3)) Me.WorldID = CInt(data(3))
@ -23,7 +23,7 @@ Public Class RoamingPokemon
End Sub End Sub
Public Function CompareData() As String 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 End Function
Public Function GetPokemon() As Pokemon Public Function GetPokemon() As Pokemon

2
P3D/World/ActionScript/V2/ScriptLibrary.vb
View File

@ -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.")) 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), 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.")) 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("pokemonID", ScriptArgument.ArgumentTypes.Str),
New ScriptArgument("level", ScriptArgument.ArgumentTypes.Int), New ScriptArgument("level", ScriptArgument.ArgumentTypes.Int),
New ScriptArgument("regionID", ScriptArgument.ArgumentTypes.Int), New ScriptArgument("regionID", ScriptArgument.ArgumentTypes.Int),