public/foundryvtt-reve-de-dragon
1
1
Fork 1
Code Issues 4 Pull Requests Actions Projects Releases 162 Wiki Activity

Préparation ajout empoignade, ActiveEffect #502

Merged
vincent.vandeme merged 1 commits from v1.5-active-effect into v1.5 2021-07-03 08:34:42 +02:00
Conversation 1 Commits 1 Files Changed 2 +5 -8
2 changed files with 5 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
module/actor.js
View File

@ -2155,10 +2155,7 @@ export class RdDActor extends Actor {
async appliquerAjoutExperience(rollData, display) { async appliquerAjoutExperience(rollData, display) {
if (!this.isPersonnage()) return; if (!this.isPersonnage()) return;
let xpData = await this._appliquerExperience(rollData.rolled, rollData.selectedCarac.label, rollData.competence); let xpData = await this._appliquerExperience(rollData.rolled, rollData.selectedCarac.label, rollData.competence);
if (!xpData) { if (xpData && display) {
return;
}
if (display) {
let message = { let message = {
whisher: ChatUtility.getWhisperRecipientsAndGMs(this.name), whisher: ChatUtility.getWhisperRecipientsAndGMs(this.name),
content: await renderTemplate(`systems/foundryvtt-reve-de-dragon/templates/chat-actor-gain-xp.html`, xpData) content: await renderTemplate(`systems/foundryvtt-reve-de-dragon/templates/chat-actor-gain-xp.html`, xpData)
@ -2168,7 +2165,7 @@ export class RdDActor extends Actor {
} }
/* -------------------------------------------- */ /* -------------------------------------------- */
async _appliquerAppelMoral(rollData, display = true) { async _appliquerAppelMoral(rollData) {
if (!this.isPersonnage()) return; if (!this.isPersonnage()) return;
if (!rollData.useMoral) return; if (!rollData.useMoral) return;
if (rollData.rolled.isEchec || if (rollData.rolled.isEchec ||