From 1db6f81cb37ff305294853c86248cad06341cf84 Mon Sep 17 00:00:00 2001 From: JappaWakka Date: Thu, 30 Jan 2025 09:51:59 +0100 Subject: [PATCH] Check if attack args not "" before CInt() --- P3D/Pokemon/Attacks/AttackSpecialFunctions.vb | 24 +++++++++++++------ 1 file changed, 17 insertions(+), 7 deletions(-) diff --git a/P3D/Pokemon/Attacks/AttackSpecialFunctions.vb b/P3D/Pokemon/Attacks/AttackSpecialFunctions.vb index 437528dda..91ff520b4 100644 --- a/P3D/Pokemon/Attacks/AttackSpecialFunctions.vb +++ b/P3D/Pokemon/Attacks/AttackSpecialFunctions.vb @@ -235,12 +235,16 @@ If f.Split(CChar(",")).Count > 3 Then Message = f.GetSplit(3, ",") If f.Split(CChar(",")).Count > 4 Then - If CInt(f.GetSplit(4, ",")) > 0 Then - RaiseAmount = CInt(f.GetSplit(4, ",")) + If f.GetSplit(4, ",") <> "" Then + If CInt(f.GetSplit(4, ",")) > 0 Then + RaiseAmount = CInt(f.GetSplit(4, ",")) + End If End If If f.Split(CChar(",")).Count > 5 Then - If CInt(f.GetSplit(5, ",")) > 0 Then - Chance = CInt(f.GetSplit(5, ",")) + If f.GetSplit(5, ",") <> "" Then + If CInt(f.GetSplit(5, ",")) > 0 Then + Chance = CInt(f.GetSplit(5, ",")) + End If End If If f.Split(CChar(",")).Count > 6 Then FailMessage = f.GetSplit(6, ",") @@ -264,11 +268,17 @@ Message = f.GetSplit(3, ",") If f.Split(CChar(",")).Count > 4 Then If CInt(f.GetSplit(4, ",")) > 0 Then - LowerAmount = CInt(f.GetSplit(4, ",")) + If f.GetSplit(4, ",") <> "" Then + If CInt(f.GetSplit(4, ",")) > 0 Then + LowerAmount = CInt(f.GetSplit(4, ",")) + End If + End If End If If f.Split(CChar(",")).Count > 5 Then - If CInt(f.GetSplit(5, ",")) > 0 Then - Chance = CInt(f.GetSplit(5, ",")) + If f.GetSplit(5, ",") <> "" Then + If CInt(f.GetSplit(5, ",")) > 0 Then + Chance = CInt(f.GetSplit(5, ",")) + End If End If If f.Split(CChar(",")).Count > 6 Then FailMessage = f.GetSplit(6, ",")