@firestone-hs/simulate-bgs-battle 1.1.501 → 1.1.502

package/dist/simulation/deathrattle-effects.js

@@ -2,12 +2,17 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.rememberDeathrattles = exports.applyMonstrosity = exports.dealDamageToAllMinions = exports.applyWheneverMinionDiesEffect = exports.handleAfterMinionKillsEffect = exports.applyEarthInvocationEnchantment = exports.applyFireInvocationEnchantment = exports.applyWaterInvocationEnchantment = exports.applyLightningInvocationEnchantment = exports.handleDeathrattleEffects = exports.computeDeathrattleMultiplier = void 0;
 const reference_data_1 = require("@firestone-hs/reference-data");
-const divine_shield_1 = require("../divine-shield");
+const card_interface_1 = require("../cards/card.interface");
+const _card_mappings_1 = require("../cards/impl/_card-mappings");
+const divine_shield_1 = require("../keywords/divine-shield");
+const reborn_1 = require("../keywords/reborn");
+const taunt_1 = require("../keywords/taunt");
+const venomous_1 = require("../keywords/venomous");
+const windfury_1 = require("../keywords/windfury");
 const utils_1 = require("../services/utils");
 const simulate_bgs_battle_1 = require("../simulate-bgs-battle");
 const utils_2 = require("../utils");
 const attack_1 = require("./attack");
-const battlecries_1 = require("./battlecries");
 const blood_gems_1 = require("./blood-gems");
 const cards_in_hand_1 = require("./cards-in-hand");
 const deathrattle_on_trigger_1 = require("./deathrattle-on-trigger");
@@ -46,577 +51,554 @@ const handleDeathrattleEffects = (boardWithDeadEntity, boardWithDeadEntityHero,
         deadEntity,
         otherBoard,
         otherBoardHero,
+        deadEntityIndexFromRight,
         gameState,
     };
     const cardIds = [deadEntity.cardId, ...((_a = deadEntity.additionalCards) !== null && _a !== void 0 ? _a : [])];
