Merge branch 'development' into feature/628-allow-override-range-measurement-settings

module/applications/sheets/actors/adversary.mjs

@@ -25,11 +25,22 @@ export default class AdversarySheet extends DHBaseActorSheet {
     };
 
     static PARTS = {
-        sidebar: { template: 'systems/daggerheart/templates/sheets/actors/adversary/sidebar.hbs' },
+        sidebar: {
+            template: 'systems/daggerheart/templates/sheets/actors/adversary/sidebar.hbs',
+            scrollable: ['.shortcut-items-section']
+        },
         header: { template: 'systems/daggerheart/templates/sheets/actors/adversary/header.hbs' },
-        features: { template: 'systems/daggerheart/templates/sheets/actors/adversary/features.hbs' },
+        features: {
-        notes: { template: 'systems/daggerheart/templates/sheets/actors/adversary/notes.hbs' },
+            template: 'systems/daggerheart/templates/sheets/actors/adversary/features.hbs',
-        effects: { template: 'systems/daggerheart/templates/sheets/actors/adversary/effects.hbs' }
+            scrollable: ['.feature-section']
+        },
+        notes: {
+            template: 'systems/daggerheart/templates/sheets/actors/adversary/notes.hbs'
+        },
+        effects: {
+            template: 'systems/daggerheart/templates/sheets/actors/adversary/effects.hbs',
+            scrollable: ['.effects-sections']
+        }
     };
 
     /** @inheritdoc */

module/applications/sheets/actors/character.mjs

