From 1b09b44d6c46568ed625454e202327dc68b1a018 Mon Sep 17 00:00:00 2001
From: WBHarry <89362246+WBHarry@users.noreply.github.com>
Date: Thu, 26 Feb 2026 11:32:05 +0100
Subject: [PATCH] [Fix] 1676 - Horde Damage Fix (#1678)

* Fixed so that horde damage reduction is only applied to the standard attack

* Changed to just adding 'isStandardAttack' in adversary data prep

* .
---
 module/data/actor/adversary.mjs           | 4 ++++
 module/data/fields/action/damageField.mjs | 3 ++-
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/module/data/actor/adversary.mjs b/module/data/actor/adversary.mjs
index 78964720..0a446c15 100644
--- a/module/data/actor/adversary.mjs
+++ b/module/data/actor/adversary.mjs
@@ -190,6 +190,10 @@ export default class DhpAdversary extends DhCreature {
         }
     }
 
+    prepareDerivedData() {
+        this.attack.roll.isStandardAttack = true;
+    }
+
     _getTags() {
         const tags = [
             game.i18n.localize(`DAGGERHEART.GENERAL.Tiers.${this.tier}`),
diff --git a/module/data/fields/action/damageField.mjs b/module/data/fields/action/damageField.mjs
index efad726c..6439344b 100644
--- a/module/data/fields/action/damageField.mjs
+++ b/module/data/fields/action/damageField.mjs
@@ -165,7 +165,8 @@ export default class DamageField extends fields.SchemaField {
         if (data.hasRoll && part.resultBased && data.roll.result.duality === -1) return part.valueAlt;
 
         const isAdversary = this.actor.type === 'adversary';
-        if (isAdversary && this.actor.system.type === CONFIG.DH.ACTOR.adversaryTypes.horde.id) {
+        const isHorde = this.actor.system.type === CONFIG.DH.ACTOR.adversaryTypes.horde.id;
+        if (isAdversary && isHorde && this.roll?.isStandardAttack) {
             const hasHordeDamage = this.actor.effects.find(x => x.type === 'horde');
             if (hasHordeDamage && !hasHordeDamage.disabled) return part.valueAlt;
         }