forked from public/foundryvtt-reve-de-dragon
Gestion des armes dans hotbar
This commit is contained in:
@ -3071,29 +3071,30 @@ export class RdDActor extends RdDBaseActor {
|
||||
}
|
||||
|
||||
/* -------------------------------------------- */
|
||||
getArmeCompetence(arme) {
|
||||
let comp = arme.system.competence
|
||||
getArmeCompetence(arme, competenceName) {
|
||||
let comp = arme.system[competenceName]
|
||||
if (!comp || comp.name == "") {
|
||||
comp = arme.system.lancer
|
||||
comp = arme.system[competenceName]
|
||||
}
|
||||
if ( !comp || comp.name == "") {
|
||||
comp = arme.system.tir
|
||||
comp = arme.system[competenceName]
|
||||
}
|
||||
return comp
|
||||
}
|
||||
|
||||
/* -------------------------------------------- */
|
||||
rollArme(arme) {
|
||||
rollArme(arme, competenceName = "competence") {
|
||||
let compToUse = this.getArmeCompetence(arme, competenceName)
|
||||
if (!Targets.hasTargets()) {
|
||||
RdDConfirm.confirmer({
|
||||
settingConfirmer: "confirmer-combat-sans-cible",
|
||||
content: `<p>Voulez vous faire un jet de compétence ${arme.system.competence} sans choisir de cible valide?
|
||||
content: `<p>Voulez vous faire un jet de compétence ${competenceName} sans choisir de cible valide?
|
||||
<br>Tous les jets de combats devront être gérés à la main
|
||||
</p>`,
|
||||
title: 'Ne pas utiliser les automatisation de combat',
|
||||
buttonLabel: "Pas d'automatisation",
|
||||
onAction: async () => {
|
||||
this.rollCompetence(this.getArmeCompetence(arme), { tryTarget: false })
|
||||
this.rollCompetence(compToUse, { tryTarget: false })
|
||||
}
|
||||
});
|
||||
return;
|
||||
@ -3105,8 +3106,8 @@ export class RdDActor extends RdDBaseActor {
|
||||
return;
|
||||
}
|
||||
|
||||
const competence = this.getCompetence(this.getArmeCompetence(arme))
|
||||
console.log("RollArme", competence, arme)
|
||||
const competence = this.getCompetence(compToUse)
|
||||
//console.log("RollArme", competence, arme)
|
||||
if (competence.isCompetencePossession()) {
|
||||
return RdDPossession.onAttaquePossession(target, this, competence);
|
||||
}
|
||||
|
Reference in New Issue
Block a user