From 5019a59c0de58d6e8e835475f6646cf1f19a9436 Mon Sep 17 00:00:00 2001 From: JappaWakka Date: Wed, 8 Nov 2023 10:14:18 +0100 Subject: [PATCH] Fix moves being able to do 0 damage --- P3D/Battle/BattleSystemV2/Battle.vb | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/P3D/Battle/BattleSystemV2/Battle.vb b/P3D/Battle/BattleSystemV2/Battle.vb index 5c835a913..a546e08f9 100644 --- a/P3D/Battle/BattleSystemV2/Battle.vb +++ b/P3D/Battle/BattleSystemV2/Battle.vb @@ -2152,8 +2152,15 @@ Damage = moveUsed.GetDamage(Critical, own, Not own, BattleScreen) End If - If effectiveness <> 0 Then + + If Damage = 0 Then + BattleScreen.BattleQuery.Add(New TextQueryObject("But it failed...")) + moveUsed.MoveMisses(own, BattleScreen) + effectiveness = 0 + Exit For + End If + Dim sturdyWorked As Boolean = False If substitute = 0 Then