Nouvelle fenêtre de jets de dés

2025-09-05 01:09:32 +02:00
parent 652c435833
commit 1ff32697f4
134 changed files with 4025 additions and 400 deletions
--- a/module/rolldata-ajustements.js
+++ b/module/rolldata-ajustements.js
@@ -24,11 +24,6 @@ export const referenceAjustements = {
    getLabel: (rollData, actor) => rollData.competence?.name,
    getValue: (rollData, actor) => rollData.competence?.system?.niveau,
  },
-  meditation: {
-    isUsed: (rollData, actor) => rollData.meditation,
-    getLabel: (rollData, actor) => 'Méditation',
-    getValue: (rollData, actor) => RdDItemMeditation.calculDifficulte(rollData)
-  },
  diffLibre: {
    isUsed: (rollData, actor) => rollData.diffLibre != undefined,
    getLabel: (rollData, actor) => rollData.selectedSort?.name ?? rollData.attackerRoll ?? RdDPossession.isDefensePossession(rollData) ? 'Imposée' : 'Libre',
@@ -41,99 +36,59 @@ export const referenceAjustements = {
    getLabel: (rollData, actor) => 'Conditions',
    getValue: (rollData, actor) => rollData.diffConditions
  },
-  tactique: {
-    isUsed: (rollData, actor) => rollData.tactique,
-    getLabel: (rollData, actor) => RdDBonus.find(rollData.tactique).descr,
-    getValue: (rollData, actor) => RdDBonus.find(rollData.tactique).attaque,
-  },
-  attaqueDefenseurSurpris: {
-    isUsed: (rollData, actor) => rollData.surpriseDefenseur,
-    getLabel: (rollData, actor) => RdDBonus.find(rollData.surpriseDefenseur).descr + (rollData.attackerRoll ? '' : ' défenseur'),
-    getValue: (rollData, actor) => RdDBonus.find(rollData.surpriseDefenseur).attaque,
-  },
  etat: {
    isUsed: (rollData, actor) => !RollDataAjustements.isIgnoreEtatGeneral(rollData),
    getLabel: (rollData, actor) => 'Etat général',
    getValue: (rollData, actor) => actor.getEtatGeneral({ ethylisme: rollData.forceAlcool != undefined })
  },
  malusArmure: {
-    isVisible: (rollData, actor) => RdDCarac.isAgiliteOuDerobee(rollData.selectedCarac),
-    isUsed: (rollData, actor) => RdDCarac.isAgiliteOuDerobee(rollData.selectedCarac),
+    isVisible: (rollData, actor) => RdDCarac.isAgiliteOuDerobee(rollData.selectedCarac?.label),
+    isUsed: (rollData, actor) => RdDCarac.isAgiliteOuDerobee(rollData.selectedCarac?.label),
    getLabel: (rollData, actor) => 'Malus armure',
    getValue: (rollData, actor) => actor.getMalusArmure()
  },
  encTotal: {
-    isVisible: (rollData, actor) => RdDCarac.isAgiliteOuDerobee(rollData.selectedCarac) && RdDItemCompetence.isMalusEncombrementTotal(rollData.competence),
-    isUsed: (rollData, actor) => !rollData.oeuvre && RdDCarac.isAgiliteOuDerobee(rollData.selectedCarac) && RdDItemCompetence.isMalusEncombrementTotal(rollData.competence) && rollData.use?.encTotal,
+    isVisible: (rollData, actor) => RdDCarac.isAgiliteOuDerobee(rollData.selectedCarac?.label) && RdDItemCompetence.isMalusEncombrementTotal(rollData.competence?.name),
+    isUsed: (rollData, actor) => !rollData.oeuvre && RdDCarac.isAgiliteOuDerobee(rollData.selectedCarac?.label) && RdDItemCompetence.isMalusEncombrementTotal(rollData.competence?.name) && rollData.use?.encTotal,
    getLabel: (rollData, actor) => 'Encombrement total',
    getValue: (rollData, actor) => -actor.getEncTotal()
  },
  surenc: {
-    isVisible: (rollData, actor) => RdDCarac.isActionPhysique(rollData.selectedCarac) && actor.isSurenc(),
-    isUsed: (rollData, actor) => rollData.use.surenc && RdDCarac.isActionPhysique(rollData.selectedCarac),
+    isVisible: (rollData, actor) => RdDCarac.isActionPhysique(rollData.selectedCarac?.label) && actor.isSurenc(),
+    isUsed: (rollData, actor) => rollData.use.surenc && RdDCarac.isActionPhysique(rollData.selectedCarac?.label),
    getLabel: (rollData, actor) => 'Sur-encombrement',
    getValue: (rollData, actor) => actor.computeMalusSurEncombrement()
  },
-  rituel: {
-    isUsed: (rollData, actor) => actor.isPersonnage() && ReglesOptionnelles.isUsing("astrologie") && rollData.selectedSort?.system.isrituel,
-    getLabel: (rollData, actor) => 'Astrologique',
-    getValue: (rollData, actor) => actor.ajustementAstrologique()
-  },
  astrologique: {
-    isVisible: (rollData, actor) => actor.isPersonnage() && ReglesOptionnelles.isUsing("astrologie") && RdDCarac.isChance(rollData.selectedCarac),
-    isUsed: (rollData, actor) =>  RdDCarac.isChance(rollData.selectedCarac) && rollData.use.astrologique,
+    isVisible: (rollData, actor) => actor.isPersonnage() && ReglesOptionnelles.isUsing("astrologie") && RdDCarac.isChance(rollData.selectedCarac?.label),
+    isUsed: (rollData, actor) =>  RdDCarac.isChance(rollData.selectedCarac?.label) && rollData.use.astrologique,
    getLabel: (rollData, actor) => 'Astrologique',
    getValue: (rollData, actor) => actor.ajustementAstrologique()
  },
  moral: {
-    isVisible: (rollData, actor) => actor.isPersonnage() && RdDCarac.isActionPhysique(rollData.selectedCarac) && rollData.use?.moral,
+    isVisible: (rollData, actor) => actor.isPersonnage() && RdDCarac.isActionPhysique(rollData.selectedCarac?.label) && rollData.use?.moral,
    isUsed: (rollData, actor) => rollData.use.moral,
    getLabel: (rollData, actor) => 'Appel au moral',
    getValue: (rollData, actor) => 1
  },
+  moralTotal: {
+    isUsed: (rollData, actor) => RdDCarac.isVolonte(rollData.selectedCarac?.label),
+    getLabel: (rollData, actor) => 'Moral',
+    getValue: (rollData, actor) => actor.getMoralTotal()
+  },
  coeur: {
-    isVisible: (rollData, actor) => actor.isPersonnage() && RdDCarac.isVolonte(rollData.selectedCarac),
+    isVisible: (rollData, actor) => actor.isPersonnage() && RdDCarac.isVolonte(rollData.selectedCarac?.label),
    isUsed: (rollData, actor) => rollData.use.coeur != undefined,
    getLabel: (rollData, actor) => 'Ajustement de c&oelig;ur',
    getValue: (rollData, actor) => -2 * (rollData.use.coeur?.coeur ?? 0)
  },
-  moralTotal: {
-    isUsed: (rollData, actor) => RdDCarac.isVolonte(rollData.selectedCarac),
-    getLabel: (rollData, actor) => 'Moral',
-    getValue: (rollData, actor) => actor.getMoralTotal()
-  },
-  facteurSign: {
-    isUsed: (rollData, actor) => rollData.diviseurSignificative > 1,
-    getLabel: (rollData, actor) => Misc.getFractionHtml(rollData.diviseurSignificative),
-    getDescr: (rollData, actor) => rollData.diviseurSignificative > 1 ? `Facteur significative <span class="rdd-diviseur">&times;${Misc.getFractionHtml(rollData.diviseurSignificative)}</span>` : ''
-  },
-  isEcaille: {
-    isVisible: (rollData, actor) => rollData.arme?.system.magique && Number(rollData.arme?.system.ecaille_efficacite) > 0,
-    isUsed: (rollData, actor) => rollData.arme?.system.magique && Number(rollData.arme?.system.ecaille_efficacite) > 0,
-    getLabel: (rollData, actor) => "Ecaille d'Efficacité: ",
-    getValue: (rollData, actor) => rollData.arme?.system.magique ? Math.max(Number(rollData.arme?.system.ecaille_efficacite), 0) : 0,
-  },
-  finesse: {
-    isUsed: (rollData, actor) => RdDBonus.isDefenseAttaqueFinesse(rollData),
-    getDescr: (rollData, actor) => 'Attaque particulière en finesse',
-  },
-  armeParade: {
-    isUsed: (rollData, actor) => RdDItemArme.needParadeSignificative(rollData.attackerRoll?.arme, rollData.arme),
-    getDescr: (rollData, actor) => rollData.attackerRoll && rollData.arme ? `${RdDItemArme.getNomCategorieParade(rollData.attackerRoll?.arme)} vs ${RdDItemArme.getNomCategorieParade(rollData.arme)}` : ''
-  },
-  surprise: {
-    isUsed: (rollData, actor) => actor.getSurprise(rollData.passeArme),
-    getDescr: (rollData, actor) => RdDBonus.find(actor.getSurprise()).descr
-  },
-  bonusCase: {
-    isUsed: (rollData, actor) => rollData.selectedSort && rollData.tmr.coord,
-    getDescr: (rollData, actor) => rollData.selectedSort && rollData.tmr.coord ? `Bonus de case: ${RdDItemSort.getCaseBonus(rollData.selectedSort, rollData.tmr.coord)}%` : ''
-  },
-  rencontreTMR: {
-    isVisible: (rollData, actor) => rollData.tmr && rollData.rencontre?.name,
-    isUsed: (rollData, actor) => rollData.tmr && rollData.rencontre?.name,
-    getLabel: (rollData, actor) => rollData.rencontre?.name,
-    getValue: (rollData, actor) => - (rollData.rencontre?.system.force ?? 0)
+
+
+  
+  meditation: {
+    isUsed: (rollData, actor) => rollData.meditation,
+    getLabel: (rollData, actor) => 'Méditation',
+    getValue: (rollData, actor) => RdDItemMeditation.calculDifficulte(rollData)
  },
  ethylismeAlcool: {
    isVisible: (rollData, actor) => rollData.nbDoses != undefined,
@@ -153,12 +108,61 @@ export const referenceAjustements = {
    getLabel: (rollData, actor) => "Ethylisme - " + RdDUtility.getNomEthylisme(rollData.ethylisme),
    getValue: (rollData, actor) => rollData.ethylisme,
  },
+  facteurSign: {
+    isUsed: (rollData, actor) => rollData.diviseurSignificative > 1,
+    getLabel: (rollData, actor) => Misc.getFractionOneN(rollData.diviseurSignificative),
+    getDescr: (rollData, actor) => rollData.diviseurSignificative > 1 ? `Facteur significative <span class="rdd-diviseur">&times;${Misc.getFractionOneN(rollData.diviseurSignificative)}</span>` : ''
+  },
+  isEcaille: {
+    isVisible: (rollData, actor) => rollData.arme?.system.magique && Number(rollData.arme?.system.ecaille_efficacite) > 0,
+    isUsed: (rollData, actor) => rollData.arme?.system.magique && Number(rollData.arme?.system.ecaille_efficacite) > 0,
+    getLabel: (rollData, actor) => "Ecaille d'Efficacité: ",
+    getValue: (rollData, actor) => rollData.arme?.system.magique ? Math.max(Number(rollData.arme?.system.ecaille_efficacite), 0) : 0,
+  },
+  tactique: {
+    isUsed: (rollData, actor) => rollData.tactique,
+    getLabel: (rollData, actor) => RdDBonus.find(rollData.tactique).descr,
+    getValue: (rollData, actor) => RdDBonus.find(rollData.tactique).attaque,
+  },
+  finesse: {
+    isUsed: (rollData, actor) => RdDBonus.isDefenseAttaqueFinesse(rollData),
+    getDescr: (rollData, actor) => 'Attaque particulière en finesse',
+  },
+  surprise: {
+    isUsed: (rollData, actor) => actor.getSurprise(rollData.passeArme),
+    getDescr: (rollData, actor) => RdDBonus.find(actor.getSurprise()).descr
+  },
+  attaqueDefenseurSurpris: {
+    isUsed: (rollData, actor) => rollData.surpriseDefenseur,
+    getLabel: (rollData, actor) => RdDBonus.find(rollData.surpriseDefenseur).descr + (rollData.attackerRoll ? '' : ' défenseur'),
+    getValue: (rollData, actor) => RdDBonus.find(rollData.surpriseDefenseur).attaque,
+  },
+  armeParade: {
+    isUsed: (rollData, actor) => RdDItemArme.needParadeSignificative(rollData.attackerRoll?.arme, rollData.arme),
+    getDescr: (rollData, actor) => rollData.attackerRoll && rollData.arme ? `${RdDItemArme.getNomCategorieParade(rollData.attackerRoll?.arme)} vs ${RdDItemArme.getNomCategorieParade(rollData.arme)}` : ''
+  },
  tailleempoignade: {
    isVisible: (rollData, actor) => rollData.isEmpoignade,
    isUsed: (rollData, actor) => rollData.isEmpoignade,
    getLabel: (rollData, actor) => "Malus de taille",
    getValue: (rollData, actor) => rollData.malusTaille,
-  }
+  },
+  
+  rituel: {
+    isUsed: (rollData, actor) => actor.isPersonnage() && ReglesOptionnelles.isUsing("astrologie") && rollData.selectedSort?.system.isrituel,
+    getLabel: (rollData, actor) => 'Astrologique',
+    getValue: (rollData, actor) => actor.ajustementAstrologique()
+  },
+  bonusCase: {
+    isUsed: (rollData, actor) => rollData.selectedSort && rollData.tmr.coord,
+    getDescr: (rollData, actor) => rollData.selectedSort && rollData.tmr.coord ? `Bonus de case: ${RdDItemSort.getCaseBonus(rollData.selectedSort, rollData.tmr.coord)}%` : ''
+  },
+  rencontreTMR: {
+    isVisible: (rollData, actor) => rollData.tmr && rollData.rencontre?.name,
+    isUsed: (rollData, actor) => rollData.tmr && rollData.rencontre?.name,
+    getLabel: (rollData, actor) => rollData.rencontre?.name,
+    getValue: (rollData, actor) => - (rollData.rencontre?.system.force ?? 0)
+  },
 }

 export class RollDataAjustements {
@@ -196,8 +200,8 @@ export class RollDataAjustements {
    const selectedCarac = rollData.selectedCarac;
    return !selectedCarac ||
      rollData.ethylisme ||
-      RdDCarac.isChance(selectedCarac) ||
-      (RdDCarac.isReve(selectedCarac) && !rollData.competence);
+      RdDCarac.isChance(selectedCarac?.label) ||
+      (RdDCarac.isReve(selectedCarac?.label) && !rollData.competence);
  }

 }