Merged with v14-Dev

module/data/action/baseAction.mjs

@@ -264,12 +264,20 @@ export default class DHBaseAction extends ActionMixin(foundry.abstract.DataModel
             hasSave: this.hasSave,
             onSave: this.save?.damageMod,
             isDirect: !!this.damage?.direct,
-            selectedRollMode: game.settings.get('core', 'rollMode'),
+            selectedMessageMode: game.settings.get('core', 'messageMode'),
             data: this.getRollData(),
             evaluate: this.hasRoll,
             resourceUpdates: new ResourceUpdateMap(this.actor),
             targetUuid: this.targetUuid,
-            ...configOptions
+            ...configOptions,
+            skips: {
+                resources: false,
+                triggers: false,
+                createMessage: false,
+                updateCountdowns: false,
+                reaction: false,
+                ...(configOptions.skips ?? {})
+            }
         };
 
         DHBaseAction.applyKeybindings(config);
@@ -329,6 +337,7 @@ export default class DHBaseAction extends ActionMixin(foundry.abstract.DataModel
      * @param {boolean} successCost
      */
     async consume(config, successCost = false) {
+        config.resourceUpdates = new ResourceUpdateMap(config.actionActor);
         await this.workflow.get('cost')?.execute(config, successCost);
         await this.workflow.get('uses')?.execute(config, successCost);
 

module/data/activeEffect/baseEffect.mjs

@@ -83,7 +83,20 @@ export default class BaseEffect extends foundry.data.ActiveEffectTypeDataModel {
                     initial: CONFIG.DH.GENERAL.range.melee.id,
                     label: 'DAGGERHEART.GENERAL.range'
                 })
-            })
+            }),
+            stacking: new fields.SchemaField(
+                {
+                    value: new fields.NumberField({
+                        initial: 1,
+                        min: 1,
+                        integer: true,
+                        nullable: false,
+                        label: 'DAGGERHEART.GENERAL.value'
+                    }),
+                    max: new fields.NumberField({ integer: true, label: 'DAGGERHEART.GENERAL.max' })
+                },
+                { nullable: true, initial: null }
+            )
         };
     }
 
@@ -158,8 +171,10 @@ export default class BaseEffect extends foundry.data.ActiveEffectTypeDataModel {
                 return acc;
             }, this.parent.actor.system.armor?.system?.armor?.current ?? 0);
 
-            const armorData = getScrollTextData(this.parent.actor, { value: newArmorTotal }, 'armor');
-            options.scrollingTextData = [armorData];
+            if (newArmorTotal !== this.parent.actor.system.armorScore.value) {
+                const armorData = getScrollTextData(this.parent.actor, { value: newArmorTotal }, 'armor');
+                options.scrollingTextData = [armorData];
+            }
         }
     }
 

module/data/fields/action/effectsField.mjs

@@ -106,22 +106,11 @@ export default class EffectsField extends fields.ArrayField {
     }
 
     /**
-     * Apply an Effect to a target or enable it if already on it
+     * Apply an Effect to a target
      * @param {object} effect   Effect object containing ActiveEffect UUID
      * @param {object} actor    Actor Document
      */
     static async applyEffect(effect, actor) {
-        const existingEffect = actor.effects.find(e => e.origin === effect.uuid);
-        if (existingEffect) {
-            return effect.update(
-                foundry.utils.mergeObject({
-                    ...effect.constructor.getInitialDuration(),
-                    disabled: false
-                })
-            );
-        }
-
-        // Otherwise, create a new effect on the target
         const effectData = foundry.utils.mergeObject({
             ...(effect.toObject?.() ?? effect),
             disabled: false,

module/data/fields/actionField.mjs

@@ -89,6 +89,7 @@ export class ActionField extends foundry.data.fields.ObjectField {
     /** @override */
     _cleanType(value, options, _state) {
         if (!(typeof value === 'object')) value = {};
+        value = super._cleanType(value, options, _state);
         const cls = this.getModel(value);
         if (cls) return cls.cleanData(value, options, _state);
         return value;
@@ -309,7 +310,7 @@ export function ActionMixin(Base) {
                 }
             };
 
-            ChatMessage.applyRollMode(msg, game.settings.get('core', 'rollMode'));
+            ChatMessage.applyMode(msg, game.settings.get('core', 'messageMode'));
             cls.create(msg);
         }
     }

module/data/item/consumable.mjs

@@ -18,8 +18,7 @@ export default class DHConsumable extends BaseDataItem {
         const fields = foundry.data.fields;
         return {
             ...super.defineSchema(),
-            consumeOnUse: new fields.BooleanField({ initial: true }),
-            destroyOnEmpty: new fields.BooleanField({ initial: true })
+            consumeOnUse: new fields.BooleanField({ initial: true })
         };
     }