diff --git a/module/sheets/WitcherActorSheet.js b/module/sheets/WitcherActorSheet.js index 7672e734..cde89a52 100644 --- a/module/sheets/WitcherActorSheet.js +++ b/module/sheets/WitcherActorSheet.js @@ -1170,9 +1170,12 @@ export default class WitcherActorSheet extends ActorSheet { if (customModifier < 0){formula += !displayRollDetails ? `${customModifier}`: `${customModifier}[${game.i18n.localize("WITCHER.Settings.Custom")}]`} if (customModifier > 0){formula += !displayRollDetails ? `+${customModifier}` : `+${customModifier}[${game.i18n.localize("WITCHER.Settings.Custom")}]`} let rollResult = await new Roll(formula).roll() - let messageData = {flavor:`

${spellItem.name}

+ let messageData = { + speaker: {alias: this.actor.name}, + flavor:`

${spellItem.name}

${game.i18n.localize("WITCHER.Spell.StaCost")}: ${staCostdisplay}
-
${game.i18n.localize("WITCHER.Spell.Effect")}: ${spellItem.data.data.effect}
`} +
${game.i18n.localize("WITCHER.Spell.Effect")}: ${spellItem.data.data.effect}
` + } if (spellItem.data.data.range) { messageData.flavor += `
${game.i18n.localize("WITCHER.Spell.Range")}: ${spellItem.data.data.range}
` } @@ -1306,7 +1309,10 @@ export default class WitcherActorSheet extends ActorSheet { rollFormula += !displayRollDetails ? `+${customAtt}` : `+${customAtt}[${game.i18n.localize("WITCHER.Settings.Custom")}]` } let rollResult = await new Roll(rollFormula).roll() - let messageData = {flavor: `

${name}

${effet}`} + let messageData = { + speaker: {alias: this.actor.name}, + flavor: `

${name}

${effet}` + } if (rollResult.dice[0].results[0].result == 10){ messageData.flavor += `
${game.i18n.localize("WITCHER.Crit")}
`; } @@ -1324,7 +1330,10 @@ export default class WitcherActorSheet extends ActorSheet { async _onCritRoll(event) { let rollResult = await new Roll("1d10x10").roll() - rollResult.toMessage() + let messageData = { + speaker: {alias: this.actor.name} + } + rollResult.toMessage(messageData) } async _onDeathSaveRoll(event) { @@ -1338,12 +1347,15 @@ export default class WitcherActorSheet extends ActorSheet { } stunBase -= this.actor.data.data.deathSaves - let messageData = {flavor: ` -

${game.i18n.localize("WITCHER.DeathSave")}

-
-
${game.i18n.localize("WITCHER.Chat.SaveText")} ${stunBase}
-
-
`} + let messageData = { + speaker: {alias: this.actor.name}, + flavor: ` +

${game.i18n.localize("WITCHER.DeathSave")}

+
+
${game.i18n.localize("WITCHER.Chat.SaveText")} ${stunBase}
+
+
` + } if (rollResult.total < stunBase) { messageData.flavor += `
${game.i18n.localize("WITCHER.Chat.Success")}
` } @@ -1380,7 +1392,7 @@ export default class WitcherActorSheet extends ActorSheet { }); let rollResult = await new Roll("1d10").roll() - let messageData = {} + let messageData = {speaker: {alias: this.actor.name}} messageData.flavor = `

${game.i18n.localize("WITCHER.Reputation")}

@@ -1408,7 +1420,7 @@ export default class WitcherActorSheet extends ActorSheet { }); let rollResult = await new Roll("1d10").roll() - let messageData = {} + let messageData = {speaker: {alias: this.actor.name}} let faceDownValue = rollResult.total + Number(repValue) + Number(this.actor.data.data.stats.will.current) messageData.flavor = ` @@ -1551,7 +1563,7 @@ export default class WitcherActorSheet extends ActorSheet { } let rollResult = await new Roll("1d10").roll() - let messageData = {} + let messageData = {speaker: {alias: this.actor.name}} messageData.flavor = `

${game.i18n.localize(statName)}

diff --git a/scripts/actions.js b/scripts/actions.js index a72ae16a..f05ddcb1 100644 --- a/scripts/actions.js +++ b/scripts/actions.js @@ -194,7 +194,8 @@ async function ApplyDamage(actor, dmgType, location, totalDamage){ content: messageContent, speaker: {alias: actor.name}, } - (await new Roll("1d6").roll()).toMessage(messageData); + let rollResult = await new Roll("1").roll() + rollResult.toMessage(messageData) return } switch(location){ @@ -318,7 +319,8 @@ async function ApplyDamage(actor, dmgType, location, totalDamage){ content: messageContent, speaker: {alias: actor.name}, } - (await new Roll("1d6").roll()).toMessage(messageData) + let rollResult = await new Roll("1").roll() + rollResult.toMessage(messageData) actor?.update({ 'data.derivedStats.hp.value': actor.data.data.derivedStats.hp.value - Math.floor(totalDamage)