From 90b13caf940a424acadbc2d304051fdfdb02e4f6 Mon Sep 17 00:00:00 2001 From: JappaWakka Date: Fri, 23 Aug 2024 19:10:58 +0200 Subject: [PATCH] .poke level and pokeID can contain constructs --- P3D/Pokemon/Wild/Spawner.vb | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/P3D/Pokemon/Wild/Spawner.vb b/P3D/Pokemon/Wild/Spawner.vb index 2e359e896..f5119480e 100644 --- a/P3D/Pokemon/Wild/Spawner.vb +++ b/P3D/Pokemon/Wild/Spawner.vb @@ -56,10 +56,10 @@ Public Class Spawner Dim splits() As String = Line.Split(CChar("|")) Dim PMethod As Integer = CInt(splits(0)) - Dim Pokemon As String = splits(1) + Dim Pokemon As String = P3D.ScriptVersion2.ScriptCommander.Parse(splits(1)).ToString Dim Chance As Integer = CInt(splits(2)) Dim DayTime() As String = splits(3).Split(CChar(",")) - Dim levelCap As String = splits(4) + Dim levelCap As String = P3D.ScriptVersion2.ScriptCommander.Parse(splits(4)).ToString 'Optional Season and Weather checks: Dim Weathers() As String = {"-1"} @@ -191,7 +191,9 @@ Public Class Spawner End If Next If Pokemons(i).Contains("_") Then - PkAD = Pokemons(i).Split(CChar("_"))(1) + PkAD = PokemonForms.GetAdditionalValueFromDataFile(Pokemons(i).Split(CChar("_"))(1)) + ElseIf Pokemons(i).Contains(";") Then + PkAD = Pokemons(i).Split(CChar(";"))(1) End If p = Pokemon.GetPokemonByID(PkID, PkAD) p.Generate(level, True, PkAD)