Préparation ajout empoignade

actor.rollArme prend maintenant une arme (ou structure)
plutôt que des noms

l'empoignade sera une pseudo arme, comme le corps à corps

# Conflicts:
#	module/actor-sheet.js
This commit is contained in:
Vincent Vandemeulebrouck
2021-05-24 22:12:37 +02:00
parent ab9f6f0017
commit 9bc4b9a3ca
6 changed files with 24 additions and 18 deletions

View File

@ -3117,11 +3117,9 @@ export class RdDActor extends Actor {
}
/* -------------------------------------------- */
rollArme(compName, armeName = undefined) {
let arme = armeName ? this.data.items.find(it => Misc.data(it).name == armeName && RdDItemArme.isArme(it)) : undefined;
let competence = Misc.data(this.getCompetence(compName));
if (arme || armeName || (competence.type == 'competencecreature' && competence.data.iscombat)) {
rollArme(arme) {
let competence = Misc.data(this.getCompetence(arme.data.competence));
if (arme || (competence.type == 'competencecreature' && competence.data.iscombat)) {
RdDCombat.createUsingTarget(this)?.attaque(competence, arme);
} else {
this.rollCompetence(competence.name);