From 2574cc93f78322a2ba11a2199cf2e22a0d5d54a8 Mon Sep 17 00:00:00 2001 From: U~man Date: Sat, 25 Jul 2020 23:55:16 +0200 Subject: [PATCH] FIX: raw attack --- src/module/actor/actor-sheet.js | 2 +- src/module/actor/entity.js | 4 +--- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/src/module/actor/actor-sheet.js b/src/module/actor/actor-sheet.js index e2e0706..0cdd053 100644 --- a/src/module/actor/actor-sheet.js +++ b/src/module/actor/actor-sheet.js @@ -164,7 +164,7 @@ export class OseActorSheet extends ActorSheet { let actorObject = this.actor; let element = event.currentTarget; let attack = element.parentElement.parentElement.dataset.attack; - actorObject.rollAttack({ skipDialog: ev.ctrlKey }, { type: attack }); + actorObject.rollAttack({roll: {}}, { type: attack, skipDialog: ev.ctrlKey }); }); html.find(".spells .item-reset").click((ev) => { diff --git a/src/module/actor/entity.js b/src/module/actor/entity.js index 11026dc..b6c18b2 100644 --- a/src/module/actor/entity.js +++ b/src/module/actor/entity.js @@ -421,14 +421,12 @@ export class OseActor extends Actor { }, }; - let skip = options.event && options.event.ctrlKey; - // Roll and return return OseDice.Roll({ event: options.event, parts: rollParts, data: rollData, - skipDialog: skip, + skipDialog: options.skipDialog, speaker: ChatMessage.getSpeaker({ actor: this }), flavor: label, title: label,