Good for now

module/applications/sheets/actors/adversary.mjs

@@ -108,17 +108,15 @@ export default class AdversarySheet extends DHBaseActorSheet {
      */
     static #reactionRoll(event) {
         const config = {
-            event: event,
+            event,
             title: `Reaction Roll: ${this.actor.name}`,
             headerTitle: 'Adversary Reaction Roll',
             roll: {
                 type: 'reaction'
             },
-            chatMessage: {
-                type: 'adversaryRoll',
-                template: 'systems/daggerheart/templates/ui/chat/adversary-roll.hbs',
-                mute: true
-            }
+            type: 'trait',
+            hasRoll: true,
+            data: this.actor.getRollData()
         };
 
         this.actor.diceRoll(config);

module/data/action/damageAction.mjs

@@ -61,43 +61,5 @@ export default class DHDamageAction extends DHBaseAction {
         }
 
         return CONFIG.Dice.daggerheart.DamageRoll.build(config);
-
-        /* const systemData = data.system ?? data;
-
-        let formulas = this.damage.parts.map(p => ({
-            formula: this.getFormulaValue(p, data).getFormula(this.actor),
-            damageTypes: p.applyTo === 'hitPoints' && !p.type.size ? new Set(['physical']) : p.type,
-            applyTo: p.applyTo
-        }));
-
-        if (!formulas.length) return;
-
-        formulas = this.formatFormulas(formulas, systemData);
-
-        const config = {
-            title: game.i18n.format(`DAGGERHEART.UI.Chat.${this.type === 'healing' ? 'healing' : 'damage'}Roll.title`, {
-                damage: game.i18n.localize(this.name)
-            }),
-            roll: formulas,
-            targets: systemData.targets?.filter(t => t.hit) ?? data.targets,
-            hasSave: this.hasSave,
-            isCritical: systemData.roll?.isCritical ?? false,
-            isHealing: this.type === 'healing',
-            hasDamage: this.type !== 'healing',
-            hasHealing: this.type === 'healing',
-            hasTarget: true,
-            source: systemData.source,
-            data: this.getRollData(),
-            event
-        };
-        if (this.hasSave) config.onSave = this.save.damageMod;
-        if (data.system) {
-            config.source.message = data._id;
-            config.directDamage = false;
-        } else {
-            config.directDamage = true;
-        }
-
-        return CONFIG.Dice.daggerheart.DamageRoll.build(config); */
     }
 }

module/data/chat-message/_modules.mjs

@@ -1,21 +1,11 @@
 import DHAbilityUse from "./abilityUse.mjs";
-import DHAdversaryRoll from "./adversaryRoll.mjs";
-import DHDamageRoll from "./damageRoll.mjs";
-import DHDualityRoll from "./dualityRoll.mjs";
+import DHActorRoll from "./adversaryRoll.mjs";
 import DHApplyEffect from './applyEffects.mjs'
 
-export {
-  DHAbilityUse,
-  DHAdversaryRoll,
-  DHDamageRoll,
-  DHDualityRoll,
-  DHApplyEffect
-}
-
 export const config = {
   abilityUse: DHAbilityUse,
-  adversaryRoll: DHAdversaryRoll,
-  damageRoll: DHDamageRoll,
-  dualityRoll: DHDualityRoll,
+  adversaryRoll: DHActorRoll,
+  damageRoll: DHActorRoll,
+  dualityRoll: DHActorRoll,
   applyEffect: DHApplyEffect
 };

module/data/chat-message/adversaryRoll.mjs

@@ -1,6 +1,6 @@
 const fields = foundry.data.fields;
 
