Petit fixes de synchro + essai pour corriger message XP + roll

Reviewed-on: public/foundryvtt-reve-de-dragon#751

changelog.md

@@ -1,4 +1,16 @@
 # 12.0
+## 12.0.42 - Les errements d'Astrobazzarh
+- Correction de différentes automatisations de combat incorrectes
+- Correction des jets `@roll[vue/-2]` qui tentaient de chercher une compétence -2 (à cause des armes à 1/2 mains)
+
+## 12.0.41 - La loupe d'Astrobazzarh
+- On peut de nouveau effectuer des tirages cachés
+- Le stress transformé est bien diminué lorsqu'on met le stress dans une compétence
+
+## 12.0.40 - Les mains d'Astrobazzarh
+- correction des attaques particulières en combat
+- correction de message sur les min/max liés aux modificateurs de races (s'applique uniquement sur la taille)
+
 ## 12.0.39 - Les mains d'Astrobazzarh
 - les armes à 1 ou 2 mains fonctionnent dans les liens de jets de dés
 - commande `/jet` pour poster une demande de jet de dés

module/actor-sheet.js

@@ -237,7 +237,11 @@ export class RdDActorSheet extends RdDBaseActorSangSheet {
 
     this.html.find('.carac-xp-augmenter').click(async event => await this.actor.updateCaracXPAuto(event.currentTarget.name.replace("augmenter.", "")))
     this.html.find('.competence-xp-augmenter').click(async event => await this.actor.updateCompetenceXPAuto(RdDSheetUtility.getItemId(event)))
-    this.html.find('.competence-stress-augmenter').click(async event => await this.actor.updateCompetenceStress(RdDSheetUtility.getItemId(event)))
+    this.html.find('.competence-stress-augmenter').click(async event =>{
+      await this.actor.updateCompetenceStress(RdDSheetUtility.getItemId(event))
+      this.render(true)
+    } 
+  )
 
     if (this.options.vueDetaillee) {
       // On carac change

module/actor.js

@@ -557,7 +557,10 @@ export class RdDActor extends RdDBaseActorSang {
         return;
       }
       fatigue = Math.max(fatigueMin, this._calculRecuperationSegment(fatigue));
-      await this.update({ "system.sante.fatigue.value": fatigue });
+      setTimeout( // On attend un peu pour que le message de récupération de r
+        async () => {
+          await this.update({ 'system.sante.fatigue.value': fatigue });
+        }, 200);
       if (fatigue == 0) {
         message.content += "Vous êtes complêtement reposé. ";
       }
@@ -736,7 +739,7 @@ export class RdDActor extends RdDBaseActorSang {
       await competence.update({
         "system.xp": toXp,
         "system.niveau": toNiveau,
-      });
+      }, { render: false })
       await ExperienceLog.add(this, XP_TOPIC.XP, fromXp, toXp, competence.name);
       await ExperienceLog.add(this, XP_TOPIC.NIVEAU, fromNiveau, toNiveau, competence.name);
     }
@@ -767,7 +770,7 @@ export class RdDActor extends RdDBaseActorSang {
     await competence.update({
       "system.xp": newXp,
       "system.niveau": toNiveau,
-    });
+    }, { render: false })
     const toXpStress = Math.max(0, fromXpStress - xpUtilise);
     await this.update({ "system.compteurs.experience.value": toXpStress });
 
@@ -783,7 +786,7 @@ export class RdDActor extends RdDBaseActorSang {
       const toNiveau = compValue ?? RdDItemCompetence.getNiveauBase(competence.system.categorie, competence.getCategories());
       this.notifyCompetencesTronc(competence, toNiveau);
       const fromNiveau = competence.system.niveau;
-      await competence.update({ 'system.niveau': toNiveau });
+      await competence.update({ 'system.niveau': toNiveau }, { render: false })
       await ExperienceLog.add(this, XP_TOPIC.NIVEAU, fromNiveau, toNiveau, competence.name, true);
     }
   }
