Fix parade créatures

This commit is contained in:
Vincent Vandemeulebrouck
2021-01-14 00:35:55 +01:00
parent 23966c1056
commit 0d599d41f9
4 changed files with 19 additions and 12 deletions

View File

@ -2119,10 +2119,10 @@ export class RdDActor extends Actor {
/* -------------------------------------------- */
async rollCompetenceCreature(compName) {
let competence = this.getCompetence(compName);
const competence = this.getCompetence(compName);
if (competence.type == 'competencecreature' && competence.data.iscombat) {
let competence = this.getCompetence(compName);
RdDCombat.createUsingTarget(this).attaque(competence, armeItem);
const arme = RdDItemCompetenceCreature.toArme(competence);
RdDCombat.createUsingTarget(this).attaque(competence, arme);
}
else {
this.rollCompetence(competence.name);
@ -2131,7 +2131,7 @@ export class RdDActor extends Actor {
/* -------------------------------------------- */
rollArme(compName, armeName = undefined) {
let arme = this.data.items.find(item => item.name == armeName && RdDItemArme.isArme(item));
let arme = armeName ? this.data.items.find(item => item.name == armeName && RdDItemArme.isArme(item)) : undefined;
let competence = this.getCompetence(compName);
if (arme || armeName || (competence.type == 'competencecreature' && competence.data.iscombat)) {
@ -2151,6 +2151,11 @@ export class RdDActor extends Actor {
return undefined;
}
getArmeParade(armeParadeId) {
const item = armeParadeId ? this.getOwnedItem(armeParadeId) : undefined;
return RdDItemArme.getArmeData(item);
}
/* -------------------------------------------- */
async equiperObjet(itemID) {
let item = this.getOwnedItem(itemID);