-export default class DHAdversaryRoll extends foundry.abstract.TypeDataModel {
+export default class DHActorRoll extends foundry.abstract.TypeDataModel {
     static defineSchema() {
         return {
             title: new fields.StringField(),
@@ -27,13 +27,17 @@ export default class DHAdversaryRoll extends foundry.abstract.TypeDataModel {
             hasEffect: new fields.BooleanField({ initial: false }),
             hasSave: new fields.BooleanField({ initial: false }),
             hasTarget: new fields.BooleanField({ initial: false }),
+            isCritical: new fields.BooleanField({ initial: false }),
             onSave: new fields.StringField(),
             source: new fields.SchemaField({
                 actor: new fields.StringField(),
                 item: new fields.StringField(),
                 action: new fields.StringField()
             }),
-            damage: new fields.ObjectField()
+            damage: new fields.ObjectField(),
+            costs: new fields.ArrayField(
+                new fields.ObjectField()
+            )
         };
     }
 

module/data/chat-message/damageRoll.mjs

@@ -1,65 +0,0 @@
-export default class DHDamageRoll extends foundry.abstract.TypeDataModel {
-    static defineSchema() {
-        const fields = foundry.data.fields;
-
-        return {
-            messageType: new fields.StringField({ initial: 'damage' }),
-            title: new fields.StringField(),
-            roll: new fields.DataField({}),
-            targets: new fields.ArrayField(
-                new fields.SchemaField({
-                    id: new fields.StringField({ required: true }),
-                    actorId: new fields.StringField({}),
-                    name: new fields.StringField(),
-                    img: new fields.StringField(),
-                    hit: new fields.BooleanField({ initial: false }),
-                    saved: new fields.SchemaField({
-                        result: new fields.NumberField(),
-                        success: new fields.BooleanField({ nullable: true, initial: null })
-                    })
-                })
-            ),
-            targetSelection: new fields.BooleanField({ initial: false }),
-            hasSave: new fields.BooleanField({ initial: false }),
-            isHealing: new fields.BooleanField({ initial: false }),
-            onSave: new fields.StringField(),
-            source: new fields.SchemaField({
-                actor: new fields.StringField(),
-                item: new fields.StringField(),
-                action: new fields.StringField(),
-                message: new fields.StringField()
-            }),
-            directDamage: new fields.BooleanField({ initial: true }),
-            damage: new fields.ObjectField(),
-            hasRoll: new fields.BooleanField({ initial: false }),
-            hasDamage: new fields.BooleanField({ initial: false }),
-            hasHealing: new fields.BooleanField({ initial: false }),
-            hasEffect: new fields.BooleanField({ initial: false })
-        };
-    }
-
-    get messageTemplate() {
-        return `systems/daggerheart/templates/ui/chat/roll.hbs`;
-        // return `systems/daggerheart/templates/ui/chat/${this.messageType}-roll.hbs`;
-    }
-
-    prepareDerivedData() {
-        this.hasHitTarget = this.targets.filter(t => t.hit === true).length > 0;
-        this.currentTargets =
-            this.targetSelection !== true
-                ? Array.from(game.user.targets).map(t =>
-                      game.system.api.fields.ActionFields.TargetField.formatTarget(t)
-                  )
-                : this.targets;
-        if(this.targetSelection === true) {
-            this.targetShort = this.targets.reduce((a,c) => {
-                if(c.hit) a.hit += 1;
-                else c.miss += 1;
-                return a;
-            }, {hit: 0, miss: 0})
-        }
-        this.pendingSaves = this.targets.filter(
-            target => target.hit && target.saved.success === null
-        ).length > 0;
-    }
-}

module/data/chat-message/dualityRoll.mjs

@@ -1,7 +0,0 @@
-import DHAdversaryRoll from './adversaryRoll.mjs';
-
-export default class DHDualityRoll extends DHAdversaryRoll {
-    get messageTemplate() {
-        return 'systems/daggerheart/templates/ui/chat/roll.hbs';
-    }
-}

module/dice/d20Roll.mjs

@@ -13,8 +13,6 @@ export default class D20Roll extends DHRoll {
         DISADVANTAGE: -1
     };
 
-    static messageType = 'adversaryRoll';
-
     static CRITICAL_TRESHOLD = 20;
 
     static DefaultDialog = D20RollDialog;
@@ -153,7 +151,6 @@ export default class D20Roll extends DHRoll {
             data.difficulty = config.roll.difficulty;
             data.success = roll.isCritical || roll.total >= config.roll.difficulty;
         }
-        data.type = config.roll.type;
         data.advantage = {
             type: config.roll.advantage,
             dice: roll.dAdvantage?.denomination,
@@ -167,7 +164,7 @@ export default class D20Roll extends DHRoll {
                 rerolls: dice.results.filter(x => x.rerolled)
             }
         }));
-        data.isCritical = roll.isCritical;
+        data.isCritical = config.isCritical = roll.isCritical;
         data.extra = roll.dice
             .filter(d => !roll.baseTerms.includes(d))
             .map(d => {

module/dice/damageRoll.mjs

@@ -6,8 +6,6 @@ export default class DamageRoll extends DHRoll {
         super(formula, data, options);
     }
 
-    static messageType = 'dualityRoll';
-
     static DefaultDialog = DamageDialog;
 
     static async buildEvaluate(roll, config = {}, message = {}) {

module/dice/dhRoll.mjs

@@ -92,11 +92,8 @@ export default class DHRoll extends Roll {
                 system: config,
                 rolls: [roll]
             };
-        // msg.applyRollMode(config.selectedRollMode);
-        // return msg;
         if(roll._evaluated) return await cls.create(msg, { rollMode: config.selectedRollMode });
         return msg;
-        // return await cls.create(msg);
     }
 
     static applyKeybindings(config) {

module/systemRegistration/handlebars.mjs

@@ -26,8 +26,6 @@ export const preloadHandlebarsTemplates = async function () {
         'systems/daggerheart/templates/actionTypes/effect.hbs',
         'systems/daggerheart/templates/actionTypes/beastform.hbs',
         'systems/daggerheart/templates/settings/components/settings-item-line.hbs',
-        'systems/daggerheart/templates/ui/chat/parts/damage-chat.hbs',
-        'systems/daggerheart/templates/ui/chat/parts/target-chat.hbs',
         'systems/daggerheart/templates/ui/tooltip/parts/tooltipChips.hbs',
         'systems/daggerheart/templates/ui/tooltip/parts/tooltipTags.hbs',
         'systems/daggerheart/templates/dialogs/downtime/activities.hbs',