Merged with refactor/84-data-models-structure

daggerheart.mjs

@@ -13,6 +13,7 @@ import { dualityRollEnricher } from './module/enrichers/DualityRollEnricher.mjs'
 import { getCommandTarget, rollCommandToJSON, setDiceSoNiceForDualityRoll } from './module/helpers/utils.mjs';
 import { abilities } from './module/config/actorConfig.mjs';
 import Resources from './module/applications/resources.mjs';
+import DHDualityRoll from './module/data/chat-message/dualityRoll.mjs';
 
 globalThis.SYSTEM = SYSTEM;
 
@@ -41,7 +42,7 @@ Hooks.once('init', () => {
     CONFIG.Item.dataModels = models.items.config;
 
     const { Items, Actors } = foundry.documents.collections;
-    Items.unregisterSheet('core', foundry.appv1.sheets.ItemSheet);
+    Items.unregisterSheet('core', foundry.applications.sheets.ItemSheetV2);
     Items.registerSheet(SYSTEM.id, applications.DhpAncestry, { types: ['ancestry'], makeDefault: true });
     Items.registerSheet(SYSTEM.id, applications.DhpCommunity, { types: ['community'], makeDefault: true });
     Items.registerSheet(SYSTEM.id, applications.DhpClassSheet, { types: ['class'], makeDefault: true });
@@ -54,16 +55,23 @@ Hooks.once('init', () => {
     Items.registerSheet(SYSTEM.id, applications.DhpArmor, { types: ['armor'], makeDefault: true });
 
     CONFIG.Actor.documentClass = documents.DhpActor;
-    CONFIG.Actor.dataModels = {
-        pc: models.DhpPC,
-        adversary: models.DhpAdversary,
-        environment: models.DhpEnvironment
-    };
-    Actors.unregisterSheet('core', foundry.appv1.sheets.ActorSheet);
-    Actors.registerSheet(SYSTEM.id, applications.DhpPCSheet, { types: ['pc'], makeDefault: true });
+    CONFIG.Actor.dataModels = models.actors.config;
+
+    Actors.unregisterSheet('core', foundry.applications.sheets.ActorSheetV2);
+    Actors.registerSheet(SYSTEM.id, applications.DhCharacterSheet, { types: ['character'], makeDefault: true });
     Actors.registerSheet(SYSTEM.id, applications.DhpAdversarySheet, { types: ['adversary'], makeDefault: true });
     Actors.registerSheet(SYSTEM.id, applications.DhpEnvironment, { types: ['environment'], makeDefault: true });
 
+    CONFIG.ActiveEffect.documentClass = documents.DhActiveEffect;
+    DocumentSheetConfig.unregisterSheet(
+        CONFIG.ActiveEffect.documentClass,
+        'core',
+        foundry.applications.sheets.ActiveEffectConfig
+    );
+    DocumentSheetConfig.registerSheet(CONFIG.ActiveEffect.documentClass, SYSTEM.id, applications.DhActiveEffectConfig, {
+        makeDefault: true
+    });
+
     CONFIG.Combat.dataModels = {
         base: models.DhCombat
     };
@@ -138,22 +146,28 @@ const renderDualityButton = async event => {
         title: button.dataset.label,
         value: rollModifier
     });
+
+    const systemData = new DHDualityRoll({
+        title: button.dataset.label,
+        origin: target.id,
+        roll: roll._formula,
+        modifiers: modifiers,
+        hope: hope,
+        fear: fear,
+        advantage: advantage,
+        disadvantage: disadvantage
+    });
+
     const cls = getDocumentClass('ChatMessage');
     const msgData = {
         type: 'dualityRoll',
         sound: CONFIG.sounds.dice,
-        system: {
-            title: button.dataset.label,
-            origin: target.id,
-            roll: roll._formula,
-            modifiers: modifiers,
-            hope: hope,
-            fear: fear,
-            advantage: advantage,
-            disadvantage: disadvantage
-        },
+        system: systemData,
         user: game.user.id,
-        content: 'systems/daggerheart/templates/chat/duality-roll.hbs',
+        content: await foundry.applications.handlebars.renderTemplate(
+            'systems/daggerheart/templates/chat/duality-roll.hbs',
+            systemData
+        ),
         rolls: [roll]
     };
 
@@ -227,29 +241,34 @@ Hooks.on('chatMessage', (_, message) => {
                         : undefined,
                     title
                 });
-            }).then(({ roll, attribute, title }) => {
+            }).then(async ({ roll, attribute, title }) => {
                 const cls = getDocumentClass('ChatMessage');
+                const systemData = new DHDualityRoll({
+                    title: title,
+                    origin: target?.id,
+                    roll: roll._formula,
+                    modifiers: attribute ? [attribute] : [],
+                    hope: { dice: rollCommand.hope ?? 'd12', value: roll.dice[0].total },
+                    fear: { dice: rollCommand.fear ?? 'd12', value: roll.dice[1].total },
+                    advantage:
+                        rollCommand.advantage && !rollCommand.disadvantage
+                            ? { dice: 'd6', value: roll.dice[2].total }
+                            : undefined,
+                    disadvantage:
+                        rollCommand.disadvantage && !rollCommand.advantage
+                            ? { dice: 'd6', value: roll.dice[2].total }
+                            : undefined
+                });
+
                 const msgData = {
                     type: 'dualityRoll',
                     sound: CONFIG.sounds.dice,
-                    system: {
-                        title: title,
-                        origin: target?.id,
-                        roll: roll._formula,
-                        modifiers: attribute ? [attribute] : [],
-                        hope: { dice: rollCommand.hope ?? 'd12', value: roll.dice[0].total },
-                        fear: { dice: rollCommand.fear ?? 'd12', value: roll.dice[1].total },
-                        advantage:
-                            rollCommand.advantage && !rollCommand.disadvantage
-                                ? { dice: 'd6', value: roll.dice[2].total }
-                                : undefined,
-                        disadvantage:
-                            rollCommand.disadvantage && !rollCommand.advantage
-                                ? { dice: 'd6', value: roll.dice[2].total }
-                                : undefined
-                    },
+                    system: systemData,
                     user: game.user.id,
-                    content: 'systems/daggerheart/templates/chat/duality-roll.hbs',
+                    content: await foundry.applications.handlebars.renderTemplate(
+                        'systems/daggerheart/templates/chat/duality-roll.hbs',
+                        systemData
+                    ),
                     rolls: [roll]
                 };
 
@@ -276,10 +295,10 @@ const preloadHandlebarsTemplates = async function () {
         'systems/daggerheart/templates/sheets/parts/heritage.hbs',
         'systems/daggerheart/templates/sheets/parts/subclassFeature.hbs',
         'systems/daggerheart/templates/sheets/parts/effects.hbs',
-        'systems/daggerheart/templates/sheets/pc/sections/inventory.hbs',
-        'systems/daggerheart/templates/sheets/pc/sections/loadout.hbs',
-        'systems/daggerheart/templates/sheets/pc/parts/heritageCard.hbs',
-        'systems/daggerheart/templates/sheets/pc/parts/advancementCard.hbs',
+        'systems/daggerheart/templates/sheets/character/sections/inventory.hbs',
+        'systems/daggerheart/templates/sheets/character/sections/loadout.hbs',
+        'systems/daggerheart/templates/sheets/character/parts/heritageCard.hbs',
+        'systems/daggerheart/templates/sheets/character/parts/advancementCard.hbs',
         'systems/daggerheart/templates/components/card-preview.hbs',
         'systems/daggerheart/templates/views/levelup/parts/selectable-card-preview.hbs',
         'systems/daggerheart/templates/sheets/global/partials/feature-section-item.hbs',