Merge branch 'main' into feature/471-Codex-Domain-Compendium

2026-01-18 07:59:03 +01:00 · 2025-08-03 18:54:37 +02:00 · 2025-08-03 18:54:37 +02:00 · d254329fbd
commit d254329fbd
parent e329f78061 497a0eebe0
188 changed files with 1274 additions and 436 deletions
--- a/lang/en.json
+++ b/lang/en.json
@ -85,6 +85,13 @@
                },
                "applyTo": {
                    "label": "Targeted Resource"
+                },
+                "consumeOnSuccess": {
+                    "label": "Consume on Success only",
+                    "short": "(on Success only)"
+                },
+                "cost": {
+                    "stepTooltip": "+{step} per step"
                }
            }
        },
--- a/module/data/action/baseAction.mjs
+++ b/module/data/action/baseAction.mjs
@ -208,7 +208,7 @@ export default class DHBaseAction extends ActionMixin(foundry.abstract.DataModel
        return !this.hasRoll;
    }

-    async consume(config) {
+    async consume(config, successCost = false) {
        const usefulResources = foundry.utils.deepClone(this.actor.system.resources);

        for (var cost of config.costs) {
@ -220,8 +220,17 @@ export default class DHBaseAction extends ActionMixin(foundry.abstract.DataModel
                };
            }
        }
+        
        const resources = config.costs
-            .filter(c => c.enabled !== false)
+            .filter(c =>
+                c.enabled !== false
+                &&
+                (
+                    (!successCost && (!c.consumeOnSuccess || config.roll?.success))
+                    ||
+                    (successCost && c.consumeOnSuccess)
+                )
+            )
            .map(c => {
                const resource = usefulResources[c.key];
                return {
@ -233,7 +242,17 @@ export default class DHBaseAction extends ActionMixin(foundry.abstract.DataModel
            });

        await this.actor.modifyResource(resources);
-        if (config.uses?.enabled) this.update({ 'uses.value': this.uses.value + 1 });
+        if (config.uses?.enabled
+            &&
+            (
+                (!successCost && (!config.uses?.consumeOnSuccess || config.roll?.success))
+                ||
+                (successCost && config.uses?.consumeOnSuccess)
+            )
+        ) this.update({ 'uses.value': this.uses.value + 1 });
+
+        if(config.roll?.success || successCost)
+            (config.message ?? config.parent).update({'system.successConsumed': true})
    }
    /* */

--- a/module/data/chat-message/adversaryRoll.mjs
+++ b/module/data/chat-message/adversaryRoll.mjs
@ -42,10 +42,28 @@ export default class DHActorRoll extends foundry.abstract.TypeDataModel {
            damage: new fields.ObjectField(),
            costs: new fields.ArrayField(
                new fields.ObjectField()
-            )
+            ),
+            successConsumed: new fields.BooleanField({ initial: false })
        };
    }

+    get actionActor() {
+        if(!this.source.actor) return null;
+        return fromUuidSync(this.source.actor);
+    }
+
+    get actionItem() {
+        const actionActor = this.actionActor;
+        if(!actionActor || !this.source.item) return null;
+        return actionActor.items.get(this.source.item);
+    }
+
+    get action() {
+        const actionItem = this.actionItem;
+        if(!actionItem || !this.source.action) return null;
+        return actionItem.system.actionsList?.find(a => a.id === this.source.action);
+    }
+
    get messageTemplate() {
        return 'systems/daggerheart/templates/ui/chat/roll.hbs';
    }
@ -74,14 +92,14 @@ export default class DHActorRoll extends foundry.abstract.TypeDataModel {

    async updateTargets() {
        this.currentTargets = this.getTargetList();
-        if(!this.targetSelection && this.hasSave) {
+        if(!this.targetSelection) {
            this.currentTargets.forEach(ct => {
                if(this.targets.find(t => t.actorId === ct.actorId)) return;
                const indexTarget = this.oldTargets.findIndex(ot => ot.actorId === ct.actorId);
                if(indexTarget === -1)
                    this.oldTargets.push(ct);
            });
-            this.setPendingSaves();
+            if(this.hasSave) this.setPendingSaves();
            if(this.currentTargets.length) {
                if(!this.parent._id) return;
                const updates = await this.parent.update(
@ -91,7 +109,7 @@ export default class DHActorRoll extends foundry.abstract.TypeDataModel {
                        }
                    }
                );
-                if(!updates)
+                if(!updates && ui.chat.collection.get(this.parent.id))
                    ui.chat.updateMessage(this.parent);
            }
        }
--- a/module/data/fields/action/costField.mjs
+++ b/module/data/fields/action/costField.mjs
@ -9,9 +9,10 @@ export default class CostField extends fields.ArrayField {
                initial: 'hope'
            }),
            keyIsID: new fields.BooleanField(),
-            value: new fields.NumberField({ nullable: true, initial: 1 }),
+            value: new fields.NumberField({ nullable: true, initial: 1, min: 0 }),
            scalable: new fields.BooleanField({ initial: false }),
-            step: new fields.NumberField({ nullable: true, initial: null })
+            step: new fields.NumberField({ nullable: true, initial: null }),
+            consumeOnSuccess: new fields.BooleanField({ initial: false, label: "DAGGERHEART.ACTIONS.Settings.consumeOnSuccess.label" })
        });
        super(element, options, context);
    }
@ -28,9 +29,9 @@ export default class CostField extends fields.ArrayField {
    static calcCosts(costs) {
        const resources = CostField.getResources.call(this, costs);
        return costs.map(c => {
-            c.scale = c.scale ?? 1;
+            c.scale = c.scale ?? 0;
            c.step = c.step ?? 1;
-            c.total = c.value + (c.scale - 1) * c.step;
+            c.total = c.value + c.scale * c.step;
            c.enabled = c.hasOwnProperty('enabled') ? c.enabled : true;
            c.max =
                c.key === 'fear'
@ -38,7 +39,7 @@ export default class CostField extends fields.ArrayField {
                    : resources[c.key].isReversed
                      ? resources[c.key].max
                      : resources[c.key].value;
-            if (c.scalable) c.maxStep = Math.floor(c.max / c.step);
+            if (c.scalable) c.maxStep = Math.floor((c.max - c.value) / c.step);
            return c;
        });
    }
--- a/module/data/fields/action/rollField.mjs
+++ b/module/data/fields/action/rollField.mjs
@ -78,7 +78,7 @@ export class DHActionRollData extends foundry.abstract.DataModel {
                        : null;
                const trait =
                    this.useDefault || !this.trait
-                        ? (spellcastingTrait ?? this.parent.item.system.attack.roll.trait ?? 'agility')
+                        ? (spellcastingTrait ?? this.parent.item.system.attack?.roll?.trait ?? 'agility')
                        : this.trait;
                if (
                    this.type === CONFIG.DH.GENERAL.rollTypes.attack.id ||
--- a/module/data/fields/action/usesField.mjs
+++ b/module/data/fields/action/usesField.mjs
@ -11,7 +11,8 @@ export default class UsesField extends fields.SchemaField {
                choices: CONFIG.DH.GENERAL.refreshTypes,
                initial: null,
                nullable: true
-            })
+            }),
+            consumeOnSuccess: new fields.BooleanField({ initial: false, label: "DAGGERHEART.ACTIONS.Settings.consumeOnSuccess.label" })
        };
        super(usesFields, options, context);
    }
--- a/module/dice/d20Roll.mjs
+++ b/module/dice/d20Roll.mjs
@ -147,6 +147,7 @@ export default class D20Roll extends DHRoll {
                const difficulty = config.roll.difficulty ?? target.difficulty ?? target.evasion;
                target.hit = this.isCritical || roll.total >= difficulty;
            });
+            data.success = config.targets.some(target => target.hit)
        } else if (config.roll.difficulty) {
            data.difficulty = config.roll.difficulty;
            data.success = roll.isCritical || roll.total >= config.roll.difficulty;
--- a/module/documents/chatMessage.mjs
+++ b/module/documents/chatMessage.mjs
@ -106,6 +106,7 @@ export default class DhpChatMessage extends foundry.documents.ChatMessage {
                });
            }

+            this.consumeOnSuccess();
            if (this.system.hasHealing) target.actor.takeHealing(damages);
            else target.actor.takeDamage(damages);
        }
@ -132,7 +133,15 @@ export default class DhpChatMessage extends foundry.documents.ChatMessage {
            const targets = this.getTargetList();
            if (targets.length === 0)
                ui.notifications.info(game.i18n.localize('DAGGERHEART.UI.Notifications.noTargetsSelected'));
+            this.consumeOnSuccess();
            await action.applyEffects(event, this, targets);
        }
    }
+
+    consumeOnSuccess() {
+        if(!this.system.successConsumed && !this.system.targetSelection) {
+            const action = this.system.action;
+            if(action) action.consume(this.system, true);
+        }
+    }
 }
--- a/src/packs/adversaries/adversary_Adult_Flickerfly_G7jiltRjgvVhZewm.json
+++ b/src/packs/adversaries/adversary_Adult_Flickerfly_G7jiltRjgvVhZewm.json
@ -70,7 +70,8 @@
      "name": "Wing Slash",
      "img": "icons/commodities/biological/wing-insect-blue.webp",
      "roll": {
-        "bonus": 3
+        "bonus": 3,
+        "type": "attack"
      },
      "range": "veryClose",
      "damage": {
@ -114,7 +115,7 @@
    "systemId": "daggerheart",
    "systemVersion": "0.0.1",
    "createdTime": 1753922784219,
-    "modifiedTime": 1754121931543,
+    "modifiedTime": 1754236374441,
    "lastModifiedBy": "MQSznptE5yLT7kj8"
  },
  "_id": "G7jiltRjgvVhZewm",
--- a/src/packs/adversaries/adversary_Apprentice_Assassin_vNIbYQ4YSzNf0WPE.json
+++ b/src/packs/adversaries/adversary_Apprentice_Assassin_vNIbYQ4YSzNf0WPE.json
@ -68,7 +68,8 @@
      "name": "Thrown Dagger",
      "range": "veryClose",
      "roll": {
-        "bonus": -1
+        "bonus": -1,
+        "type": "attack"
      },
      "damage": {
        "parts": [
@ -113,7 +114,7 @@
    "systemId": "daggerheart",
    "systemVersion": "0.0.1",
    "createdTime": 1753922784220,
-    "modifiedTime": 1754090770938,
+    "modifiedTime": 1754236375474,
    "lastModifiedBy": "MQSznptE5yLT7kj8"
  },
  "_id": "vNIbYQ4YSzNf0WPE",
--- a/src/packs/adversaries/adversary_Arch_Necromancer_WPEOIGfclNJxWb87.json
+++ b/src/packs/adversaries/adversary_Arch_Necromancer_WPEOIGfclNJxWb87.json
@ -80,7 +80,8 @@
    "attack": {
      "name": "Necrotic Blast",
      "roll": {
-        "bonus": 6
+        "bonus": 6,
+        "type": "attack"
      },
      "range": "far",
      "damage": {
@ -125,7 +126,7 @@
    "systemId": "daggerheart",
    "systemVersion": "0.0.1",
    "createdTime": 1753922784221,
-    "modifiedTime": 1754219468339,
+    "modifiedTime": 1754236374832,
    "lastModifiedBy": "MQSznptE5yLT7kj8"
  },
  "_id": "WPEOIGfclNJxWb87",
--- a/src/packs/adversaries/adversary_Archer_Squadron_0ts6CGd93lLqGZI5.json
+++ b/src/packs/adversaries/adversary_Archer_Squadron_0ts6CGd93lLqGZI5.json
@ -101,7 +101,8 @@
      "img": "icons/weapons/bows/longbow-recurve-leather-brown.webp",
      "range": "far",
      "roll": {
-        "bonus": 0
+        "bonus": 0,
+        "type": "attack"
      }
    }
  },