@@ -808,7 +811,7 @@ export class RdDActor extends RdDBaseActorSang {
       if (isNaN(toXp) || typeof (toXp) != 'number') toXp = 0;
       const fromXp = competence.system.xp;
       this.checkCompetenceXP(idOrName, toXp);
-      await competence.update({ 'system.xp': toXp });
+      await competence.update({ 'system.xp': toXp }, { render: false })
       await ExperienceLog.add(this, XP_TOPIC.XP, fromXp, toXp, competence.name, true);
       if (toXp > fromXp) {
         RdDUtility.checkThanatosXP(competence)
@@ -822,7 +825,7 @@ export class RdDActor extends RdDBaseActorSang {
     if (competence) {
       if (isNaN(toXpSort) || typeof (toXpSort) != 'number') toXpSort = 0;
       const fromXpSort = competence.system.xp_sort;
-      await competence.update({ 'system.xp_sort': toXpSort });
+      await competence.update({ 'system.xp_sort': toXpSort }, { render: false })
       await ExperienceLog.add(this, XP_TOPIC.XPSORT, fromXpSort, toXpSort, competence.name, true);
       if (toXpSort > fromXpSort) {
         RdDUtility.checkThanatosXP(competence)
@@ -834,7 +837,7 @@ export class RdDActor extends RdDBaseActorSang {
   async updateCompetenceArchetype(idOrName, compValue) {
     let competence = this.getCompetence(idOrName)
     if (competence) {
-      await competence.update({ 'system.niveau_archetype': Math.max(compValue ?? 0, 0) });
+      await competence.update({ 'system.niveau_archetype': Math.max(compValue ?? 0, 0) })
     }
   }
 
@@ -1584,7 +1587,7 @@ export class RdDActor extends RdDBaseActorSang {
 
   /* -------------------------------------------- */
   async _appliquerAppelMoral(rollData) {
-    if (!rollData.use.moral || game.settings.get("core", "rollMode") == 'selfroll'){
+    if (!rollData.use.moral || game.settings.get("core", "rollMode") == 'selfroll') {
       return
     }
     if (rollData.rolled.isEchec ||
@@ -1800,8 +1803,10 @@ export class RdDActor extends RdDBaseActorSang {
     };
     RollDataAjustements.calcul(rollData, this);
     await RdDResolutionTable.rollData(rollData);
-    this.gererExperience(rollData);
     await RdDRollResult.displayRollData(rollData, this)
+
+    this.gererExperience(rollData);
+
     return rollData.rolled;
   }
 
@@ -2527,7 +2532,6 @@ export class RdDActor extends RdDBaseActorSang {
       })
     }
     const blessure = this.getItem(blessureId, 'blessure')
-    console.log('TODO update blessure', this, blessureId, rollData, rollData.tache);
     if (blessure && !blessure.system.premierssoins.done) {
       const tache = rollData.tache;
       if (rollData.rolled.isETotal) {
@@ -2644,12 +2648,13 @@ export class RdDActor extends RdDBaseActorSang {
   }
 
   /* -------------------------------------------- */
-  async incDecItemUse(itemId, inc = 1) {
+  async incDecItemUse(itemId, shouldIncrease = true) {
+    if (shouldIncrease) {
       const currentItemUse = this.getFlag(SYSTEM_RDD, 'itemUse');
       let itemUse = currentItemUse ? foundry.utils.duplicate(currentItemUse) : {};
-    itemUse[itemId] = (itemUse[itemId] ?? 0) + inc;
+      itemUse[itemId] = (itemUse[itemId] ?? 0) + 1;
       await this.setFlag(SYSTEM_RDD, 'itemUse', itemUse);
-    console.log("ITEM USE INC", inc, itemUse);
+    }
   }
 
   /* -------------------------------------------- */

module/actor/base-actor-reve.js

@@ -277,14 +277,9 @@ export class RdDBaseActorReve extends RdDBaseActor {
     return dialog
   }
 
-  createEmptyCallback() {
-    return {
-      condition: r => false,
-      action: r => { }
-    };
-  }
-  createCallbackExperience() { return this.createEmptyCallback(); }
-  createCallbackAppelAuMoral() { return this.createEmptyCallback(); }
+  createCallbackExperience() { return { action: r => { } } }
+  createCallbackAppelAuMoral() { return { action: r => { } } }
+
   async _onCloseRollDialog(html) { }
 
   async rollCaracCompetence(caracName, compName, diff, options = { title: "" }) {

module/actor/base-actor.js

@@ -244,16 +244,19 @@ export class RdDBaseActor extends Actor {
   async onUpdateActor(update, options, actorId) { }
   async onDeleteItem(item, options, id) {
     if (item.isInventaire()) {
-      this._removeItemFromConteneur(item)
+      await this._removeItemFromConteneur(item)
     }
   }
 
-  _removeItemFromConteneur(item) {
-    this.items.filter(it => it.isConteneur() && it.system.contenu.includes(item.id))
-      .forEach(conteneur => {
-        const nouveauContenu = conteneur.system.contenu.filter(id => id != item.id);
-        conteneur.update({ 'system.contenu': nouveauContenu });
-      });
+  async _removeItemFromConteneur(item) {
+    const updates = this.items.filter(it => it.isConteneur() && it.system.contenu.includes(item.id))
+      .map(conteneur => {
+        const nouveauContenu = conteneur.system.contenu.filter(id => id != item.id)
+        return { _id: conteneur.id, 'system.contenu': nouveauContenu }
+      })
+    if (updates.length > 0) {
+      await this.updateEmbeddedDocuments('Item', updates)
+    }
   }
 
   async onTimeChanging(oldTimestamp, newTimestamp) {
@@ -744,7 +747,7 @@ export class RdDBaseActor extends Actor {
   async jetDeMoral() { this.actionImpossible("jet de moral") }
 
   async resetItemUse() { }
-  async incDecItemUse(itemId, inc = 1) { }
+  async incDecItemUse(itemId, shouldIncrease = true) { }
   getItemUse(itemId) { return 0; }
 
   async finDeRound(options = { terminer: false }) { }

module/applications/sheets/_module.mjs

@@ -1,3 +0,0 @@
-export { default as RdDItemSheet} from "./common-item-sheet.mjs"
-export { default as RdDMonnaieSheet } from "./monnaie-sheet.mjs"
-export { default as RdDMunitionSheet } from "./munition-sheet.mjs"

module/applications/sheets/common-item-sheet.mjs

@@ -1,200 +0,0 @@
-const { HandlebarsApplicationMixin } = foundry.applications.api
-import { SYSTEM_RDD } from "../../constants.js"
-import { Misc } from "../../misc.js"
-
-export default class RdDItemSheet extends HandlebarsApplicationMixin(foundry.applications.sheets.ItemSheetV2) {
-
-  static register(sheetClass) {
-    const itemType = sheetClass.ITEM_TYPE
-    Items.registerSheet(SYSTEM_RDD, sheetClass, {
-      label: Misc.typeName('Item', itemType),
-      types: [itemType],
-      makeDefault: true
-    })
-  }
-
-  static get ITEM_TYPE() { return undefined }
-  /**
-   * Different sheet modes.
-   * @enum {number}
-   */
-  static SHEET_MODES = { EDIT: 0, PLAY: 1 }
-
-  constructor(options = {}) {
-    super(options)
-    this.#dragDrop = this.#createDragDropHandlers()
-  }
-
-  #dragDrop
-  _sheetMode = this.constructor.SHEET_MODES.PLAY
-
-  /** @override */
-  static DEFAULT_OPTIONS = {
-    classes: ["fvtt-rdd", "item"],
-    position: {
-      width: 600,
-      height: "auto",
-    },
-    form: {
-      submitOnChange: true,
-    },
-    window: {
-      resizable: true,
-    },
-    dragDrop: [{ dragSelector: "[data-drag]", dropSelector: null }],
-    actions: {
-      toggleSheet: RdDItemSheet.#onToggleSheet,
-      editImage: RdDItemSheet.#onEditImage,
-    },
-  }
-
-  /**
-   * Is the sheet currently in 'Play' mode?
-   * @type {boolean}
-   */
-  get isPlayMode() {
-    return this._sheetMode === this.constructor.SHEET_MODES.PLAY
-  }
-
-  /**
-   * Is the sheet currently in 'Edit' mode?
-   * @type {boolean}
-   */
-  get isEditMode() {
-    return this._sheetMode === this.constructor.SHEET_MODES.EDIT
-  }
-
-  /** @override */
-  async _prepareContext() {
-    const context = {
-      fields: this.document.schema.fields,
-      systemFields: this.document.system.schema.fields,
-      item: this.document,
-      system: this.document.system,
-      source: this.document.toObject(),
-      isEditMode: this.isEditMode,
-      isPlayMode: this.isPlayMode,
-      isEditable: this.isEditable,
-    }
-    return context
-  }
-
-  /** @override */
-  _onRender(context, options) {
-    this.#dragDrop.forEach((d) => d.bind(this.element))
-  }
-
-  // #region Drag-and-Drop Workflow
-  /**
-   * Create drag-and-drop workflow handlers for this Application
-   * @returns {DragDrop[]}     An array of DragDrop handlers
-   * @private
-   */
-  #createDragDropHandlers() {
-    return this.options.dragDrop.map((d) => {
-      d.permissions = {
-        dragstart: this._canDragStart.bind(this),
-        drop: this._canDragDrop.bind(this),
-      }
-      d.callbacks = {
-        dragstart: this._onDragStart.bind(this),
-        dragover: this._onDragOver.bind(this),
-        drop: this._onDrop.bind(this),
-      }
-      return new DragDrop(d)
-    })
-  }
-
-  /**
-   * Define whether a user is able to begin a dragstart workflow for a given drag selector
-   * @param {string} selector       The candidate HTML selector for dragging
-   * @returns {boolean}             Can the current user drag this selector?
-   * @protected
-   */
-  _canDragStart(selector) {
-    return this.isEditable
-  }
-
-  /**
-   * Define whether a user is able to conclude a drag-and-drop workflow for a given drop selector
-   * @param {string} selector       The candidate HTML selector for the drop target
-   * @returns {boolean}             Can the current user drop on this selector?
-   * @protected
-   */
-  _canDragDrop(selector) {
-    return this.isEditable && this.document.isOwner
-  }
-
-  /**
-   * Callback actions which occur at the beginning of a drag start workflow.
-   * @param {DragEvent} event       The originating DragEvent
-   * @protected
-   */
-  _onDragStart(event) {
-    const el = event.currentTarget
-    if ("link" in event.target.dataset) return
-
-    // Extract the data you need
-    let dragData = null
-
-    if (!dragData) return
-
-    // Set data transfer
-    event.dataTransfer.setData("text/plain", JSON.stringify(dragData))
-  }
-
-  /**
-   * Callback actions which occur when a dragged element is over a drop target.
-   * @param {DragEvent} event       The originating DragEvent
-   * @protected
-   */
-  _onDragOver(event) { }
-
-  /**
-   * Callback actions which occur when a dragged element is dropped on a target.
-   * @param {DragEvent} event       The originating DragEvent
-   * @protected
-   */
-  async _onDrop(event) { }
-
-  // #endregion
-
-  // #region Actions
-  /**
-   * Handle toggling between Edit and Play mode.
-   * @param {Event} event             The initiating click event.
-   * @param {HTMLElement} target      The current target of the event listener.
-   */
-  static #onToggleSheet(event, target) {
-    const modes = this.constructor.SHEET_MODES
-    this._sheetMode = this.isEditMode ? modes.PLAY : modes.EDIT
-    this.render()
-  }
-
-  /**
-   * Handle changing a Document's image.
-   *
-   * @this RdDItemSheet
-   * @param {PointerEvent} event   The originating click event
-   * @param {HTMLElement} target   The capturing HTML element which defined a [data-action]
-   * @returns {Promise}
-   * @private
-   */
-  static async #onEditImage(event, target) {
-    const attr = target.dataset.edit
-    const current = foundry.utils.getProperty(this.document, attr)
-    const { img } = this.document.constructor.getDefaultArtwork?.(this.document.toObject()) ?? {}
-    const fp = new FilePicker({
-      current,
-      type: "image",
-      redirectToRoot: img ? [img] : [],
-      callback: (path) => {
-        this.document.update({ [attr]: path })
-      },
-      top: this.position.top + 40,
-      left: this.position.left + 10,
-    })
-    return fp.browse()
-  }
-  // #endregion
-}

module/applications/sheets/monnaie-sheet.mjs

@@ -1,35 +0,0 @@
-import { TEMPLATE_DESCRIPTION, TEMPLATE_INVENTAIRE } from "../../common/_module.mjs";
-import { ITEM_TYPES } from "../../constants.js";
-import RdDItemSheet from "./common-item-sheet.mjs";
-
-export default class RdDMonnaieSheet extends RdDItemSheet {
-  /** @override */
-  static get ITEM_TYPE() { return ITEM_TYPES.monnaie }
-
-  /** @override */
-  static DEFAULT_OPTIONS = {
-    classes: ["fvtt-rdd", "item", "monnaie"],
-    position: {
-      width: 600,
-    },
-    window: {
-      contentClasses: ["monnaie-content"],
-    },
-  }
-
-  /** @override */
-  static PARTS = {
-    main: {
-      template: "systems/foundryvtt-reve-de-dragon/templates/item/monnaie.hbs",
-    },
-  }
-
-  /** @override */
-  async _prepareContext() {
-    const context = await super._prepareContext()
-    return Object.assign(context,
-      await TEMPLATE_DESCRIPTION.prepareContext(this.item),
-      await TEMPLATE_INVENTAIRE.prepareContext(this.item)
-    )
-  }
-}

module/applications/sheets/munition-sheet.mjs

@@ -1,35 +0,0 @@
-import { TEMPLATE_DESCRIPTION, TEMPLATE_INVENTAIRE } from "../../common/_module.mjs";
-import { ITEM_TYPES } from "../../constants.js";
-import RdDItemSheet from "./common-item-sheet.mjs";
-
-export default class RdDMunitionSheet extends RdDItemSheet {
-  /** @override */
-  static get ITEM_TYPE() { return ITEM_TYPES.munition }
-
-  /** @override */
-  static DEFAULT_OPTIONS = {
-    classes: ["fvtt-rdd", "item", "munition"],
-    position: {
-      width: 600,
-    },
-    window: {
-      contentClasses: ["munition-content"],
-    },
-  }
-
-  /** @override */
-  static PARTS = {
-    main: {
-      template: "systems/foundryvtt-reve-de-dragon/templates/item/munition.hbs",
-    },
-  }
-
-  /** @override */
-  async _prepareContext() {
-    const context = await super._prepareContext()
-    return Object.assign(context,
-      await TEMPLATE_DESCRIPTION.prepareContext(this.item),
-      await TEMPLATE_INVENTAIRE.prepareContext(this.item)
-    )
-  }
-}

module/apps/textroll/text-roll-carac-competence.js

@@ -5,7 +5,7 @@ import { RdDUtility } from "../../rdd-utility.js";
 import { TextRollManager } from "./text-roll-formatter.js";
 
 const REGECP_CARAC = "(?<carac>[A-Za-zÀ-ÖØ-öø-ÿ\\s\\-]+)"
-const REGEXP_COMP = "(\\/(?<competence>[A-Za-z0-9À-ÖØ-öø-ÿ -]+))?"
+const REGEXP_COMP = "(\\/(?<competence>[A-Za-zÀ-ÖØ-öø-ÿ ]+([1-2]?[A-Za-zÀ-ÖØ-öø-ÿ ]+)?))?"
 const REGEXP_DIFF = "(/(?<diff>[\\+\\-]?\\d+(d\\d+)?))?"
 const REGEXP_ROLL_CARAC_COMP = REGECP_CARAC + REGEXP_COMP + REGEXP_DIFF
 const XREGEXP_ROLL_CARAC_COMP = XRegExp("@roll\\[" + REGEXP_ROLL_CARAC_COMP + "\\]", 'giu')

module/chat-utility.js

@@ -62,7 +62,6 @@ export class ChatUtility {
   }
 
   /* -------------------------------------------- */
-
   static removeMessages(socketData) {
     if (Misc.isFirstConnectedGM()) {
       ChatUtility.onRemoveMessages(socketData);
@@ -97,7 +96,7 @@ export class ChatUtility {
         }
         break
       case "gmroll":
-        messageData.whisper = ChatUtility.getOwners(actor)
+        messageData.whisper = actor ? ChatUtility.getOwners(actor) : ChatUtility.getUserAndGMs()
         break
       case "selfroll":
         messageData.whisper = [game.user]
@@ -108,7 +107,7 @@ export class ChatUtility {
   }
 
   static getOwners(document) {
-    return game.users.filter(it => document.getUserLevel(it) == CONST.DOCUMENT_OWNERSHIP_LEVELS.OWNER)
+    return document ? game.users.filter(it => document.getUserLevel(it) == CONST.DOCUMENT_OWNERSHIP_LEVELS.OWNER) : [game.user]
   }
 
   static getUserAndGMs() {
@@ -199,7 +198,7 @@ export class ChatUtility {
   static async onCreateChatMessage(chatMessage, options, id) {
     if (chatMessage.isAuthor) {
       await chatMessage.setFlag(SYSTEM_RDD, 'rdd-timestamp', game.system.rdd.calendrier.getTimestamp());
-      await chatMessage.update({ content: await RdDTextEditor.enrichHTML(chatMessage.content, undefined, {showLink:false}) })
+      await chatMessage.update({ content: await RdDTextEditor.enrichHTML(chatMessage.content, undefined, { showLink: false }) })
     }
   }
 }

module/common/_module.mjs

@@ -1,7 +0,0 @@
-import { CommonDescription } from "./description.mjs";
-import { CommonInventaire } from "./inventaire.mjs";
-
-export const TEMPLATE_DESCRIPTION = new CommonDescription()
-export const TEMPLATE_INVENTAIRE = new CommonInventaire()
-
-

module/common/common-template.mjs

@@ -1,8 +0,0 @@
-/**
- * class describing common methods implemented by template parts,
- * used for sheet/models/documents
- */
-export default class CommonTemplate {
-  fields() { }
-  async prepareContext(item) { }
-}

module/common/description.mjs

@@ -1,22 +0,0 @@
-import { RdDTextEditor } from "../apps/rdd-text-roll-editor.js"
-import CommonTemplate from "./common-template.mjs"
-import { HTMLSTRING } from "./field-types.mjs"
-
-const fields = foundry.data.fields
-
-export class CommonDescription extends CommonTemplate {
-  fields() {
-    return {
-      description: new fields.HTMLField({ ...HTMLSTRING }),
-      descriptionmj: new fields.HTMLField({ gmOnly: true, ...HTMLSTRING })
-    }
-  }
-
-  async prepareContext(item) {
-    return {
-      description: await RdDTextEditor.enrichHTML(item.system.description, item),
-      descriptionmj: await RdDTextEditor.enrichHTML(item.system.descriptionmj, item),
-    }
-  }
-
-}

module/common/field-types.mjs

@@ -1,9 +0,0 @@
-export const INTEGER = { required: true, nullable: false, min: 0, integer: true }
-export const DECIMAL = { required: true, nullable: false, min: 0, integer: false } /* TODO: validation de nombre décimales?*/
-export const INTEGER_SIGNED = { required: true, nullable: false, integer: true }
-export const DECIMAL_SIGNED = { required: true, nullable: false, integer: false }
-export const STRING = { required: true, nullable: false, blank: true, trim: true }
-export const HTMLSTRING = { initial: "", required: true, nullable: false, blank: true, trim: false, textSearch: true }
-
-export const MODEL_ARRAY = { initial: [], required: true, nullable: false }
-

module/common/inventaire.mjs

@@ -1,28 +0,0 @@
-import CommonTemplate from "./common-template.mjs"
-import { RARETES } from "../item/raretes.js"
-import { DECIMAL, INTEGER, INTEGER_SIGNED, MODEL_ARRAY, STRING } from "./field-types.mjs"
-
-const fields = foundry.data.fields
-
-export class CommonInventaire extends CommonTemplate {
-  fields() {
-    return {
-      encombrement: new fields.NumberField({ label: "Encombrement", initial: 0, ...INTEGER }),
-      quantite: new fields.NumberField({ label: "Quantité", initial: 1, ...INTEGER }),
-      qualite: new fields.NumberField({ label: "Qualité", initial: 0, ...INTEGER_SIGNED }),
-      cout: new fields.NumberField({ label: "Coût", initial: 0.0, ...DECIMAL }),
-      environnement: new fields.ArrayField(
-        new fields.SchemaField({
-          milieu: new fields.StringField({ label: "Milieu", initial: "", ...STRING }),
-          rarete: new fields.StringField({
-            label: "Rareté", initial: RARETES[0].code, ...STRING,
-            validate: (value, options) => RARETES.find(it => it.code == value)
-          }),
-          frequence: new fields.NumberField({ label: "Fréquence", initial: RARETES[0].frequence, ...INTEGER }),
-        }),
-        { label: "Environnement", ...MODEL_ARRAY }),
-    }
-  }
-  async prepareContext(item) {
-  }
-}

module/documents/_module.mjs

@@ -1,2 +0,0 @@
-export { default as RdDModelMonnaie } from "./monnaie.mjs"
-export { default as RdDModelMunition } from "./munition.mjs"

module/documents/monnaie.mjs

@@ -1,7 +0,0 @@
-import { RdDItem } from "../item.js";
-
-export default class RdDItemMonnaie extends RdDItem {
-  static get defaultIcon() {
-    return 'systems/foundryvtt-reve-de-dragon/icons/objets/piece_etain_poisson.webp'
-  }
-}

module/documents/munition.mjs

@@ -1,7 +0,0 @@
-import { RdDItem } from "../item.js";
-
-export default class RdDItemMunition extends RdDItem {
-  static get defaultIcon() {
-    return 'systems/foundryvtt-reve-de-dragon/icons/objets/fleche.webp'
-  }
-}

module/item-sheet.js

@@ -14,11 +14,12 @@ import { RdDItem } from "./item.js";
 import { FLEUVE_COORD, TMRUtility } from "./tmr-utility.js";
 import { RdDTextEditor } from "./apps/rdd-text-roll-editor.js";
 import { ItemAction } from "./item/item-actions.js";
+import { RdDItemGemme } from "./item/gemme.js";
 
 /**
  * Extend the basic ItemSheet for RdD specific items
  */
-export class RdDItemSheetV1 extends ItemSheet {
+export class RdDItemSheet extends ItemSheet {
 
   static get ITEM_TYPE() {
     return undefined
@@ -42,7 +43,7 @@ export class RdDItemSheetV1 extends ItemSheet {
   static get defaultOptions() {
     return foundry.utils.mergeObject(super.defaultOptions, {
       classes: [SYSTEM_RDD, "sheet", "item"],
-      template: RdDItemSheetV1.defaultTemplate(RdDItemSheetV1.ITEM_TYPE),
+      template: RdDItemSheet.defaultTemplate(RdDItemSheet.ITEM_TYPE),
       width: 550,
       height: 550
     }, { inplace: false });
@@ -50,7 +51,7 @@ export class RdDItemSheetV1 extends ItemSheet {
 
   /* -------------------------------------------- */
   get template() {
-    return RdDItemSheetV1.defaultTemplate(this.item.type);
+    return RdDItemSheet.defaultTemplate(this.item.type);
   }
 
   get title() {
@@ -263,7 +264,7 @@ export class RdDItemSheetV1 extends ItemSheet {
   _updateObject(event, formData) {
     switch (this.item.type) {
       case ITEM_TYPES.sort:
-        formData['system.bonuscase'] = RdDItemSort.bonuscasesToString(RdDItemSheetV1._listCaseTmr(
+        formData['system.bonuscase'] = RdDItemSort.bonuscasesToString(RdDItemSheet._listCaseTmr(
           formData.caseTmrCoord,
           formData.caseTmrBonus,
           formData.caseTmrAdd
@@ -313,7 +314,7 @@ export class RdDItemSheetV1 extends ItemSheet {
 
   async _onDrop(event) {
     // Try to extract the dragData
-    let dragData = RdDItemSheetV1.$extractDragData(event);
+    let dragData = RdDItemSheet.$extractDragData(event);
     if (!dragData) return false;
     const allowed = Hooks.call("dropActorSheetData", this.actor, this, dragData);
     if (allowed === false) return false;

module/item/sheet-base-inventaire.js

@@ -1,14 +1,14 @@
 import { HtmlUtility } from "../html-utility.js";
-import { RdDItemSheetV1 } from "../item-sheet.js";
+import { RdDItemSheet } from "../item-sheet.js";
 import { Misc } from "../misc.js";
 import { RdDRaretes } from "./raretes.js";
 
 const TYPE_ITEMS_NATURELS = ["faune", "herbe", "plante", "ingredient"];
 
-export class RdDItemInventaireSheet extends RdDItemSheetV1 {
+export class RdDItemInventaireSheet extends RdDItemSheet {
 
   static get defaultOptions() {
-    return foundry.utils.mergeObject(RdDItemSheetV1.defaultOptions, {
+    return foundry.utils.mergeObject(RdDItemSheet.defaultOptions, {
       tabs: [{ navSelector: ".sheet-tabs", contentSelector: ".sheet-body", initial: "informations" }]
     }, { inplace: false })
   }

module/item/sheet-blessure.js

@@ -1,6 +1,6 @@
-import { RdDItemSheetV1 } from "../item-sheet.js";
+import { RdDItemSheet } from "../item-sheet.js";
 
-export class RdDBlessureItemSheet extends RdDItemSheetV1 {
+export class RdDBlessureItemSheet extends RdDItemSheet {
 
   static get ITEM_TYPE() { return "blessure" };
 

module/item/sheet-rencontre.js

@@ -1,7 +1,7 @@
 import { RdDRencontre } from "./rencontre.js";
-import { RdDItemSheetV1 } from "../item-sheet.js";
+import { RdDItemSheet } from "../item-sheet.js";
 
-export class RdDRencontreItemSheet extends RdDItemSheetV1 {
+export class RdDRencontreItemSheet extends RdDItemSheet {
   
   static get ITEM_TYPE() { return "rencontre" };
 

module/item/sheet-service.js

@@ -1,6 +1,6 @@
-import { RdDItemSheetV1 } from "../item-sheet.js";
+import { RdDItemSheet } from "../item-sheet.js";
 
-export class RdDServiceItemSheet extends RdDItemSheetV1 {
+export class RdDServiceItemSheet extends RdDItemSheet {
 
   static get ITEM_TYPE() { return "service" };
 

module/item/sheet-signedraconique.js

@@ -1,12 +1,12 @@
-import { RdDItemSheetV1 } from "../item-sheet.js";
+import { RdDItemSheet } from "../item-sheet.js";
 import { RdDItemSigneDraconique } from "./signedraconique.js";
 import { TMRUtility } from "../tmr-utility.js";
 
 /**
  * Item sheet pour signes draconiques
- * @extends {RdDItemSheetV1}
+ * @extends {RdDItemSheet}
  */
-export class RdDSigneDraconiqueItemSheet extends RdDItemSheetV1 {
+export class RdDSigneDraconiqueItemSheet extends RdDItemSheet {
 
   static get ITEM_TYPE() { return "signedraconique" }
 

module/misc.js

@@ -265,7 +265,7 @@ export class Misc {
     const subset = elements.filter(options.preFilter)
       .filter(it => Grammar.toLowerCaseNoAccent(options.mapper(it))?.includes(value))
       .sort(Misc.ascending(it => options.mapper(it)))
-    if (subset.length == 0) {
+    if (subset.length == 0 && options?.onMessage) {
       options.onMessage(`Pas de ${options.description} correspondant à ${value}`);
     }
     return subset;

module/models/_module.mjs

@@ -1,2 +0,0 @@
-export { default as RdDModelMonnaie } from "./monnaie.mjs"
-export { default as RdDModelMunition } from "./munition.mjs"

module/models/monnaie.mjs

@@ -1,10 +0,0 @@
-import { TEMPLATE_DESCRIPTION, TEMPLATE_INVENTAIRE } from "../common/_module.mjs";
-
-export default class RdDModelMonnaie extends foundry.abstract.TypeDataModel {
-  static defineSchema() {
-    return Object.assign({},
-      TEMPLATE_DESCRIPTION.fields(),
-      TEMPLATE_INVENTAIRE.fields()
-    )
-  }
-}

module/models/munition.mjs

@@ -1,10 +0,0 @@
-import { TEMPLATE_DESCRIPTION, TEMPLATE_INVENTAIRE } from "../common/_module.mjs";
-
-export default class RdDModelMunition extends foundry.abstract.TypeDataModel {
-  static defineSchema() {
-    return Object.assign({},
-      TEMPLATE_DESCRIPTION.fields(),
-      TEMPLATE_INVENTAIRE.fields()
-    )
-  }
-}

module/rdd-combat.js

@@ -743,23 +743,13 @@ export class RdDCombat {
           this.attacker.createCallbackExperience(),
           this.attacker.createCallbackAppelAuMoral(),
           { action: r => this.removeChatMessageActionsPasseArme(r.passeArme) },
-          { action: r => this._increaseItemUse(r, arme) },
-          { action: r => this._onAttaqueNormale(r) },
-          { action: r => this._onAttaqueParticuliere(r) },
-          { action: r => this._onAttaqueEchec(r) },
-          { action: r => this._onAttaqueEchecTotal(r) },
+          { action: async r => await this.attacker.incDecItemUse(arme._id, arme && !RdDCombat.isParticuliere(r)) },
+          { action: r => this._onAttaque(r) },
         ]
       });
     dialog.render(true);
   }
 
-  _increaseItemUse(rollData, arme) {
-    if (!arme || RdDCombat.isParticuliere(rollData)) {
-      return
-    }
-    this.attacker.incDecItemUse(arme._id)
-  }
-
   /* -------------------------------------------- */
   _prepareAttaque(competence, arme) {
     let rollData = {
@@ -790,11 +780,23 @@ export class RdDCombat {
     return rollData;
   }
 
+  async _onAttaque(attackerRoll) {
+    if (RdDCombat.isParticuliere(attackerRoll)) {
+      return await this._onAttaqueParticuliere(attackerRoll)
+    }
+    if (RdDCombat.isReussite(attackerRoll)) {
+      return await this._onAttaqueNormale(attackerRoll)
+    }
+    // if (RdDCombat.isParticuliere(attackerRoll) && attackerRoll.particuliere == undefined) {
+    //   return
+    // }
+    if (RdDCombat.isEchecTotal(attackerRoll)) {
+      return await this._onAttaqueEchecTotal(attackerRoll)
+    }
+    return await this._onAttaqueEchec(attackerRoll)
+  }
   /* -------------------------------------------- */
   async _onAttaqueParticuliere(rollData) {
-    if (!RdDCombat.isParticuliere(rollData)) {
-      return
-    }
     const isMeleeDiffNegative = (rollData.competence.type == 'competencecreature' || rollData.selectedCarac.label == "Mêlée") && rollData.diffLibre < 0;
     // force toujours, sauf empoignade
     // finesse seulement en mélée, pour l'empoignade, ou si la difficulté libre est de -1 minimum
@@ -832,9 +834,6 @@ export class RdDCombat {
 
   /* -------------------------------------------- */
   async _onAttaqueNormale(attackerRoll) {
-    if (!RdDCombat.isReussite(attackerRoll) || RdDCombat.isParticuliere(attackerRoll)) {
-      return
-    }
     console.log("RdDCombat.onAttaqueNormale >>>", attackerRoll);
 
     attackerRoll.dmg = RdDBonus.dmg(attackerRoll, this.attacker, this.defender.isEntite());
@@ -849,7 +848,7 @@ export class RdDCombat {
       return;
     }
 
-    if (this.target) {
+    if (this.defender) {
       await this._sendMessageDefense(attackerRoll, defenderRoll);
     }
   }
@@ -951,9 +950,6 @@ export class RdDCombat {
 
   /* -------------------------------------------- */
   async _onAttaqueEchecTotal(attackerRoll) {
-    if (!RdDCombat.isEchecTotal(attackerRoll)) {
-      return
-    }
     const choixEchecTotal = await ChatMessage.create({
       whisper: ChatUtility.getOwners(this.attacker),
       content: await renderTemplate('systems/foundryvtt-reve-de-dragon/templates/chat-demande-attaque-etotal.hbs', {
@@ -980,26 +976,20 @@ export class RdDCombat {
   }
 
   /* -------------------------------------------- */
-  async _onAttaqueEchec(rollData) {
-    if (!RdDCombat.isEchec(rollData)) {
-      return
-    }
-    console.log("RdDCombat.onAttaqueEchec >>>", rollData);
-    await RdDRollResult.displayRollData(rollData, this.attacker, 'chat-resultat-attaque.hbs');
-
+  async _onAttaqueEchec(attackerRoll) {
+    console.log("RdDCombat.onAttaqueEchec >>>", attackerRoll);
+    await RdDRollResult.displayRollData(attackerRoll, this.attacker, 'chat-resultat-attaque.hbs');
   }
 
   /* -------------------------------------------- */
   async choixParticuliere(rollData, choix) {
     console.log("RdDCombat.choixParticuliere >>>", rollData, choix);
 
-    if (choix != "rapidite") {
-      this.attacker.incDecItemUse(rollData.arme.id);
-    }
+    await this.attacker.incDecItemUse(rollData.arme.id, choix != "rapidite")
 
     this.removeChatMessageActionsPasseArme(rollData.passeArme);
     rollData.particuliere = choix;
-    await this._onAttaqueNormale(rollData);
+    await this._onAttaqueNormale(rollData)
   }
 
   /* -------------------------------------------- */
@@ -1023,10 +1013,8 @@ export class RdDCombat {
           this.defender.createCallbackExperience(),
           this.defender.createCallbackAppelAuMoral(),
           { action: r => this.removeChatMessageActionsPasseArme(r.passeArme) },
-          { condition: r => !RdDCombat.isParticuliere(r), action: r => this.defender.incDecItemUse(armeParadeId) },
-          { condition: RdDCombat.isReussite, action: r => this._onParadeNormale(r) },
-          { condition: RdDCombat.isParticuliere, action: r => this._onParadeParticuliere(r) },
-          { condition: RdDCombat.isEchec, action: r => this._onParadeEchec(r) },
+          { action: async r => await this.defender.incDecItemUse(armeParadeId, !RdDCombat.isParticuliere(r)) },
+          { action: r => this._onParade(r) },
         ]
       });
     dialog.render(true);
@@ -1057,8 +1045,19 @@ export class RdDCombat {
     return defenderRoll;
   }
 
+
+  async _onParade(defenderRoll) {
+    if (RdDCombat.isParticuliere(defenderRoll)) {
+      return await this._onParadeParticuliere(defenderRoll)
+    }
+    if (RdDCombat.isReussite(defenderRoll)) {
+      return await this._onParadeNormale(defenderRoll)
+    }
+    await this._onParadeEchec(defenderRoll)
+  }
+
   /* -------------------------------------------- */
-  _onParadeParticuliere(defenderRoll) {
+  async _onParadeParticuliere(defenderRoll) {
     console.log("RdDCombat._onParadeParticuliere >>>", defenderRoll);
     if (!defenderRoll.attackerRoll.isPart) {
       // TODO: attaquant doit jouer résistance et peut être désarmé p132
@@ -1067,7 +1066,6 @@ export class RdDCombat {
         this.defender)
     }
   }
-
   /* -------------------------------------------- */
   async _onParadeNormale(defenderRoll) {
     console.log("RdDCombat._onParadeNormale >>>", defenderRoll);
@@ -1106,11 +1104,9 @@ export class RdDCombat {
         callbacks: [
           this.defender.createCallbackExperience(),
           this.defender.createCallbackAppelAuMoral(),
-          { condition: r => !RdDCombat.isParticuliere(r), action: r => this.defender.incDecItemUse(esquive._id) },
+          { action: async r => await this.defender.incDecItemUse(esquive._id, !RdDCombat.isParticuliere(r)) },
           { action: r => this.removeChatMessageActionsPasseArme(r.passeArme) },
-          { condition: RdDCombat.isReussite, action: r => this._onEsquiveNormale(r) },
-          { condition: RdDCombat.isParticuliere, action: r => this._onEsquiveParticuliere(r) },
-          { condition: RdDCombat.isEchec, action: r => this._onEsquiveEchec(r) },
+          { action: r => this._onEsquive(r) },
         ]
       });
     dialog.render(true);
@@ -1138,9 +1134,18 @@ export class RdDCombat {
     return rollData;
   }
 
+  async _onEsquive(defenderRoll) {
+    if (RdDCombat.isParticuliere(defenderRoll)) {
+      return await this._onEsquiveParticuliere(defenderRoll)
+    }
+    if (RdDCombat.isReussite(defenderRoll)) {
+      return await this._onEsquiveNormale(defenderRoll)
+    }
+    return await this._onEsquiveEchec(defenderRoll)
+  }
   /* -------------------------------------------- */
-  _onEsquiveParticuliere(rollData) {
-    console.log("RdDCombat._onEsquiveParticuliere >>>", rollData);
+  async _onEsquiveParticuliere(defenderRoll) {
+    console.log("RdDCombat._onEsquiveParticuliere >>>", defenderRoll);
     ChatUtility.createChatWithRollMode(
       { content: "<strong>Vous pouvez esquiver une deuxième fois!</strong>" },
       this.defender);

module/rdd-main.js

@@ -54,7 +54,7 @@ import { RdDItemSouffle } from "./item/souffle.js"
 
 import { RdDRencontre } from "./item/rencontre.js"
 
-import { RdDItemSheetV1 } from "./item-sheet.js"
+import { RdDItemSheet } from "./item-sheet.js"
 import { RdDBlessureItemSheet } from "./item/sheet-blessure.js"
 import { RdDServiceItemSheet } from "./item/sheet-service.js"
 import { RdDRencontreItemSheet } from "./item/sheet-rencontre.js"
@@ -80,10 +80,6 @@ import { RdDItemPotion } from "./item/potion.js"
 import { RdDItemGemme } from "./item/gemme.js"
 import { RdDGemmeItemSheet } from "./item/sheet-gemme.js"
 
-import * as models from "./models/_module.mjs"
-import * as items from "./documents/_module.mjs"
-import * as sheets from "./applications/sheets/_module.mjs"
-
 /**
  * RdD system
  * Author: LeRatierBretonnien
@@ -104,8 +100,6 @@ export class SystemReveDeDragon {
     this.RdDHotbar = RdDHotbar
     this.RdDStatBlockParser = RdDStatBlockParser
     this.itemClasses = {
-      monnaie: items.RdDModelMonnaie,
-      munition: items.RdDModelMunition,
       armure: RdDItemArmure,
       blessure: RdDItemBlessure,
       gemme: RdDItemGemme,
@@ -135,9 +129,6 @@ export class SystemReveDeDragon {
   /* -------------------------------------------- */
   onInit() {
     game.system.rdd = this
-
-    globalThis.RdD = game.system
-
     this.AppAstrologie = AppAstrologie
 
     console.log(`Initializing Reve de Dragon System Settings`)
@@ -184,10 +175,6 @@ export class SystemReveDeDragon {
     console.log(`Initializing Reve de Dragon Documents`)
     CONFIG.Actor.documentClass = RdDBaseActor
     CONFIG.Item.documentClass = RdDItem
-    CONFIG.Item.dataModels = {
-      monnaie: models.RdDModelMonnaie,
-      munition: models.RdDModelMunition,
-    }
     CONFIG.RDD = {
       resolutionTable: RdDResolutionTable.resolutionTable,
       carac_array: RdDUtility.getCaracArray(),
@@ -208,15 +195,12 @@ export class SystemReveDeDragon {
 
     Items.registerSheet(SYSTEM_RDD, RdDItemInventaireSheet, {
       types: [
-        "objet", "arme", "armure", "livre", "nourritureboisson",
+        "objet", "arme", "armure", "livre", "munition",
+        "monnaie", "nourritureboisson",
       ],
       makeDefault: true
     })
-
-    sheets.RdDItemSheet.register(sheets.RdDMonnaieSheet)
-    sheets.RdDItemSheet.register(sheets.RdDMunitionSheet)
-
-    Items.registerSheet(SYSTEM_RDD, RdDItemSheetV1, {
+    Items.registerSheet(SYSTEM_RDD, RdDItemSheet, {
       types: [
         "competence", "competencecreature",
         "recettealchimique", "musique", "chant", "danse", "jeu", "race",
@@ -228,17 +212,17 @@ export class SystemReveDeDragon {
       makeDefault: true
     })
     
-    RdDItemSheetV1.register(RdDBlessureItemSheet)
-    RdDItemSheetV1.register(RdDConteneurItemSheet)
-    RdDItemSheetV1.register(RdDFauneItemSheet)
-    RdDItemSheetV1.register(RdDGemmeItemSheet)
-    RdDItemSheetV1.register(RdDHerbeItemSheet)
-    RdDItemSheetV1.register(RdDIngredientItemSheet)
-    RdDItemSheetV1.register(RdDPlanteItemSheet)
-    RdDItemSheetV1.register(RdDPotionItemSheet)
-    RdDItemSheetV1.register(RdDRencontreItemSheet)
-    RdDItemSheetV1.register(RdDServiceItemSheet)
-    RdDItemSheetV1.register(RdDSigneDraconiqueItemSheet)
+    RdDItemSheet.register(RdDBlessureItemSheet)
+    RdDItemSheet.register(RdDConteneurItemSheet)
+    RdDItemSheet.register(RdDFauneItemSheet)
+    RdDItemSheet.register(RdDGemmeItemSheet)
+    RdDItemSheet.register(RdDHerbeItemSheet)
+    RdDItemSheet.register(RdDIngredientItemSheet)
+    RdDItemSheet.register(RdDPlanteItemSheet)
+    RdDItemSheet.register(RdDPotionItemSheet)
+    RdDItemSheet.register(RdDRencontreItemSheet)
+    RdDItemSheet.register(RdDServiceItemSheet)
+    RdDItemSheet.register(RdDSigneDraconiqueItemSheet)
     RdDJournalSheet.register()
 
     // préparation des différents modules

module/rdd-resolution-table.js

@@ -1,4 +1,3 @@
-import { ChatUtility } from "./chat-utility.js";
 import { Misc } from "./misc.js";
 import { RdDDice } from "./rdd-dice.js";
 import { ReglesOptionnelles } from "./settings/regles-optionnelles.js";

system.json

@@ -1,9 +1,9 @@
 {
   "id": "foundryvtt-reve-de-dragon",
   "title": "Rêve de Dragon",
-  "version": "12.0.38",
-  "download": "https://www.uberwald.me/gitea/public/foundryvtt-reve-de-dragon/releases/download/12.0.38/rddsystem.zip",
-  "manifest": "https://www.uberwald.me/gitea/public/foundryvtt-reve-de-dragon/releases/download/12.0.38/system.json",
+  "version": "12.0.42",
+  "download": "https://www.uberwald.me/gitea/public/foundryvtt-reve-de-dragon/releases/download/12.0.42/rddsystem.zip",
+  "manifest": "https://www.uberwald.me/gitea/public/foundryvtt-reve-de-dragon/releases/download/12.0.42/system.json",
   "changelog": "https://www.uberwald.me/gitea/public/foundryvtt-reve-de-dragon/raw/branch/v11/changelog.md",
   "compatibility": {
     "minimum": "11",

template.json

@@ -742,6 +742,9 @@
     "objet": {
       "templates": ["description", "equipement", "inventaire"]
     },
+    "monnaie": {
+      "templates": ["description", "inventaire"]
+    },
     "gemme": {
       "templates": ["description", "enchantable", "inventaire", "temporel"],
       "type": "",
@@ -750,6 +753,9 @@
       "inertie": 0,
       "enchantabilite": 0
     },
+    "munition": {
+      "templates": ["description", "inventaire"]
+    },
     "nourritureboisson": {
       "templates": ["description", "inventaire", "comestible"],
       "cuisinier": "",

templates/actor/xp-competences.hbs

@@ -1,15 +1,18 @@
 <div>
   <ul class="item-list">
-    <li class="item flexrow">
+    <li class="flexrow">
       <label class="derivee-label" for="system.compteurs.experience.value">Stress transformé</label>
       {{#if options.vueDetaillee}}
-      <input class="derivee-value" type="number" name="system.compteurs.experience.value" value="{{system.compteurs.experience.value}}" data-dtype="number" size="3"/>
+      <input class="resource-content"
+        type="text" data-dtype="Number" size="3"
+        name="system.compteurs.experience.value"
+        value="{{system.compteurs.experience.value}}"/>
       {{else}}
       <label name="system.compteurs.experience.value">{{system.compteurs.experience.value}}</label>
       {{/if}}
     </li>
     {{#if options.vueDetaillee}}
-    <li class="item flexrow">
+    <li class="flexrow">
       <span class="generic-label">Total XP compétences</span>
       <span class="competence-value">{{calc.competenceXPTotal}}</span>
     </li>

templates/chat-demande-attaque-particuliere.hbs

@@ -2,19 +2,22 @@
   <h4 class="rdd-roll-part">{{alias}} réussit une attaque particulière!</strong></h4>
   {{#if isForce}}
   <br>
-  <a class="chat-card-button particuliere-attaque" data-mode="force" data-attackerId="{{attackerId}}">
+  <a class="chat-card-button particuliere-attaque" data-mode="force" data-attackerId="{{attackerId}}"
+    data-defenderTokenId="{{defenderToken.id}}" data-attackerTokenId="{{attackerToken.id}}">
     Attaquer en Force
   </a>
   {{/if}}
   {{#if isRapide}}
   <br>
-  <a class="chat-card-button particuliere-attaque" data-mode="rapidite" data-attackerId="{{attackerId}}">
+  <a class="chat-card-button particuliere-attaque" data-mode="rapidite" data-attackerId="{{attackerId}}"
+    data-defenderTokenId="{{defenderToken.id}}" data-attackerTokenId="{{attackerToken.id}}">
     Attaquer en Rapidité
   </a>
   {{/if}}
   {{#if isFinesse}}
   <br>
-  <a class="chat-card-button particuliere-attaque" data-mode="finesse" data-attackerId="{{attackerId}}">
+  <a class="chat-card-button particuliere-attaque" data-mode="finesse" data-attackerId="{{attackerId}}"
+    data-defenderTokenId="{{defenderToken.id}}" data-attackerTokenId="{{attackerToken.id}}">
     Attaquer en Finesse
   </a>
   {{/if}}

templates/chat-resultat-lecture-signedraconique.hbs

@@ -4,7 +4,7 @@
 <hr>
 <div>
   {{#if rolled.isSuccess}}
-  {{alias}} a gagné {{xpSort}} points d'expérience en sorts dans la {{competence.name}}.
+  {{alias}} a gagné {{xpSort}} points d'expérience en sorts en {{competence.name}}.
   {{else}}
   {{alias}} n'a pas pu interpréter le signe draconique.
   {{/if}}

templates/item/monnaie.hbs

@@ -1,14 +0,0 @@
-<form class="{{cssClass}}" autocomplete="off">
-  {{>"systems/foundryvtt-reve-de-dragon/templates/header-item.hbs"}}
-  <nav class="sheet-tabs tabs" data-group="primary">
-    <a class="item" data-tab="informations">Informations</a>
-    {{>"systems/foundryvtt-reve-de-dragon/templates/item/partial-tab-environnement.hbs"}}
-  </nav>
-  <section class="sheet-body">
-    <div class="tab items flexcol" data-group="primary" data-tab="informations">
-      {{>"systems/foundryvtt-reve-de-dragon/templates/item/partial-inventaire.hbs"}}
-      {{>"systems/foundryvtt-reve-de-dragon/templates/partial-item-description.hbs"}}
-    </div>
-    {{>"systems/foundryvtt-reve-de-dragon/templates/item/partial-environnement.hbs"}}
-  </section>
-</form>

templates/item/munition.hbs

@@ -1,14 +0,0 @@
-<form class="{{cssClass}}" autocomplete="off">
-  {{>"systems/foundryvtt-reve-de-dragon/templates/header-item.hbs"}}
-  <nav class="sheet-tabs tabs" data-group="primary">
-    <a class="item" data-tab="informations">Informations</a>
-    {{>"systems/foundryvtt-reve-de-dragon/templates/item/partial-tab-environnement.hbs"}}
-  </nav>
-  <section class="sheet-body">
-    <div class="tab items flexcol" data-group="primary" data-tab="informations">
-      {{>"systems/foundryvtt-reve-de-dragon/templates/item/partial-inventaire.hbs"}}
-      {{>"systems/foundryvtt-reve-de-dragon/templates/partial-item-description.hbs"}}
-    </div>
-    {{>"systems/foundryvtt-reve-de-dragon/templates/item/partial-environnement.hbs"}}
-  </section>
-</form>