Nouveau roll-dialog: mode attaque / defense

module/actor/base-actor-reve.js

@@ -14,9 +14,9 @@ import { RdDConfirm } from "../rdd-confirm.js";
 import { RdDCarac } from "../rdd-carac.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 { RdDItemArme } from "../item/arme.js";
 
 import { ChatUtility } from "../chat-utility.js";
 import { DialogValidationEncaissement } from "../dialog-validation-encaissement.js";
@@ -80,7 +80,7 @@ export class RdDBaseActorReve extends RdDBaseActor {
   getBonusDegat() { return RdDCarac.getCaracDerivee(this.getEncombrementMax()).plusdom }
 
   getMoralTotal() { return 0 }
-  listeAmoureux() {return []}
+  listeAmoureux() { return [] }
   getProtectionNaturelle() { return Number(this.system.attributs?.protection?.value ?? 0) }
   getSConst() { return 0 }
 
@@ -113,7 +113,7 @@ export class RdDBaseActorReve extends RdDBaseActor {
 
   listActions({ isAttaque = false, isEquipe = false }) {
     return this.itemTypes[ITEM_TYPES.competencecreature]
-      .filter(it => RdDItemCompetenceCreature.isAttaque(it))
+      .filter(it => it.isAttaque())
       .map(it => RdDItemCompetenceCreature.attaqueCreature(it))
       .filter(it => it != undefined);
   }
@@ -191,6 +191,10 @@ export class RdDBaseActorReve extends RdDBaseActor {
     return RdDItemArme.getArme(armeParadeId ? this.getEmbeddedDocument('Item', armeParadeId) : undefined)
   }
 
+  isForceInsuffisante(forceRequise) {
+    return false
+  }
+
   getDraconicOuPossession() { return POSSESSION_SANS_DRACONIC }
 
   getPossession(possessionId) {
@@ -222,8 +226,13 @@ export class RdDBaseActorReve extends RdDBaseActor {
   /* -------------------------------------------- */
   isEffectAllowed(effectId) { return false }
 
-  getEffects(filter = e => true) {
-    return this.getEmbeddedCollection("ActiveEffect").filter(filter);
+  getEffects(filter = e => true, forceRequise = undefined) {
+    const effects = this.getEmbeddedCollection("ActiveEffect").filter(filter)
+    if (forceRequise && this.isForceInsuffisante(forceRequise)) {
+      /// TODO
+      effects.push(StatusEffects.prepareActiveEffect(STATUSES.StatusForceWeak))
+    }
+    return effects
   }
 
   getEffectByStatus(statusId) {
@@ -259,11 +268,7 @@ export class RdDBaseActorReve extends RdDBaseActor {
   }
 
   getSurprise(isCombat = undefined) {
-    return StatusEffects.typeSurprise(
-      this.getEffects()
-        .map(it => StatusEffects.niveauSurprise(it, isCombat))
-        .reduce(Misc.sum(), 0)
-    )
+    return StatusEffects.getSurprise(this.getEffects(), isCombat)
   }
 
   /* -------------------------------------------- */

module/actor/base-actor-sheet.js

@@ -5,7 +5,6 @@ import { RdDSheetUtility } from "../rdd-sheet-utility.js";
 import { Monnaie } from "../item-monnaie.js";
 import { ITEM_TYPES } from "../constants.js";
 import { RdDItem } from "../item.js";
-import { RdDItemCompetenceCreature } from "../item-competencecreature.js";
 import { RdDTextEditor } from "../apps/rdd-text-roll-editor.js";
 import { ItemAction } from "../item/item-actions.js";
 
@@ -56,7 +55,7 @@ export class RdDBaseActorSheet extends foundry.appv1.sheets.ActorSheet {
     this._appliquerRechercheObjets(formData.conteneurs, formData.inventaires);
     formData.conteneurs = RdDUtility.conteneursRacine(formData.conteneurs);
     formData.competences.filter(it => it.type == ITEM_TYPES.competencecreature)
-      .forEach(it => it.isdommages = RdDItemCompetenceCreature.isDommages(it))
+      .forEach(it => it.isdommages = it.isDommages())
 
     return formData;
   }