Cherry pick v10 gixes

Quelques liens pointaient sur les icones du bazaar de forge-vtt

module/actor-sheet.js

@@ -456,9 +456,9 @@ export class RdDActorSheet extends RdDBaseActorSheet {
 
   /* -------------------------------------------- */
   async selectTypeOeuvreToCreate() {
-    let typeObjets = RdDItem.getTypesOeuvres();
+    let types = RdDItem.getTypesOeuvres();
     let content = `<span class="competence-label">Selectionnez le type d'oeuvre</span><select class="item-type">`;
-    for (let typeName of typeObjets) {
+    for (let typeName of types) {
       content += `<option value="${typeName}">${Misc.typeName('Item', typeName)}</option>`
     }
     content += '</select>';

module/actor.js

@@ -3204,25 +3204,31 @@ export class RdDActor extends RdDBaseActor {
     if (attacker && !await attacker.accorder(this, 'avant-encaissement')) {
       return;
     }
+    const attackerId = attacker?.id;
     if (ReglesOptionelles.isUsing('validation-encaissement-gr') && !game.user.isGM) {
       RdDBaseActor.remoteActorCall({
         actorId: this.id,
-        method: 'validerEncaissement',
-        args: [rollData, show]
+        method: 'appliquerEncaissement',
+        args: [rollData, show, attackerId]
       });
       return;
     }
+    await this.appliquerEncaissement(rollData, show, attackerId);
+  }
+
+  async appliquerEncaissement(rollData, show, attackerId) {
     const armure = await this.computeArmure(rollData);
     if (ReglesOptionelles.isUsing('validation-encaissement-gr')) {
-      DialogValidationEncaissement.validerEncaissement(this, rollData, armure, show, (encaissement, show) => this._appliquerEncaissement(encaissement, show, attacker));
+      DialogValidationEncaissement.validerEncaissement(this, rollData, armure, show, attackerId, (encaissement, show, attackerId) => this._appliquerEncaissement(encaissement, show, attackerId));
     }
     else {
       let encaissement = await RdDUtility.jetEncaissement(rollData, armure, { showDice: SHOW_DICE });
-      await this._appliquerEncaissement(encaissement, show, attacker)
+      await this._appliquerEncaissement(encaissement, show, attackerId);
     }
   }
 
-  async _appliquerEncaissement(encaissement, show, attacker) {
+  async _appliquerEncaissement(encaissement, show, attackedId) {
+    const attacker = attackedId ? game.actors.get(attackedId) : undefined
     let santeOrig = duplicate(this.system.sante);
 
     const blessure = await this.ajouterBlessure(encaissement, attacker); // Will update the result table

module/actor/base-actor-sheet.js

@@ -50,16 +50,16 @@ export class RdDBaseActorSheet extends ActorSheet {
       encTotal: await this.actor.computeEncTotal(),
     }
 
-    this.objetVersConteneur = RdDUtility.buildArbreDeConteneurs(formData.conteneurs, formData.objets);
-    this._appliquerRechercheObjets(formData.objets, formData.conteneurs);
+    this.objetVersConteneur = RdDUtility.buildArbreDeConteneurs(formData.conteneurs, formData.inventaires);
+    this._appliquerRechercheObjets(formData.conteneurs, formData.inventaires);
     formData.conteneurs = RdDUtility.conteneursRacine(formData.conteneurs);
     return formData;
   }
 
-  _appliquerRechercheObjets(objets, conteneurs) {
+  _appliquerRechercheObjets(conteneurs, inventaires) {
     if (this.options.recherche?.text) {
       const recherche = this.options.recherche;
-      const allVisible = objets.filter(it => it.isNomTypeLike(recherche.text)).map(it => it.id);
+      const allVisible = inventaires.filter(it => it.isNomTypeLike(recherche.text)).map(it => it.id);
       let addVisible = conteneurs.filter(it => it.isNomTypeLike(recherche.text)).map(it => it.id)
       do {
         allVisible.push(...addVisible)
@@ -67,11 +67,11 @@ export class RdDBaseActorSheet extends ActorSheet {
         addVisible = parentsIds.filter(id => !allVisible.includes(id))
       }
       while (addVisible.length > 0)
-      objets.forEach(it => it.system.isHidden = !allVisible.includes(it.id))
+      inventaires.forEach(it => it.system.isHidden = !allVisible.includes(it.id))
       conteneurs.forEach(it => it.system.isHidden = !allVisible.includes(it.id))
     }
     else {
-      objets.forEach(it => it.system.isHidden = false)
+      inventaires.forEach(it => it.system.isHidden = false)
       conteneurs.forEach(it => it.system.isHidden = false)
     }
   }
@@ -118,9 +118,10 @@ export class RdDBaseActorSheet extends ActorSheet {
     formData.herbes = Misc.arrayOrEmpty(itemTypes['herbe']);
     formData.nourritureboissons = Misc.arrayOrEmpty(itemTypes['nourritureboisson']);
     formData.gemmes = Misc.arrayOrEmpty(itemTypes['gemme']);
-    formData.monnaie = Misc.arrayOrEmpty(itemTypes['monnaie']).sort(Monnaie.triValeurEntiere());
+    formData.monnaies = Misc.arrayOrEmpty(itemTypes['monnaie']).sort(Monnaie.triValeurEntiere());
+    formData.objets = Misc.arrayOrEmpty(itemTypes['objet'])
 
-    formData.objets = RdDItem.getItemTypesInventaire('all')
+    formData.inventaires = RdDItem.getItemTypesInventaire('all')
       .map(t => Misc.arrayOrEmpty(itemTypes[t]))
       .reduce((a, b) => a.concat(b), [])
       .sort(Misc.ascending(it => it.name));
@@ -230,9 +231,9 @@ export class RdDBaseActorSheet extends ActorSheet {
 
   /* -------------------------------------------- */
   async selectObjetTypeToCreate() {
-    let typeObjets = this.getTypesInventaire().sort(Misc.ascending(type => Misc.typeName('Item', type)));
+    let types = this.getTypesInventaire().sort(Misc.ascending(type => Misc.typeName('Item', type)));
     let content = `<span class="competence-label">Selectionnez le type d'équipement</span><select class="item-type">`;
-    for (let typeName of typeObjets) {
+    for (let typeName of types) {
       content += `<option value="${typeName}">${Misc.typeName('Item', typeName)}</option>`
     }
     content += '</select>';

module/actor/base-actor.js

@@ -3,6 +3,7 @@ import { SYSTEM_SOCKET_ID } from "../constants.js";
 import { Monnaie } from "../item-monnaie.js";
 import { Misc } from "../misc.js";
 import { RdDAudio } from "../rdd-audio.js";
+import { RdDConfirm } from "../rdd-confirm.js";
 import { RdDUtility } from "../rdd-utility.js";
 import { SystemCompendiums } from "../settings/system-compendiums.js";
 import { APP_ASTROLOGIE_REFRESH } from "../sommeil/app-astrologie.js";

module/dialog-validation-encaissement.js

@@ -7,7 +7,7 @@ import { RdDUtility } from "./rdd-utility.js";
  */
 export class DialogValidationEncaissement extends Dialog {
 
-  static async validerEncaissement(actor, rollData, armure, show, onEncaisser) {
+  static async validerEncaissement(actor, rollData, armure, show, attackerId, onEncaisser) {
     let encaissement = await RdDUtility.jetEncaissement(rollData, armure, { showDice: HIDE_DICE });
     const html = await renderTemplate('systems/foundryvtt-reve-de-dragon/templates/dialog-validation-encaissement.html', {
       actor: actor,
@@ -15,12 +15,12 @@ export class DialogValidationEncaissement extends Dialog {
       encaissement: encaissement,
       show: show
     });
-    const dialog = new DialogValidationEncaissement(html, actor, rollData, armure, encaissement, show, onEncaisser);
+    const dialog = new DialogValidationEncaissement(html, actor, rollData, armure, encaissement, show, attackerId, onEncaisser);
     dialog.render(true);
   }
 
   /* -------------------------------------------- */
-  constructor(html, actor, rollData, armure, encaissement, show, onEncaisser) {
+  constructor(html, actor, rollData, armure, encaissement, show, attackerId, onEncaisser) {
     // Common conf
     let buttons = {
       "valider": { label: "Valider", callback: html => this.onValider() },
@@ -48,6 +48,7 @@ export class DialogValidationEncaissement extends Dialog {
     this.armure = armure;
     this.encaissement = encaissement;
     this.show = show;
+    this.attackerId = attackerId;
     this.onEncaisser = onEncaisser;
     this.forceDiceResult = {total: encaissement.roll.result };
   }
@@ -66,6 +67,6 @@ export class DialogValidationEncaissement extends Dialog {
 
   async onValider() {
     this.encaissement = await RdDUtility.jetEncaissement(this.rollData, this.armure, { showDice: SHOW_DICE, forceDiceResult: this.forceDiceResult});
-    this.onEncaisser(this.encaissement, this.show)
+    this.onEncaisser(this.encaissement, this.show, this.attackerId)
   }
 }

module/item.js

@@ -15,6 +15,7 @@ export const TYPES = {
   conteneur: 'conteneur',
   sort: 'sort',
   herbe: 'herbe',
+  plante: 'plante',
   faune: 'faune',
   ingredient: 'ingredient',
   livre: 'livre',
@@ -34,6 +35,8 @@ export const TYPES = {
   maladie: 'maladie',
   poison: 'poison',
   oeuvre: 'oeuvre',
+  monnaie: 'monnaie',
+  munition: 'munition',
   nourritureboisson: 'nourritureboisson',
   service: 'service',
   signedraconique: 'signedraconique',
@@ -42,7 +45,8 @@ export const TYPES = {
   sortreserve: 'sortreserve',
   extraitpoetique: 'extraitpoetique',
   tarot: 'tarot',
-  empoignade: 'empoignade'
+  empoignade: 'empoignade',
+  objet: 'objet'
 }
 const typesInventaireMateriel = [
   TYPES.arme,

module/item/sheet-conteneur.js

@@ -29,7 +29,7 @@ export class RdDConteneurItemSheet extends RdDItemInventaireSheet {
   /* -------------------------------------------- */
   prepareConteneurData(formData) {
     RdDBaseActorSheet.filterItemsPerTypeForSheet(formData, this.actor.itemTypes);
-    this.objetVersConteneur = RdDUtility.buildArbreDeConteneurs(formData.conteneurs, formData.objets);
+    this.objetVersConteneur = RdDUtility.buildArbreDeConteneurs(formData.conteneurs, formData.inventaires);
     formData.subItems = formData.conteneurs.find(it => it._id == this.item.id)?.subItems;
   }
 

module/rdd-carac.js

@@ -58,15 +58,6 @@ export class RdDCarac {
       selectedCarac?.label.match(/(Apparence|Force|Agilité|Dextérité|Vue|Ouïe|Odorat-Goût|Empathie|Dérobée|Mêlée|Tir|Lancer)/);
   }
 
-  static isIgnoreEtatGeneral(rollData) {
-    const selectedCarac = rollData.selectedCarac;
-    return !selectedCarac ||
-      rollData.ethylisme ||
-      RdDCarac.isChance(selectedCarac) ||
-      (RdDCarac.isReve(selectedCarac) && !rollData.competence);
-  }
-
-
   static computeTotal(carac, beaute = undefined) {
     const total = Object.values(carac ?? {}).filter(c => !c.derivee)
       .map(it => parseInt(it.value))

module/rdd-roll.js

@@ -314,8 +314,8 @@ export class RdDRoll extends Dialog {
     HtmlUtility.showControlWhen(this.html.find(".use-encTotal"), rollData.ajustements.encTotal.visible && RdDCarac.isAgiliteOuDerobee(rollData.selectedCarac));
     HtmlUtility.showControlWhen(this.html.find(".use-surenc"), rollData.ajustements.surenc.visible && RdDCarac.isActionPhysique(rollData.selectedCarac));
     HtmlUtility.showControlWhen(this.html.find(".utilisation-moral"), rollData.use.appelAuMoral);
-    HtmlUtility.showControlWhen(this.html.find(".diffMoral"), rollData.ajustements.moralTotal.used);
     HtmlUtility.showControlWhen(this.html.find(".divAppelAuMoral"), rollData.use.appelAuMoral);
+    HtmlUtility.showControlWhen(this.html.find(".diffMoral"), rollData.ajustements.moralTotal.used);
 
     // Mise à jour valeurs
     this.html.find(".dialog-roll-title").text(this._getTitle(rollData));

module/rdd-utility.js

@@ -339,13 +339,13 @@ export class RdDUtility {
   }
 
   /* -------------------------------------------- */
-  static buildArbreDeConteneurs(conteneurs, objets) {
+  static buildArbreDeConteneurs(conteneurs, inventaires) {
     let objetVersConteneur = {};
     // Attribution des objets aux conteneurs
     for (let conteneur of conteneurs) {
       conteneur.subItems = [];
       for (let id of conteneur.system.contenu ?? []) {
-        let objet = objets.find(objet => (id == objet._id));
+        let objet = inventaires.find(objet => (id == objet._id));
         if (objet) {
           objet.estContenu = true; // Permet de filtrer ce qui est porté dans le template
           objetVersConteneur[id] = conteneur._id;
@@ -354,20 +354,20 @@ export class RdDUtility {
       }
     }
     for (let conteneur of conteneurs) {
-      conteneur.system.encTotal = RdDUtility.calculEncContenu(conteneur, objets);
+      conteneur.system.encTotal = RdDUtility.calculEncContenu(conteneur, inventaires);
     }
     return objetVersConteneur;
   }
 
   /* -------------------------------------------- */
-  static calculEncContenu(conteneur, objets) {
+  static calculEncContenu(conteneur, inventaires) {
     const contenus = (conteneur.system.contenu ?? []).filter(id => id != undefined)
-      .map(id => objets.find(it => (id == it.id)))
+      .map(id => inventaires.find(it => (id == it.id)))
       .filter(it => it);
     let enc = Number(conteneur.system.encombrement ?? 0) * Number(conteneur.system.quantite ?? 1);
     for (let contenu of contenus) {
       if (contenu.type == 'conteneur') {
-        enc += RdDUtility.calculEncContenu(contenu, objets);
+        enc += RdDUtility.calculEncContenu(contenu, inventaires);
       }
       else {
         enc += Number(contenu.system.encombrement ?? 0) * Number(contenu.system.quantite ?? 1)

module/rolldata-ajustements.js

@@ -51,7 +51,7 @@ export const referenceAjustements = {
     getValue: (rollData, actor) => RdDBonus.find(rollData.surpriseDefenseur).attaque,
   },
   etat: {
-    isUsed: (rollData, actor) => !RdDCarac.isIgnoreEtatGeneral(rollData),
+    isUsed: (rollData, actor) => !RollDataAjustements.isIgnoreEtatGeneral(rollData),
     getLabel: (rollData, actor) => 'Etat général',
     getValue: (rollData, actor) => actor.getEtatGeneral({ ethylisme: rollData.forceAlcool != undefined })
   },
@@ -177,4 +177,11 @@ export class RollDataAjustements {
     return sum;
   }
 
+  static isIgnoreEtatGeneral(rollData) {
+    const selectedCarac = rollData.selectedCarac;
+    return !selectedCarac ||
+      rollData.ethylisme ||
+      RdDCarac.isChance(selectedCarac) ||
+      (RdDCarac.isReve(selectedCarac) && !rollData.competence);
+  }
 }

system.json

@@ -1,8 +1,8 @@
 {
   "id": "foundryvtt-reve-de-dragon",
   "title": "Rêve de Dragon",
-  "version": "11.0.4",
-  "download": "https://www.uberwald.me/gitea/public/foundryvtt-reve-de-dragon/archive/foundryvtt-reve-de-dragon-11.0.4.zip",
+  "version": "11.0.5",
+  "download": "https://www.uberwald.me/gitea/public/foundryvtt-reve-de-dragon/archive/foundryvtt-reve-de-dragon-11.0.5.zip",
   "manifest": "https://www.uberwald.me/gitea/public/foundryvtt-reve-de-dragon/raw/v11/system.json",
   "compatibility": {
     "minimum": "11",

templates/actor/commerce-inventaire.html

@@ -25,7 +25,7 @@
     <span class="equipement-detail">Prix (sols)</span>
     <span class="equipement-actions">Actions</span>
   </li>
-  {{#each (trier objets) as |item id|}}
+  {{#each (trier inventaires) as |item id|}}
     {{#unless item.estContenu}}
       {{#if (ne item.type 'conteneur')}}
         {{buildLigneInventaire item ../options}}

templates/actor/inventaire-monnaie.html

@@ -1,7 +1,7 @@
 {{#if @root.options.isObserver}}
 <span class="item-name"><h4>Argent et Monnaies (fortune: {{calc.fortune.sols}} sols {{calc.fortune.deniers}} deniers)</h4></span>
 <ul class="item-list alterne-list">
-  {{#each monnaie as |piece id|}}
+  {{#each monnaies as |piece id|}}
   <li class="item flexrow list-item" data-item-id="{{piece._id}}">
     <img class="sheet-competence-img" src="{{piece.img}}" title="{{piece.name}}"/>
     <span class="equipement-nom">{{piece.name}}</span>

templates/actor/inventaire.html

@@ -22,7 +22,7 @@
     <span class="equipement-detail">Enc.</span>
     <span class="equipement-actions">Actions</span>
   </li>
-  {{#each objets as |item id|}}
+  {{#each inventaires as |item id|}}
     {{#unless item.estContenu}}
     {{#if (ne item.type 'conteneur')}}
       {{buildLigneInventaire item @root.options}}