Merge branch 'main' into release

daggerheart.mjs

@@ -16,10 +16,10 @@ import {
     settingsRegistration,
     socketRegistration
 } from './module/systemRegistration/_module.mjs';
-import { placeables, DhTokenLayer } from './module/canvas/_module.mjs';
+import { placeables } from './module/canvas/_module.mjs';
+import { registerRollDiceHooks } from './module/dice/dhRoll.mjs';
 import './node_modules/@yaireo/tagify/dist/tagify.css';
 import TemplateManager from './module/documents/templateManager.mjs';
-import TokenManager from './module/documents/tokenManager.mjs';
 
 CONFIG.DH = SYSTEM;
 CONFIG.TextEditor.enrichers.push(...enricherConfig);
@@ -52,12 +52,8 @@ CONFIG.ChatMessage.template = 'systems/daggerheart/templates/ui/chat/chat-messag
 
 CONFIG.Canvas.rulerClass = placeables.DhRuler;
 CONFIG.Canvas.layers.templates.layerClass = placeables.DhTemplateLayer;
-CONFIG.Canvas.layers.tokens.layerClass = DhTokenLayer;
-
 CONFIG.MeasuredTemplate.objectClass = placeables.DhMeasuredTemplate;
 
-CONFIG.Scene.documentClass = documents.DhScene;
-
 CONFIG.Token.documentClass = documents.DhToken;
 CONFIG.Token.prototypeSheetClass = applications.sheetConfigs.DhPrototypeTokenConfig;
 CONFIG.Token.objectClass = placeables.DhTokenPlaceable;
@@ -65,7 +61,6 @@ CONFIG.Token.rulerClass = placeables.DhTokenRuler;
 CONFIG.Token.hudClass = applications.hud.DHTokenHUD;
 
 CONFIG.ui.combat = applications.ui.DhCombatTracker;
-CONFIG.ui.nav = applications.ui.DhSceneNavigation;
 CONFIG.ui.chat = applications.ui.DhChatLog;
 CONFIG.ui.effectsDisplay = applications.ui.DhEffectsDisplay;
 CONFIG.ui.hotbar = applications.ui.DhHotbar;
@@ -77,7 +72,6 @@ CONFIG.ui.countdowns = applications.ui.DhCountdowns;
 CONFIG.ux.ContextMenu = applications.ux.DHContextMenu;
 CONFIG.ux.TooltipManager = documents.DhTooltipManager;
 CONFIG.ux.TemplateManager = new TemplateManager();
