From 09e38bad39d33f21eeec6f95c944a4c31dc7a13f Mon Sep 17 00:00:00 2001
From: Sirz Benjie <142067137+SirzBenjie@users.noreply.github.com>
Date: Sat, 10 May 2025 19:05:18 -0500
Subject: [PATCH] Set lastHit to true when target faints during multi-hit move

---
 src/phases/move-effect-phase.ts | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/src/phases/move-effect-phase.ts b/src/phases/move-effect-phase.ts
index c65e8e15271..462e4ba47b8 100644
--- a/src/phases/move-effect-phase.ts
+++ b/src/phases/move-effect-phase.ts
@@ -905,6 +905,14 @@ export class MoveEffectPhase extends PokemonPhase {
 
     target.destroySubstitute();
     target.lapseTag(BattlerTagType.COMMANDED);
+
+    // Force `lastHit` to be true if this is a multi hit move with hits left
+    // `hitsLeft` must be left as-is in order for the message displaying the number of hits
+    // to display the proper number.
+    // Note: When Dragon Darts' smart targeting is implemented, this logic may need to be adjusted.
+    if (!this.lastHit && user.turnData.hitsLeft > 1) {
+      this.lastHit = true;
+    }
   }
 
   /**