Merge branch 'main' into feature/group-roll-rework

module/applications/dialogs/tagTeamDialog.mjs

@@ -366,8 +366,7 @@ export default class TagTeamDialog extends HandlebarsApplicationMixin(Applicatio
         let rollIsSelected = false;
         for (const member of Object.values(members)) {
             const rollFinished = Boolean(member.rollData);
-            const damageFinished =
+            const damageFinished = member.rollData?.options?.hasDamage ? Boolean(member.rollData.options.damage) : true;
-                member.rollData?.options?.hasDamage !== undefined ? member.rollData.options.damage : true;
 
             rollsAreFinished = rollsAreFinished && rollFinished && damageFinished;
             rollIsSelected = rollIsSelected || member.selected;

module/config/generalConfig.mjs

@@ -484,7 +484,7 @@ export const defaultRestOptions = {
                                 value: {
                                     custom: {
                                         enabled: true,
-                                        formula: '@system.armorScore'
+                                        formula: '@system.armorScore.max'
                                     }
                                 }
                             }

module/data/activeEffect/changeTypes/armor.mjs

@@ -44,7 +44,8 @@ export default class ArmorChange extends foundry.abstract.DataModel {
         label: 'Armor',
         defaultPriority: 20,
         handler: (actor, change, _options, _field, replacementData) => {
-            const parsedMax = itemAbleRollParse(change.value.max, actor, change.effect.parent);
+            const baseParsedMax = itemAbleRollParse(change.value.max, actor, change.effect.parent);
+            const parsedMax = new Roll(baseParsedMax).evaluateSync().total;
             game.system.api.documents.DhActiveEffect.applyChange(
                 actor,
                 {
@@ -110,6 +111,8 @@ export default class ArmorChange extends foundry.abstract.DataModel {
     };
 
     get isSuppressed() {
+        if (!this.parent.parent?.actor) return false;
+
         switch (this.value.interaction) {
             case CONFIG.DH.GENERAL.activeEffectArmorInteraction.active.id:
                 return !this.parent.parent?.actor.system.armor;

module/dice/dhRoll.mjs

@@ -256,7 +256,7 @@ export default class DHRoll extends Roll {
             if (!roll.terms[i].isDeterministic) continue;
             const termTotal = roll.terms[i].total;
             if (typeof termTotal === 'number') {
-                const multiplier = roll.terms[i - 1]?.operator === " - " ? -1 : 1;
+                const multiplier = roll.terms[i - 1]?.operator === ' - ' ? -1 : 1;
                 modifierTotal += multiplier * termTotal;
             }
         }
@@ -272,7 +272,7 @@ export default class DHRoll extends Roll {
         const changeKeys = this.getActionChangeKeys();
         return (
             this.options.effects?.reduce((acc, effect) => {
-                if (effect.system.changes.some(x => changeKeys.some(key => x.key.includes(key)))) {
+                if (effect.system.changes.some(x => changeKeys.some(key => x.key?.includes(key)))) {
                     acc[effect.id] = {
                         id: effect.id,
                         name: effect.name,

module/dice/die/_module.mjs

@@ -1,9 +1,13 @@
 import DualityDie from './dualityDie.mjs';
+import HopeDie from './hopeDie.mjs';
+import FearDie from './fearDie.mjs';
 import AdvantageDie from './advantageDie.mjs';
 import DisadvantageDie from './disadvantageDie.mjs';
 
 export const diceTypes = {
     DualityDie,
+    HopeDie,
+    FearDie,
     AdvantageDie,
     DisadvantageDie
 };

module/dice/die/dualityDie.mjs

@@ -43,9 +43,10 @@ export default class DualityDie extends foundry.dice.terms.Die {
                     options: { appearance: {} }
                 };
 
-                const preset = await getDiceSoNicePreset(diceSoNice[key], faces);
+                const diceAppearance = await this.getDiceSoNiceAppearance(options.liveRoll.roll);
-                diceSoNiceRoll.dice[0].options.appearance = preset.appearance;
+                diceSoNiceRoll.dice[0].options.appearance = diceAppearance.appearance;
-                diceSoNiceRoll.dice[0].options.modelFile = preset.modelFile;
+                diceSoNiceRoll.dice[0].options.modelFile = diceAppearance.modelFile;
+                diceSoNiceRoll.dice[0].results = diceSoNiceRoll.dice[0].results.filter(x => x.active);
 
                 await game.dice3d.showForRoll(diceSoNiceRoll, game.user, true);
             } else {
@@ -59,4 +60,11 @@ export default class DualityDie extends foundry.dice.terms.Die {
             this.#updateResources(oldDuality, newDuality, options.liveRoll.actor);
         }
     }
+
+    /**
+     * Overridden by extending classes HopeDie and FearDie
+     */
+    async getDiceSoNiceAppearance() {
+        return {};
+    }
 }

module/dice/die/fearDie.mjs

@@ -0,0 +1,9 @@
+import { getDiceSoNicePresets } from '../../config/generalConfig.mjs';
+import DualityDie from './dualityDie.mjs';
+
+export default class FearDie extends DualityDie {
+    async getDiceSoNiceAppearance(roll) {
+        const { fear } = await getDiceSoNicePresets(roll, this.denomination, this.denomination);
+        return fear;
+    }
+}

module/dice/die/hopeDie.mjs

@@ -0,0 +1,9 @@
+import { getDiceSoNicePresets } from '../../config/generalConfig.mjs';
+import DualityDie from './dualityDie.mjs';
+
+export default class HopeDie extends DualityDie {
+    async getDiceSoNiceAppearance(roll) {
+        const { hope } = await getDiceSoNicePresets(roll, this.denomination, this.denomination);
+        return hope;
+    }
+}

module/dice/dualityRoll.mjs

@@ -24,7 +24,7 @@ export default class DualityRoll extends D20Roll {
     }
 
     get dHope() {
-        if (!(this.dice[0] instanceof game.system.api.dice.diceTypes.DualityDie)) this.createBaseDice();
+        if (!(this.dice[0] instanceof game.system.api.dice.diceTypes.HopeDie)) this.createBaseDice();
         return this.dice[0];
     }
 
@@ -34,7 +34,7 @@ export default class DualityRoll extends D20Roll {
     }
 
     get dFear() {
-        if (!(this.dice[1] instanceof game.system.api.dice.diceTypes.DualityDie)) this.createBaseDice();
+        if (!(this.dice[1] instanceof game.system.api.dice.diceTypes.FearDie)) this.createBaseDice();
         return this.dice[1];
     }
 
@@ -68,8 +68,8 @@ export default class DualityRoll extends D20Roll {
     }
 
     get extraDice() {
-        const { DualityDie, AdvantageDie, DisadvantageDie } = game.system.api.dice.diceTypes;
+        const { HopeDie, FearDie, AdvantageDie, DisadvantageDie } = game.system.api.dice.diceTypes;
-        return this.dice.filter(x => ![DualityDie, AdvantageDie, DisadvantageDie].some(die => x instanceof die));
+        return this.dice.filter(x => ![HopeDie, FearDie, AdvantageDie, DisadvantageDie].some(die => x instanceof die));
     }
 
     setRallyChoices() {
@@ -125,8 +125,8 @@ export default class DualityRoll extends D20Roll {
 
     /** @inheritDoc */
     static fromData(data) {
-        data.terms[0].class = 'DualityDie';
+        data.terms[0].class = 'HopeDie';
-        data.terms[2].class = 'DualityDie';
+        data.terms[2].class = 'FearDie';
         if (data.options.roll.advantage?.type && data.terms[4]?.faces) {
             data.terms[4].class = data.options.roll.advantage.type === 1 ? 'AdvantageDie' : 'DisadvantageDie';
         }
@@ -135,18 +135,18 @@ export default class DualityRoll extends D20Roll {
 
     createBaseDice() {
         if (
-            this.dice[0] instanceof game.system.api.dice.diceTypes.DualityDie &&
+            this.dice[0] instanceof game.system.api.dice.diceTypes.HopeDie &&
-            this.dice[1] instanceof game.system.api.dice.diceTypes.DualityDie
+            this.dice[1] instanceof game.system.api.dice.diceTypes.FearDie
         ) {
             this.terms = [this.terms[0], this.terms[1], this.terms[2]];
             return;
         }
 
-        this.terms[0] = new game.system.api.dice.diceTypes.DualityDie({
+        this.terms[0] = new game.system.api.dice.diceTypes.HopeDie({
             faces: this.data.rules.dualityRoll?.defaultHopeDice ?? 12
         });
         this.terms[1] = new foundry.dice.terms.OperatorTerm({ operator: '+' });
-        this.terms[2] = new game.system.api.dice.diceTypes.DualityDie({
+        this.terms[2] = new game.system.api.dice.diceTypes.FearDie({
             faces: this.data.rules.dualityRoll?.defaultFearDice ?? 12
         });
     }

module/systemRegistration/migrations.mjs

@@ -1,3 +1,4 @@
+import { defaultRestOptions } from '../config/generalConfig.mjs';
 import { RefreshType, socketEvent } from './socket.mjs';
 
 export async function runMigrations() {
@@ -341,6 +342,18 @@ export async function runMigrations() {
 
         lastMigrationVersion = '2.0.0';
     }
+
+    if (foundry.utils.isNewerVersion('2.0.4', lastMigrationVersion)) {
+        const downtimeMoves = game.settings.get(CONFIG.DH.id, CONFIG.DH.SETTINGS.gameSettings.Homebrew);
+        if (restMoves.longRest.moves.repairArmor) {
+            await downtimeMoves.updateSource({
+                'restMoves.longRest.moves.repairArmor': defaultRestOptions.longRest().repairArmor
+            });
+            game.settings.set(CONFIG.DH.id, CONFIG.DH.SETTINGS.gameSettings.Homebrew, downtimeMoves.toObject());
+        }
+
+        lastMigrationVersion = '2.0.4';
+    }
     //#endregion
 
     await game.settings.set(CONFIG.DH.id, CONFIG.DH.SETTINGS.gameSettings.LastMigrationVersion, lastMigrationVersion);

styles/less/global/prose-mirror.less

@@ -4,6 +4,7 @@
 .application.daggerheart {
     prose-mirror {
         height: 100% !important;
+        width: 100%;
 
         .editor-menu {
             background-color: transparent;

styles/less/sheets/actors/party/resources.less

@@ -155,6 +155,26 @@ body.game:is(.performance-low, .noblur) {
                         }
                     }
 
+                    .stat-section {
+                        position: relative;
+                        display: flex;
+                        gap: 10px;
+                        background-color: light-dark(transparent, @dark-blue);
+                        color: light-dark(@dark-blue, @golden);
+                        padding: 5px 10px;
+                        border: 1px solid light-dark(@dark-blue, @golden);
+                        border-radius: 3px;
+                        align-items: center;
+                        width: fit-content;
+
+                        h4 {
+                            font-size: var(--font-size-12);
+                            font-weight: bold;
+                            text-transform: uppercase;
+                            color: light-dark(@dark-blue, @golden);
+                        }
+                    }
+
                     .threshold-section {
                         display: flex;
                         align-self: center;

system.json

@@ -2,7 +2,7 @@
     "id": "daggerheart",
     "title": "Daggerheart",
     "description": "An unofficial implementation of the Daggerheart system",
-    "version": "2.0.1",
+    "version": "2.0.3",
     "compatibility": {
         "minimum": "14.359",
         "verified": "14.359",
@@ -296,7 +296,7 @@
     "background": "systems/daggerheart/assets/logos/FoundrybornBackgroundLogo.png",
     "primaryTokenAttribute": "resources.hitPoints",
     "secondaryTokenAttribute": "resources.stress",
-    "url": "https://your/hosted/system/repo/",
+    "url": "https://github.com/Foundryborne/daggerheart",
-    "manifest": "https://your/hosted/system/repo/system.json",
+    "manifest": "https://raw.githubusercontent.com/Foundryborne/daggerheart/main/system.json",
-    "download": "https://your/packaged/download/archive.zip"
+    "download": "https://github.com/Foundryborne/daggerheart/releases/download/2.0.3/system.zip"
 }

templates/sheets/actors/party/resources.hbs

@@ -87,6 +87,12 @@
                             </div>
                         {{/unless}}
 
+                        {{#if (eq actor.type 'character')}}
+                            <div class="stat-section">
+                                <h4>{{localize "DAGGERHEART.GENERAL.evasion"}}: {{actor.system.evasion}}</h4>
+                            </div>
+                        {{/if}}
+
                         {{#unless (eq actor.type 'companion')}}
                             <div class="threshold-section">
                                 <h4 class="threshold-label">{{localize "DAGGERHEART.GENERAL.DamageThresholds.minor"}}</h4>