-CONFIG.ux.TokenManager = new TokenManager();
 
 Hooks.once('init', () => {
     game.system.api = {
@@ -89,102 +83,40 @@ Hooks.once('init', () => {
         fields
     };
 
-    game.system.registeredTriggers = new RegisteredTriggers();
-
     const { DocumentSheetConfig } = foundry.applications.apps;
     DocumentSheetConfig.unregisterSheet(TokenDocument, 'core', foundry.applications.sheets.TokenConfig);
     DocumentSheetConfig.registerSheet(TokenDocument, SYSTEM.id, applications.sheetConfigs.DhTokenConfig, {
         makeDefault: true
     });
 
-    const sheetLabel = typePath => () =>
-        game.i18n.format('DAGGERHEART.GENERAL.typeSheet', {
-            type: game.i18n.localize(typePath)
-        });
-
     const { Items, Actors } = foundry.documents.collections;
     Items.unregisterSheet('core', foundry.applications.sheets.ItemSheetV2);
-    Items.registerSheet(SYSTEM.id, applications.sheets.items.Ancestry, {
-        types: ['ancestry'],
-        makeDefault: true,
-        label: sheetLabel('TYPES.Item.ancestry')
-    });
-    Items.registerSheet(SYSTEM.id, applications.sheets.items.Community, {
-        types: ['community'],
-        makeDefault: true,
-        label: sheetLabel('TYPES.Item.community')
-    });
-    Items.registerSheet(SYSTEM.id, applications.sheets.items.Class, {
-        types: ['class'],
-        makeDefault: true,
-        label: sheetLabel('TYPES.Item.class')
-    });
-    Items.registerSheet(SYSTEM.id, applications.sheets.items.Subclass, {
-        types: ['subclass'],
-        makeDefault: true,
-        label: sheetLabel('TYPES.Item.subclass')
-    });
-    Items.registerSheet(SYSTEM.id, applications.sheets.items.Feature, {
-        types: ['feature'],
-        makeDefault: true,
-        label: sheetLabel('TYPES.Item.feature')
-    });
-    Items.registerSheet(SYSTEM.id, applications.sheets.items.DomainCard, {
-        types: ['domainCard'],
-        makeDefault: true,
-        label: sheetLabel('TYPES.Item.domainCard')
-    });
+    Items.registerSheet(SYSTEM.id, applications.sheets.items.Ancestry, { types: ['ancestry'], makeDefault: true });
+    Items.registerSheet(SYSTEM.id, applications.sheets.items.Community, { types: ['community'], makeDefault: true });
+    Items.registerSheet(SYSTEM.id, applications.sheets.items.Class, { types: ['class'], makeDefault: true });
+    Items.registerSheet(SYSTEM.id, applications.sheets.items.Subclass, { types: ['subclass'], makeDefault: true });
+    Items.registerSheet(SYSTEM.id, applications.sheets.items.Feature, { types: ['feature'], makeDefault: true });
+    Items.registerSheet(SYSTEM.id, applications.sheets.items.DomainCard, { types: ['domainCard'], makeDefault: true });
     Items.registerSheet(SYSTEM.id, applications.sheets.items.Loot, {
         types: ['loot'],
-        makeDefault: true,
-        label: sheetLabel('TYPES.Item.loot')
-    });
-    Items.registerSheet(SYSTEM.id, applications.sheets.items.Consumable, {
-        types: ['consumable'],
-        makeDefault: true,
-        label: sheetLabel('TYPES.Item.consumable')
-    });
-    Items.registerSheet(SYSTEM.id, applications.sheets.items.Weapon, {
-        types: ['weapon'],
-        makeDefault: true,
-        label: sheetLabel('TYPES.Item.weapon')
-    });
-    Items.registerSheet(SYSTEM.id, applications.sheets.items.Armor, {
-        types: ['armor'],
-        makeDefault: true,
-        label: sheetLabel('TYPES.Item.armor')
-    });
-    Items.registerSheet(SYSTEM.id, applications.sheets.items.Beastform, {
-        types: ['beastform'],
-        makeDefault: true,
-        label: sheetLabel('TYPES.Item.beastform')
+        makeDefault: true
     });
+    Items.registerSheet(SYSTEM.id, applications.sheets.items.Consumable, { types: ['consumable'], makeDefault: true });
+    Items.registerSheet(SYSTEM.id, applications.sheets.items.Weapon, { types: ['weapon'], makeDefault: true });
+    Items.registerSheet(SYSTEM.id, applications.sheets.items.Armor, { types: ['armor'], makeDefault: true });
+    Items.registerSheet(SYSTEM.id, applications.sheets.items.Beastform, { types: ['beastform'], makeDefault: true });
 
     Actors.unregisterSheet('core', foundry.applications.sheets.ActorSheetV2);
-    Actors.registerSheet(SYSTEM.id, applications.sheets.actors.Character, {
-        types: ['character'],
-        makeDefault: true,
-        label: sheetLabel('TYPES.Actor.character')
-    });
-    Actors.registerSheet(SYSTEM.id, applications.sheets.actors.Companion, {
-        types: ['companion'],
-        makeDefault: true,
-        label: sheetLabel('TYPES.Actor.companion')
-    });
-    Actors.registerSheet(SYSTEM.id, applications.sheets.actors.Adversary, {
-        types: ['adversary'],
-        makeDefault: true,
-        label: sheetLabel('TYPES.Actor.adversary')
-    });
+    Actors.registerSheet(SYSTEM.id, applications.sheets.actors.Character, { types: ['character'], makeDefault: true });
+    Actors.registerSheet(SYSTEM.id, applications.sheets.actors.Companion, { types: ['companion'], makeDefault: true });
+    Actors.registerSheet(SYSTEM.id, applications.sheets.actors.Adversary, { types: ['adversary'], makeDefault: true });
     Actors.registerSheet(SYSTEM.id, applications.sheets.actors.Environment, {
         types: ['environment'],
-        makeDefault: true,
-        label: sheetLabel('TYPES.Actor.environment')
+        makeDefault: true
     });
     Actors.registerSheet(SYSTEM.id, applications.sheets.actors.Party, {
         types: ['party'],
-        makeDefault: true,
-        label: sheetLabel('TYPES.Actor.party')
+        makeDefault: true
     });
 
     DocumentSheetConfig.unregisterSheet(
@@ -197,8 +129,7 @@ Hooks.once('init', () => {
         SYSTEM.id,
         applications.sheetConfigs.ActiveEffectConfig,
         {
-            makeDefault: true,
-            label: sheetLabel('DOCUMENT.ActiveEffect')
+            makeDefault: true
         }
     );
 
@@ -207,10 +138,9 @@ Hooks.once('init', () => {
     // Make Compendium Dialog resizable
     foundry.applications.sidebar.apps.Compendium.DEFAULT_OPTIONS.window.resizable = true;
 
-    DocumentSheetConfig.unregisterSheet(foundry.documents.Scene, 'core', foundry.applications.sheets.SceneConfig);
     DocumentSheetConfig.registerSheet(foundry.documents.Scene, SYSTEM.id, applications.scene.DhSceneConfigSettings, {
         makeDefault: true,
-        label: sheetLabel('DOCUMENT.Scene')
+        label: 'Daggerheart'
     });
 
     settingsRegistration.registerDHSettings();
@@ -247,6 +177,7 @@ Hooks.on('ready', async () => {
         ui.compendiumBrowser = new applications.ui.ItemBrowser();
 
     socketRegistration.registerSocketHooks();
+    registerRollDiceHooks();
     socketRegistration.registerUserQueries();
 
     if (!game.user.getFlag(CONFIG.DH.id, CONFIG.DH.FLAGS.userFlags.welcomeMessage)) {
@@ -262,9 +193,9 @@ Hooks.on('ready', async () => {
 
 Hooks.once('dicesoniceready', () => {});
 
-Hooks.on('renderChatMessageHTML', (document, element) => {
+Hooks.on('renderChatMessageHTML', (_, element, message) => {
     enricherRenderSetup(element);
-    const cssClass = document.flags?.daggerheart?.cssClass;
+    const cssClass = message.message.flags?.daggerheart?.cssClass;
     if (cssClass) cssClass.split(' ').forEach(cls => element.classList.add(cls));
 });
 
@@ -309,7 +240,7 @@ Hooks.on('chatMessage', (_, message) => {
             target,
             difficulty,
             title,
-            label: game.i18n.localize('DAGGERHEART.GENERAL.dualityRoll'),
+            label: 'test',
             actionType: null,
             advantage
         });
@@ -317,121 +248,53 @@ Hooks.on('chatMessage', (_, message) => {
     }
 });
 
-const updateActorsRangeDependentEffects = async token => {
+Hooks.on('moveToken', async (movedToken, data) => {
+    const effectsAutomation = game.settings.get(CONFIG.DH.id, CONFIG.DH.SETTINGS.gameSettings.Automation).effects;
+    if (!effectsAutomation.rangeDependent) return;
+
+    const rangeDependantEffects = movedToken.actor.effects.filter(effect => effect.system.rangeDependence?.enabled);
+
+    const updateEffects = async (disposition, token, effects, effectUpdates) => {
         const rangeMeasurement = game.settings.get(
             CONFIG.DH.id,
             CONFIG.DH.SETTINGS.gameSettings.variantRules
         ).rangeMeasurement;
 
-    for (let effect of token.actor?.allApplicableEffects() ?? []) {
-        if (!effect.system.rangeDependence?.enabled) continue;
+        for (let effect of effects.filter(x => x.system.rangeDependence?.enabled)) {
             const { target, range, type } = effect.system.rangeDependence;
+            if ((target === 'friendly' && disposition !== 1) || (target === 'hostile' && disposition !== -1))
+                return false;
 
-        // If there are no targets, assume false. Otherwise, start with the effect enabled.
-        let enabledEffect = game.user.targets.size !== 0;
-        // Expect all targets to meet the rangeDependence requirements
-        for (let userTarget of game.user.targets) {
-            const disposition = userTarget.document.disposition;
-            if ((target === 'friendly' && disposition !== 1) || (target === 'hostile' && disposition !== -1)) {
-                enabledEffect = false;
-                break;
-            }
+            const distanceBetween = canvas.grid.measurePath([
+                { ...movedToken.toObject(), x: data.destination.x, y: data.destination.y },
+                token
+            ]).distance;
+            const distance = rangeMeasurement[range];
 
-            // Get required distance and special case 5 feet to test adjacency
-            const required = rangeMeasurement[range];
             const reverse = type === CONFIG.DH.GENERAL.rangeInclusion.outsideRange.id;
-            const inRange =
-                required === 5
-                    ? userTarget.isAdjacentWith(token.object)
-                    : userTarget.distanceTo(token.object) <= required;
-            if (reverse ? inRange : !inRange) {
-                enabledEffect = false;
-                break;
-            }
-        }
-
-        await effect.update({ disabled: !enabledEffect });
+            const newDisabled = reverse ? distanceBetween <= distance : distanceBetween > distance;
+            const oldDisabled = effectUpdates[effect.uuid] ? effectUpdates[effect.uuid].disabled : newDisabled;
+            effectUpdates[effect.uuid] = {
+                disabled: oldDisabled || newDisabled,
+                value: effect
+            };
         }
     };
 
-const updateAllRangeDependentEffects = async () => {
-    const effectsAutomation = game.settings.get(CONFIG.DH.id, CONFIG.DH.SETTINGS.gameSettings.Automation).effects;
-    if (!effectsAutomation.rangeDependent) return;
-
-    const tokens = canvas.scene?.tokens;
-    if (!tokens) return;
-
-    if (game.user.character) {
-        // The character updates their character's token. There can be only one token.
-        const characterToken = tokens.find(x => x.actor === game.user.character);
-        updateActorsRangeDependentEffects(characterToken);
-    } else if (game.user.isActiveGM) {
-        // The GM is responsible for all other tokens.
-        const playerCharacters = game.users.players.filter(x => x.active).map(x => x.character);
-        for (const token of tokens.filter(x => !playerCharacters.includes(x.actor))) {
-            updateActorsRangeDependentEffects(token);
+    const effectUpdates = {};
+    for (let token of game.scenes.find(x => x.active).tokens) {
+        if (token.id !== movedToken.id) {
+            await updateEffects(token.disposition, token, rangeDependantEffects, effectUpdates);
         }
+
+        if (token.actor) await updateEffects(movedToken.disposition, token, token.actor.effects, effectUpdates);
     }
-};
 
-const debouncedRangeEffectCall = foundry.utils.debounce(updateAllRangeDependentEffects, 50);
-
-Hooks.on('targetToken', () => {
-    debouncedRangeEffectCall();
-});
-
-Hooks.on('refreshToken', (_, options) => {
-    if (options.refreshPosition) {
-        debouncedRangeEffectCall();
+    for (let key in effectUpdates) {
+        const effect = effectUpdates[key];
+        await effect.value.update({ disabled: effect.disabled });
     }
 });
 
 Hooks.on('renderCompendiumDirectory', (app, html) => applications.ui.ItemBrowser.injectSidebarButton(html));
 Hooks.on('renderDocumentDirectory', (app, html) => applications.ui.ItemBrowser.injectSidebarButton(html));
-
-class RegisteredTriggers extends Map {
-    constructor() {
-        super();
-    }
-
-    async registerTriggers(trigger, actor, triggeringActorType, uuid, commands) {
-        const existingTrigger = this.get(trigger);
-        if (!existingTrigger) this.set(trigger, new Map());
-
-        this.get(trigger).set(uuid, { actor, triggeringActorType, commands });
-    }
-
-    async runTrigger(trigger, currentActor, ...args) {
-        const updates = [];
-        const triggerSettings = game.settings.get(CONFIG.DH.id, CONFIG.DH.SETTINGS.gameSettings.Automation).triggers;
-        if (!triggerSettings.enabled) return updates;
-
-        const dualityTrigger = this.get(trigger);
-        if (dualityTrigger) {
-            for (let { actor, triggeringActorType, commands } of dualityTrigger.values()) {
-                const triggerData = CONFIG.DH.TRIGGER.triggers[trigger];
-                if (triggerData.usesActor && triggeringActorType !== 'any') {
-                    if (triggeringActorType === 'self' && currentActor?.uuid !== actor) continue;
-                    else if (triggeringActorType === 'other' && currentActor?.uuid === actor) continue;
-                }
-
-                for (let command of commands) {
-                    try {
-                        const result = await command(...args);
-                        if (result?.updates?.length) updates.push(...result.updates);
-                    } catch (_) {
-                        const triggerName = game.i18n.localize(triggerData.label);
-                        ui.notifications.error(
-                            game.i18n.format('DAGGERHEART.CONFIG.Triggers.triggerError', {
-                                trigger: triggerName,
-                                actor: currentActor?.name
-                            })
-                        );
-                    }
-                }
-            }
-        }
-
-        return updates;
-    }
-}

lang/en.json

@@ -36,7 +36,6 @@
     },
 
     "DAGGERHEART": {
-        "CharacterSheet": "Character Sheet",
         "ACTIONS": {
             "TYPES": {
                 "attack": {
@@ -69,11 +68,7 @@
                 },
                 "summon": {
                     "name": "Summon",
-                    "tooltip": "Create tokens in the scene.",
-                    "error": "You do not have permission to summon tokens or there is no active scene.",
-                    "invalidDrop": "You can only drop Actor entities to summon.",
-                    "chatMessageTitle": "Test2",
-                    "chatMessageHeaderTitle": "Summoning"
+                    "tooltip": "Create tokens in the scene."
                 }
             },
             "Config": {
@@ -94,9 +89,7 @@
                     "customFormula": "Custom Formula",
                     "formula": "Formula"
                 },
-                "displayInChat": "Display in chat",
-                "deleteTriggerTitle": "Delete Trigger",
-                "deleteTriggerContent": "Are you sure you want to delete the {trigger} trigger?"
+                "displayInChat": "Display in chat"
             },
             "RollField": {
                 "diceRolling": {
@@ -126,9 +119,6 @@
                 },
                 "cost": {
                     "stepTooltip": "+{step} per step"
-                },
-                "summon": {
-                    "dropSummonsHere": "Drop Summons Here"
                 }
             }
         },
@@ -203,8 +193,6 @@
                     "unequip": "Unequip",
                     "useItem": "Use Item"
                 },
-                "defaultHopeDice": "Default Hope Dice",
-                "defaultFearDice": "Default Fear Dice",
                 "disadvantageSources": {
                     "label": "Disadvantage Sources",
                     "hint": "Add single words or short text as reminders and hints of what a character has disadvantage on."
@@ -237,7 +225,6 @@
                     "confirmText": "Would you like to level up your companion {name} by {levelChange} levels at this time? (You can do it manually later)"
                 },
                 "viewLevelups": "View Levelups",
-                "viewParty": "View Party",
                 "InvalidOldCharacterImportTitle": "Old Character Import",
                 "InvalidOldCharacterImportText": "Character data exported prior to system version 1.1 will not generate a complete character. Do you wish to continue?",
                 "cancelBeastform": "Cancel Beastform"
@@ -338,7 +325,6 @@
                 "equip": "Equip",
                 "sendToChat": "Send To Chat",
                 "toLoadout": "Send to Loadout",
-                "recall": "Recall",
                 "toVault": "Send to Vault",
                 "unequip": "Unequip",
                 "useItem": "Use Item"
@@ -400,8 +386,7 @@
                 "hideNewCountdowns": "Hide New Countdowns"
             },
             "DaggerheartMenu": {
-                "title": "GM Tools",
-                "refreshFeatures": "Refresh Features"
+                "title": "GM Tools"
             },
             "DeleteConfirmation": {
                 "title": "Delete {type} - {name}",
@@ -519,7 +504,6 @@
                 },
                 "navigateLevel": "To Level {level}",
                 "navigateToLevelup": "Return To Levelup",
-                "finishLevelup": "Finish Levelup",
                 "navigateToSummary": "To Summary",
                 "options": {
                     "trait": "Gain a +1 bonus to two unmarked character traits and mark them.",
@@ -599,7 +583,6 @@
             },
             "OwnershipSelection": {
                 "title": "Ownership Selection - {name}",
-                "noPlayers": "No players to assign ownership to",
                 "default": "Default Ownership"
             },
             "ReactionRoll": {
@@ -626,9 +609,6 @@
                 "insufficientHope": "The initiating character doesn't have enough hope",
                 "createTagTeam": "Create TagTeam Roll",
                 "chatMessageRollTitle": "Roll"
-            },
-            "TokenConfig": {
-                "actorSizeUsed": "Actor size is set, determining the dimensions"
             }
         },
         "CLASS": {
@@ -638,6 +618,11 @@
             }
         },
         "CONFIG": {
+            "ActionType": {
+                "passive": "Passive",
+                "action": "Action",
+                "reaction": "Reaction"
+            },
             "AdversaryTrait": {
                 "relentless": {
                     "name": "Relentless",
@@ -1046,12 +1031,6 @@
                     "description": ""
                 }
             },
-            "FeatureForm": {
-                "label": "Feature Form",
-                "passive": "Passive",
-                "action": "Action",
-                "reaction": "Reaction"
-            },
             "Gold": {
                 "title": "Gold",
                 "coins": "Coins",
@@ -1155,8 +1134,7 @@
                 "any": "Any",
                 "friendly": "Friendly",
                 "hostile": "Hostile",
-                "self": "Self",
-                "other": "Other"
+                "self": "Self"
             },
             "TemplateTypes": {
                 "circle": "Circle",
@@ -1166,14 +1144,6 @@
                 "rect": "Rectangle",
                 "ray": "Ray"
             },
-            "TokenSize": {
-                "tiny": "Tiny",
-                "small": "Small",
-                "medium": "Medium",
-                "large": "Large",
-                "huge": "Huge",
-                "gargantuan": "Gargantuan"
-            },
             "Traits": {
                 "agility": {
                     "name": "Agility",
@@ -1230,29 +1200,6 @@
                     }
                 }
             },
-            "Triggers": {
-                "postDamageReduction": {
-                    "label": "After Damage Reduction"
-                },
-                "preDamageReduction": {
-                    "label": "Before Damage Reduction"
-                },
-                "dualityRoll": {
-                    "label": "Duality Roll"
-                },
-                "fearRoll": {
-                    "label": "Fear Roll"
-                },
-                "triggerTexts": {
-                    "strangePatternsContentTitle": "Matched {nr} times.",
-                    "strangePatternsContentSubTitle": "Increase hope and stress to a total of {nr}.",
-                    "ferocityContent": "Spend 2 Hope to gain {bonus} bonus Evasion until after the next attack against you?",
-                    "ferocityEffectDescription": "Your evasion is increased by {bonus}. This bonus lasts until after the next attack made against you."
-                },
-                "triggerType": "Trigger Type",
-                "triggeringActorType": "Triggering Actor Type",
-                "triggerError": "{trigger} trigger failed for {actor}. It's probably configured wrong."
-            },
             "WeaponFeature": {
                 "barrier": {
                     "name": "Barrier",
@@ -1837,9 +1784,7 @@
                             "label": "Long Rest: Bonus Long Rest Moves",
                             "hint": "The number of extra Long Rest Moves the character can take during a Long Rest."
                         }
-                    },
-                    "target": "Target",
-                    "targetSelf": "Self"
+                    }
                 },
                 "maxLoadout": {
                     "label": "Max Loadout Cards Bonus"
@@ -1854,7 +1799,6 @@
                 "plural": "Costs"
             },
             "Damage": {
-                "massive": "Massive",
                 "severe": "Severe",
                 "major": "Major",
                 "minor": "Minor",
@@ -2090,10 +2034,10 @@
                 "partyMembers": "Party Members",
                 "projects": "Projects",
                 "types": "Types",
+                "itemFeatures": "Item Features",
                 "questions": "Questions",
                 "configuration": "Configuration",
-                "base": "Base",
-                "triggers": "Triggers"
+                "base": "Base"
             },
             "Tiers": {
                 "singular": "Tier",
@@ -2147,7 +2091,6 @@
             "fear": "Fear",
             "features": "Features",
             "formula": "Formula",
-            "general": "General",
             "gm": "GM",
             "healing": "Healing",
             "healingRoll": "Healing Roll",
@@ -2162,7 +2105,6 @@
             },
             "hope": "Hope",
             "hordeHp": "Horde HP",
-            "icon": "Icon",
             "identify": "Identity",
             "imagePath": "Image Path",
             "inactiveEffects": "Inactive Effects",
@@ -2199,7 +2141,6 @@
             "recovery": "Recovery",
             "refresh": "Refresh",
             "reroll": "Reroll",
-            "rerolled": "Rerolled",
             "rerollThing": "Reroll {thing}",
             "resource": "Resource",
             "roll": "Roll",
@@ -2214,22 +2155,16 @@
             "stress": "Stress",
             "subclasses": "Subclasses",
             "success": "Success",
-            "summon": {
-                "single": "Summon",
-                "plural": "Summons"
-            },
             "take": "Take",
             "Target": {
                 "single": "Target",
                 "plural": "Targets"
             },
             "title": "Title",
-            "tokenSize": "Token Size",
             "total": "Total",
             "traitModifier": "Trait Modifier",
             "true": "True",
             "type": "Type",
-            "typeSheet": "System {type} Sheet",
             "unarmed": "Unarmed",
             "unarmedAttack": "Unarmed Attack",
             "unarmored": "Unarmored",
@@ -2282,10 +2217,8 @@
                     "tokenRingImg": { "label": "Subject Texture" },
                     "tokenSize": {
                         "placeholder": "Using character dimensions",
-                        "disabledPlaceholder": "Set by character size",
                         "height": { "label": "Height" },
-                        "width": { "label": "Width" },
-                        "scale": { "label": "Token Scale" }
+                        "width": { "label": "Width" }
                     },
                     "evolved": {
                         "maximumTier": { "label": "Maximum Tier" },
@@ -2307,11 +2240,7 @@
                 "evolvedDrag": "Drag a form here to evolve it.",
                 "hybridize": "Hybridize",
                 "hybridizeFeatureTitle": "Hybrid Features",
-                "hybridizeDrag": "Drag a form here to hybridize it.",
-                "mainTrait": "Main Trait",
-                "traitBonus": "Trait Bonus",
-                "evolvedTokenHint": "An evolved beastform's token is based on that of the form you evolve",
-                "evolvedImagePlaceholder": "The image for the form selected for evolution will be used"
+                "hybridizeDrag": "Drag a form here to hybridize it."
             },
             "Class": {
                 "hopeFeatures": "Hope Features",
@@ -2334,9 +2263,6 @@
             "DomainCard": {
                 "type": "Type",
                 "recallCost": "Recall Cost",
-                "vaultActive": "Active In Vault",
-                "loadoutIgnore": "Ignores Loadout Limits",
-                "domainTouched": "Domain Touched",
                 "foundationTitle": "Foundation",
                 "specializationTitle": "Specialization",
                 "masteryTitle": "Mastery"
@@ -2475,12 +2401,6 @@
                             "hint": "Automatically apply effects. Targets must be selected before the action is made and Reaction Roll Automation must be different than Never. Bypass users permissions."
                         }
                     },
-                    "triggers": {
-                        "enabled": {
-                            "label": "Enabled",
-                            "hint": "Advanced automation such as triggering a popup for a wizard's Strange Patterns"
-                        }
-                    },
                     "summaryMessages": {
                         "label": "Summary Messages"
                     }
@@ -2490,9 +2410,6 @@
                 },
                 "roll": {
                     "title": "Actions"
-                },
-                "trigger": {
-                    "title": "Triggers"
                 }
             },
             "Homebrew": {
@@ -2517,12 +2434,9 @@
                 },
                 "currency": {
                     "title": "Currency Overrides",
-                    "changeIcon": "Change Currency Icon",
                     "currencyName": "Currency Name",
                     "coinName": "Coin Name",
                     "handfulName": "Handful Name",
-                    "iconName": "Icon Name",
-                    "iconNameHint": "Icons are from fontawesome",
                     "bagName": "Bag Name",
                     "chestName": "Chest Name"
                 },
@@ -2584,11 +2498,6 @@
                     "hint": "Apply variant rules from the Daggerheart system",
                     "name": "Variant Rules",
                     "actionTokens": "Action Tokens"
-                },
-                "SpotlightRequestQueue": {
-                    "name": "Spotlight Request Queue",
-                    "label": "Spotlight Request Queue",
-                    "hint": "Adds more structure to spotlight requests by ordering them from oldest to newest"
                 }
             },
             "Resources": {
@@ -2602,10 +2511,6 @@
                     "actionTokens": {
                         "enabled": { "label": "Enabled" },
                         "tokens": { "label": "Tokens" }
-                    },
-                    "massiveDamage": {
-                        "title": "Massive Damage",
-                        "enabled": { "label": "Enabled" }
                     }
                 }
             },
@@ -2620,9 +2525,7 @@
                     }
                 },
                 "disabledText": "Daggerheart Measurements are disabled in System Settings - Variant Rules",
-                "rangeMeasurement": "Range Measurement",
-                "sceneEnvironments": "Scene Environments",
-                "dragEnvironmentHere": "Drag environments here"
+                "rangeMeasurement": "Range Measurement"
             }
         },
         "UI": {
@@ -2680,8 +2583,7 @@
                     "selectMember": "Select a Member",
                     "rerollTitle": "Reroll Group Roll",
                     "rerollContent": "Are you sure you want to reroll your {trait} check?",
-                    "rerollTooltip": "Reroll",
-                    "wholePartySelected": "The whole party is selected"
+                    "rerollTooltip": "Reroll"
                 },
                 "healingRoll": {
                     "title": "Heal - {damage}",
@@ -2835,10 +2737,7 @@
                 "gmRequired": "This action requires an online GM",
                 "gmOnly": "This can only be accessed by the GM",
                 "noActorOwnership": "You do not have permissions for this character",
-                "documentIsMissing": "The {documentType} is missing from the world.",
-                "tokenActorMissing": "{name} is missing an Actor",
-                "tokenActorsMissing": "[{names}] missing Actors",
-                "domainTouchRequirement": "This domain card requires {nr} {domain} cards in the loadout to be used"
+                "documentIsMissing": "The {documentType} is missing from the world."
             },
             "Sidebar": {
                 "actorDirectory": {
@@ -2881,10 +2780,7 @@
                 "companionPartnerLevelBlock": "The companion needs an assigned partner to level up.",
                 "configureAttribution": "Configure Attribution",
                 "deleteItem": "Delete Item",
-                "immune": "Immune",
-                "middleClick": "[Middle Click] Keep tooltip view",
-                "tokenSize": "The token size used on the canvas",
-                "previewTokenHelp": "Left-click to place, right-click to cancel"
+                "immune": "Immune"
             }
         }
     }

module/applications/dialogs/beastformDialog.mjs

@@ -278,26 +278,19 @@ export default class BeastformDialog extends HandlebarsApplicationMixin(Applicat
                 'close',
                 async () => {
                     const selected = app.selected.toObject();
-                    const evolved = app.evolved.form ? app.evolved.form.toObject() : null;
                     const data = await game.system.api.data.items.DHBeastform.getWildcardImage(
                         app.configData.data.parent,
-                        evolved ?? app.selected
+                        app.selected
                     );
                     if (data) {
                         if (!data.selectedImage) selected = null;
                         else {
-                            const imageSource = evolved ?? selected;
-                            if (imageSource.usesDynamicToken) imageSource.system.tokenRingImg = data.selectedImage;
-                            else imageSource.system.tokenImg = data.selectedImage;
+                            if (data.usesDynamicToken) selected.system.tokenRingImg = data.selectedImage;
+                            else selected.system.tokenImg = data.selectedImage;
                         }
                     }
 
-                    resolve({
-                        selected: selected,
-                        evolved: { ...app.evolved, form: evolved },
-                        hybrid: app.hybrid,
-                        item: featureItem
-                    });
+                    resolve({ selected: selected, evolved: app.evolved, hybrid: app.hybrid, item: featureItem });
                 },
                 { once: true }
             );

module/applications/dialogs/d20RollDialog.mjs

@@ -10,7 +10,6 @@ export default class D20RollDialog extends HandlebarsApplicationMixin(Applicatio
         this.config = config;
         this.config.experiences = [];
         this.reactionOverride = config.actionType === 'reaction';
-        this.selectedEffects = this.config.bonusEffects;
 
         if (config.source?.action) {
             this.item = config.data.parent.items.get(config.source.item) ?? config.data.parent;
@@ -36,7 +35,6 @@ export default class D20RollDialog extends HandlebarsApplicationMixin(Applicatio
             selectExperience: this.selectExperience,
             toggleReaction: this.toggleReaction,
             toggleTagTeamRoll: this.toggleTagTeamRoll,
-            toggleSelectedEffect: this.toggleSelectedEffect,
             submitRoll: this.submitRoll
         },
         form: {
@@ -78,9 +76,6 @@ export default class D20RollDialog extends HandlebarsApplicationMixin(Applicatio
             icon
         }));
 
-        context.hasSelectedEffects = Boolean(this.selectedEffects && Object.keys(this.selectedEffects).length);
-        context.selectedEffects = this.selectedEffects;
-
         this.config.costs ??= [];
         if (this.config.costs?.length) {
             const updatedCosts = game.system.api.fields.ActionFields.CostField.calcCosts.call(
@@ -109,7 +104,7 @@ export default class D20RollDialog extends HandlebarsApplicationMixin(Applicatio
             context.roll = this.roll;
             context.rollType = this.roll?.constructor.name;
             context.rallyDie = this.roll.rallyChoices;
-            const experiences = this.config.data?.system?.experiences || {};
+            const experiences = this.config.data?.experiences || {};
             context.experiences = Object.keys(experiences).map(id => ({
                 id,
                 ...experiences[id]
@@ -190,7 +185,7 @@ export default class D20RollDialog extends HandlebarsApplicationMixin(Applicatio
                           extKey: button.dataset.key,
                           key: this.config?.data?.parent?.isNPC ? 'fear' : 'hope',
                           value: 1,
-                          name: this.config.data?.system.experiences?.[button.dataset.key]?.name
+                          name: this.config.data?.experiences?.[button.dataset.key]?.name
                       }
                   ];
         this.render();
@@ -200,9 +195,9 @@ export default class D20RollDialog extends HandlebarsApplicationMixin(Applicatio
         if (this.config.roll) {
             this.reactionOverride = !this.reactionOverride;
             this.config.actionType = this.reactionOverride
-                ? 'reaction'
-                : this.config.actionType === 'reaction'
-                  ? 'action'
+                ? CONFIG.DH.ITEM.actionTypes.reaction.id
+                : this.config.actionType === CONFIG.DH.ITEM.actionTypes.reaction.id
+                  ? CONFIG.DH.ITEM.actionTypes.action.id
                   : this.config.actionType;
             this.render();
         }
@@ -213,11 +208,6 @@ export default class D20RollDialog extends HandlebarsApplicationMixin(Applicatio
         this.render();
     }
 
-    static toggleSelectedEffect(_event, button) {
-        this.selectedEffects[button.dataset.key].selected = !this.selectedEffects[button.dataset.key].selected;
-        this.render();
-    }
-
     static async submitRoll() {
         await this.close({ submitted: true });
     }

module/applications/dialogs/damageDialog.mjs

@@ -6,7 +6,6 @@ export default class DamageDialog extends HandlebarsApplicationMixin(Application
 
         this.roll = roll;
         this.config = config;
-        this.selectedEffects = this.config.bonusEffects;
     }
 
     static DEFAULT_OPTIONS = {
@@ -21,7 +20,6 @@ export default class DamageDialog extends HandlebarsApplicationMixin(Application
             icon: 'fa-solid fa-dice'
         },
         actions: {
-            toggleSelectedEffect: this.toggleSelectedEffect,
             submitRoll: this.submitRoll
         },
         form: {
@@ -59,9 +57,6 @@ export default class DamageDialog extends HandlebarsApplicationMixin(Application
             icon
         }));
         context.modifiers = this.config.modifiers;
-        context.hasSelectedEffects = Boolean(Object.keys(this.selectedEffects).length);
-        context.selectedEffects = this.selectedEffects;
-
         return context;
     }
 
@@ -74,11 +69,6 @@ export default class DamageDialog extends HandlebarsApplicationMixin(Application
         this.render();
     }
 
-    static toggleSelectedEffect(_event, button) {
-        this.selectedEffects[button.dataset.key].selected = !this.selectedEffects[button.dataset.key].selected;
-        this.render();
-    }
-
     static async submitRoll() {
         await this.close({ submitted: true });
     }

module/applications/dialogs/downtime.mjs

@@ -93,9 +93,7 @@ export default class DhpDowntime extends HandlebarsApplicationMixin(ApplicationV
     }
 
     getRefreshables() {
-        const actionItems = this.actor.items
-            .filter(x => this.actor.system.isItemAvailable(x))
-            .reduce((acc, x) => {
+        const actionItems = this.actor.items.reduce((acc, x) => {
             if (x.system.actions) {
                 const recoverable = x.system.actions.reduce((acc, action) => {
                     if (refreshIsAllowed([this.shortrest ? 'shortRest' : 'longRest'], action.uses.recovery)) {
@@ -120,7 +118,7 @@ export default class DhpDowntime extends HandlebarsApplicationMixin(ApplicationV
             if (
                 x.system.resource &&
                 x.system.resource.type &&
-                refreshIsAllowed([this.shortrest ? 'shortRest' : 'longRest'], x.system.resource.recovery)
+                refreshIsAllowed([this.shortrest ? 'shortRest' : 'longRest'], action.uses.recovery)
             ) {
                 acc.push({
                     title: game.i18n.localize(`TYPES.Item.${x.type}`),
@@ -183,18 +181,12 @@ export default class DhpDowntime extends HandlebarsApplicationMixin(ApplicationV
                 .filter(x => category.moves[x].selected)
                 .flatMap(key => {
                     const move = category.moves[key];
-                    const needsTarget = move.actions.filter(x => x.target?.type && x.target.type !== 'self').length > 0;
                     return [...Array(move.selected).keys()].map(_ => ({
                         ...move,
-                        movePath: `${categoryKey}.moves.${key}`,
-                        needsTarget: needsTarget
+                        movePath: `${categoryKey}.moves.${key}`
                     }));
                 });
         });
-        const characters = game.actors
-            .filter(x => x.type === 'character')
-            .filter(x => x.testUserPermission(game.user, 'LIMITED'))
-            .filter(x => x.uuid !== this.actor.uuid);
 
         const cls = getDocumentClass('ChatMessage');
         const msg = {
@@ -214,9 +206,7 @@ export default class DhpDowntime extends HandlebarsApplicationMixin(ApplicationV
                         `DAGGERHEART.APPLICATIONS.Downtime.${this.shortrest ? 'shortRest' : 'longRest'}.title`
                     ),
                     actor: { name: this.actor.name, img: this.actor.img },
-                    moves: moves,
-                    characters: characters,
-                    selfId: this.actor.uuid
+                    moves: moves
                 }
             ),
             flags: {

module/applications/dialogs/itemTransfer.mjs

@@ -1,61 +1,69 @@
 const { HandlebarsApplicationMixin, ApplicationV2 } = foundry.applications.api;
 
 export default class ItemTransferDialog extends HandlebarsApplicationMixin(ApplicationV2) {
-    constructor(data) {
+    constructor(item) {
         super({});
-        this.data = data;
+
+        this.item = item;
+        this.quantity = item.system.quantity;
     }
 
     get title() {
-        return this.data.title;
+        return this.item.name;
     }
 
     static DEFAULT_OPTIONS = {
         tag: 'form',
         classes: ['daggerheart', 'dh-style', 'dialog', 'item-transfer'],
-        position: { width: 400, height: 'auto' },
+        position: { width: 300, height: 'auto' },
         window: { icon: 'fa-solid fa-hand-holding-hand' },
         actions: {
             finish: ItemTransferDialog.#finish
-        }
+        },
+        form: { handler: this.updateData, submitOnChange: true, closeOnSubmit: false }
     };
 
     static PARTS = {
-        main: { template: 'systems/daggerheart/templates/dialogs/item-transfer.hbs', root: true }
+        main: { template: 'systems/daggerheart/templates/dialogs/item-transfer.hbs' }
     };
 
+    _attachPartListeners(partId, htmlElement, options) {
+        super._attachPartListeners(partId, htmlElement, options);
+
+        htmlElement.querySelector('.number-display').addEventListener('change', event => {
+            this.quantity = isNaN(event.target.value) ? this.quantity : Number(event.target.value);
+            this.render();
+        });
+    }
+
     async _prepareContext(_options) {
         const context = await super._prepareContext(_options);
-        return foundry.utils.mergeObject(context, this.data);
+        context.item = this.item;
+        context.quantity = this.quantity;
+
+        return context;
+    }
+
+    static async updateData(_event, _element, formData) {
+        const { quantity } = foundry.utils.expandObject(formData.object);
+        this.quantity = quantity;
+        this.render();
     }
 
     static async #finish() {
-        this.selected = this.form.elements.quantity.valueAsNumber || null;
-        this.close();
+        this.close({ submitted: true });
     }
 
-    static #determineTransferOptions({ originActor, targetActor, item, currency }) {
-        originActor ??= item?.actor;
-        const homebrewKey = CONFIG.DH.SETTINGS.gameSettings.Homebrew;
-        const currencySetting = game.settings.get(CONFIG.DH.id, homebrewKey).currency?.[currency] ?? null;
+    close(options = {}) {
+        if (!options.submitted) this.quantity = null;
 
-        return {
-            originActor,
-            targetActor,
-            itemImage: item?.img,
-            currencyIcon: currencySetting?.icon,
-            max: item?.system.quantity ?? originActor.system.gold[currency] ?? 0,
-            title: item?.name ?? currencySetting?.label
-        };
+        super.close();
     }
 
-    static async configure(options) {
+    static async configure(item) {
         return new Promise(resolve => {
-            const data = this.#determineTransferOptions(options);
-            if (data.max <= 1) return resolve(data.max);
-
-            const app = new this(data);
-            app.addEventListener('close', () => resolve(app.selected), { once: true });
+            const app = new this(item);
+            app.addEventListener('close', () => resolve(app.quantity), { once: true });
             app.render({ force: true });
         });
     }

module/applications/dialogs/ownershipSelection.mjs

@@ -38,6 +38,7 @@ export default class OwnershipSelection extends HandlebarsApplicationMixin(Appli
 
     async _prepareContext(_options) {
         const context = await super._prepareContext(_options);
+        context.ownershipDefaultOptions = CONFIG.DH.GENERAL.basicOwnershiplevels;
         context.ownershipOptions = CONFIG.DH.GENERAL.simpleOwnershiplevels;
         context.defaultOwnership = this.defaultOwnership;
         context.ownership = game.users.reduce((acc, user) => {
@@ -51,7 +52,6 @@ export default class OwnershipSelection extends HandlebarsApplicationMixin(Appli
 
             return acc;
         }, {});
-        context.showOwnership = Boolean(Object.keys(context.ownership).length);
 
         return context;
     }

module/applications/dialogs/tagTeamDialog.mjs

@@ -77,7 +77,7 @@ export default class TagTeamDialog extends HandlebarsApplicationMixin(Applicatio
             cost: this.data.initiator.cost
         };
 
-        const selectedMember = Object.values(context.members).find(x => x.selected && x.roll);
+        const selectedMember = Object.values(context.members).find(x => x.selected);
         const selectedIsCritical = selectedMember?.roll?.system?.isCritical;
         context.selectedData = {
             result: selectedMember
@@ -220,8 +220,8 @@ export default class TagTeamDialog extends HandlebarsApplicationMixin(Applicatio
                         !roll.system.isCritical && criticalRoll
                             ? (await getCritDamageBonus(damage.formula)) + damage.total
                             : damage.total;
-                    const updatedDamageParts = damage.parts;
                     if (systemData.damage[key]) {
+                        const updatedDamageParts = damage.parts;
                         if (!roll.system.isCritical && criticalRoll) {
                             for (let part of updatedDamageParts) {
                                 const criticalDamage = await getCritDamageBonus(part.formula);

module/applications/hud/tokenHUD.mjs

@@ -21,8 +21,6 @@ export default class DHTokenHUD extends foundry.applications.hud.TokenHUD {
 
     async _prepareContext(options) {
         const context = await super._prepareContext(options);
-        if (!this.actor) return context;
-
         context.partyOnCanvas =
             this.actor.type === 'party' &&
             this.actor.system.partyMembers.some(member => member.getActiveTokens().length > 0);
@@ -60,33 +58,14 @@ export default class DHTokenHUD extends foundry.applications.hud.TokenHUD {
     }
 
     static async #onToggleCombat() {
-        const tokensWithoutActors = canvas.tokens.controlled.filter(t => !t.actor);
-        const warning =
-            tokensWithoutActors.length === 1
-                ? game.i18n.format('DAGGERHEART.UI.Notifications.tokenActorMissing', {
-                      name: tokensWithoutActors[0].name
-                  })
-                : game.i18n.format('DAGGERHEART.UI.Notifications.tokenActorsMissing', {
-                      names: tokensWithoutActors.map(x => x.name).join(', ')
-                  });
-
         const tokens = canvas.tokens.controlled
-            .filter(t => t.actor && !DHTokenHUD.#nonCombatTypes.includes(t.actor.type))
+            .filter(t => !t.actor || !DHTokenHUD.#nonCombatTypes.includes(t.actor.type))
             .map(t => t.document);
-        if (!this.object.controlled && this.document.actor) tokens.push(this.document);
+        if (!this.object.controlled) tokens.push(this.document);
 
         try {
-            if (this.document.inCombat) {
-                const tokensInCombat = tokens.filter(t => t.inCombat);
-                await TokenDocument.implementation.deleteCombatants([...tokensInCombat, ...tokensWithoutActors]);
-            } else {
-                if (tokensWithoutActors.length) {
-                    ui.notifications.warn(warning);
-                }
-
-                const tokensOutOfCombat = tokens.filter(t => !t.inCombat);
-                await TokenDocument.implementation.createCombatants(tokensOutOfCombat);
-            }
+            if (this.document.inCombat) await TokenDocument.implementation.deleteCombatants(tokens);
+            else await TokenDocument.implementation.createCombatants(tokens);
         } catch (err) {
             ui.notifications.warn(err.message);
         }
@@ -218,8 +197,6 @@ export default class DHTokenHUD extends foundry.applications.hud.TokenHUD {
         for (const effect of activeEffects) {
             for (const statusId of effect.statuses) {
                 const status = choices[statusId];
-                if (!status) continue;
-
                 status.instances = 1 + (status.instances ?? 0);
                 status.locked = status.locked || effect.condition || status.instances > 1;
                 if (!status) continue;

module/applications/levelup/characterLevelup.mjs

@@ -280,19 +280,11 @@ export default class DhCharacterLevelUp extends LevelUpBase {
                                     break;
                                 case 'experience':
                                     if (!advancement[choiceKey]) advancement[choiceKey] = [];
-                                    const allExperiences = {
-                                        ...this.actor.system.experiences,
-                                        ...Object.values(this.levelup.levels).reduce((acc, level) => {
-                                            for (const key of Object.keys(level.achievements.experiences)) {
-                                                acc[key] = level.achievements.experiences[key];
-                                            }
-
-                                            return acc;
-                                        }, {})
-                                    };
                                     const data = checkbox.data.map(data => {
-                                        const experience = Object.keys(allExperiences).find(x => x === data);
-                                        return allExperiences[experience]?.name ?? '';
+                                        const experience = Object.keys(this.actor.system.experiences).find(
+                                            x => x === data
+                                        );
+                                        return this.actor.system.experiences[experience]?.name ?? '';
                                     });
                                     advancement[choiceKey].push({ data: data, value: checkbox.value });
                                     break;

module/applications/levelup/levelup.mjs

@@ -357,23 +357,11 @@ export default class DhlevelUp extends HandlebarsApplicationMixin(ApplicationV2)
 
         const experienceIncreaseTagify = htmlElement.querySelector('.levelup-experience-increases');
         if (experienceIncreaseTagify) {
-            const allExperiences = {
-                ...this.actor.system.experiences,
-                ...Object.values(this.levelup.levels).reduce((acc, level) => {
-                    for (const key of Object.keys(level.achievements.experiences)) {
-                        acc[key] = level.achievements.experiences[key];
-                    }
-
-                    return acc;
-                }, {})
-            };
             tagifyElement(
                 experienceIncreaseTagify,
-                Object.keys(allExperiences).reduce((acc, id) => {
-                    const experience = allExperiences[id];
-                    if (experience.name) {
+                Object.keys(this.actor.system.experiences).reduce((acc, id) => {
+                    const experience = this.actor.system.experiences[id];
                     acc.push({ id: id, label: experience.name });
-                    }
 
                     return acc;
                 }, []),

module/applications/scene/sceneConfigSettings.mjs

@@ -1,25 +1,16 @@
-import { RefreshType, socketEvent } from '../../systemRegistration/socket.mjs';
-
 export default class DhSceneConfigSettings extends foundry.applications.sheets.SceneConfig {
-    constructor(options) {
-        super(options);
-
-        Hooks.on(socketEvent.Refresh, ({ refreshType }) => {
-            if (refreshType === RefreshType.Scene) this.render();
-        });
-    }
-
-    static DEFAULT_OPTIONS = {
-        ...super.DEFAULT_OPTIONS,
-        actions: {
-            ...super.DEFAULT_OPTIONS.actions,
-            removeSceneEnvironment: DhSceneConfigSettings.#removeSceneEnvironment
-        }
-    };
+    // static DEFAULT_OPTIONS = {
+    //     ...super.DEFAULT_OPTIONS,
+    //     form: {
+    //         handler: this.updateData,
+    //         closeOnSubmit: true
+    //     }
+    // };
 
     static buildParts() {
         const { footer, tabs, ...parts } = super.PARTS;
         const tmpParts = {
+            // tabs,
             tabs: { template: 'systems/daggerheart/templates/scene/tabs.hbs' },
             ...parts,
             dh: { template: 'systems/daggerheart/templates/scene/dh-config.hbs' },
@@ -37,47 +28,27 @@ export default class DhSceneConfigSettings extends foundry.applications.sheets.S
 
     static TABS = DhSceneConfigSettings.buildTabs();
 
-    async _preRender(context, options) {
-        await super._preFirstRender(context, options);
-
-        if (!options.internalRefresh)
-            this.daggerheartFlag = new game.system.api.data.scenes.DHScene(this.document.flags.daggerheart);
-    }
-
     _attachPartListeners(partId, htmlElement, options) {
         super._attachPartListeners(partId, htmlElement, options);
-
         switch (partId) {
             case 'dh':
                 htmlElement.querySelector('#rangeMeasurementSetting')?.addEventListener('change', async event => {
-                    this.daggerheartFlag.updateSource({ rangeMeasurement: { setting: event.target.value } });
-                    this.render({ internalRefresh: true });
+                    const flagData = foundry.utils.mergeObject(this.document.flags.daggerheart, {
+                        rangeMeasurement: { setting: event.target.value }
+                    });
+                    this.document.flags.daggerheart = flagData;
+                    this.render();
                 });
-
-                const dragArea = htmlElement.querySelector('.scene-environments');
-                if (dragArea) dragArea.ondrop = this._onDrop.bind(this);
-
                 break;
         }
     }
 
-    async _onDrop(event) {
-        const data = foundry.applications.ux.TextEditor.implementation.getDragEventData(event);
-        const item = await foundry.utils.fromUuid(data.uuid);
-        if (item instanceof game.system.api.documents.DhpActor && item.type === 'environment') {
-            await this.daggerheartFlag.updateSource({
-                sceneEnvironments: [...this.daggerheartFlag.sceneEnvironments, data.uuid]
-            });
-            this.render({ internalRefresh: true });
-        }
-    }
-
     /** @inheritDoc */
     async _preparePartContext(partId, context, options) {
         context = await super._preparePartContext(partId, context, options);
         switch (partId) {
             case 'dh':
-                context.data = this.daggerheartFlag;
+                context.data = new game.system.api.data.scenes.DHScene(canvas.scene.flags.daggerheart);
                 context.variantRules = game.settings.get(CONFIG.DH.id, CONFIG.DH.SETTINGS.gameSettings.variantRules);
                 break;
         }
@@ -85,24 +56,8 @@ export default class DhSceneConfigSettings extends foundry.applications.sheets.S
         return context;
     }
 
-    static async #removeSceneEnvironment(_event, button) {
-        await this.daggerheartFlag.updateSource({
-            sceneEnvironments: this.daggerheartFlag.sceneEnvironments.filter(
-                (_, index) => index !== Number.parseInt(button.dataset.index)
-            )
-        });
-        this.render({ internalRefresh: true });
-    }
-
-    /** @override */
-    async _processSubmitData(event, form, submitData, options) {
-        submitData.flags.daggerheart = this.daggerheartFlag.toObject();
-        for (const key of Object.keys(this.document._source.flags.daggerheart?.sceneEnvironments ?? {})) {
-            if (!submitData.flags.daggerheart.sceneEnvironments[key]) {
-                submitData.flags.daggerheart.sceneEnvironments[`-=${key}`] = null;
-            }
-        }
-
-        super._processSubmitData(event, form, submitData, options);
-    }
+    // static async updateData(event, _, formData) {
+    //     const data = foundry.utils.expandObject(formData.object);
+    //     this.close(data);
+    // }
 }

module/applications/settings/homebrewSettings.mjs

@@ -32,7 +32,6 @@ export default class DhHomebrewSettings extends HandlebarsApplicationMixin(Appli
             icon: 'fa-solid fa-gears'
         },
         actions: {
-            editCurrencyIcon: this.changeCurrencyIcon,
             addItem: this.addItem,
             editItem: this.editItem,
             removeItem: this.removeItem,
@@ -44,7 +43,6 @@ export default class DhHomebrewSettings extends HandlebarsApplicationMixin(Appli
             deleteAdversaryType: this.deleteAdversaryType,
             selectAdversaryType: this.selectAdversaryType,
             save: this.save,
-            resetTokenSizes: this.resetTokenSizes,
             reset: this.reset
         },
         form: { handler: this.updateData, submitOnChange: true }
@@ -117,45 +115,6 @@ export default class DhHomebrewSettings extends HandlebarsApplicationMixin(Appli
         this.render();
     }
 
-    static async changeCurrencyIcon(_, target) {
-        const type = target.dataset.currency;
-        const currentIcon = this.settings.currency[type].icon;
-        const icon = await foundry.applications.api.DialogV2.input({
-            classes: ['daggerheart', 'dh-style', 'change-currency-icon'],
-            content: await foundry.applications.handlebars.renderTemplate(
-                'systems/daggerheart/templates/settings/homebrew-settings/change-currency-icon.hbs',
-                { currentIcon }
-            ),
-            window: {
-                title: game.i18n.localize('DAGGERHEART.SETTINGS.Homebrew.currency.changeIcon'),
-                icon: 'fa-solid fa-coins'
-            },
-            render: (_, dialog) => {
-                const icon = dialog.element.querySelector('.displayed-icon i');
-                const input = dialog.element.querySelector('input');
-                const reset = dialog.element.querySelector('button[data-action=reset]');
-                input.addEventListener('input', () => {
-                    icon.classList.value = input.value;
-                });
-                reset.addEventListener('click', () => {
-                    const currencyField = DhHomebrew.schema.fields.currency.fields[type];
-                    const initial = currencyField.fields.icon.getInitialValue();
-                    input.value = icon.classList.value = initial;
-                });
-            },
-            ok: {
-                callback: (_, button) => button.form.elements.icon.value
-            }
-        });
-
-        if (icon !== null) {
-            await this.settings.updateSource({
-                [`currency.${type}.icon`]: icon
-            });
-            this.render();
-        }
-    }
-
     static async addItem(_, target) {
         const { type } = target.dataset;
         if (['shortRest', 'longRest'].includes(type)) {
@@ -425,14 +384,6 @@ export default class DhHomebrewSettings extends HandlebarsApplicationMixin(Appli
         this.close();
     }
 
-    static async resetTokenSizes() {
-        await this.settings.updateSource({
-            tokenSizes: this.settings.schema.fields.tokenSizes.initial
-        });
-
-        this.render();
-    }
-
     static async reset() {
         const confirmed = await foundry.applications.api.DialogV2.confirm({
             window: {

module/applications/sheets-configs/action-base-config.mjs

@@ -7,7 +7,6 @@ export default class DHActionBaseConfig extends DaggerheartSheet(ApplicationV2)
 
         this.action = action;
         this.openSection = null;
-        this.openTrigger = this.action.triggers.length > 0 ? 0 : null;
     }
 
     get title() {
@@ -16,7 +15,7 @@ export default class DHActionBaseConfig extends DaggerheartSheet(ApplicationV2)
 
     static DEFAULT_OPTIONS = {
         tag: 'form',
-        classes: ['daggerheart', 'dh-style', 'action-config', 'dialog', 'max-800'],
+        classes: ['daggerheart', 'dh-style', 'dialog', 'max-800'],
         window: {
             icon: 'fa-solid fa-wrench',
             resizable: false
@@ -30,18 +29,13 @@ export default class DHActionBaseConfig extends DaggerheartSheet(ApplicationV2)
             removeElement: this.removeElement,
             editEffect: this.editEffect,
             addDamage: this.addDamage,
-            removeDamage: this.removeDamage,
-            editDoc: this.editDoc,
-            addTrigger: this.addTrigger,
-            removeTrigger: this.removeTrigger,
-            expandTrigger: this.expandTrigger
+            removeDamage: this.removeDamage
         },
         form: {
             handler: this.updateForm,
             submitOnChange: true,
             closeOnSubmit: false
-        },
-        dragDrop: [{ dragSelector: null, dropSelector: '#summon-drop-zone', handlers: ['_onDrop'] }]
+        }
     };
 
     static PARTS = {
@@ -61,10 +55,6 @@ export default class DHActionBaseConfig extends DaggerheartSheet(ApplicationV2)
         effect: {
             id: 'effect',
             template: 'systems/daggerheart/templates/sheets-settings/action-settings/effect.hbs'
-        },
-        trigger: {
-            id: 'trigger',
-            template: 'systems/daggerheart/templates/sheets-settings/action-settings/trigger.hbs'
         }
     };
 
@@ -92,18 +82,10 @@ export default class DHActionBaseConfig extends DaggerheartSheet(ApplicationV2)
             id: 'effect',
             icon: null,
             label: 'DAGGERHEART.GENERAL.Tabs.effects'
-        },
-        trigger: {
-            active: false,
-            cssClass: '',
-            group: 'primary',
-            id: 'trigger',
-            icon: null,
-            label: 'DAGGERHEART.GENERAL.Tabs.triggers'
         }
     };
 
-    static CLEAN_ARRAYS = ['damage.parts', 'cost', 'effects', 'summon'];
+    static CLEAN_ARRAYS = ['damage.parts', 'cost', 'effects'];
 
     _getTabs(tabs) {
         for (const v of Object.values(tabs)) {
@@ -114,24 +96,9 @@ export default class DHActionBaseConfig extends DaggerheartSheet(ApplicationV2)
         return tabs;
     }
 
-    _attachPartListeners(partId, htmlElement, options) {
-        super._attachPartListeners(partId, htmlElement, options);
-
-        htmlElement.querySelectorAll('.summon-count-wrapper input').forEach(element => {
-            element.addEventListener('change', this.updateSummonCount.bind(this));
-        });
-    }
-
     async _prepareContext(_options) {
         const context = await super._prepareContext(_options, 'action');
-        context.source = this.action.toObject(true);
-
-        context.summons = [];
-        for (const summon of context.source.summon ?? []) {
-            const actor = await foundry.utils.fromUuid(summon.actorUUID);
-            context.summons.push({ actor, count: summon.count });
-        }
-
+        context.source = this.action.toObject(false);
         context.openSection = this.openSection;
         context.tabs = this._getTabs(this.constructor.TABS);
         context.config = CONFIG.DH;
@@ -144,16 +111,6 @@ export default class DHActionBaseConfig extends DaggerheartSheet(ApplicationV2)
         context.baseSaveDifficulty = this.action.actor?.baseSaveDifficulty;
         context.baseAttackBonus = this.action.actor?.system.attack?.roll.bonus;
         context.hasRoll = this.action.hasRoll;
-        context.triggers = context.source.triggers.map((trigger, index) => {
-            const { hint, returns, usesActor } = CONFIG.DH.TRIGGER.triggers[trigger.trigger];
-            return {
-                ...trigger,
-                hint,
-                returns,
-                usesActor,
-                revealed: this.openTrigger === index
-            };
-        });
 
         const settingsTiers = game.settings.get(CONFIG.DH.id, CONFIG.DH.SETTINGS.gameSettings.LevelTiers).tiers;
         context.tierOptions = [
@@ -224,9 +181,8 @@ export default class DHActionBaseConfig extends DaggerheartSheet(ApplicationV2)
     }
 
     static async updateForm(event, _, formData) {
-        const submitData = this._prepareSubmitData(event, formData);
-
-        const data = foundry.utils.mergeObject(this.action.toObject(), submitData);
+        const submitData = this._prepareSubmitData(event, formData),
+            data = foundry.utils.mergeObject(this.action.toObject(), submitData);
         this.action = await this.action.update(data);
 
         this.sheetUpdate?.(this.action);
@@ -245,26 +201,12 @@ export default class DHActionBaseConfig extends DaggerheartSheet(ApplicationV2)
     static removeElement(event, button) {
         event.stopPropagation();
         const data = this.action.toObject(),
-            key = event.target.closest('[data-key]').dataset.key;
-
-        // Prefer explicit index, otherwise find by uuid
-        let index = button?.dataset.index;
-        if (index === undefined || index === null || index === '') {
-            const uuid = button?.dataset.uuid ?? button?.dataset.itemUuid;
-            index = data[key].findIndex(e => (e?.actorUUID ?? e?.uuid) === uuid);
-            if (index === -1) return;
-        } else index = Number(index);
-
+            key = event.target.closest('[data-key]').dataset.key,
+            index = button.dataset.index;
         data[key].splice(index, 1);
         this.constructor.updateForm.bind(this)(null, null, { object: foundry.utils.flattenObject(data) });
     }
 
-    static async editDoc(_event, target) {
-        const element = target.closest('[data-item-uuid]');
-        const doc = (await foundry.utils.fromUuid(element.dataset.itemUuid)) ?? null;
-        if (doc) return doc.sheet.render({ force: true });
-    }
-
     static addDamage(_event) {
         if (!this.action.damage.parts) return;
         const data = this.action.toObject(),
@@ -282,69 +224,6 @@ export default class DHActionBaseConfig extends DaggerheartSheet(ApplicationV2)
         this.constructor.updateForm.bind(this)(null, null, { object: foundry.utils.flattenObject(data) });
     }
 
-    static addTrigger() {
-        const data = this.action.toObject();
-        data.triggers.push({
-            trigger: CONFIG.DH.TRIGGER.triggers.dualityRoll.id,
-            triggeringActor: CONFIG.DH.TRIGGER.triggerActorTargetType.any.id
-        });
-        this.constructor.updateForm.bind(this)(null, null, { object: foundry.utils.flattenObject(data) });
-    }
-
-    static async removeTrigger(_event, button) {
-        const trigger = CONFIG.DH.TRIGGER.triggers[this.action.triggers[button.dataset.index].trigger];
-        const confirmed = await foundry.applications.api.DialogV2.confirm({
-            window: {
-                title: game.i18n.localize('DAGGERHEART.ACTIONS.Config.deleteTriggerTitle')
-            },
-            content: game.i18n.format('DAGGERHEART.ACTIONS.Config.deleteTriggerContent', {
-                trigger: game.i18n.localize(trigger.label)
-            })
-        });
-
-        if (!confirmed) return;
-
-        const data = this.action.toObject();
-        data.triggers = data.triggers.filter((_, index) => index !== Number.parseInt(button.dataset.index));
-        this.constructor.updateForm.bind(this)(null, null, { object: foundry.utils.flattenObject(data) });
-    }
-
-    static async expandTrigger(_event, button) {
-        const index = Number.parseInt(button.dataset.index);
-        const toggle = (element, codeMirror) => {
-            codeMirror.classList.toggle('revealed');
-            const button = element.querySelector('a > i');
-            button.classList.toggle('fa-angle-up');
-            button.classList.toggle('fa-angle-down');
-        };
-
-        const fieldset = button.closest('fieldset');
-        const codeMirror = fieldset.querySelector('.code-mirror-wrapper');
-        toggle(fieldset, codeMirror);
-
-        if (this.openTrigger !== null && this.openTrigger !== index) {
-            const previouslyExpanded = fieldset
-                .closest(`section`)
-                .querySelector(`fieldset[data-index="${this.openTrigger}"]`);
-            const codeMirror = previouslyExpanded.querySelector('.code-mirror-wrapper');
-            toggle(previouslyExpanded, codeMirror);
-            this.openTrigger = index;
-        } else if (this.openTrigger === index) {
-            this.openTrigger = null;
-        } else {
-            this.openTrigger = index;
-        }
-    }
-
-    updateSummonCount(event) {
-        event.stopPropagation();
-        const wrapper = event.target.closest('.summon-count-wrapper');
-        const index = wrapper.dataset.index;
-        const data = this.action.toObject();
-        data.summon[index].count = event.target.value;
-        this.constructor.updateForm.bind(this)(null, null, { object: foundry.utils.flattenObject(data) });
-    }
-
     /** Specific implementation in extending classes **/
     static async addEffect(_event) {}
     static removeEffect(_event, _button) {}
@@ -354,29 +233,4 @@ export default class DHActionBaseConfig extends DaggerheartSheet(ApplicationV2)
         this.tabGroups.primary = 'base';
         await super.close(options);
     }
-
-    async _onDrop(event) {
-        const data = foundry.applications.ux.TextEditor.getDragEventData(event);
-        const item = await foundry.utils.fromUuid(data.uuid);
-        if (!(item instanceof game.system.api.documents.DhpActor)) {
-            ui.notifications.warn(game.i18n.localize('DAGGERHEART.ACTIONS.TYPES.summon.invalidDrop'));
-            return;
-        }
-
-        const actionData = this.action.toObject();
-        let countvalue = 1;
-        for (const entry of actionData.summon) {
-            if (entry.actorUUID === data.uuid) {
-                entry.count += 1;
-                countvalue = entry.count;
-                await this.constructor.updateForm.bind(this)(null, null, {
-                    object: foundry.utils.flattenObject(actionData)
-                });
-                return;
-            }
-        }
-
-        actionData.summon.push({ actorUUID: data.uuid, count: countvalue });
-        await this.constructor.updateForm.bind(this)(null, null, { object: foundry.utils.flattenObject(actionData) });
-    }
 }

module/applications/sheets-configs/activeEffectConfig.mjs

@@ -9,9 +9,6 @@ export default class DhActiveEffectConfig extends foundry.applications.sheets.Ac
             if (!ignoredActorKeys.includes(key)) {
                 const model = game.system.api.models.actors[key];
                 const attributes = CONFIG.Token.documentClass.getTrackedAttributes(model);
-                // As per DHToken._getTrackedAttributesFromSchema, attributes.bar have a max version as well.
-                const maxAttributes = attributes.bar.map(x => [...x, 'max']);
-                attributes.value.push(...maxAttributes);
                 const group = game.i18n.localize(model.metadata.label);
                 const choices = CONFIG.Token.documentClass
                     .getTrackedAttributeChoices(attributes, model)

module/applications/sheets-configs/adversary-settings.mjs

@@ -51,19 +51,6 @@ export default class DHAdversarySettings extends DHBaseActorSettings {
         }
     };
 
-    async _prepareContext(options) {
-        const context = await super._prepareContext(options);
-
-        const featureForms = ['passive', 'action', 'reaction'];
-        context.features = context.document.system.features.sort((a, b) =>
-            a.system.featureForm !== b.system.featureForm
-                ? featureForms.indexOf(a.system.featureForm) - featureForms.indexOf(b.system.featureForm)
-                : a.sort - b.sort
-        );
-
-        return context;
-    }
-
     /* -------------------------------------------- */
 
     /**

module/applications/sheets-configs/environment-settings.mjs

@@ -49,19 +49,6 @@ export default class DHEnvironmentSettings extends DHBaseActorSettings {
         }
     };
 
-    async _prepareContext(options) {
-        const context = await super._prepareContext(options);
-
-        const featureForms = ['passive', 'action', 'reaction'];
-        context.features = context.document.system.features.sort((a, b) =>
-            a.system.featureForm !== b.system.featureForm
-                ? featureForms.indexOf(a.system.featureForm) - featureForms.indexOf(b.system.featureForm)
-                : a.sort - b.sort
-        );
-
-        return context;
-    }
-
     /**
      *  Adds a new category entry to the actor.
      * @type {ApplicationClickAction}

module/applications/sheets-configs/prototype-token-config.mjs

@@ -1,30 +1,20 @@
-import DHTokenConfigMixin from './token-config-mixin.mjs';
-import { getActorSizeFromForm } from './token-config-mixin.mjs';
-
-export default class DhPrototypeTokenConfig extends DHTokenConfigMixin(
-    foundry.applications.sheets.PrototypeTokenConfig
-) {
+export default class DhPrototypeTokenConfig extends foundry.applications.sheets.PrototypeTokenConfig {
     /** @inheritDoc */
-    static DEFAULT_OPTIONS = {
-        ...super.DEFAULT_OPTIONS,
-        form: { handler: DhPrototypeTokenConfig.#onSubmit }
+    async _prepareResourcesTab() {
+        const token = this.token;
+        const usesTrackableAttributes = !foundry.utils.isEmpty(CONFIG.Actor.trackableAttributes);
+        const attributeSource =
+            this.actor?.system instanceof foundry.abstract.DataModel && usesTrackableAttributes
+                ? this.actor?.type
+                : this.actor?.system;
+        const TokenDocument = foundry.utils.getDocumentClass('Token');
+        const attributes = TokenDocument.getTrackedAttributes(attributeSource);
+        return {
+            barAttributes: TokenDocument.getTrackedAttributeChoices(attributes, attributeSource),
+            bar1: token.getBarAttribute?.('bar1'),
+            bar2: token.getBarAttribute?.('bar2'),
+            turnMarkerModes: DhPrototypeTokenConfig.TURN_MARKER_MODES,
+            turnMarkerAnimations: CONFIG.Combat.settings.turnMarkerAnimations
         };
-
-    /**
-     * Process form submission for the sheet
-     * @this {PrototypeTokenConfig}
-     * @type {ApplicationFormSubmission}
-     */
-    static async #onSubmit(event, form, formData) {
-        const submitData = this._processFormData(event, form, formData);
-        submitData.detectionModes ??= []; // Clear detection modes array
-        this._processChanges(submitData);
-        const changes = { prototypeToken: submitData };
-
-        const changedTokenSizeValue = getActorSizeFromForm(this.element, this.actor);
-        if (changedTokenSizeValue) changes.system = { size: changedTokenSizeValue };
-
-        this.actor.validate({ changes, clean: true, fallback: false });
-        await this.actor.update(changes);
     }
 }

module/applications/sheets-configs/token-config-mixin.mjs

@@ -1,114 +0,0 @@
-export default function DHTokenConfigMixin(Base) {
-    class DHTokenConfigBase extends Base {
-        /** @override */
-        static PARTS = {
-            tabs: super.PARTS.tabs,
-            identity: super.PARTS.identity,
-            appearance: {
-                template: 'systems/daggerheart/templates/sheets-settings/token-config/appearance.hbs',
-                scrollable: ['']
-            },
-            vision: super.PARTS.vision,
-            light: super.PARTS.light,
-            resources: super.PARTS.resources,
-            footer: super.PARTS.footer
-        };
-
-        _attachPartListeners(partId, htmlElement, options) {
-            super._attachPartListeners(partId, htmlElement, options);
-
-            switch (partId) {
-                case 'appearance':
-                    htmlElement
-                        .querySelector('#dhTokenSize')
-                        ?.addEventListener('change', this.onTokenSizeChange.bind(this));
-                    break;
-            }
-        }
-
-        /** @inheritDoc */
-        async _prepareResourcesTab() {
-            const token = this.token;
-            const usesTrackableAttributes = !foundry.utils.isEmpty(CONFIG.Actor.trackableAttributes);
-            const attributeSource =
-                this.actor?.system instanceof foundry.abstract.DataModel && usesTrackableAttributes
-                    ? this.actor?.type
-                    : this.actor?.system;
-            const TokenDocument = foundry.utils.getDocumentClass('Token');
-            const attributes = TokenDocument.getTrackedAttributes(attributeSource);
-            return {
-                barAttributes: TokenDocument.getTrackedAttributeChoices(attributes, attributeSource),
-                bar1: token.getBarAttribute?.('bar1'),
-                bar2: token.getBarAttribute?.('bar2'),
-                turnMarkerModes: DHTokenConfigBase.TURN_MARKER_MODES,
-                turnMarkerAnimations: CONFIG.Combat.settings.turnMarkerAnimations
-            };
-        }
-
-        async _prepareAppearanceTab() {
-            const context = await super._prepareAppearanceTab();
-            context.tokenSizes = CONFIG.DH.ACTOR.tokenSize;
-            context.tokenSize = this.actor?.system?.size;
-            context.usesActorSize = this.actor?.system?.metadata?.usesSize;
-            context.actorSizeDisable = context.usesActorSize && this.actor.system.size !== 'custom';
-
-            return context;
-        }
-
-        /** @inheritDoc */
-        _previewChanges(changes) {
-            if (!changes || !this._preview) return;
-
-            const tokenSizeSelect = this.element?.querySelector('#dhTokenSize');
-            if (this.actor && tokenSizeSelect && tokenSizeSelect.value !== 'custom') {
-                const tokenSizes = game.settings.get(CONFIG.DH.id, CONFIG.DH.SETTINGS.gameSettings.Homebrew).tokenSizes;
-                const tokenSize = tokenSizes[tokenSizeSelect.value];
-                changes.width = tokenSize;
-                changes.height = tokenSize;
-            }
-
-            const deletions = { '-=actorId': null, '-=actorLink': null };
-            const mergeOptions = { inplace: false, performDeletions: true };
-            this._preview.updateSource(mergeObject(changes, deletions, mergeOptions));
-
-            if (this._preview?.object?.destroyed === false) {
-                this._preview.object.initializeSources();
-                this._preview.object.renderFlags.set({ refresh: true });
-            }
-        }
-
-        async onTokenSizeChange(event) {
-            const value = event.target.value;
-            const tokenSizeDimensions = this.element.querySelector('#tokenSizeDimensions');
-            if (tokenSizeDimensions) {
-                const disabled = value !== 'custom';
-
-                tokenSizeDimensions.dataset.tooltip = disabled
-                    ? game.i18n.localize('DAGGERHEART.APPLICATIONS.TokenConfig.actorSizeUsed')
-                    : '';
-
-                const disabledIcon = tokenSizeDimensions.querySelector('i');
-                if (disabledIcon) {
-                    disabledIcon.style.opacity = disabled ? '' : '0';
-                }
-
-                const dimensionsInputs = tokenSizeDimensions.querySelectorAll('.form-fields input');
-                for (const input of dimensionsInputs) {
-                    input.disabled = disabled;
-                }
-            }
-        }
-    }
-
-    return DHTokenConfigBase;
-}
-
-export function getActorSizeFromForm(element, actor) {
-    const tokenSizeSelect = element.querySelector('#dhTokenSize');
-    const isSizeDifferent = tokenSizeSelect?.value !== actor?.system?.size;
-    if (tokenSizeSelect && actor && isSizeDifferent) {
-        return tokenSizeSelect.value;
-    }
-
-    return null;
-}

module/applications/sheets-configs/token-config.mjs

@@ -1,11 +1,20 @@
-import DHTokenConfigMixin from './token-config-mixin.mjs';
-import { getActorSizeFromForm } from './token-config-mixin.mjs';
-
-export default class DhTokenConfig extends DHTokenConfigMixin(foundry.applications.sheets.TokenConfig) {
-    async _processSubmitData(event, form, submitData, options) {
-        const changedTokenSizeValue = getActorSizeFromForm(this.element, this.actor);
-        if (changedTokenSizeValue) this.token.actor.update({ 'system.size': changedTokenSizeValue });
-
-        super._processSubmitData(event, form, submitData, options);
+export default class DhTokenConfig extends foundry.applications.sheets.TokenConfig {
+    /** @inheritDoc */
+    async _prepareResourcesTab() {
+        const token = this.token;
+        const usesTrackableAttributes = !foundry.utils.isEmpty(CONFIG.Actor.trackableAttributes);
+        const attributeSource =
+            this.actor?.system instanceof foundry.abstract.DataModel && usesTrackableAttributes
+                ? this.actor?.type
+                : this.actor?.system;
+        const TokenDocument = foundry.utils.getDocumentClass('Token');
+        const attributes = TokenDocument.getTrackedAttributes(attributeSource);
+        return {
+            barAttributes: TokenDocument.getTrackedAttributeChoices(attributes, attributeSource),
+            bar1: token.getBarAttribute?.('bar1'),
+            bar2: token.getBarAttribute?.('bar2'),
+            turnMarkerModes: DhTokenConfig.TURN_MARKER_MODES,
+            turnMarkerAnimations: CONFIG.Combat.settings.turnMarkerAnimations
+        };
     }
 }

module/applications/sheets/actors/adversary.mjs

@@ -26,12 +26,7 @@ export default class AdversarySheet extends DHBaseActorSheet {
                 }
             ]
         },
-        dragDrop: [
-            {
-                dragSelector: '[data-item-id][draggable="true"], [data-item-id] [draggable="true"]',
-                dropSelector: null
-            }
-        ]
+        dragDrop: [{ dragSelector: '[data-item-id][draggable="true"]', dropSelector: null }]
     };
 
     static PARTS = {
@@ -93,13 +88,6 @@ export default class AdversarySheet extends DHBaseActorSheet {
         context.resources.stress.emptyPips =
             context.resources.stress.max < maxResource ? maxResource - context.resources.stress.max : 0;
 
-        const featureForms = ['passive', 'action', 'reaction'];
-        context.features = this.document.system.features.sort((a, b) =>
-            a.system.featureForm !== b.system.featureForm
-                ? featureForms.indexOf(a.system.featureForm) - featureForms.indexOf(b.system.featureForm)
-                : a.sort - b.sort
-        );
-
         return context;
     }
 
@@ -176,15 +164,6 @@ export default class AdversarySheet extends DHBaseActorSheet {
         });
     }
 
-    /** @inheritdoc */
-    async _onDragStart(event) {
-        const inventoryItem = event.currentTarget.closest('.inventory-item');
-        if (inventoryItem) {
-            event.dataTransfer.setDragImage(inventoryItem.querySelector('img'), 60, 0);
-        }
-        super._onDragStart(event);
-    }
-
     /* -------------------------------------------- */
     /*  Application Clicks Actions                  */
     /* -------------------------------------------- */

module/applications/sheets/actors/character.mjs

@@ -32,8 +32,7 @@ export default class CharacterSheet extends DHBaseActorSheet {
             handleResourceDice: CharacterSheet.#handleResourceDice,
             advanceResourceDie: CharacterSheet.#advanceResourceDie,
             cancelBeastform: CharacterSheet.#cancelBeastform,
-            useDowntime: this.useDowntime,
-            viewParty: CharacterSheet.#viewParty
+            useDowntime: this.useDowntime
         },
         window: {
             resizable: true,
@@ -47,7 +46,7 @@ export default class CharacterSheet extends DHBaseActorSheet {
         },
         dragDrop: [
             {
-                dragSelector: '[data-item-id][draggable="true"], [data-item-id] [draggable="true"]',
+                dragSelector: '[data-item-id][draggable="true"]',
                 dropSelector: null
             }
         ],
@@ -140,6 +139,10 @@ export default class CharacterSheet extends DHBaseActorSheet {
             element.addEventListener('change', this.updateItemResource.bind(this));
             element.addEventListener('click', e => e.stopPropagation());
         });
+        htmlElement.querySelectorAll('.inventory-item-quantity').forEach(element => {
+            element.addEventListener('change', this.updateItemQuantity.bind(this));
+            element.addEventListener('click', e => e.stopPropagation());
+        });
 
         // Add listener for armor marks input
         htmlElement.querySelectorAll('.armor-marks-input').forEach(element => {
@@ -319,45 +322,6 @@ export default class CharacterSheet extends DHBaseActorSheet {
                     ui.notifications.warn(game.i18n.localize('DAGGERHEART.UI.Notifications.loadoutMaxReached'));
                 }
             },
-            {
-                name: 'recall',
-                icon: 'fa-solid fa-bolt-lightning',
-                condition: target => {
-                    const doc = getDocFromElementSync(target);
-                    return doc && doc.system.inVault;
-                },
-                callback: async (target, event) => {
-                    const doc = await getDocFromElement(target);
-                    const actorLoadout = doc.actor.system.loadoutSlot;
-                    if (!actorLoadout.available) {
-                        ui.notifications.warn(game.i18n.localize('DAGGERHEART.UI.Notifications.loadoutMaxReached'));
-                        return;
-                    }
-                    if (doc.system.recallCost == 0) {
-                        return doc.update({ 'system.inVault': false });
-                    }
-                    const type = 'effect';
-                    const cls = game.system.api.models.actions.actionsTypes[type];
-                    const action = new cls(
-                        {
-                            ...cls.getSourceConfig(doc.system),
-                            type: type,
-                            chatDisplay: false,
-                            cost: [
-                                {
-                                    key: 'stress',
-                                    value: doc.system.recallCost
-                                }
-                            ]
-                        },
-                        { parent: doc.system }
-                    );
-                    const config = await action.use(event);
-                    if (config) {
-                        return doc.update({ 'system.inVault': false });
-                    }
-                }
-            },
             {
                 name: 'toVault',
                 icon: 'fa-solid fa-arrow-down',
@@ -629,6 +593,14 @@ export default class CharacterSheet extends DHBaseActorSheet {
         this.render();
     }
 
+    async updateItemQuantity(event) {
+        const item = await getDocFromElement(event.currentTarget);
+        if (!item) return;
+
+        await item.update({ 'system.quantity': event.currentTarget.value });
+        this.render();
+    }
+
     async updateArmorMarks(event) {
         const armor = this.document.system.armor;
         if (!armor) return;
@@ -712,27 +684,21 @@ export default class CharacterSheet extends DHBaseActorSheet {
             headerTitle: game.i18n.format('DAGGERHEART.UI.Chat.dualityRoll.abilityCheckTitle', {
                 ability: abilityLabel
             }),
-            effects: Array.from(await this.document.allApplicableEffects()),
             roll: {
-                trait: button.dataset.attribute,
-                type: 'trait'
+                trait: button.dataset.attribute
             },
-            hasRoll: true,
+            hasRoll: true
+        };
+        const result = await this.document.diceRoll({
+            ...config,
             actionType: 'action',
             headerTitle: `${game.i18n.localize('DAGGERHEART.GENERAL.dualityRoll')}: ${this.actor.name}`,
             title: game.i18n.format('DAGGERHEART.UI.Chat.dualityRoll.abilityCheckTitle', {
                 ability: abilityLabel
             })
-        };
-        const result = await this.document.diceRoll(config);
-        if (!result) return;
+        });
 
-        /* This could be avoided by baking config.costs into config.resourceUpdates. Didn't feel like messing with it at the time */
-        const costResources = result.costs
-            .filter(x => x.enabled)
-            .map(cost => ({ ...cost, value: -cost.value, total: -cost.total }));
-        config.resourceUpdates.addResources(costResources);
-        await config.resourceUpdates.updateResources();
+        if (result) game.system.api.fields.ActionFields.CostField.execute.call(this, result);
     }
 
     //TODO: redo toggleEquipItem method
@@ -830,7 +796,7 @@ export default class CharacterSheet extends DHBaseActorSheet {
     static async #toggleVault(_event, button) {
         const doc = await getDocFromElement(button);
         const { available } = this.document.system.loadoutSlot;
-        if (doc.system.inVault && !available && !doc.system.loadoutIgnore) {
+        if (doc.system.inVault && !available) {
             return ui.notifications.warn(game.i18n.localize('DAGGERHEART.UI.Notifications.loadoutMaxReached'));
         }
 
@@ -901,41 +867,6 @@ export default class CharacterSheet extends DHBaseActorSheet {
         game.system.api.fields.ActionFields.BeastformField.handleActiveTransformations.call(item);
     }
 
-    static async #viewParty(_, target) {
-        const parties = this.document.parties;
-        if (parties.size <= 1) {
-            parties.first()?.sheet.render({ force: true });
-            return;
-        }
-
-        const buttons = parties.map(p => {
-            const button = document.createElement('button');
-            button.type = 'button';
-            button.classList.add('plain');
-            const img = document.createElement('img');
-            img.src = p.img;
-            button.append(img);
-            const name = document.createElement('span');
-            name.textContent = p.name;
-            button.append(name);
-            button.addEventListener('click', () => {
-                p.sheet?.render({ force: true });
-                game.tooltip.dismissLockedTooltips();
-            });
-            return button;
-        });
-
-        const html = document.createElement('div');
-        html.classList.add('party-list');
-        html.append(...buttons);
-
-        game.tooltip.dismissLockedTooltips();
-        game.tooltip.activate(target, {
-            html,
-            locked: true
-        });
-    }
-
     /**
      *  Open the downtime application.
      * @type {ApplicationClickAction}
@@ -946,15 +877,6 @@ export default class CharacterSheet extends DHBaseActorSheet {
         });
     }
 
-    /** @inheritdoc */
-    async _onDragStart(event) {
-        const inventoryItem = event.currentTarget.closest('.inventory-item');
-        if (inventoryItem) {
-            event.dataTransfer.setDragImage(inventoryItem.querySelector('img'), 60, 0);
-        }
-        super._onDragStart(event);
-    }
-
     async _onDropItem(event, item) {
         if (this.document.uuid === item.parent?.uuid) {
             return super._onDropItem(event, item);

module/applications/sheets/actors/environment.mjs

@@ -25,12 +25,7 @@ export default class DhpEnvironment extends DHBaseActorSheet {
             toggleResourceDice: DhpEnvironment.#toggleResourceDice,
             handleResourceDice: DhpEnvironment.#handleResourceDice
         },
-        dragDrop: [
-            {
-                dragSelector: '[data-item-id][draggable="true"], [data-item-id] [draggable="true"]',
-                dropSelector: null
-            }
-        ]
+        dragDrop: [{ dragSelector: '.inventory-item', dropSelector: null }]
     };
 
     /**@override */
@@ -79,9 +74,6 @@ export default class DhpEnvironment extends DHBaseActorSheet {
             case 'header':
                 await this._prepareHeaderContext(context, options);
 
-                break;
-            case 'features':
-                await this._prepareFeaturesContext(context, options);
                 break;
             case 'notes':
                 await this._prepareNotesContext(context, options);
@@ -118,22 +110,6 @@ export default class DhpEnvironment extends DHBaseActorSheet {
         }
     }
 
-    /**
-     * Prepare render context for the features part.
-     * @param {ApplicationRenderContext} context
-     * @param {ApplicationRenderOptions} options
-     * @returns {Promise<void>}
-     * @protected
-     */
-    async _prepareFeaturesContext(context, _options) {
-        const featureForms = ['passive', 'action', 'reaction'];
-        context.features = this.document.system.features.sort((a, b) =>
-            a.system.featureForm !== b.system.featureForm
-                ? featureForms.indexOf(a.system.featureForm) - featureForms.indexOf(b.system.featureForm)
-                : a.sort - b.sort
-        );
-    }
-
     /**
      * Prepare render context for the Header part.
      * @param {ApplicationRenderContext} context

module/applications/sheets/actors/party.mjs

@@ -40,7 +40,7 @@ export default class Party extends DHBaseActorSheet {
             selectRefreshable: DaggerheartMenu.selectRefreshable,
             refreshActors: DaggerheartMenu.refreshActors
         },
-        dragDrop: [{ dragSelector: '[data-item-id]', dropSelector: null }]
+        dragDrop: [{ dragSelector: '[data-item-id][draggable="true"]', dropSelector: null }]
     };
 
     /**@override */

module/applications/sheets/api/application-mixin.mjs

@@ -178,79 +178,6 @@ export default function DHApplicationMixin(Base) {
         _attachPartListeners(partId, htmlElement, options) {
             super._attachPartListeners(partId, htmlElement, options);
             this._dragDrop.forEach(d => d.bind(htmlElement));
-
-            // Handle delta inputs
-            for (const deltaInput of htmlElement.querySelectorAll('input[data-allow-delta]')) {
-                deltaInput.dataset.numValue = deltaInput.value;
-                deltaInput.inputMode = 'numeric';
-
-                const handleUpdate = (delta = 0) => {
-                    const min = Number(deltaInput.min) || 0;
-                    const max = Number(deltaInput.max) || Infinity;
-                    const current = Number(deltaInput.dataset.numValue);
-                    const rawNumber = Number(deltaInput.value);
-                    if (Number.isNaN(rawNumber)) {
-                        deltaInput.value = delta ? Math.clamp(current + delta, min, max) : current;
-                        return;
-                    }
-
-                    const newValue =
-                        deltaInput.value.startsWith('+') || deltaInput.value.startsWith('-')
-                            ? Math.clamp(current + rawNumber + delta, min, max)
-                            : Math.clamp(rawNumber + delta, min, max);
-                    deltaInput.value = deltaInput.dataset.numValue = newValue;
-                };
-
-                // Force valid characters while inputting
-                deltaInput.addEventListener('input', () => {
-                    deltaInput.value = /[+=\-]?\d*/.exec(deltaInput.value)?.at(0) ?? deltaInput.value;
-                });
-
-                // Recreate Keyup/Keydown support
-                deltaInput.addEventListener('keydown', event => {
-                    const step = event.key === 'ArrowUp' ? 1 : event.key === 'ArrowDown' ? -1 : 0;
-                    if (step !== 0) {
-                        handleUpdate(step);
-                        deltaInput.dispatchEvent(new Event('change', { bubbles: true }));
-                    }
-                });
-
-                // Mousewheel while focused support
-                deltaInput.addEventListener(
-                    'wheel',
-                    event => {
-                        if (deltaInput === document.activeElement) {
-                            event.preventDefault();
-                            handleUpdate(Math.sign(-1 * event.deltaY));
-                            deltaInput.dispatchEvent(new Event('change', { bubbles: true }));
-                        }
-                    },
-                    { passive: false }
-                );
-
-                deltaInput.addEventListener('change', () => {
-                    handleUpdate();
-                });
-            }
-
-            // Handle contenteditable
-            for (const input of htmlElement.querySelectorAll('[contenteditable][data-property]')) {
-                const property = input.dataset.property;
-                input.addEventListener('blur', () => {
-                    const selection = document.getSelection();
-                    if (input.contains(selection.anchorNode)) {
-                        selection.empty();
-                    }
-                    this.document.update({ [property]: input.textContent });
-                });
-
-                input.addEventListener('keydown', event => {
-                    if (event.key === 'Enter') input.blur();
-                });
-
-                // Chrome sometimes add <br>, which aren't a problem for the value but are for the placeholder
-                input.addEventListener('input', () => input.querySelectorAll('br').forEach(i => i.remove()));
-            }
         }
 
         /**@inheritdoc */
@@ -398,8 +325,7 @@ export default function DHApplicationMixin(Base) {
             if (data.type === 'ActiveEffect' && data.fromInternal !== this.document.uuid) {
                 this.document.createEmbeddedDocuments('ActiveEffect', [data.data]);
             } else {
-                // Fallback to super, but note that item sheets do not have this function
-                return super._onDrop?.(event);
+                return super._onDrop(event);
             }
         }
 
@@ -505,7 +431,6 @@ export default function DHApplicationMixin(Base) {
                         const doc = await getDocFromElement(target),
                             action = doc?.system?.attack ?? doc;
                         const config = action.prepareConfig(event);
-                        config.effects = Array.from(await this.document.allApplicableEffects());
                         config.hasRoll = false;
                         return action && action.workflow.get('damage').execute(config, null, true);
                     }
@@ -586,9 +511,7 @@ export default function DHApplicationMixin(Base) {
                 if (!doc || !descriptionElement) continue;
 
                 // localize the description (idk if it's still necessary)
-                const description = doc.system?.getEnrichedDescription
-                    ? await doc.system.getEnrichedDescription()
-                    : game.i18n.localize(doc.system?.description ?? doc.description);
+                const description = game.i18n.localize(doc.system?.description ?? doc.description);
 
                 // Enrich the description and attach it;
                 const isAction = doc.documentName === 'Action';
@@ -739,7 +662,7 @@ export default function DHApplicationMixin(Base) {
             };
             if (inVault) data['system.inVault'] = true;
             if (disabled) data.disabled = true;
-            if (type === 'domainCard' && parent?.system.domains?.length) {
+            if (type === "domainCard" && parent?.system.domains?.length) {
                 data.system.domain = parent.system.domains[0];
             }
 

module/applications/sheets/api/base-actor.mjs

@@ -34,10 +34,7 @@ export default class DHBaseActorSheet extends DHApplicationMixin(ActorSheetV2) {
                 }
             }
         ],
-        dragDrop: [
-            { dragSelector: '.inventory-item[data-type="attack"]', dropSelector: null },
-            { dragSelector: ".currency[data-currency] .drag-handle", dropSelector: null }
-        ]
+        dragDrop: [{ dragSelector: '.inventory-item[data-type="attack"]', dropSelector: null }]
     };
 
     /* -------------------------------------------- */
@@ -92,7 +89,6 @@ export default class DHBaseActorSheet extends DHApplicationMixin(ActorSheetV2) {
                     value: context.source.system.gold[key]
                 };
             }
-            context.inventory.hasCurrency = Object.values(context.inventory.currencies).some((c) => c.enabled);
         }
 
         return context;
@@ -138,10 +134,6 @@ export default class DHBaseActorSheet extends DHApplicationMixin(ActorSheetV2) {
     _attachPartListeners(partId, htmlElement, options) {
         super._attachPartListeners(partId, htmlElement, options);
 
-        htmlElement.querySelectorAll('.inventory-item-quantity').forEach(element => {
-            element.addEventListener('change', this.updateItemQuantity.bind(this));
-            element.addEventListener('click', e => e.stopPropagation());
-        });
         htmlElement.querySelectorAll('.item-button .action-uses-button').forEach(element => {
             element.addEventListener('contextmenu', DHBaseActorSheet.#modifyActionUses);
         });
@@ -180,15 +172,6 @@ export default class DHBaseActorSheet extends DHApplicationMixin(ActorSheetV2) {
         return this._getContextMenuCommonOptions.call(this, { usable: true, toChat: true });
     }
 
-    /* -------------------------------------------- */
-    /*  Application Listener Actions                */
-    /* -------------------------------------------- */
-
-    async updateItemQuantity(event) {
-        const item = await getDocFromElement(event.currentTarget);
-        await item?.update({ 'system.quantity': event.currentTarget.value });
-    }
-
     /* -------------------------------------------- */
     /*  Application Clicks Actions                  */
     /* -------------------------------------------- */
@@ -257,35 +240,14 @@ export default class DHBaseActorSheet extends DHApplicationMixin(ActorSheetV2) {
     /*  Application Drag/Drop                       */
     /* -------------------------------------------- */
 
-    async _onDrop(event) {
-        event.stopPropagation();
-        const data = foundry.applications.ux.TextEditor.implementation.getDragEventData(event);
-        if (data.type === 'Currency' && ['character', 'party'].includes(this.document.type)) {
-            const originActor = await foundry.utils.fromUuid(data.originActor);
-            if (!originActor || originActor.uuid === this.document.uuid) return;
-            const currency = data.currency;
-            const quantity = await game.system.api.applications.dialogs.ItemTransferDialog.configure({
-                originActor,
-                targetActor: this.document,
-                currency
-            });
-            if (quantity) {
-                originActor.update({ [`system.gold.${currency}`]: Math.max(0, originActor.system.gold[currency] - quantity) });
-                this.document.update({ [`system.gold.${currency}`]: this.document.system.gold[currency] + quantity });
-            }
-            return;
-        }
-
-        return super._onDrop(event);
-    }
-
     async _onDropItem(event, item) {
         const data = foundry.applications.ux.TextEditor.implementation.getDragEventData(event);
+        const physicalActorTypes = ['character', 'party'];
         const originActor = item.actor;
         if (
             item.actor?.uuid === this.document.uuid ||
             !originActor ||
-            !['character', 'party'].includes(this.document.type)
+            !physicalActorTypes.includes(this.document.type)
         ) {
             return super._onDropItem(event, item);
         }
@@ -294,10 +256,10 @@ export default class DHBaseActorSheet extends DHApplicationMixin(ActorSheetV2) {
         if (item.system.metadata.isInventoryItem) {
             if (item.system.metadata.isQuantifiable) {
                 const actorItem = originActor.items.get(data.originId);
-                const quantityTransfered = await game.system.api.applications.dialogs.ItemTransferDialog.configure({
-                    item,
-                    targetActor: this.document
-                });
+                const quantityTransfered =
+                    actorItem.system.quantity === 1
+                        ? 1
+                        : await game.system.api.applications.dialogs.ItemTransferDialog.configure(item);
 
                 if (quantityTransfered) {
                     if (quantityTransfered === actorItem.system.quantity) {
@@ -338,16 +300,6 @@ export default class DHBaseActorSheet extends DHApplicationMixin(ActorSheetV2) {
      * @param {DragEvent} event - The drag event
      */
     async _onDragStart(event) {
-        // Handle drag/dropping currencies
-        const currencyEl = event.currentTarget.closest(".currency[data-currency]");
-        if (currencyEl) {
-            const currency = currencyEl.dataset.currency;
-            const data = { type: 'Currency', currency, originActor: this.document.uuid };
-            event.dataTransfer.setData('text/plain', JSON.stringify(data));
-            return;
-        }
-
-        // Handle drag/dropping attacks
         const attackItem = event.currentTarget.closest('.inventory-item[data-type="attack"]');
         if (attackItem) {
             const attackData = {

module/applications/sheets/api/base-item.mjs

@@ -76,10 +76,16 @@ export default class DHBaseItemSheet extends DHApplicationMixin(ItemSheetV2) {
     /**@inheritdoc */
     async _preparePartContext(partId, context, options) {
         await super._preparePartContext(partId, context, options);
+        const { TextEditor } = foundry.applications.ux;
 
         switch (partId) {
             case 'description':
-                context.enrichedDescription = await this.document.system.getEnrichedDescription();
+                const value = foundry.utils.getProperty(this.document, 'system.description') ?? '';
+                context.enrichedDescription = await TextEditor.enrichHTML(value, {
+                    relativeTo: this.item,
+                    rollData: this.item.getRollData(),
+                    secrets: this.item.isOwner
+                });
                 break;
             case 'effects':
                 await this._prepareEffectsContext(context, options);

module/applications/sheets/items/beastform.mjs

@@ -77,7 +77,6 @@ export default class BeastformSheet extends DHBaseItemSheet {
                         name: context.document.system.advantageOn[key].value
                     }))
                 );
-                context.dimensionsDisabled = context.document.system.tokenSize.size !== 'custom';
                 break;
             case 'effects':
                 context.effects.actives = context.effects.actives.map(effect => {

module/applications/sheets/items/feature.mjs

@@ -31,11 +31,4 @@ export default class FeatureSheet extends DHBaseItemSheet {
             labelPrefix: 'DAGGERHEART.GENERAL.Tabs'
         }
     };
-//Might be wrong location but testing out if here is okay.
-    /**@override */
-    async _prepareContext(options) {
-        const context = await super._prepareContext(options);
-        context.featureFormChoices = CONFIG.DH.ITEM.featureForm;
-        return context;
-    }
 }

module/applications/sidebar/tabs/actorDirectory.mjs

@@ -17,30 +17,4 @@ export default class DhActorDirectory extends foundry.applications.sidebar.tabs.
                   : null;
         };
     }
-
-    /** @inheritDoc */
-    _onDragStart(event) {
-        let actor;
-        const { entryId } = event.currentTarget.dataset;
-        if (entryId) {
-            actor = this.collection.get(entryId);
-            if (!actor?.visible) return false;
-        }
-        super._onDragStart(event);
-
-        // Create the drag preview.
-        if (actor && canvas.ready) {
-            const img = event.currentTarget.querySelector('img');
-            const pt = actor.prototypeToken;
-            const usesSize = actor.system.metadata.usesSize;
-            const tokenSizes = game.settings.get(CONFIG.DH.id, CONFIG.DH.SETTINGS.gameSettings.Homebrew).tokenSizes;
-            const width = usesSize ? tokenSizes[actor.system.size] : pt.width;
-            const height = usesSize ? tokenSizes[actor.system.size] : pt.height;
-
-            const w = width * canvas.dimensions.size * Math.abs(pt.texture.scaleX) * canvas.stage.scale.x;
-            const h = height * canvas.dimensions.size * Math.abs(pt.texture.scaleY) * canvas.stage.scale.y;
-            const preview = foundry.applications.ux.DragDrop.implementation.createDragImage(img, w, h);
-            event.dataTransfer.setDragImage(preview, w / 2, h / 2);
-        }
-    }
 }

module/applications/ui/_module.mjs

@@ -5,5 +5,4 @@ export { default as DhCombatTracker } from './combatTracker.mjs';
 export { default as DhEffectsDisplay } from './effectsDisplay.mjs';
 export { default as DhFearTracker } from './fearTracker.mjs';
 export { default as DhHotbar } from './hotbar.mjs';
-export { default as DhSceneNavigation } from './sceneNavigation.mjs';
 export { ItemBrowser } from './itemBrowser.mjs';

module/applications/ui/chatLog.mjs

@@ -55,28 +55,27 @@ export default class DhpChatLog extends foundry.applications.sidebar.tabs.ChatLo
         ];
     }
 
-    addChatListeners = async (document, html, data) => {
-        const message = data?.message ?? document.toObject(false);
+    addChatListeners = async (app, html, data) => {
         html.querySelectorAll('.simple-roll-button').forEach(element =>
-            element.addEventListener('click', event => this.onRollSimple(event, message))
+            element.addEventListener('click', event => this.onRollSimple(event, data.message))
         );
         html.querySelectorAll('.ability-use-button').forEach(element =>
-            element.addEventListener('click', event => this.abilityUseButton(event, message))
+            element.addEventListener('click', event => this.abilityUseButton(event, data.message))
         );
         html.querySelectorAll('.action-use-button').forEach(element =>
-            element.addEventListener('click', event => this.actionUseButton(event, message))
+            element.addEventListener('click', event => this.actionUseButton(event, data.message))
         );
         html.querySelectorAll('.reroll-button').forEach(element =>
-            element.addEventListener('click', event => this.rerollEvent(event, message))
+            element.addEventListener('click', event => this.rerollEvent(event, data.message))
         );
         html.querySelectorAll('.group-roll-button').forEach(element =>
-            element.addEventListener('click', event => this.groupRollButton(event, message))
+            element.addEventListener('click', event => this.groupRollButton(event, data.message))
         );
         html.querySelectorAll('.group-roll-reroll').forEach(element =>
-            element.addEventListener('click', event => this.groupRollReroll(event, message))
+            element.addEventListener('click', event => this.groupRollReroll(event, data.message))
         );
         html.querySelectorAll('.group-roll-success').forEach(element =>
-            element.addEventListener('click', event => this.groupRollSuccessEvent(event, message))
+            element.addEventListener('click', event => this.groupRollSuccessEvent(event, data.message))
         );
         html.querySelectorAll('.group-roll-header-expand-section').forEach(element =>
             element.addEventListener('click', this.groupRollExpandSection)
@@ -134,9 +133,7 @@ export default class DhpChatLog extends foundry.applications.sidebar.tabs.ChatLo
 
     async actionUseButton(event, message) {
         const { moveIndex, actionIndex, movePath } = event.currentTarget.dataset;
-        const targetUuid = event.currentTarget.closest('.action-use-button-parent').querySelector('select')?.value;
-        const parent = await foundry.utils.fromUuid(targetUuid || message.system.actor);
-
+        const parent = await foundry.utils.fromUuid(message.system.actor);
         const actionType = message.system.moves[moveIndex].actions[actionIndex];
         const cls = game.system.api.models.actions.actionsTypes[actionType.type];
         const action = new cls(
@@ -148,8 +145,7 @@ export default class DhpChatLog extends foundry.applications.sidebar.tabs.ChatLo
                     type: CONFIG.DH.ITEM.originItemType.restMove,
                     itemPath: movePath,
                     actionIndex: actionIndex
-                },
-                targetUuid: targetUuid
+                }
             },
             { parent: parent.system }
         );
@@ -249,6 +245,7 @@ export default class DhpChatLog extends foundry.applications.sidebar.tabs.ChatLo
         });
 
         if (!result) return;
+        await game.system.api.fields.ActionFields.CostField.execute.call({ actor }, result);
 
         const newMessageData = foundry.utils.deepClone(message.system);
         foundry.utils.setProperty(newMessageData, `${path}.result`, result.roll);

module/applications/ui/combatTracker.mjs

@@ -5,7 +5,8 @@ export default class DhCombatTracker extends foundry.applications.sidebar.tabs.C
         actions: {
             requestSpotlight: this.requestSpotlight,
             toggleSpotlight: this.toggleSpotlight,
-            setActionTokens: this.setActionTokens
+            setActionTokens: this.setActionTokens,
+            openCountdowns: this.openCountdowns
         }
     };
 
@@ -41,13 +42,13 @@ export default class DhCombatTracker extends foundry.applications.sidebar.tabs.C
         const modifierBP =
             this.combats
                 .find(x => x.active)
-                ?.system?.extendedBattleToggles?.reduce((acc, toggle) => (acc ?? 0) + toggle.category, null) ?? null;
+                ?.system?.extendedBattleToggles?.reduce((acc, toggle) => acc + toggle.category, 0) ?? 0;
         const maxBP = CONFIG.DH.ENCOUNTER.BaseBPPerEncounter(context.characters.length) + modifierBP;
         const currentBP = AdversaryBPPerEncounter(context.adversaries, context.characters);
 
         Object.assign(context, {
             fear: game.settings.get(CONFIG.DH.id, CONFIG.DH.SETTINGS.gameSettings.Resources.Fear),
-            battlepoints: { max: maxBP, current: currentBP, hasModifierBP: modifierBP !== null }
+            battlepoints: { max: maxBP, current: currentBP, hasModifierBP: Boolean(modifierBP) }
         });
     }
 
@@ -56,26 +57,21 @@ export default class DhCombatTracker extends foundry.applications.sidebar.tabs.C
 
         const adversaries = context.turns?.filter(x => x.isNPC) ?? [];
         const characters = context.turns?.filter(x => !x.isNPC) ?? [];
-        const spotlightQueueEnabled = game.settings.get(
-            CONFIG.DH.id,
-            CONFIG.DH.SETTINGS.gameSettings.SpotlightRequestQueue
-        );
 
         const spotlightRequests = characters
-            ?.filter(x => !x.isNPC && spotlightQueueEnabled)
+            ?.filter(x => !x.isNPC)
             .filter(x => x.system.spotlight.requestOrderIndex > 0)
             .sort((a, b) => {
                 const valueA = a.system.spotlight.requestOrderIndex;
                 const valueB = b.system.spotlight.requestOrderIndex;
+
                 return valueA - valueB;
             });
 
         Object.assign(context, {
             actionTokens: game.settings.get(CONFIG.DH.id, CONFIG.DH.SETTINGS.gameSettings.variantRules).actionTokens,
             adversaries,
-            characters: characters
-                ?.filter(x => !x.isNPC)
-                .filter(x => !spotlightQueueEnabled || x.system.spotlight.requestOrderIndex == 0),
+            characters: characters?.filter(x => !x.isNPC).filter(x => x.system.spotlight.requestOrderIndex == 0),
             spotlightRequests
         });
     }
@@ -127,7 +123,7 @@ export default class DhCombatTracker extends foundry.applications.sidebar.tabs.C
             resource,
             active: index === combat.turn,
             canPing: combatant.sceneId === canvas.scene?.id && game.user.hasPermission('PING_CANVAS'),
-            type: combatant.actor?.system?.type,
+            type: combatant.actor.system.type,
             img: await this._getCombatantThumbnail(combatant)
         };
 
@@ -165,13 +161,9 @@ export default class DhCombatTracker extends foundry.applications.sidebar.tabs.C
 
         if (this.viewed.turn !== toggleTurn) {
             const { updateCountdowns } = game.system.api.applications.ui.DhCountdowns;
-            if (combatant.actor?.type === 'character') {
-                await updateCountdowns(
-                    CONFIG.DH.GENERAL.countdownProgressionTypes.spotlight.id,
-                    CONFIG.DH.GENERAL.countdownProgressionTypes.characterSpotlight.id
-                );
-            } else {
             await updateCountdowns(CONFIG.DH.GENERAL.countdownProgressionTypes.spotlight.id);
+            if (combatant.actor.type === 'character') {
+                await updateCountdowns(CONFIG.DH.GENERAL.countdownProgressionTypes.characterSpotlight.id);
             }
 
             const autoPoints = game.settings.get(CONFIG.DH.id, CONFIG.DH.SETTINGS.gameSettings.Automation).actionPoints;

module/applications/ui/countdowns.mjs

@@ -245,20 +245,14 @@ export default class DhCountdowns extends HandlebarsApplicationMixin(Application
         return super.close(options);
     }
 
-    /**
-     * Sends updates of the countdowns to the GM player. Since this is asynchronous, be sure to
-     * update all the countdowns at the same time.
-     *
-     * @param  {...any} progressTypes Countdowns to be updated
-     */
-    static async updateCountdowns(...progressTypes) {
+    static async updateCountdowns(progressType) {
         const { countdownAutomation } = game.settings.get(CONFIG.DH.id, CONFIG.DH.SETTINGS.gameSettings.Automation);
         if (!countdownAutomation) return;
 
         const countdownSetting = game.settings.get(CONFIG.DH.id, CONFIG.DH.SETTINGS.gameSettings.Countdowns);
         const updatedCountdowns = Object.keys(countdownSetting.countdowns).reduce((acc, key) => {
             const countdown = countdownSetting.countdowns[key];
-            if (progressTypes.indexOf(countdown.progress.type) !== -1 && countdown.progress.current > 0) {
+            if (countdown.progress.type === progressType && countdown.progress.current > 0) {
                 acc.push(key);
             }
 
@@ -266,7 +260,7 @@ export default class DhCountdowns extends HandlebarsApplicationMixin(Application
         }, []);
 
         const countdownData = countdownSetting.toObject();
-        const settings = {
+        await game.settings.set(CONFIG.DH.id, CONFIG.DH.SETTINGS.gameSettings.Countdowns, {
             ...countdownData,
             countdowns: Object.keys(countdownData.countdowns).reduce((acc, key) => {
                 const countdown = foundry.utils.deepClone(countdownData.countdowns[key]);
@@ -277,12 +271,14 @@ export default class DhCountdowns extends HandlebarsApplicationMixin(Application
                 acc[key] = countdown;
                 return acc;
             }, {})
-        };
-        await emitAsGM(GMUpdateEvent.UpdateCountdowns,
-            DhCountdowns.gmSetSetting.bind(settings),
-            settings, null, {
-                refreshType: RefreshType.Countdown
         });
+
+        const data = { refreshType: RefreshType.Countdown };
+        await game.socket.emit(`system.${CONFIG.DH.id}`, {
+            action: socketEvent.Refresh,
+            data
+        });
+        Hooks.callAll(socketEvent.Refresh, data);
     }
 
     async _onRender(context, options) {

module/applications/ui/effectsDisplay.mjs

@@ -87,7 +87,7 @@ export default class DhEffectsDisplay extends HandlebarsApplicationMixin(Applica
     async removeEffect(event) {
         const element = event.target.closest('.effect-container');
         const effects = DhEffectsDisplay.getTokenEffects();
-        const effect = effects.find(x => x.id === element.dataset.effectId);
+        const effect = effects.find(x => x.id === element.id);
         await effect.delete();
         this.render();
     }

module/applications/ui/itemBrowser.mjs

@@ -230,14 +230,6 @@ export class ItemBrowser extends HandlebarsApplicationMixin(ApplicationV2) {
                 result.flatMap(r => r),
                 'name'
             );
-
-            /* If any noticeable slowdown occurs, consider replacing with enriching description on clicking to expand descriptions */
-            for (const item of this.items) {
-                item.system.enrichedDescription =
-                    (await item.system.getEnrichedDescription?.()) ??
-                    (await foundry.applications.ux.TextEditor.implementation.enrichHTML(item.description));
-            }
-
             this.fieldFilter = this._createFieldFilter();
 
             if (this.presets?.filter) {

module/applications/ui/sceneNavigation.mjs

@@ -1,89 +0,0 @@
-import { emitAsGM, GMUpdateEvent } from '../../systemRegistration/socket.mjs';
-
-export default class DhSceneNavigation extends foundry.applications.ui.SceneNavigation {
-    /** @inheritdoc */
-    static DEFAULT_OPTIONS = {
-        ...super.DEFAULT_OPTIONS,
-        classes: ['faded-ui', 'flexcol', 'scene-navigation'],
-        actions: {
-            openSceneEnvironment: DhSceneNavigation.#openSceneEnvironment
-        }
-    };
-
-    /** @inheritdoc */
-    static PARTS = {
-        scenes: {
-            root: true,
-            template: 'systems/daggerheart/templates/ui/sceneNavigation/scene-navigation.hbs'
-        }
-    };
-
-    /** @inheritdoc */
-    async _prepareContext(options) {
-        const context = await super._prepareContext(options);
-
-        const extendScenes = scenes =>
-            scenes.map(x => {
-                const scene = game.scenes.get(x.id);
-                if (!scene.flags.daggerheart) return x;
-
-                const daggerheartInfo = new game.system.api.data.scenes.DHScene(scene.flags.daggerheart);
-                const environments = daggerheartInfo.sceneEnvironments.filter(
-                    x => x && x.testUserPermission(game.user, 'LIMITED')
-                );
-                const hasEnvironments = environments.length > 0 && x.isView;
-                return {
-                    ...x,
-                    hasEnvironments,
-                    environmentImage: hasEnvironments ? environments[0].img : null,
-                    environments: environments
-                };
-            });
-        context.scenes.active = extendScenes(context.scenes.active);
-        context.scenes.inactive = extendScenes(context.scenes.inactive);
-
-        return context;
-    }
-
-    static async #openSceneEnvironment(event, button) {
-        const scene = game.scenes.get(button.dataset.sceneId);
-        const sceneEnvironments = new game.system.api.data.scenes.DHScene(
-            scene.flags.daggerheart
-        ).sceneEnvironments.filter(x => x.testUserPermission(game.user, 'LIMITED'));
-
-        if (sceneEnvironments.length === 1 || event.shiftKey) {
-            sceneEnvironments[0].sheet.render(true);
-        } else {
-            new foundry.applications.ux.ContextMenu.implementation(
-                button,
-                '.scene-environment',
-                sceneEnvironments.map(environment => ({
-                    name: environment.name,
-                    callback: () => {
-                        if (scene.flags.daggerheart.sceneEnvironments[0] !== environment.uuid) {
-                            const newEnvironments = scene.flags.daggerheart.sceneEnvironments;
-                            const newFirst = newEnvironments.splice(
-                                newEnvironments.findIndex(x => x === environment.uuid)
-                            )[0];
-                            newEnvironments.unshift(newFirst);
-                            emitAsGM(
-                                GMUpdateEvent.UpdateDocument,
-                                scene.update.bind(scene),
-                                { 'flags.daggerheart.sceneEnvironments': newEnvironments },
-                                scene.uuid
-                            );
-                        }
-
-                        environment.sheet.render({ force: true });
-                    }
-                })),
-                {
-                    jQuery: false,
-                    fixed: true
-                }
-            );
-
-            CONFIG.ux.ContextMenu.triggerContextMenu(event, '.scene-environment');
-        }
-    }
-}

module/applications/ux/contextMenu.mjs

@@ -96,11 +96,11 @@ export default class DHContextMenu extends foundry.applications.ux.ContextMenu {
      * Trigger a context menu event in response to a normal click on a additional options button.
      * @param {PointerEvent} event
      */
-    static triggerContextMenu(event, altSelector) {
+    static triggerContextMenu(event) {
         event.preventDefault();
         event.stopPropagation();
         const { clientX, clientY } = event;
-        const selector = altSelector ?? '[data-item-uuid]';
+        const selector = '[data-item-uuid]';
         const target = event.target.closest(selector) ?? event.currentTarget.closest(selector);
         target?.dispatchEvent(
             new PointerEvent('contextmenu', {

module/canvas/_module.mjs

@@ -1,2 +1 @@
 export * as placeables from './placeables/_module.mjs';
-export { default as DhTokenLayer } from './tokens.mjs';

module/canvas/placeables/token.mjs

@@ -1,12 +1,4 @@
 export default class DhTokenPlaceable extends foundry.canvas.placeables.Token {
-    /** @inheritdoc */
-    async _draw(options) {
-        await super._draw(options);
-
-        if (this.document.flags.daggerheart?.createPlacement)
-            this.previewHelp ||= this.addChild(this.#drawPreviewHelp());
-    }
-
     /** @inheritDoc */
     async _drawEffects() {
         this.effects.renderable = false;
@@ -42,69 +34,6 @@ export default class DhTokenPlaceable extends foundry.canvas.placeables.Token {
         this.renderFlags.set({ refreshEffects: true });
     }
 
-    /**
-     * Returns the distance from this token to another token object.
-     * This value is corrected to handle alternate token sizes and other grid types
-     * according to the diagonal rules.
-     */
-    distanceTo(target) {
-        if (!canvas.ready) return NaN;
-        if (this === target) return 0;
-
-        const originPoint = this.center;
-        const destinationPoint = target.center;
-
-        // Compute for gridless. This version returns circular edge to edge + grid distance,
-        // so that tokens that are touching return 5.
-        if (canvas.grid.type === CONST.GRID_TYPES.GRIDLESS) {
-            const boundsCorrection = canvas.grid.distance / canvas.grid.size;
-            const originRadius = (this.bounds.width * boundsCorrection) / 2;
-            const targetRadius = (target.bounds.width * boundsCorrection) / 2;
-            const distance = canvas.grid.measurePath([originPoint, destinationPoint]).distance;
-            return distance - originRadius - targetRadius + canvas.grid.distance;
-        }
-
-        // Compute what the closest grid space of each token is, then compute that distance
-        const originEdge = this.#getEdgeBoundary(this.bounds, originPoint, destinationPoint);
-        const targetEdge = this.#getEdgeBoundary(target.bounds, originPoint, destinationPoint);
-        const adjustedOriginPoint = canvas.grid.getTopLeftPoint({
-            x: originEdge.x + Math.sign(originPoint.x - originEdge.x),
-            y: originEdge.y + Math.sign(originPoint.y - originEdge.y)
-        });
-        const adjustDestinationPoint = canvas.grid.getTopLeftPoint({
-            x: targetEdge.x + Math.sign(destinationPoint.x - targetEdge.x),
-            y: targetEdge.y + Math.sign(destinationPoint.y - targetEdge.y)
-        });
-        return canvas.grid.measurePath([adjustedOriginPoint, adjustDestinationPoint]).distance;
-    }
-
-    /** Returns the point at which a line starting at origin and ending at destination intersects the edge of the bounds */
-    #getEdgeBoundary(bounds, originPoint, destinationPoint) {
-        const points = [
-            { x: bounds.x, y: bounds.y },
-            { x: bounds.x + bounds.width, y: bounds.y },
-            { x: bounds.x + bounds.width, y: bounds.y + bounds.height },
-            { x: bounds.x, y: bounds.y + bounds.height }
-        ];
-        const pairsToTest = [
-            [points[0], points[1]],
-            [points[1], points[2]],
-            [points[2], points[3]],
-            [points[3], points[0]]
-        ];
-        for (const pair of pairsToTest) {
-            const result = foundry.utils.lineSegmentIntersection(originPoint, destinationPoint, pair[0], pair[1]);
-            if (result) return result;
-        }
-
-        return null;
-    }
-
-    /** Tests if the token is at least adjacent with another, with some leeway for diagonals */
-    isAdjacentWith(token) {
-        return this.distanceTo(token) <= canvas.grid.distance * 1.5;
-    }
-
     /** @inheritDoc */
     _drawBar(number, bar, data) {
         const val = Number(data.value);
@@ -140,25 +69,4 @@ export default class DhTokenPlaceable extends foundry.canvas.placeables.Token {
         bar.position.set(0, posY);
         return true;
     }
-
-    /**
-     * Draw a helptext for previews as a text object
-     * @returns {PreciseText}    The Text object for the preview helper
-     */
-    #drawPreviewHelp() {
-        const { uiScale } = canvas.dimensions;
-
-        const textStyle = CONFIG.canvasTextStyle.clone();
-        textStyle.fontSize = 18;
-        textStyle.wordWrapWidth = this.w * 2.5;
-        textStyle.fontStyle = 'italic';
-
-        const helpText = new foundry.canvas.containers.PreciseText(
-            `(${game.i18n.localize('DAGGERHEART.UI.Tooltip.previewTokenHelp')})`,
-            textStyle
-        );
-        helpText.anchor.set(helpText.width / 900, 1);
-        helpText.scale.set(uiScale, uiScale);
-        return helpText;
-    }
 }

module/canvas/tokens.mjs

@@ -1,16 +0,0 @@
-export default class DhTokenLayer extends foundry.canvas.layers.TokenLayer {
-    async _createPreview(createData, options) {
-        if (options.actor) {
-            const tokenSizes = game.settings.get(CONFIG.DH.id, CONFIG.DH.SETTINGS.gameSettings.Homebrew).tokenSizes;
-            if (options.actor?.system.metadata.usesSize) {
-                const tokenSize = tokenSizes[options.actor.system.size];
-                if (tokenSize && options.actor.system.size !== CONFIG.DH.ACTOR.tokenSize.custom.id) {
-                    createData.width = tokenSize;
-                    createData.height = tokenSize;
-                }
-            }
-        }
-
-        return super._createPreview(createData, options);
-    }
-}

module/config/_module.mjs

@@ -10,4 +10,3 @@ export * as itemConfig from './itemConfig.mjs';
 export * as settingsConfig from './settingsConfig.mjs';
 export * as systemConfig from './system.mjs';
 export * as itemBrowserConfig from './itemBrowserConfig.mjs';
-export * as triggerConfig from './triggerConfig.mjs';

module/config/actionConfig.mjs

@@ -2,7 +2,7 @@ export const actionTypes = {
     attack: {
         id: 'attack',
         name: 'DAGGERHEART.ACTIONS.TYPES.attack.name',
-        icon: 'fa-hand-fist',
+        icon: 'fa-khanda',
         tooltip: 'DAGGERHEART.ACTIONS.TYPES.attack.tooltip'
     },
     countdown: {

module/config/actorConfig.mjs

@@ -211,44 +211,6 @@ export const adversaryTraits = {
     }
 };
 
-export const tokenSize = {
-    custom: {
-        id: 'custom',
-        value: 0,
-        label: 'DAGGERHEART.GENERAL.custom'
-    },
-    tiny: {
-        id: 'tiny',
-        value: 1,
-        label: 'DAGGERHEART.CONFIG.TokenSize.tiny'
-    },
-    small: {
-        id: 'small',
-        value: 2,
-        label: 'DAGGERHEART.CONFIG.TokenSize.small'
-    },
-    medium: {
-        id: 'medium',
-        value: 3,
-        label: 'DAGGERHEART.CONFIG.TokenSize.medium'
-    },
-    large: {
-        id: 'large',
-        value: 4,
-        label: 'DAGGERHEART.CONFIG.TokenSize.large'
-    },
-    huge: {
-        id: 'huge',
-        value: 5,
-        label: 'DAGGERHEART.CONFIG.TokenSize.huge'
-    },
-    gargantuan: {
-        id: 'gargantuan',
-        value: 6,
-        label: 'DAGGERHEART.CONFIG.TokenSize.gargantuan'
-    }
-};
-
 export const levelChoices = {
     attributes: {
         name: 'attributes',

module/config/encounterConfig.mjs

@@ -9,7 +9,7 @@ export const AdversaryBPPerEncounter = (adversaries, characters) => {
             );
             if (existingEntry) {
                 existingEntry.nr += 1;
-            } else if (adversary.type) {
+            } else {
                 acc.push({ adversary, nr: 1 });
             }
             return acc;
@@ -21,7 +21,7 @@ export const AdversaryBPPerEncounter = (adversaries, characters) => {
             if (type.partyAmountPerBP) {
                 acc += characters.length === 0 ? 0 : Math.ceil(entry.nr / characters.length);
             } else {
-                acc += bpCost * entry.nr;
+                acc += bpCost;
             }
 
             return acc;
@@ -84,7 +84,6 @@ export const BPModifiers = {
         increaseDamage: {
             sort: 2,
             description: 'DAGGERHEART.CONFIG.BPModifiers.increaseDamage.description',
-            effectTargetTypes: ['adversary'],
             effects: [
                 {
                     name: 'DAGGERHEART.CONFIG.BPModifiers.increaseDamage.effect.name',

module/config/generalConfig.mjs

@@ -232,7 +232,7 @@ export const defaultRestOptions = {
                     actionType: 'action',
                     chatDisplay: false,
                     target: {
-                        type: 'friendly'
+                        type: 'self'
                     },
                     damage: {
                         parts: [
@@ -298,7 +298,7 @@ export const defaultRestOptions = {
                     actionType: 'action',
                     chatDisplay: false,
                     target: {
-                        type: 'friendly'
+                        type: 'self'
                     },
                     damage: {
                         parts: [
@@ -341,7 +341,7 @@ export const defaultRestOptions = {
                     actionType: 'action',
                     chatDisplay: false,
                     target: {
-                        type: 'friendly'
+                        type: 'self'
                     },
                     damage: {
                         parts: [
@@ -407,7 +407,7 @@ export const defaultRestOptions = {
                     actionType: 'action',
                     chatDisplay: false,
                     target: {
-                        type: 'friendly'
+                        type: 'self'
                     },
                     damage: {
                         parts: [
@@ -496,8 +496,6 @@ export const diceTypes = {
     d20: 'd20'
 };
 
-export const dieFaces = [4, 6, 8, 10, 12, 20];
-
 export const multiplierTypes = {
     prof: 'Proficiency',
     cast: 'Spellcast',

module/config/hooksConfig.mjs

@@ -1,3 +1,5 @@
-export const hooksConfig = {
+const hooksConfig = {
     effectDisplayToggle: 'DHEffectDisplayToggle'
 };
+
+export default hooksConfig;

module/config/itemConfig.mjs

@@ -5,6 +5,7 @@ export const armorFeatures = {
         actions: [
             {
                 type: 'damage',
+                actionType: 'action',
                 chatDisplay: true,
                 name: 'DAGGERHEART.CONFIG.ArmorFeature.burning.actions.burn.name',
                 description: 'DAGGERHEART.CONFIG.ArmorFeature.burning.actions.burn.description',
@@ -173,6 +174,7 @@ export const armorFeatures = {
         actions: [
             {
                 type: 'effect',
+                actionType: 'action',
                 chatDisplay: true,
                 name: 'DAGGERHEART.CONFIG.ArmorFeature.hopeful.actions.hope.name',
                 description: 'DAGGERHEART.CONFIG.ArmorFeature.hopeful.actions.hope.description',
@@ -186,6 +188,7 @@ export const armorFeatures = {
         actions: [
             {
                 type: 'effect',
+                actionType: 'action',
                 chatDisplay: true,
                 name: 'DAGGERHEART.CONFIG.ArmorFeature.impenetrable.actions.impenetrable.name',
                 description: 'DAGGERHEART.CONFIG.ArmorFeature.impenetrable.actions.impenetrable.description',
@@ -228,6 +231,7 @@ export const armorFeatures = {
         actions: [
             {
                 type: 'effect',
+                actionType: 'action',
                 chatDisplay: true,
                 name: 'DAGGERHEART.CONFIG.ArmorFeature.painful.actions.pain.name',
                 description: 'DAGGERHEART.CONFIG.ArmorFeature.painful.actions.pain.description',
@@ -265,6 +269,7 @@ export const armorFeatures = {
         actions: [
             {
                 type: 'effect',
+                actionType: 'action',
                 chatDisplay: true,
                 name: 'DAGGERHEART.CONFIG.ArmorFeature.quiet.actions.quiet.name',
                 description: 'DAGGERHEART.CONFIG.ArmorFeature.quiet.actions.quiet.description',
@@ -301,6 +306,7 @@ export const armorFeatures = {
         actions: [
             {
                 type: 'attack',
+                actionType: 'action',
                 chatDisplay: true,
                 name: 'DAGGERHEART.CONFIG.ArmorFeature.resilient.actions.resilient.name',
                 description: 'DAGGERHEART.CONFIG.ArmorFeature.resilient.actions.resilient.description',
@@ -347,6 +353,7 @@ export const armorFeatures = {
         actions: [
             {
                 type: 'effect',
+                actionType: 'action',
                 chatDisplay: true,
                 name: 'DAGGERHEART.CONFIG.ArmorFeature.shifting.actions.shift.name',
                 description: 'DAGGERHEART.CONFIG.ArmorFeature.shifting.actions.shift.description',
@@ -366,6 +373,7 @@ export const armorFeatures = {
         actions: [
             {
                 type: 'attack',
+                actionType: 'action',
                 chatDisplay: true,
                 name: 'DAGGERHEART.CONFIG.ArmorFeature.timeslowing.actions.slowTime.name',
                 description: 'DAGGERHEART.CONFIG.ArmorFeature.timeslowing.actions.slowTime.description',
@@ -393,6 +401,7 @@ export const armorFeatures = {
         actions: [
             {
                 type: 'effect',
+                actionType: 'action',
                 chatDisplay: true,
                 name: 'DAGGERHEART.CONFIG.ArmorFeature.truthseeking.actions.truthseeking.name',
                 description: 'DAGGERHEART.CONFIG.ArmorFeature.truthseeking.actions.truthseeking.description',
@@ -435,8 +444,7 @@ export const armorFeatures = {
                     {
                         key: 'system.resistance.magical.reduction',
                         mode: 2,
-                        value: '@system.armorScore',
-                        priority: 21
+                        value: '@system.armorScore'
                     }
                 ]
             }
@@ -529,6 +537,7 @@ export const weaponFeatures = {
         actions: [
             {
                 type: 'effect',
+                actionType: 'action',
                 chatDisplay: true,
                 name: 'DAGGERHEART.CONFIG.WeaponFeature.bouncing.actions.bounce.name',
                 description: 'DAGGERHEART.CONFIG.WeaponFeature.bouncing.actions.bounce.description',
@@ -573,6 +582,7 @@ export const weaponFeatures = {
         actions: [
             {
                 type: 'effect',
+                actionType: 'action',
                 chatDisplay: true,
                 name: 'DAGGERHEART.CONFIG.WeaponFeature.brutal.actions.addDamage.name',
                 description: 'DAGGERHEART.CONFIG.WeaponFeature.brutal.actions.addDamage.description',
@@ -586,6 +596,7 @@ export const weaponFeatures = {
         actions: [
             {
                 type: 'effect',
+                actionType: 'action',
                 chatDisplay: true,
                 name: 'DAGGERHEART.CONFIG.WeaponFeature.burning.actions.burn.name',
                 description: 'DAGGERHEART.CONFIG.WeaponFeature.burning.actions.burn.description',
@@ -599,6 +610,7 @@ export const weaponFeatures = {
         actions: [
             {
                 type: 'effect',
+                actionType: 'action',
                 chatDisplay: true,
                 name: 'DAGGERHEART.CONFIG.WeaponFeature.charged.actions.markStress.name',
                 description: 'DAGGERHEART.CONFIG.WeaponFeature.charged.actions.markStress.description',
@@ -635,6 +647,7 @@ export const weaponFeatures = {
         actions: [
             {
                 type: 'effect',
+                actionType: 'action',
                 chatDisplay: true,
                 name: 'DAGGERHEART.CONFIG.WeaponFeature.concussive.actions.attack.name',
                 description: 'DAGGERHEART.CONFIG.WeaponFeature.concussive.actions.attack.description',
@@ -675,6 +688,7 @@ export const weaponFeatures = {
         actions: [
             {
                 type: 'effect',
+                actionType: 'action',
                 chatDisplay: true,
                 name: 'DAGGERHEART.CONFIG.WeaponFeature.deadly.actions.extraDamage.name',
                 description: 'DAGGERHEART.CONFIG.WeaponFeature.deadly.actions.extraDamage.description',
@@ -688,6 +702,7 @@ export const weaponFeatures = {
         actions: [
             {
                 type: 'effect',
+                actionType: 'action',
                 chatDisplay: true,
                 name: 'DAGGERHEART.CONFIG.WeaponFeature.deflecting.actions.deflect.name',
                 description: 'DAGGERHEART.CONFIG.WeaponFeature.deflecting.actions.deflect.description',
@@ -710,8 +725,7 @@ export const weaponFeatures = {
                             {
                                 key: 'system.evasion',
                                 mode: 2,
-                                value: '@system.armorScore',
-                                priority: 21
+                                value: '@system.armorScore'
                             }
                         ]
                     }
@@ -725,6 +739,7 @@ export const weaponFeatures = {
         actions: [
             {
                 type: 'damage',
+                actionType: 'action',
                 chatDisplay: true,
                 name: 'DAGGERHEART.CONFIG.WeaponFeature.destructive.actions.attack.name',
                 description: 'DAGGERHEART.CONFIG.WeaponFeature.destructive.actions.attack.descriptive',
@@ -769,6 +784,7 @@ export const weaponFeatures = {
         actions: [
             {
                 type: 'effect',
+                actionType: 'action',
                 chatDisplay: true,
                 name: 'DAGGERHEART.CONFIG.WeaponFeature.devastating.actions.devastate.name',
                 description: 'DAGGERHEART.CONFIG.WeaponFeature.devastating.actions.devastate.description',
@@ -819,6 +835,7 @@ export const weaponFeatures = {
         actions: [
             {
                 type: 'effect',
+                actionType: 'action',
                 chatDisplay: true,
                 name: 'DAGGERHEART.CONFIG.WeaponFeature.doubledUp.actions.doubleUp.name',
                 description: 'DAGGERHEART.CONFIG.WeaponFeature.doubledUp.actions.doubleUp.description',
@@ -832,6 +849,7 @@ export const weaponFeatures = {
         actions: [
             {
                 type: 'effect',
+                actionType: 'action',
                 chatDisplay: true,
                 name: 'DAGGERHEART.CONFIG.WeaponFeature.dueling.actions.duel.name',
                 description: 'DAGGERHEART.CONFIG.WeaponFeature.dueling.actions.duel.description',
@@ -845,6 +863,7 @@ export const weaponFeatures = {
         actions: [
             {
                 type: 'effect', // Should prompt a dc 14 reaction save on adversaries
+                actionType: 'action',
                 chatDisplay: true,
                 name: 'DAGGERHEART.CONFIG.WeaponFeature.eruptive.actions.erupt.name',
                 description: 'DAGGERHEART.CONFIG.WeaponFeature.eruptive.actions.erupt.description',
@@ -858,6 +877,7 @@ export const weaponFeatures = {
         actions: [
             {
                 type: 'effect',
+                actionType: 'action',
                 chatDisplay: true,
                 name: 'DAGGERHEART.CONFIG.WeaponFeature.grappling.actions.grapple.name',
                 description: 'DAGGERHEART.CONFIG.WeaponFeature.grappling.actions.grapple.description',
@@ -877,6 +897,7 @@ export const weaponFeatures = {
         actions: [
             {
                 type: 'effect',
+                actionType: 'action',
                 chatDisplay: true,
                 name: 'DAGGERHEART.CONFIG.WeaponFeature.greedy.name',
                 description: 'DAGGERHEART.CONFIG.WeaponFeature.greedy.description',
@@ -908,6 +929,7 @@ export const weaponFeatures = {
         actions: [
             {
                 type: 'healing',
+                actionType: 'action',
                 chatDisplay: true,
                 name: 'DAGGERHEART.CONFIG.WeaponFeature.healing.actions.heal.name',
                 description: 'DAGGERHEART.CONFIG.WeaponFeature.healing.actions.heal.description',
@@ -955,6 +977,7 @@ export const weaponFeatures = {
         actions: [
             {
                 type: 'effect',
+                actionType: 'action',
                 chatDisplay: true,
                 name: 'DAGGERHEART.CONFIG.WeaponFeature.hooked.actions.hook.name',
                 description: 'DAGGERHEART.CONFIG.WeaponFeature.hooked.actions.hook.description',
@@ -968,6 +991,7 @@ export const weaponFeatures = {
         actions: [
             {
                 type: 'effect',
+                actionType: 'action',
                 chatDisplay: true,
                 name: 'DAGGERHEART.CONFIG.WeaponFeature.hot.actions.hot.name',
                 description: 'DAGGERHEART.CONFIG.WeaponFeature.hot.actions.hot.description',
@@ -981,6 +1005,7 @@ export const weaponFeatures = {
         actions: [
             {
                 type: 'effect',
+                actionType: 'action',
                 chatDisplay: true,
                 name: 'DAGGERHEART.CONFIG.WeaponFeature.invigorating.actions.invigorate.name',
                 description: 'DAGGERHEART.CONFIG.WeaponFeature.invigorating.actions.invigorate.description',
@@ -994,6 +1019,7 @@ export const weaponFeatures = {
         actions: [
             {
                 type: 'effect',
+                actionType: 'action',
                 chatDisplay: true,
                 name: 'DAGGERHEART.CONFIG.WeaponFeature.lifestealing.actions.lifesteal.name',
                 description: 'DAGGERHEART.CONFIG.WeaponFeature.lifestealing.actions.lifesteal.description',
@@ -1007,6 +1033,7 @@ export const weaponFeatures = {
         actions: [
             {
                 type: 'effect',
+                actionType: 'action',
                 chatDisplay: true,
                 name: 'DAGGERHEART.CONFIG.WeaponFeature.lockedOn.actions.lockOn.name',
                 description: 'DAGGERHEART.CONFIG.WeaponFeature.lockedOn.actions.lockOn.description',
@@ -1020,6 +1047,7 @@ export const weaponFeatures = {
         actions: [
             {
                 type: 'effect',
+                actionType: 'action',
                 chatDisplay: true,
                 name: 'DAGGERHEART.CONFIG.WeaponFeature.long.actions.long.name',
                 description: 'DAGGERHEART.CONFIG.WeaponFeature.long.actions.long.description',
@@ -1033,6 +1061,7 @@ export const weaponFeatures = {
         actions: [
             {
                 type: 'effect',
+                actionType: 'action',
                 chatDisplay: true,
                 name: 'DAGGERHEART.CONFIG.WeaponFeature.lucky.actions.luck.name',
                 description: 'DAGGERHEART.CONFIG.WeaponFeature.lucky.actions.luck.description',
@@ -1070,6 +1099,7 @@ export const weaponFeatures = {
         actions: [
             {
                 type: 'effect',
+                actionType: 'action',
                 chatDisplay: true,
                 name: 'DAGGERHEART.CONFIG.WeaponFeature.painful.actions.pain.name',
                 description: 'DAGGERHEART.CONFIG.WeaponFeature.painful.actions.pain.description',
@@ -1115,6 +1145,7 @@ export const weaponFeatures = {
         actions: [
             {
                 type: 'effect',
+                actionType: 'action',
                 chatDisplay: true,
                 name: 'DAGGERHEART.CONFIG.WeaponFeature.parry.actions.parry.name',
                 description: 'DAGGERHEART.CONFIG.WeaponFeature.parry.actions.parry.description',
@@ -1128,6 +1159,7 @@ export const weaponFeatures = {
         actions: [
             {
                 type: 'effect',
+                actionType: 'action',
                 chatDisplay: true,
                 name: 'DAGGERHEART.CONFIG.WeaponFeature.persuasive.actions.persuade.name',
                 description: 'DAGGERHEART.CONFIG.WeaponFeature.persuasive.actions.persuade.description',
@@ -1164,6 +1196,7 @@ export const weaponFeatures = {
         actions: [
             {
                 type: 'effect',
+                actionType: 'action',
                 chatDisplay: true,
                 name: 'DAGGERHEART.CONFIG.WeaponFeature.pompous.actions.pompous.name',
                 description: 'DAGGERHEART.CONFIG.WeaponFeature.pompous.actions.pompous.description',
@@ -1207,6 +1240,7 @@ export const weaponFeatures = {
         actions: [
             {
                 type: 'effect',
+                actionType: 'action',
                 chatDisplay: true,
                 name: 'DAGGERHEART.CONFIG.WeaponFeature.quick.actions.quick.name',
                 description: 'DAGGERHEART.CONFIG.WeaponFeature.quick.actions.quick.description',
@@ -1244,6 +1278,7 @@ export const weaponFeatures = {
         actions: [
             {
                 type: 'effect',
+                actionType: 'action',
                 chatDisplay: true,
                 name: 'DAGGERHEART.CONFIG.WeaponFeature.reloading.actions.reload.name',
                 description: 'DAGGERHEART.CONFIG.WeaponFeature.reloading.actions.reload.description',
@@ -1257,6 +1292,7 @@ export const weaponFeatures = {
         actions: [
             {
                 type: 'effect',
+                actionType: 'action',
                 chatDisplay: true,
                 name: 'DAGGERHEART.CONFIG.WeaponFeature.retractable.actions.retract.name',
                 description: 'DAGGERHEART.CONFIG.WeaponFeature.retractable.actions.retract.description',
@@ -1270,6 +1306,7 @@ export const weaponFeatures = {
         actions: [
             {
                 type: 'effect',
+                actionType: 'action',
                 chatDisplay: true,
                 name: 'DAGGERHEART.CONFIG.WeaponFeature.returning.actions.return.name',
                 description: 'DAGGERHEART.CONFIG.WeaponFeature.returning.actions.return.description',
@@ -1283,6 +1320,7 @@ export const weaponFeatures = {
         actions: [
             {
                 type: 'effect',
+                actionType: 'action',
                 chatDisplay: true,
                 name: 'DAGGERHEART.CONFIG.WeaponFeature.scary.actions.scare.name',
                 description: 'DAGGERHEART.CONFIG.WeaponFeature.scary.actions.scare.description',
@@ -1326,8 +1364,7 @@ export const weaponFeatures = {
                     {
                         key: 'system.bonuses.damage.primaryWeapon.bonus',
                         mode: 2,
-                        value: '@system.traits.agility.value',
-                        priority: 21
+                        value: '@system.traits.agility.value'
                     }
                 ]
             }
@@ -1339,6 +1376,7 @@ export const weaponFeatures = {
         actions: [
             {
                 type: 'effect',
+                actionType: 'action',
                 chatDisplay: true,
                 name: 'DAGGERHEART.CONFIG.WeaponFeature.sheltering.actions.shelter.name',
                 description: 'DAGGERHEART.CONFIG.WeaponFeature.sheltering.actions.shelter.description',
@@ -1352,6 +1390,7 @@ export const weaponFeatures = {
         actions: [
             {
                 type: 'effect',
+                actionType: 'action',
                 chatDisplay: true,
                 name: 'DAGGERHEART.CONFIG.WeaponFeature.startling.actions.startle.name',
                 description: 'DAGGERHEART.CONFIG.WeaponFeature.startling.actions.startle.description',
@@ -1371,6 +1410,7 @@ export const weaponFeatures = {
         actions: [
             {
                 type: 'effect',
+                actionType: 'action',
                 chatDisplay: true,
                 name: 'DAGGERHEART.CONFIG.WeaponFeature.timebending.actions.bendTime.name',
                 description: 'DAGGERHEART.CONFIG.WeaponFeature.timebending.actions.bendTime.description',
@@ -1418,12 +1458,6 @@ export const orderedWeaponFeatures = () => {
     return Object.values(all).sort((a, b) => game.i18n.localize(a.label).localeCompare(game.i18n.localize(b.label)));
 };
 
-export const featureForm = {
-    passive: 'DAGGERHEART.CONFIG.FeatureForm.passive',
-    action: 'DAGGERHEART.CONFIG.FeatureForm.action',
-    reaction: 'DAGGERHEART.CONFIG.FeatureForm.reaction'
-};
-
 export const featureTypes = {
     ancestry: {
         id: 'ancestry',
@@ -1481,6 +1515,21 @@ export const featureSubTypes = {
     mastery: 'mastery'
 };
 
+export const actionTypes = {
+    passive: {
+        id: 'passive',
+        label: 'DAGGERHEART.CONFIG.ActionType.passive'
+    },
+    action: {
+        id: 'action',
+        label: 'DAGGERHEART.CONFIG.ActionType.action'
+    },
+    reaction: {
+        id: 'reaction',
+        label: 'DAGGERHEART.CONFIG.ActionType.reaction'
+    }
+};
+
 export const itemResourceTypes = {
     simple: {
         id: 'simple',

module/config/settingsConfig.mjs

@@ -28,8 +28,7 @@ export const gameSettings = {
     LevelTiers: 'LevelTiers',
     Countdowns: 'Countdowns',
     LastMigrationVersion: 'LastMigrationVersion',
-    TagTeamRoll: 'TagTeamRoll',
-    SpotlightRequestQueue: 'SpotlightRequestQueue',
+    TagTeamRoll: 'TagTeamRoll'
 };
 
 export const actionAutomationChoices = {

module/config/system.mjs

@@ -7,8 +7,7 @@ import * as SETTINGS from './settingsConfig.mjs';
 import * as EFFECTS from './effectConfig.mjs';
 import * as ACTIONS from './actionConfig.mjs';
 import * as FLAGS from './flagsConfig.mjs';
-import * as HOOKS from './hooksConfig.mjs';
-import * as TRIGGER from './triggerConfig.mjs';
+import HOOKS from './hooksConfig.mjs';
 import * as ITEMBROWSER from './itemBrowserConfig.mjs';
 
 export const SYSTEM_ID = 'daggerheart';
@@ -25,6 +24,5 @@ export const SYSTEM = {
     ACTIONS,
     FLAGS,
     HOOKS,
-    TRIGGER,
     ITEMBROWSER
 };

module/config/triggerConfig.mjs

@@ -1,42 +0,0 @@
-/* hints and returns are intentionally not translated. They are programatical terms and best understood in english */
-export const triggers = {
-    dualityRoll: {
-        id: 'dualityRoll',
-        usesActor: true,
-        args: ['roll', 'actor'],
-        label: 'DAGGERHEART.CONFIG.Triggers.dualityRoll.label',
-        hint: 'this: Action, roll: DhRoll, actor: DhActor',
-        returns: '{ updates: [{ key, value, total }] }'
-    },
-    fearRoll: {
-        id: 'fearRoll',
-        usesActor: true,
-        args: ['roll', 'actor'],
-        label: 'DAGGERHEART.CONFIG.Triggers.fearRoll.label',
-        hint: 'this: Action, roll: DhRoll, actor: DhActor',
-        returns: '{ updates: [{ key, value, total }] }'
-    },
-    postDamageReduction: {
-        id: 'postDamageReduction',
-        usesActor: true,
-        args: ['damageUpdates', 'actor'],
-        label: 'DAGGERHEART.CONFIG.Triggers.postDamageReduction.label',
-        hint: 'damageUpdates: ResourceUpdates, actor: DhActor',
-        returns: '{ updates: [{ originActor: this.actor, updates: [{ key, value, total }] }] }'
-    }
-};
-
-export const triggerActorTargetType = {
-    any: {
-        id: 'any',
-        label: 'DAGGERHEART.CONFIG.TargetTypes.any'
-    },
-    self: {
-        id: 'self',
-        label: 'DAGGERHEART.CONFIG.TargetTypes.self'
-    },
-    other: {
-        id: 'other',
-        label: 'DAGGERHEART.CONFIG.TargetTypes.other'
-    }
-};

module/data/action/attackAction.mjs

@@ -36,7 +36,6 @@ export default class DHAttackAction extends DHDamageAction {
 
     async use(event, options) {
         const result = await super.use(event, options);
-        if (!result.message) return;
 
         if (result.message.system.action.roll?.type === 'attack') {
             const { updateCountdowns } = game.system.api.applications.ui.DhCountdowns;

module/data/action/baseAction.mjs

@@ -2,7 +2,6 @@ import DhpActor from '../../documents/actor.mjs';
 import D20RollDialog from '../../applications/dialogs/d20RollDialog.mjs';
 import { ActionMixin } from '../fields/actionField.mjs';
 import { originItemField } from '../chat-message/actorRoll.mjs';
-import TriggerField from '../fields/triggerField.mjs';
 
 const fields = foundry.data.fields;
 
@@ -34,9 +33,7 @@ export default class DHBaseAction extends ActionMixin(foundry.abstract.DataModel
                 initial: 'action',
                 nullable: false,
                 required: true
-            }),
-            targetUuid: new fields.StringField({ initial: undefined }),
-            triggers: new fields.ArrayField(new TriggerField())
+            })
         };
 
         this.extraSchemas.forEach(s => {
@@ -98,9 +95,6 @@ export default class DHBaseAction extends ActionMixin(foundry.abstract.DataModel
     prepareData() {
         this.name = this.name || game.i18n.localize(CONFIG.DH.ACTIONS.actionTypes[this.type].name);
         this.img = this.img ?? this.parent?.parent?.img;
-
-        /* Fallback to feature description */
-        this.description = this.description || this.parent?.description;
     }
 
     /**
@@ -165,8 +159,12 @@ export default class DHBaseAction extends ActionMixin(foundry.abstract.DataModel
      * @returns {object}
      */
     getRollData(data = {}) {
-        const actorData = this.actor ? this.actor.getRollData(false) : {};
+        if (!this.actor) return null;
+        const actorData = this.actor.getRollData(false);
+
+        // Add Roll results to RollDatas
         actorData.result = data.roll?.total ?? 1;
+
         actorData.scale = data.costs?.length // Right now only return the first scalable cost.
             ? (data.costs.find(c => c.scalable)?.total ?? 1)
             : 1;
@@ -195,11 +193,11 @@ export default class DHBaseAction extends ActionMixin(foundry.abstract.DataModel
     async use(event) {
         if (!this.actor) throw new Error("An Action can't be used outside of an Actor context.");
 
+        if (this.chatDisplay) await this.toChat();
+
         let config = this.prepareConfig(event);
         if (!config) return;
 
-        await this.addEffects(config);
-
         if (Hooks.call(`${CONFIG.DH.id}.preUseAction`, this, config) === false) return;
 
         // Display configuration window if necessary
@@ -210,12 +208,9 @@ export default class DHBaseAction extends ActionMixin(foundry.abstract.DataModel
 
         // Execute the Action Worflow in order based of schema fields
         await this.executeWorkflow(config);
-        await config.resourceUpdates.updateResources();
 
         if (Hooks.call(`${CONFIG.DH.id}.postUseAction`, this, config) === false) return;
 
-        if (this.chatDisplay) await this.toChat();
-
         return config;
     }
 
@@ -244,11 +239,8 @@ export default class DHBaseAction extends ActionMixin(foundry.abstract.DataModel
             isDirect: !!this.damage?.direct,
             selectedRollMode: game.settings.get('core', 'rollMode'),
             data: this.getRollData(),
-            evaluate: this.hasRoll,
-            resourceUpdates: new ResourceUpdateMap(this.actor),
-            targetUuid: this.targetUuid
+            evaluate: this.hasRoll
         };
-
         DHBaseAction.applyKeybindings(config);
         return config;
     }
@@ -266,16 +258,6 @@ export default class DHBaseAction extends ActionMixin(foundry.abstract.DataModel
         return config;
     }
 
-    /** */
-    async addEffects(config) {
-        let effects = [];
-        if (this.actor) {
-            effects = Array.from(await this.actor.allApplicableEffects());
-        }
-
-        config.effects = effects;
-    }
-
     /**
      * Method used to know if a configuration dialog must be shown or not when there is no roll.
      * @param {*} config    Object that contains workflow datas. Usually made from Action Fields prepareConfig methods.
@@ -340,50 +322,11 @@ export default class DHBaseAction extends ActionMixin(foundry.abstract.DataModel
      * @returns {string[]} An array of localized tag strings.
      */
     _getTags() {
-        const tags = [game.i18n.localize(`DAGGERHEART.ACTIONS.TYPES.${this.type}.name`)];
+        const tags = [
+            game.i18n.localize(`DAGGERHEART.ACTIONS.TYPES.${this.type}.name`),
+            game.i18n.localize(`DAGGERHEART.CONFIG.ActionType.${this.actionType}`)
+        ];
 
         return tags;
     }
 }
-
-export class ResourceUpdateMap extends Map {
-    #actor;
-
-    constructor(actor) {
-        super();
-
-        this.#actor = actor;
-    }
-
-    addResources(resources) {
-        if (!resources?.length) return;
-        const invalidResources = resources.some(resource => !resource.key);
-        if (invalidResources) return;
-
-        for (const resource of resources) {
-            if (!resource.key) continue;
-
-            const existing = this.get(resource.key);
-            if (existing) {
-                this.set(resource.key, {
-                    ...existing,
-                    value: existing.value + (resource.value ?? 0),
-                    total: existing.total + (resource.total ?? 0)
-                });
-            } else {
-                this.set(resource.key, resource);
-            }
-        }
-    }
-
-    #getResources() {
-        return Array.from(this.values());
-    }
-
-    async updateResources() {
-        if (this.#actor) {
-            const target = this.#actor.system.partner ?? this.#actor;
-            await target.modifyResource(this.#getResources());
-        }
-    }
-}

module/data/action/summonAction.mjs

@@ -1,5 +1,19 @@
 import DHBaseAction from './baseAction.mjs';
 
 export default class DHSummonAction extends DHBaseAction {
-    static extraSchemas = [...super.extraSchemas, 'summon'];
+    static defineSchema() {
+        const fields = foundry.data.fields;
+        return {
+            ...super.defineSchema(),
+            documentUUID: new fields.DocumentUUIDField({ type: 'Actor' })
+        };
+    }
+
+    async trigger(event, ...args) {
+        if (!this.canSummon || !canvas.scene) return;
+    }
+
+    get canSummon() {
+        return game.user.can('TOKEN_CREATE');
+    }
 }

module/data/activeEffect/baseEffect.mjs

@@ -1,17 +1,3 @@
-/** -- Changes Type Priorities --
- *  - Base Number -
- *  Custom: 0
- *  Multiply: 10
- *  Add: 20
- *  Downgrade: 30
- *  Upgrade: 40
- *  Override: 50
- *
- *  - Changes Value Priorities -
- *  Standard: +0
- *  "Anything that uses another data model value as its value": +1 - Effects that increase traits have to be calculated first at Base priority. (EX: Raise evasion by half your agility)
- */
-
 export default class BaseEffect extends foundry.abstract.TypeDataModel {
     static defineSchema() {
         const fields = foundry.data.fields;

module/data/activeEffect/beastformEffect.mjs

@@ -19,7 +19,6 @@ export default class BeastformEffect extends BaseEffect {
                     base64: false
                 }),
                 tokenSize: new fields.SchemaField({
-                    scale: new fields.NumberField({ nullable: false, initial: 1 }),
                     height: new fields.NumberField({ integer: false, nullable: true }),
                     width: new fields.NumberField({ integer: false, nullable: true })
                 })
@@ -56,9 +55,7 @@ export default class BeastformEffect extends BaseEffect {
             const update = {
                 ...baseUpdate,
                 texture: {
-                    src: this.characterTokenData.tokenImg,
-                    scaleX: this.characterTokenData.tokenSize.scale,
-                    scaleY: this.characterTokenData.tokenSize.scale
+                    src: this.characterTokenData.tokenImg
                 },
                 ring: {
                     enabled: this.characterTokenData.usesDynamicToken,
@@ -68,30 +65,11 @@ export default class BeastformEffect extends BaseEffect {
                 }
             };
 
-            const updateToken = token => {
-                let x = null,
-                    y = null;
-                if (token.object?.scene?.grid) {
-                    const positionData = game.system.api.documents.DhToken.getSnappedPositionInSquareGrid(
-                        token.object.scene.grid,
-                        { x: token.x, y: token.y, elevation: token.elevation },
-                        baseUpdate.width,
-                        baseUpdate.height
-                    );
-
-                    x = positionData.x;
-                    y = positionData.y;
-                }
-
-                return {
+            const updateToken = token => ({
                 ...baseUpdate,
-                    x,
-                    y,
                 'texture': {
                     enabled: this.characterTokenData.usesDynamicToken,
-                        src: token.flags.daggerheart?.beastformTokenImg ?? this.characterTokenData.tokenImg,
-                        scaleX: this.characterTokenData.tokenSize.scale,
-                        scaleY: this.characterTokenData.tokenSize.scale
+                    src: token.flags.daggerheart?.beastformTokenImg ?? this.characterTokenData.tokenImg
                 },
                 'ring': {
                     subject: {
@@ -100,8 +78,7 @@ export default class BeastformEffect extends BaseEffect {
                     }
                 },
                 'flags.daggerheart': { '-=beastformTokenImg': null, '-=beastformSubjectTexture': null }
-                };
-            };
+            });
 
             await updateActorTokens(this.parent.parent, update, updateToken);
 

module/data/actor/adversary.mjs

@@ -1,6 +1,6 @@
 import DHAdversarySettings from '../../applications/sheets-configs/adversary-settings.mjs';
 import { ActionField } from '../fields/actionField.mjs';
-import BaseDataActor, { commonActorRules } from './base.mjs';
+import BaseDataActor from './base.mjs';
 import { resourceField, bonusField } from '../fields/actorField.mjs';
 
 export default class DhpAdversary extends BaseDataActor {
@@ -11,8 +11,7 @@ export default class DhpAdversary extends BaseDataActor {
             label: 'TYPES.Actor.adversary',
             type: 'adversary',
             settingSheet: DHAdversarySettings,
-            hasAttribution: true,
-            usesSize: true
+            hasAttribution: true
         });
     }
 
@@ -56,11 +55,27 @@ export default class DhpAdversary extends BaseDataActor {
                 })
             }),
             resources: new fields.SchemaField({
-                hitPoints: resourceField(0, 0, 'DAGGERHEART.GENERAL.HitPoints.plural', true),
-                stress: resourceField(0, 0, 'DAGGERHEART.GENERAL.stress', true)
+                hitPoints: resourceField(
+                    0,
+                    0,
+                    'DAGGERHEART.GENERAL.HitPoints.plural',
+                    true,
+                    game.i18n.localize('DAGGERHEART.GENERAL.max')
+                ),
+                stress: resourceField(
+                    0,
+                    0,
+                    'DAGGERHEART.GENERAL.stress',
+                    true,
+                    game.i18n.localize('DAGGERHEART.GENERAL.max')
+                )
             }),
             rules: new fields.SchemaField({
-                ...commonActorRules()
+                conditionImmunities: new fields.SchemaField({
+                    hidden: new fields.BooleanField({ initial: false }),
+                    restrained: new fields.BooleanField({ initial: false }),
+                    vulnerable: new fields.BooleanField({ initial: false })
+                })
             }),
             attack: new ActionField({
                 initial: {
@@ -127,7 +142,7 @@ export default class DhpAdversary extends BaseDataActor {
     }
 
     isItemValid(source) {
-        return source.type === 'feature';
+        return source.type === "feature";
     }
 
     async _preUpdate(changes, options, user) {

module/data/actor/base.mjs

@@ -1,24 +1,21 @@
 import DHBaseActorSettings from '../../applications/sheets/api/actor-setting.mjs';
-import DHItem from '../../documents/item.mjs';
 import { getScrollTextData } from '../../helpers/utils.mjs';
 
-const fields = foundry.data.fields;
-
 const resistanceField = (resistanceLabel, immunityLabel, reductionLabel) =>
-    new fields.SchemaField({
-        resistance: new fields.BooleanField({
+    new foundry.data.fields.SchemaField({
+        resistance: new foundry.data.fields.BooleanField({
             initial: false,
             label: `${resistanceLabel}.label`,
             hint: `${resistanceLabel}.hint`,
             isAttributeChoice: true
         }),
-        immunity: new fields.BooleanField({
+        immunity: new foundry.data.fields.BooleanField({
             initial: false,
             label: `${immunityLabel}.label`,
             hint: `${immunityLabel}.hint`,
             isAttributeChoice: true
         }),
-        reduction: new fields.NumberField({
+        reduction: new foundry.data.fields.NumberField({
             integer: true,
             initial: 0,
             label: `${reductionLabel}.label`,
@@ -26,25 +23,6 @@ const resistanceField = (resistanceLabel, immunityLabel, reductionLabel) =>
         })
     });
 
-/* Common rules applying to Characters and Adversaries */
-export const commonActorRules = (extendedData = { damageReduction: {} }) => ({
-    conditionImmunities: new fields.SchemaField({
-        hidden: new fields.BooleanField({ initial: false }),
-        restrained: new fields.BooleanField({ initial: false }),
-        vulnerable: new fields.BooleanField({ initial: false })
-    }),
-    damageReduction: new fields.SchemaField({
-        thresholdImmunities: new fields.SchemaField({
-            minor: new fields.BooleanField({ initial: false })
-        }),
-        reduceSeverity: new fields.SchemaField({
-            magical: new fields.NumberField({ initial: 0, min: 0 }),
-            physical: new fields.NumberField({ initial: 0, min: 0 })
-        }),
-        ...extendedData.damageReduction
-    })
-});
-
 /**
  * Describes metadata about the actor data model type
  * @typedef {Object} ActorDataModelMetadata
@@ -63,8 +41,7 @@ export default class BaseDataActor extends foundry.abstract.TypeDataModel {
             settingSheet: null,
             hasResistances: true,
             hasAttribution: false,
-            hasLimitedView: true,
-            usesSize: false
+            hasLimitedView: true
         };
     }
 
@@ -75,6 +52,7 @@ export default class BaseDataActor extends foundry.abstract.TypeDataModel {
 
     /** @inheritDoc */
     static defineSchema() {
+        const fields = foundry.data.fields;
         const schema = {};
 
         if (this.metadata.hasAttribution) {
@@ -98,13 +76,6 @@ export default class BaseDataActor extends foundry.abstract.TypeDataModel {
                     'DAGGERHEART.GENERAL.DamageResistance.magicalReduction'
                 )
             });
-        if (this.metadata.usesSize)
-            schema.size = new fields.StringField({
-                required: true,
-                nullable: false,
-                choices: CONFIG.DH.ACTOR.tokenSize,
-                initial: CONFIG.DH.ACTOR.tokenSize.custom.id
-            });
         return schema;
     }
 
@@ -135,17 +106,6 @@ export default class BaseDataActor extends foundry.abstract.TypeDataModel {
         return data;
     }
 
-    /**
-     * Checks if an item is available for use, such as multiclass features being disabled
-     * on a character.
-     *
-     * @param {DHItem} item The item being checked for availability
-     * @return {boolean} whether the item is available
-     */
-    isItemAvailable(item) {
-        return true;
-    }
-
     async _preDelete() {
         /* Clear all partyMembers from tagTeam setting.*/
         /* Revisit this when tagTeam is improved for many parties */

module/data/actor/character.mjs

@@ -1,7 +1,7 @@
 import { burden } from '../../config/generalConfig.mjs';
 import ForeignDocumentUUIDField from '../fields/foreignDocumentUUIDField.mjs';
 import DhLevelData from '../levelData.mjs';
-import BaseDataActor, { commonActorRules } from './base.mjs';
+import BaseDataActor from './base.mjs';
 import { attributeField, resourceField, stressDamageReductionRule, bonusField } from '../fields/actorField.mjs';
 import { ActionField } from '../fields/actionField.mjs';
 import DHCharacterSettings from '../../applications/sheets-configs/character-settings.mjs';
@@ -217,10 +217,7 @@ export default class DhCharacter extends BaseDataActor {
             }),
             companion: new ForeignDocumentUUIDField({ type: 'Actor', nullable: true, initial: null }),
             rules: new fields.SchemaField({
-                ...commonActorRules({
-                    damageReduction: {
-                        magical: new fields.BooleanField({ initial: false }),
-                        physical: new fields.BooleanField({ initial: false }),
+                damageReduction: new fields.SchemaField({
                     maxArmorMarked: new fields.SchemaField({
                         value: new fields.NumberField({
                             required: true,
@@ -237,9 +234,7 @@ export default class DhCharacter extends BaseDataActor {
                         })
                     }),
                     stressDamageReduction: new fields.SchemaField({
-                            severe: stressDamageReductionRule(
-                                'DAGGERHEART.GENERAL.Rules.damageReduction.stress.severe'
-                            ),
+                        severe: stressDamageReductionRule('DAGGERHEART.GENERAL.Rules.damageReduction.stress.severe'),
                         major: stressDamageReductionRule('DAGGERHEART.GENERAL.Rules.damageReduction.stress.major'),
                         minor: stressDamageReductionRule('DAGGERHEART.GENERAL.Rules.damageReduction.stress.minor'),
                         any: stressDamageReductionRule('DAGGERHEART.GENERAL.Rules.damageReduction.stress.any')
@@ -250,8 +245,16 @@ export default class DhCharacter extends BaseDataActor {
                         label: 'DAGGERHEART.GENERAL.Rules.damageReduction.increasePerArmorMark.label',
                         hint: 'DAGGERHEART.GENERAL.Rules.damageReduction.increasePerArmorMark.hint'
                     }),
+                    magical: new fields.BooleanField({ initial: false }),
+                    physical: new fields.BooleanField({ initial: false }),
+                    thresholdImmunities: new fields.SchemaField({
+                        minor: new fields.BooleanField({ initial: false })
+                    }),
+                    reduceSeverity: new fields.SchemaField({
+                        magical: new fields.NumberField({ initial: 0, min: 0 }),
+                        physical: new fields.NumberField({ initial: 0, min: 0 })
+                    }),
                     disabledArmor: new fields.BooleanField({ intial: false })
-                    }
                 }),
                 attack: new fields.SchemaField({
                     damage: new fields.SchemaField({
@@ -280,23 +283,10 @@ export default class DhCharacter extends BaseDataActor {
                         })
                     })
                 }),
-                dualityRoll: new fields.SchemaField({
-                    defaultHopeDice: new fields.NumberField({
-                        nullable: false,
-                        required: true,
-                        integer: true,
-                        choices: CONFIG.DH.GENERAL.dieFaces,
-                        initial: 12,
-                        label: 'DAGGERHEART.ACTORS.Character.defaultHopeDice'
-                    }),
-                    defaultFearDice: new fields.NumberField({
-                        nullable: false,
-                        required: true,
-                        integer: true,
-                        choices: CONFIG.DH.GENERAL.dieFaces,
-                        initial: 12,
-                        label: 'DAGGERHEART.ACTORS.Character.defaultFearDice'
-                    })
+                conditionImmunities: new fields.SchemaField({
+                    hidden: new fields.BooleanField({ initial: false }),
+                    restrained: new fields.BooleanField({ initial: false }),
+                    vulnerable: new fields.BooleanField({ initial: false })
                 }),
                 runeWard: new fields.BooleanField({ initial: false }),
                 burden: new fields.SchemaField({
@@ -445,33 +435,6 @@ export default class DhCharacter extends BaseDataActor {
         return attack;
     }
 
-    /** @inheritDoc */
-    isItemAvailable(item) {
-        if (!super.isItemAvailable(this)) return false;
-        /**
-         * Preventing subclass features from being available if the chacaracter does not
-         * have the right subclass advancement
-         */
-        if (item.system.originItemType !== CONFIG.DH.ITEM.featureTypes.subclass.id) {
-            return true;
-        }
-        if (!this.class.subclass) return false;
-
-        const prop = item.system.multiclassOrigin ? 'multiclass' : 'class';
-        const subclassState = this[prop].subclass?.system?.featureState;
-        if (!subclassState) return false;
-
-        if (
-            item.system.identifier === CONFIG.DH.ITEM.featureSubTypes.foundation ||
-            (item.system.identifier === CONFIG.DH.ITEM.featureSubTypes.specialization && subclassState >= 2) ||
-            (item.system.identifier === CONFIG.DH.ITEM.featureSubTypes.mastery && subclassState >= 3)
-        ) {
-            return true;
-        } else {
-            return false;
-        }
-    }
-
     get sheetLists() {
         const ancestryFeatures = [],
             communityFeatures = [],
@@ -480,7 +443,7 @@ export default class DhCharacter extends BaseDataActor {
             companionFeatures = [],
             features = [];
 
-        for (let item of this.parent.items.filter(x => this.isItemAvailable(x))) {
+        for (let item of this.parent.items) {
             if (item.system.originItemType === CONFIG.DH.ITEM.featureTypes.ancestry.id) {
                 ancestryFeatures.push(item);
             } else if (item.system.originItemType === CONFIG.DH.ITEM.featureTypes.community.id) {
@@ -488,7 +451,20 @@ export default class DhCharacter extends BaseDataActor {
             } else if (item.system.originItemType === CONFIG.DH.ITEM.featureTypes.class.id) {
                 classFeatures.push(item);
             } else if (item.system.originItemType === CONFIG.DH.ITEM.featureTypes.subclass.id) {
+                if (this.class.subclass) {
+                    const prop = item.system.multiclassOrigin ? 'multiclass' : 'class';
+                    const subclassState = this[prop].subclass?.system?.featureState;
+                    if (!subclassState) continue;
+
+                    if (
+                        item.system.identifier === CONFIG.DH.ITEM.featureSubTypes.foundation ||
+                        (item.system.identifier === CONFIG.DH.ITEM.featureSubTypes.specialization &&
+                            subclassState >= 2) ||
+                        (item.system.identifier === CONFIG.DH.ITEM.featureSubTypes.mastery && subclassState >= 3)
+                    ) {
                         subclassFeatures.push(item);
+                    }
+                }
             } else if (item.system.originItemType === CONFIG.DH.ITEM.featureTypes.companion.id) {
                 companionFeatures.push(item);
             } else if (item.type === 'feature' && !item.system.type) {

module/data/actor/environment.mjs

@@ -1,11 +1,8 @@
 import BaseDataActor from './base.mjs';
 import ForeignDocumentUUIDArrayField from '../fields/foreignDocumentUUIDArrayField.mjs';
 import DHEnvironmentSettings from '../../applications/sheets-configs/environment-settings.mjs';
-import { RefreshType, socketEvent } from '../../systemRegistration/socket.mjs';
 
 export default class DhEnvironment extends BaseDataActor {
-    scenes = new Set();
-
     /**@override */
     static LOCALIZATION_PREFIXES = ['DAGGERHEART.ACTORS.Environment'];
 
@@ -56,31 +53,6 @@ export default class DhEnvironment extends BaseDataActor {
     }
 
     isItemValid(source) {
-        return source.type === 'feature';
-    }
-
-    _onUpdate(changes, options, userId) {
-        super._onUpdate(changes, options, userId);
-        for (const scene of this.scenes) {
-            scene.render();
-        }
-    }
-
-    _onDelete(options, userId) {
-        super._onDelete(options, userId);
-        for (const scene of this.scenes) {
-            if (game.user.isActiveGM) {
-                const newSceneEnvironments = scene.flags.daggerheart.sceneEnvironments.filter(
-                    x => x !== this.parent.uuid
-                );
-                scene.update({ 'flags.daggerheart.sceneEnvironments': newSceneEnvironments }).then(() => {
-                    Hooks.callAll(socketEvent.Refresh, { refreshType: RefreshType.Scene });
-                    game.socket.emit(`system.${CONFIG.DH.id}`, {
-                        action: socketEvent.Refresh,
-                        data: { refreshType: RefreshType.TagTeamRoll }
-                    });
-                });
-            }
-        }
+        return source.type === "feature";
     }
 }

module/data/actor/party.mjs

@@ -26,7 +26,7 @@ export default class DhParty extends BaseDataActor {
     /* -------------------------------------------- */
 
     isItemValid(source) {
-        return ['weapon', 'armor', 'consumable', 'loot'].includes(source.type);
+        return ["weapon", "armor", "consumable", "loot"].includes(source.type);
     }
 
     prepareBaseData() {

module/data/combat.mjs

@@ -15,9 +15,8 @@ export default class DhCombat extends foundry.abstract.TypeDataModel {
     get extendedBattleToggles() {
         const modifiers = CONFIG.DH.ENCOUNTER.BPModifiers;
         const adversaries =
-            this.parent.turns?.filter(x => x.actor && x.isNPC)?.map(x => ({ ...x.actor, type: x.actor.system.type })) ??
-            [];
-        const characters = this.parent.turns?.filter(x => x.actor && !x.isNPC) ?? [];
+            this.parent.turns?.filter(x => x.isNPC)?.map(x => ({ ...x.actor, type: x.actor.system.type })) ?? [];
+        const characters = this.parent.turns?.filter(x => !x.isNPC) ?? [];
 
         const activeAutomatic = Object.keys(modifiers).reduce((acc, categoryKey) => {
             const category = modifiers[categoryKey];

module/data/fields/_module.mjs

@@ -2,6 +2,5 @@ export { ActionCollection } from './actionField.mjs';
 export { default as FormulaField } from './formulaField.mjs';
 export { default as ForeignDocumentUUIDField } from './foreignDocumentUUIDField.mjs';
 export { default as ForeignDocumentUUIDArrayField } from './foreignDocumentUUIDArrayField.mjs';
-export { default as TriggerField } from './triggerField.mjs';
 export { default as MappingField } from './mappingField.mjs';
 export * as ActionFields from './action/_module.mjs';

module/data/fields/action/_module.mjs

@@ -9,4 +9,3 @@ export { default as BeastformField } from './beastformField.mjs';
 export { default as DamageField } from './damageField.mjs';
 export { default as RollField } from './rollField.mjs';
 export { default as MacroField } from './macroField.mjs';
-export { default as SummonField } from './summonField.mjs';

module/data/fields/action/beastformField.mjs

@@ -76,7 +76,7 @@ export default class BeastformField extends fields.SchemaField {
      * @returns
      */
     static async transform(selectedForm, evolvedData, hybridData) {
-        const formData = evolvedData?.form ?? selectedForm;
+        const formData = evolvedData?.form ? evolvedData.form.toObject() : selectedForm;
         const beastformEffect = formData.effects.find(x => x.type === 'beastform');
         if (!beastformEffect) {
             ui.notifications.error('DAGGERHEART.UI.Notifications.beastformMissingEffect');
@@ -92,18 +92,6 @@ export default class BeastformField extends fields.SchemaField {
 
             beastformEffect.changes = [...beastformEffect.changes, ...evolvedForm.changes];
             formData.system.features = [...formData.system.features, ...selectedForm.system.features.map(x => x.uuid)];
-
-            const baseSize = evolvedData.form.system.tokenSize.size;
-            const evolvedSize =
-                baseSize === 'custom'
-                    ? 'custom'
-                    : (Object.keys(CONFIG.DH.ACTOR.tokenSize).find(
-                          x => CONFIG.DH.ACTOR.tokenSize[x].value === CONFIG.DH.ACTOR.tokenSize[baseSize].value + 1
-                      ) ?? baseSize);
-            formData.system.tokenSize = {
-                ...evolvedData.form.system.tokenSize,
-                size: evolvedSize
-            };
         }
 
         if (selectedForm.system.beastformType === CONFIG.DH.ITEM.beastformTypes.hybrid.id) {

module/data/fields/action/costField.mjs

@@ -75,7 +75,7 @@ export default class CostField extends fields.ArrayField {
                 }
             }, []);
 
-        config.resourceUpdates.addResources(resources);
+        await actor.modifyResource(resources);
     }
 
     /**

module/data/fields/action/rollField.mjs

@@ -87,7 +87,7 @@ export class DHActionRollData extends foundry.abstract.DataModel {
                 if (this.type === CONFIG.DH.GENERAL.rollTypes.attack.id)
                     modifiers.push({
                         label: 'Bonus to Hit',
-                        value: this.bonus ?? this.parent.actor.system.attack.roll.bonus ?? 0
+                        value: this.bonus ?? this.parent.actor.system.attack.roll.bonus
                     });
                 break;
             default:

module/data/fields/action/saveField.mjs

@@ -124,7 +124,8 @@ export default class SaveField extends fields.SchemaField {
      */
     static async updateSaveMessage(result, message, targetId) {
         if (!result) return;
-
+        const updateMsg = async function (message, targetId, result) {
+            // setTimeout(async () => {
             const chatMessage = ui.chat.collection.get(message._id),
                 changes = {
                     flags: {
@@ -139,6 +140,13 @@ export default class SaveField extends fields.SchemaField {
                     }
                 };
             await chatMessage.update(changes);
+            // }, 100);
+        };
+        if (game.modules.get('dice-so-nice')?.active)
+            game.dice3d
+                .waitFor3DAnimationByMessageID(result.message.id ?? result.message._id)
+                .then(async () => await updateMsg(message, targetId, result));
+        else await updateMsg(message, targetId, result);
     }
 
     /**

module/data/fields/action/summonField.mjs

@@ -1,89 +0,0 @@
-import FormulaField from '../formulaField.mjs';
-
-const fields = foundry.data.fields;
-
-export default class DHSummonField extends fields.ArrayField {
-    /**
-     * Action Workflow order
-     */
-    static order = 120;
-
-    constructor(options = {}, context = {}) {
-        const summonFields = new fields.SchemaField({
-            actorUUID: new fields.DocumentUUIDField({
-                type: 'Actor',
-                required: true
-            }),
-            count: new FormulaField({
-                required: true,
-                default: '1'
-            })
-        });
-        super(summonFields, options, context);
-    }
-
-    static async execute() {
-        if (!canvas.scene) {
-            ui.notifications.warn(game.i18n.localize('DAGGERHEART.ACTIONS.TYPES.summon.error'));
-            return;
-        }
-
-        if (this.summon.length === 0) {
-            ui.notifications.warn('No actors configured for this Summon action.');
-            return;
-        }
-
-        const rolls = [];
-        const summonData = [];
-        for (const summon of this.summon) {
-            let count = summon.count;
-            const roll = new Roll(summon.count);
-            if (!roll.isDeterministic) {
-                await roll.evaluate();
-                if (game.modules.get('dice-so-nice')?.active) rolls.push(roll);
-                count = roll.total;
-            }
-
-            const actor = DHSummonField.getWorldActor(await foundry.utils.fromUuid(summon.actorUUID));
-            /* Extending summon data in memory so it's available in actionField.toChat. Think it's harmless, but ugly. Could maybe find a better way. */
-            summon.rolledCount = count;
-            summon.actor = actor.toObject();
-
-            summonData.push({ actor, count: count });
-        }
-
-        if (rolls.length) await Promise.all(rolls.map(roll => game.dice3d.showForRoll(roll, game.user, true)));
-
-        this.actor.sheet?.minimize();
-        DHSummonField.handleSummon(summonData, this.actor);
-    }
-
-    /* Check for any available instances of the actor present in the world if we're missing artwork in the compendium */
-    static getWorldActor(baseActor) {
-        const dataType = game.system.api.data.actors[`Dh${baseActor.type.capitalize()}`];
-        if (baseActor.inCompendium && dataType && baseActor.img === dataType.DEFAULT_ICON) {
-            const worldActorCopy = game.actors.find(x => x.name === baseActor.name);
-            return worldActorCopy ?? baseActor;
-        }
-
-        return baseActor;
-    }
-
-    static async handleSummon(summonData, actionActor, summonIndex = 0) {
-        const summon = summonData[summonIndex];
-        const result = await CONFIG.ux.TokenManager.createPreviewAsync(summon.actor, {
-            name: `${summon.actor.prototypeToken.name}${summon.count > 1 ? ` (${summon.count}x)` : ''}`
-        });
-
-        if (!result) return actionActor.sheet?.maximize();
-        summon.actor = result.actor;
-
-        summon.count--;
-        if (summon.count <= 0) {
-            summonIndex++;
-            if (summonIndex === summonData.length) return actionActor.sheet?.maximize();
-        }
-
-        DHSummonField.handleSummon(summonData, actionActor, summonIndex);
-    }
-}

module/data/fields/action/targetField.mjs

@@ -25,12 +25,9 @@ export default class TargetField extends fields.SchemaField {
         config.hasTarget = true;
         let targets;
         // If the Action is configured as self-targeted, set targets as the owner. Probably better way than to fallback to getDependentTokens
-        if (this.target?.type === CONFIG.DH.GENERAL.targetTypes.self.id) {
+        if (this.target?.type === CONFIG.DH.GENERAL.targetTypes.self.id)
             targets = [this.actor.token ?? this.actor.prototypeToken];
-        } else if (config.targetUuid) {
-            const actor = fromUuidSync(config.targetUuid);
-            targets = [actor.token ?? actor.prototypeToken];
-        } else {
+        else {
             targets = Array.from(game.user.targets);
             if (this.target.type !== CONFIG.DH.GENERAL.targetTypes.any.id) {
                 targets = targets.filter(target => TargetField.isTargetFriendly(this.actor, target, this.target.type));
@@ -82,7 +79,7 @@ export default class TargetField extends fields.SchemaField {
         return {
             id: token.id,
             actorId: token.actor.uuid,
-            name: token.name,
+            name: token.actor.name,
             img: token.actor.img,
             difficulty: token.actor.system.difficulty,
             evasion: token.actor.system.evasion,

module/data/fields/actionField.mjs

@@ -141,12 +141,6 @@ export function ActionMixin(Base) {
             return this.documentName;
         }
 
-        //Getter for icons
-        get typeIcon() {
-            const config = CONFIG.DH.ACTIONS.actionTypes[this.type];
-            return config?.icon || 'fa-question'; // Fallback icon just in case
-        }
-
         get relativeUUID() {
             return `.Item.${this.item.id}.Action.${this.id}`;
         }
@@ -262,28 +256,22 @@ export function ActionMixin(Base) {
         async toChat(origin) {
             const cls = getDocumentClass('ChatMessage');
             const systemData = {
-                title: game.i18n.localize('DAGGERHEART.CONFIG.FeatureForm.action'),
+                title: game.i18n.localize('DAGGERHEART.CONFIG.ActionType.action'),
                 origin: origin,
                 action: {
                     name: this.name,
                     img: this.baseAction ? this.parent.parent.img : this.img,
-                    tags: this.tags ? this.tags : ['Spell', 'Arcana', 'Lv 10'],
-                    summon: this.summon
+                    tags: this.tags ? this.tags : ['Spell', 'Arcana', 'Lv 10']
                 },
                 itemOrigin: this.item,
                 description: this.description || (this.item instanceof Item ? this.item.system.description : '')
             };
-
-            const speaker = cls.getSpeaker();
             const msg = {
                 type: 'abilityUse',
                 user: game.user.id,
                 actor: { name: this.actor.name, img: this.actor.img },
                 author: this.author,
-                speaker: {
-                    speaker,
-                    actor: speaker.actor ?? this.actor
-                },
+                speaker: cls.getSpeaker(),
                 title: game.i18n.localize('DAGGERHEART.UI.Chat.action.title'),
                 system: systemData,
                 content: await foundry.applications.handlebars.renderTemplate(

module/data/fields/triggerField.mjs

@@ -1,24 +0,0 @@
-export default class TriggerField extends foundry.data.fields.SchemaField {
-    constructor(context) {
-        super(
-            {
-                trigger: new foundry.data.fields.StringField({
-                    nullable: false,
-                    blank: false,
-                    initial: CONFIG.DH.TRIGGER.triggers.dualityRoll.id,
-                    choices: CONFIG.DH.TRIGGER.triggers,
-                    label: 'DAGGERHEART.CONFIG.Triggers.triggerType'
-                }),
-                triggeringActorType: new foundry.data.fields.StringField({
-                    nullable: false,
-                    blank: false,
-                    initial: CONFIG.DH.TRIGGER.triggerActorTargetType.any.id,
-                    choices: CONFIG.DH.TRIGGER.triggerActorTargetType,
-                    label: 'DAGGERHEART.CONFIG.Triggers.triggeringActorType'
-                }),
-                command: new foundry.data.fields.JavaScriptField({ async: true })
-            },
-            context
-        );
-    }
-}

module/data/item/armor.mjs

@@ -54,21 +54,6 @@ export default class DHArmor extends AttachableItem {
         );
     }
 
-    /**@inheritdoc */
-    async getDescriptionData() {
-        const baseDescription = this.description;
-        const allFeatures = CONFIG.DH.ITEM.allArmorFeatures();
-        const features = this.armorFeatures.map(x => allFeatures[x.value]);
-        if (!features.length) return { prefix: null, value: baseDescription, suffix: null };
-
-        const prefix = await foundry.applications.handlebars.renderTemplate(
-            'systems/daggerheart/templates/sheets/items/armor/description.hbs',
-            { features }
-        );
-
-        return { prefix, value: baseDescription, suffix: null };
-    }
-
     /**@inheritdoc */
     async _preUpdate(changes, options, user) {
         const allowed = await super._preUpdate(changes, options, user);

module/data/item/base.mjs

@@ -8,7 +8,7 @@
  * @property {boolean} isInventoryItem- Indicates whether items of this type is a Inventory Item
  */
 
-import { addLinkedItemsDiff, getScrollTextData, updateLinkedItemApps } from '../../helpers/utils.mjs';
+import { addLinkedItemsDiff, createScrollText, getScrollTextData, updateLinkedItemApps } from '../../helpers/utils.mjs';
 import { ActionsField } from '../fields/actionField.mjs';
 import FormulaField from '../fields/formulaField.mjs';
 
@@ -124,33 +124,6 @@ export default class BaseDataItem extends foundry.abstract.TypeDataModel {
         return [source, page ? `pg ${page}.` : null].filter(x => x).join('. ');
     }
 
-    /**
-     * Augments the description for the item with type specific info to display. Implemented in applicable item subtypes.
-     * @param {object} [options] - Options that modify the styling of the rendered template. { headerStyle: undefined|'none'|'large' }
-     * @returns {string}
-     */
-    async getDescriptionData(_options) {
-        return { prefix: null, value: this.description, suffix: null };
-    }
-
-    /**
-     * Gets the enriched and augmented description for the item.
-     * @param {object} [options] - Options that modify the styling of the rendered template. { headerStyle: undefined|'none'|'large' }
-     * @returns {string}
-     */
-    async getEnrichedDescription() {
-        if (!this.metadata.hasDescription) return '';
-
-        const { prefix, value, suffix } = await this.getDescriptionData();
-        const fullDescription = [prefix, value, suffix].filter(p => !!p).join('\n<hr>\n');
-
-        return await foundry.applications.ux.TextEditor.implementation.enrichHTML(fullDescription, {
-            relativeTo: this,
-            rollData: this.getRollData(),
-            secrets: this.isOwner
-        });
-    }
-
     /**
      * Obtain a data object used to evaluate any dice rolls associated with this Item Type
      * @param {object} [options] - Options which modify the getRollData method.
@@ -162,30 +135,6 @@ export default class BaseDataItem extends foundry.abstract.TypeDataModel {
         return data;
     }
 
-    prepareBaseData() {
-        super.prepareBaseData();
-
-        for (const action of this.actions ?? []) {
-            if (!action.actor) continue;
-
-            const actionsToRegister = [];
-            for (let i = 0; i < action.triggers.length; i++) {
-                const trigger = action.triggers[i];
-                const { args } = CONFIG.DH.TRIGGER.triggers[trigger.trigger];
-                const fn = new foundry.utils.AsyncFunction(...args, `{${trigger.command}\n}`);
-                actionsToRegister.push(fn.bind(action));
-                if (i === action.triggers.length - 1)
-                    game.system.registeredTriggers.registerTriggers(
-                        trigger.trigger,
-                        action.actor?.uuid,
-                        trigger.triggeringActorType,
-                        this.parent.uuid,
-                        actionsToRegister
-                    );
-            }
-        }
-    }
-
     async _preCreate(data, options, user) {
         // Skip if no initial action is required or actions already exist
         if (this.metadata.hasInitialAction && foundry.utils.isEmpty(this.actions)) {

module/data/item/beastform.mjs

@@ -43,13 +43,6 @@ export default class DHBeastform extends BaseDataItem {
                 base64: false
             }),
             tokenSize: new fields.SchemaField({
-                size: new fields.StringField({
-                    required: true,
-                    nullable: false,
-                    choices: CONFIG.DH.ACTOR.tokenSize,
-                    initial: CONFIG.DH.ACTOR.tokenSize.custom.id
-                }),
-                scale: new fields.NumberField({ nullable: false, min: 0.2, max: 3, step: 0.05, initial: 1 }),
                 height: new fields.NumberField({ integer: true, min: 1, initial: null, nullable: true }),
                 width: new fields.NumberField({ integer: true, min: 1, initial: null, nullable: true })
             }),
@@ -185,7 +178,6 @@ export default class DHBeastform extends BaseDataItem {
                     tokenImg: this.parent.parent.prototypeToken.texture.src,
                     tokenRingImg: this.parent.parent.prototypeToken.ring.subject.texture,
                     tokenSize: {
-                        scale: this.parent.parent.prototypeToken.texture.scaleX,
                         height: this.parent.parent.prototypeToken.height,
                         width: this.parent.parent.prototypeToken.width
                     }
@@ -198,22 +190,11 @@ export default class DHBeastform extends BaseDataItem {
 
         await this.parent.parent.createEmbeddedDocuments('ActiveEffect', [beastformEffect.toObject()]);
 
-        const autoTokenSize =
-            this.tokenSize.size !== 'custom'
-                ? game.settings.get(CONFIG.DH.id, CONFIG.DH.SETTINGS.gameSettings.Homebrew).tokenSizes[
-                      this.tokenSize.size
-                  ]
-                : null;
-        const width = autoTokenSize ?? this.tokenSize.width;
-        const height = autoTokenSize ?? this.tokenSize.height;
-
         const prototypeTokenUpdate = {
-            height,
-            width,
+            height: this.tokenSize.height,
+            width: this.tokenSize.width,
             texture: {
-                src: this.tokenImg,
-                scaleX: this.tokenSize.scale,
-                scaleY: this.tokenSize.scale
+                src: this.tokenImg
             },
             ring: {
                 subject: {
@@ -221,33 +202,16 @@ export default class DHBeastform extends BaseDataItem {
                 }
             }
         };
-        const tokenUpdate = token => {
-            let x = null,
-                y = null;
-            if (token.object?.scene?.grid) {
-                const positionData = game.system.api.documents.DhToken.getSnappedPositionInSquareGrid(
-                    token.object.scene.grid,
-                    { x: token.x, y: token.y, elevation: token.elevation },
-                    width ?? token.width,
-                    height ?? token.height
-                );
 
-                x = positionData.x;
-                y = positionData.y;
-            }
-
-            return {
+        const tokenUpdate = token => ({
             ...prototypeTokenUpdate,
-                x,
-                y,
             flags: {
                 daggerheart: {
                     beastformTokenImg: token.texture.src,
                     beastformSubjectTexture: token.ring.subject.texture
                 }
             }
-            };
-        };
+        });
 
         await updateActorTokens(this.parent.parent, prototypeTokenUpdate, tokenUpdate);
 

module/data/item/domainCard.mjs

@@ -29,21 +29,7 @@ export default class DHDomainCard extends BaseDataItem {
                 required: true,
                 initial: CONFIG.DH.DOMAIN.cardTypes.ability.id
             }),
-            inVault: new fields.BooleanField({ initial: false }),
-            vaultActive: new fields.BooleanField({
-                required: true,
-                nullable: false,
-                initial: false
-            }),
-            loadoutIgnore: new fields.BooleanField({
-                required: true,
-                nullable: false,
-                initial: false
-            }),
-            domainTouched: new fields.NumberField({
-                nullable: true,
-                initial: null
-            })
+            inVault: new fields.BooleanField({ initial: false })
         };
     }
 
@@ -52,19 +38,6 @@ export default class DHDomainCard extends BaseDataItem {
         return game.i18n.localize(allDomainData[this.domain].label);
     }
 
-    get isVaultSupressed() {
-        return this.inVault && !this.vaultActive;
-    }
-
-    get isDomainTouchedSuppressed() {
-        if (!this.parent.system.domainTouched || this.parent.parent?.type !== 'character') return false;
-
-        const matchingDomainCards = this.parent.parent.items.filter(
-            item => !item.system.inVault && item.system.domain === this.parent.system.domain
-        ).length;
-        return matchingDomainCards < this.parent.system.domainTouched;
-    }
-
     /* -------------------------------------------- */
 
     /**@override */

module/data/item/feature.mjs

@@ -30,13 +30,7 @@ export default class DHFeature extends BaseDataItem {
                 initial: null
             }),
             multiclassOrigin: new fields.BooleanField({ initial: false }),
-            identifier: new fields.StringField(),
-            featureForm: new fields.StringField({
-                required: true,
-                initial: 'passive',
-                choices: CONFIG.DH.ITEM.featureForm,
-                label: 'DAGGERHEART.CONFIG.FeatureForm.label'
-            })
+            identifier: new fields.StringField()
         };
     }
 }

module/data/item/weapon.mjs

@@ -110,21 +110,6 @@ export default class DHWeapon extends AttachableItem {
         );
     }
 
-    /**@inheritdoc */
-    async getDescriptionData() {
-        const baseDescription = this.description;
-        const allFeatures = CONFIG.DH.ITEM.allWeaponFeatures();
-        const features = this.weaponFeatures.map(x => allFeatures[x.value]);
-        if (!features.length) return { prefix: null, value: baseDescription, suffix: null };
-
-        const prefix = await foundry.applications.handlebars.renderTemplate(
-            'systems/daggerheart/templates/sheets/items/weapon/description.hbs',
-            { features }
-        );
-
-        return { prefix, value: baseDescription, suffix: null };
-    }
-
     prepareDerivedData() {
         this.attack.roll.trait = this.rules.attack.roll.trait ?? this.attack.roll.trait;
     }

module/data/scene/scene.mjs

@@ -1,8 +1,3 @@
-import ForeignDocumentUUIDArrayField from '../fields/foreignDocumentUUIDArrayField.mjs';
-
-/*  Foundry does not add any system data for subtyped Scenes. The data model is therefore used by instantiating a new instance of it for sceneConfigSettings.mjs.
-    Needed dataprep and lifetime hooks are handled in documents/scene.
-*/
 export default class DHScene extends foundry.abstract.DataModel {
     static defineSchema() {
         const fields = foundry.data.fields;
@@ -18,8 +13,7 @@ export default class DHScene extends foundry.abstract.DataModel {
                 veryClose: new fields.NumberField({ integer: true, label: 'DAGGERHEART.CONFIG.Range.veryClose.name' }),
                 close: new fields.NumberField({ integer: true, label: 'DAGGERHEART.CONFIG.Range.close.name' }),
                 far: new fields.NumberField({ integer: true, label: 'DAGGERHEART.CONFIG.Range.far.name' })
-            }),
-            sceneEnvironments: new ForeignDocumentUUIDArrayField({ type: 'Actor', prune: true })
+            })
         };
     }
 }

module/data/settings/Automation.mjs

@@ -173,13 +173,6 @@ export default class DhAutomation extends foundry.abstract.DataModel {
                         label: 'DAGGERHEART.GENERAL.player.plurial'
                     })
                 })
-            }),
-            triggers: new fields.SchemaField({
-                enabled: new fields.BooleanField({
-                    nullable: false,
-                    initial: true,
-                    label: 'DAGGERHEART.SETTINGS.Automation.FIELDS.triggers.enabled.label'
-                })
             })
         };
     }

module/data/settings/Homebrew.mjs

@@ -1,15 +1,14 @@
 import { defaultRestOptions } from '../../config/generalConfig.mjs';
 import { ActionsField } from '../fields/actionField.mjs';
 
-const currencyField = (initial, label, icon) =>
+const currencyField = (initial, label) =>
     new foundry.data.fields.SchemaField({
         enabled: new foundry.data.fields.BooleanField({ required: true, initial: true }),
         label: new foundry.data.fields.StringField({
             required: true,
             initial,
             label
-        }),
-        icon: new foundry.data.fields.StringField({ required: true, nullable: false, blank: true, initial: icon })
+        })
     });
 
 export default class DhHomebrew extends foundry.abstract.DataModel {
@@ -40,60 +39,16 @@ export default class DhHomebrew extends foundry.abstract.DataModel {
             traitArray: new fields.ArrayField(new fields.NumberField({ required: true, integer: true }), {
                 initial: () => [2, 1, 1, 0, 0, -1]
             }),
-            tokenSizes: new fields.SchemaField({
-                tiny: new fields.NumberField({
-                    integer: false,
-                    initial: 0.5,
-                    label: 'DAGGERHEART.CONFIG.TokenSize.tiny'
-                }),
-                small: new fields.NumberField({
-                    integer: false,
-                    initial: 0.8,
-                    label: 'DAGGERHEART.CONFIG.TokenSize.small'
-                }),
-                medium: new fields.NumberField({
-                    integer: false,
-                    initial: 1,
-                    label: 'DAGGERHEART.CONFIG.TokenSize.medium'
-                }),
-                large: new fields.NumberField({
-                    integer: false,
-                    initial: 2,
-                    label: 'DAGGERHEART.CONFIG.TokenSize.large'
-                }),
-                huge: new fields.NumberField({
-                    integer: false,
-                    initial: 3,
-                    label: 'DAGGERHEART.CONFIG.TokenSize.huge'
-                }),
-                gargantuan: new fields.NumberField({
-                    integer: false,
-                    initial: 4,
-                    label: 'DAGGERHEART.CONFIG.TokenSize.gargantuan'
-                })
-            }),
             currency: new fields.SchemaField({
                 title: new fields.StringField({
                     required: true,
                     initial: 'Gold',
                     label: 'DAGGERHEART.SETTINGS.Homebrew.currency.currencyName'
                 }),
-                coins: currencyField(
-                    'Coins',
-                    'DAGGERHEART.SETTINGS.Homebrew.currency.coinName',
-                    'fa-solid fa-coin-front'
-                ),
-                handfuls: currencyField(
-                    'Handfuls',
-                    'DAGGERHEART.SETTINGS.Homebrew.currency.handfulName',
-                    'fa-solid fa-coins'
-                ),
-                bags: currencyField('Bags', 'DAGGERHEART.SETTINGS.Homebrew.currency.bagName', 'fa-solid fa-sack'),
-                chests: currencyField(
-                    'Chests',
-                    'DAGGERHEART.SETTINGS.Homebrew.currency.chestName',
-                    'fa-solid fa-treasure-chest'
-                )
+                coins: currencyField('Coins', 'DAGGERHEART.SETTINGS.Homebrew.currency.coinName'),
+                handfuls: currencyField('Handfuls', 'DAGGERHEART.SETTINGS.Homebrew.currency.handfulName'),
+                bags: currencyField('Bags', 'DAGGERHEART.SETTINGS.Homebrew.currency.bagName'),
+                chests: currencyField('Chests', 'DAGGERHEART.SETTINGS.Homebrew.currency.chestName')
             }),
             restMoves: new fields.SchemaField({
                 longRest: new fields.SchemaField({
@@ -184,10 +139,22 @@ export default class DhHomebrew extends foundry.abstract.DataModel {
     /** @inheritDoc */
     _initializeSource(source, options = {}) {
         source = super._initializeSource(source, options);
-        for (const type of ['coins', 'handfuls', 'bags', 'chests']) {
-            const initial = this.schema.fields.currency.fields[type].getInitialValue();
-            source.currency[type] = foundry.utils.mergeObject(initial, source.currency[type], { inplace: false });
-        }
+        source.currency.coins = {
+            enabled: source.currency.coins.enabled ?? true,
+            label: source.currency.coins.label || source.currency.coins
+        };
+        source.currency.handfuls = {
+            enabled: source.currency.handfuls.enabled ?? true,
+            label: source.currency.handfuls.label || source.currency.handfuls
+        };
+        source.currency.bags = {
+            enabled: source.currency.bags.enabled ?? true,
+            label: source.currency.bags.label || source.currency.bags
+        };
+        source.currency.chests = {
+            enabled: source.currency.chests.enabled ?? true,
+            label: source.currency.chests.label || source.currency.chests
+        };
         return source;
     }
 }

module/data/settings/VariantRules.mjs

@@ -39,13 +39,6 @@ export default class DhVariantRules extends foundry.abstract.DataModel {
                     label: 'DAGGERHEART.CONFIG.Range.close.name'
                 }),
                 far: new fields.NumberField({ required: true, initial: 60, label: 'DAGGERHEART.CONFIG.Range.far.name' })
-            }),
-            massiveDamage: new fields.SchemaField({
-                enabled: new fields.BooleanField({
-                    required: true,
-                    initial: false,
-                    label: 'DAGGERHEART.SETTINGS.VariantRules.FIELDS.massiveDamage.enabled.label'
-                })
             })
         };
     }

module/dice/d20Roll.mjs

@@ -35,9 +35,7 @@ export default class D20Roll extends DHRoll {
 
     get isCritical() {
         if (!this.d20._evaluated) return;
-
-        const criticalThreshold = this.options.actionType === 'reaction' ? 20 : this.data.system.criticalThreshold;
-        return this.d20.total >= criticalThreshold;
+        return this.d20.total >= this.data.system.criticalThreshold;
     }
 
     get hasAdvantage() {
@@ -100,10 +98,10 @@ export default class D20Roll extends DHRoll {
         this.options.roll.modifiers = this.applyBaseBonus();
 
         this.options.experiences?.forEach(m => {
-            if (this.options.data.system?.experiences?.[m])
+            if (this.options.data.experiences?.[m])
                 this.options.roll.modifiers.push({
-                    label: this.options.data.system.experiences[m].name,
-                    value: this.options.data.system.experiences[m].value
+                    label: this.options.data.experiences[m].name,
+                    value: this.options.data.experiences[m].value
                 });
         });
 
@@ -129,55 +127,15 @@ export default class D20Roll extends DHRoll {
         const modifiers = foundry.utils.deepClone(this.options.roll.baseModifiers) ?? [];
 
         modifiers.push(
-            ...this.getBonus(
-                `system.bonuses.roll.${this.options.actionType}`,
-                `${this.options.actionType?.capitalize()} Bonus`
-            )
+            ...this.getBonus(`roll.${this.options.actionType}`, `${this.options.actionType?.capitalize()} Bonus`)
         );
-
-        if (this.options.roll.type !== CONFIG.DH.GENERAL.rollTypes.attack.id) {
         modifiers.push(
-                ...this.getBonus(
-                    `system.bonuses.roll.${this.options.roll.type}`,
-                    `${this.options.roll.type?.capitalize()} Bonus`
-                )
+            ...this.getBonus(`roll.${this.options.roll.type}`, `${this.options.roll.type?.capitalize()} Bonus`)
         );
-        }
-
-        if (
-            this.options.roll.type === CONFIG.DH.GENERAL.rollTypes.attack.id ||
-            (this.options.roll.type === CONFIG.DH.GENERAL.rollTypes.spellcast.id && this.options.hasDamage)
-        ) {
-            modifiers.push(
-                ...this.getBonus(`system.bonuses.roll.attack`, `${this.options.roll.type?.capitalize()} Bonus`)
-            );
-        }
 
         return modifiers;
     }
 
-    getActionChangeKeys() {
-        const changeKeys = new Set([`system.bonuses.roll.${this.options.actionType}`]);
-
-        if (this.options.roll.type !== CONFIG.DH.GENERAL.rollTypes.attack.id) {
-            changeKeys.add(`system.bonuses.roll.${this.options.roll.type}`);
-        }
-
-        if (
-            this.options.roll.type === CONFIG.DH.GENERAL.rollTypes.attack.id ||
-            (this.options.roll.type === CONFIG.DH.GENERAL.rollTypes.spellcast.id && this.options.hasDamage)
-        ) {
-            changeKeys.add(`system.bonuses.roll.attack`);
-        }
-
-        if (this.options.roll.trait && this.data.traits?.[this.options.roll.trait]) {
-            if (this.options.roll.type !== CONFIG.DH.GENERAL.rollTypes.spellcast.id)
-                changeKeys.add('system.bonuses.roll.trait');
-        }
-
-        return changeKeys;
-    }
-
     static postEvaluate(roll, config = {}) {
         const data = super.postEvaluate(roll, config);
         data.type = config.actionType;

module/dice/damageRoll.mjs

@@ -93,6 +93,7 @@ export default class DamageRoll extends DHRoll {
             type = this.options.messageType ?? (this.options.hasHealing ? 'healing' : 'damage'),
             options = part ?? this.options;
 
+        modifiers.push(...this.getBonus(`${type}`, `${type.capitalize()} Bonus`));
         if (!this.options.hasHealing) {
             options.damageTypes?.forEach(t => {
                 modifiers.push(...this.getBonus(`${type}.${t}`, `${t.capitalize()} ${type.capitalize()} Bonus`));
@@ -107,31 +108,6 @@ export default class DamageRoll extends DHRoll {
         return modifiers;
     }
 
-    getActionChangeKeys() {
-        const type = this.options.messageType ?? (this.options.hasHealing ? 'healing' : 'damage');
-        const changeKeys = [];
-
-        for (const roll of this.options.roll) {
-            for (const damageType of roll.damageTypes?.values?.() ?? []) {
-                changeKeys.push(`system.bonuses.${type}.${damageType}`);
-            }
-        }
-
-        const item = this.data.parent?.items?.get(this.options.source.item);
-        if (item) {
-            switch (item.type) {
-                case 'weapon':
-                    if (!this.options.hasHealing)
-                        ['primaryWeapon', 'secondaryWeapon'].forEach(w =>
-                            changeKeys.push(`system.bonuses.damage.${w}`)
-                        );
-                    break;
-            }
-        }
-
-        return changeKeys;
-    }
-
     constructFormula(config) {
         this.options.roll.forEach((part, index) => {
             part.roll = new Roll(Roll.replaceFormulaData(part.formula, config.data));

module/dice/dhRoll.mjs

@@ -4,7 +4,6 @@ export default class DHRoll extends Roll {
     baseTerms = [];
     constructor(formula, data = {}, options = {}) {
         super(formula, data, options);
-        options.bonusEffects = this.bonusEffectBuilder();
         if (!this.data || !Object.keys(this.data).length) this.data = options.data;
     }
 
@@ -165,17 +164,11 @@ export default class DHRoll extends Roll {
                 new foundry.dice.terms.OperatorTerm({ operator: '+' }),
                 ...this.constructor.parse(modifier.join(' + '), this.options.data)
             ];
-        } else if (Number.isNumeric(modifier)) {
-            const numTerm = modifier < 0 ? '-' : '+';
-            return [
-                new foundry.dice.terms.OperatorTerm({ operator: numTerm }),
-                new foundry.dice.terms.NumericTerm({ number: Math.abs(modifier) })
-            ];
         } else {
             const numTerm = modifier < 0 ? '-' : '+';
             return [
                 new foundry.dice.terms.OperatorTerm({ operator: numTerm }),
-                ...this.constructor.parse(modifier, this.options.data)
+                new foundry.dice.terms.NumericTerm({ number: Math.abs(modifier) })
             ];
         }
     }
@@ -192,20 +185,18 @@ export default class DHRoll extends Roll {
     }
 
     getBonus(path, label) {
-        const modifiers = [];
-        for (const effect of Object.values(this.options.bonusEffects)) {
-            if (!effect.selected) continue;
-            for (const change of effect.changes) {
-                if (!change.key.includes(path)) continue;
-                const changeValue = game.system.api.documents.DhActiveEffect.getChangeValue(
-                    this.data,
-                    change,
-                    effect.origEffect
-                );
-                modifiers.push({ label: label, value: changeValue });
-            }
-        }
-
+        const bonus = foundry.utils.getProperty(this.data.bonuses, path),
+            modifiers = [];
+        if (bonus?.bonus)
+            modifiers.push({
+                label: label,
+                value: bonus?.bonus
+            });
+        if (bonus?.dice?.length)
+            modifiers.push({
+                label: label,
+                value: bonus?.dice
+            });
         return modifiers;
     }
 
@@ -244,28 +235,68 @@ export default class DHRoll extends Roll {
     static temporaryModifierBuilder(config) {
         return {};
     }
+}
 
-    bonusEffectBuilder() {
-        const changeKeys = this.getActionChangeKeys();
-        return (
-            this.options.effects?.reduce((acc, effect) => {
-                if (effect.changes.some(x => changeKeys.some(key => x.key.includes(key)))) {
-                    acc[effect.id] = {
-                        id: effect.id,
-                        name: effect.name,
-                        description: effect.description,
-                        changes: effect.changes,
-                        origEffect: effect,
-                        selected: !effect.disabled
+export const registerRollDiceHooks = () => {
+    Hooks.on(`${CONFIG.DH.id}.postRollDuality`, async (config, message) => {
+        const automationSettings = game.settings.get(CONFIG.DH.id, CONFIG.DH.SETTINGS.gameSettings.Automation);
+        if (
+            automationSettings.countdownAutomation &&
+            config.actionType !== CONFIG.DH.ITEM.actionTypes.reaction.id &&
+            !config.tagTeamSelected &&
+            !config.skips?.updateCountdowns
+        ) {
+            const { updateCountdowns } = game.system.api.applications.ui.DhCountdowns;
+            await updateCountdowns(CONFIG.DH.GENERAL.countdownProgressionTypes.actionRoll.id);
+
+            if (config.roll.result.duality === -1) {
+                await updateCountdowns(CONFIG.DH.GENERAL.countdownProgressionTypes.fear.id);
+            }
+        }
+
+        const hopeFearAutomation = automationSettings.hopeFear;
+        if (
+            !config.source?.actor ||
+            (game.user.isGM ? !hopeFearAutomation.gm : !hopeFearAutomation.players) ||
+            config.actionType === 'reaction' ||
+            config.tagTeamSelected ||
+            config.skips?.resources
+        )
+            return;
+        const actor = await fromUuid(config.source.actor);
+        let updates = [];
+        if (!actor) return;
+        if (config.roll.isCritical || config.roll.result.duality === 1)
+            updates.push({ key: 'hope', value: 1, total: -1, enabled: true });
+        if (config.roll.isCritical) updates.push({ key: 'stress', value: 1, total: -1, enabled: true });
+        if (config.roll.result.duality === -1) updates.push({ key: 'fear', value: 1, total: -1, enabled: true });
+
+        if (config.rerolledRoll) {
+            if (config.rerolledRoll.isCritical || config.rerolledRoll.result.duality === 1)
+                updates.push({ key: 'hope', value: -1, total: 1, enabled: true });
+            if (config.rerolledRoll.isCritical) updates.push({ key: 'stress', value: -1, total: 1, enabled: true });
+            if (config.rerolledRoll.result.duality === -1)
+                updates.push({ key: 'fear', value: -1, total: 1, enabled: true });
+        }
+
+        if (updates.length) {
+            const target = actor.system.partner ?? actor;
+            if (!['dead', 'defeated', 'unconscious'].some(x => actor.statuses.has(x))) {
+                if (config.rerolledRoll) target.modifyResource(updates);
+                else config.costs = [...(config.costs ?? []), ...updates];
+            }
+        }
+
+        if (!config.roll.hasOwnProperty('success') && !config.targets?.length) return;
+
+        const rollResult = config.roll.success || config.targets.some(t => t.hit),
+            looseSpotlight = !rollResult || config.roll.result.duality === -1;
+
+        if (looseSpotlight && game.combat?.active) {
+            const currentCombatant = game.combat.combatants.get(game.combat.current?.combatantId);
+            if (currentCombatant?.actorId == actor.id) ui.combat.setCombatantSpotlight(currentCombatant.id);
+        }
+
+        return;
+    });
 };
-                }
-
-                return acc;
-            }, {}) ?? []
-        );
-    }
-
-    getActionChangeKeys() {
-        return [];
-    }
-}

module/dice/dualityRoll.mjs

@@ -2,7 +2,6 @@ import D20RollDialog from '../applications/dialogs/d20RollDialog.mjs';
 import D20Roll from './d20Roll.mjs';
 import { setDiceSoNiceForDualityRoll } from '../helpers/utils.mjs';
 import { getDiceSoNicePresets } from '../config/generalConfig.mjs';
-import { ResourceUpdateMap } from '../data/action/baseAction.mjs';
 
 export default class DualityRoll extends D20Roll {
     _advantageFaces = 6;
@@ -20,7 +19,7 @@ export default class DualityRoll extends D20Roll {
 
     get title() {
         return game.i18n.localize(
-            `DAGGERHEART.GENERAL.${this.options?.actionType === 'reaction' ? 'reactionRoll' : 'dualityRoll'}`
+            `DAGGERHEART.GENERAL.${this.options?.actionType === CONFIG.DH.ITEM.actionTypes.reaction.id ? 'reactionRoll' : 'dualityRoll'}`
         );
     }
 
@@ -130,14 +129,9 @@ export default class DualityRoll extends D20Roll {
             this.terms = [this.terms[0], this.terms[1], this.terms[2]];
             return;
         }
-
-        this.terms[0] = new foundry.dice.terms.Die({
-            faces: this.data.rules.dualityRoll?.defaultHopeDice ?? 12
-        });
+        this.terms[0] = new foundry.dice.terms.Die({ faces: 12 });
         this.terms[1] = new foundry.dice.terms.OperatorTerm({ operator: '+' });
-        this.terms[2] = new foundry.dice.terms.Die({
-            faces: this.data.rules.dualityRoll?.defaultFearDice ?? 12
-        });
+        this.terms[2] = new foundry.dice.terms.Die({ faces: 12 });
     }
 
     applyAdvantage() {
@@ -178,34 +172,6 @@ export default class DualityRoll extends D20Roll {
         return modifiers;
     }
 
-    getActionChangeKeys() {
-        const changeKeys = new Set([`system.bonuses.roll.${this.options.actionType}`]);
-
-        if (this.options.roll.type !== CONFIG.DH.GENERAL.rollTypes.attack.id) {
-            changeKeys.add(`system.bonuses.roll.${this.options.roll.type}`);
-        }
-
-        if (
-            this.options.roll.type === CONFIG.DH.GENERAL.rollTypes.attack.id ||
-            (this.options.roll.type === CONFIG.DH.GENERAL.rollTypes.spellcast.id && this.options.hasDamage)
-        ) {
-            changeKeys.add(`system.bonuses.roll.attack`);
-        }
-
-        if (this.options.roll.trait && this.data.traits?.[this.options.roll.trait]) {
-            if (this.options.roll.type !== CONFIG.DH.GENERAL.rollTypes.spellcast.id)
-                changeKeys.add('system.bonuses.roll.trait');
-        }
-
-        const weapons = ['primaryWeapon', 'secondaryWeapon'];
-        weapons.forEach(w => {
-            if (this.options.source.item && this.options.source.item === this.data[w]?.id)
-                changeKeys.add(`system.bonuses.roll.${w}`);
-        });
-
-        return changeKeys;
-    }
-
     static async buildEvaluate(roll, config = {}, message = {}) {
         await super.buildEvaluate(roll, config, message);
 
@@ -253,114 +219,6 @@ export default class DualityRoll extends D20Roll {
         return data;
     }
 
-    static async buildPost(roll, config, message) {
-        await super.buildPost(roll, config, message);
-
-        await DualityRoll.dualityUpdate(config);
-        await DualityRoll.handleTriggers(roll, config);
-    }
-
-    static async handleTriggers(roll, config) {
-        if (!config.source?.actor) return;
-
-        const updates = [];
-        const dualityUpdates = await game.system.registeredTriggers.runTrigger(
-            CONFIG.DH.TRIGGER.triggers.dualityRoll.id,
-            roll.data?.parent,
-            roll,
-            roll.data?.parent
-        );
-        if (dualityUpdates?.length) updates.push(...dualityUpdates);
-
-        if (config.roll.result.duality === -1) {
-            const fearUpdates = await game.system.registeredTriggers.runTrigger(
-                CONFIG.DH.TRIGGER.triggers.fearRoll.id,
-                roll.data?.parent,
-                roll,
-                roll.data?.parent
-            );
-            if (fearUpdates?.length) updates.push(...fearUpdates);
-        }
-
-        config.resourceUpdates.addResources(updates);
-    }
-
-    static async addDualityResourceUpdates(config) {
-        const automationSettings = game.settings.get(CONFIG.DH.id, CONFIG.DH.SETTINGS.gameSettings.Automation);
-        const hopeFearAutomation = automationSettings.hopeFear;
-        if (
-            !config.source?.actor ||
-            (game.user.isGM ? !hopeFearAutomation.gm : !hopeFearAutomation.players) ||
-            config.actionType === 'reaction' ||
-            config.tagTeamSelected ||
-            config.skips?.resources
-        )
-            return;
-        const actor = await fromUuid(config.source.actor);
-        let updates = [];
-        if (!actor) return;
-
-        if (config.rerolledRoll) {
-            if (config.roll.result.duality != config.rerolledRoll.result.duality) {
-                const hope =
-                    (config.roll.isCritical || config.roll.result.duality === 1 ? 1 : 0) -
-                    (config.rerolledRoll.isCritical || config.rerolledRoll.result.duality === 1 ? 1 : 0);
-                const stress = (config.roll.isCritical ? 1 : 0) - (config.rerolledRoll.isCritical ? 1 : 0);
-                const fear =
-                    (config.roll.result.duality === -1 ? 1 : 0) - (config.rerolledRoll.result.duality === -1 ? 1 : 0);
-
-                if (hope !== 0) updates.push({ key: 'hope', value: hope, total: -1 * hope, enabled: true });
-                if (stress !== 0) updates.push({ key: 'stress', value: -1 * stress, total: stress, enabled: true });
-                if (fear !== 0) updates.push({ key: 'fear', value: fear, total: -1 * fear, enabled: true });
-            }
-        } else {
-            if (config.roll.isCritical || config.roll.result.duality === 1)
-                updates.push({ key: 'hope', value: 1, total: -1, enabled: true });
-            if (config.roll.isCritical) updates.push({ key: 'stress', value: -1, total: 1, enabled: true });
-            if (config.roll.result.duality === -1) updates.push({ key: 'fear', value: 1, total: -1, enabled: true });
-        }
-
-        if (updates.length) {
-            // const target = actor.system.partner ?? actor;
-            if (!['dead', 'defeated', 'unconscious'].some(x => actor.statuses.has(x))) {
-                config.resourceUpdates.addResources(updates);
-            }
-        }
-    }
-
-    static async dualityUpdate(config) {
-        const automationSettings = game.settings.get(CONFIG.DH.id, CONFIG.DH.SETTINGS.gameSettings.Automation);
-        if (
-            automationSettings.countdownAutomation &&
-            config.actionType !== 'reaction' &&
-            !config.tagTeamSelected &&
-            !config.skips?.updateCountdowns
-        ) {
-            const { updateCountdowns } = game.system.api.applications.ui.DhCountdowns;
-
-            if (config.roll.result.duality === -1) {
-                await updateCountdowns(
-                    CONFIG.DH.GENERAL.countdownProgressionTypes.actionRoll.id,
-                    CONFIG.DH.GENERAL.countdownProgressionTypes.fear.id
-                );
-            } else {
-                await updateCountdowns(CONFIG.DH.GENERAL.countdownProgressionTypes.actionRoll.id);
-            }
-        }
-
-        await DualityRoll.addDualityResourceUpdates(config);
-
-        if (!config.roll.hasOwnProperty('success') && !config.targets?.length) return;
-
-        const rollResult = config.roll.success || config.targets?.some(t => t.hit),
-            looseSpotlight = !rollResult || config.roll.result.duality === -1;
-
-        if (looseSpotlight && game.combat?.active) {
-            const currentCombatant = game.combat.combatants.get(game.combat.current?.combatantId);
-            if (currentCombatant?.actorId == config.data.id) ui.combat.setCombatantSpotlight(currentCombatant.id);
-        }
-    }
-
     static async reroll(rollString, target, message) {
         let parsedRoll = game.system.api.dice.DualityRoll.fromData({ ...rollString, evaluated: false });
         const term = parsedRoll.terms[target.dataset.dieIndex];
@@ -399,20 +257,14 @@ export default class DualityRoll extends D20Roll {
         newRoll.extra = newRoll.extra.slice(2);
 
         const tagTeamSettings = game.settings.get(CONFIG.DH.id, CONFIG.DH.SETTINGS.gameSettings.TagTeamRoll);
-
-        const actor = message.system.source.actor ? await foundry.utils.fromUuid(message.system.source.actor) : null;
-        const config = {
+        Hooks.call(`${CONFIG.DH.id}.postRollDuality`, {
             source: { actor: message.system.source.actor ?? '' },
             targets: message.system.targets,
             tagTeamSelected: Object.values(tagTeamSettings.members).some(x => x.messageId === message._id),
             roll: newRoll,
-            rerolledRoll: message.system.roll,
-            resourceUpdates: new ResourceUpdateMap(actor)
-        };
-
-        await DualityRoll.addDualityResourceUpdates(config);
-        await config.resourceUpdates.updateResources();
-
+            rerolledRoll:
+                newRoll.result.duality !== message.system.roll.result.duality ? message.system.roll : undefined
+        });
         return { newRoll, parsedRoll };
     }
 }

module/documents/_module.mjs

@@ -4,8 +4,6 @@ export { default as DhpCombat } from './combat.mjs';
 export { default as DHCombatant } from './combatant.mjs';
 export { default as DhActiveEffect } from './activeEffect.mjs';
 export { default as DhChatMessage } from './chatMessage.mjs';
-export { default as DhScene } from './scene.mjs';
 export { default as DhToken } from './token.mjs';
 export { default as DhTooltipManager } from './tooltipManager.mjs';
 export { default as DhTemplateManager } from './templateManager.mjs';
-export { default as DhTokenManager } from './tokenManager.mjs';

module/documents/activeEffect.mjs

@@ -20,10 +20,7 @@ export default class DhActiveEffect extends foundry.documents.ActiveEffect {
         }
 
         if (this.parent?.type === 'domainCard') {
-            const isVaultSupressed = this.parent.system.isVaultSupressed;
-            const domainTouchedSupressed = this.parent.system.isDomainTouchedSuppressed;
-
-            return isVaultSupressed || domainTouchedSupressed;
+            return this.parent.system.inVault;
         }
 
         return super.isSuppressed;
@@ -109,29 +106,23 @@ export default class DhActiveEffect extends foundry.documents.ActiveEffect {
 
     /**@inheritdoc*/
     static applyField(model, change, field) {
-        change.value = DhActiveEffect.getChangeValue(model, change, change.effect);
-        super.applyField(model, change, field);
-    }
-
-    /** */
-    static getChangeValue(model, change, effect) {
-        let value = change.value;
-        const isOriginTarget = value.toLowerCase().includes('origin.@');
+        const isOriginTarget = change.value.toLowerCase().includes('origin.@');
         let parseModel = model;
-        if (isOriginTarget && effect.origin) {
-            value = change.value.replaceAll(/origin\.@/gi, '@');
+        if (isOriginTarget && change.effect.origin) {
+            change.value = change.value.replaceAll(/origin\.@/gi, '@');
             try {
-                const originEffect = foundry.utils.fromUuidSync(effect.origin);
+                const effect = foundry.utils.fromUuidSync(change.effect.origin);
                 const doc =
-                    originEffect.parent?.parent instanceof game.system.api.documents.DhpActor
-                        ? originEffect.parent
-                        : originEffect.parent.parent;
+                    effect.parent?.parent instanceof game.system.api.documents.DhpActor
+                        ? effect.parent
+                        : effect.parent.parent;
                 if (doc) parseModel = doc;
             } catch (_) {}
         }
 
-        const evalValue = this.effectSafeEval(itemAbleRollParse(value, parseModel, effect.parent));
-        return evalValue ?? value;
+        const evalValue = this.effectSafeEval(itemAbleRollParse(change.value, parseModel, change.effect.parent));
+        change.value = evalValue ?? change.value;
+        super.applyField(model, change, field);
     }
 
     /**
@@ -203,11 +194,28 @@ export default class DhActiveEffect extends foundry.documents.ActiveEffect {
     }
 
     prepareDerivedData() {
-        /* Check for item availability such as in the case of subclass advancement. */
-        if (this.parent?.parent?.system?.isItemAvailable) {
-            if (!this.parent.parent.system.isItemAvailable(this.parent)) {
+        /* Preventing subclass features from transferring to actor if they do not have the right subclass advancement */
+        if (this.parent?.type === 'feature') {
+            const origSubclassParent = this.parent.system.originItemType === 'subclass';
+            if (origSubclassParent) {
+                const subclass = this.parent.parent.items.find(
+                    x =>
+                        x.type === 'subclass' &&
+                        x.system.isMulticlass === (this.parent.system.identifier === 'multiclass')
+                );
+
+                if (subclass) {
+                    const featureState = subclass.system.featureState;
+
+                    if (
+                        (this.parent.system.identifier === CONFIG.DH.ITEM.featureSubTypes.specialization &&
+                            featureState < 2) ||
+                        (this.parent.system.identifier === CONFIG.DH.ITEM.featureSubTypes.mastery && featureState < 3)
+                    ) {
                         this.transfer = false;
                     }
                 }
             }
         }
+    }
+}

module/documents/actor.mjs

@@ -1,9 +1,8 @@
 import { emitAsGM, GMUpdateEvent } from '../systemRegistration/socket.mjs';
 import { LevelOptionType } from '../data/levelTier.mjs';
 import DHFeature from '../data/item/feature.mjs';
-import { createScrollText, damageKeyToNumber, getDamageKey } from '../helpers/utils.mjs';
+import { createScrollText, damageKeyToNumber } from '../helpers/utils.mjs';
 import DhCompanionLevelUp from '../applications/levelup/companionLevelup.mjs';
-import { ResourceUpdateMap } from '../data/action/baseAction.mjs';
 
 export default class DhpActor extends Actor {
     parties = new Set();
@@ -74,27 +73,16 @@ export default class DhpActor extends Actor {
     /**@inheritdoc */
     async _preCreate(data, options, user) {
         if ((await super._preCreate(data, options, user)) === false) return false;
-        const update = {};
-
-        // Set default token size. Done here as we do not want to set a datamodel default, since that would apply the sizing to third party actor modules that aren't set up with the size system.
-        if (this.system.metadata.usesSize && !data.system?.size) {
-            Object.assign(update, {
-                system: {
-                    size: CONFIG.DH.ACTOR.tokenSize.medium.id
-                }
-            });
-        }
 
         // Configure prototype token settings
+        const prototypeToken = {};
         if (['character', 'companion', 'party'].includes(this.type))
-            Object.assign(update, {
-                prototypeToken: {
+            Object.assign(prototypeToken, {
                 sight: { enabled: true },
                 actorLink: true,
                 disposition: CONST.TOKEN_DISPOSITIONS.FRIENDLY
-                }
             });
-        this.updateSource(update);
+        this.updateSource({ prototypeToken });
     }
 
     _onUpdate(changes, options, userId) {
@@ -489,7 +477,6 @@ export default class DhpActor extends Actor {
     async diceRoll(config) {
         config.source = { ...(config.source ?? {}), actor: this.uuid };
         config.data = this.getRollData();
-        config.resourceUpdates = new ResourceUpdateMap(this);
         const rollClass = config.roll.lite ? CONFIG.Dice.daggerheart['DHRoll'] : this.rollClass;
         return await rollClass.build(config);
     }
@@ -539,11 +526,7 @@ export default class DhpActor extends Actor {
 
     /**@inheritdoc */
     getRollData() {
-        const rollData = foundry.utils.deepClone(super.getRollData());
-        /* system gets repeated infinately which causes issues when trying to use the data for document creation */
-        delete rollData.system;
-
-        rollData.id = this.id;
+        const rollData = super.getRollData();
         rollData.name = this.name;
         rollData.system = this.system.getRollData();
         rollData.prof = this.system.proficiency ?? 1;
@@ -631,32 +614,6 @@ export default class DhpActor extends Actor {
                     }
                 }
             }
-            if (this.type === 'adversary') {
-                const reducedSeverity = hpDamage.damageTypes.reduce((value, curr) => {
-                    return Math.max(this.system.rules.damageReduction.reduceSeverity[curr], value);
-                }, 0);
-                hpDamage.value = Math.max(hpDamage.value - reducedSeverity, 0);
-
-                if (
-                    hpDamage.value &&
-                    this.system.rules.damageReduction.thresholdImmunities[getDamageKey(hpDamage.value)]
-                ) {
-                    hpDamage.value -= 1;
-                }
-            }
-        }
-
-        const results = await game.system.registeredTriggers.runTrigger(
-            CONFIG.DH.TRIGGER.triggers.postDamageReduction.id,
-            this,
-            updates,
-            this
-        );
-
-        if (results?.length) {
-            const resourceMap = new ResourceUpdateMap(results[0].originActor);
-            for (var result of results) resourceMap.addResources(result.updates);
-            resourceMap.updateResources();
         }
 
         updates.forEach(
@@ -722,10 +679,6 @@ export default class DhpActor extends Actor {
         return updates;
     }
 
-    /**
-     * Resources are modified asynchronously, so be careful not to update the same resource in
-     * quick succession.
-     */
     async modifyResource(resources) {
         if (!resources?.length) return;
 
@@ -808,11 +761,6 @@ export default class DhpActor extends Actor {
     }
 
     convertDamageToThreshold(damage) {
-        const massiveDamageEnabled = game.settings.get(CONFIG.DH.id, CONFIG.DH.SETTINGS.gameSettings.variantRules)
-            .massiveDamage.enabled;
-        if (massiveDamageEnabled && damage >= this.system.damageThresholds.severe * 2) {
-            return 4;
-        }
         return damage >= this.system.damageThresholds.severe ? 3 : damage >= this.system.damageThresholds.major ? 2 : 1;
     }
 
@@ -906,7 +854,7 @@ export default class DhpActor extends Actor {
                 acc.push(effect);
 
                 const currentStatusActiveEffects = acc.filter(
-                    x => x.statuses.size === 1 && x.name === game.i18n.localize(statusMap.get(x.statuses.first())?.name)
+                    x => x.statuses.size === 1 && x.name === game.i18n.localize(statusMap.get(x.statuses.first()).name)
                 );
 
                 for (var status of effect.statuses) {

module/documents/chatMessage.mjs

@@ -157,10 +157,7 @@ export default class DhpChatMessage extends foundry.documents.ChatMessage {
         event.stopPropagation();
         const config = foundry.utils.deepClone(this.system);
         config.event = event;
-        if (this.system.action) {
-            await this.system.action.addEffects(config);
-            await this.system.action.workflow.get('damage')?.execute(config, this._id, true);
-        }
+        await this.system.action?.workflow.get('damage')?.execute(config, this._id, true);
 
         Hooks.callAll(socketEvent.Refresh, { refreshType: RefreshType.TagTeamRoll });
         await game.socket.emit(`system.${CONFIG.DH.id}`, {

module/documents/combat.mjs

@@ -28,7 +28,6 @@ export default class DhpCombat extends Combat {
                         ...effect,
                         name: game.i18n.localize(effect.name),
                         description: game.i18n.localize(effect.description),
-                        effectTargetTypes: grouping.effectTargetTypes ?? [],
                         flags: {
                             [`${CONFIG.DH.id}.${CONFIG.DH.FLAGS.combatToggle}`]: {
                                 category: toggle.category,
@@ -46,7 +45,11 @@ export default class DhpCombat extends Combat {
             for (let actor of actors) {
                 await actor.createEmbeddedDocuments(
                     'ActiveEffect',
-                    effects.filter(x => x.effectTargetTypes.includes(actor.type))
+                    effects.map(effect => ({
+                        ...effect,
+                        name: game.i18n.localize(effect.name),
+                        description: game.i18n.localize(effect.description)
+                    }))
                 );
             }
         } else {

module/documents/item.mjs

@@ -31,7 +31,7 @@ export default class DHItem extends foundry.documents.Item {
     static async createDocuments(sources, operation) {
         // Ensure that items being created are valid to the actor its being added to
         const actor = operation.parent;
-        sources = actor?.system?.isItemValid ? sources.filter(s => actor.system.isItemValid(s)) : sources;
+        sources = actor?.system?.isItemValid ? sources.filter((s) => actor.system.isItemValid(s)) : sources;
         return super.createDocuments(sources, operation);
     }
 
@@ -146,16 +146,6 @@ export default class DHItem extends foundry.documents.Item {
     /* -------------------------------------------- */
 
     async use(event) {
-        /* DomainCard check. Can be expanded or made neater */
-        if (this.system.isDomainTouchedSuppressed) {
-            return ui.notifications.warn(
-                game.i18n.format('DAGGERHEART.UI.Notifications.domainTouchRequirement', {
-                    nr: this.domainTouched,
-                    domain: game.i18n.localize(CONFIG.DH.DOMAIN.allDomains()[this.domain].label)
-                })
-            );
-        }
-
         const actions = new Set(this.system.actionsList);
         if (actions?.size) {
             let action = actions.first();

module/documents/scene.mjs

@@ -1,66 +0,0 @@
-import DHToken from './token.mjs';
-
-export default class DhScene extends Scene {
-    /** A map of `TokenDocument` IDs embedded in this scene long with new dimensions from actor size-category changes */
-    #sizeSyncBatch = new Map();
-
-    /** Synchronize a token's dimensions with its actor's size category. */
-    syncTokenDimensions(tokenDoc, tokenSize) {
-        if (!tokenDoc.parent?.tokens.has(tokenDoc.id)) return;
-        const prototype = tokenDoc.actor?.prototypeToken ?? tokenDoc;
-        this.#sizeSyncBatch.set(tokenDoc.id, {
-            size: tokenSize,
-            prototypeSize: { width: prototype.width, height: prototype.height },
-            position: { x: tokenDoc.x, y: tokenDoc.y, elevation: tokenDoc.elevation }
-        });
-        this.#processSyncBatch();
-    }
-
-    /** Retrieve size and clear size-sync batch, make updates. */
-    #processSyncBatch = foundry.utils.debounce(() => {
-        const tokenSizes = game.settings.get(CONFIG.DH.id, CONFIG.DH.SETTINGS.gameSettings.Homebrew).tokenSizes;
-        const entries = this.#sizeSyncBatch
-            .entries()
-            .toArray()
-            .map(([_id, { size, prototypeSize, position }]) => {
-                const tokenSize = tokenSizes[size];
-                const width = size !== CONFIG.DH.ACTOR.tokenSize.custom.id ? tokenSize : prototypeSize.width;
-                const height = size !== CONFIG.DH.ACTOR.tokenSize.custom.id ? tokenSize : prototypeSize.height;
-                const updatedPosition = DHToken.getSnappedPositionInSquareGrid(this.grid, position, width, height);
-                return {
-                    _id,
-                    width,
-                    height,
-                    ...updatedPosition
-                };
-            });
-        this.#sizeSyncBatch.clear();
-        this.updateEmbeddedDocuments('Token', entries, { animation: { movementSpeed: 1.5 } });
-    }, 0);
-
-    prepareBaseData() {
-        super.prepareBaseData();
-
-        if (this instanceof game.system.api.documents.DhScene) {
-            const system = new game.system.api.data.scenes.DHScene(this.flags.daggerheart);
-
-            // Register this scene to all environements
-            for (const environment of system.sceneEnvironments) {
-                environment.system.scenes?.add(this);
-            }
-        }
-    }
-
-    _onDelete(options, userId) {
-        super._onDelete(options, userId);
-
-        if (this instanceof game.system.api.documents.DhScene) {
-            const system = new game.system.api.data.scenes.DHScene(this.flags.daggerheart);
-
-            // Clear this scene from all environments that aren't deleted
-            for (const environment of system.sceneEnvironments) {
-                environment?.system?.scenes?.delete(this);
-            }
-        }
-    }
-}

module/documents/token.mjs

@@ -1,4 +1,4 @@
-export default class DHToken extends CONFIG.Token.documentClass {
+export default class DHToken extends TokenDocument {
     /**
      * Inspect the Actor data model and identify the set of attributes which could be used for a Token Bar.
      * @param {object} attributes       The tracked attributes which can be chosen from
@@ -83,7 +83,7 @@ export default class DHToken extends CONFIG.Token.documentClass {
         if (combat?.system?.battleToggles?.length) {
             await combat.toggleModifierEffects(
                 true,
-                tokens.filter(x => x.actor).map(x => x.actor)
+                tokens.map(x => x.actor)
             );
         }
         super.createCombatants(tokens, combat ?? {});
@@ -95,445 +95,9 @@ export default class DHToken extends CONFIG.Token.documentClass {
         if (combat?.system?.battleToggles?.length) {
             await combat.toggleModifierEffects(
                 false,
-                tokens.filter(x => x.actor).map(x => x.actor)
+                tokens.map(x => x.actor)
             );
         }
         super.deleteCombatants(tokens, combat ?? {});
     }
-
-    /**@inheritdoc */
-    static async _preCreateOperation(documents, operation, user) {
-        const allowed = await super._preCreateOperation(documents, operation, user);
-        if (allowed === false) return false;
-
-        const tokenSizes = game.settings.get(CONFIG.DH.id, CONFIG.DH.SETTINGS.gameSettings.Homebrew).tokenSizes;
-        for (const document of documents) {
-            const actor = document.actor;
-            if (actor?.system.metadata.usesSize) {
-                const tokenSize = tokenSizes[actor.system.size];
-                if (tokenSize && actor.system.size !== CONFIG.DH.ACTOR.tokenSize.custom.id) {
-                    document.updateSource({
-                        width: tokenSize,
-                        height: tokenSize
-                    });
-                }
-            }
-        }
-    }
-
-    /**@inheritdoc */
-    _onRelatedUpdate(update = {}, operation = {}) {
-        super._onRelatedUpdate(update, operation);
-
-        if (!this.actor?.isOwner) return;
-
-        const updates = Array.isArray(update) ? update : [update];
-        const activeGM = game.users.activeGM; // Let the active GM take care of updates if available
-        for (let update of updates) {
-            if (
-                this.actor.system.metadata.usesSize &&
-                update.system?.size &&
-                activeGM &&
-                game.user.id === activeGM.id
-            ) {
-                const tokenSizes = game.settings.get(CONFIG.DH.id, CONFIG.DH.SETTINGS.gameSettings.Homebrew).tokenSizes;
-                const tokenSize = tokenSizes[update.system.size];
-                if (tokenSize !== this.width || tokenSize !== this.height) {
-                    this.parent?.syncTokenDimensions(this, update.system.size);
-                }
-            }
-        }
-    }
-
-    /**@inheritdoc */
-    getSnappedPosition(data = {}) {
-        const grid = this.parent?.grid ?? BaseScene.defaultGrid;
-        const x = data.x ?? this.x;
-        const y = data.y ?? this.y;
-        let elevation = data.elevation ?? this.elevation;
-        const unsnapped = { x, y, elevation };
-
-        // Gridless grid
-        if (grid.isGridless) return unsnapped;
-
-        // Get position and elevation
-        elevation = Math.round(elevation / grid.distance) * grid.distance;
-
-        let width = data.width ?? this.width;
-        let height = data.height ?? this.height;
-
-        if (this.actor?.system.metadata.usesSize) {
-            const tokenSizes = game.settings.get(CONFIG.DH.id, CONFIG.DH.SETTINGS.gameSettings.Homebrew).tokenSizes;
-            const tokenSize = tokenSizes[this.actor.system.size];
-            if (tokenSize && this.actor.system.size !== CONFIG.DH.ACTOR.tokenSize.custom.id) {
-                width = tokenSize ?? width;
-                height = tokenSize ?? height;
-            }
-        }
-
-        // Round width and height to nearest multiple of 0.5 if not small
-        width = width < 1 ? width : Math.round(width * 2) / 2;
-        height = height < 1 ? height : Math.round(height * 2) / 2;
-        const shape = data.shape ?? this.shape;
-
-        // Square grid
-        let snapped;
-        if (grid.isSquare) snapped = DHToken.getSnappedPositionInSquareGrid(grid, unsnapped, width, height);
-        // Hexagonal grid
-        else snapped = DHToken.getSnappedPositionInHexagonalGrid(grid, unsnapped, width, height, shape);
-        return { x: snapped.x, y: snapped.y, elevation };
-    }
-
-    static getSnappedPositionInSquareGrid(grid, position, width, height) {
-        const M = CONST.GRID_SNAPPING_MODES;
-        // Small tokens snap to any vertex of the subgrid with resolution 4
-        // where the token is fully contained within the grid space
-        const isTiny = (width === 0.5 && height <= 1) || (width <= 1 && height === 0.5);
-        if (isTiny) {
-            let x = position.x / grid.size;
-            let y = position.y / grid.size;
-            if (width === 1) x = Math.round(x);
-            else {
-                x = Math.floor(x * 8);
-                const k = ((x % 8) + 8) % 8;
-                if (k >= 6) x = Math.ceil(x / 8);
-                else if (k === 5) x = Math.floor(x / 8) + 0.5;
-                else x = Math.round(x / 2) / 4;
-            }
-            if (height === 1) y = Math.round(y);
-            else {
-                y = Math.floor(y * 8);
-                const k = ((y % 8) + 8) % 8;
-                if (k >= 6) y = Math.ceil(y / 8);
-                else if (k === 5) y = Math.floor(y / 8) + 0.5;
-                else y = Math.round(y / 2) / 4;
-            }
-
-            x *= grid.size;
-            y *= grid.size;
-
-            return { x, y };
-        } else if (width < 1 && height < 1) {
-            // isSmall
-            let xGrid = Math.round(position.x / grid.size);
-            let yGrid = Math.round(position.y / grid.size);
-
-            const x = xGrid * grid.size + grid.size / 2 - (width * grid.size) / 2;
-            const y = yGrid * grid.size + grid.size / 2 - (height * grid.size) / 2;
-
-            return { x, y };
-        }
-
-        const modeX = Number.isInteger(width) ? M.VERTEX : M.VERTEX | M.EDGE_MIDPOINT | M.CENTER;
-        const modeY = Number.isInteger(height) ? M.VERTEX : M.VERTEX | M.EDGE_MIDPOINT | M.CENTER;
-
-        if (modeX === modeY) return grid.getSnappedPoint(position, { mode: modeX });
-
-        return {
-            x: grid.getSnappedPoint(position, { mode: modeX }).x,
-            y: grid.getSnappedPoint(position, { mode: modeY }).y
-        };
-    }
-
-    //#region CopyPasta for mean private methods that have to be duplicated
-    static getSnappedPositionInHexagonalGrid(grid, position, width, height, shape) {
-        // Hexagonal shape
-        const hexagonalShape = DHToken.#getHexagonalShape(width, height, shape, grid.columns);
-        if (hexagonalShape) {
-            const offsetX = hexagonalShape.anchor.x * grid.sizeX;
-            const offsetY = hexagonalShape.anchor.y * grid.sizeY;
-            position = grid.getCenterPoint({ x: position.x + offsetX, y: position.y + offsetY });
-            position.x -= offsetX;
-            position.y -= offsetY;
-            return position;
-        }
-
-        // Rectagular shape
-        const M = CONST.GRID_SNAPPING_MODES;
-        return grid.getSnappedPoint(position, { mode: M.CENTER | M.VERTEX | M.CORNER | M.SIDE_MIDPOINT });
-    }
-
-    /**
-     * The cache of hexagonal shapes.
-     * @type {Map<string, DeepReadonly<TokenHexagonalShapeData>>}
-     */
-    static #hexagonalShapes = new Map();
-
-    static #getHexagonalShape(width, height, shape, columns) {
-        if (!Number.isInteger(width * 2) || !Number.isInteger(height * 2)) return null;
-
-        // TODO: can we set a max of 2^13 on width and height so that we may use an integer key?
-        const key = `${width},${height},${shape}${columns ? 'C' : 'R'}`;
-        let data = DHToken.#hexagonalShapes.get(key);
-        if (data) return data;
-
-        // Hexagon symmetry
-        if (columns) {
-            const rowData = BaseToken.#getHexagonalShape(height, width, shape, false);
-            if (!rowData) return null;
-
-            // Transpose the offsets/points of the shape in row orientation
-            const offsets = { even: [], odd: [] };
-            for (const { i, j } of rowData.offsets.even) offsets.even.push({ i: j, j: i });
-            for (const { i, j } of rowData.offsets.odd) offsets.odd.push({ i: j, j: i });
-            offsets.even.sort(({ i: i0, j: j0 }, { i: i1, j: j1 }) => j0 - j1 || i0 - i1);
-            offsets.odd.sort(({ i: i0, j: j0 }, { i: i1, j: j1 }) => j0 - j1 || i0 - i1);
-            const points = [];
-            for (let i = rowData.points.length; i > 0; i -= 2) {
-                points.push(rowData.points[i - 1], rowData.points[i - 2]);
-            }
-            data = {
-                offsets,
-                points,
-                center: { x: rowData.center.y, y: rowData.center.x },
-                anchor: { x: rowData.anchor.y, y: rowData.anchor.x }
-            };
-        }
-
-        // Small hexagon
-        else if (width === 0.5 && height === 0.5) {
-            data = {
-                offsets: { even: [{ i: 0, j: 0 }], odd: [{ i: 0, j: 0 }] },
-                points: [0.25, 0.0, 0.5, 0.125, 0.5, 0.375, 0.25, 0.5, 0.0, 0.375, 0.0, 0.125],
-                center: { x: 0.25, y: 0.25 },
-                anchor: { x: 0.25, y: 0.25 }
-            };
-        }
-
-        // Normal hexagon
-        else if (width === 1 && height === 1) {
-            data = {
-                offsets: { even: [{ i: 0, j: 0 }], odd: [{ i: 0, j: 0 }] },
-                points: [0.5, 0.0, 1.0, 0.25, 1, 0.75, 0.5, 1.0, 0.0, 0.75, 0.0, 0.25],
-                center: { x: 0.5, y: 0.5 },
-                anchor: { x: 0.5, y: 0.5 }
-            };
-        }
-
-        // Hexagonal ellipse or trapezoid
-        else if (shape <= CONST.TOKEN_SHAPES.TRAPEZOID_2) {
-            data = DHToken.#createHexagonalEllipseOrTrapezoid(width, height, shape);
-        }
-
-        // Hexagonal rectangle
-        else if (shape <= CONST.TOKEN_SHAPES.RECTANGLE_2) {
-            data = DHToken.#createHexagonalRectangle(width, height, shape);
-        }
-
-        // Cache the shape
-        if (data) {
-            foundry.utils.deepFreeze(data);
-            DHToken.#hexagonalShapes.set(key, data);
-        }
-
-        return data;
-    }
-
-    static #createHexagonalEllipseOrTrapezoid(width, height, shape) {
-        if (!Number.isInteger(width) || !Number.isInteger(height)) return null;
-        const points = [];
-        let top;
-        let bottom;
-        switch (shape) {
-            case CONST.TOKEN_SHAPES.ELLIPSE_1:
-                if (height >= 2 * width) return null;
-                top = Math.floor(height / 2);
-                bottom = Math.floor((height - 1) / 2);
-                break;
-            case CONST.TOKEN_SHAPES.ELLIPSE_2:
-                if (height >= 2 * width) return null;
-                top = Math.floor((height - 1) / 2);
-                bottom = Math.floor(height / 2);
-                break;
-            case CONST.TOKEN_SHAPES.TRAPEZOID_1:
-                if (height > width) return null;
-                top = height - 1;
-                bottom = 0;
-                break;
-            case CONST.TOKEN_SHAPES.TRAPEZOID_2:
-                if (height > width) return null;
-                top = 0;
-                bottom = height - 1;
-                break;
-        }
-        const offsets = { even: [], odd: [] };
-        for (let i = bottom; i > 0; i--) {
-            for (let j = 0; j < width - i; j++) {
-                offsets.even.push({ i: bottom - i, j: j + (((bottom & 1) + i + 1) >> 1) });
-                offsets.odd.push({ i: bottom - i, j: j + (((bottom & 1) + i) >> 1) });
-            }
-        }
-        for (let i = 0; i <= top; i++) {
-            for (let j = 0; j < width - i; j++) {
-                offsets.even.push({ i: bottom + i, j: j + (((bottom & 1) + i + 1) >> 1) });
-                offsets.odd.push({ i: bottom + i, j: j + (((bottom & 1) + i) >> 1) });
-            }
-        }
-        let x = 0.5 * bottom;
-        let y = 0.25;
-        for (let k = width - bottom; k--; ) {
-            points.push(x, y);
-            x += 0.5;
-            y -= 0.25;
-            points.push(x, y);
-            x += 0.5;
-            y += 0.25;
-        }
-        points.push(x, y);
-        for (let k = bottom; k--; ) {
-            y += 0.5;
-            points.push(x, y);
-            x += 0.5;
-            y += 0.25;
-            points.push(x, y);
-        }
-        y += 0.5;
-        for (let k = top; k--; ) {
-            points.push(x, y);
-            x -= 0.5;
-            y += 0.25;
-            points.push(x, y);
-            y += 0.5;
-        }
-        for (let k = width - top; k--; ) {
-            points.push(x, y);
-            x -= 0.5;
-            y += 0.25;
-            points.push(x, y);
-            x -= 0.5;
-            y -= 0.25;
-        }
-        points.push(x, y);
-        for (let k = top; k--; ) {
-            y -= 0.5;
-            points.push(x, y);
-            x -= 0.5;
-            y -= 0.25;
-            points.push(x, y);
-        }
-        y -= 0.5;
-        for (let k = bottom; k--; ) {
-            points.push(x, y);
-            x += 0.5;
-            y -= 0.25;
-            points.push(x, y);
-            y -= 0.5;
-        }
-        return {
-            offsets,
-            points,
-            // We use the centroid of the polygon for ellipse and trapzoid shapes
-            center: foundry.utils.polygonCentroid(points),
-            anchor: bottom % 2 ? { x: 0.0, y: 0.5 } : { x: 0.5, y: 0.5 }
-        };
-    }
-
-    /**
-     * Create the row-based hexagonal rectangle given the type, width, and height.
-     * @param {number} width                      The width of the Token (positive)
-     * @param {number} height                     The height of the Token (positive)
-     * @param {TokenShapeType} shape              The shape type (must be RECTANGLE_1 or RECTANGLE_2)
-     * @returns {TokenHexagonalShapeData|null}    The hexagonal shape or null if there is no shape
-     *                                            for the given combination of arguments
-     */
-    static #createHexagonalRectangle(width, height, shape) {
-        if (width < 1 || !Number.isInteger(height)) return null;
-        if (width === 1 && height > 1) return null;
-        if (!Number.isInteger(width) && height === 1) return null;
-
-        const even = shape === CONST.TOKEN_SHAPES.RECTANGLE_1 || height === 1;
-        const offsets = { even: [], odd: [] };
-        for (let i = 0; i < height; i++) {
-            const j0 = even ? 0 : (i + 1) & 1;
-            const j1 = ((width + (i & 1) * 0.5) | 0) - (even ? i & 1 : 0);
-            for (let j = j0; j < j1; j++) {
-                offsets.even.push({ i, j: j + (i & 1) });
-                offsets.odd.push({ i, j });
-            }
-        }
-        let x = even ? 0.0 : 0.5;
-        let y = 0.25;
-        const points = [x, y];
-        while (x + 1 <= width) {
-            x += 0.5;
-            y -= 0.25;
-            points.push(x, y);
-            x += 0.5;
-            y += 0.25;
-            points.push(x, y);
-        }
-        if (x !== width) {
-            y += 0.5;
-            points.push(x, y);
-            x += 0.5;
-            y += 0.25;
-            points.push(x, y);
-        }
-        while (y + 1.5 <= 0.75 * height) {
-            y += 0.5;
-            points.push(x, y);
-            x -= 0.5;
-            y += 0.25;
-            points.push(x, y);
-            y += 0.5;
-            points.push(x, y);
-            x += 0.5;
-            y += 0.25;
-            points.push(x, y);
-        }
-        if (y + 0.75 < 0.75 * height) {
-            y += 0.5;
-            points.push(x, y);
-            x -= 0.5;
-            y += 0.25;
-            points.push(x, y);
-        }
-        y += 0.5;
-        points.push(x, y);
-        while (x - 1 >= 0) {
-            x -= 0.5;
-            y += 0.25;
-            points.push(x, y);
-            x -= 0.5;
-            y -= 0.25;
-            points.push(x, y);
-        }
-        if (x !== 0) {
-            y -= 0.5;
-            points.push(x, y);
-            x -= 0.5;
-            y -= 0.25;
-            points.push(x, y);
-        }
-        while (y - 1.5 > 0) {
-            y -= 0.5;
-            points.push(x, y);
-            x += 0.5;
-            y -= 0.25;
-            points.push(x, y);
-            y -= 0.5;
-            points.push(x, y);
-            x -= 0.5;
-            y -= 0.25;
-            points.push(x, y);
-        }
-        if (y - 0.75 > 0) {
-            y -= 0.5;
-            points.push(x, y);
-            x += 0.5;
-            y -= 0.25;
-            points.push(x, y);
-        }
-        return {
-            offsets,
-            points,
-            // We use center of the rectangle (and not the centroid of the polygon) for the rectangle shapes
-            center: {
-                x: width / 2,
-                y: (0.75 * Math.floor(height) + 0.5 * (height % 1) + 0.25) / 2
-            },
-            anchor: even ? { x: 0.5, y: 0.5 } : { x: 0.0, y: 0.5 }
-        };
-    }
-    //#endregion
 }

module/documents/tokenManager.mjs

@@ -1,104 +0,0 @@
-/**
- * A singleton class that handles preview tokens.
- */
-
-export default class DhTokenManager {
-    #activePreview;
-    #actor;
-    #resolve;
-
-    /**
-     * Create a template preview, deactivating any existing ones.
-     * @param {object} data
-     */
-    async createPreview(actor, tokenData) {
-        this.#actor = actor;
-        const token = await canvas.tokens._createPreview(
-            {
-                ...actor.prototypeToken,
-                displayName: 50,
-                ...tokenData
-            },
-            { renderSheet: false, actor }
-        );
-
-        this.#activePreview = {
-            document: token.document,
-            object: token,
-            origin: { x: token.document.x, y: token.document.y }
-        };
-
-        this.#activePreview.events = {
-            contextmenu: this.#cancelTemplate.bind(this),
-            mousedown: this.#confirmTemplate.bind(this),
-            mousemove: this.#onDragMouseMove.bind(this)
-        };
-
-        canvas.stage.on('mousemove', this.#activePreview.events.mousemove);
-        canvas.stage.on('mousedown', this.#activePreview.events.mousedown);
-        canvas.app.view.addEventListener('contextmenu', this.#activePreview.events.contextmenu);
-    }
-
-    /* Currently intended for using as a preview of where to create a token. (note the flag) */
-    async createPreviewAsync(actor, tokenData = {}) {
-        return new Promise(resolve => {
-            this.#resolve = resolve;
-            this.createPreview(actor, { ...tokenData, flags: { daggerheart: { createPlacement: true } } });
-        });
-    }
-
-    /**
-     * Handles the movement of the token preview on mousedrag.
-     * @param {mousemove Event} event
-     */
-    #onDragMouseMove(event) {
-        event.stopPropagation();
-        const { moveTime, object } = this.#activePreview;
-        const update = {};
-
-        const now = Date.now();
-        if (now - (moveTime || 0) <= 16) return;
-        this.#activePreview.moveTime = now;
-
-        let cursor = event.getLocalPosition(canvas.templates);
-
-        Object.assign(update, canvas.grid.getTopLeftPoint(cursor));
-
-        object.document.updateSource(update);
-        object.renderFlags.set({ refresh: true });
-    }
-
-    /**
-     * Cancels the preview token on right-click.
-     * @param {contextmenu Event} event
-     */
-    #cancelTemplate(_event, resolved) {
-        const { mousemove, mousedown, contextmenu } = this.#activePreview.events;
-        this.#activePreview.object.destroy();
-
-        canvas.stage.off('mousemove', mousemove);
-        canvas.stage.off('mousedown', mousedown);
-        canvas.app.view.removeEventListener('contextmenu', contextmenu);
-        if (this.#resolve && !resolved) this.#resolve(false);
-    }
-
-    /**
-     * Creates a real Actor and token at the preview location and cancels the preview.
-     * @param {click Event} event
-     */
-    async #confirmTemplate(event) {
-        event.stopPropagation();
-        this.#cancelTemplate(event, true);
-
-        const actor = this.#actor.inCompendium
-            ? await game.system.api.documents.DhpActor.create(this.#actor.toObject())
-            : this.#actor;
-        const tokenData = await actor.getTokenDocument();
-        const result = await canvas.scene.createEmbeddedDocuments('Token', [
-            { ...tokenData, x: this.#activePreview.document.x, y: this.#activePreview.document.y }
-        ]);
-
-        this.#activePreview = undefined;
-        if (this.#resolve && result.length) this.#resolve(result[0]);
-    }
-}

module/documents/tooltipManager.mjs

@@ -10,7 +10,6 @@ export default class DhTooltipManager extends foundry.helpers.interaction.Toolti
         let html = options.html;
         if (element.dataset.tooltip?.startsWith('#battlepoints#')) {
             this.#wide = true;
-            this.#bordered = true;
 
             html = await this.getBattlepointHTML(element.dataset.combatId);
             options.direction = this._determineItemTooltipDirection(element);
@@ -23,7 +22,6 @@ export default class DhTooltipManager extends foundry.helpers.interaction.Toolti
             return;
         } else {
             this.#wide = false;
-            this.#bordered = false;
         }
 
         if (element.dataset.tooltip === '#effect-display#') {
@@ -67,7 +65,7 @@ export default class DhTooltipManager extends foundry.helpers.interaction.Toolti
             if (item) {
                 const isAction = item instanceof game.system.api.models.actions.actionsTypes.base;
                 const isEffect = item instanceof ActiveEffect;
-                await this.enrichText(item);
+                await this.enrichText(item, isAction || isEffect);
 
                 const type = isAction ? 'action' : isEffect ? 'effect' : item.type;
                 html = await foundry.applications.handlebars.renderTemplate(
@@ -75,8 +73,7 @@ export default class DhTooltipManager extends foundry.helpers.interaction.Toolti
                     {
                         item: item,
                         description: item.system?.enrichedDescription ?? item.enrichedDescription,
-                        config: CONFIG.DH,
-                        allDomains: CONFIG.DH.DOMAIN.allDomains()
+                        config: CONFIG.DH
                     }
                 );
 
@@ -171,6 +168,14 @@ export default class DhTooltipManager extends foundry.helpers.interaction.Toolti
         super.activate(element, { ...options, html: html });
     }
 
+    _setStyle(position = {}) {
+        super._setStyle(position);
+
+        if (this.#bordered) {
+            this.tooltip.classList.add('bordered-tooltip');
+        }
+    }
+
     _determineItemTooltipDirection(element, prefered = this.constructor.TOOLTIP_DIRECTIONS.LEFT) {
         const pos = element.getBoundingClientRect();
         const dirs = this.constructor.TOOLTIP_DIRECTIONS;
@@ -202,20 +207,10 @@ export default class DhTooltipManager extends foundry.helpers.interaction.Toolti
         }
     }
 
-    async enrichText(item) {
+    async enrichText(item, flatStructure) {
         const { TextEditor } = foundry.applications.ux;
-
-        if (item.system?.metadata?.hasDescription) {
-            const enrichedValue =
-                (await item.system?.getEnrichedDescription?.()) ??
-                (await TextEditor.enrichHTML(item.system.description));
-            foundry.utils.setProperty(item, 'system.enrichedDescription', enrichedValue);
-        } else if (item.description) {
-            const enrichedValue = await TextEditor.enrichHTML(item.description);
-            foundry.utils.setProperty(item, 'enrichedDescription', enrichedValue);
-        }
-
         const enrichPaths = [
+            { path: flatStructure ? '' : 'system', name: 'description' },
             { path: 'system', name: 'features' },
             { path: 'system', name: 'actions' },
             { path: 'system', name: 'customActions' }
@@ -230,15 +225,12 @@ export default class DhTooltipManager extends foundry.helpers.interaction.Toolti
                 for (const [index, itemValue] of pathValue.entries()) {
                     const itemIsAction = itemValue instanceof game.system.api.models.actions.actionsTypes.base;
                     const value = itemIsAction || !itemValue?.item ? itemValue : itemValue.item;
-                    const enrichedValue =
-                        (await value.system?.getEnrichedDescription?.()) ??
-                        (await TextEditor.enrichHTML(value.system?.description ?? value.description));
+                    const enrichedValue = await TextEditor.enrichHTML(value.system?.description ?? value.description);
                     if (itemIsAction) value.enrichedDescription = enrichedValue;
                     else foundry.utils.setProperty(item, `${basePath}.${index}.enrichedDescription`, enrichedValue);
                 }
             } else {
-                const enrichedValue =
-                    (await item.system?.getEnrichedDescription?.()) ?? (await TextEditor.enrichHTML(pathValue));
+                const enrichedValue = await TextEditor.enrichHTML(pathValue);
                 foundry.utils.setProperty(
                     item,
                     `${data.path ? `${data.path}.` : ''}enriched${data.name.capitalize()}`,
@@ -255,17 +247,12 @@ export default class DhTooltipManager extends foundry.helpers.interaction.Toolti
         if (this.#wide) {
             this.tooltip.classList.add('wide');
         }
-
-        if (this.#bordered) {
-            this.tooltip.classList.add('bordered-tooltip');
-        }
     }
 
     /**@inheritdoc */
     lockTooltip() {
         const clone = super.lockTooltip();
-        if (this.#wide) clone.classList.add('wide');
-        if (this.#bordered) clone.classList.add('bordered-tooltip');
+        clone.classList.add('wide');
 
         return clone;
     }
@@ -275,7 +262,7 @@ export default class DhTooltipManager extends foundry.helpers.interaction.Toolti
         const combat = game.combats.get(combatId);
         const adversaries =
             combat.turns?.filter(x => x.actor?.isNPC)?.map(x => ({ ...x.actor, type: x.actor.system.type })) ?? [];
-        const characters = combat.turns?.filter(x => !x.isNPC && x.actor) ?? [];
+        const characters = combat.turns?.filter(x => !x.isNPC) ?? [];
 
         const nrCharacters = characters.length;
         const currentBP = AdversaryBPPerEncounter(adversaries, characters);
@@ -285,7 +272,7 @@ export default class DhTooltipManager extends foundry.helpers.interaction.Toolti
         );
 
         const categories = combat.combatants.reduce((acc, combatant) => {
-            if (combatant.actor?.type === 'adversary') {
+            if (combatant.actor.type === 'adversary') {
                 const keyData = Object.keys(acc).reduce((identifiers, categoryKey) => {
                     if (identifiers) return identifiers;
                     const category = acc[categoryKey];
@@ -365,7 +352,7 @@ export default class DhTooltipManager extends foundry.helpers.interaction.Toolti
 
         await combat.toggleModifierEffects(
             event.target.checked,
-            combat.combatants.filter(x => x.actor?.type === 'adversary').map(x => x.actor),
+            combat.combatants.filter(x => x.actor.type === 'adversary').map(x => x.actor),
             category,
             grouping
         );

module/enrichers/DualityRollEnricher.mjs

@@ -86,9 +86,9 @@ export const enrichedDualityRoll = async (
     const config = {
         event: event ?? {},
         title: title,
-        headerTitle: label,
         roll: {
             trait: traitValue && target ? traitValue : null,
+            label: label,
             difficulty: difficulty,
             advantage,
             type: reaction ? 'reaction' : null
@@ -101,7 +101,7 @@ export const enrichedDualityRoll = async (
         await target.diceRoll(config);
     } else {
         // For no target, call DualityRoll directly with basic data
-        config.data = { experiences: {}, traits: {}, rules: {} };
+        config.data = { experiences: {}, traits: {} };
         config.source = { actor: null };
         await CONFIG.Dice.daggerheart.DualityRoll.build(config);
     }

module/enrichers/LookupEnricher.mjs

@@ -3,11 +3,6 @@ import { parseInlineParams } from './parser.mjs';
 export default function DhLookupEnricher(match, { rollData }) {
     const results = parseInlineParams(match[1], { first: 'formula' });
     const element = document.createElement('span');
-
-    const lookupCommand = match[0];
-    const lookupParam = match[1];
-    const lookupText = Roll.replaceFormulaData(String(results.formula), rollData);
-    element.textContent = lookupText === lookupParam ? lookupCommand : lookupText;
-
+    element.textContent = Roll.replaceFormulaData(String(results.formula), rollData);
     return element;
 }

module/helpers/utils.mjs

@@ -119,7 +119,7 @@ export const tagifyElement = (element, baseOptions, onChange, tagifyOptions = {}
                             spellcheck='false'
                             tabIndex="${this.settings.a11y.focusableTags ? 0 : -1}"
                             class="${this.settings.classNames.tag} ${tagData.class ? tagData.class : ''}"
-                            data-tooltip="${tagData.description ? htmlToText(tagData.description) : tagData.name}"
+                            data-tooltip="${tagData.description || tagData.name}"
                             ${this.getAttributes(tagData)}> 
                     <x class="${this.settings.classNames.tagX}" role='button' aria-label='remove tag'></x>
                     <div>
@@ -198,7 +198,7 @@ foundry.dice.terms.Die.prototype.selfCorrecting = function (modifier) {
 };
 
 export const getDamageKey = damage => {
-    return ['none', 'minor', 'major', 'severe', 'massive', 'any'][damage];
+    return ['none', 'minor', 'major', 'severe', 'any'][damage];
 };
 
 export const getDamageLabel = damage => {
@@ -211,8 +211,7 @@ export const damageKeyToNumber = key => {
         minor: 1,
         major: 2,
         severe: 3,
-        massive: 4,
-        any: 5
+        any: 4
     }[key];
 };
 
@@ -472,12 +471,5 @@ export function refreshIsAllowed(allowedTypes, typeToCheck) {
 
 export async function getCritDamageBonus(formula) {
     const critRoll = new Roll(formula);
-    return critRoll.dice.reduce((acc, dice) => acc + dice.faces * dice.number, 0);
-}
-
-export function htmlToText(html) {
-    var tempDivElement = document.createElement('div');
-    tempDivElement.innerHTML = html;
-
-    return tempDivElement.textContent || tempDivElement.innerText || '';
+    return critRoll.dice.reduce((acc, dice) => acc + dice.faces, 0);
 }