Merged with main

module/data/chat-message/adversaryRoll.mjs

@@ -1,7 +1,9 @@
+import { DHBaseAction } from '../action/action.mjs';
+
+const fields = foundry.data.fields;
+
 export default class DHAdversaryRoll extends foundry.abstract.TypeDataModel {
     static defineSchema() {
-        const fields = foundry.data.fields;
-
         return {
             title: new fields.StringField(),
             roll: new fields.DataField(),
@@ -20,6 +22,7 @@ export default class DHAdversaryRoll extends foundry.abstract.TypeDataModel {
                     })
                 })
             ),
+            targetSelection: new fields.BooleanField({ initial: true }),
             hasDamage: new fields.BooleanField({ initial: false }),
             hasHealing: new fields.BooleanField({ initial: false }),
             hasEffect: new fields.BooleanField({ initial: false }),
@@ -28,11 +31,20 @@ export default class DHAdversaryRoll extends foundry.abstract.TypeDataModel {
                 actor: new fields.StringField(),
                 item: new fields.StringField(),
                 action: new fields.StringField()
-            })
+            }),
+            damage: new fields.ObjectField()
         };
     }
 
     get messageTemplate() {
         return 'systems/daggerheart/templates/chat/adversary-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 => DHBaseAction.formatTarget(t))
+                : this.targets;
+    }
 }

module/data/chat-message/damageRoll.mjs

@@ -3,7 +3,7 @@ export default class DHDamageRoll extends foundry.abstract.TypeDataModel {
         const fields = foundry.data.fields;
 
         return {
-            messageType: new fields.StringField({initial: 'damage'}),
+            messageType: new fields.StringField({ initial: 'damage' }),
             title: new fields.StringField(),
             roll: new fields.DataField({}),
             targets: new fields.ArrayField(
@@ -19,6 +19,7 @@ export default class DHDamageRoll extends foundry.abstract.TypeDataModel {
                     })
                 })
             ),
+            targetSelection: new fields.BooleanField({ initial: true }),
             hasSave: new fields.BooleanField({ initial: false }),
             onSave: new fields.StringField(),
             source: new fields.SchemaField({
@@ -27,11 +28,19 @@ export default class DHDamageRoll extends foundry.abstract.TypeDataModel {
                 action: new fields.StringField(),
                 message: new fields.StringField()
             }),
-            directDamage: new fields.BooleanField({initial: true})
+            directDamage: new fields.BooleanField({ initial: true })
         };
     }
 
     get messageTemplate() {
         return `systems/daggerheart/templates/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 => DHBaseAction.formatTarget(t))
+                : this.targets;
+    }
 }

module/data/chat-message/dualityRoll.mjs

@@ -1,44 +1,6 @@
-const fields = foundry.data.fields;
-
-export default class DHDualityRoll extends foundry.abstract.TypeDataModel {
-    static dualityResult = {
-        hope: 1,
-        fear: 2,
-        critical: 3
-    };
-
-    static defineSchema() {
-        return {
-            title: new fields.StringField(),
-            roll: new fields.DataField({}),
-            targets: new fields.ArrayField(
-                new fields.SchemaField({
-                    id: new fields.StringField({}),
-                    actorId: new fields.StringField({}),
-                    name: new fields.StringField({}),
-                    img: new fields.StringField({}),
-                    difficulty: new fields.NumberField({ integer: true, nullable: true }),
-                    evasion: new fields.NumberField({ integer: true }),
-                    hit: new fields.BooleanField({ initial: false }),
-                    saved: new fields.SchemaField({
-                        result: new fields.NumberField(),
-                        success: new fields.BooleanField({ nullable: true, initial: null })
-                    })
-                })
-            ),
-            costs: new fields.ArrayField(new fields.ObjectField()),
-            hasDamage: new fields.BooleanField({ initial: false }),
-            hasHealing: new fields.BooleanField({ initial: false }),
-            hasEffect: new fields.BooleanField({ initial: false }),
-            hasSave: new fields.BooleanField({ initial: false }),
-            source: new fields.SchemaField({
-                actor: new fields.StringField(),
-                item: new fields.StringField(),
-                action: new fields.StringField()
-            })
-        };
-    }
+import DHAdversaryRoll from './adversaryRoll.mjs';
 
+export default class DHDualityRoll extends DHAdversaryRoll {
     get messageTemplate() {
         return 'systems/daggerheart/templates/chat/duality-roll.hbs';
     }