Good for now

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';
-    }
-}