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

Fix double effet créatures

Browse Source
This commit is contained in:
Vincent Vandemeulebrouck
2021-01-19 23:39:35 +01:00
parent 807e58e36a
commit 7db9834b9a
8 changed files with 38 additions and 121 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
module/actor.js
View File

@ -1753,8 +1753,13 @@ export class RdDActor extends Actor {
/* -------------------------------------------- */
async rollCompetence(name) {
let rollData = { competence: this.getCompetence(name) }
if (rollData.competence.type == 'competencecreature') {
if (rollData.competence.data.iscombat) {
const arme = RdDItemCompetenceCreature.toArme(competence);
RdDCombat.createUsingTarget(this).attaque(competence, arme);
return;
}
// Fake competence pour créature
RdDItemCompetenceCreature.setRollDataCreature(rollData);
}
@ -2125,19 +2130,6 @@ export class RdDActor extends Actor {
this.currentTMR.render(true);
}
/* -------------------------------------------- */
async rollCompetenceCreature(compName) {
const competence = this.getCompetence(compName);
if (competence.type == 'competencecreature' && competence.data.iscombat) {
const arme = RdDItemCompetenceCreature.toArme(competence);
RdDCombat.createUsingTarget(this).attaque(competence, arme);
}
else {
this.rollCompetence(competence.name);
}
}
/* -------------------------------------------- */
rollArme(compName, armeName = undefined) {
let arme = armeName ? this.data.items.find(item => item.name == armeName && RdDItemArme.isArme(item)) : undefined;