@@ -78,6 +78,7 @@ export default class CharacterSheet extends DHBaseActorSheet {
     static PARTS = {
         sidebar: {
             id: 'sidebar',
+            scrollable: ['.shortcut-items-section'],
             template: 'systems/daggerheart/templates/sheets/actors/character/sidebar.hbs'
         },
         header: {
@@ -86,22 +87,27 @@ export default class CharacterSheet extends DHBaseActorSheet {
         },
         features: {
             id: 'features',
+            scrollable: ['.features-sections'],
             template: 'systems/daggerheart/templates/sheets/actors/character/features.hbs'
         },
         loadout: {
             id: 'loadout',
+            scrollable: ['.items-section'],
             template: 'systems/daggerheart/templates/sheets/actors/character/loadout.hbs'
         },
         inventory: {
             id: 'inventory',
+            scrollable: ['.items-section'],
             template: 'systems/daggerheart/templates/sheets/actors/character/inventory.hbs'
         },
         biography: {
             id: 'biography',
+            scrollable: ['.items-section'],
             template: 'systems/daggerheart/templates/sheets/actors/character/biography.hbs'
         },
         effects: {
             id: 'effects',
+            scrollable: ['.effects-sections'],
             template: 'systems/daggerheart/templates/sheets/actors/character/effects.hbs'
         }
     };

module/applications/sheets/actors/companion.mjs

@@ -15,7 +15,10 @@ export default class DhCompanionSheet extends DHBaseActorSheet {
     static PARTS = {
         header: { template: 'systems/daggerheart/templates/sheets/actors/companion/header.hbs' },
         details: { template: 'systems/daggerheart/templates/sheets/actors/companion/details.hbs' },
-        effects: { template: 'systems/daggerheart/templates/sheets/actors/companion/effects.hbs' }
+        effects: {
+            template: 'systems/daggerheart/templates/sheets/actors/companion/effects.hbs',
+            scrollable: ['.effects-sections']
+        }
     };
 
     /* -------------------------------------------- */

module/applications/sheets/actors/environment.mjs

@@ -27,9 +27,13 @@ export default class DhpEnvironment extends DHBaseActorSheet {
     /**@override */
     static PARTS = {
         header: { template: 'systems/daggerheart/templates/sheets/actors/environment/header.hbs' },
-        features: { template: 'systems/daggerheart/templates/sheets/actors/environment/features.hbs' },
+        features: {
+            template: 'systems/daggerheart/templates/sheets/actors/environment/features.hbs',
+            scrollable: ['feature-section']
+        },
         potentialAdversaries: {
-            template: 'systems/daggerheart/templates/sheets/actors/environment/potentialAdversaries.hbs'
+            template: 'systems/daggerheart/templates/sheets/actors/environment/potentialAdversaries.hbs',
+            scrollable: ['items-sections']
         },
         notes: { template: 'systems/daggerheart/templates/sheets/actors/environment/notes.hbs' }
     };

module/dice/dhRoll.mjs

@@ -84,7 +84,7 @@ export default class DHRoll extends Roll {
 
     static async toMessage(roll, config) {
         const cls = getDocumentClass('ChatMessage'),
-            msg = {
+            msgData = {
                 type: this.messageType,
                 user: game.user.id,
                 title: roll.title,
@@ -94,8 +94,16 @@ export default class DHRoll extends Roll {
                 rolls: [roll]
             };
         config.selectedRollMode ??= game.settings.get('core', 'rollMode');
-        if (roll._evaluated) return await cls.create(msg, { rollMode: config.selectedRollMode });
+
-        return msg;
+        if (roll._evaluated) {
+            const message = await cls.create(msgData, { rollMode: config.selectedRollMode });
+
+            if (game.modules.get('dice-so-nice')?.active) {
+                await game.dice3d.waitFor3DAnimationByMessageID(message.id);
+            }
+
+            return message;
+        } else return msgData;
     }
 
     /** @inheritDoc */

src/packs/items/weapons/weapon_Advanced_Spear_pK6dsNABKKp1CIGN.json

@@ -99,46 +99,7 @@
       "artist": ""
     }
   },
-  "effects": [
+  "effects": [],
-    {
-      "name": "Cumbersome",
-      "description": "-1 to Finesse",
-      "img": "icons/commodities/metal/mail-plate-steel.webp",
-      "changes": [
-        {
-          "key": "system.traits.finesse.value",
-          "mode": 2,
-          "value": "-1"
-        }
-      ],
-      "_id": "hl0S2LrBY5Mg69q6",
-      "type": "base",
-      "system": {},
-      "disabled": false,
-      "duration": {
-        "startTime": null,
-        "combat": null
-      },
-      "origin": null,
-      "tint": "#ffffff",
-      "transfer": true,
-      "statuses": [],
-      "sort": 0,
-      "flags": {},
-      "_stats": {
-        "compendiumSource": null,
-        "duplicateSource": null,
-        "exportSource": null,
-        "coreVersion": "13.346",
-        "systemId": "daggerheart",
-        "systemVersion": "0.0.1",
-        "createdTime": 1753831987001,
-        "modifiedTime": 1753831987001,
-        "lastModifiedBy": "FecEtPuoQh6MpjQ0"
-      },
-      "_key": "!items.effects!pK6dsNABKKp1CIGN.hl0S2LrBY5Mg69q6"
-    }
-  ],
   "sort": 0,
   "ownership": {
     "default": 0,

src/packs/items/weapons/weapon_Hallowed_Axe_Vayg7CnRTFBrunjM.json

@@ -25,7 +25,7 @@
         "amount": 1
       },
       "roll": {
-        "trait": "agility",
+        "trait": "strength",
         "type": "attack",
         "difficulty": null,
         "bonus": null,
@@ -112,9 +112,9 @@
     "exportSource": null,
     "coreVersion": "13.347",
     "systemId": "daggerheart",
-    "systemVersion": "1.0.5",
+    "systemVersion": "1.0.6",
     "createdTime": 1753828229603,
-    "modifiedTime": 1755430661659,
+    "modifiedTime": 1755633052433,
     "lastModifiedBy": "VZIeX2YDvX338Zvr"
   },
   "_key": "!items!Vayg7CnRTFBrunjM"

src/packs/items/weapons/weapon_Improved_Spear_j5Pt1thLfcvopBij.json

@@ -99,46 +99,7 @@
       "artist": ""
     }
   },
-  "effects": [
+  "effects": [],
-    {
-      "name": "Cumbersome",
-      "description": "-1 to Finesse",
-      "img": "icons/commodities/metal/mail-plate-steel.webp",
-      "changes": [
-        {
-          "key": "system.traits.finesse.value",
-          "mode": 2,
-          "value": "-1"
-        }
-      ],
-      "_id": "8twXPJELZpvFWA5K",
-      "type": "base",
-      "system": {},
-      "disabled": false,
-      "duration": {
-        "startTime": null,
-        "combat": null
-      },
-      "origin": null,
-      "tint": "#ffffff",
-      "transfer": true,
-      "statuses": [],
-      "sort": 0,
-      "flags": {},
-      "_stats": {
-        "compendiumSource": null,
-        "duplicateSource": null,
-        "exportSource": null,
-        "coreVersion": "13.346",
-        "systemId": "daggerheart",
-        "systemVersion": "0.0.1",
-        "createdTime": 1753829466016,
-        "modifiedTime": 1753829466016,
-        "lastModifiedBy": "FecEtPuoQh6MpjQ0"
-      },
-      "_key": "!items.effects!j5Pt1thLfcvopBij.8twXPJELZpvFWA5K"
-    }
-  ],
   "sort": 0,
   "ownership": {
     "default": 0,

src/packs/items/weapons/weapon_Legendary_Spear_4e5pWxi2qohuGsWh.json

@@ -99,46 +99,7 @@
       "artist": ""
     }
   },
-  "effects": [
+  "effects": [],
-    {
-      "name": "Cumbersome",
-      "description": "-1 to Finesse",
-      "img": "icons/commodities/metal/mail-plate-steel.webp",
-      "changes": [
-        {
-          "key": "system.traits.finesse.value",
-          "mode": 2,
-          "value": "-1"
-        }
-      ],
-      "_id": "f44KWDgCQeKYfccr",
-      "type": "base",
-      "system": {},
-      "disabled": false,
-      "duration": {
-        "startTime": null,
-        "combat": null
-      },
-      "origin": null,
-      "tint": "#ffffff",
-      "transfer": true,
-      "statuses": [],
-      "sort": 0,
-      "flags": {},
-      "_stats": {
-        "compendiumSource": null,
-        "duplicateSource": null,
-        "exportSource": null,
-        "coreVersion": "13.346",
-        "systemId": "daggerheart",
-        "systemVersion": "0.0.1",
-        "createdTime": 1753834816288,
-        "modifiedTime": 1753834816288,
-        "lastModifiedBy": "FecEtPuoQh6MpjQ0"
-      },
-      "_key": "!items.effects!4e5pWxi2qohuGsWh.f44KWDgCQeKYfccr"
-    }
-  ],
   "sort": 0,
   "ownership": {
     "default": 0,

src/packs/items/weapons/weapon_Spear_TF85tKJetUjLwh54.json

@@ -99,46 +99,7 @@
       "artist": ""
     }
   },
-  "effects": [
+  "effects": [],
-    {
-      "name": "Cumbersome",
-      "description": "-1 to Finesse",
-      "img": "icons/commodities/metal/mail-plate-steel.webp",
-      "changes": [
-        {
-          "key": "system.traits.finesse.value",
-          "mode": 2,
-          "value": "-1"
-        }
-      ],
-      "_id": "Z5MnVI8EOOgzRdXC",
-      "type": "base",
-      "system": {},
-      "disabled": false,
-      "duration": {
-        "startTime": null,
-        "combat": null
-      },
-      "origin": null,
-      "tint": "#ffffff",
-      "transfer": true,
-      "statuses": [],
-      "sort": 0,
-      "flags": {},
-      "_stats": {
-        "compendiumSource": null,
-        "duplicateSource": null,
-        "exportSource": null,
-        "coreVersion": "13.346",
-        "systemId": "daggerheart",
-        "systemVersion": "0.0.1",
-        "createdTime": 1753828072355,
-        "modifiedTime": 1753828072355,
-        "lastModifiedBy": "FecEtPuoQh6MpjQ0"
-      },
-      "_key": "!items.effects!TF85tKJetUjLwh54.Z5MnVI8EOOgzRdXC"
-    }
-  ],
   "sort": 0,
   "ownership": {
     "default": 0,

styles/less/sheets/actors/adversary/effects.less

@@ -0,0 +1,17 @@
+@import '../../../utils/colors.less';
+
+.application.sheet.daggerheart.actor.dh-style.adversary {
+    .tab.effects {
+        .effects-sections {
+            display: flex;
+            flex-direction: column;
+            gap: 10px;
+            overflow-y: auto;
+            mask-image: linear-gradient(0deg, transparent 0%, black 5%);
+            padding-bottom: 20px;
+
+            scrollbar-width: thin;
+            scrollbar-color: light-dark(@dark-blue, @golden) transparent;
+        }
+    }
+}

styles/less/sheets/actors/companion/effects.less

@@ -0,0 +1,17 @@
+@import '../../../utils/colors.less';
+
+.application.sheet.daggerheart.actor.dh-style.companion {
+    .tab.effects {
+        .effects-sections {
+            display: flex;
+            flex-direction: column;
+            gap: 10px;
+            overflow-y: auto;
+            mask-image: linear-gradient(0deg, transparent 0%, black 5%);
+            padding-bottom: 20px;
+
+            scrollbar-width: thin;
+            scrollbar-color: light-dark(@dark-blue, @golden) transparent;
+        }
+    }
+}

styles/less/sheets/actors/environment/potentialAdversaries.less

@@ -0,0 +1,17 @@
+@import '../../../utils/colors.less';
+
+.application.sheet.daggerheart.actor.dh-style.environment {
+    .tab.potentialAdversaries {
+        .items-section {
+            display: flex;
+            flex-direction: column;
+            gap: 10px;
+            overflow-y: auto;
+            mask-image: linear-gradient(0deg, transparent 0%, black 5%);
+            padding-bottom: 20px;
+
+            scrollbar-width: thin;
+            scrollbar-color: light-dark(@dark-blue, @golden) transparent;
+        }
+    }
+}

styles/less/sheets/index.less

@@ -4,6 +4,7 @@
 @import './actors/adversary/header.less';
 @import './actors/adversary/sheet.less';
 @import './actors/adversary/sidebar.less';
+@import './actors/adversary/effects.less';
 
 @import './actors/character/biography.less';
 @import './actors/character/effects.less';
@@ -17,9 +18,11 @@
 @import './actors/companion/details.less';
 @import './actors/companion/header.less';
 @import './actors/companion/sheet.less';
+@import './actors/companion/effects.less';
 
 @import './actors/environment/actions.less';
 @import './actors/environment/header.less';
+@import './actors/environment/potentialAdversaries.less';
 @import './actors/environment/sheet.less';
 
 @import './items/beastform.less';

templates/sheets/actors/adversary/effects.hbs

@@ -1,5 +1,6 @@
 <section class='tab {{tabs.effects.cssClass}} {{tabs.effects.id}}' data-tab='{{tabs.effects.id}}'
     data-group='{{tabs.effects.group}}'>
+    <div class="effects-sections">
         {{> 'daggerheart.inventory-items'
         title='DAGGERHEART.GENERAL.activeEffects'
         type='effect'
@@ -17,4 +18,5 @@
         canCreate=true
         hideResources=true
         }}
+    </div>
 </section>

templates/sheets/actors/companion/effects.hbs

@@ -1,5 +1,6 @@
 <section class='tab {{tabs.effects.cssClass}} {{tabs.effects.id}}' data-tab='{{tabs.effects.id}}'
     data-group='{{tabs.effects.group}}'>
+    <div class="effects-sections">
         {{> 'daggerheart.inventory-items'
         title='DAGGERHEART.GENERAL.activeEffects'
         type='effect'
@@ -17,4 +18,5 @@
         canCreate=true
         hideResources=true
         }}
+    </div>
 </section>

templates/sheets/actors/environment/potentialAdversaries.hbs

@@ -3,7 +3,7 @@
     data-tab='{{tabs.potentialAdversaries.id}}'
     data-group='{{tabs.potentialAdversaries.group}}'
 >    
-    <div class="action-section">
+    <div class="items-section">
         {{#each document.system.potentialAdversaries as |category categoryId|}}
             {{> 'daggerheart.inventory-items'
             title=category.label