@ -114,7 +115,7 @@
    "systemId": "daggerheart",
    "systemVersion": "0.0.1",
    "createdTime": 1753922784223,
-    "modifiedTime": 1754090770938,
+    "modifiedTime": 1754236373813,
    "lastModifiedBy": "MQSznptE5yLT7kj8"
  },
  "_id": "0ts6CGd93lLqGZI5",
--- a/src/packs/adversaries/adversary_Assassin_Poisoner_h5RuhzGL17dW5FBT.json
+++ b/src/packs/adversaries/adversary_Assassin_Poisoner_h5RuhzGL17dW5FBT.json
@ -76,7 +76,8 @@
      "name": "Poisoned Throwing Dagger",
      "img": "icons/skills/melee/blade-tip-acid-poison-green.webp",
      "roll": {
-        "bonus": 3
+        "bonus": 3,
+        "type": "attack"
      },
      "range": "close",
      "damage": {
@ -120,7 +121,7 @@
    "systemId": "daggerheart",
    "systemVersion": "0.0.1",
    "createdTime": 1753922784224,
-    "modifiedTime": 1754090770938,
+    "modifiedTime": 1754236375140,
    "lastModifiedBy": "MQSznptE5yLT7kj8"
  },
  "_id": "h5RuhzGL17dW5FBT",
