Fix competencecreatures/competences

This commit is contained in:
2025-09-28 21:59:10 +02:00
parent 17e10d3be9
commit 3480b64d75
15 changed files with 86 additions and 62 deletions

View File

@@ -7,19 +7,18 @@ import { RdDResolutionTable } from "./rdd-resolution-table.js";
import { RdDRoll } from "./rdd-roll.js";
import { RdDRollTables } from "./rdd-rolltables.js";
import { ReglesOptionnelles } from "./settings/regles-optionnelles.js";
import { STATUSES } from "./settings/status-effects.js";
import { Targets } from "./targets.js";
import { RdDEmpoignade } from "./rdd-empoignade.js";
import { RdDRollResult } from "./rdd-roll-result.js";
import { RdDItemArme } from "./item/arme.js";
import { RdDItemCompetence } from "./item-competence.js";
import { RdDItemCompetenceCreature } from "./item-competencecreature.js";
import { RdDInitiative } from "./initiative.mjs";
import RollDialog from "./roll/roll-dialog.mjs";
import { PART_DEFENSE } from "./roll/roll-part-defense.mjs";
import { RollDialogAdapter } from "./roll/roll-dialog-adapter.mjs";
import { ROLL_TYPE_ATTAQUE, ROLL_TYPE_DEFENSE } from "./roll/roll-constants.mjs";
import { OptionsAvancees, ROLL_DIALOG_V2_TEST } from "./settings/options-avancees.js";
import { MappingCreatureArme } from "./item/mapping-creature-arme.mjs";
/* -------------------------------------------- */
const premierRoundInit = [
@@ -716,7 +715,7 @@ export class RdDCombat {
};
if (this.attacker.isCreatureEntite()) {
RdDItemCompetenceCreature.setRollDataCreature(rollData);
MappingCreatureArme.setRollDataCreature(rollData);
}
else if (arme) {
// Usual competence
@@ -1023,7 +1022,7 @@ export class RdDCombat {
};
if (this.defender.isCreatureEntite()) {
RdDItemCompetenceCreature.setRollDataCreature(defenderRoll);
MappingCreatureArme.setRollDataCreature(defenderRoll);
}
return defenderRoll;
@@ -1155,7 +1154,7 @@ export class RdDCombat {
};
if (this.defender.isCreatureEntite()) {
RdDItemCompetenceCreature.setRollDataCreature(rollData);
MappingCreatureArme.setRollDataCreature(rollData);
}
return rollData;
}