229 - Narrative Countdown Window Update (#237)

* Improved

* Fixed the mode not sticking

* Removed console log

module/data/action/action.mjs

@@ -403,11 +403,18 @@ export class DHBaseAction extends foundry.abstract.DataModel {
     hasCost(costs) {
         const realCosts = this.getRealCosts(costs),
             hasFearCost = realCosts.findIndex(c => c.type === 'fear');
-        if(hasFearCost > -1) {
+        if (hasFearCost > -1) {
             const fearCost = realCosts.splice(hasFearCost, 1);
-            if(!game.user.isGM || fearCost[0].total > game.settings.get(SYSTEM.id, SYSTEM.SETTINGS.gameSettings.Resources.Fear)) return false;
+            if (
+                !game.user.isGM ||
+                fearCost[0].total > game.settings.get(SYSTEM.id, SYSTEM.SETTINGS.gameSettings.Resources.Fear)
+            )
+                return false;
         }
-        return realCosts.reduce((a, c) => a && this.actor.system.resources[c.type]?.value >= (c.total ?? c.value), true);
+        return realCosts.reduce(
+            (a, c) => a && this.actor.system.resources[c.type]?.value >= (c.total ?? c.value),
+            true
+        );
     }
     /* COST */
 
@@ -499,19 +506,25 @@ export class DHBaseAction extends foundry.abstract.DataModel {
 
     /* SAVE */
     async rollSave(target, event, message) {
-        if(!target?.actor) return;
-        return target.actor.diceRoll({
-            event,
-            title: 'Roll Save',
-            roll: {
-                trait: this.save.trait,
-                difficulty: this.save.difficulty,
-                type: "reaction"
-            },
-            data: target.actor.getRollData()
-        }).then(async (result) => {
-            if(result) this.updateChatMessage(message, target.id, {result: result.roll.total, success: result.roll.success});
-        })
+        if (!target?.actor) return;
+        return target.actor
+            .diceRoll({
+                event,
+                title: 'Roll Save',
+                roll: {
+                    trait: this.save.trait,
+                    difficulty: this.save.difficulty,
+                    type: 'reaction'
+                },
+                data: target.actor.getRollData()
+            })
+            .then(async result => {
+                if (result)
+                    this.updateChatMessage(message, target.id, {
+                        result: result.roll.total,
+                        success: result.roll.success
+                    });
+            });
     }
 
     async updateChatMessage(message, targetId, changes, chain = true) {

module/data/chat-message/adversaryRoll.mjs

@@ -1,4 +1,4 @@
-import { DHBaseAction } from "../action/action.mjs";
+import { DHBaseAction } from '../action/action.mjs';
 
 const fields = foundry.data.fields;
 
@@ -42,6 +42,9 @@ export default class DHAdversaryRoll extends foundry.abstract.TypeDataModel {
 
     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;
+        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(
@@ -28,7 +28,7 @@ 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 })
         };
     }
 
@@ -38,6 +38,9 @@ export default class DHDamageRoll extends foundry.abstract.TypeDataModel {
 
     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;
+        this.currentTargets =
+            this.targetSelection !== true
+                ? Array.from(game.user.targets).map(t => DHBaseAction.formatTarget(t))
+                : this.targets;
     }
 }

module/data/chat-message/dualityRoll.mjs

@@ -1,4 +1,4 @@
-import DHAdversaryRoll from "./adversaryRoll.mjs";
+import DHAdversaryRoll from './adversaryRoll.mjs';
 
 export default class DHDualityRoll extends DHAdversaryRoll {
     get messageTemplate() {

module/data/countdowns.mjs

@@ -36,7 +36,8 @@ class DhCountdownData extends foundry.abstract.DataModel {
                         })
                     })
                 )
-            })
+            }),
+            window: new fields.SchemaField({})
         };
     }