From 594cc432a2c1c0dcecfa952ed515ca392d05e17c Mon Sep 17 00:00:00 2001
From: Christopher Schmidt <schmidtc086@outlook.com>
Date: Fri, 5 Jul 2024 15:39:01 -0400
Subject: [PATCH] Cherrypicks due to beta issues #3

---
 src/data/move.ts | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/src/data/move.ts b/src/data/move.ts
index c1296c25d4a..eb6537fed9c 100644
--- a/src/data/move.ts
+++ b/src/data/move.ts
@@ -1299,6 +1299,8 @@ export class SacrificialAttrOnHit extends MoveEffectAttr {
 
     user.damageAndUpdate(user.hp, HitResult.OTHER, false, true, true);
     user.turnData.damageTaken += user.hp;
+    const attackResult = { move: move.id, result: HitResult.OTHER as DamageResult, damage: user.hp, critical: false, sourceId: user.id };
+    user.turnData.attacksReceived.unshift(attackResult);
 
     return true;
   }
@@ -1339,7 +1341,10 @@ export class HalfSacrificialAttr extends MoveEffectAttr {
     // Check to see if the Pokemon has an ability that blocks non-direct damage
     applyAbAttrs(BlockNonDirectDamageAbAttr, user, cancelled);
     if (!cancelled.value) {
-      user.damageAndUpdate(Math.ceil(user.getMaxHp()/2), HitResult.OTHER, false, true, true);
+      const damage = Math.ceil(user.getMaxHp()/2);
+      user.damageAndUpdate(damage, HitResult.OTHER, false, true, true);
+      const attackResult = { move: move.id, result: HitResult.OTHER as DamageResult, damage: damage, critical: false, sourceId: user.id };
+      user.turnData.attacksReceived.unshift(attackResult);
       user.scene.queueMessage(i18next.t("moveTriggers:cutHpPowerUpMove", {pokemonName: getPokemonNameWithAffix(user)})); // Queue recoil message
     }
     return true;