--- a/src/packs/adversaries/adversary_Battle_Box_dgH3fW9FTYLaIDvS.json
+++ b/src/packs/adversaries/adversary_Battle_Box_dgH3fW9FTYLaIDvS.json
@ -76,7 +76,8 @@
      "name": "Slam",
      "img": "icons/commodities/tech/metal-barrel.webp",
      "roll": {
-        "bonus": 2
+        "bonus": 2,
+        "type": "attack"
      },
      "damage": {
        "parts": [
@ -120,7 +121,7 @@
    "systemId": "daggerheart",
    "systemVersion": "0.0.1",
    "createdTime": 1753922784224,
-    "modifiedTime": 1754090770938,
+    "modifiedTime": 1754236375071,
    "lastModifiedBy": "MQSznptE5yLT7kj8"
  },
  "_id": "dgH3fW9FTYLaIDvS",
--- a/src/packs/adversaries/adversary_Chaos_Skull_jDmHqGvzg5wjgmxE.json
+++ b/src/packs/adversaries/adversary_Chaos_Skull_jDmHqGvzg5wjgmxE.json
@ -69,7 +69,8 @@
    "attack": {
      "name": "Energy Blast",
      "roll": {
-        "bonus": 2
+        "bonus": 2,
+        "type": "attack"
      },
      "range": "close",
      "damage": {
@ -114,7 +115,7 @@
    "systemId": "daggerheart",
    "systemVersion": "0.0.1",
    "createdTime": 1753922784233,
-    "modifiedTime": 1754090770938,
+    "modifiedTime": 1754236375196,
    "lastModifiedBy": "MQSznptE5yLT7kj8"
  },
  "_id": "jDmHqGvzg5wjgmxE",
--- a/src/packs/adversaries/adversary_Conscript_99TqczuQipBmaB8i.json
+++ b/src/packs/adversaries/adversary_Conscript_99TqczuQipBmaB8i.json
@ -62,7 +62,8 @@
      "name": "Spears",
      "range": "veryClose",
      "roll": {
-        "bonus": 0
+        "bonus": 0,
+        "type": "attack"
      },
      "damage": {
        "parts": [
@ -106,7 +107,7 @@
    "systemId": "daggerheart",
    "systemVersion": "0.0.1",
    "createdTime": 1753922784234,
-    "modifiedTime": 1754090770938,
+    "modifiedTime": 1754236374185,
    "lastModifiedBy": "MQSznptE5yLT7kj8"
  },
  "_id": "99TqczuQipBmaB8i",
--- a/src/packs/adversaries/adversary_Courtesan_ZxWaWPdzFIUPNC62.json
+++ b/src/packs/adversaries/adversary_Courtesan_ZxWaWPdzFIUPNC62.json
@ -80,7 +80,8 @@
    "attack": {
      "name": "Dagger",
      "roll": {
-        "bonus": -3
+        "bonus": -3,
+        "type": "attack"
      },
      "damage": {
        "parts": [
@ -124,7 +125,7 @@
    "systemId": "daggerheart",
    "systemVersion": "0.0.1",
    "createdTime": 1753922784237,
-    "modifiedTime": 1754090770938,
+    "modifiedTime": 1754236374964,
    "lastModifiedBy": "MQSznptE5yLT7kj8"
  },
  "_id": "ZxWaWPdzFIUPNC62",
--- a/src/packs/adversaries/adversary_Cult_Adept_0NxCSugvKQ4W8OYZ.json
+++ b/src/packs/adversaries/adversary_Cult_Adept_0NxCSugvKQ4W8OYZ.json
@ -80,7 +80,8 @@
    "attack": {
      "name": "Rune-Covered Rod",
      "roll": {
-        "bonus": 2
+        "bonus": 2,
+        "type": "attack"
      },
      "damage": {
        "parts": [
@ -125,7 +126,7 @@
    "systemId": "daggerheart",
    "systemVersion": "0.0.1",
    "createdTime": 1753922784239,
-    "modifiedTime": 1754142403176,
+    "modifiedTime": 1754236373793,
    "lastModifiedBy": "MQSznptE5yLT7kj8"
  },
  "_id": "0NxCSugvKQ4W8OYZ",
--- a/src/packs/adversaries/adversary_Cult_Fang_tyBOpLfigAhI9bU3.json
+++ b/src/packs/adversaries/adversary_Cult_Fang_tyBOpLfigAhI9bU3.json
@ -70,7 +70,8 @@
      "name": "Long Knife",
      "img": "icons/weapons/daggers/dagger-ritual-simple-green.webp",
      "roll": {
-        "bonus": 2
+        "bonus": 2,
+        "type": "attack"
      },
      "damage": {
        "parts": [
@ -114,7 +115,7 @@
    "systemId": "daggerheart",
    "systemVersion": "0.0.1",
    "createdTime": 1753922784239,
-    "modifiedTime": 1754090222049,
+    "modifiedTime": 1754236375454,
    "lastModifiedBy": "MQSznptE5yLT7kj8"
  },
  "_id": "tyBOpLfigAhI9bU3",
--- a/src/packs/adversaries/adversary_Cult_Initiate_zx99sOGTXicP4SSD.json
+++ b/src/packs/adversaries/adversary_Cult_Initiate_zx99sOGTXicP4SSD.json
@ -62,7 +62,8 @@
      "name": "Ritual Dagger",
      "img": "icons/weapons/daggers/dagger-crooked-black.webp",
      "roll": {
-        "bonus": 0
+        "bonus": 0,
+        "type": "attack"
      },
      "damage": {
        "parts": [
@ -106,7 +107,7 @@
    "systemId": "daggerheart",
    "systemVersion": "0.0.1",
    "createdTime": 1753922784240,
-    "modifiedTime": 1754090770938,
+    "modifiedTime": 1754236375538,
    "lastModifiedBy": "MQSznptE5yLT7kj8"
  },
  "_id": "zx99sOGTXicP4SSD",
--- a/src/packs/adversaries/adversary_Demon_of_Avarice_pnyjIGxxvurcWmTv.json
+++ b/src/packs/adversaries/adversary_Demon_of_Avarice_pnyjIGxxvurcWmTv.json
@ -76,7 +76,8 @@
      "name": "Hungry Maw",
      "img": "icons/creatures/abilities/mouth-teeth-rows-red.webp",
      "roll": {
-        "bonus": 2
+        "bonus": 2,
+        "type": "attack"
      },
      "damage": {
        "parts": [
@ -119,7 +120,7 @@
    "systemId": "daggerheart",
    "systemVersion": "0.0.1",
    "createdTime": 1753922784247,
-    "modifiedTime": 1754123854047,
+    "modifiedTime": 1754236375381,
    "lastModifiedBy": "MQSznptE5yLT7kj8"
  },
  "_id": "pnyjIGxxvurcWmTv",
--- a/src/packs/adversaries/adversary_Demon_of_Despair_kE4dfhqmIQpNd44e.json
+++ b/src/packs/adversaries/adversary_Demon_of_Despair_kE4dfhqmIQpNd44e.json
@ -76,7 +76,8 @@
      "name": "Miasma Bolt",
      "img": "icons/magic/acid/projectile-smoke-glowing.webp",
      "roll": {
-        "bonus": 3
+        "bonus": 3,
+        "type": "attack"
      },
      "damage": {
        "parts": [
@ -119,7 +120,7 @@
    "systemId": "daggerheart",
    "systemVersion": "0.0.1",
    "createdTime": 1753922784248,
-    "modifiedTime": 1754124805912,
+    "modifiedTime": 1754236375236,
    "lastModifiedBy": "MQSznptE5yLT7kj8"
  },
  "_id": "kE4dfhqmIQpNd44e",
--- a/src/packs/adversaries/adversary_Demon_of_Hubris_2VN3BftageoTTIzu.json
+++ b/src/packs/adversaries/adversary_Demon_of_Hubris_2VN3BftageoTTIzu.json
@ -77,7 +77,8 @@
      "img": "icons/weapons/polearms/spear-flared-gold.webp",
      "range": "veryClose",
      "roll": {
-        "bonus": 4
+        "bonus": 4,
+        "type": "attack"
      },
      "damage": {
        "parts": [
@ -120,7 +121,7 @@
    "systemId": "daggerheart",
    "systemVersion": "0.0.1",
    "createdTime": 1753922784249,
-    "modifiedTime": 1754125152223,
+    "modifiedTime": 1754236373869,
    "lastModifiedBy": "MQSznptE5yLT7kj8"
  },
  "_id": "2VN3BftageoTTIzu",
--- a/src/packs/adversaries/adversary_Demon_of_Jealousy_SxSOkM4bcVOFyjbo.json
+++ b/src/packs/adversaries/adversary_Demon_of_Jealousy_SxSOkM4bcVOFyjbo.json
@ -75,7 +75,8 @@
    "attack": {
      "name": "Psychic Assault",
      "roll": {
-        "bonus": 4
+        "bonus": 4,
+        "type": "attack"
      },
      "range": "far",
      "damage": {
@ -120,7 +121,7 @@
    "systemId": "daggerheart",
    "systemVersion": "0.0.1",
    "createdTime": 1753922784249,
-    "modifiedTime": 1754125577865,
+    "modifiedTime": 1754236374726,
    "lastModifiedBy": "MQSznptE5yLT7kj8"
  },
  "_id": "SxSOkM4bcVOFyjbo",
--- a/src/packs/adversaries/adversary_Demon_of_Wrath_5lphJAgzoqZI3VoG.json
+++ b/src/packs/adversaries/adversary_Demon_of_Wrath_5lphJAgzoqZI3VoG.json
@ -76,7 +76,8 @@
      "name": "Fists",
      "range": "veryClose",
      "roll": {
-        "bonus": 3
+        "bonus": 3,
+        "type": "attack"
      },
      "img": "icons/skills/melee/unarmed-punch-fist-yellow-red.webp",
      "damage": {
@ -120,7 +121,7 @@
    "systemId": "daggerheart",
    "systemVersion": "0.0.1",
    "createdTime": 1753922784252,
-    "modifiedTime": 1754125870154,
+    "modifiedTime": 1754236373976,
    "lastModifiedBy": "MQSznptE5yLT7kj8"
  },
  "_id": "5lphJAgzoqZI3VoG",
--- a/src/packs/adversaries/adversary_Demonic_Hound_Pack_NoRZ1PqB8N5wcIw0.json
+++ b/src/packs/adversaries/adversary_Demonic_Hound_Pack_NoRZ1PqB8N5wcIw0.json
@ -106,7 +106,8 @@
      "name": "Claws and Fangs",
      "img": "icons/creatures/abilities/mouth-teeth-rows-red.webp",
      "roll": {
-        "bonus": 0
+        "bonus": 0,
+        "type": "attack"
      },
      "range": ""
    }
@ -120,7 +121,7 @@
    "systemId": "daggerheart",
    "systemVersion": "0.0.1",
    "createdTime": 1753922784253,
-    "modifiedTime": 1754090770938,
+    "modifiedTime": 1754236374571,
    "lastModifiedBy": "MQSznptE5yLT7kj8"
  },
  "_id": "NoRZ1PqB8N5wcIw0",
--- a/src/packs/adversaries/adversary_Dire_Bat_tBWHW00epmMnkawe.json
+++ b/src/packs/adversaries/adversary_Dire_Bat_tBWHW00epmMnkawe.json
@ -74,7 +74,8 @@
    "attack": {
      "name": "Claws and Teeth",
      "roll": {
-        "bonus": 2
+        "bonus": 2,
+        "type": "attack"
      },
      "damage": {
        "parts": [
@ -118,7 +119,7 @@
    "systemId": "daggerheart",
    "systemVersion": "0.0.1",
    "createdTime": 1753922784253,
-    "modifiedTime": 1754126214523,
+    "modifiedTime": 1754236375442,
    "lastModifiedBy": "MQSznptE5yLT7kj8"
  },
  "_id": "tBWHW00epmMnkawe",
--- a/src/packs/adversaries/adversary_Dryad_wR7cFKrHvRzbzhBT.json
+++ b/src/packs/adversaries/adversary_Dryad_wR7cFKrHvRzbzhBT.json
@ -76,7 +76,8 @@
      "name": "Deadfall Shortbow",
      "img": "icons/weapons/bows/longbow-recurve-skull-brown.webp",
      "roll": {
-        "bonus": 4
+        "bonus": 4,
+        "type": "attack"
      },
      "range": "far",
      "damage": {
@ -120,7 +121,7 @@
    "systemId": "daggerheart",
    "systemVersion": "0.0.1",
    "createdTime": 1753922784258,
-    "modifiedTime": 1754126923288,
+    "modifiedTime": 1754236375484,
    "lastModifiedBy": "MQSznptE5yLT7kj8"
  },
  "_id": "wR7cFKrHvRzbzhBT",
--- a/src/packs/adversaries/adversary_Electric_Eels_TLzY1nDw0Bu9Ud40.json
+++ b/src/packs/adversaries/adversary_Electric_Eels_TLzY1nDw0Bu9Ud40.json
@ -100,7 +100,8 @@
      "name": "Shocking Bite",
      "img": "icons/creatures/abilities/mouth-teeth-sharp.webp",
      "roll": {
-        "bonus": 0
+        "bonus": 0,
+        "type": "attack"
      },
      "range": ""
    }
@ -114,7 +115,7 @@
    "systemId": "daggerheart",
    "systemVersion": "0.0.1",
    "createdTime": 1753922784258,
-    "modifiedTime": 1754090770938,
+    "modifiedTime": 1754236374738,
    "lastModifiedBy": "MQSznptE5yLT7kj8"
  },
  "_id": "TLzY1nDw0Bu9Ud40",
--- a/src/packs/adversaries/adversary_Elemental_Spark_P7h54ZePFPHpYwvB.json
+++ b/src/packs/adversaries/adversary_Elemental_Spark_P7h54ZePFPHpYwvB.json
@ -62,7 +62,8 @@
      "name": "Bursts of Fire",
      "img": "icons/magic/fire/blast-jet-stream-splash.webp",
      "roll": {
-        "bonus": 0
+        "bonus": 0,
+        "type": "attack"
      },
      "range": "close",
      "damage": {
@ -107,7 +108,7 @@
    "systemId": "daggerheart",
    "systemVersion": "0.0.1",
    "createdTime": 1753922784259,
-    "modifiedTime": 1754127540262,
+    "modifiedTime": 1754236374651,
    "lastModifiedBy": "MQSznptE5yLT7kj8"
  },
  "_id": "P7h54ZePFPHpYwvB",
--- a/src/packs/adversaries/adversary_Elite_Soldier_bfhVWMBUh61b9J6n.json
+++ b/src/packs/adversaries/adversary_Elite_Soldier_bfhVWMBUh61b9J6n.json
@ -71,7 +71,7 @@
      "range": "veryClose",
      "roll": {
        "bonus": 1,
-        "type": null,
+        "type": "attack",
        "trait": null,
        "difficulty": null,
        "advState": "neutral",
@ -149,7 +149,7 @@
    "systemId": "daggerheart",
    "systemVersion": "0.0.1",
    "createdTime": 1754090776362,
-    "modifiedTime": 1754090776362,
+    "modifiedTime": 1754236375037,
    "lastModifiedBy": "MQSznptE5yLT7kj8"
  },
  "ownership": {
--- a/src/packs/adversaries/adversary_Failed_Experiment_ChwwVqowFw8hJQwT.json
+++ b/src/packs/adversaries/adversary_Failed_Experiment_ChwwVqowFw8hJQwT.json
@ -75,7 +75,8 @@
    "attack": {
      "name": "Bite and Claw",
      "roll": {
-        "bonus": 1
+        "bonus": 1,
+        "type": "attack"
      },
      "damage": {
        "parts": [
@ -120,7 +121,7 @@
    "systemId": "daggerheart",
    "systemVersion": "0.0.1",
    "createdTime": 1753922784262,
-    "modifiedTime": 1754090770938,
+    "modifiedTime": 1754236374339,
    "lastModifiedBy": "MQSznptE5yLT7kj8"
  },
  "_id": "ChwwVqowFw8hJQwT",
--- a/src/packs/adversaries/adversary_Fallen_Shock_Troop_OsLG2BjaEdTZUJU9.json
+++ b/src/packs/adversaries/adversary_Fallen_Shock_Troop_OsLG2BjaEdTZUJU9.json
@ -60,7 +60,8 @@
    },
    "attack": {
      "roll": {
-        "bonus": 2
+        "bonus": 2,
+        "type": "attack"
      },
      "name": "Cursed Axe",
      "img": "icons/weapons/axes/axe-battle-skull-black.webp",
@ -107,7 +108,7 @@
    "systemId": "daggerheart",
    "systemVersion": "0.0.1",
    "createdTime": 1753922784264,
-    "modifiedTime": 1754219468339,
+    "modifiedTime": 1754236374634,
    "lastModifiedBy": "MQSznptE5yLT7kj8"
  },
  "_id": "OsLG2BjaEdTZUJU9",
--- a/src/packs/adversaries/adversary_Fallen_Sorcerer_PELRry1vqjBzSAlr.json
+++ b/src/packs/adversaries/adversary_Fallen_Sorcerer_PELRry1vqjBzSAlr.json
@ -75,7 +75,8 @@
    "attack": {
      "name": "Corrupted Staff",
      "roll": {
-        "bonus": 4
+        "bonus": 4,
+        "type": "attack"
      },
      "range": "far",
      "damage": {
@ -120,7 +121,7 @@
    "systemId": "daggerheart",
    "systemVersion": "0.0.1",
    "createdTime": 1753922784265,
-    "modifiedTime": 1754219468339,
+    "modifiedTime": 1754236374668,
    "lastModifiedBy": "MQSznptE5yLT7kj8"
  },
  "_id": "PELRry1vqjBzSAlr",
--- a/src/packs/adversaries/adversary_Giant_Beastmaster_8VZIgU12cB3cvlyH.json
+++ b/src/packs/adversaries/adversary_Giant_Beastmaster_8VZIgU12cB3cvlyH.json
@ -76,7 +76,8 @@
      "name": "Longbow",
      "img": "icons/weapons/bows/longbow-recurve-leather-brown.webp",
      "roll": {
-        "bonus": 2
+        "bonus": 2,
+        "type": "attack"
      },
      "range": "far",
      "damage": {
@ -120,7 +121,7 @@
    "systemId": "daggerheart",
    "systemVersion": "0.0.1",
    "createdTime": 1753922784268,
-    "modifiedTime": 1754090770938,
+    "modifiedTime": 1754236374099,
    "lastModifiedBy": "MQSznptE5yLT7kj8"
  },
  "_id": "8VZIgU12cB3cvlyH",
--- a/src/packs/adversaries/adversary_Giant_Brawler_YnObCleGjPT7yqEc.json
+++ b/src/packs/adversaries/adversary_Giant_Brawler_YnObCleGjPT7yqEc.json
@ -76,7 +76,8 @@
      "name": "Warhammer",
      "img": "icons/weapons/hammers/hammer-double-simple-worn.webp",
      "roll": {
-        "bonus": 2
+        "bonus": 2,
+        "type": "attack"
      },
      "range": "veryClose",
      "damage": {
@ -120,7 +121,7 @@
    "systemId": "daggerheart",
    "systemVersion": "0.0.1",
    "createdTime": 1753922784268,
-    "modifiedTime": 1754090770938,
+    "modifiedTime": 1754236374935,
    "lastModifiedBy": "MQSznptE5yLT7kj8"
  },
  "_id": "YnObCleGjPT7yqEc",
--- a/src/packs/adversaries/adversary_Giant_Eagle_OMQ0v6PE8s1mSU0K.json
+++ b/src/packs/adversaries/adversary_Giant_Eagle_OMQ0v6PE8s1mSU0K.json
@ -70,7 +70,7 @@
      "name": "Claws and Beak",
      "roll": {
        "bonus": 1,
-        "type": null,
+        "type": "attack",
        "trait": null,
        "difficulty": null,
        "advState": "neutral",
@ -149,7 +149,7 @@
    "systemId": "daggerheart",
    "systemVersion": "0.0.1",
    "createdTime": 1754090770908,
-    "modifiedTime": 1754090770938,
+    "modifiedTime": 1754236374596,
    "lastModifiedBy": "MQSznptE5yLT7kj8"
  },
  "ownership": {
--- a/src/packs/adversaries/adversary_Giant_Rat_4PfLnaCrOcMdb4dK.json
+++ b/src/packs/adversaries/adversary_Giant_Rat_4PfLnaCrOcMdb4dK.json
@ -65,7 +65,8 @@
    },
    "attack": {
      "roll": {
-        "bonus": -4
+        "bonus": -4,
+        "type": "attack"
      },
      "name": "Claws",
      "img": "icons/creatures/claws/claw-straight-brown.webp",
@ -111,7 +112,7 @@
    "systemId": "daggerheart",
    "systemVersion": "0.0.1",
    "createdTime": 1753922784270,
-    "modifiedTime": 1754046551239,
+    "modifiedTime": 1754236373924,
    "lastModifiedBy": "MQSznptE5yLT7kj8"
  },
  "_id": "4PfLnaCrOcMdb4dK",
--- a/src/packs/adversaries/adversary_Giant_Recruit_5s8wSvpyC5rxY5aD.json
+++ b/src/packs/adversaries/adversary_Giant_Recruit_5s8wSvpyC5rxY5aD.json
@ -94,7 +94,8 @@
      },
      "range": "veryClose",
      "roll": {
-        "bonus": 1
+        "bonus": 1,
+        "type": "attack"
      }
    }
  },
@ -107,7 +108,7 @@
    "systemId": "daggerheart",
    "systemVersion": "0.0.1",
    "createdTime": 1753922784271,
-    "modifiedTime": 1754090770938,
+    "modifiedTime": 1754236373987,
    "lastModifiedBy": "MQSznptE5yLT7kj8"
  },
  "_id": "5s8wSvpyC5rxY5aD",
--- a/src/packs/adversaries/adversary_Giant_Scorpion_fmfntuJ8mHRCAktP.json
+++ b/src/packs/adversaries/adversary_Giant_Scorpion_fmfntuJ8mHRCAktP.json
@ -75,7 +75,8 @@
      "name": "Pincers",
      "img": "icons/creatures/claws/pincer-crab-brown.webp",
      "roll": {
-        "bonus": 1
+        "bonus": 1,
+        "type": "attack"
      },
      "damage": {
        "parts": [
@ -118,7 +119,7 @@
    "systemId": "daggerheart",
    "systemVersion": "0.0.1",
    "createdTime": 1753922784272,
-    "modifiedTime": 1754046801101,
+    "modifiedTime": 1754236375100,
    "lastModifiedBy": "MQSznptE5yLT7kj8"
  },
  "_id": "fmfntuJ8mHRCAktP",
--- a/src/packs/adversaries/adversary_Glass_Snake_8KWVLWXFhlY2kYx0.json
+++ b/src/packs/adversaries/adversary_Glass_Snake_8KWVLWXFhlY2kYx0.json
@ -70,7 +70,8 @@
      "name": "Glass Fangs",
      "img": "icons/creatures/abilities/fang-tooth-blood-red.webp",
      "roll": {
-        "bonus": 2
+        "bonus": 2,
+        "type": "attack"
      },
      "range": "veryClose",
      "damage": {
@ -114,7 +115,7 @@
    "systemId": "daggerheart",
    "systemVersion": "0.0.1",
    "createdTime": 1753922784273,
-    "modifiedTime": 1754047110424,
+    "modifiedTime": 1754236374083,
    "lastModifiedBy": "MQSznptE5yLT7kj8"
  },
  "_id": "8KWVLWXFhlY2kYx0",
--- a/src/packs/adversaries/adversary_Gorgon_8mJYMpbLTb8qIOrr.json
+++ b/src/packs/adversaries/adversary_Gorgon_8mJYMpbLTb8qIOrr.json
@ -75,7 +75,8 @@
    "attack": {
      "name": "Sunsear Shortbow",
      "roll": {
-        "bonus": 4
+        "bonus": 4,
+        "type": "attack"
      },
      "range": "far",
      "damage": {
@ -120,7 +121,7 @@
    "systemId": "daggerheart",
    "systemVersion": "0.0.1",
    "createdTime": 1753922784274,
-    "modifiedTime": 1754090770938,
+    "modifiedTime": 1754236374109,
    "lastModifiedBy": "MQSznptE5yLT7kj8"
  },
  "_id": "8mJYMpbLTb8qIOrr",
--- a/src/packs/adversaries/adversary_Greater_Earth_Elemental_dsfB3YhoL5SudvS2.json
+++ b/src/packs/adversaries/adversary_Greater_Earth_Elemental_dsfB3YhoL5SudvS2.json
@ -70,7 +70,8 @@
      "name": "Boulder Fist",
      "img": "icons/magic/earth/strike-fist-stone.webp",
      "roll": {
-        "bonus": 7
+        "bonus": 7,
+        "type": "attack"
      },
      "range": "veryClose",
      "damage": {
@ -114,7 +115,7 @@
    "systemId": "daggerheart",
    "systemVersion": "0.0.1",
    "createdTime": 1753922784275,
-    "modifiedTime": 1754127636642,
+    "modifiedTime": 1754236375088,
    "lastModifiedBy": "MQSznptE5yLT7kj8"
  },
  "_id": "dsfB3YhoL5SudvS2",
--- a/src/packs/adversaries/adversary_Greater_Water_Elemental_xIICT6tEdnA7dKDV.json
+++ b/src/packs/adversaries/adversary_Greater_Water_Elemental_xIICT6tEdnA7dKDV.json
@ -70,7 +70,8 @@
      "name": "Crashing Wave",
      "img": "icons/magic/water/wave-water-blue.webp",
      "roll": {
-        "bonus": 3
+        "bonus": 3,
+        "type": "attack"
      },
      "range": "veryClose",
      "damage": {
@ -114,7 +115,7 @@
    "systemId": "daggerheart",
    "systemVersion": "0.0.1",
    "createdTime": 1753922784278,
-    "modifiedTime": 1754127980927,
+    "modifiedTime": 1754236375512,
    "lastModifiedBy": "MQSznptE5yLT7kj8"
  },
  "_id": "xIICT6tEdnA7dKDV",
--- a/src/packs/adversaries/adversary_Green_Ooze_SHXedd9zZPVfUgUa.json
+++ b/src/packs/adversaries/adversary_Green_Ooze_SHXedd9zZPVfUgUa.json
@ -74,7 +74,8 @@
    "attack": {
      "name": "Ooze Appendage",
      "roll": {
-        "bonus": 1
+        "bonus": 1,
+        "type": "attack"
      },
      "damage": {
        "parts": [
@ -118,7 +119,7 @@
    "systemId": "daggerheart",
    "systemVersion": "0.0.1",
    "createdTime": 1753922784278,
-    "modifiedTime": 1754047493989,
+    "modifiedTime": 1754236374705,
    "lastModifiedBy": "MQSznptE5yLT7kj8"
  },
  "_id": "SHXedd9zZPVfUgUa",
--- a/src/packs/adversaries/adversary_Hallowed_Archer_kabueAo6BALApWqp.json
+++ b/src/packs/adversaries/adversary_Hallowed_Archer_kabueAo6BALApWqp.json
@ -69,7 +69,8 @@
    "attack": {
      "range": "far",
      "roll": {
-        "bonus": 4
+        "bonus": 4,
+        "type": "attack"
      },
      "name": "Sanctified Longbow",
      "img": "icons/weapons/bows/shortbow-recurve-yellow.webp",
@ -114,7 +115,7 @@
    "systemId": "daggerheart",
    "systemVersion": "0.0.1",
    "createdTime": 1753922784279,
-    "modifiedTime": 1754219468339,
+    "modifiedTime": 1754236375250,
    "lastModifiedBy": "MQSznptE5yLT7kj8"
  },
  "_id": "kabueAo6BALApWqp",
--- a/src/packs/adversaries/adversary_Hallowed_Soldier_VENwg7xEFcYObjmT.json
+++ b/src/packs/adversaries/adversary_Hallowed_Soldier_VENwg7xEFcYObjmT.json
@ -61,7 +61,8 @@
    "attack": {
      "name": "Sword and Shield",
      "roll": {
-        "bonus": 2
+        "bonus": 2,
+        "type": "attack"
      },
      "damage": {
        "parts": [
@ -106,7 +107,7 @@
    "systemId": "daggerheart",
    "systemVersion": "0.0.1",
    "createdTime": 1753922784279,
-    "modifiedTime": 1754219468339,
+    "modifiedTime": 1754236374772,
    "lastModifiedBy": "MQSznptE5yLT7kj8"
  },
  "_id": "VENwg7xEFcYObjmT",
--- a/src/packs/adversaries/adversary_Harrier_uRtghKE9mHlII4rs.json
+++ b/src/packs/adversaries/adversary_Harrier_uRtghKE9mHlII4rs.json
@ -75,7 +75,8 @@
      "name": "Javelin",
      "range": "close",
      "roll": {
-        "bonus": 1
+        "bonus": 1,
+        "type": "attack"
      },
      "damage": {
        "parts": [
@ -119,7 +120,7 @@
    "systemId": "daggerheart",
    "systemVersion": "0.0.1",
    "createdTime": 1753922784281,
-    "modifiedTime": 1754047818844,
+    "modifiedTime": 1754236375463,
    "lastModifiedBy": "MQSznptE5yLT7kj8"
  },
  "_id": "uRtghKE9mHlII4rs",
--- a/src/packs/adversaries/adversary_Head_Guard_mK3A5FTx6k8iPU3F.json
+++ b/src/packs/adversaries/adversary_Head_Guard_mK3A5FTx6k8iPU3F.json
@ -79,7 +79,8 @@
      "name": "Mace",
      "img": "icons/weapons/maces/mace-round-ornate-purple.webp",
      "roll": {
-        "bonus": 4
+        "bonus": 4,
+        "type": "attack"
      },
      "damage": {
        "parts": [
@ -122,7 +123,7 @@
    "systemId": "daggerheart",
    "systemVersion": "0.0.1",
    "createdTime": 1753922784282,
-    "modifiedTime": 1754048050272,
+    "modifiedTime": 1754236375275,
    "lastModifiedBy": "MQSznptE5yLT7kj8"
  },
  "_id": "mK3A5FTx6k8iPU3F",
--- a/src/packs/adversaries/adversary_Head_Vampire_i2UNbRvgyoSs07M6.json
+++ b/src/packs/adversaries/adversary_Head_Vampire_i2UNbRvgyoSs07M6.json
@ -76,7 +76,8 @@
      "name": "Rapier",
      "img": "icons/weapons/swords/sword-jeweled-red.webp",
      "roll": {
-        "bonus": 5
+        "bonus": 5,
+        "type": "attack"
      },
      "damage": {
        "parts": [
@ -119,7 +120,7 @@
    "systemId": "daggerheart",
    "systemVersion": "0.0.1",
    "createdTime": 1753922784283,
-    "modifiedTime": 1754128365686,
+    "modifiedTime": 1754236375168,
    "lastModifiedBy": "MQSznptE5yLT7kj8"
  },
  "_id": "i2UNbRvgyoSs07M6",
--- a/src/packs/adversaries/adversary_High_Seraph_r1mbfSSwKWdcFdAU.json
+++ b/src/packs/adversaries/adversary_High_Seraph_r1mbfSSwKWdcFdAU.json
@ -75,7 +75,8 @@
    "attack": {
      "name": "Holy Sword",
      "roll": {
-        "bonus": 8
+        "bonus": 8,
+        "type": "attack"
      },
      "range": "veryClose",
      "damage": {
@ -120,7 +121,7 @@
    "systemId": "daggerheart",
    "systemVersion": "0.0.1",
    "createdTime": 1753922784283,
-    "modifiedTime": 1754219468339,
+    "modifiedTime": 1754236375397,
    "lastModifiedBy": "MQSznptE5yLT7kj8"
  },
  "_id": "r1mbfSSwKWdcFdAU",
--- a/src/packs/adversaries/adversary_Huge_Green_Ooze_6hbqmxDXFOzZJDk4.json
+++ b/src/packs/adversaries/adversary_Huge_Green_Ooze_6hbqmxDXFOzZJDk4.json
@ -76,7 +76,8 @@
      "name": "Ooze Appendage",
      "img": "icons/creatures/slimes/slime-movement-dripping-pseudopods-green.webp",
      "roll": {
-        "bonus": 3
+        "bonus": 3,
+        "type": "attack"
      },
      "damage": {
        "parts": [
@ -119,7 +120,7 @@
    "systemId": "daggerheart",
    "systemVersion": "0.0.1",
    "createdTime": 1753922784284,
-    "modifiedTime": 1754129116472,
+    "modifiedTime": 1754236374016,
    "lastModifiedBy": "MQSznptE5yLT7kj8"
  },
  "_id": "6hbqmxDXFOzZJDk4",
--- a/src/packs/adversaries/adversary_Hydra_MI126iMOOobQ1Obn.json
+++ b/src/packs/adversaries/adversary_Hydra_MI126iMOOobQ1Obn.json
@ -70,7 +70,8 @@
      "name": "Bite",
      "img": "icons/creatures/abilities/mouth-teeth-rows-red.webp",
      "roll": {
-        "bonus": 3
+        "bonus": 3,
+        "type": "attack"
      },
      "range": "close",
      "damage": {
@ -114,7 +115,7 @@
    "systemId": "daggerheart",
    "systemVersion": "0.0.1",
    "createdTime": 1753922784285,
-    "modifiedTime": 1754129471407,
+    "modifiedTime": 1754236374476,
    "lastModifiedBy": "MQSznptE5yLT7kj8"
  },
  "_id": "MI126iMOOobQ1Obn",
--- a/src/packs/adversaries/adversary_Jagged_Knife_Bandit_5Lh1T0zaT8Pkr2U2.json
+++ b/src/packs/adversaries/adversary_Jagged_Knife_Bandit_5Lh1T0zaT8Pkr2U2.json
@ -74,7 +74,8 @@
    "attack": {
      "name": "Daggers",
      "roll": {
-        "bonus": 1
+        "bonus": 1,
+        "type": "attack"
      },
      "damage": {
        "parts": [
@ -118,7 +119,7 @@
    "systemId": "daggerheart",
    "systemVersion": "0.0.1",
    "createdTime": 1753922784290,
-    "modifiedTime": 1754048329039,
+    "modifiedTime": 1754236373947,
    "lastModifiedBy": "MQSznptE5yLT7kj8"
  },
  "_id": "5Lh1T0zaT8Pkr2U2",
--- a/src/packs/adversaries/adversary_Jagged_Knife_Hexer_MbBPIOxaxXYNApXz.json
+++ b/src/packs/adversaries/adversary_Jagged_Knife_Hexer_MbBPIOxaxXYNApXz.json
@ -75,7 +75,8 @@
      "name": "Staff",
      "range": "far",
      "roll": {
-        "bonus": 2
+        "bonus": 2,
+        "type": "attack"
      },
      "img": "icons/weapons/staves/staff-blue-jewel.webp",
      "damage": {
@ -119,7 +120,7 @@
    "systemId": "daggerheart",
    "systemVersion": "0.0.1",
    "createdTime": 1753922784291,
-    "modifiedTime": 1754048452205,
+    "modifiedTime": 1754236374521,
    "lastModifiedBy": "MQSznptE5yLT7kj8"
  },
  "_id": "MbBPIOxaxXYNApXz",
--- a/src/packs/adversaries/adversary_Jagged_Knife_Kneebreaker_CBKixLH3yhivZZuL.json
+++ b/src/packs/adversaries/adversary_Jagged_Knife_Kneebreaker_CBKixLH3yhivZZuL.json
@ -79,7 +79,8 @@
      "name": "Club",
      "img": "icons/weapons/clubs/club-barbed-steel.webp",
      "roll": {
-        "bonus": -3
+        "bonus": -3,
+        "type": "attack"
      },
      "damage": {
        "parts": [
@ -122,7 +123,7 @@
    "systemId": "daggerheart",
    "systemVersion": "0.0.1",
    "createdTime": 1753922784292,
-    "modifiedTime": 1754048705930,
+    "modifiedTime": 1754236374304,
    "lastModifiedBy": "MQSznptE5yLT7kj8"
  },
  "_id": "CBKixLH3yhivZZuL",
--- a/src/packs/adversaries/adversary_Jagged_Knife_Lackey_C0OMQqV7pN6t7ouR.json
+++ b/src/packs/adversaries/adversary_Jagged_Knife_Lackey_C0OMQqV7pN6t7ouR.json
@ -59,7 +59,8 @@
      "name": "Daggers",
      "img": "icons/weapons/daggers/dagger-twin-green.webp",
      "roll": {
-        "bonus": -2
+        "bonus": -2,
+        "type": "attack"
      },
      "damage": {
        "parts": [
@ -111,7 +112,7 @@
    "systemId": "daggerheart",
    "systemVersion": "0.0.1",
    "createdTime": 1753922784293,
-    "modifiedTime": 1754048849157,
+    "modifiedTime": 1754236374283,
    "lastModifiedBy": "MQSznptE5yLT7kj8"
  },
  "_id": "C0OMQqV7pN6t7ouR",
--- a/src/packs/adversaries/adversary_Jagged_Knife_Lieutenant_aTljstqteGoLpCBq.json
+++ b/src/packs/adversaries/adversary_Jagged_Knife_Lieutenant_aTljstqteGoLpCBq.json
@ -75,7 +75,8 @@
      "name": "Javelin",
      "img": "icons/weapons/polearms/spear-hooked-rounded.webp",
      "roll": {
-        "bonus": 2
+        "bonus": 2,
+        "type": "attack"
      },
      "range": "close",
      "damage": {
@ -119,7 +120,7 @@
    "systemId": "daggerheart",
    "systemVersion": "0.0.1",
    "createdTime": 1753922784294,
-    "modifiedTime": 1754048988454,
+    "modifiedTime": 1754236375013,
    "lastModifiedBy": "MQSznptE5yLT7kj8"
  },
  "_id": "aTljstqteGoLpCBq",
--- a/src/packs/adversaries/adversary_Jagged_Knife_Shadow_XF4tYTq9nPJAy2ox.json
+++ b/src/packs/adversaries/adversary_Jagged_Knife_Shadow_XF4tYTq9nPJAy2ox.json
@ -75,7 +75,8 @@
      "name": "Daggers",
      "img": "icons/weapons/daggers/dagger-twin-green.webp",
      "roll": {
-        "bonus": 1
+        "bonus": 1,
+        "type": "attack"
      },
      "damage": {
        "parts": [
@ -118,7 +119,7 @@
    "systemId": "daggerheart",
    "systemVersion": "0.0.1",
    "createdTime": 1753922784295,
-    "modifiedTime": 1754049225449,
+    "modifiedTime": 1754236374879,
    "lastModifiedBy": "MQSznptE5yLT7kj8"
  },
  "_id": "XF4tYTq9nPJAy2ox",
--- a/src/packs/adversaries/adversary_Jagged_Knife_Sniper_1zuyof1XuIfi3aMG.json
+++ b/src/packs/adversaries/adversary_Jagged_Knife_Sniper_1zuyof1XuIfi3aMG.json
@ -75,7 +75,8 @@
      "name": "Shortbow",
      "img": "icons/weapons/bows/shortbow-leather.webp",
      "roll": {
-        "bonus": -1
+        "bonus": -1,
+        "type": "attack"
      },
      "range": "far",
      "damage": {
@ -119,7 +120,7 @@
    "systemId": "daggerheart",
    "systemVersion": "0.0.1",
    "createdTime": 1753922784296,
-    "modifiedTime": 1754049439023,
+    "modifiedTime": 1754236373855,
    "lastModifiedBy": "MQSznptE5yLT7kj8"
  },
  "_id": "1zuyof1XuIfi3aMG",
--- a/src/packs/adversaries/adversary_Juvenile_Flickerfly_MYXmTx2FHcIjdfYZ.json
+++ b/src/packs/adversaries/adversary_Juvenile_Flickerfly_MYXmTx2FHcIjdfYZ.json
@ -70,7 +70,8 @@
      "name": "Wing Slash",
      "img": "icons/commodities/biological/wing-insect-blue.webp",
      "roll": {
-        "bonus": 3
+        "bonus": 3,
+        "type": "attack"
      },
      "range": "veryClose",
      "damage": {
@ -114,7 +115,7 @@
    "systemId": "daggerheart",
    "systemVersion": "0.0.1",
    "createdTime": 1753922784297,
-    "modifiedTime": 1754090770938,
+    "modifiedTime": 1754236374492,
    "lastModifiedBy": "MQSznptE5yLT7kj8"
  },
  "_id": "MYXmTx2FHcIjdfYZ",
--- a/src/packs/adversaries/adversary_Knight_of_the_Realm_7ai2opemrclQe3VF.json
+++ b/src/packs/adversaries/adversary_Knight_of_the_Realm_7ai2opemrclQe3VF.json
@ -86,7 +86,8 @@
      "name": "Longsword",
      "img": "icons/weapons/swords/sword-guard.webp",
      "roll": {
-        "bonus": 4
+        "bonus": 4,
+        "type": "attack"
      },
      "damage": {
        "parts": [
@ -130,7 +131,7 @@
    "systemId": "daggerheart",
    "systemVersion": "0.0.1",
    "createdTime": 1753922784302,
-    "modifiedTime": 1754090770938,
+    "modifiedTime": 1754236374063,
    "lastModifiedBy": "MQSznptE5yLT7kj8"
  },
  "_id": "7ai2opemrclQe3VF",
--- a/src/packs/adversaries/adversary_Kraken_4nqv3ZwJGjnmic8j.json
+++ b/src/packs/adversaries/adversary_Kraken_4nqv3ZwJGjnmic8j.json
@ -75,7 +75,8 @@
    "attack": {
      "name": "Tentacles",
      "roll": {
-        "bonus": 7
+        "bonus": 7,
+        "type": "attack"
      },
      "range": "close",
      "damage": {
@ -120,7 +121,7 @@
    "systemId": "daggerheart",
    "systemVersion": "0.0.1",
    "createdTime": 1753922784303,
-    "modifiedTime": 1754219468339,
+    "modifiedTime": 1754236373932,
    "lastModifiedBy": "MQSznptE5yLT7kj8"
  },
  "_id": "4nqv3ZwJGjnmic8j",
--- a/src/packs/adversaries/adversary_Masked_Thief_niBpVU7yeo5ccskE.json
+++ b/src/packs/adversaries/adversary_Masked_Thief_niBpVU7yeo5ccskE.json
@ -76,7 +76,8 @@
      "name": "Backsword",
      "img": "icons/weapons/swords/sword-hooked.webp",
      "roll": {
-        "bonus": 3
+        "bonus": 3,
+        "type": "attack"
      },
      "damage": {
        "parts": [
@ -120,7 +121,7 @@
    "systemId": "daggerheart",
    "systemVersion": "0.0.1",
    "createdTime": 1753922784304,
-    "modifiedTime": 1754090770938,
+    "modifiedTime": 1754236375343,
    "lastModifiedBy": "MQSznptE5yLT7kj8"
  },
  "_id": "niBpVU7yeo5ccskE",
--- a/src/packs/adversaries/adversary_Master_Assassin_dNta0cUzr96xcFhf.json
+++ b/src/packs/adversaries/adversary_Master_Assassin_dNta0cUzr96xcFhf.json
@ -81,7 +81,8 @@
      "name": "Serrated Dagger",
      "img": "icons/weapons/daggers/dagger-jagged-handguard-black.webp",
      "roll": {
-        "bonus": 5
+        "bonus": 5,
+        "type": "attack"
      },
      "range": "close",
      "damage": {
@ -125,7 +126,7 @@
    "systemId": "daggerheart",
    "systemVersion": "0.0.1",
    "createdTime": 1753922784305,
-    "modifiedTime": 1754090770938,
+    "modifiedTime": 1754236375063,
    "lastModifiedBy": "MQSznptE5yLT7kj8"
  },
  "_id": "dNta0cUzr96xcFhf",
--- a/src/packs/adversaries/adversary_Merchant_Al3w2CgjfdT3p9ma.json
+++ b/src/packs/adversaries/adversary_Merchant_Al3w2CgjfdT3p9ma.json
@ -74,7 +74,8 @@
    "attack": {
      "name": "Club",
      "roll": {
-        "bonus": -4
+        "bonus": -4,
+        "type": "attack"
      },
      "damage": {
        "parts": [
@ -118,7 +119,7 @@
    "systemId": "daggerheart",
    "systemVersion": "0.0.1",
    "createdTime": 1753922784305,
-    "modifiedTime": 1754049539761,
+    "modifiedTime": 1754236374230,
    "lastModifiedBy": "MQSznptE5yLT7kj8"
  },
  "_id": "Al3w2CgjfdT3p9ma",
--- a/src/packs/adversaries/adversary_Merchant_Baron_Vy02IhGhkJLuezu4.json
+++ b/src/packs/adversaries/adversary_Merchant_Baron_Vy02IhGhkJLuezu4.json
@ -81,7 +81,8 @@
      "name": "Rapier",
      "img": "icons/weapons/swords/sword-jeweled-red.webp",
      "roll": {
-        "bonus": -2
+        "bonus": -2,
+        "type": "attack"
      },
      "damage": {
        "parts": [
@ -124,7 +125,7 @@
    "systemId": "daggerheart",
    "systemVersion": "0.0.1",
    "createdTime": 1753922784306,
-    "modifiedTime": 1754090770938,
+    "modifiedTime": 1754236374821,
    "lastModifiedBy": "MQSznptE5yLT7kj8"
  },
  "_id": "Vy02IhGhkJLuezu4",
--- a/src/packs/adversaries/adversary_Minor_Chaos_Elemental_sRn4bqerfARvhgSV.json
+++ b/src/packs/adversaries/adversary_Minor_Chaos_Elemental_sRn4bqerfARvhgSV.json
@ -69,7 +69,8 @@
    "attack": {
      "name": "Warp Blast",
      "roll": {
-        "bonus": 3
+        "bonus": 3,
+        "type": "attack"
      },
      "damage": {
        "parts": [
@ -113,7 +114,7 @@
    "systemId": "daggerheart",
    "systemVersion": "0.0.1",
    "createdTime": 1753922784307,
-    "modifiedTime": 1754049682687,
+    "modifiedTime": 1754236375428,
    "lastModifiedBy": "MQSznptE5yLT7kj8"
  },
  "_id": "sRn4bqerfARvhgSV",
--- a/src/packs/adversaries/adversary_Minor_Demon_3tqCjDwJAQ7JKqMb.json
+++ b/src/packs/adversaries/adversary_Minor_Demon_3tqCjDwJAQ7JKqMb.json
@ -70,7 +70,8 @@
      "name": "Claws",
      "img": "icons/creatures/claws/claw-hooked-barbed.webp",
      "roll": {
-        "bonus": 3
+        "bonus": 3,
+        "type": "attack"
      },
      "damage": {
        "parts": [
@ -113,7 +114,7 @@
    "systemId": "daggerheart",
    "systemVersion": "0.0.1",
    "createdTime": 1753922784308,
-    "modifiedTime": 1754050065137,
+    "modifiedTime": 1754236373911,
    "lastModifiedBy": "MQSznptE5yLT7kj8"
  },
  "_id": "3tqCjDwJAQ7JKqMb",
--- a/src/packs/adversaries/adversary_Minor_Fire_Elemental_DscWkNVoHak6P4hh.json
+++ b/src/packs/adversaries/adversary_Minor_Fire_Elemental_DscWkNVoHak6P4hh.json
@ -70,7 +70,8 @@
      "name": "Elemental Blast",
      "img": "icons/magic/fire/flame-burning-earth-orange.webp",
      "roll": {
-        "bonus": 3
+        "bonus": 3,
+        "type": "attack"
      },
      "range": "far",
      "damage": {
@ -114,7 +115,7 @@
    "systemId": "daggerheart",
    "systemVersion": "0.0.1",
    "createdTime": 1753922784308,
-    "modifiedTime": 1754050387942,
+    "modifiedTime": 1754236374357,
    "lastModifiedBy": "MQSznptE5yLT7kj8"
  },
  "_id": "DscWkNVoHak6P4hh",
--- a/src/packs/adversaries/adversary_Minor_Treant_G62k4oSkhkoXEs2D.json
+++ b/src/packs/adversaries/adversary_Minor_Treant_G62k4oSkhkoXEs2D.json
@ -62,7 +62,8 @@
      "name": "Clawed Branch",
      "img": "icons/magic/nature/root-vine-hand-strike.webp",
      "roll": {
-        "bonus": -2
+        "bonus": -2,
+        "type": "attack"
      },
      "damage": {
        "parts": [
@ -106,7 +107,7 @@
    "systemId": "daggerheart",
    "systemVersion": "0.0.1",
    "createdTime": 1753922784309,
-    "modifiedTime": 1754050771646,
+    "modifiedTime": 1754236374420,
    "lastModifiedBy": "MQSznptE5yLT7kj8"
  },
  "_id": "G62k4oSkhkoXEs2D",
--- a/src/packs/adversaries/adversary_Minotaur_Wrecker_rM9qCIYeWg9I0B4l.json
+++ b/src/packs/adversaries/adversary_Minotaur_Wrecker_rM9qCIYeWg9I0B4l.json
@ -69,7 +69,8 @@
    "attack": {
      "name": "Battleaxe",
      "roll": {
-        "bonus": 2
+        "bonus": 2,
+        "type": "attack"
      },
      "range": "veryClose",
      "damage": {
@ -114,7 +115,7 @@
    "systemId": "daggerheart",
    "systemVersion": "0.0.1",
    "createdTime": 1753922784310,
-    "modifiedTime": 1754090770938,
+    "modifiedTime": 1754236375407,
    "lastModifiedBy": "MQSznptE5yLT7kj8"
  },
  "_id": "rM9qCIYeWg9I0B4l",
--- a/src/packs/adversaries/adversary_Monarch_yx0vK2yfNVZKWUUi.json
+++ b/src/packs/adversaries/adversary_Monarch_yx0vK2yfNVZKWUUi.json
@ -81,7 +81,8 @@
      "name": "Warhammer",
      "img": "icons/weapons/hammers/hammer-double-engraved-gold.webp",
      "roll": {
-        "bonus": 0
+        "bonus": 0,
+        "type": "attack"
      },
      "damage": {
        "parts": [
@ -124,7 +125,7 @@
    "systemId": "daggerheart",
    "systemVersion": "0.0.1",
    "createdTime": 1753922784312,
-    "modifiedTime": 1754129881483,
+    "modifiedTime": 1754236375521,
    "lastModifiedBy": "MQSznptE5yLT7kj8"
  },
  "_id": "yx0vK2yfNVZKWUUi",
--- a/src/packs/adversaries/adversary_Mortal_Hunter_mVV7a7KQAORoPMgZ.json
+++ b/src/packs/adversaries/adversary_Mortal_Hunter_mVV7a7KQAORoPMgZ.json
@ -75,7 +75,8 @@
    "attack": {
      "name": "Tear at Flesh",
      "roll": {
-        "bonus": 5
+        "bonus": 5,
+        "type": "attack"
      },
      "range": "veryClose",
      "damage": {
@ -119,7 +120,7 @@
    "systemId": "daggerheart",
    "systemVersion": "0.0.1",
    "createdTime": 1753922784313,
-    "modifiedTime": 1754090770938,
+    "modifiedTime": 1754236375305,
    "lastModifiedBy": "MQSznptE5yLT7kj8"
  },
  "_id": "mVV7a7KQAORoPMgZ",
--- a/src/packs/adversaries/adversary_Oracle_of_Doom_befIqd5IYKg6eUz2.json
+++ b/src/packs/adversaries/adversary_Oracle_of_Doom_befIqd5IYKg6eUz2.json
@ -75,7 +75,8 @@
    "attack": {
      "name": "Psychic Attack",
      "roll": {
-        "bonus": 8
+        "bonus": 8,
+        "type": "attack"
      },
      "range": "far",
      "damage": {
@ -120,7 +121,7 @@
    "systemId": "daggerheart",
    "systemVersion": "0.0.1",
    "createdTime": 1753922784315,
-    "modifiedTime": 1754219468339,
+    "modifiedTime": 1754236375025,
    "lastModifiedBy": "MQSznptE5yLT7kj8"
  },
  "_id": "befIqd5IYKg6eUz2",
--- a/src/packs/adversaries/adversary_Outer_Realms_Abomination_A0SeeDzwjvqOsyof.json
+++ b/src/packs/adversaries/adversary_Outer_Realms_Abomination_A0SeeDzwjvqOsyof.json
@ -70,7 +70,8 @@
      "name": "Massive Pseudopod",
      "range": "veryClose",
      "roll": {
-        "bonus": 4
+        "bonus": 4,
+        "type": "attack"
      },
      "damage": {
        "parts": [
@ -114,7 +115,7 @@
    "systemId": "daggerheart",
    "systemVersion": "0.0.1",
    "createdTime": 1753922784319,
-    "modifiedTime": 1754219468339,
+    "modifiedTime": 1754236374220,
    "lastModifiedBy": "MQSznptE5yLT7kj8"
  },
  "_id": "A0SeeDzwjvqOsyof",
--- a/src/packs/adversaries/adversary_Outer_Realms_Corrupter_ms6nuOl3NFkhPj1k.json
+++ b/src/packs/adversaries/adversary_Outer_Realms_Corrupter_ms6nuOl3NFkhPj1k.json
@ -70,7 +70,8 @@
      "name": "Corroding Pseudopod",
      "range": "veryClose",
      "roll": {
-        "bonus": 7
+        "bonus": 7,
+        "type": "attack"
      },
      "img": "icons/creatures/tentacles/tentacles-thing-green.webp",
      "damage": {
@ -114,7 +115,7 @@
    "systemId": "daggerheart",
    "systemVersion": "0.0.1",
    "createdTime": 1753922784320,
-    "modifiedTime": 1754219468339,
+    "modifiedTime": 1754236375331,
    "lastModifiedBy": "MQSznptE5yLT7kj8"
  },
  "_id": "ms6nuOl3NFkhPj1k",
--- a/src/packs/adversaries/adversary_Outer_Realms_Thrall_moJhHgKqTKPS2WYS.json
+++ b/src/packs/adversaries/adversary_Outer_Realms_Thrall_moJhHgKqTKPS2WYS.json
@ -92,7 +92,8 @@
      },
      "name": "Claws and Teeth",
      "roll": {
-        "bonus": 3
+        "bonus": 3,
+        "type": "attack"
      },
      "img": "icons/creatures/claws/claw-talons-yellow-red.webp"
    }
@ -106,7 +107,7 @@
    "systemId": "daggerheart",
    "systemVersion": "0.0.1",
    "createdTime": 1753922784321,
-    "modifiedTime": 1754219468339,
+    "modifiedTime": 1754236375320,
    "lastModifiedBy": "MQSznptE5yLT7kj8"
  },
  "_id": "moJhHgKqTKPS2WYS",
--- a/src/packs/adversaries/adversary_Patchwork_Zombie_Hulk_EQTOAOUrkIvS2z88.json
+++ b/src/packs/adversaries/adversary_Patchwork_Zombie_Hulk_EQTOAOUrkIvS2z88.json
@ -79,7 +79,8 @@
      "name": "Too Many Arms",
      "range": "veryClose",
      "roll": {
-        "bonus": 4
+        "bonus": 4,
+        "type": "attack"
      },
      "damage": {
        "parts": [
@ -123,7 +124,7 @@
    "systemId": "daggerheart",
    "systemVersion": "0.0.1",
    "createdTime": 1753922784322,
-    "modifiedTime": 1754051426324,
+    "modifiedTime": 1754236374380,
    "lastModifiedBy": "MQSznptE5yLT7kj8"
  },
  "_id": "EQTOAOUrkIvS2z88",
--- a/src/packs/adversaries/adversary_Perfected_Zombie_CP6iRfHdyFWniTHY.json
+++ b/src/packs/adversaries/adversary_Perfected_Zombie_CP6iRfHdyFWniTHY.json
@ -71,7 +71,8 @@
      "img": "icons/weapons/axes/axe-battle-eyes-red.webp",
      "range": "veryClose",
      "roll": {
-        "bonus": 4
+        "bonus": 4,
+        "type": "attack"
      },
      "damage": {
        "parts": [
@ -114,7 +115,7 @@
    "systemId": "daggerheart",
    "systemVersion": "0.0.1",
    "createdTime": 1753922784323,
-    "modifiedTime": 1754219468339,
+    "modifiedTime": 1754236374324,
    "lastModifiedBy": "MQSznptE5yLT7kj8"
  },
  "_id": "CP6iRfHdyFWniTHY",
--- a/src/packs/adversaries/adversary_Petty_Noble_wycLpvebWdUqRhpP.json
+++ b/src/packs/adversaries/adversary_Petty_Noble_wycLpvebWdUqRhpP.json
@ -75,7 +75,8 @@
      "name": "Rapier",
      "img": "icons/weapons/swords/sword-jeweled-red.webp",
      "roll": {
-        "bonus": -3
+        "bonus": -3,
+        "type": "attack"
      },
      "damage": {
        "parts": [
@ -118,7 +119,7 @@
    "systemId": "daggerheart",
    "systemVersion": "0.0.1",
    "createdTime": 1753922784324,
-    "modifiedTime": 1754051774893,
+    "modifiedTime": 1754236375504,
    "lastModifiedBy": "MQSznptE5yLT7kj8"
  },
  "_id": "wycLpvebWdUqRhpP",
--- a/src/packs/adversaries/adversary_Pirate_Captain_OROJbjsqagVh7ECV.json
+++ b/src/packs/adversaries/adversary_Pirate_Captain_OROJbjsqagVh7ECV.json
@ -79,7 +79,8 @@
      "name": "Cutlass",
      "img": "icons/weapons/swords/scimitar-worn-blue.webp",
      "roll": {
-        "bonus": 4
+        "bonus": 4,
+        "type": "attack"
      },
      "damage": {
        "parts": [
@ -122,7 +123,7 @@
    "systemId": "daggerheart",
    "systemVersion": "0.0.1",
    "createdTime": 1753922784325,
-    "modifiedTime": 1754052049963,
+    "modifiedTime": 1754236374624,
    "lastModifiedBy": "MQSznptE5yLT7kj8"
  },
  "_id": "OROJbjsqagVh7ECV",
--- a/src/packs/adversaries/adversary_Pirate_Raiders_5YgEajn0wa4i85kC.json
+++ b/src/packs/adversaries/adversary_Pirate_Raiders_5YgEajn0wa4i85kC.json
@ -105,7 +105,8 @@
      "name": "Cutlass",
      "img": "icons/weapons/swords/scimitar-worn-blue.webp",
      "roll": {
-        "bonus": 1
+        "bonus": 1,
+        "type": "attack"
      }
    }
  },
@ -118,7 +119,7 @@
    "systemId": "daggerheart",
    "systemVersion": "0.0.1",
    "createdTime": 1753922784326,
-    "modifiedTime": 1754052314538,
+    "modifiedTime": 1754236373965,
    "lastModifiedBy": "MQSznptE5yLT7kj8"
  },
  "_id": "5YgEajn0wa4i85kC",
--- a/src/packs/adversaries/adversary_Red_Ooze_9rVlbJVrDNn1x7PS.json
+++ b/src/packs/adversaries/adversary_Red_Ooze_9rVlbJVrDNn1x7PS.json
@ -74,7 +74,8 @@
    "attack": {
      "name": "Ooze Appendage",
      "roll": {
-        "bonus": 1
+        "bonus": 1,
+        "type": "attack"
      },
      "damage": {
        "parts": [
@ -118,7 +119,7 @@
    "systemId": "daggerheart",
    "systemVersion": "0.0.1",
    "createdTime": 1753922784338,
-    "modifiedTime": 1754052609388,
+    "modifiedTime": 1754236374205,
    "lastModifiedBy": "MQSznptE5yLT7kj8"
  },
  "_id": "9rVlbJVrDNn1x7PS",
--- a/src/packs/adversaries/adversary_Rotted_Zombie_gP3fWTLzSFnpA8EJ.json
+++ b/src/packs/adversaries/adversary_Rotted_Zombie_gP3fWTLzSFnpA8EJ.json
@ -53,7 +53,8 @@
    "attack": {
      "name": "Bite",
      "roll": {
-        "bonus": -3
+        "bonus": -3,
+        "type": "attack"
      },
      "damage": {
        "parts": [
@ -106,7 +107,7 @@
    "systemId": "daggerheart",
    "systemVersion": "0.0.1",
    "createdTime": 1753922784339,
-    "modifiedTime": 1754053185385,
+    "modifiedTime": 1754236375111,
    "lastModifiedBy": "MQSznptE5yLT7kj8"
  },
  "_id": "gP3fWTLzSFnpA8EJ",
--- a/src/packs/adversaries/adversary_Royal_Advisor_EtLJiTsilPPZvLUX.json
+++ b/src/packs/adversaries/adversary_Royal_Advisor_EtLJiTsilPPZvLUX.json
@ -81,7 +81,8 @@
      "name": "Wand",
      "img": "icons/weapons/wands/wand-gem-violet.webp",
      "roll": {
-        "bonus": -3
+        "bonus": -3,
+        "type": "attack"
      },
      "range": "far",
      "damage": {
@ -125,7 +126,7 @@
    "systemId": "daggerheart",
    "systemVersion": "0.0.1",
    "createdTime": 1753922784339,
-    "modifiedTime": 1754090770938,
+    "modifiedTime": 1754236374390,
    "lastModifiedBy": "MQSznptE5yLT7kj8"
  },
  "_id": "EtLJiTsilPPZvLUX",
--- a/src/packs/adversaries/adversary_Secret_Keeper_sLAccjvCWfeedbpI.json
+++ b/src/packs/adversaries/adversary_Secret_Keeper_sLAccjvCWfeedbpI.json
@ -81,7 +81,8 @@
      "name": "Sigil-laden Staff",
      "range": "far",
      "roll": {
-        "bonus": 3
+        "bonus": 3,
+        "type": "attack"
      },
      "damage": {
        "parts": [
@ -125,7 +126,7 @@
    "systemId": "daggerheart",
    "systemVersion": "0.0.1",
    "createdTime": 1753922784341,
-    "modifiedTime": 1754090770938,
+    "modifiedTime": 1754236375419,
    "lastModifiedBy": "MQSznptE5yLT7kj8"
  },
  "_id": "sLAccjvCWfeedbpI",
--- a/src/packs/adversaries/adversary_Sellsword_bgreCaQ6ap2DVpCr.json
+++ b/src/packs/adversaries/adversary_Sellsword_bgreCaQ6ap2DVpCr.json
@ -92,7 +92,8 @@
        ]
      },
      "roll": {
-        "bonus": 3
+        "bonus": 3,
+        "type": "attack"
      },
      "img": "icons/weapons/swords/sword-guard.webp"
    }
@ -106,7 +107,7 @@
    "systemId": "daggerheart",
    "systemVersion": "0.0.1",
    "createdTime": 1753922784341,
-    "modifiedTime": 1754053085697,
+    "modifiedTime": 1754236375045,
    "lastModifiedBy": "MQSznptE5yLT7kj8"
  },
  "_id": "bgreCaQ6ap2DVpCr",
--- a/src/packs/adversaries/adversary_Shambling_Zombie_2nXz4ilAY4xuhKLm.json
+++ b/src/packs/adversaries/adversary_Shambling_Zombie_2nXz4ilAY4xuhKLm.json
@ -70,7 +70,8 @@
      "name": "Bite",
      "img": "icons/creatures/abilities/mouth-teeth-sharp.webp",
      "roll": {
-        "bonus": 0
+        "bonus": 0,
+        "type": "attack"
      },
      "damage": {
        "parts": [
@ -113,7 +114,7 @@
    "systemId": "daggerheart",
    "systemVersion": "0.0.1",
    "createdTime": 1753922784342,
-    "modifiedTime": 1754053203019,
+    "modifiedTime": 1754236373883,
    "lastModifiedBy": "MQSznptE5yLT7kj8"
  },
  "_id": "2nXz4ilAY4xuhKLm",
--- a/src/packs/adversaries/adversary_Shark_YmVAkdNsyuXWTtYp.json
+++ b/src/packs/adversaries/adversary_Shark_YmVAkdNsyuXWTtYp.json
@ -70,7 +70,8 @@
      "name": "Toothy Maw",
      "img": "icons/creatures/abilities/mouth-teeth-lamprey-red.webp",
      "roll": {
-        "bonus": 2
+        "bonus": 2,
+        "type": "attack"
      },
      "range": "veryClose",
      "damage": {
@ -114,7 +115,7 @@
    "systemId": "daggerheart",
    "systemVersion": "0.0.1",
    "createdTime": 1753922784342,
-    "modifiedTime": 1754090770938,
+    "modifiedTime": 1754236374913,
    "lastModifiedBy": "MQSznptE5yLT7kj8"
  },
  "_id": "YmVAkdNsyuXWTtYp",
--- a/src/packs/adversaries/adversary_Siren_BK4jwyXSRx7IOQiO.json
+++ b/src/packs/adversaries/adversary_Siren_BK4jwyXSRx7IOQiO.json
@ -75,7 +75,8 @@
    "attack": {
      "name": "Distended Jaw Bite",
      "roll": {
-        "bonus": 2
+        "bonus": 2,
+        "type": "attack"
      },
      "damage": {
        "parts": [
@ -120,7 +121,7 @@
    "systemId": "daggerheart",
    "systemVersion": "0.0.1",
    "createdTime": 1753922784344,
-    "modifiedTime": 1754090770938,
+    "modifiedTime": 1754236374255,
    "lastModifiedBy": "MQSznptE5yLT7kj8"
  },
  "_id": "BK4jwyXSRx7IOQiO",
--- a/src/packs/adversaries/adversary_Skeleton_Archer_7X5q7a6ueeHs5oA9.json
+++ b/src/packs/adversaries/adversary_Skeleton_Archer_7X5q7a6ueeHs5oA9.json
@ -69,7 +69,8 @@
    "attack": {
      "name": "Shortbow",
      "roll": {
-        "bonus": 2
+        "bonus": 2,
+        "type": "attack"
      },
      "range": "far",
      "damage": {
@ -114,7 +115,7 @@
    "systemId": "daggerheart",
    "systemVersion": "0.0.1",
    "createdTime": 1753922784345,
-    "modifiedTime": 1754053336193,
+    "modifiedTime": 1754236374038,
    "lastModifiedBy": "MQSznptE5yLT7kj8"
  },
  "_id": "7X5q7a6ueeHs5oA9",
--- a/src/packs/adversaries/adversary_Skeleton_Dredge_6l1a3Fazq8BoKIcc.json
+++ b/src/packs/adversaries/adversary_Skeleton_Dredge_6l1a3Fazq8BoKIcc.json
@ -54,7 +54,8 @@
      "name": "Bone Claws",
      "img": "icons/magic/death/hand-undead-skeleton-fire-green.webp",
      "roll": {
-        "bonus": -1
+        "bonus": -1,
+        "type": "attack"
      },
      "damage": {
        "parts": [
@ -106,7 +107,7 @@
    "systemId": "daggerheart",
    "systemVersion": "0.0.1",
    "createdTime": 1753922784347,
-    "modifiedTime": 1754053476707,
+    "modifiedTime": 1754236374029,
    "lastModifiedBy": "MQSznptE5yLT7kj8"
  },
  "_id": "6l1a3Fazq8BoKIcc",
--- a/src/packs/adversaries/adversary_Skeleton_Knight_Q9LaVTyXF9NF12C7.json
+++ b/src/packs/adversaries/adversary_Skeleton_Knight_Q9LaVTyXF9NF12C7.json
@ -70,7 +70,8 @@
      "name": "Rusty Greatsword",
      "img": "icons/weapons/swords/greatsword-crossguard-flanged-red.webp",
      "roll": {
-        "bonus": 2
+        "bonus": 2,
+        "type": "attack"
      },
      "damage": {
        "parts": [
@ -113,7 +114,7 @@
    "systemId": "daggerheart",
    "systemVersion": "0.0.1",
    "createdTime": 1753922784348,
-    "modifiedTime": 1754053576422,
+    "modifiedTime": 1754236374678,
    "lastModifiedBy": "MQSznptE5yLT7kj8"
  },
  "_id": "Q9LaVTyXF9NF12C7",
--- a/src/packs/adversaries/adversary_Skeleton_Warrior_10YIQl0lvCJXZLfX.json
+++ b/src/packs/adversaries/adversary_Skeleton_Warrior_10YIQl0lvCJXZLfX.json
@ -69,7 +69,8 @@
    "attack": {
      "name": "Sword",
      "roll": {
-        "bonus": 0
+        "bonus": 0,
+        "type": "attack"
      },
      "damage": {
        "parts": [
@ -113,7 +114,7 @@
    "systemId": "daggerheart",
    "systemVersion": "0.0.1",
    "createdTime": 1753922784350,
-    "modifiedTime": 1754053847804,
+    "modifiedTime": 1754236373827,
    "lastModifiedBy": "MQSznptE5yLT7kj8"
  },
  "_id": "10YIQl0lvCJXZLfX",
--- a/src/packs/adversaries/adversary_Spectral_Archer_5tCkhnBByUIN5UdG.json
+++ b/src/packs/adversaries/adversary_Spectral_Archer_5tCkhnBByUIN5UdG.json
@ -76,7 +76,8 @@
      "name": "Longbow",
      "img": "icons/weapons/bows/longbow-recurve-leather-brown.webp",
      "roll": {
-        "bonus": 3
+        "bonus": 3,
+        "type": "attack"
      },
      "damage": {
        "parts": [
@ -120,7 +121,7 @@
    "systemId": "daggerheart",
    "systemVersion": "0.0.1",
    "createdTime": 1753922784351,
-    "modifiedTime": 1754090770938,
+    "modifiedTime": 1754236373994,
    "lastModifiedBy": "MQSznptE5yLT7kj8"
  },
  "_id": "5tCkhnBByUIN5UdG",
--- a/src/packs/adversaries/adversary_Spectral_Captain_65cSO3EQEh6ZH6Xk.json
+++ b/src/packs/adversaries/adversary_Spectral_Captain_65cSO3EQEh6ZH6Xk.json
@ -105,7 +105,8 @@
        ]
      },
      "roll": {
-        "bonus": 3
+        "bonus": 3,
+        "type": "attack"
      },
      "range": "far"
    }
@ -119,7 +120,7 @@
    "systemId": "daggerheart",
    "systemVersion": "0.0.1",
    "createdTime": 1753922784352,
-    "modifiedTime": 1754090770938,
+    "modifiedTime": 1754236374005,
    "lastModifiedBy": "MQSznptE5yLT7kj8"
  },
  "_id": "65cSO3EQEh6ZH6Xk",
--- a/src/packs/adversaries/adversary_Spectral_Guardian_UFVGl1osOsJTneLf.json
+++ b/src/packs/adversaries/adversary_Spectral_Guardian_UFVGl1osOsJTneLf.json
@ -76,7 +76,8 @@
      "name": "Spear",
      "img": "icons/weapons/polearms/spear-ice-crystal-blue.webp",
      "roll": {
-        "bonus": 1
+        "bonus": 1,
+        "type": "attack"
      },
      "range": "veryClose",
      "damage": {
@ -120,7 +121,7 @@
    "systemId": "daggerheart",
    "systemVersion": "0.0.1",
    "createdTime": 1753922784353,
-    "modifiedTime": 1754090770938,
+    "modifiedTime": 1754236374750,
    "lastModifiedBy": "MQSznptE5yLT7kj8"
  },
  "_id": "UFVGl1osOsJTneLf",
--- a/src/packs/adversaries/adversary_Spellblade_ldbWEL7uZs84vyrR.json
+++ b/src/packs/adversaries/adversary_Spellblade_ldbWEL7uZs84vyrR.json
@ -75,7 +75,8 @@
      "name": "Empowered Longsword",
      "img": "icons/weapons/swords/sword-broad-serrated-blue.webp",
      "roll": {
-        "bonus": 3
+        "bonus": 3,
+        "type": "attack"
      },
      "damage": {
        "parts": [
@ -119,7 +120,7 @@
    "systemId": "daggerheart",
    "systemVersion": "0.0.1",
    "createdTime": 1753922784353,
-    "modifiedTime": 1754054040763,
+    "modifiedTime": 1754236375260,
    "lastModifiedBy": "MQSznptE5yLT7kj8"
  },
  "_id": "ldbWEL7uZs84vyrR",
--- a/src/packs/adversaries/adversary_Spy_8zlynOhnVA59KpKT.json
+++ b/src/packs/adversaries/adversary_Spy_8zlynOhnVA59KpKT.json
@ -75,7 +75,8 @@
    "attack": {
      "name": "Dagger",
      "roll": {
-        "bonus": -2
+        "bonus": -2,
+        "type": "attack"
      },
      "damage": {
        "parts": [
@ -120,7 +121,7 @@
    "systemId": "daggerheart",
    "systemVersion": "0.0.1",
    "createdTime": 1753922784354,
-    "modifiedTime": 1754090770938,
+    "modifiedTime": 1754236374153,
    "lastModifiedBy": "MQSznptE5yLT7kj8"
  },
  "_id": "8zlynOhnVA59KpKT",
--- a/Show more
+++ b/Show more