Item munition

- affichage en erreur des monnaies sans valeur (dites "de glipzouk")
- gestion du prix parfois non modifiable

changelog.md

@@ -1,8 +1,4 @@
 # 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

module/actor.js

@@ -2643,13 +2643,12 @@ export class RdDActor extends RdDBaseActorSang {
   }
 
   /* -------------------------------------------- */
-  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) + 1;
-      await this.setFlag(SYSTEM_RDD, 'itemUse', itemUse);
-    }
+  async incDecItemUse(itemId, inc = 1) {
+    const currentItemUse = this.getFlag(SYSTEM_RDD, 'itemUse');
+    let itemUse = currentItemUse ? foundry.utils.duplicate(currentItemUse) : {};
+    itemUse[itemId] = (itemUse[itemId] ?? 0) + inc;
+    await this.setFlag(SYSTEM_RDD, 'itemUse', itemUse);
+    console.log("ITEM USE INC", inc, itemUse);
   }
 
   /* -------------------------------------------- */

module/actor/base-actor-reve.js

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

module/actor/base-actor.js

@@ -747,7 +747,7 @@ export class RdDBaseActor extends Actor {
   async jetDeMoral() { this.actionImpossible("jet de moral") }
 
   async resetItemUse() { }
-  async incDecItemUse(itemId, shouldIncrease = true) { }
+  async incDecItemUse(itemId, inc = 1) { }
   getItemUse(itemId) { return 0; }
 
   async finDeRound(options = { terminer: false }) { }

module/applications/sheets/_module.mjs

@@ -0,0 +1,4 @@
+export { default as RdDItemBaseSheet} 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

@@ -0,0 +1,111 @@
+const { HandlebarsApplicationMixin } = foundry.applications.api
+import { SYSTEM_RDD } from "../../constants.js"
+import { Misc } from "../../misc.js"
+import { RdDSheetUtility } from "../../rdd-sheet-utility.js";
+
+
+export default class RdDItemBaseSheet extends HandlebarsApplicationMixin(foundry.applications.sheets.ItemSheetV2) {
+
+  static preloadHandlebars(...templatesList) {
+    const handlebars = ["systems/foundryvtt-reve-de-dragon/templates/sheets/item/common/header.hbs"]
+    templatesList.forEach(templates =>
+      templates.forEach(t =>
+        t.handlebars().forEach(h => handlebars.push(h))
+      )
+    )
+    loadTemplates(Misc.distinct(handlebars))
+  }
+  
+  static register(sheetClass) {
+    const itemType = sheetClass.ITEM_TYPE
+    Items.registerSheet(SYSTEM_RDD, sheetClass, {
+      label: Misc.typeName('Item', itemType),
+      types: [itemType],
+      makeDefault: true
+    })
+  }
+  
+  static registerAll(...sheetClasses) {
+    const handlebars = ["systems/foundryvtt-reve-de-dragon/templates/sheets/item/common/header.hbs"]
+    sheetClasses.forEach(sheetClass => {
+      sheetClass.TEMPLATES.forEach(t =>
+        t.handlebars().forEach(h => handlebars.push(h))
+      )
+      const itemType = sheetClass.ITEM_TYPE
+      Items.registerSheet(SYSTEM_RDD, sheetClass, {
+        label: Misc.typeName('Item', itemType),
+        types: [itemType],
+        makeDefault: true
+      })
+    })
+    loadTemplates(Misc.distinct(handlebars))
+  }
+
+  static get ITEM_TYPE() { return undefined }
+
+  constructor(options = {}) {
+    super(options)
+  }
+
+  static get TEMPLATES() { return [] }
+
+  /** @override */
+  static DEFAULT_OPTIONS = {
+    classes: ["fvtt-rdd", "item"],
+    position: {
+      width: 600,
+      height: "auto",
+    },
+    form: {
+      submitOnChange: true,
+    },
+    window: {
+      resizable: true,
+    },
+    actions: {
+      editImage: RdDItemBaseSheet.#onEditImage,
+    }
+  }
+
+  /** @override */
+  async _prepareContext() {
+    return {
+      item: this.document,
+      options: RdDSheetUtility.getOptions(this.document, this.isEditable),
+      fields: this.document.schema.fields,
+      systemFields: this.document.system.schema.fields,
+      system: this.document.system,
+      source: this.document.toObject(),
+      isEditable: this.isEditable,
+    }
+  }
+
+  // #region Actions
+
+  /**
+   * Handle changing a Document's image.
+   *
+   * @this RdDItemBaseSheet
+   * @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

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

module/applications/sheets/munition-sheet.mjs

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

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-zÀ-ÖØ-öø-ÿ ]+([1-2]?[A-Za-zÀ-ÖØ-öø-ÿ ]+)?))?"
+const REGEXP_COMP = "(\\/(?<competence>[A-Za-z0-9À-ÖØ-öø-ÿ -]+))?"
 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/common/_module.mjs

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

module/common/common-template.mjs

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

module/common/description.mjs

@@ -0,0 +1,32 @@
+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 })
+    }
+  }
+
+  handlebars() {
+    return [
+      "systems/foundryvtt-reve-de-dragon/templates/sheets/item/common/template-description.hbs",
+    ]
+  }
+  actions() {
+    return {}
+  }
+
+  async prepareContext(item) {
+    const enriched = {
+      description: await RdDTextEditor.enrichHTML(item.system.description, item),
+      descriptionmj: await RdDTextEditor.enrichHTML(item.system.descriptionmj, item),
+    }
+    return { enriched }
+  }
+
+}

module/common/field-types.mjs

@@ -0,0 +1,9 @@
+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, textSearch: true }
+
+export const MODEL_ARRAY = { initial: [], required: true, nullable: false }
+

module/common/inventaire.mjs

@@ -0,0 +1,36 @@
+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 }),
+    }
+  }
+
+  handlebars() {
+    return [
+      "systems/foundryvtt-reve-de-dragon/templates/sheets/item/common/template-inventaire.hbs"
+    ]
+  }
+
+  async prepareContext(item) {
+    return {}
+  }
+}

module/documents/_module.mjs

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

module/documents/monnaie.mjs

@@ -0,0 +1,7 @@
+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

@@ -0,0 +1,7 @@
+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,12 +14,11 @@ 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 RdDItemSheet extends ItemSheet {
+export class RdDItemSheetV1 extends ItemSheet {
 
   static get ITEM_TYPE() {
     return undefined
@@ -43,7 +42,7 @@ export class RdDItemSheet extends ItemSheet {
   static get defaultOptions() {
     return foundry.utils.mergeObject(super.defaultOptions, {
       classes: [SYSTEM_RDD, "sheet", "item"],
-      template: RdDItemSheet.defaultTemplate(RdDItemSheet.ITEM_TYPE),
+      template: RdDItemSheetV1.defaultTemplate(RdDItemSheetV1.ITEM_TYPE),
       width: 550,
       height: 550
     }, { inplace: false });
@@ -51,7 +50,7 @@ export class RdDItemSheet extends ItemSheet {
 
   /* -------------------------------------------- */
   get template() {
-    return RdDItemSheet.defaultTemplate(this.item.type);
+    return RdDItemSheetV1.defaultTemplate(this.item.type);
   }
 
   get title() {
@@ -101,7 +100,7 @@ export class RdDItemSheet extends ItemSheet {
       description: await RdDTextEditor.enrichHTML(this.item.system.description, this.item),
       descriptionmj: await RdDTextEditor.enrichHTML(this.item.system.descriptionmj, this.item),
       isComestible: this.item.getUtilisationCuisine(),
-      options: RdDSheetUtility.mergeDocumentRights(this.options, this.item, this.isEditable),
+      options: RdDSheetUtility.mergeDocumentRights({}, this.item, this.isEditable),
       competences: await SystemCompendiums.getCompetences(ACTOR_TYPES.personnage),
       categories: RdDItem.getCategories(this.item.type),
     }
@@ -264,7 +263,7 @@ export class RdDItemSheet extends ItemSheet {
   _updateObject(event, formData) {
     switch (this.item.type) {
       case ITEM_TYPES.sort:
-        formData['system.bonuscase'] = RdDItemSort.bonuscasesToString(RdDItemSheet._listCaseTmr(
+        formData['system.bonuscase'] = RdDItemSort.bonuscasesToString(RdDItemSheetV1._listCaseTmr(
           formData.caseTmrCoord,
           formData.caseTmrBonus,
           formData.caseTmrAdd
@@ -314,7 +313,7 @@ export class RdDItemSheet extends ItemSheet {
 
   async _onDrop(event) {
     // Try to extract the dragData
-    let dragData = RdDItemSheet.$extractDragData(event);
+    let dragData = RdDItemSheetV1.$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 { RdDItemSheet } from "../item-sheet.js";
+import { RdDItemSheetV1 } 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 RdDItemSheet {
+export class RdDItemInventaireSheet extends RdDItemSheetV1 {
 
   static get defaultOptions() {
-    return foundry.utils.mergeObject(RdDItemSheet.defaultOptions, {
+    return foundry.utils.mergeObject(RdDItemSheetV1.defaultOptions, {
       tabs: [{ navSelector: ".sheet-tabs", contentSelector: ".sheet-body", initial: "informations" }]
     }, { inplace: false })
   }

module/item/sheet-blessure.js

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

module/item/sheet-rencontre.js

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

module/item/sheet-service.js

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

module/item/sheet-signedraconique.js

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

module/models/_module.mjs

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

module/models/monnaie.mjs

@@ -0,0 +1,10 @@
+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

@@ -0,0 +1,10 @@
+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,13 +743,23 @@ export class RdDCombat {
           this.attacker.createCallbackExperience(),
           this.attacker.createCallbackAppelAuMoral(),
           { action: r => this.removeChatMessageActionsPasseArme(r.passeArme) },
-          { action: async r => await this.attacker.incDecItemUse(arme._id, arme && !RdDCombat.isParticuliere(r)) },
-          { action: r => this._onAttaque(r) },
+          { 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) },
         ]
       });
     dialog.render(true);
   }
 
+  _increaseItemUse(rollData, arme) {
+    if (!arme || RdDCombat.isParticuliere(rollData)) {
+      return
+    }
+    this.attacker.incDecItemUse(arme._id)
+  }
+
   /* -------------------------------------------- */
   _prepareAttaque(competence, arme) {
     let rollData = {
@@ -780,23 +790,11 @@ 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
@@ -834,6 +832,12 @@ export class RdDCombat {
 
   /* -------------------------------------------- */
   async _onAttaqueNormale(attackerRoll) {
+    if (!RdDCombat.isReussite(attackerRoll)) {
+      return
+    }
+    if (RdDCombat.isParticuliere(attackerRoll) && attackerRoll.particuliere == undefined) {
+      return
+    }
     console.log("RdDCombat.onAttaqueNormale >>>", attackerRoll);
 
     attackerRoll.dmg = RdDBonus.dmg(attackerRoll, this.attacker, this.defender.isEntite());
@@ -950,6 +954,9 @@ 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', {
@@ -976,16 +983,22 @@ export class RdDCombat {
   }
 
   /* -------------------------------------------- */
-  async _onAttaqueEchec(attackerRoll) {
-    console.log("RdDCombat.onAttaqueEchec >>>", attackerRoll);
-    await RdDRollResult.displayRollData(attackerRoll, this.attacker, 'chat-resultat-attaque.hbs');
+  async _onAttaqueEchec(rollData) {
+    if (!RdDCombat.isEchec(rollData)) {
+      return
+    }
+    console.log("RdDCombat.onAttaqueEchec >>>", rollData);
+    await RdDRollResult.displayRollData(rollData, this.attacker, 'chat-resultat-attaque.hbs');
+
   }
 
   /* -------------------------------------------- */
   async choixParticuliere(rollData, choix) {
     console.log("RdDCombat.choixParticuliere >>>", rollData, choix);
 
-    await this.attacker.incDecItemUse(rollData.arme.id, choix != "rapidite")
+    if (choix != "rapidite") {
+      this.attacker.incDecItemUse(rollData.arme.id);
+    }
 
     this.removeChatMessageActionsPasseArme(rollData.passeArme);
     rollData.particuliere = choix;
@@ -1013,8 +1026,10 @@ export class RdDCombat {
           this.defender.createCallbackExperience(),
           this.defender.createCallbackAppelAuMoral(),
           { action: r => this.removeChatMessageActionsPasseArme(r.passeArme) },
-          { action: async r => await this.defender.incDecItemUse(armeParadeId, !RdDCombat.isParticuliere(r)) },
-          { action: r => this._onParade(r) },
+          { 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) },
         ]
       });
     dialog.render(true);
@@ -1045,19 +1060,8 @@ 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)
-  }
-
   /* -------------------------------------------- */
-  async _onParadeParticuliere(defenderRoll) {
+  _onParadeParticuliere(defenderRoll) {
     console.log("RdDCombat._onParadeParticuliere >>>", defenderRoll);
     if (!defenderRoll.attackerRoll.isPart) {
       // TODO: attaquant doit jouer résistance et peut être désarmé p132
@@ -1066,6 +1070,7 @@ export class RdDCombat {
         this.defender)
     }
   }
+
   /* -------------------------------------------- */
   async _onParadeNormale(defenderRoll) {
     console.log("RdDCombat._onParadeNormale >>>", defenderRoll);
@@ -1104,9 +1109,11 @@ export class RdDCombat {
         callbacks: [
           this.defender.createCallbackExperience(),
           this.defender.createCallbackAppelAuMoral(),
-          { action: async r => await this.defender.incDecItemUse(esquive._id, !RdDCombat.isParticuliere(r)) },
+          { condition: r => !RdDCombat.isParticuliere(r), action: r => this.defender.incDecItemUse(esquive._id) },
           { action: r => this.removeChatMessageActionsPasseArme(r.passeArme) },
-          { action: r => this._onEsquive(r) },
+          { condition: RdDCombat.isReussite, action: r => this._onEsquiveNormale(r) },
+          { condition: RdDCombat.isParticuliere, action: r => this._onEsquiveParticuliere(r) },
+          { condition: RdDCombat.isEchec, action: r => this._onEsquiveEchec(r) },
         ]
       });
     dialog.render(true);
@@ -1134,18 +1141,9 @@ 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)
-  }
   /* -------------------------------------------- */
-  async _onEsquiveParticuliere(defenderRoll) {
-    console.log("RdDCombat._onEsquiveParticuliere >>>", defenderRoll);
+  _onEsquiveParticuliere(rollData) {
+    console.log("RdDCombat._onEsquiveParticuliere >>>", rollData);
     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 { RdDItemSheet } from "./item-sheet.js"
+import { RdDItemSheetV1 } 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,6 +80,10 @@ 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
@@ -100,6 +104,8 @@ export class SystemReveDeDragon {
     this.RdDHotbar = RdDHotbar
     this.RdDStatBlockParser = RdDStatBlockParser
     this.itemClasses = {
+      monnaie: items.RdDModelMonnaie,
+      munition: items.RdDModelMunition,
       armure: RdDItemArmure,
       blessure: RdDItemBlessure,
       gemme: RdDItemGemme,
@@ -129,6 +135,9 @@ export class SystemReveDeDragon {
   /* -------------------------------------------- */
   onInit() {
     game.system.rdd = this
+
+    globalThis.RdD = game.system
+
     this.AppAstrologie = AppAstrologie
 
     console.log(`Initializing Reve de Dragon System Settings`)
@@ -175,6 +184,10 @@ 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(),
@@ -195,12 +208,17 @@ export class SystemReveDeDragon {
 
     Items.registerSheet(SYSTEM_RDD, RdDItemInventaireSheet, {
       types: [
-        "objet", "arme", "armure", "livre", "munition",
-        "monnaie", "nourritureboisson",
+        "objet", "arme", "armure", "livre", "nourritureboisson",
       ],
       makeDefault: true
     })
-    Items.registerSheet(SYSTEM_RDD, RdDItemSheet, {
+
+    sheets.RdDItemBaseSheet.registerAll(
+      sheets.RdDMonnaieSheet,
+      sheets.RdDMunitionSheet
+    )
+
+    Items.registerSheet(SYSTEM_RDD, RdDItemSheetV1, {
       types: [
         "competence", "competencecreature",
         "recettealchimique", "musique", "chant", "danse", "jeu", "race",
@@ -211,18 +229,18 @@ export class SystemReveDeDragon {
       ],
       makeDefault: true
     })
-    
-    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)
+
+    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)
     RdDJournalSheet.register()
 
     // préparation des différents modules

module/rdd-resolution-table.js

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

module/rdd-sheet-utility.js

@@ -3,11 +3,11 @@ import { RdDItem } from "./item.js";
 
 export class RdDSheetUtility {
 
-  static mergeDocumentRights(options, document, editable) {
+  static getOptions(document, editable) {
     const userRightLevel = game.user.isGM
       ? CONST.DOCUMENT_OWNERSHIP_LEVELS.OWNER
       : document.getUserLevel(game.user);
-    let newOptions = {
+    return {
       isGM: game.user.isGM,
       isOwned: document.parent ? true : false,
       editable: editable,
@@ -16,10 +16,15 @@ export class RdDSheetUtility {
       isObserver: userRightLevel >= CONST.DOCUMENT_OWNERSHIP_LEVELS.OBSERVER,
       isOwner: userRightLevel >= CONST.DOCUMENT_OWNERSHIP_LEVELS.OWNER
     }
+  }
+
+  static mergeDocumentRights(options, document, editable) {
+    const newOptions = RdDSheetUtility.getOptions(document, editable);
     foundry.utils.mergeObject(options, newOptions);
     return options;
   }
 
+
   static getItem(event, actor) {
     return actor.items.get(RdDSheetUtility.getItemId(event))
   }

styles/simple.css

@@ -28,6 +28,9 @@
     font-weight: normal;
     font-style: normal;
 }
+body {
+  --input-height: 1.4rem;
+}
 :root {
 /* =================== 1. ACTOR SHEET FONT STYLES =========== */
   --window-header-title-font-family: CaslonAntique;
@@ -731,10 +734,36 @@ input:is(.blessure-premiers_soins, .blessure-soins_complets) {
 .flex-grow-3 {
   flex-grow: 3;
 }
-
-.editor.prosemirror {
+fieldset {
+  border-style: groove;
+  border-width: 0.1rem;
+  padding-inline: 0.2rem;
+  padding-block: 0.1rem;
+  margin-inline: 0.1rem;
+  margin-block: 0.1rem;
+}
+form.application.sheet.fvtt-rdd fieldset :is(label, input) {
+  font-family: CaslonAntique;
+  text-align: justify;
+  font-size: 1rem;
+  letter-spacing: 1px;
+}
+form.application.sheet.fvtt-rdd div.form-group {
+  clear: both;
+  display: flex;
+  flex-direction: row;
+  flex-wrap: wrap;
+  margin: 0.1rem 0;
+  align-items: center;
+}
+form.application.sheet.fvtt-rdd .editor.prosemirror {
   height: fit-content;
-  min-height: 20rem;
+  min-height: 5rem;
+}
+form.application.sheet.fvtt-rdd prose-mirror.prosemirror .editor-container {
+  min-height: 5rem;
+  height: fit-content;
+  margin: 0;
 }
 .large-editor {
   border: 2;
@@ -742,6 +771,7 @@ input:is(.blessure-premiers_soins, .blessure-soins_complets) {
   min-height: 12rem;
   padding: 0 3px;
 }
+
 .editor {
   border: 2;
   height: fit-content;
@@ -765,6 +795,7 @@ input:is(.blessure-premiers_soins, .blessure-soins_complets) {
 .foundryvtt-reve-de-dragon.sheet :is(.large-editor,.editor,.medium-editor,.small-editor){
   align-items: start;
 }
+
 .foundryvtt-reve-de-dragon.sheet :is(.large-editor,.editor,.medium-editor,.small-editor) .editor.prosemirror{
   align-items: normal;
 }

system.json

@@ -1,9 +1,9 @@
 {
   "id": "foundryvtt-reve-de-dragon",
   "title": "Rêve de Dragon",
-  "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",
+  "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",
   "changelog": "https://www.uberwald.me/gitea/public/foundryvtt-reve-de-dragon/raw/branch/v11/changelog.md",
   "compatibility": {
     "minimum": "11",

template.json

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

templates/item/munition.hbs

@@ -0,0 +1,14 @@
+<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/sheets/item/common/header.hbs

@@ -0,0 +1,6 @@
+<header class="sheet-header">
+    <img class="profile-img" src="{{item.img}}" data-edit="img" data-tooltip="{{item.name}}"/>
+    <div class="header-fields">
+        <h1 class="charname"><input name="name" type="text" value="{{item.name}}" placeholder="Name"/></h1>
+    </div>
+</header>

templates/sheets/item/common/template-description.hbs

@@ -0,0 +1,21 @@
+<fieldset>
+<div>
+  <label>Description :</label>
+    {{formInput
+      systemFields.description 
+      enriched=enriched.description
+      value=system.description
+      name="system.description"
+      toggled=true}}
+</div>
+{{#if options.isGM}}
+<div>
+  <label>Description (MJ seulement):</label>
+    {{formInput
+      systemFields.descriptionmj
+      enriched=enriched.descriptionmj
+      value=system.descriptionmj
+      name="system.descriptionmj" toggled=true}}
+</div>
+{{/if}}
+</fieldset>

templates/sheets/item/common/template-inventaire.hbs

@@ -0,0 +1,17 @@
+<fieldset>
+  {{formField systemFields.qualite value=system.qualite}}
+  {{formField systemFields.encombrement value=system.encombrement}}
+  {{formField systemFields.quantite value=system.quantite}}
+
+ <div class="form-group item-cout">
+    <label>Prix (sols)</label>
+    <div class="form-fields">
+      <input class="attribute-value number-x3 {{#if (and (eq item.type 'monnaie') (eq system.cout 0))}} field-error{{/if}}"
+        type="number" data-dtype="Number"
+        name="system.cout"
+        value="{{numberFormat system.cout decimals=2 sign=false}}" 
+        {{#unless (isFieldInventaireModifiable type 'cout')}}disabled{{/unless}}
+      />
+    </div>
+  </div>
+</fieldset>

templates/sheets/item/monnaie.hbs

@@ -0,0 +1,5 @@
+<section>
+  {{> "systems/foundryvtt-reve-de-dragon/templates/sheets/item/common/header.hbs"}}
+  {{>"systems/foundryvtt-reve-de-dragon/templates/sheets/item/common/template-inventaire.hbs"}}
+  {{>"systems/foundryvtt-reve-de-dragon/templates/sheets/item/common/template-description.hbs"}}
+</section>

templates/sheets/item/munition.hbs

@@ -0,0 +1,5 @@
+<section>
+  {{> "systems/foundryvtt-reve-de-dragon/templates/sheets/item/common/header.hbs"}}
+  {{>"systems/foundryvtt-reve-de-dragon/templates/sheets/item/common/template-inventaire.hbs"}}
+  {{>"systems/foundryvtt-reve-de-dragon/templates/sheets/item/common/template-description.hbs"}}
+</section>