Fixed DSN rolling; removed console messages; chat message clean up

daggerheart.mjs

@@ -249,7 +249,6 @@ Hooks.on('chatMessage', (_, message) => {
     }
 
     if (message.startsWith('/fr')) {
-        console.log("fr message", message);
         const result =
             message.trim().toLowerCase() === '/fr' ? { result: {} } : rollCommandToJSON(message.replace(/\/fr\s?/, ''));
         if (!result) {
@@ -259,12 +258,10 @@ Hooks.on('chatMessage', (_, message) => {
 
         const { result: rollCommand, flavor } = result;
 
-        console.log("rollCommand", rollCommand);
         const fateType = rollCommand.type ?? "Hope";
-        console.log("fateType", fateType);
 
         const target = getCommandTarget({ allowNull: true });
-        const title = 'Fate';
+        const title = fateType + ' Fate Roll';
 
         enrichedFateRoll({
             target,

lang/en.json

@@ -2056,6 +2056,7 @@
                 "plural": "Experiences"
             },
             "failure": "Failure",
+            "fateRoll": "Fate Roll",
             "fear": "Fear",
             "features": "Features",
             "formula": "Formula",

module/data/chat-message/actorRoll.mjs

@@ -50,7 +50,7 @@ export default class DHActorRoll extends foundry.abstract.TypeDataModel {
             }),
             damage: new fields.ObjectField(),
             costs: new fields.ArrayField(new fields.ObjectField()),
-            successConsumed: new fields.BooleanField({ initial: false }),
+            successConsumed: new fields.BooleanField({ initial: false })
         };
     }
 

module/dice/dualityRoll.mjs

@@ -119,7 +119,6 @@ export default class DualityRoll extends D20Roll {
 
     /** @inheritDoc */
     static fromData(data) {
-        console.log("data", data);
         data.terms[0].class = foundry.dice.terms.Die.name;
         data.terms[2].class = foundry.dice.terms.Die.name;
         return super.fromData(data);
@@ -175,9 +174,6 @@ export default class DualityRoll extends D20Roll {
 
     static async buildEvaluate(roll, config = {}, message = {}) {
         await super.buildEvaluate(roll, config, message);
-        console.log("roll", config);
-        console.log("config", config);
-        console.log("message", message);
 
         await setDiceSoNiceForDualityRoll(
             roll,

module/dice/fateRoll.mjs

@@ -49,7 +49,6 @@ export default class FateRoll extends D20Roll {
 
 
     get fateDie() {
-        console.log("fateRoll this", this);
         return this.data.fateType;
     }
 
@@ -59,7 +58,6 @@ export default class FateRoll extends D20Roll {
 
     /** @inheritDoc */
     static fromData(data) {
-        console.log("data", data);
         data.terms[0].class = foundry.dice.terms.Die.name;
         return super.fromData(data);
     }
@@ -74,9 +72,6 @@ export default class FateRoll extends D20Roll {
 
     static async buildEvaluate(roll, config = {}, message = {}) {
         await super.buildEvaluate(roll, config, message);
-        console.log("roll", config);
-        console.log("config", config);
-        console.log("message", message);
 
         if (roll.fateDie === "Hope") {
             await setDiceSoNiceForHopeFateRoll(

module/documents/chatMessage.mjs

@@ -89,7 +89,6 @@ export default class DhpChatMessage extends foundry.documents.ChatMessage {
             }
             if (this.type === 'fateRoll') {
                 html.classList.add('fate');
-                html.classList.add('hope');
             }
 
             const autoExpandRoll = game.settings.get(

module/enrichers/FateRollEnricher.mjs

@@ -9,16 +9,15 @@ export default function DhFateRollEnricher(match, _options) {
 
 function getFateMessage(roll, flavor) {
     const label = flavor ?? 'Fate';
-    console.log("ROLL", roll);
 
     const dataLabel = game.i18n.localize('DAGGERHEART.GENERAL.fate');
 
     const fateElement = document.createElement('span');
     fateElement.innerHTML = `
-        <button type="button" class="fate-roll-button${roll?.inline ? ' inline' : ''}" 
+        <button type="button" class="fate-roll-button${roll?.inline ? ' inline' : ''}"
             data-title="${label}"
             data-label="${dataLabel}"
-            data-hope="${roll?.hope ?? 'd12'}" 
+            data-hope="${roll?.hope ?? 'd12'}"
             ${label}
         </button>
     `;

module/helpers/utils.mjs

@@ -73,14 +73,14 @@ export const setDiceSoNiceForHopeFateRoll = async (rollResult, hopeFaces) => {
     if (!game.modules.get('dice-so-nice')?.active) return;
     const { diceSoNice } = game.settings.get(CONFIG.DH.id, CONFIG.DH.SETTINGS.gameSettings.appearance);
     const diceSoNicePresets = await getDiceSoNicePreset(diceSoNice.hope, hopeFaces);
-    rollResult.dice[0].options = diceSoNicePresets.hope;
+    rollResult.dice[0].options = diceSoNicePresets;
 };
 
 export const setDiceSoNiceForFearFateRoll = async (rollResult, fearFaces) => {
     if (!game.modules.get('dice-so-nice')?.active) return;
     const { diceSoNice } = game.settings.get(CONFIG.DH.id, CONFIG.DH.SETTINGS.gameSettings.appearance);
     const diceSoNicePresets = await getDiceSoNicePreset(diceSoNice.fear, fearFaces);
-    rollResult.dice[0].options = diceSoNicePresets.fear;
+    rollResult.dice[0].options = diceSoNicePresets;
 };
 
 export const chunkify = (array, chunkSize, mappingFunc) => {

templates/ui/chat/parts/roll-part.hbs

@@ -103,7 +103,10 @@
                         {{/if}}
                     </div>
                 </div>
-                <div class="roll-formula">{{roll.formula}}</div>
+                {{#if roll.fate}}
+                {{else}}
+                    <div class="roll-formula">{{roll.formula}}</div>
+                {{/if}}
             </div>
         </div>
     </div>