From 20e456ead8187a0d9f10f39cda8e1cc8329c31de Mon Sep 17 00:00:00 2001 From: JappaWakka Date: Tue, 27 Jun 2023 15:50:57 +0200 Subject: [PATCH] =?UTF-8?q?Return=20regular=20pok=C3=A9mon=20name=20if=20n?= =?UTF-8?q?o=20nickname?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- P3D/World/ActionScript/V2/ScriptConstructs/DoPokemon.vb | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/P3D/World/ActionScript/V2/ScriptConstructs/DoPokemon.vb b/P3D/World/ActionScript/V2/ScriptConstructs/DoPokemon.vb index 25a5b3cf2..9430ec09a 100644 --- a/P3D/World/ActionScript/V2/ScriptConstructs/DoPokemon.vb +++ b/P3D/World/ActionScript/V2/ScriptConstructs/DoPokemon.vb @@ -56,7 +56,11 @@ Return Core.Player.Pokemons(index).AdditionalData Case "nickname" Dim index As Integer = int(argument.GetSplit(0)) - Return Core.Player.Pokemons(index).NickName + If Core.Player.Pokemons(index).NickName <> "" Then + Return Core.Player.Pokemons(index).NickName + Else + Return Core.Player.Pokemons(index).GetName + End If Case "hasnickname" Dim index As Integer = int(argument.GetSplit(0)) Return (Core.Player.Pokemons(index).NickName = "")