uberwald/l5rx-chiaroscuro
0
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixes for RnK visibility

Browse Source
This commit is contained in:
Vlyan
2021-08-12 10:29:13 +02:00
parent 45af487a4b
commit 0d7ddddaee
5 changed files with 38 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
system/scripts/dice/roll-n-keep-dialog.js
View File

@@ -512,7 +512,13 @@ export class RollnKeepDialog extends FormApplication {
// Show DsN dice for the new roll
if (game.dice3d !== undefined) {
game.dice3d.showForRoll(roll, game.user, true);
game.dice3d.showForRoll(
roll,
game.user,
true,
this._message.data.whisper.length === 0 ? null : this._message.data.whisper,
this._message.data.blind
);
}
roll.terms.forEach((term) => {
@@ -617,6 +623,7 @@ export class RollnKeepDialog extends FormApplication {
if (this.roll.l5r5e.isInitiativeRoll) {
let msgOptions = {
rnkRoll: this.roll,
rollMode: game.l5r5e.HelpersL5r5e.getRollMode(this._message.data),
};
await this.roll.l5r5e.actor.rollInitiative({
@@ -630,7 +637,10 @@ export class RollnKeepDialog extends FormApplication {
delete msgOptions.rnkMessage;
} else {
// Send it to chat, switch to new message
this.message = await this.roll.toMessage();
this.message = await this.roll.toMessage(
{},
{ rollMode: game.l5r5e.HelpersL5r5e.getRollMode(this._message.data) }
);
}
// Refresh viewers

8
system/scripts/dice/roll.js
View File

@@ -302,8 +302,8 @@ export class RollL5r5e extends Roll {
// RollMode
const rMode = rollMode || messageData.rollMode || game.settings.get("core", "rollMode");
if (rollMode) {
ChatMessage.applyRollMode(messageData, rMode);
if (rMode) {
messageData = ChatMessage.applyRollMode(messageData, rMode);
}
// Prepare chat data
@@ -336,8 +336,8 @@ export class RollL5r5e extends Roll {
static fromData(data) {
const roll = super.fromData(data);
roll.data = duplicate(data.data);
roll.l5r5e = duplicate(data.l5r5e);
roll.data = foundry.utils.duplicate(data.data);
roll.l5r5e = foundry.utils.duplicate(data.l5r5e);
// get real Actor object
if (data.l5r5e.actor) {