diff --git a/module/controllers/bol-rolls.js b/module/controllers/bol-rolls.js index 0151cc2..a2eaad2 100644 --- a/module/controllers/bol-rolls.js +++ b/module/controllers/bol-rolls.js @@ -677,10 +677,10 @@ export class BoLDefaultRoll { async sendChatMessage() { let actor = BoLUtility.getActorFromRollData(this.rollData) this._buildChatMessage(this.rollData).then(async msgFlavor => { + //console.log("MSG", msgFlavor ) let msg = await this.rollData.roll.toMessage({ user: game.user.id, rollMode: game.settings.get("core", "rollMode"), - //whisper: BoLUtility.getWhisperRecipientsAndGMs(this.rollData.actor.name), flavor: msgFlavor, speaker: ChatMessage.getSpeaker({ actor: actor }), }) diff --git a/module/system/bol-utility.js b/module/system/bol-utility.js index 8d3882c..b1032c0 100644 --- a/module/system/bol-utility.js +++ b/module/system/bol-utility.js @@ -31,7 +31,7 @@ export class BoLUtility { hint: "Sélectionne la formule de dés (par défaut 2d6)", scope: "world", config: true, - default: "2d6", + default: "6", type: String, choices: { "6": "2d6", "8":"2d8", "10":"2d10", "12":"2d12", "20":"2d20"}, onChange: value => { @@ -149,7 +149,7 @@ export class BoLUtility { df = "6" } return { - diceFormula: this.diceFormula, + diceFormula: df, successValue : this.successValue, criticalSuccessValue: this.criticalSuccessValue, criticalFailureValue: this.criticalFailureValue diff --git a/system.json b/system.json index a9fcd69..77bb2b5 100644 --- a/system.json +++ b/system.json @@ -14,7 +14,7 @@ ], "url": "https://www.uberwald.me/gitea/public/bol", "license": "LICENSE.txt", - "version": "10.5.11", + "version": "10.5.12", "compatibility": { "minimum": "10", "verified": "10" @@ -202,7 +202,7 @@ ], "socket": true, "manifest": "https://www.uberwald.me/gitea/public/bol/raw/v10/system.json", - "download": "https://www.uberwald.me/gitea/public/bol/archive/bol-v10.5.11.zip", + "download": "https://www.uberwald.me/gitea/public/bol/archive/bol-v10.5.12.zip", "background": "systems/bol/ui/page_accueil.webp", "gridDistance": 1.5, "gridUnits": "m", diff --git a/templates/chat/rolls/default-roll-card.hbs b/templates/chat/rolls/default-roll-card.hbs index c14d5b3..4d82bfd 100644 --- a/templates/chat/rolls/default-roll-card.hbs +++ b/templates/chat/rolls/default-roll-card.hbs @@ -1,20 +1,20 @@
{{#if isSuccess}} {{#if isLegendary}} -

 {{localize "BOL.ui.criticallegend"}}... +

{{localize "BOL.ui.criticallegend"}}... {{else}} {{#if isCritical}} -

 {{localize "BOL.ui.critical"}}... +

{{localize "BOL.ui.critical"}}... {{else}} -

 {{localize "BOL.ui.success"}}... +

{{localize "BOL.ui.success"}}... {{/if}} {{/if}} {{/if}} {{#if isFailure}} {{#if isFumble}} -

 {{localize "BOL.ui.fumble"}}... +

{{localize "BOL.ui.fumble"}}... {{else}} -

 {{localize "BOL.ui.failure"}}... +

{{localize "BOL.ui.failure"}}... {{/if}} {{/if}} {{actor.name}} @@ -52,9 +52,6 @@ {{/if}}
- - - {{#if isCritical}}
{{localize "BOL.chat.criticalinfo"}} @@ -83,14 +80,14 @@ {{/if}} {{#if reroll}} - + {{/if}} {{#if (and isSuccess (not isCritical))}} - + {{/if}} {{#if isRealCritical}} - + {{/if}}