-    let enchantments = [
+    const enchantments = [
         ...((_b = deadEntity.enchantments) !== null && _b !== void 0 ? _b : []),
     ].sort((a, b) => a.timing - b.timing);
-    const maxNumberOfGroups = 12;
-    const enchantmentGroups = (0, utils_1.groupByFunction)((enchantment) => enchantment.cardId)(enchantments);
-    enchantments = Object.keys(enchantmentGroups)
-        .filter((cardId) => simulate_bgs_battle_1.VALID_DEATHRATTLE_ENCHANTMENTS.includes(cardId))
-        .flatMap((cardId) => {
-        let repeatsToApply = enchantmentGroups[cardId].map((e) => e.repeats || 1).reduce((a, b) => a + b, 0);
-        if ([
-            "BG21_000e",
-            "BG21_000_Ge",
-        ].includes(cardId)) {
-            repeatsToApply = repeatsToApply * multiplier;
-        }
-        const results = [];
-        const repeatsPerBuff = Math.max(1, Math.floor(repeatsToApply / maxNumberOfGroups));
-        let repeatsDone = 0;
-        while (repeatsDone < repeatsToApply) {
-            const repeats = Math.min(repeatsPerBuff, repeatsToApply - repeatsDone);
-            results.push({
-                cardId: cardId,
-                repeats: repeats,
-                timing: Math.min(...enchantmentGroups[cardId].map((e) => e.timing)),
-            });
-            repeatsDone += repeatsPerBuff;
-        }
-        return results;
-    });
     for (const deadEntityCardId of cardIds) {
-        switch (deadEntityCardId) {
-            case "BG26_801":
-            case "BG26_801_G":
-                for (let i = 0; i < multiplier; i++) {
-                    const allNeighbours = (0, attack_1.getNeighbours)(boardWithDeadEntity, deadEntity, deadEntityIndexFromRight).filter((e) => (0, utils_2.hasMechanic)(gameState.allCards.getCard(e.cardId), reference_data_1.GameTag[reference_data_1.GameTag.BATTLECRY]));
-                    const neighbours = deadEntityCardId === "BG26_801_G"
-                        ? allNeighbours
-                        : [(0, utils_1.pickRandom)(allNeighbours)].filter((e) => !!e);
-                    for (const neighbour of neighbours) {
-                        gameState.spectator.registerPowerTarget(deadEntity, neighbour, boardWithDeadEntity, boardWithDeadEntityHero, otherBoardHero);
-                        (0, battlecries_1.triggerBattlecry)(boardWithDeadEntity, boardWithDeadEntityHero, neighbour, otherBoard, otherBoardHero, gameState);
+        const deathrattleImpl = _card_mappings_1.cardMappings[deadEntityCardId];
+        if ((0, card_interface_1.hasDeathrattleEffect)(deathrattleImpl)) {
+            for (let i = 0; i < multiplier; i++) {
+                deathrattleImpl.deathrattleEffect(deadEntity, deathrattleTriggeredInput);
+                (0, deathrattle_on_trigger_1.onDeathrattleTriggered)(deathrattleTriggeredInput);
+            }
+        }
+        else {
+            switch (deadEntityCardId) {
+                case "BG_OG_221":
+                    for (let i = 0; i < multiplier; i++) {
+                        (0, divine_shield_1.grantRandomDivineShield)(deadEntity, boardWithDeadEntity, boardWithDeadEntityHero, otherBoardHero, gameState);
+                        (0, deathrattle_on_trigger_1.onDeathrattleTriggered)(deathrattleTriggeredInput);
                     }
-                    (0, deathrattle_on_trigger_1.onDeathrattleTriggered)(deathrattleTriggeredInput);
-                }
-                break;
-            case "BG_OG_221":
-                for (let i = 0; i < multiplier; i++) {
-                    (0, divine_shield_1.grantRandomDivineShield)(deadEntity, boardWithDeadEntity, boardWithDeadEntityHero, otherBoardHero, gameState);
-                    (0, deathrattle_on_trigger_1.onDeathrattleTriggered)(deathrattleTriggeredInput);
-                }
-                break;
-            case "TB_BaconUps_014":
-                for (let i = 0; i < multiplier; i++) {
-                    (0, divine_shield_1.grantRandomDivineShield)(deadEntity, boardWithDeadEntity, boardWithDeadEntityHero, otherBoardHero, gameState);
-                    (0, divine_shield_1.grantRandomDivineShield)(deadEntity, boardWithDeadEntity, boardWithDeadEntityHero, otherBoardHero, gameState);
-                    (0, deathrattle_on_trigger_1.onDeathrattleTriggered)(deathrattleTriggeredInput);
-                }
-                break;
-            case "BG26_888":
-            case "BG26_888_G":
-                const belcherMultiplier = deadEntityCardId === "BG26_888_G" ? 2 : 1;
-                for (let i = 0; i < multiplier; i++) {
-                    for (let j = 0; j < belcherMultiplier; j++) {
-                        const possibleBelcherTargets = boardWithDeadEntity
-                            .filter((entity) => !entity.venomous)
-                            .filter((entity) => !entity.poisonous)
-                            .filter((entity) => entity.health > 0 && !entity.definitelyDead)
-                            .filter((entity) => (0, utils_2.hasCorrectTribe)(entity, boardWithDeadEntityHero, reference_data_1.Race.MURLOC, gameState.allCards));
-                        if (possibleBelcherTargets.length > 0) {
-                            const chosen = (0, utils_1.pickRandom)(possibleBelcherTargets);
-                            (0, utils_2.updateVenomous)(chosen, true, boardWithDeadEntity, boardWithDeadEntityHero, gameState);
-                            gameState.spectator.registerPowerTarget(deadEntity, chosen, boardWithDeadEntity, boardWithDeadEntityHero, otherBoardHero);
+                    break;
+                case "TB_BaconUps_014":
+                    for (let i = 0; i < multiplier; i++) {
+                        (0, divine_shield_1.grantRandomDivineShield)(deadEntity, boardWithDeadEntity, boardWithDeadEntityHero, otherBoardHero, gameState);
+                        (0, divine_shield_1.grantRandomDivineShield)(deadEntity, boardWithDeadEntity, boardWithDeadEntityHero, otherBoardHero, gameState);
+                        (0, deathrattle_on_trigger_1.onDeathrattleTriggered)(deathrattleTriggeredInput);
+                    }
+                    break;
+                case "BG26_888":
+                case "BG26_888_G":
+                    const belcherMultiplier = deadEntityCardId === "BG26_888_G" ? 2 : 1;
+                    for (let i = 0; i < multiplier; i++) {
+                        for (let j = 0; j < belcherMultiplier; j++) {
+                            const possibleBelcherTargets = boardWithDeadEntity
+                                .filter((entity) => !entity.venomous)
+                                .filter((entity) => !entity.poisonous)
+                                .filter((entity) => entity.health > 0 && !entity.definitelyDead)
+                                .filter((entity) => (0, utils_2.hasCorrectTribe)(entity, boardWithDeadEntityHero, reference_data_1.Race.MURLOC, gameState.allCards));
+                            if (possibleBelcherTargets.length > 0) {
+                                const chosen = (0, utils_1.pickRandom)(possibleBelcherTargets);
+                                (0, venomous_1.updateVenomous)(chosen, true, boardWithDeadEntity, boardWithDeadEntityHero, otherBoardHero, gameState);
+                                gameState.spectator.registerPowerTarget(deadEntity, chosen, boardWithDeadEntity, boardWithDeadEntityHero, otherBoardHero);
+                            }
                         }
+                        (0, deathrattle_on_trigger_1.onDeathrattleTriggered)(deathrattleTriggeredInput);
                     }
-                    (0, deathrattle_on_trigger_1.onDeathrattleTriggered)(deathrattleTriggeredInput);
-                }
-                break;
-            case "TB_BaconShop_HERO_76_Buddy":
-            case "TB_BaconShop_HERO_76_Buddy_G":
-                const iterations = deadEntityCardId === "TB_BaconShop_HERO_76_Buddy_G" ? 2 : 1;
-                for (let i = 0; i < multiplier; i++) {
-                    for (let j = 0; j < iterations; j++) {
-                        let validTargets = boardWithDeadEntity.filter((entity) => !entity.divineShield);
-                        if (!(validTargets === null || validTargets === void 0 ? void 0 : validTargets.length)) {
-                            validTargets = boardWithDeadEntity.filter((entity) => !entity.taunt);
+                    break;
+                case "TB_BaconShop_HERO_76_Buddy":
+                case "TB_BaconShop_HERO_76_Buddy_G":
+                    const iterations = deadEntityCardId === "TB_BaconShop_HERO_76_Buddy_G" ? 2 : 1;
+                    for (let i = 0; i < multiplier; i++) {
+                        for (let j = 0; j < iterations; j++) {
+                            let validTargets = boardWithDeadEntity.filter((entity) => !entity.divineShield);
                             if (!(validTargets === null || validTargets === void 0 ? void 0 : validTargets.length)) {
-                                validTargets = boardWithDeadEntity.filter((entity) => !entity.windfury);
+                                validTargets = boardWithDeadEntity.filter((entity) => !entity.taunt);
+                                if (!(validTargets === null || validTargets === void 0 ? void 0 : validTargets.length)) {
+                                    validTargets = boardWithDeadEntity.filter((entity) => !entity.windfury);
+                                }
+                            }
+                            const target = (0, utils_1.pickRandom)(validTargets);
+                            if (target) {
+                                if (!target.divineShield) {
+                                    (0, divine_shield_1.updateDivineShield)(target, boardWithDeadEntity, boardWithDeadEntityHero, otherBoardHero, true, gameState);
+                                }
+                                (0, taunt_1.updateTaunt)(target, true, boardWithDeadEntity, boardWithDeadEntityHero, otherBoardHero, gameState);
+                                (0, windfury_1.updateWindfury)(target, true, boardWithDeadEntity, boardWithDeadEntityHero, otherBoardHero, gameState);
+                                gameState.spectator.registerPowerTarget(deadEntity, target, boardWithDeadEntity, boardWithDeadEntityHero, otherBoardHero);
                             }
                         }
-                        const target = (0, utils_1.pickRandom)(validTargets);
-                        if (target) {
-                            if (!target.divineShield) {
+                        (0, deathrattle_on_trigger_1.onDeathrattleTriggered)(deathrattleTriggeredInput);
+                    }
+                    break;
+                case "BGS_040":
+                case "TB_BaconUps_154":
+                    for (let i = 0; i < multiplier; i++) {
+                        const nadinaMultiplier = deadEntityCardId === "TB_BaconUps_154" ? 6 : 3;
+                        for (let j = 0; j < nadinaMultiplier; j++) {
+                            const validTargets = boardWithDeadEntity
+                                .filter((e) => (0, utils_2.hasCorrectTribe)(e, boardWithDeadEntityHero, reference_data_1.Race.DRAGON, gameState.allCards))
+                                .filter((entity) => !entity.divineShield);
+                            const target = (0, utils_1.pickRandom)(validTargets);
+                            if (target) {
                                 (0, divine_shield_1.updateDivineShield)(target, boardWithDeadEntity, boardWithDeadEntityHero, otherBoardHero, true, gameState);
+                                gameState.spectator.registerPowerTarget(deadEntity, target, boardWithDeadEntity, boardWithDeadEntityHero, otherBoardHero);
                             }
-                            target.taunt = true;
-                            target.windfury = true;
-                            gameState.spectator.registerPowerTarget(deadEntity, target, boardWithDeadEntity, boardWithDeadEntityHero, otherBoardHero);
                         }
+                        (0, deathrattle_on_trigger_1.onDeathrattleTriggered)(deathrattleTriggeredInput);
                     }
-                    (0, deathrattle_on_trigger_1.onDeathrattleTriggered)(deathrattleTriggeredInput);
-                }
-                break;
-            case "BGS_040":
-            case "TB_BaconUps_154":
-                for (let i = 0; i < multiplier; i++) {
-                    const nadinaMultiplier = deadEntityCardId === "TB_BaconUps_154" ? 6 : 3;
-                    for (let j = 0; j < nadinaMultiplier; j++) {
-                        const validTargets = boardWithDeadEntity
-                            .filter((e) => (0, utils_2.hasCorrectTribe)(e, boardWithDeadEntityHero, reference_data_1.Race.DRAGON, gameState.allCards))
-                            .filter((entity) => !entity.divineShield);
-                        const target = (0, utils_1.pickRandom)(validTargets);
-                        if (target) {
-                            (0, divine_shield_1.updateDivineShield)(target, boardWithDeadEntity, boardWithDeadEntityHero, otherBoardHero, true, gameState);
-                            gameState.spectator.registerPowerTarget(deadEntity, target, boardWithDeadEntity, boardWithDeadEntityHero, otherBoardHero);
-                        }
+                    break;
+                case "BG_OG_256":
+                    for (let i = 0; i < multiplier; i++) {
+                        (0, utils_2.addStatsToBoard)(deadEntity, boardWithDeadEntity, boardWithDeadEntityHero, 1, 1, gameState);
+                        (0, deathrattle_on_trigger_1.onDeathrattleTriggered)(deathrattleTriggeredInput);
                     }
-                    (0, deathrattle_on_trigger_1.onDeathrattleTriggered)(deathrattleTriggeredInput);
-                }
-                break;
-            case "BG_OG_256":
-                for (let i = 0; i < multiplier; i++) {
-                    (0, utils_2.addStatsToBoard)(deadEntity, boardWithDeadEntity, boardWithDeadEntityHero, 1, 1, gameState);
-                    (0, deathrattle_on_trigger_1.onDeathrattleTriggered)(deathrattleTriggeredInput);
-                }
-                break;
-            case "TB_BaconUps_025":
-                for (let i = 0; i < multiplier; i++) {
-                    (0, utils_2.addStatsToBoard)(deadEntity, boardWithDeadEntity, boardWithDeadEntityHero, 2, 2, gameState);
-                    (0, deathrattle_on_trigger_1.onDeathrattleTriggered)(deathrattleTriggeredInput);
-                }
-                break;
-            case "BGS_018":
-            case "TB_BaconUps_085":
-                for (let i = 0; i < multiplier; i++) {
-                    const goldrinnBuff = deadEntityCardId === "TB_BaconUps_085" ? 6 : 3;
-                    (0, utils_2.addStatsToBoard)(deadEntity, boardWithDeadEntity, boardWithDeadEntityHero, goldrinnBuff, goldrinnBuff, gameState, 'BEAST');
-                    boardWithDeadEntityHero.globalInfo.GoldrinnBuffAtk += goldrinnBuff;
-                    boardWithDeadEntityHero.globalInfo.GoldrinnBuffHealth += goldrinnBuff;
-                    (0, deathrattle_on_trigger_1.onDeathrattleTriggered)(deathrattleTriggeredInput);
-                }
-                break;
-            case "BG29_871":
-            case "BG29_871_G":
-                const silithidStats = deadEntity.cardId === "BG29_871_G" ? 2 : 1;
-                for (let i = 0; i < multiplier; i++) {
-                    (0, utils_2.addStatsToBoard)(deadEntity, boardWithDeadEntity, boardWithDeadEntityHero, silithidStats, silithidStats, gameState, reference_data_1.Race[reference_data_1.Race.BEAST]);
-                    (0, deathrattle_on_trigger_1.onDeathrattleTriggered)(deathrattleTriggeredInput);
-                }
-                break;
-            case "YOD_026":
-                for (let i = 0; i < multiplier; i++) {
-                    (0, utils_2.grantRandomAttack)(deadEntity, boardWithDeadEntity, boardWithDeadEntityHero, deadEntity.attack, gameState);
-                    (0, deathrattle_on_trigger_1.onDeathrattleTriggered)(deathrattleTriggeredInput);
-                }
-                break;
-            case "TB_BaconUps_112":
-                for (let i = 0; i < multiplier; i++) {
-                    (0, utils_2.grantRandomAttack)(deadEntity, boardWithDeadEntity, boardWithDeadEntityHero, deadEntity.attack, gameState);
-                    (0, utils_2.grantRandomAttack)(deadEntity, boardWithDeadEntity, boardWithDeadEntityHero, deadEntity.attack, gameState);
-                    (0, deathrattle_on_trigger_1.onDeathrattleTriggered)(deathrattleTriggeredInput);
-                }
-                break;
-            case "BG21_006":
-            case "BG21_006_G":
-                const tricksterMultiplier = deadEntityCardId === "BG21_006_G" ? 2 : 1;
-                for (let i = 0; i < multiplier; i++) {
-                    for (let j = 0; j < tricksterMultiplier; j++) {
-                        const targetBoard = boardWithDeadEntity;
-                        (0, utils_2.grantRandomHealth)(deadEntity, targetBoard, boardWithDeadEntityHero, deadEntity.maxHealth, gameState, true);
+                    break;
+                case "TB_BaconUps_025":
+                    for (let i = 0; i < multiplier; i++) {
+                        (0, utils_2.addStatsToBoard)(deadEntity, boardWithDeadEntity, boardWithDeadEntityHero, 2, 2, gameState);
+                        (0, deathrattle_on_trigger_1.onDeathrattleTriggered)(deathrattleTriggeredInput);
                     }
-                    (0, deathrattle_on_trigger_1.onDeathrattleTriggered)(deathrattleTriggeredInput);
-                }
-                break;
-            case "BG29_815":
-            case "BG29_815_G":
-                const nightbaneLoops = deadEntityCardId === "BG29_815_G" ? 2 : 1;
-                for (let i = 0; i < multiplier; i++) {
-                    for (let j = 0; j < nightbaneLoops; j++) {
-                        const pickedTargetEntityIds = [];
-                        for (let k = 0; k < 2; k++) {
-                            const target = (0, utils_1.pickRandomAlive)(boardWithDeadEntity.filter((e) => !pickedTargetEntityIds.includes(e.entityId)));
-                            if (!!target) {
-                                pickedTargetEntityIds.push(target.entityId);
-                                (0, stats_1.modifyStats)(target, deadEntity.attack, 0, boardWithDeadEntity, boardWithDeadEntityHero, gameState);
-                                gameState.spectator.registerPowerTarget(deadEntity, target, boardWithDeadEntity, null, null);
+                    break;
+                case "BG29_871":
+                case "BG29_871_G":
+                    const silithidStats = deadEntity.cardId === "BG29_871_G" ? 2 : 1;
+                    for (let i = 0; i < multiplier; i++) {
+                        (0, utils_2.addStatsToBoard)(deadEntity, boardWithDeadEntity, boardWithDeadEntityHero, silithidStats, silithidStats, gameState, reference_data_1.Race[reference_data_1.Race.BEAST]);
+                        (0, deathrattle_on_trigger_1.onDeathrattleTriggered)(deathrattleTriggeredInput);
+                    }
+                    break;
+                case "YOD_026":
+                    for (let i = 0; i < multiplier; i++) {
+                        (0, utils_2.grantRandomAttack)(deadEntity, boardWithDeadEntity, boardWithDeadEntityHero, deadEntity.attack, gameState);
+                        (0, deathrattle_on_trigger_1.onDeathrattleTriggered)(deathrattleTriggeredInput);
+                    }
+                    break;
+                case "TB_BaconUps_112":
+                    for (let i = 0; i < multiplier; i++) {
+                        (0, utils_2.grantRandomAttack)(deadEntity, boardWithDeadEntity, boardWithDeadEntityHero, deadEntity.attack, gameState);
+                        (0, utils_2.grantRandomAttack)(deadEntity, boardWithDeadEntity, boardWithDeadEntityHero, deadEntity.attack, gameState);
+                        (0, deathrattle_on_trigger_1.onDeathrattleTriggered)(deathrattleTriggeredInput);
+                    }
+                    break;
+                case "BG21_006":
+                case "BG21_006_G":
+                    const tricksterMultiplier = deadEntityCardId === "BG21_006_G" ? 2 : 1;
+                    for (let i = 0; i < multiplier; i++) {
+                        for (let j = 0; j < tricksterMultiplier; j++) {
+                            const targetBoard = boardWithDeadEntity;
+                            (0, utils_2.grantRandomHealth)(deadEntity, targetBoard, boardWithDeadEntityHero, deadEntity.maxHealth, gameState, true);
+                        }
+                        (0, deathrattle_on_trigger_1.onDeathrattleTriggered)(deathrattleTriggeredInput);
+                    }
+                    break;
+                case "BG29_815":
+                case "BG29_815_G":
+                    const nightbaneLoops = deadEntityCardId === "BG29_815_G" ? 2 : 1;
+                    for (let i = 0; i < multiplier; i++) {
+                        for (let j = 0; j < nightbaneLoops; j++) {
+                            const pickedTargetEntityIds = [];
+                            for (let k = 0; k < 2; k++) {
+                                const target = (0, utils_1.pickRandomAlive)(boardWithDeadEntity.filter((e) => !pickedTargetEntityIds.includes(e.entityId)));
+                                if (!!target) {
+                                    pickedTargetEntityIds.push(target.entityId);
+                                    (0, stats_1.modifyStats)(target, deadEntity.attack, 0, boardWithDeadEntity, boardWithDeadEntityHero, gameState);
+                                    gameState.spectator.registerPowerTarget(deadEntity, target, boardWithDeadEntity, null, null);
+                                }
                             }
                         }
+                        (0, deathrattle_on_trigger_1.onDeathrattleTriggered)(deathrattleTriggeredInput);
                     }
-                    (0, deathrattle_on_trigger_1.onDeathrattleTriggered)(deathrattleTriggeredInput);
-                }
-                break;
-            case "BG21_000":
-                for (let i = 0; i < multiplier; i++) {
-                    applyLeapFroggerEffect(boardWithDeadEntity, boardWithDeadEntityHero, deadEntity, false, gameState, deadEntity.deathrattleRepeats);
-                    (0, deathrattle_on_trigger_1.onDeathrattleTriggered)(deathrattleTriggeredInput);
-                }
-                break;
-            case "BG21_000_G":
-                for (let i = 0; i < multiplier; i++) {
-                    applyLeapFroggerEffect(boardWithDeadEntity, boardWithDeadEntityHero, deadEntity, true, gameState, deadEntity.deathrattleRepeats);
-                    (0, deathrattle_on_trigger_1.onDeathrattleTriggered)(deathrattleTriggeredInput);
-                }
-                break;
-            case "BG21_001":
-                for (let i = 0; i < multiplier; i++) {
-                    const target = (0, utils_2.grantRandomStats)(deadEntity, boardWithDeadEntity, boardWithDeadEntityHero, 6, 6, reference_data_1.Race.BEAST, true, gameState);
-                    if (!!target) {
-                        gameState.spectator.registerPowerTarget(deadEntity, target, boardWithDeadEntity, boardWithDeadEntityHero, otherBoardHero);
+                    break;
+                case "BG21_000":
+                    for (let i = 0; i < multiplier; i++) {
+                        applyLeapFroggerEffect(boardWithDeadEntity, boardWithDeadEntityHero, deadEntity, false, gameState, deadEntity.deathrattleRepeats);
+                        (0, deathrattle_on_trigger_1.onDeathrattleTriggered)(deathrattleTriggeredInput);
                     }
-                    (0, deathrattle_on_trigger_1.onDeathrattleTriggered)(deathrattleTriggeredInput);
-                }
-                break;
-            case "BG21_001_G":
-                for (let i = 0; i < multiplier; i++) {
-                    const target = (0, utils_2.grantRandomStats)(deadEntity, boardWithDeadEntity, boardWithDeadEntityHero, 12, 12, reference_data_1.Race.BEAST, true, gameState);
-                    if (!!target) {
-                        gameState.spectator.registerPowerTarget(deadEntity, target, boardWithDeadEntity, boardWithDeadEntityHero, otherBoardHero);
+                    break;
+                case "BG21_000_G":
+                    for (let i = 0; i < multiplier; i++) {
+                        applyLeapFroggerEffect(boardWithDeadEntity, boardWithDeadEntityHero, deadEntity, true, gameState, deadEntity.deathrattleRepeats);
+                        (0, deathrattle_on_trigger_1.onDeathrattleTriggered)(deathrattleTriggeredInput);
                     }
-                    (0, deathrattle_on_trigger_1.onDeathrattleTriggered)(deathrattleTriggeredInput);
-                }
-                break;
-            case "BG25_022":
-            case "BG25_022_G":
-                const scarletMultiplier = deadEntityCardId === "BG25_022_G" ? 2 : 1;
-                for (let i = 0; i < multiplier; i++) {
-                    const target = (0, utils_2.grantRandomStats)(deadEntity, boardWithDeadEntity, boardWithDeadEntityHero, scarletMultiplier * 1, scarletMultiplier * 2, reference_data_1.Race.UNDEAD, false, gameState);
-                    if (!!target) {
-                        gameState.spectator.registerPowerTarget(deadEntity, target, boardWithDeadEntity, boardWithDeadEntityHero, otherBoardHero);
+                    break;
+                case "BG21_001":
+                    for (let i = 0; i < multiplier; i++) {
+                        const target = (0, utils_2.grantRandomStats)(deadEntity, boardWithDeadEntity, boardWithDeadEntityHero, 6, 6, reference_data_1.Race.BEAST, true, gameState);
+                        if (!!target) {
+                            gameState.spectator.registerPowerTarget(deadEntity, target, boardWithDeadEntity, boardWithDeadEntityHero, otherBoardHero);
+                        }
+                        (0, deathrattle_on_trigger_1.onDeathrattleTriggered)(deathrattleTriggeredInput);
                     }
-                    (0, deathrattle_on_trigger_1.onDeathrattleTriggered)(deathrattleTriggeredInput);
-                }
-                break;
-            case "BG25_007":
-            case "BG25_007_G":
-                const anubarakMultiplier = deadEntityCardId === "BG25_007_G" ? 2 : 1;
-                const attackBonus = anubarakMultiplier * 1;
-                for (let i = 0; i < multiplier; i++) {
-                    boardWithDeadEntityHero.globalInfo.UndeadAttackBonus += attackBonus;
-                    (0, utils_2.addStatsToBoard)(deadEntity, boardWithDeadEntity, boardWithDeadEntityHero, attackBonus, 0, gameState, reference_data_1.Race[reference_data_1.Race.UNDEAD]);
-                    (0, deathrattle_on_trigger_1.onDeathrattleTriggered)(deathrattleTriggeredInput);
-                }
-                break;
-            case "TB_BaconShop_HERO_17_Buddy":
-            case "TB_BaconShop_HERO_17_Buddy_G":
-                const squirrelDamage = deadEntity.cardId === "TB_BaconShop_HERO_17_Buddy_G" ? 4 : 2;
-                for (let i = 0; i < multiplier; i++) {
-                    const numberOfDeadMechsThisCombat = gameState.sharedState.deaths
-                        .filter((entity) => entity.friendly === deadEntity.friendly)
-                        .filter((entity) => (0, utils_2.hasCorrectTribe)(entity, boardWithDeadEntityHero, reference_data_1.Race.MECH, gameState.allCards)).length;
-                    for (let j = 0; j < numberOfDeadMechsThisCombat; j++) {
-                        (0, attack_1.dealDamageToRandomEnemy)(otherBoard, otherBoardHero, deadEntity, squirrelDamage, boardWithDeadEntity, boardWithDeadEntityHero, gameState);
+                    break;
+                case "BG21_001_G":
+                    for (let i = 0; i < multiplier; i++) {
+                        const target = (0, utils_2.grantRandomStats)(deadEntity, boardWithDeadEntity, boardWithDeadEntityHero, 12, 12, reference_data_1.Race.BEAST, true, gameState);
+                        if (!!target) {
+                            gameState.spectator.registerPowerTarget(deadEntity, target, boardWithDeadEntity, boardWithDeadEntityHero, otherBoardHero);
+                        }
+                        (0, deathrattle_on_trigger_1.onDeathrattleTriggered)(deathrattleTriggeredInput);
                     }
-                    (0, deathrattle_on_trigger_1.onDeathrattleTriggered)(deathrattleTriggeredInput);
-                }
-                break;
-            case "BG_BOT_606":
-            case "TB_BaconUps_028":
-                const kaboomLoops = deadEntity.cardId === "TB_BaconUps_028" ? 2 : 1;
-                const baseDamage = 4 +
-                    boardWithDeadEntityHero.trinkets.filter((t) => t.cardId === "BG30_MagicItem_803").length *
-                        10;
-                for (let i = 0; i < multiplier; i++) {
-                    for (let j = 0; j < kaboomLoops; j++) {
-                        (0, attack_1.dealDamageToRandomEnemy)(otherBoard, otherBoardHero, deadEntity, baseDamage, boardWithDeadEntity, boardWithDeadEntityHero, gameState);
+                    break;
+                case "BG25_022":
+                case "BG25_022_G":
+                    const scarletMultiplier = deadEntityCardId === "BG25_022_G" ? 2 : 1;
+                    for (let i = 0; i < multiplier; i++) {
+                        const target = (0, utils_2.grantRandomStats)(deadEntity, boardWithDeadEntity, boardWithDeadEntityHero, scarletMultiplier * 1, scarletMultiplier * 2, reference_data_1.Race.UNDEAD, false, gameState);
+                        if (!!target) {
+                            gameState.spectator.registerPowerTarget(deadEntity, target, boardWithDeadEntity, boardWithDeadEntityHero, otherBoardHero);
+                        }
+                        (0, deathrattle_on_trigger_1.onDeathrattleTriggered)(deathrattleTriggeredInput);
                     }
-                    (0, deathrattle_on_trigger_1.onDeathrattleTriggered)(deathrattleTriggeredInput);
-                }
-                break;
-            case "BG29_843":
-            case "BG29_843_G":
-                const fireDancerLoops = deadEntity.cardId === "BG29_843_G" ? 2 : 1;
-                for (let i = 0; i < multiplier; i++) {
-                    for (let j = 0; j < fireDancerLoops; j++) {
-                        const minionsToDamage = [...otherBoard, ...boardWithDeadEntity];
-                        for (const target of minionsToDamage) {
-                            const isSameSide = target.friendly === deadEntity.friendly;
-                            const board = isSameSide ? boardWithDeadEntity : otherBoard;
-                            const hero = isSameSide ? boardWithDeadEntityHero : otherBoardHero;
-                            (0, attack_1.dealDamageToMinion)(target, board, hero, deadEntity, 1, isSameSide ? otherBoard : boardWithDeadEntity, isSameSide ? otherBoardHero : boardWithDeadEntityHero, gameState);
+                    break;
+                case "BG25_007":
+                case "BG25_007_G":
+                    const anubarakMultiplier = deadEntityCardId === "BG25_007_G" ? 2 : 1;
+                    const attackBonus = anubarakMultiplier * 1;
+                    for (let i = 0; i < multiplier; i++) {
+                        boardWithDeadEntityHero.globalInfo.UndeadAttackBonus += attackBonus;
+                        (0, utils_2.addStatsToBoard)(deadEntity, boardWithDeadEntity, boardWithDeadEntityHero, attackBonus, 0, gameState, reference_data_1.Race[reference_data_1.Race.UNDEAD]);
+                        (0, deathrattle_on_trigger_1.onDeathrattleTriggered)(deathrattleTriggeredInput);
+                    }
+                    break;
+                case "TB_BaconShop_HERO_17_Buddy":
+                case "TB_BaconShop_HERO_17_Buddy_G":
+                    const squirrelDamage = deadEntity.cardId === "TB_BaconShop_HERO_17_Buddy_G" ? 4 : 2;
+                    for (let i = 0; i < multiplier; i++) {
+                        const numberOfDeadMechsThisCombat = gameState.sharedState.deaths
+                            .filter((entity) => entity.friendly === deadEntity.friendly)
+                            .filter((entity) => (0, utils_2.hasCorrectTribe)(entity, boardWithDeadEntityHero, reference_data_1.Race.MECH, gameState.allCards)).length;
+                        for (let j = 0; j < numberOfDeadMechsThisCombat; j++) {
+                            (0, attack_1.dealDamageToRandomEnemy)(otherBoard, otherBoardHero, deadEntity, squirrelDamage, boardWithDeadEntity, boardWithDeadEntityHero, gameState);
                         }
+                        (0, deathrattle_on_trigger_1.onDeathrattleTriggered)(deathrattleTriggeredInput);
                     }
-                    (0, attack_1.processMinionDeath)(boardWithDeadEntity, boardWithDeadEntityHero, otherBoard, otherBoardHero, gameState);
-                    (0, deathrattle_on_trigger_1.onDeathrattleTriggered)(deathrattleTriggeredInput);
-                }
-                break;
-            case "BG28_968":
-            case "BG28_968_G":
-                const lighterFighterDamage = deadEntity.cardId === "BG28_968_G" ? 8 : 4;
-                for (let i = 0; i < multiplier; i++) {
-                    for (let j = 0; j < 2; j++) {
-                        const target = (0, utils_1.pickRandomLowestHealth)(otherBoard);
-                        gameState.spectator.registerPowerTarget(deadEntity, target, otherBoard, boardWithDeadEntityHero, otherBoardHero);
-                        (0, attack_1.dealDamageToMinion)(target, otherBoard, otherBoardHero, deadEntity, lighterFighterDamage, boardWithDeadEntity, boardWithDeadEntityHero, gameState);
+                    break;
+                case "BG_BOT_606":
+                case "TB_BaconUps_028":
+                    const kaboomLoops = deadEntity.cardId === "TB_BaconUps_028" ? 2 : 1;
+                    const baseDamage = 4 +
+                        boardWithDeadEntityHero.trinkets.filter((t) => t.cardId === "BG30_MagicItem_803").length *
+                            10;
+                    for (let i = 0; i < multiplier; i++) {
+                        for (let j = 0; j < kaboomLoops; j++) {
+                            (0, attack_1.dealDamageToRandomEnemy)(otherBoard, otherBoardHero, deadEntity, baseDamage, boardWithDeadEntity, boardWithDeadEntityHero, gameState);
+                        }
+                        (0, deathrattle_on_trigger_1.onDeathrattleTriggered)(deathrattleTriggeredInput);
                     }
-                    (0, deathrattle_on_trigger_1.onDeathrattleTriggered)(deathrattleTriggeredInput);
-                }
-                break;
-            case "BG25_165":
-            case "BG25_165_G":
-                const boomboxDamage = deadEntity.cardId === "BG25_165_G" ? 14 : 7;
-                for (let i = 0; i < multiplier; i++) {
-                    const targets = (0, attack_1.findNearestEnemies)(boardWithDeadEntity, null, deadEntityIndexFromRight, otherBoard, 2, gameState.allCards);
-                    targets.forEach((target) => {
-                        (0, attack_1.dealDamageToMinion)(target, otherBoard, otherBoardHero, deadEntity, boomboxDamage, boardWithDeadEntity, boardWithDeadEntityHero, gameState);
-                    });
-                    (0, deathrattle_on_trigger_1.onDeathrattleTriggered)(deathrattleTriggeredInput);
-                }
-                break;
-            case "BG_FP1_024":
-            case "TB_BaconUps_118":
-                const damage = deadEntityCardId === "TB_BaconUps_118" ? 2 : 1;
-                for (let i = 0; i < multiplier; i++) {
-                    const minionsToDamage = [...otherBoard, ...boardWithDeadEntity];
-                    for (const target of minionsToDamage) {
-                        const isSameSide = target.friendly === deadEntity.friendly;
-                        const board = isSameSide ? boardWithDeadEntity : otherBoard;
-                        const hero = isSameSide ? boardWithDeadEntityHero : otherBoardHero;
-                        (0, attack_1.dealDamageToMinion)(target, board, hero, deadEntity, damage, isSameSide ? otherBoard : boardWithDeadEntity, isSameSide ? otherBoardHero : boardWithDeadEntityHero, gameState);
+                    break;
+                case "BG29_843":
+                case "BG29_843_G":
+                    const fireDancerLoops = deadEntity.cardId === "BG29_843_G" ? 2 : 1;
+                    for (let i = 0; i < multiplier; i++) {
+                        for (let j = 0; j < fireDancerLoops; j++) {
+                            const minionsToDamage = [...otherBoard, ...boardWithDeadEntity];
+                            for (const target of minionsToDamage) {
+                                const isSameSide = target.friendly === deadEntity.friendly;
+                                const board = isSameSide ? boardWithDeadEntity : otherBoard;
+                                const hero = isSameSide ? boardWithDeadEntityHero : otherBoardHero;
+                                (0, attack_1.dealDamageToMinion)(target, board, hero, deadEntity, 1, isSameSide ? otherBoard : boardWithDeadEntity, isSameSide ? otherBoardHero : boardWithDeadEntityHero, gameState);
+                            }
+                        }
+                        (0, attack_1.processMinionDeath)(boardWithDeadEntity, boardWithDeadEntityHero, otherBoard, otherBoardHero, gameState);
+                        (0, deathrattle_on_trigger_1.onDeathrattleTriggered)(deathrattleTriggeredInput);
                     }
-                    (0, deathrattle_on_trigger_1.onDeathrattleTriggered)(deathrattleTriggeredInput);
-                }
-                break;
-            case "BG_DAL_775":
-            case "BG_DAL_775_G":
-                const loops = deadEntityCardId === "BG_DAL_775_G" ? 2 : 1;
-                for (let i = 0; i < multiplier; i++) {
-                    for (let j = 0; j < loops; j++) {
+                    break;
+                case "BG28_968":
+                case "BG28_968_G":
+                    const lighterFighterDamage = deadEntity.cardId === "BG28_968_G" ? 8 : 4;
+                    for (let i = 0; i < multiplier; i++) {
+                        for (let j = 0; j < 2; j++) {
+                            const target = (0, utils_1.pickRandomLowestHealth)(otherBoard);
+                            gameState.spectator.registerPowerTarget(deadEntity, target, otherBoard, boardWithDeadEntityHero, otherBoardHero);
+                            (0, attack_1.dealDamageToMinion)(target, otherBoard, otherBoardHero, deadEntity, lighterFighterDamage, boardWithDeadEntity, boardWithDeadEntityHero, gameState);
+                        }
+                        (0, deathrattle_on_trigger_1.onDeathrattleTriggered)(deathrattleTriggeredInput);
+                    }
+                    break;
+                case "BG25_165":
+                case "BG25_165_G":
+                    const boomboxDamage = deadEntity.cardId === "BG25_165_G" ? 14 : 7;
+                    for (let i = 0; i < multiplier; i++) {
+                        const targets = (0, attack_1.findNearestEnemies)(boardWithDeadEntity, null, deadEntityIndexFromRight, otherBoard, 2, gameState.allCards);
+                        targets.forEach((target) => {
+                            (0, attack_1.dealDamageToMinion)(target, otherBoard, otherBoardHero, deadEntity, boomboxDamage, boardWithDeadEntity, boardWithDeadEntityHero, gameState);
+                        });
+                        (0, deathrattle_on_trigger_1.onDeathrattleTriggered)(deathrattleTriggeredInput);
+                    }
+                    break;
+                case "BG_FP1_024":
+                case "TB_BaconUps_118":
+                    const damage = deadEntityCardId === "TB_BaconUps_118" ? 2 : 1;
+                    for (let i = 0; i < multiplier; i++) {
                         const minionsToDamage = [...otherBoard, ...boardWithDeadEntity];
                         for (const target of minionsToDamage) {
                             const isSameSide = target.friendly === deadEntity.friendly;
                             const board = isSameSide ? boardWithDeadEntity : otherBoard;
                             const hero = isSameSide ? boardWithDeadEntityHero : otherBoardHero;
-                            (0, attack_1.dealDamageToMinion)(target, board, hero, deadEntity, 3, isSameSide ? otherBoard : boardWithDeadEntity, isSameSide ? otherBoardHero : boardWithDeadEntityHero, gameState);
+                            (0, attack_1.dealDamageToMinion)(target, board, hero, deadEntity, damage, isSameSide ? otherBoard : boardWithDeadEntity, isSameSide ? otherBoardHero : boardWithDeadEntityHero, gameState);
                         }
+                        (0, deathrattle_on_trigger_1.onDeathrattleTriggered)(deathrattleTriggeredInput);
                     }
-                    (0, deathrattle_on_trigger_1.onDeathrattleTriggered)(deathrattleTriggeredInput);
-                }
-                break;
-            case "BG23_318":
-            case "BG23_318_G":
-                if (deadEntity.lastAffectedByEntity) {
-                    deadEntity.lastAffectedByEntity.definitelyDead = true;
-                }
-                (0, deathrattle_on_trigger_1.onDeathrattleTriggered)(deathrattleTriggeredInput);
-                break;
-            case "BG25_399":
-            case "BG25_399_G":
-                for (let i = 0; i < multiplier; i++) {
-                    const radioQuantity = deadEntityCardId === "BG25_399_G" ? 2 : 1;
-                    const radioEntities = Array(radioQuantity).fill(deadEntity.lastAffectedByEntity);
-                    (0, cards_in_hand_1.addCardsInHand)(boardWithDeadEntityHero, boardWithDeadEntity, radioEntities, gameState);
-                    (0, deathrattle_on_trigger_1.onDeathrattleTriggered)(deathrattleTriggeredInput);
-                }
-                break;
-            case "BG28_900":
-            case "BG28_900_G":
-                for (let i = 0; i < multiplier; i++) {
-                    (0, cards_in_hand_1.addCardsInHand)(boardWithDeadEntityHero, boardWithDeadEntity, [null], gameState);
-                }
-                break;
-            case "BG26_867":
-            case "BG26_867_G":
-                for (let i = 0; i < multiplier; i++) {
-                    const numberOfBloodGems = deadEntityCardId === "BG26_867_G" ? 6 : 3;
-                    for (const entity of boardWithDeadEntity.filter((e) => (0, utils_2.hasCorrectTribe)(e, boardWithDeadEntityHero, reference_data_1.Race.QUILBOAR, gameState.allCards))) {
-                        (0, blood_gems_1.playBloodGemsOn)(deadEntity, entity, numberOfBloodGems, boardWithDeadEntity, boardWithDeadEntityHero, gameState);
+                    break;
+                case "BG_DAL_775":
+                case "BG_DAL_775_G":
+                    const loops = deadEntityCardId === "BG_DAL_775_G" ? 2 : 1;
+                    for (let i = 0; i < multiplier; i++) {
+                        for (let j = 0; j < loops; j++) {
+                            const minionsToDamage = [...otherBoard, ...boardWithDeadEntity];
+                            for (const target of minionsToDamage) {
+                                const isSameSide = target.friendly === deadEntity.friendly;
+                                const board = isSameSide ? boardWithDeadEntity : otherBoard;
+                                const hero = isSameSide ? boardWithDeadEntityHero : otherBoardHero;
+                                (0, attack_1.dealDamageToMinion)(target, board, hero, deadEntity, 3, isSameSide ? otherBoard : boardWithDeadEntity, isSameSide ? otherBoardHero : boardWithDeadEntityHero, gameState);
+                            }
+                        }
+                        (0, deathrattle_on_trigger_1.onDeathrattleTriggered)(deathrattleTriggeredInput);
+                    }
+                    break;
+                case "BG23_318":
+                case "BG23_318_G":
+                    if (deadEntity.lastAffectedByEntity) {
+                        deadEntity.lastAffectedByEntity.definitelyDead = true;
                     }
                     (0, deathrattle_on_trigger_1.onDeathrattleTriggered)(deathrattleTriggeredInput);
-                }
-                break;
-            case "TB_BaconShop_HERO_41_Buddy":
-            case "TB_BaconShop_HERO_41_Buddy_G":
-                for (let i = 0; i < multiplier; i++) {
-                    const numberToGild = deadEntityCardId === "TB_BaconShop_HERO_41_Buddy_G" ? 2 : 1;
-                    const targetBoard = boardWithDeadEntity.filter((e) => !e.definitelyDead && e.health > 0);
-                    for (let i = 0; i < Math.min(numberToGild, boardWithDeadEntity.length); i++) {
-                        const rightMostMinion = targetBoard[targetBoard.length - 1 - i];
-                        if (rightMostMinion) {
-                            (0, golden_1.makeMinionGolden)(rightMostMinion, deadEntity, boardWithDeadEntity, boardWithDeadEntityHero, otherBoardHero, gameState);
+                    break;
+                case "BG25_399":
+                case "BG25_399_G":
+                    for (let i = 0; i < multiplier; i++) {
+                        const radioQuantity = deadEntityCardId === "BG25_399_G" ? 2 : 1;
+                        const radioEntities = Array(radioQuantity).fill(deadEntity.lastAffectedByEntity);
+                        (0, cards_in_hand_1.addCardsInHand)(boardWithDeadEntityHero, boardWithDeadEntity, radioEntities, gameState);
+                        (0, deathrattle_on_trigger_1.onDeathrattleTriggered)(deathrattleTriggeredInput);
+                    }
+                    break;
+                case "BG28_900":
+                case "BG28_900_G":
+                    for (let i = 0; i < multiplier; i++) {
+                        (0, cards_in_hand_1.addCardsInHand)(boardWithDeadEntityHero, boardWithDeadEntity, [null], gameState);
+                        (0, deathrattle_on_trigger_1.onDeathrattleTriggered)(deathrattleTriggeredInput);
+                    }
+                    break;
+                case "BG26_867":
+                case "BG26_867_G":
+                    for (let i = 0; i < multiplier; i++) {
+                        const numberOfBloodGems = deadEntityCardId === "BG26_867_G" ? 6 : 3;
+                        for (const entity of boardWithDeadEntity.filter((e) => (0, utils_2.hasCorrectTribe)(e, boardWithDeadEntityHero, reference_data_1.Race.QUILBOAR, gameState.allCards))) {
+                            (0, blood_gems_1.playBloodGemsOn)(deadEntity, entity, numberOfBloodGems, boardWithDeadEntity, boardWithDeadEntityHero, gameState);
                         }
+                        (0, deathrattle_on_trigger_1.onDeathrattleTriggered)(deathrattleTriggeredInput);
                     }
-                    (0, deathrattle_on_trigger_1.onDeathrattleTriggered)(deathrattleTriggeredInput);
-                }
-                break;
-            case "BG26_360":
-            case "BG26_360_G":
-                const statsScourfin = deadEntityCardId === "BG26_360_G" ? 10 : 5;
-                for (let i = 0; i < multiplier; i++) {
-                    (0, utils_2.grantRandomStats)(deadEntity, boardWithDeadEntityHero.hand.filter((e) => { var _a; return ((_a = gameState.allCards.getCard(e.cardId).type) === null || _a === void 0 ? void 0 : _a.toUpperCase()) === reference_data_1.CardType[reference_data_1.CardType.MINION]; }), boardWithDeadEntityHero, statsScourfin, statsScourfin, null, true, gameState);
-                    (0, deathrattle_on_trigger_1.onDeathrattleTriggered)(deathrattleTriggeredInput);
-                }
-                break;
-            case "BG23_017":
-            case "BG23_017_G":
-                for (let i = 0; i < multiplier; i++) {
-                    const sanguineChampionStats = deadEntityCardId === "BG23_017" ? 1 : 2;
-                    boardWithDeadEntityHero.globalInfo.BloodGemAttackBonus += sanguineChampionStats;
-                    boardWithDeadEntityHero.globalInfo.BloodGemHealthBonus += sanguineChampionStats;
-                    (0, deathrattle_on_trigger_1.onDeathrattleTriggered)(deathrattleTriggeredInput);
-                }
-                break;
-            case "BG26_160":
-            case "BG26_160_G":
-                for (let i = 0; i < multiplier; i++) {
-                    const piperBuff = deadEntityCardId === "BG26_160" ? 1 : 2;
-                    boardWithDeadEntityHero.globalInfo.BloodGemAttackBonus += piperBuff;
-                    (0, deathrattle_on_trigger_1.onDeathrattleTriggered)(deathrattleTriggeredInput);
-                }
-                break;
-            case "BG_RLK_957":
-                for (let i = 0; i < multiplier; i++) {
-                    (0, utils_2.addStatsToBoard)(deadEntity, boardWithDeadEntity, boardWithDeadEntityHero, 2, 1, gameState, reference_data_1.Race[reference_data_1.Race.UNDEAD]);
-                    (0, deathrattle_on_trigger_1.onDeathrattleTriggered)(deathrattleTriggeredInput);
-                }
-                break;
-            case "BG26_GIL_513":
-                for (let i = 0; i < multiplier; i++) {
-                    (0, utils_2.addStatsToBoard)(deadEntity, boardWithDeadEntity, boardWithDeadEntityHero, 1, 0, gameState, null);
-                    (0, deathrattle_on_trigger_1.onDeathrattleTriggered)(deathrattleTriggeredInput);
-                }
-                break;
-            case "BG_ICC_099":
-                for (let i = 0; i < multiplier; i++) {
-                    for (const entity of boardWithDeadEntity) {
-                        (0, attack_1.dealDamageToMinion)(entity, boardWithDeadEntity, boardWithDeadEntityHero, deadEntity, 5, otherBoard, otherBoardHero, gameState);
+                    break;
+                case "TB_BaconShop_HERO_41_Buddy":
+                case "TB_BaconShop_HERO_41_Buddy_G":
+                    for (let i = 0; i < multiplier; i++) {
+                        const numberToGild = deadEntityCardId === "TB_BaconShop_HERO_41_Buddy_G" ? 2 : 1;
+                        const targetBoard = boardWithDeadEntity.filter((e) => !e.definitelyDead && e.health > 0);
+                        for (let i = 0; i < Math.min(numberToGild, boardWithDeadEntity.length); i++) {
+                            const rightMostMinion = targetBoard[targetBoard.length - 1 - i];
+                            if (rightMostMinion) {
+                                (0, golden_1.makeMinionGolden)(rightMostMinion, deadEntity, boardWithDeadEntity, boardWithDeadEntityHero, otherBoardHero, gameState);
+                            }
+                        }
+                        (0, deathrattle_on_trigger_1.onDeathrattleTriggered)(deathrattleTriggeredInput);
                     }
-                    (0, deathrattle_on_trigger_1.onDeathrattleTriggered)(deathrattleTriggeredInput);
-                }
-                break;
-            case "BG27_006":
-            case "BG27_006_G":
-                for (let i = 0; i < multiplier; i++) {
-                    const witheredSpearhideCardsToAdd = Array(deadEntity.cardId === "BG27_006_G" ? 2 : 1).fill("BG20_GEM");
-                    (0, cards_in_hand_1.addCardsInHand)(boardWithDeadEntityHero, boardWithDeadEntity, witheredSpearhideCardsToAdd, gameState);
-                    (0, deathrattle_on_trigger_1.onDeathrattleTriggered)(deathrattleTriggeredInput);
-                }
-                break;
-            case "BG26_055":
-            case "BG26_055_G":
-                for (let i = 0; i < multiplier; i++) {
-                    applyRecurringNightmareDeathrattleEffect(boardWithDeadEntity, boardWithDeadEntityHero, deadEntity, deadEntityCardId === "BG26_055_G", gameState.allCards, gameState.spectator, gameState.sharedState);
-                    (0, deathrattle_on_trigger_1.onDeathrattleTriggered)(deathrattleTriggeredInput);
-                }
-                break;
-            case "BG27_080":
-            case "BG27_080_G":
-                const motleyBuff = deadEntity.cardId === "BG27_080_G" ? 2 : 1;
-                for (let i = 0; i < multiplier; i++) {
-                    (0, utils_2.grantStatsToMinionsOfEachType)(deadEntity, boardWithDeadEntity, boardWithDeadEntityHero, motleyBuff * 2, motleyBuff * 1, gameState);
-                    (0, deathrattle_on_trigger_1.onDeathrattleTriggered)(deathrattleTriggeredInput);
-                }
-                break;
-            case "BG28_304":
-            case "BG28_304_G":
-                const moroesBuffAtk = deadEntity.cardId === "BG28_304_G" ? 4 : 2;
-                const moroesBuffHealth = deadEntity.cardId === "BG28_304_G" ? 8 : 4;
-                for (let i = 0; i < multiplier; i++) {
-                    (0, utils_2.addStatsToBoard)(deadEntity, boardWithDeadEntity, boardWithDeadEntityHero, moroesBuffAtk, moroesBuffHealth, gameState, reference_data_1.Race[reference_data_1.Race.UNDEAD]);
-                    (0, deathrattle_on_trigger_1.onDeathrattleTriggered)(deathrattleTriggeredInput);
-                }
-                break;
-            case "BG28_306":
-            case "BG28_306_G":
-                const steadfastSpiritBuff = deadEntity.cardId === "BG28_306_G" ? 2 : 1;
-                for (let i = 0; i < multiplier; i++) {
-                    (0, utils_2.addStatsToBoard)(deadEntity, boardWithDeadEntity, boardWithDeadEntityHero, steadfastSpiritBuff, steadfastSpiritBuff, gameState);
-                    (0, deathrattle_on_trigger_1.onDeathrattleTriggered)(deathrattleTriggeredInput);
-                }
-                break;
-            case "BG28_309":
-            case "BG28_309_G":
-                const mummifierBuff = deadEntity.cardId === "BG28_309_G" ? 2 : 1;
-                for (let i = 0; i < multiplier; i++) {
-                    for (let j = 0; j < mummifierBuff; j++) {
-                        const targets = boardWithDeadEntity
-                            .filter((e) => e.cardId !== "BG28_309" &&
-                            e.cardId !== "BG28_309_G")
-                            .filter((e) => !e.reborn)
-                            .filter((e) => (0, utils_2.hasCorrectTribe)(e, boardWithDeadEntityHero, reference_data_1.Race.UNDEAD, gameState.allCards));
-                        const target = (0, utils_1.pickRandom)(targets);
-                        if (target) {
-                            target.reborn = true;
-                            gameState.spectator.registerPowerTarget(deadEntity, target, boardWithDeadEntity, boardWithDeadEntityHero, otherBoardHero);
+                    break;
+                case "BG26_360":
+                case "BG26_360_G":
+                    const statsScourfin = deadEntityCardId === "BG26_360_G" ? 10 : 5;
+                    for (let i = 0; i < multiplier; i++) {
+                        (0, utils_2.grantRandomStats)(deadEntity, boardWithDeadEntityHero.hand.filter((e) => {
+                            var _a;
+                            return ((_a = gameState.allCards.getCard(e.cardId).type) === null || _a === void 0 ? void 0 : _a.toUpperCase()) ===
+                                reference_data_1.CardType[reference_data_1.CardType.MINION];
+                        }), boardWithDeadEntityHero, statsScourfin, statsScourfin, null, true, gameState);
+                        (0, deathrattle_on_trigger_1.onDeathrattleTriggered)(deathrattleTriggeredInput);
+                    }
+                    break;
+                case "BG23_017":
+                case "BG23_017_G":
+                    for (let i = 0; i < multiplier; i++) {
+                        const sanguineChampionStats = deadEntityCardId === "BG23_017" ? 1 : 2;
+                        boardWithDeadEntityHero.globalInfo.BloodGemAttackBonus += sanguineChampionStats;
+                        boardWithDeadEntityHero.globalInfo.BloodGemHealthBonus += sanguineChampionStats;
+                        (0, deathrattle_on_trigger_1.onDeathrattleTriggered)(deathrattleTriggeredInput);
+                    }
+                    break;
+                case "BG26_160":
+                case "BG26_160_G":
+                    for (let i = 0; i < multiplier; i++) {
+                        const piperBuff = deadEntityCardId === "BG26_160" ? 1 : 2;
+                        boardWithDeadEntityHero.globalInfo.BloodGemAttackBonus += piperBuff;
+                        (0, deathrattle_on_trigger_1.onDeathrattleTriggered)(deathrattleTriggeredInput);
+                    }
+                    break;
+                case "BG_RLK_957":
+                    for (let i = 0; i < multiplier; i++) {
+                        (0, utils_2.addStatsToBoard)(deadEntity, boardWithDeadEntity, boardWithDeadEntityHero, 2, 1, gameState, reference_data_1.Race[reference_data_1.Race.UNDEAD]);
+                        (0, deathrattle_on_trigger_1.onDeathrattleTriggered)(deathrattleTriggeredInput);
+                    }
+                    break;
+                case "BG26_GIL_513":
+                    for (let i = 0; i < multiplier; i++) {
+                        (0, utils_2.addStatsToBoard)(deadEntity, boardWithDeadEntity, boardWithDeadEntityHero, 1, 0, gameState, null);
+                        (0, deathrattle_on_trigger_1.onDeathrattleTriggered)(deathrattleTriggeredInput);
+                    }
+                    break;
+                case "BG_ICC_099":
+                    for (let i = 0; i < multiplier; i++) {
+                        for (const entity of boardWithDeadEntity) {
+                            (0, attack_1.dealDamageToMinion)(entity, boardWithDeadEntity, boardWithDeadEntityHero, deadEntity, 5, otherBoard, otherBoardHero, gameState);
                         }
+                        (0, deathrattle_on_trigger_1.onDeathrattleTriggered)(deathrattleTriggeredInput);
                     }
-                    (0, deathrattle_on_trigger_1.onDeathrattleTriggered)(deathrattleTriggeredInput);
-                }
-                break;
-            case "BG26_148":
-            case "BG26_148_G":
-                for (let i = 0; i < multiplier; i++) {
-                    const scraperToAddQuantity = deadEntity.cardId === "BG26_148_G" ? 2 : 1;
-                    const scraperCardsToAdd = [];
-                    for (let i = 0; i < scraperToAddQuantity; i++) {
-                        scraperCardsToAdd.push((0, utils_1.pickRandom)(gameState.cardsData.scrapScraperSpawns));
+                    break;
+                case "BG27_006":
+                case "BG27_006_G":
+                    for (let i = 0; i < multiplier; i++) {
+                        const witheredSpearhideCardsToAdd = Array(deadEntity.cardId === "BG27_006_G" ? 2 : 1).fill("BG20_GEM");
+                        (0, cards_in_hand_1.addCardsInHand)(boardWithDeadEntityHero, boardWithDeadEntity, witheredSpearhideCardsToAdd, gameState);
+                        (0, deathrattle_on_trigger_1.onDeathrattleTriggered)(deathrattleTriggeredInput);
                     }
-                    (0, cards_in_hand_1.addCardsInHand)(boardWithDeadEntityHero, boardWithDeadEntity, scraperCardsToAdd, gameState);
-                    (0, deathrattle_on_trigger_1.onDeathrattleTriggered)(deathrattleTriggeredInput);
-                }
-                break;
-            case "BG29_862":
-            case "BG29_862_G":
-                for (let i = 0; i < multiplier; i++) {
-                    const conjurerToAddQuantity = deadEntity.cardId === "BG29_862_G" ? 2 : 1;
-                    const conjurerCardsToAdd = [];
-                    for (let i = 0; i < conjurerToAddQuantity; i++) {
-                        conjurerCardsToAdd.push((0, utils_1.pickRandom)(gameState.cardsData.battlecryMinions));
+                    break;
+                case "BG26_055":
+                case "BG26_055_G":
+                    for (let i = 0; i < multiplier; i++) {
+                        applyRecurringNightmareDeathrattleEffect(boardWithDeadEntity, boardWithDeadEntityHero, deadEntity, deadEntityCardId === "BG26_055_G", gameState.allCards, gameState.spectator, gameState.sharedState);
+                        (0, deathrattle_on_trigger_1.onDeathrattleTriggered)(deathrattleTriggeredInput);
                     }
-                    (0, cards_in_hand_1.addCardsInHand)(boardWithDeadEntityHero, boardWithDeadEntity, conjurerCardsToAdd, gameState);
-                    (0, deathrattle_on_trigger_1.onDeathrattleTriggered)(deathrattleTriggeredInput);
-                }
-                break;
-            case "BG25_HERO_103_Buddy":
-            case "BG25_HERO_103_Buddy_G":
-                for (let i = 0; i < multiplier; i++) {
-                    const loops = deadEntity.cardId === "BG25_HERO_103_Buddy_G" ? 2 : 1;
-                    for (let j = 0; j < loops; j++) {
-                        const atkBuff = deadEntity.attack;
-                        const healthBuff = deadEntity.maxHealth;
-                        const target = (0, utils_1.pickRandom)(boardWithDeadEntity.filter((e) => e.entityId !== deadEntity.entityId));
-                        if (target) {
-                            (0, stats_1.modifyStats)(target, atkBuff, healthBuff, boardWithDeadEntity, boardWithDeadEntityHero, gameState);
-                            gameState.spectator.registerPowerTarget(deadEntity, target, boardWithDeadEntity, boardWithDeadEntityHero, otherBoardHero);
+                    break;
+                case "BG27_080":
+                case "BG27_080_G":
+                    const motleyBuff = deadEntity.cardId === "BG27_080_G" ? 2 : 1;
+                    for (let i = 0; i < multiplier; i++) {
+                        (0, utils_2.grantStatsToMinionsOfEachType)(deadEntity, boardWithDeadEntity, boardWithDeadEntityHero, motleyBuff * 2, motleyBuff * 1, gameState);
+                        (0, deathrattle_on_trigger_1.onDeathrattleTriggered)(deathrattleTriggeredInput);
+                    }
+                    break;
+                case "BG28_304":
+                case "BG28_304_G":
+                    const moroesBuffAtk = deadEntity.cardId === "BG28_304_G" ? 4 : 2;
+                    const moroesBuffHealth = deadEntity.cardId === "BG28_304_G" ? 8 : 4;
+                    for (let i = 0; i < multiplier; i++) {
+                        (0, utils_2.addStatsToBoard)(deadEntity, boardWithDeadEntity, boardWithDeadEntityHero, moroesBuffAtk, moroesBuffHealth, gameState, reference_data_1.Race[reference_data_1.Race.UNDEAD]);
+                        (0, deathrattle_on_trigger_1.onDeathrattleTriggered)(deathrattleTriggeredInput);
+                    }
+                    break;
+                case "BG28_306":
+                case "BG28_306_G":
+                    const steadfastSpiritBuff = deadEntity.cardId === "BG28_306_G" ? 2 : 1;
+                    for (let i = 0; i < multiplier; i++) {
+                        (0, utils_2.addStatsToBoard)(deadEntity, boardWithDeadEntity, boardWithDeadEntityHero, steadfastSpiritBuff, steadfastSpiritBuff, gameState);
+                        (0, deathrattle_on_trigger_1.onDeathrattleTriggered)(deathrattleTriggeredInput);
+                    }
+                    break;
+                case "BG28_309":
+                case "BG28_309_G":
+                    const mummifierBuff = deadEntity.cardId === "BG28_309_G" ? 2 : 1;
+                    for (let i = 0; i < multiplier; i++) {
+                        for (let j = 0; j < mummifierBuff; j++) {
+                            const targets = boardWithDeadEntity
+                                .filter((e) => e.cardId !== "BG28_309" &&
+                                e.cardId !== "BG28_309_G")
+                                .filter((e) => !e.reborn)
+                                .filter((e) => (0, utils_2.hasCorrectTribe)(e, boardWithDeadEntityHero, reference_data_1.Race.UNDEAD, gameState.allCards));
+                            const target = (0, utils_1.pickRandom)(targets);
+                            if (target) {
+                                (0, reborn_1.updateReborn)(target, true, boardWithDeadEntity, boardWithDeadEntityHero, otherBoardHero, gameState);
+                                gameState.spectator.registerPowerTarget(deadEntity, target, boardWithDeadEntity, boardWithDeadEntityHero, otherBoardHero);
+                            }
                         }
+                        (0, deathrattle_on_trigger_1.onDeathrattleTriggered)(deathrattleTriggeredInput);
                     }
-                    (0, deathrattle_on_trigger_1.onDeathrattleTriggered)(deathrattleTriggeredInput);
-                }
-                break;
-            case "BG29_808":
-            case "BG29_808_G":
-                const spikedSaviorLoops = deadEntity.cardId === "BG29_808_G" ? 2 : 1;
-                for (let i = 0; i < multiplier; i++) {
-                    for (let j = 0; j < spikedSaviorLoops; j++) {
-                        const targetBoard = [...boardWithDeadEntity];
-                        for (const entity of targetBoard) {
-                            (0, stats_1.modifyStats)(entity, 0, 1, boardWithDeadEntity, boardWithDeadEntityHero, gameState);
-                            (_c = gameState.spectator) === null || _c === void 0 ? void 0 : _c.registerPowerTarget(deadEntity, entity, boardWithDeadEntity, null, null);
+                    break;
+                case "BG26_148":
+                case "BG26_148_G":
+                    for (let i = 0; i < multiplier; i++) {
+                        const scraperToAddQuantity = deadEntity.cardId === "BG26_148_G" ? 2 : 1;
+                        const scraperCardsToAdd = [];
+                        for (let i = 0; i < scraperToAddQuantity; i++) {
+                            scraperCardsToAdd.push((0, utils_1.pickRandom)(gameState.cardsData.scrapScraperSpawns));
                         }
-                        for (const entity of targetBoard) {
-                            (0, attack_1.dealDamageToMinion)(entity, boardWithDeadEntity, boardWithDeadEntityHero, deadEntity, 1, otherBoard, otherBoardHero, gameState);
+                        (0, cards_in_hand_1.addCardsInHand)(boardWithDeadEntityHero, boardWithDeadEntity, scraperCardsToAdd, gameState);
+                        (0, deathrattle_on_trigger_1.onDeathrattleTriggered)(deathrattleTriggeredInput);
+                    }
+                    break;
+                case "BG29_862":
+                case "BG29_862_G":
+                    for (let i = 0; i < multiplier; i++) {
+                        const conjurerToAddQuantity = deadEntity.cardId === "BG29_862_G" ? 2 : 1;
+                        const conjurerCardsToAdd = [];
+                        for (let i = 0; i < conjurerToAddQuantity; i++) {
+                            conjurerCardsToAdd.push((0, utils_1.pickRandom)(gameState.cardsData.battlecryMinions));
                         }
+                        (0, cards_in_hand_1.addCardsInHand)(boardWithDeadEntityHero, boardWithDeadEntity, conjurerCardsToAdd, gameState);
+                        (0, deathrattle_on_trigger_1.onDeathrattleTriggered)(deathrattleTriggeredInput);
                     }
-                    (0, deathrattle_on_trigger_1.onDeathrattleTriggered)(deathrattleTriggeredInput);
-                }
-                break;
-            case "BG31_821":
-            case "BG31_821_G":
-                for (let i = 0; i < multiplier; i++) {
-                    boardWithDeadEntityHero.globalInfo.PirateAttackBonus +=
-                        deadEntity.cardId === "BG31_821_G" ? 10 : 5;
-                }
-                break;
-            default:
-                if ((0, utils_2.hasMechanic)(gameState.allCards.getCard(deadEntity.cardId), reference_data_1.GameTag[reference_data_1.GameTag.DEATHRATTLE])) {
+                    break;
+                case "BG25_HERO_103_Buddy":
+                case "BG25_HERO_103_Buddy_G":
                     for (let i = 0; i < multiplier; i++) {
+                        const loops = deadEntity.cardId === "BG25_HERO_103_Buddy_G" ? 2 : 1;
+                        for (let j = 0; j < loops; j++) {
+                            const atkBuff = deadEntity.attack;
+                            const healthBuff = deadEntity.maxHealth;
+                            const target = (0, utils_1.pickRandom)(boardWithDeadEntity.filter((e) => e.entityId !== deadEntity.entityId));
+                            if (target) {
+                                (0, stats_1.modifyStats)(target, atkBuff, healthBuff, boardWithDeadEntity, boardWithDeadEntityHero, gameState);
+                                gameState.spectator.registerPowerTarget(deadEntity, target, boardWithDeadEntity, boardWithDeadEntityHero, otherBoardHero);
+                            }
+                        }
                         (0, deathrattle_on_trigger_1.onDeathrattleTriggered)(deathrattleTriggeredInput);
                     }
-                }
-                break;
+                    break;
+                case "BG29_808":
+                case "BG29_808_G":
+                    const spikedSaviorLoops = deadEntity.cardId === "BG29_808_G" ? 2 : 1;
+                    for (let i = 0; i < multiplier; i++) {
+                        for (let j = 0; j < spikedSaviorLoops; j++) {
+                            const targetBoard = [...boardWithDeadEntity];
+                            for (const entity of targetBoard) {
+                                (0, stats_1.modifyStats)(entity, 0, 1, boardWithDeadEntity, boardWithDeadEntityHero, gameState);
+                                (_c = gameState.spectator) === null || _c === void 0 ? void 0 : _c.registerPowerTarget(deadEntity, entity, boardWithDeadEntity, null, null);
+                            }
+                            for (const entity of targetBoard) {
+                                (0, attack_1.dealDamageToMinion)(entity, boardWithDeadEntity, boardWithDeadEntityHero, deadEntity, 1, otherBoard, otherBoardHero, gameState);
+                            }
+                        }
+                        (0, deathrattle_on_trigger_1.onDeathrattleTriggered)(deathrattleTriggeredInput);
+                    }
+                    break;
+                case "BG31_821":
+                case "BG31_821_G":
+                    for (let i = 0; i < multiplier; i++) {
+                        boardWithDeadEntityHero.globalInfo.PirateAttackBonus +=
+                            deadEntity.cardId === "BG31_821_G" ? 10 : 5;
+                        (0, deathrattle_on_trigger_1.onDeathrattleTriggered)(deathrattleTriggeredInput);
+                    }
+                    break;
+                default:
+                    if ((0, utils_2.hasMechanic)(gameState.allCards.getCard(deadEntity.cardId), reference_data_1.GameTag[reference_data_1.GameTag.DEATHRATTLE])) {
+                        for (let i = 0; i < multiplier; i++) {
+                            (0, deathrattle_on_trigger_1.onDeathrattleTriggered)(deathrattleTriggeredInput);
+                        }
+                    }
+                    break;
+            }
         }
     }
     for (const enchantment of enchantments) {
+        const deathrattleImpl = _card_mappings_1.cardMappings[enchantment.cardId];
+        if ((0, card_interface_1.hasDeathrattleEnchantmentEffect)(deathrattleImpl)) {
+            for (let i = 0; i < multiplier; i++) {
+                deathrattleImpl.deathrattleEnchantmentEffect(enchantment, deathrattleTriggeredInput);
+                (0, deathrattle_on_trigger_1.onDeathrattleTriggered)(deathrattleTriggeredInput);
+            }
+        }
         switch (enchantment.cardId) {
             case "BG30_MagicItem_917e":
-                (0, cards_in_hand_1.addCardsInHand)(boardWithDeadEntityHero, boardWithDeadEntity, [null], gameState);
+                for (let i = 0; i < multiplier; i++) {
+                    (0, cards_in_hand_1.addCardsInHand)(boardWithDeadEntityHero, boardWithDeadEntity, [null], gameState);
+                }
                 break;
             case "BG30_MagicItem_411e":
-                (0, cards_in_hand_1.addCardsInHand)(boardWithDeadEntityHero, boardWithDeadEntity, ["BG20_GEM"], gameState);
+                for (let i = 0; i < multiplier; i++) {
+                    (0, cards_in_hand_1.addCardsInHand)(boardWithDeadEntityHero, boardWithDeadEntity, ["BG20_GEM"], gameState);
+                }
                 break;
             case "BG21_000e":
             case "BG21_000_Ge":
@@ -637,7 +619,7 @@ const handleDeathrattleEffects = (boardWithDeadEntity, boardWithDeadEntityHero,
                 break;
             case "BG22_HERO_001_Buddy_e3":
                 for (let i = 0; i < multiplier; i++) {
-                    (0, exports.applyWaterInvocationEnchantment)(boardWithDeadEntity, boardWithDeadEntityHero, deadEntity, deadEntity, gameState);
+                    (0, exports.applyWaterInvocationEnchantment)(boardWithDeadEntity, boardWithDeadEntityHero, otherBoardHero, deadEntity, deadEntity, gameState);
                     (0, deathrattle_on_trigger_1.onDeathrattleTriggered)(deathrattleTriggeredInput);
                 }
                 break;
@@ -661,13 +643,13 @@ const applyLightningInvocationEnchantment = (boardWithDeadEntity, boardWithDeadE
     }
 };
 exports.applyLightningInvocationEnchantment = applyLightningInvocationEnchantment;
-const applyWaterInvocationEnchantment = (boardWithDeadEntity, boardWithDeadEntityHero, deadEntity, sourceEntity, gameState) => {
+const applyWaterInvocationEnchantment = (boardWithDeadEntity, boardWithDeadEntityHero, otherHero, deadEntity, sourceEntity, gameState) => {
     const multiplier = (deadEntity === null || deadEntity === void 0 ? void 0 : deadEntity.cardId) === "BG22_HERO_001_Buddy_G" ? 2 : 1;
     for (let i = 0; i < multiplier; i++) {
         const validBoard = boardWithDeadEntity.filter((e) => e.health > 0 && !e.definitelyDead);
         const target = validBoard[validBoard.length - 1];
         if (!!target) {
-            target.taunt = true;
+            (0, taunt_1.updateTaunt)(target, true, boardWithDeadEntity, boardWithDeadEntityHero, otherHero, gameState);
             (0, stats_1.modifyStats)(target, 0, 3, boardWithDeadEntity, boardWithDeadEntityHero, gameState);
             gameState.spectator.registerPowerTarget(sourceEntity, target, boardWithDeadEntity, null, null);
         }
@@ -960,7 +942,7 @@ const rememberDeathrattles = (fish, deadEntities, cardsData, allCards, sharedSta
             timing: sharedState.currentEntityId++,
         });
     })
-        .filter((enchantment) => simulate_bgs_battle_1.VALID_DEATHRATTLE_ENCHANTMENTS.includes(enchantment.cardId));
+        .filter((enchantment) => (0, simulate_bgs_battle_1.isValidDeathrattleEnchantment)(enchantment.cardId));
     const deadEntityRememberedDeathrattles = (_a = deadEntities
         .filter((e) => { var _a; return !!((_a = e.rememberedDeathrattles) === null || _a === void 0 ? void 0 : _a.length); })
         .filter((e) => e.entityId !== fish.rebornFromEntityId)