diff --git a/module/item-arme.js b/module/item-arme.js index fdd86ac2..22118f78 100644 --- a/module/item-arme.js +++ b/module/item-arme.js @@ -28,7 +28,7 @@ export class RdDItemArme extends Item { switch (arme ? arme.type : '') { case 'arme': return arme; case 'competencecreature': - return RdDItemCompetenceCreature.toActionArme(arme); + return RdDItemCompetenceCreature.armeNaturelle(arme); } return RdDItemArme.mainsNues(); } diff --git a/module/item-competencecreature.js b/module/item-competencecreature.js index 1c59a285..e4311271 100644 --- a/module/item-competencecreature.js +++ b/module/item-competencecreature.js @@ -1,4 +1,4 @@ -import { Misc } from "./misc.js"; + import { RdDCombatManager } from "./rdd-combat.js"; /* -------------------------------------------- */ @@ -12,12 +12,12 @@ export class RdDItemCompetenceCreature extends Item { rollData.competence.system.categorie = "creature" rollData.selectedCarac = rollData.carac.carac_creature if (rollData.competence.system.iscombat) { - rollData.arme = RdDItemCompetenceCreature.toActionArme(rollData.competence); + rollData.arme = RdDItemCompetenceCreature.armeNaturelle(rollData.competence); } } /* -------------------------------------------- */ - static toActionArme(competencecreature) { + static armeNaturelle(competencecreature) { if (RdDItemCompetenceCreature.isCompetenceAttaque(competencecreature)) { // si c'est un Item compétence: cloner pour ne pas modifier lma compétence let arme = (competencecreature instanceof Item) ? competencecreature.clone(): competencecreature; diff --git a/module/rdd-combat.js b/module/rdd-combat.js index 08c56b6a..e80bbc7a 100644 --- a/module/rdd-combat.js +++ b/module/rdd-combat.js @@ -222,7 +222,7 @@ export class RdDCombatManager extends Combat { static listActionsCreature(competences) { return competences.filter(it => RdDItemCompetenceCreature.isCompetenceAttaque(it)) - .map(it => RdDItemCompetenceCreature.toActionArme(it)); + .map(it => RdDItemCompetenceCreature.armeNaturelle(it)); } static listActionsPossessions(actor) {