From 7943d38e87120497de9b5e2e9d162c32be6d26d9 Mon Sep 17 00:00:00 2001 From: Marco Braga Date: Thu, 22 Apr 2021 21:59:36 +0200 Subject: [PATCH 1/3] Fix rnkMessage not passing on actor object for NPCs --- system/scripts/combat.js | 2 +- system/scripts/dice/dice-picker-dialog.js | 20 +++++++++++--------- system/scripts/dice/roll-n-keep-dialog.js | 16 ++++++++++------ 3 files changed, 22 insertions(+), 16 deletions(-) diff --git a/system/scripts/combat.js b/system/scripts/combat.js index 96575eb..f76b138 100644 --- a/system/scripts/combat.js +++ b/system/scripts/combat.js @@ -112,7 +112,7 @@ export class CombatL5r5e extends Combat { // Ugly but work... i need the new message if (ids.length === 1) { - combatant.actor.rnkMessage = rnkMessage; + messageOptions.rnkMessage = rnkMessage; } // if the character succeeded on their Initiative check, they add 1 to their base initiative value, diff --git a/system/scripts/dice/dice-picker-dialog.js b/system/scripts/dice/dice-picker-dialog.js index 50aa0c2..5a73ae2 100644 --- a/system/scripts/dice/dice-picker-dialog.js +++ b/system/scripts/dice/dice-picker-dialog.js @@ -434,22 +434,24 @@ export class DicePickerDialog extends FormApplication { let message; if (this.object.isInitiativeRoll) { // Initiative roll + let msgOptions = { + skillId: this.object.skill.id, + difficulty: this.object.difficulty.value, + difficultyHidden: this.object.difficulty.hidden, + useVoidPoint: this.object.useVoidPoint, + skillAssistance: this.object.skill.assistance, + }; + await this._actor.rollInitiative({ initiativeOptions: { formula: formula.join("+"), // updateTurn: true, - messageOptions: { - skillId: this.object.skill.id, - difficulty: this.object.difficulty.value, - difficultyHidden: this.object.difficulty.hidden, - useVoidPoint: this.object.useVoidPoint, - skillAssistance: this.object.skill.assistance, - }, + messageOptions: msgOptions, }, }); // Adhesive tape to get the messageId :/ - message = this._actor.rnkMessage; - delete this._actor.rnkMessage; + message = msgOptions.rnkMessage; + delete msgOptions.rnkMessage; } else { // Regular roll, so let's roll ! const roll = await new game.l5r5e.RollL5r5e(formula.join("+")); diff --git a/system/scripts/dice/roll-n-keep-dialog.js b/system/scripts/dice/roll-n-keep-dialog.js index fad6b9e..cad314e 100644 --- a/system/scripts/dice/roll-n-keep-dialog.js +++ b/system/scripts/dice/roll-n-keep-dialog.js @@ -613,24 +613,28 @@ export class RollnKeepDialog extends FormApplication { const msgOldId = this._message._id; if (this.roll.l5r5e.isInitiativeRoll) { + let msgOptions = { + rnkRoll: this.roll, + }; + await this.roll.l5r5e.actor.rollInitiative({ rerollInitiative: true, initiativeOptions: { - messageOptions: { - rnkRoll: this.roll, - }, + messageOptions: msgOptions, }, }); // Adhesive tape to get the message :/ - this.message = this.roll.l5r5e.actor.rnkMessage; - delete this.roll.l5r5e.actor.rnkMessage; + this.message = msgOptions.rnkMessage; + delete msgOptions.rnkMessage; } else { // Send it to chat, switch to new message this.message = await this.roll.toMessage(); } // Refresh viewers - game.l5r5e.sockets.updateMessageIdAndRefresh(appOldId, this._message._id); + if (this._message) { + game.l5r5e.sockets.updateMessageIdAndRefresh(appOldId, this._message._id); + } // Delete old chat message related to this series if (game.settings.get("l5r5e", "rnk.deleteOldMessage")) { From 62f350f4a8e98893f3f296d2ca92fbf40710d808 Mon Sep 17 00:00:00 2001 From: Marco Braga Date: Fri, 23 Apr 2021 11:30:26 +0200 Subject: [PATCH 2/3] Show keep limit in RnK --- system/templates/dice/roll-n-keep-dialog.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/system/templates/dice/roll-n-keep-dialog.html b/system/templates/dice/roll-n-keep-dialog.html index cbc8efe..1772572 100644 --- a/system/templates/dice/roll-n-keep-dialog.html +++ b/system/templates/dice/roll-n-keep-dialog.html @@ -37,7 +37,7 @@ {{!-- Face Rings --}}
- {{localize 'l5r5e.roll_n_keep.swap_drop_here'}} + {{localize 'l5r5e.roll_n_keep.swap_drop_here'}} ({{l5r5e.keepLimit}} {{localize 'l5r5e.max'}}) {{#each data.swapDiceFaces.rings}} From 35f61dac84fd089981ad7ad237c4658daa729c99 Mon Sep 17 00:00:00 2001 From: Marco Braga Date: Fri, 23 Apr 2021 11:34:41 +0200 Subject: [PATCH 3/3] Fixed keep limit position --- system/templates/dice/roll-n-keep-dialog.html | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/system/templates/dice/roll-n-keep-dialog.html b/system/templates/dice/roll-n-keep-dialog.html index 1772572..dca5a24 100644 --- a/system/templates/dice/roll-n-keep-dialog.html +++ b/system/templates/dice/roll-n-keep-dialog.html @@ -37,7 +37,7 @@ {{!-- Face Rings --}}
- {{localize 'l5r5e.roll_n_keep.swap_drop_here'}} ({{l5r5e.keepLimit}} {{localize 'l5r5e.max'}}) + {{localize 'l5r5e.roll_n_keep.swap_drop_here'}} {{#each data.swapDiceFaces.rings}} @@ -84,7 +84,7 @@ {{!-- Keep --}}
- {{localize 'l5r5e.roll_n_keep.keep_drop_here'}} + {{localize 'l5r5e.roll_n_keep.keep_drop_here'}} ({{l5r5e.keepLimit}} {{localize 'l5r5e.max'}})