Merge pull request 'Recherche par nom' (#618 ) from VincentVk/foundryvtt-reve-de-dragon:v10 into v10

Reviewed-on: public/foundryvtt-reve-de-dragon#618
Version 10.6.8
2023-01-31 07:32:09 +01:00 · 2023-01-30 22:08:11 +01:00 · 2023-01-30 22:08:11 +01:00 · 2023-01-28 20:50:52 +01:00 · 2023-01-28 18:08:47 +01:00 · 2023-01-28 16:46:17 +01:00
49 changed files with 295 additions and 233 deletions
--- a/module/actor.js
+++ b/module/actor.js
@@ -880,10 +880,7 @@ export class RdDActor extends RdDBaseActor {
        for (let troncName of tronc) {
          message += "<br>" + troncName;
        }
-        ChatMessage.create({
-          whisper: ChatMessage.getWhisperRecipients(this.name),
-          content: message
-        });
+        ui.notifications.info(message);
      }
      const update = { _id: competence.id, 'system.niveau': nouveauNiveau };
      await this.updateEmbeddedDocuments('Item', [update]); // Updates one EmbeddedEntity
--- a/module/actor/base-actor-sheet.js
+++ b/module/actor/base-actor-sheet.js
@@ -31,32 +31,21 @@ export class RdDBaseActorSheet extends ActorSheet {
    Monnaie.validerMonnaies(this.actor.itemTypes['monnaie']);

    this.actor.recompute();
-    const userRightLevel = game.user.isGM ? CONST.DOCUMENT_OWNERSHIP_LEVELS.OWNER : this.actor.getUserLevel(game.user)
-    const options = duplicate(this.options);
-    mergeObject(options, {
-      isGM: game.user.isGM,
-      editable: this.isEditable,
-      cssClass: this.isEditable ? "editable" : "locked",
-      isLimited: userRightLevel >= CONST.DOCUMENT_OWNERSHIP_LEVELS.LIMITED,
-      isObserver: userRightLevel >= CONST.DOCUMENT_OWNERSHIP_LEVELS.OBSERVER,
-      isOwner: userRightLevel >= CONST.DOCUMENT_OWNERSHIP_LEVELS.OWNER,
-      owner: this.actor.isOwner,
-    });
-
    let formData = {
      title: this.title,
      id: this.actor.id,
      type: this.actor.type,
      img: this.actor.img,
      name: this.actor.name,
-      system: foundry.utils.deepClone(this.actor.system),
+      system: this.actor.system,
      description: await TextEditor.enrichHTML(this.actor.system.description, { async: true }),
      notesmj: await TextEditor.enrichHTML(this.actor.system.notesmj, { async: true }),
-      options: options,
+      options: RdDSheetUtility.mergeDocumentRights(this.options, this.actor, this.isEditable)
    }
+
    RdDBaseActorSheet.filterItemsPerTypeForSheet(formData, this.actor.itemTypes);
    formData.calc = {
-      fortune: this.toSolsDeniers(this.actor.getFortune()),
+      fortune: Monnaie.toSolsDeniers(this.actor.getFortune()),
      prixTotalEquipement: this.actor.computePrixTotalEquipement(),
      encTotal: await this.actor.computeEncTotal(),
    }
@@ -64,17 +53,9 @@ export class RdDBaseActorSheet extends ActorSheet {
    this.objetVersConteneur = RdDUtility.buildArbreDeConteneurs(formData.conteneurs, formData.objets);
    formData.conteneurs = RdDUtility.conteneursRacine(formData.conteneurs);

-
    return formData;
  }

-  toSolsDeniers(fortune) {
-    return {
-      sols: Math.floor(fortune),
-      deniers: Math.round(100 * (fortune - Math.floor(fortune)))
-    };
-  }
-
  /* -------------------------------------------- */
  static filterItemsPerTypeForSheet(formData, itemTypes) {
    formData.recettescuisine = Misc.arrayOrEmpty(itemTypes['recettecuisine']);
--- a/module/dialog-item-vente.js
+++ b/module/dialog-item-vente.js
@@ -8,7 +8,7 @@ export class DialogItemVente extends Dialog {
    const venteData = {
      item: item,
      alias: item.actor?.name ?? game.user.name,
-      vendeurId: item.actor?.id ,
+      vendeurId: item.actor?.id,
      prixOrigine: item.calculerPrixCommercant(),
      prixUnitaire: item.calculerPrixCommercant(),
      prixLot: item.calculerPrixCommercant(),
@@ -40,51 +40,62 @@ export class DialogItemVente extends Dialog {

  activateListeners(html) {
    super.activateListeners(html);
+
    this.html = html;
-    this.setQuantiteIllimite(this.venteData.quantiteIllimite);
    this.html.find(".tailleLot").change(event => this.setTailleLot(Number(event.currentTarget.value)));
    this.html.find(".quantiteNbLots").change(event => this.setNbLots(Number(event.currentTarget.value)));
    this.html.find(".quantiteIllimite").change(event => this.setQuantiteIllimite(event.currentTarget.checked));
    this.html.find(".prixLot").change(event => this.setPrixLot(Number(event.currentTarget.value)));
+
+    this.setQuantiteIllimite(this.venteData.quantiteIllimite);
  }

  async onProposer(it) {
-    await this.html.find(".tailleLot").change();
-    await this.html.find(".quantiteNbLots").change();
-    await this.html.find(".quantiteIllimite").change();
-    await this.html.find(".prixLot").change();
+    this.updateVente(this.getChoixVente());
    this.callback(this.venteData);
  }

+  updateVente(update) {
+    mergeObject(this.venteData, update);
+  }
+
+  getChoixVente() {
+    return {
+      quantiteNbLots: Number(this.html.find(".quantiteNbLots").val()),
+      tailleLot: Number(this.html.find(".tailleLot").val()),
+      quantiteIllimite: this.html.find(".quantiteIllimite").is(':checked'),
+      prixLot: Number(this.html.find(".prixLot").val())
+    };
+  }
+
  /* -------------------------------------------- */
  setPrixLot(prixLot) {
    this.venteData.prixLot = prixLot;
  }

  setTailleLot(tailleLot) {
-    // recalculer le prix du lot
-    if (tailleLot != this.venteData.tailleLot) {
-      this.venteData.prixLot = (tailleLot * this.venteData.prixOrigine).toFixed(2);
-      this.html.find(".prixLot").val(this.venteData.prixLot);
-    }
-    this.venteData.tailleLot = tailleLot;
-    // recalculer le nombre de lots max
-    this.venteData.quantiteMaxLots = Math.floor(this.venteData.quantiteMax / tailleLot);
-    this.venteData.quantiteNbLots = Math.min(this.venteData.quantiteMaxLots, this.venteData.quantiteNbLots);
+    const maxLots = Math.floor(this.venteData.quantiteMax / tailleLot);
+    this.updateVente({
+      tailleLot,
+      quantiteNbLots: Math.min(maxLots, this.venteData.quantiteNbLots),
+      quantiteMaxLots: maxLots,
+      prixLot: (tailleLot * this.venteData.prixOrigine).toFixed(2)
+    });
+
+    this.html.find(".prixLot").val(this.venteData.prixLot);
    this.html.find(".quantiteNbLots").val(this.venteData.quantiteNbLots);
    this.html.find(".quantiteNbLots").attr("max", this.venteData.quantiteMaxLots)
  }

  setNbLots(nbLots) {
-    if (this.venteData.isOwned) {
-      nbLots = Math.max(0, Math.min(nbLots, this.venteData.quantiteMaxLots));
-    }
-    this.venteData.quantiteNbLots = nbLots;
+    this.updateVente({
+      quantiteNbLots: this.venteData.isOwned ? Math.max(0, Math.min(nbLots, this.venteData.quantiteMaxLots)) : nbLots
+    })
    this.html.find(".quantiteNbLots").val(this.venteData.quantiteNbLots);
  }

  setQuantiteIllimite(checked) {
-    this.venteData.quantiteIllimite = checked;
+    this.updateVente({ quantiteIllimite: checked })
    this.html.find(".label-quantiteIllimite").text(this.venteData.quantiteIllimite ? "Illimités" : "disponibles");
    HtmlUtility.showControlWhen(this.html.find(".quantiteNbLots"), !this.venteData.quantiteIllimite)
  }
--- a/module/item-monnaie.js
+++ b/module/item-monnaie.js
@@ -62,6 +62,13 @@ export class Monnaie {
    return deniers;
  }

+  static toSolsDeniers(fortune) {
+    return {
+      sols: Math.floor(fortune),
+      deniers: Math.round(100 * (fortune - Math.floor(fortune)))
+    };
+  }
+
  static getFortune(monnaies) {
    return (monnaies??[])
      .map(m => Number(m.system.cout) * Number(m.system.quantite))
--- a/module/item-sheet.js
+++ b/module/item-sheet.js
@@ -86,22 +86,17 @@ export class RdDItemSheet extends ItemSheet {
  /* -------------------------------------------- */
  async getData() {
    let formData = {
-      id: this.item.id,
      title: this.item.name,
+      id: this.item.id,
      type: this.item.type,
      img: this.item.img,
      name: this.item.name,
      system: this.item.system,
-      isGM: game.user.isGM,
      actorId: this.actor?.id,
-      isOwned: this.actor ? true : false,
-      owner: this.item.isOwner,
-      editable: this.isEditable,
-      cssClass: this.isEditable ? "editable" : "locked",
-      isSoins: false,
      description: await TextEditor.enrichHTML(this.item.system.description, { async: true }),
      descriptionmj: await TextEditor.enrichHTML(this.item.system.descriptionmj, { async: true }),
-      isComestible: this.item.getUtilisationCuisine()
+      isComestible: this.item.getUtilisationCuisine(),
+      options: RdDSheetUtility.mergeDocumentRights(this.options, this.item, this.isEditable)
    }

    const competences = await SystemCompendiums.getCompetences(this.actor?.type);
@@ -138,12 +133,12 @@ export class RdDItemSheet extends ItemSheet {
    if (this.item.type == 'potion') {
      await RdDHerbes.addPotionFormData(formData);
    }
-    if (formData.isOwned && this.item.type == 'herbe' && (formData.system.categorie == 'Soin' || formData.system.categorie == 'Repos')) {
+    if (formData.options.isOwned && this.item.type == 'herbe' && (formData.system.categorie == 'Soin' || formData.system.categorie == 'Repos')) {
      formData.isIngredientPotionBase = true;
    }
    if (this.item.type == 'sortreserve') {
      const sortId = this.item.system.sortid;
-      formData.sort = formData.isOwned ? this.item.actor.items.get(sortId) : game.items.get(sortId);
+      formData.sort = formData.options.isOwned ? this.item.actor.items.get(sortId) : game.items.get(sortId);
    }
    formData.bonusCaseList = RdDItemSort.getBonusCaseList(formData, true);

@@ -156,7 +151,9 @@ export class RdDItemSheet extends ItemSheet {
    super.activateListeners(html);
    this.html = html;

-    HtmlUtility.showControlWhen(this.html.find(".item-cout"), ReglesOptionelles.isUsing('afficher-prix-joueurs') || game.user.isGM || !this.item.isOwned);
+    HtmlUtility.showControlWhen(this.html.find(".item-cout"), ReglesOptionelles.isUsing('afficher-prix-joueurs')
+      || game.user.isGM
+      || !this.item.isOwned);
    HtmlUtility.showControlWhen(this.html.find(".item-magique"), this.item.isMagique());

    // Everything below here is only needed if the sheet is editable
--- a/module/item/sheet-conteneur.js
+++ b/module/item/sheet-conteneur.js
@@ -29,7 +29,6 @@ export class RdDConteneurItemSheet extends RdDItemInventaireSheet {
  /* -------------------------------------------- */
  prepareConteneurData(formData) {
    RdDBaseActorSheet.filterItemsPerTypeForSheet(formData, this.actor.itemTypes);
-
    this.objetVersConteneur = RdDUtility.buildArbreDeConteneurs(formData.conteneurs, formData.objets);
    formData.subItems = formData.conteneurs.find(it => it._id == this.item.id)?.subItems;
  }
@@ -44,7 +43,8 @@ export class RdDConteneurItemSheet extends RdDItemInventaireSheet {
    const dragData = {
      actorId: this.actor.id,
      type: "Item",
-      data: item.system
+      data: item.system,
+      uuid: item.uuid
    };

    event.dataTransfer.setData("text/plain", JSON.stringify(dragData));
@@ -52,7 +52,8 @@ export class RdDConteneurItemSheet extends RdDItemInventaireSheet {

  async _onDropItem(event, dragData) {
    if (this.actor) {
-      const dropParams = await RdDSheetUtility.prepareItemDropParameters(this.item.id, this.actor, dragData, this.objetVersConteneur);
+      const destItemId = this.html.find(event.target)?.closest('.item').attr('data-item-id') ?? this.item.id
+      const dropParams = await RdDSheetUtility.prepareItemDropParameters(destItemId, this.actor, dragData, this.objetVersConteneur);
      await this.actor.processDropItem(dropParams);
      await this.render(true);
    }
--- a/module/item/sheet-service.js
+++ b/module/item/sheet-service.js
@@ -6,7 +6,7 @@ export class RdDServiceItemSheet extends RdDItemSheet {

  async getData() {
    const formData = await super.getData();
-    formData.disabled = formData.isGM || formData.isOwned ? '' : 'disabled';
+    formData.disabled = formData.options.isGM || formData.options.isOwned ? '' : 'disabled';
    return formData;
  }

--- a/module/rdd-alchimie.js
+++ b/module/rdd-alchimie.js
@@ -8,13 +8,11 @@ export class RdDAlchimie {

  /* -------------------------------------------- */
  static processManipulation(recette, actorId = undefined) {
-    //console.log("CALLED", recette, recette.isOwned, actorId );
    let manip = recette.system.manipulation;
    let matchArray = manip.match(matchOperations);
    if (matchArray) {
      for (let matchStr of matchArray) {
        let result = matchStr.match(matchOperationTerms);
-        //console.log("RESULT ", result);
        if (result[1] && result[2]) {
          let commande = Misc.upperFirst(result[1]);
          let replacement = this[`_alchimie${commande}`](recette, result[2], actorId);
--- a/module/rdd-sheet-utility.js
+++ b/module/rdd-sheet-utility.js
@@ -1,9 +1,24 @@
 import { DialogSplitItem } from "./dialog-split-item.js";
 import { RdDItem } from "./item.js";
-import { SystemCompendiums } from "./settings/system-compendiums.js";

 export class RdDSheetUtility {

+  static mergeDocumentRights(options, document, editable) {
+    const userRightLevel = game.user.isGM
+      ? CONST.DOCUMENT_OWNERSHIP_LEVELS.OWNER
+      : document.getUserLevel(game.user);
+    mergeObject(options, {
+      isGM: game.user.isGM,
+      isOwned: document.parent,
+      editable: editable,
+      cssClass: editable ? "editable" : "locked",
+      isLimited: userRightLevel >= CONST.DOCUMENT_OWNERSHIP_LEVELS.LIMITED,
+      isObserver: userRightLevel >= CONST.DOCUMENT_OWNERSHIP_LEVELS.OBSERVER,
+      isOwner: userRightLevel >= CONST.DOCUMENT_OWNERSHIP_LEVELS.OWNER
+    });
+    return options;
+  }
+
  static getItem(event, actor) {
    return actor.items.get(RdDSheetUtility.getItemId(event))
  }
@@ -23,7 +38,7 @@ export class RdDSheetUtility {

  static async prepareItemDropParameters(destItemId, actor, dragData, objetVersConteneur) {
    let item = fromUuidSync(dragData.uuid);
-    if (item.pack && !item.system){
+    if (item.pack && !item.system) {
      item = await RdDItem.getCorrespondingItem(item);
    }
    if (actor.canReceive(item)) {
--- a/module/rdd-utility.js
+++ b/module/rdd-utility.js
@@ -202,7 +202,7 @@ export class RdDUtility {
      'systems/foundryvtt-reve-de-dragon/templates/enum-periode.html',
      'systems/foundryvtt-reve-de-dragon/templates/enum-tmr-effet.html',
      // Partials
-      'systems/foundryvtt-reve-de-dragon/templates/tirage/liste-resultats.hbs',
+      'systems/foundryvtt-reve-de-dragon/templates/tirage/liste-resultats-recherche.hbs',
      'systems/foundryvtt-reve-de-dragon/templates/common/timestamp.hbs',
      'systems/foundryvtt-reve-de-dragon/templates/common/periodicite.hbs',
      'systems/foundryvtt-reve-de-dragon/templates/common/enum-duree.hbs',
@@ -278,8 +278,9 @@ export class RdDUtility {
    Handlebars.registerHelper('apostrophe', (article, str) => Grammar.apostrophe(article, str));
    Handlebars.registerHelper('un', str => Grammar.articleIndetermine(str));
    Handlebars.registerHelper('accord', (genre, ...args) => Grammar.accord(genre, args));
-    Handlebars.registerHelper('buildConteneur', (objet, templateItem, options) => { return new Handlebars.SafeString(RdDUtility.buildConteneur(objet, 1, templateItem, options)); });
-    Handlebars.registerHelper('buildContenu', (objet) => { return new Handlebars.SafeString(RdDUtility.buildContenu(objet, 1, true)); });
+    Handlebars.registerHelper('buildLigneInventaire', (item, options) => { return new Handlebars.SafeString(RdDUtility.buildLigneInventaire(item, options)); });
+    Handlebars.registerHelper('buildInventaireConteneur', (actorId, itemId, options) => { return new Handlebars.SafeString(RdDUtility.buildInventaireConteneur(actorId, itemId, options)); });
+    Handlebars.registerHelper('buildContenuConteneur', (item, options) => { return new Handlebars.SafeString(RdDUtility.buildContenuConteneur(item, options)); });
    Handlebars.registerHelper('calculerPrixCommercant', item => item.calculerPrixCommercant());
    Handlebars.registerHelper('caseTmr-label', coord => TMRUtility.getTMRLabel(coord));
    Handlebars.registerHelper('caseTmr-type', coord => TMRUtility.getTMRType(coord));
@@ -394,38 +395,58 @@ export class RdDUtility {
    return conteneurs.filter((conteneur, index, arr) => !conteneur.estContenu);
  }

-  /* -------------------------------------------- */
-  /** Construit la structure récursive des conteneurs, avec imbrication potentielle
-   * 
-   */
-  static buildConteneur(objet, profondeur, templateItem, options) {
-    if (!profondeur) profondeur = 1;
-    if (!templateItem) templateItem = 'actor/inventaire-item.html'
-    objet.niveau = profondeur;
-
-    const isConteneur = objet.type == 'conteneur';
-    const isOuvert = isConteneur && this.getAfficheContenu(objet._id);
-    const isVide = isConteneur && objet.system.contenu.length == 0;
-    const conteneur = Handlebars.partials[`systems/foundryvtt-reve-de-dragon/templates/${templateItem}`]({
-      item: objet,
-      vide: isVide,
-      ouvert: isOuvert,
-      options: options
-    });
-    const contenu = isConteneur ? RdDUtility.buildContenu(objet, profondeur, isOuvert, templateItem, options) : '';
-    return conteneur + contenu;
+  static prepareOptionsArbreInventaire(item, optionsArbre) {
+    if (!optionsArbre.profondeur) {
+      optionsArbre.profondeur = 1
+    };
+    if (!optionsArbre.templateItem) {
+      optionsArbre.templateItem = item.parent?.type == 'commerce'
+        ? "systems/foundryvtt-reve-de-dragon/templates/actor/commerce-inventaire-item.html"
+        : "systems/foundryvtt-reve-de-dragon/templates/actor/inventaire-item.html";
+    }
+    item.niveau = optionsArbre.profondeur;
  }

  /* -------------------------------------------- */
-  static buildContenu(objet, profondeur, afficherContenu, templateItem, options) {
-    if (!profondeur) profondeur = 1;
-    if (!templateItem) templateItem = 'actor/inventaire-item.html'
-    objet.niveau = profondeur;

-    const display = afficherContenu ? 'item-display-show' : 'item-display-hide';
-    let strContenu = `<ul class='item-list alterne-list ${display} list-item-margin${Math.min(profondeur, 6)}'>`;
-    for (let subItem of objet.subItems) {
-      strContenu += this.buildConteneur(subItem, profondeur + 1, templateItem, options);
+  /**
+   * Construit la structure récursive des conteneurs, avec imbrication potentielle
+   */
+  static buildLigneInventaire(item, options = {}, optionsArbre = { ouvert: false, profondeur: 1 }) {
+    RdDUtility.prepareOptionsArbreInventaire(item, optionsArbre);
+
+    const isConteneur = item.type == 'conteneur';
+    const inventaire = {
+      item: item,
+      vide: isConteneur && item.system.contenu.length == 0,
+      ouvert: isConteneur && RdDUtility.getAfficheContenu(item._id),
+      options: options
+    };
+    optionsArbre.ouvert = inventaire.ouvert
+    const ligneObjet = Handlebars.partials[optionsArbre.templateItem](inventaire);
+    if (isConteneur) {
+      return ligneObjet + RdDUtility.buildContenuConteneur(item, options, optionsArbre);
+    }
+    return ligneObjet;
+  }
+
+  static buildInventaireConteneur(actorId, itemId, options) {
+    const actor = game.actors.get(actorId)
+    const item = actor?.items.get(itemId)
+    if (item) {
+      return RdDUtility.buildContenuConteneur(item, options, { ouvert: true, profondeur: 1 });
+    }
+    return '';
+  }
+
+  /* -------------------------------------------- */
+  static buildContenuConteneur(conteneur, options = {}, optionsArbre = {}) {
+    RdDUtility.prepareOptionsArbreInventaire(conteneur, optionsArbre);
+    const display = optionsArbre.ouvert ? 'item-display-show' : 'item-display-hide';
+    let strContenu = `<ul class='item-list alterne-list ${display} list-item-margin${Math.min(optionsArbre.profondeur, 6)}'>`;
+    optionsArbre.profondeur++;
+    for (let contenu of conteneur.subItems) {
+      strContenu += this.buildLigneInventaire(contenu, options, optionsArbre);
    }
    return strContenu + "</ul>";
  }
--- a/module/tirage/fenetre-recherche-tirage.js
+++ b/module/tirage/fenetre-recherche-tirage.js
@@ -3,6 +3,7 @@ import { HtmlUtility } from '../html-utility.js';
 import { Misc } from "../misc.js";
 import { CompendiumTableHelpers } from '../settings/system-compendiums.js';
 import { RdDRaretes } from '../item/raretes.js';
+import { Grammar } from '../grammar.js';

 const FILTER_GROUPS = [
  { group: 'type', label: "Type d'objet" },
@@ -188,6 +189,30 @@ export class FenetreRechercheTirage extends Application {
      const row = await CompendiumTableHelpers.getRandom(table, 'Item')
      await CompendiumTableHelpers.tableRowToChatMessage(row, 'Item');
    })
+    
+    // this.html.find('.recherche')
+    //   .each((index, field) => {
+    //     if (this.options.recherche) {
+    //       field.focus();
+    //       field.setSelectionRange(this.options.recherche.start, this.options.recherche.end);
+    //     }
+    //   })
+    //   .keyup(async event => {
+    //     const nouvelleRecherche = this._optionRecherche(event.currentTarget);
+    //     if (this.options.recherche?.text != nouvelleRecherche?.text) {
+    //       this.options.recherche = nouvelleRecherche;
+    //       if (this.timerRecherche) {
+    //         clearTimeout(this.timerRecherche);
+    //       }
+    //       this.timerRecherche = setTimeout(() => {
+    //         this.timerRecherche = undefined;
+    //         this.render(true);
+    //       }, 500);
+    //     }
+    //   })
+    //   .change(async event =>
+    //     this.options.recherche = this._optionRecherche(event.currentTarget)
+    //   );
  }

  showFilterGroup(groupDiv, show) {
@@ -200,14 +225,14 @@ export class FenetreRechercheTirage extends Application {

  supprimerFiltres() {
    this.html.find('input:is(.activate-filter-group,.activate-filter-milieu)').prop("checked", false);
-    this.html.find('div.liste-resultats').html('');
-    this.changeListeFiltresActifs();
+    this.html.find('div.liste-resultats-recherche').html('');
+    this.html.find('.section-filters-text input.recherche').val('');
  }

  async recherche() {
    const table = await this.buildTable();
-    const htmlResultats = await renderTemplate(`systems/foundryvtt-reve-de-dragon/templates/tirage/liste-resultats.hbs`, { resultats: table });
-    this.html.find('div.liste-resultats').html(htmlResultats);
+    const htmlResultats = await renderTemplate(`systems/foundryvtt-reve-de-dragon/templates/tirage/liste-resultats-recherche.hbs`, { resultats: table });
+    this.html.find('div.liste-resultats-recherche').html(htmlResultats);
    this._dragDrop.forEach(dragDropHandler => dragDropHandler.bind(this.element[0]))
  }

@@ -225,13 +250,19 @@ export class FenetreRechercheTirage extends Application {
    }
    return (it, mi) => true;
  }
+  buildFilterRechercheName() {
+    const recherche = this.html.find('.section-filters-text input.recherche').val();
+    if (recherche) {
+      return  (it, mi) => Grammar.includesLowerCaseNoAccent(it.name, recherche);
+    }
+    return (it, mi) => true;
+  }

  buildCheckedGroupFilter(milieux) {
    const filtersList = this.getGroupCheckedFilters()
      .map(gf => this.buildOrFilter(gf.filters.map(f => f.check)));
-    if (milieux) {
-      filtersList.push(this.buildMilieuxFilter(milieux));
-    }
+    filtersList.push(this.buildMilieuxFilter(milieux));
+    filtersList.push(this.buildFilterRechercheName());
    return this.buildAndFilter(filtersList)
  }

--- a/packs/equipement.db
+++ b/packs/equipement.db
@@ -7,7 +7,7 @@
 {"_id":"3DJePXhrDWQxbUeM","name":"Dé à jouer en os","type":"objet","img":"systems/foundryvtt-reve-de-dragon/icons/objets/des_en_os.webp","effects":[],"folder":null,"sort":0,"flags":{"core":{"sourceId":"Compendium.foundryvtt-reve-de-dragon.equipement.3DJePXhrDWQxbUeM"}},"system":{"description":"","descriptionmj":"","encombrement":0.01,"quantite":1,"qualite":0,"cout":0.1,"milieu":"","environnement":[{"milieu":"Villages","rarete":"Frequente","frequence":18},{"milieu":"Villes","rarete":"Frequente","frequence":18}],"equipe":false,"resistance":0},"ownership":{"default":0,"rYShh2P1DNavdoBD":3},"_stats":{"systemId":"foundryvtt-reve-de-dragon","systemVersion":"10.6.1","coreVersion":"10.291","createdTime":1668808206015,"modifiedTime":1674002002072,"lastModifiedBy":"Hp9ImM4o9YRTSdfu"}}
 {"_id":"3cn9nWtY0Vb1PLTx","name":"Dague de jet","type":"arme","img":"systems/foundryvtt-reve-de-dragon/icons/objets/dagues.webp","effects":[],"folder":null,"sort":0,"flags":{"core":{"sourceId":"Compendium.foundryvtt-reve-de-dragon.equipement.3cn9nWtY0Vb1PLTx"}},"system":{"description":"<p>Chaque point de force au dessus de 10 augmente les port&eacute;es de 1m.</p>\n<p>Chaque point de force en dessous de 9 diminue les port&eacute;es de 1m.</p>","descriptionmj":"","equipe":false,"encombrement":0.5,"quantite":1,"qualite":0,"cout":3,"milieu":"","environnement":[{"milieu":"Villages","rarete":"Rare","frequence":6},{"milieu":"Villes","rarete":"Frequente","frequence":18}],"resistance":0,"categorie_parade":"","dommages":"1","penetration":0,"force":"0","competence":"Dague","lancer":"Dague de jet","tir":"","portee_courte":3,"portee_moyenne":8,"portee_extreme":15,"magique":false,"ecaille_efficacite":0,"resistance_magique":0,"rapide":true,"deuxmains":false,"unemain":true,"initpremierround":"dague"},"ownership":{"default":0,"rYShh2P1DNavdoBD":3},"_stats":{"systemId":"foundryvtt-reve-de-dragon","systemVersion":"10.6.1","coreVersion":"10.291","createdTime":1668808206015,"modifiedTime":1674002002072,"lastModifiedBy":"Hp9ImM4o9YRTSdfu"}}
 {"_id":"3t0NhMC0cFQyCZGH","name":"Soufflet","type":"objet","img":"systems/foundryvtt-reve-de-dragon/icons/objets/soufflet.webp","effects":[],"folder":null,"sort":0,"flags":{"core":{"sourceId":"Compendium.foundryvtt-reve-de-dragon.equipement.3t0NhMC0cFQyCZGH"}},"system":{"description":"","descriptionmj":"","encombrement":0.2,"quantite":1,"qualite":0,"cout":0.4,"milieu":"","environnement":[{"milieu":"Villages","rarete":"Rare","frequence":6},{"milieu":"Villes","rarete":"Frequente","frequence":18}],"equipe":false,"resistance":0},"ownership":{"default":0,"rYShh2P1DNavdoBD":3},"_stats":{"systemId":"foundryvtt-reve-de-dragon","systemVersion":"10.6.1","coreVersion":"10.291","createdTime":1668808206015,"modifiedTime":1674002002072,"lastModifiedBy":"Hp9ImM4o9YRTSdfu"}}
-{"_id":"3uWCDH1NOjHJpVo1","name":"Maillet","type":"arme","img":"systems/foundryvtt-reve-de-dragon/icons/objets/maillet.webp","effects":[],"folder":null,"sort":0,"flags":{"core":{"sourceId":"Compendium.foundryvtt-reve-de-dragon.equipement.3uWCDH1NOjHJpVo1"}},"system":{"description":"","descriptionmj":"","equipe":false,"encombrement":0.1,"quantite":1,"qualite":0,"cout":0.05,"milieu":"","environnement":[{"milieu":"Villages","rarete":"Frequente","frequence":18},{"milieu":"Villes","rarete":"Frequente","frequence":18}],"resistance":7,"categorie_parade":"","dommages":"1","penetration":0,"force":"7","competence":"Masse à 1 main","lancer":"","tir":"","portee_courte":0,"portee_moyenne":0,"portee_extreme":0,"magique":false,"ecaille_efficacite":0,"resistance_magique":0,"rapide":false,"deuxmains":false,"unemain":false,"initpremierround":"masse"},"ownership":{"default":0,"Q4cUvqxCxMoTJXDL":3},"_stats":{"systemId":"foundryvtt-reve-de-dragon","systemVersion":"10.6.1","coreVersion":"10.291","createdTime":1668808206015,"modifiedTime":1674002002072,"lastModifiedBy":"Hp9ImM4o9YRTSdfu"}}
+{"_id":"3uWCDH1NOjHJpVo1","name":"Maillet","type":"arme","img":"systems/foundryvtt-reve-de-dragon/icons/objets/maillet.webp","effects":[],"folder":null,"sort":0,"flags":{"core":{"sourceId":"Compendium.foundryvtt-reve-de-dragon.equipement.3uWCDH1NOjHJpVo1"}},"system":{"description":"","descriptionmj":"","equipe":false,"encombrement":0.1,"quantite":1,"qualite":0,"cout":0.05,"milieu":"","environnement":[{"milieu":"Villages","rarete":"Frequente","frequence":18},{"milieu":"Villes","rarete":"Frequente","frequence":18}],"resistance":7,"categorie_parade":"","dommages":"1","penetration":0,"force":"7","competence":"Masse à 1 main","lancer":"","tir":"","portee_courte":0,"portee_moyenne":0,"portee_extreme":0,"magique":false,"ecaille_efficacite":0,"resistance_magique":0,"rapide":false,"deuxmains":false,"unemain":true,"initpremierround":"masse"},"ownership":{"default":0,"Q4cUvqxCxMoTJXDL":3},"_stats":{"systemId":"foundryvtt-reve-de-dragon","systemVersion":"10.6.4","coreVersion":"10.291","createdTime":1668808206015,"modifiedTime":1674571031725,"lastModifiedBy":"F2zvQUIw6mQepDqs"}}
 {"_id":"4GeV81qoJrjHIgzR","name":"Tournegraisse","type":"potion","img":"systems/foundryvtt-reve-de-dragon/icons/objets/tournegraisse.webp","effects":[],"folder":null,"sort":0,"flags":{"core":{"sourceId":"Compendium.foundryvtt-reve-de-dragon.equipement.4GeV81qoJrjHIgzR"}},"system":{"description":"<p>Cr&egrave;me sirupeuse blanch&acirc;tre.</p>","descriptionmj":"","encombrement":0.1,"quantite":1,"qualite":0,"cout":2,"milieu":"","environnement":[{"milieu":"Villages","rarete":"Rarissime","frequence":2},{"milieu":"Villes","rarete":"Rare","frequence":6}],"temporel":{"debut":{"indexDate":-1,"indexMinute":0},"fin":{"indexDate":-1,"indexMinute":0}},"rarete":"","categorie":"Remede","herbe":"","herbebrins":0,"herbebonus":0,"reposalchimique":false,"pr":0,"prpermanent":false,"prdate":0,"soinherbe":"","soinherbebonus":0},"ownership":{"default":0,"rYShh2P1DNavdoBD":3},"_stats":{"systemId":"foundryvtt-reve-de-dragon","systemVersion":"10.6.3","coreVersion":"10.291","createdTime":1668808206015,"modifiedTime":1674255023054,"lastModifiedBy":"Hp9ImM4o9YRTSdfu"}}
 {"_id":"4LFXefT0HFpaXQLx","name":"Briquet à silex","type":"objet","img":"systems/foundryvtt-reve-de-dragon/icons/objets/briquet.webp","effects":[],"folder":null,"sort":0,"flags":{"core":{"sourceId":"Compendium.foundryvtt-reve-de-dragon.equipement.4LFXefT0HFpaXQLx"}},"system":{"description":"","descriptionmj":"","encombrement":0.08,"quantite":1,"qualite":0,"cout":0.4,"milieu":"","environnement":[{"milieu":"Villages","rarete":"Frequente","frequence":18},{"milieu":"Villes","rarete":"Frequente","frequence":18}],"equipe":false,"resistance":0},"ownership":{"default":0,"rYShh2P1DNavdoBD":3},"_stats":{"systemId":"foundryvtt-reve-de-dragon","systemVersion":"10.6.1","coreVersion":"10.291","createdTime":1668808206015,"modifiedTime":1674002002072,"lastModifiedBy":"Hp9ImM4o9YRTSdfu"}}
 {"_id":"4qPaCKONcrsK6JbQ","name":"Pichet de grès (1 litre)","type":"conteneur","img":"systems/foundryvtt-reve-de-dragon/icons/objets/pichet.webp","effects":[],"folder":null,"sort":0,"flags":{"core":{"sourceId":"Compendium.foundryvtt-reve-de-dragon.equipement.4qPaCKONcrsK6JbQ"}},"system":{"description":"","descriptionmj":"","encombrement":0.3,"quantite":1,"qualite":0,"cout":0.3,"milieu":"","environnement":[{"milieu":"Villages","rarete":"Frequente","frequence":18},{"milieu":"Villes","rarete":"Frequente","frequence":18}],"contenu":[],"capacite":0.5,"equipe":false},"ownership":{"default":0,"rYShh2P1DNavdoBD":3},"_stats":{"systemId":"foundryvtt-reve-de-dragon","systemVersion":"10.6.1","coreVersion":"10.291","createdTime":1668808206016,"modifiedTime":1674002002072,"lastModifiedBy":"Hp9ImM4o9YRTSdfu"}}
@@ -29,7 +29,7 @@
 {"_id":"AOQsKTjIbcy8NV9t","name":"Pierre à aiguiser","type":"objet","img":"systems/foundryvtt-reve-de-dragon/icons/objets/pierre_a_aiguiser.webp","effects":[],"folder":null,"sort":0,"flags":{"core":{"sourceId":"Compendium.foundryvtt-reve-de-dragon.equipement.AOQsKTjIbcy8NV9t"}},"system":{"description":"","descriptionmj":"","encombrement":0.2,"quantite":1,"qualite":0,"cout":0.3,"milieu":"","environnement":[{"milieu":"Villages","rarete":"Frequente","frequence":18},{"milieu":"Villes","rarete":"Frequente","frequence":18}],"equipe":false,"resistance":0},"ownership":{"default":0,"rYShh2P1DNavdoBD":3},"_stats":{"systemId":"foundryvtt-reve-de-dragon","systemVersion":"10.6.1","coreVersion":"10.291","createdTime":1668808206018,"modifiedTime":1674002002074,"lastModifiedBy":"Hp9ImM4o9YRTSdfu"}}
 {"_id":"As5kYvyOrWrr8KJm","name":"Etui à luth de cuir","type":"conteneur","img":"systems/foundryvtt-reve-de-dragon/icons/objets/etui_luth.webp","effects":[],"folder":null,"sort":0,"flags":{"core":{"sourceId":"Compendium.foundryvtt-reve-de-dragon.equipement.As5kYvyOrWrr8KJm"}},"system":{"description":"","descriptionmj":"","encombrement":0.2,"quantite":1,"qualite":0,"cout":1,"milieu":"","environnement":[{"milieu":"Villages","rarete":"Rare","frequence":6},{"milieu":"Villes","rarete":"Frequente","frequence":18}],"contenu":[],"capacite":1,"equipe":false},"ownership":{"default":0,"rYShh2P1DNavdoBD":3},"_stats":{"systemId":"foundryvtt-reve-de-dragon","systemVersion":"10.6.1","coreVersion":"10.291","createdTime":1668808206018,"modifiedTime":1674002002074,"lastModifiedBy":"Hp9ImM4o9YRTSdfu"}}
 {"_id":"B2BhuxveVKMnD8fe","name":"Bottes de cuir souple","type":"objet","img":"systems/foundryvtt-reve-de-dragon/icons/objets/bottes_de_cuir.webp","effects":[],"folder":null,"sort":0,"flags":{"core":{"sourceId":"Compendium.foundryvtt-reve-de-dragon.equipement.B2BhuxveVKMnD8fe"}},"system":{"description":"","descriptionmj":"","encombrement":0.4,"quantite":1,"qualite":0,"cout":2,"milieu":"","environnement":[{"milieu":"Villages","rarete":"Frequente","frequence":18},{"milieu":"Villes","rarete":"Commune","frequence":54}],"equipe":false,"resistance":0},"ownership":{"default":0,"rYShh2P1DNavdoBD":3},"_stats":{"systemId":"foundryvtt-reve-de-dragon","systemVersion":"10.6.1","coreVersion":"10.291","createdTime":1668808206018,"modifiedTime":1674002002075,"lastModifiedBy":"Hp9ImM4o9YRTSdfu"}}
-{"_id":"BQPhNy9AUCpEGgFg","name":"Couteau de cuisine","type":"arme","img":"systems/foundryvtt-reve-de-dragon/icons/objets/couteau-cuisine.webp","effects":[],"folder":null,"sort":0,"flags":{"core":{"sourceId":"Compendium.foundryvtt-reve-de-dragon.equipement.BQPhNy9AUCpEGgFg"}},"system":{"description":"","descriptionmj":"","equipe":false,"encombrement":0.2,"quantite":1,"qualite":0,"cout":1,"milieu":"","environnement":[{"milieu":"Villages","rarete":"Frequente","frequence":18},{"milieu":"Villes","rarete":"Frequente","frequence":18}],"resistance":6,"categorie_parade":"dagues","dommages":"1","penetration":0,"force":"0","competence":"Dague","lancer":"Dague de jet","tir":"","portee_courte":3,"portee_moyenne":8,"portee_extreme":15,"magique":false,"ecaille_efficacite":null,"resistance_magique":null,"rapide":false,"deuxmains":false,"unemain":false,"initpremierround":"dague"},"ownership":{"default":0,"Q4cUvqxCxMoTJXDL":3},"_stats":{"systemId":"foundryvtt-reve-de-dragon","systemVersion":"10.6.1","coreVersion":"10.291","createdTime":1668808206018,"modifiedTime":1674002002075,"lastModifiedBy":"Hp9ImM4o9YRTSdfu"}}
+{"_id":"BQPhNy9AUCpEGgFg","name":"Couteau de cuisine","type":"arme","img":"systems/foundryvtt-reve-de-dragon/icons/objets/couteau-cuisine.webp","effects":[],"folder":null,"sort":0,"flags":{"core":{"sourceId":"Compendium.foundryvtt-reve-de-dragon.equipement.BQPhNy9AUCpEGgFg"}},"system":{"description":"","descriptionmj":"","equipe":false,"encombrement":0.2,"quantite":1,"qualite":0,"cout":1,"milieu":"","environnement":[{"milieu":"Villages","rarete":"Frequente","frequence":18},{"milieu":"Villes","rarete":"Frequente","frequence":18}],"resistance":6,"categorie_parade":"dagues","dommages":"1","penetration":0,"force":"0","competence":"Dague","lancer":"Dague de jet","tir":"","portee_courte":3,"portee_moyenne":8,"portee_extreme":15,"magique":false,"ecaille_efficacite":null,"resistance_magique":null,"rapide":true,"deuxmains":false,"unemain":true,"initpremierround":"dague"},"ownership":{"default":0,"Q4cUvqxCxMoTJXDL":3},"_stats":{"systemId":"foundryvtt-reve-de-dragon","systemVersion":"10.6.4","coreVersion":"10.291","createdTime":1668808206018,"modifiedTime":1674573404232,"lastModifiedBy":"F2zvQUIw6mQepDqs"}}
 {"_id":"CMtQM06J3BZsHHxH","name":"Sandales","type":"objet","img":"systems/foundryvtt-reve-de-dragon/icons/objets/sandales.webp","effects":[],"folder":null,"sort":0,"flags":{"core":{"sourceId":"Compendium.foundryvtt-reve-de-dragon.equipement.CMtQM06J3BZsHHxH"}},"system":{"description":"","descriptionmj":"","encombrement":0.1,"quantite":1,"qualite":0,"cout":0.3,"milieu":"","environnement":[{"milieu":"Villages","rarete":"Frequente","frequence":18},{"milieu":"Villes","rarete":"Frequente","frequence":18}],"equipe":false,"resistance":0},"ownership":{"default":0,"rYShh2P1DNavdoBD":3},"_stats":{"systemId":"foundryvtt-reve-de-dragon","systemVersion":"10.6.1","coreVersion":"10.291","createdTime":1668808206018,"modifiedTime":1674002002075,"lastModifiedBy":"Hp9ImM4o9YRTSdfu"}}
 {"_id":"CQSxJv1mgmIeMCbM","name":"Grappin","type":"objet","img":"systems/foundryvtt-reve-de-dragon/icons/objets/grappin.webp","effects":[],"folder":null,"sort":0,"flags":{"core":{"sourceId":"Compendium.foundryvtt-reve-de-dragon.equipement.CQSxJv1mgmIeMCbM"}},"system":{"description":"","descriptionmj":"","encombrement":0.5,"quantite":1,"qualite":0,"cout":2,"milieu":"","environnement":[{"milieu":"Villages","rarete":"Rare","frequence":6},{"milieu":"Villes","rarete":"Rare","frequence":6}],"equipe":false,"resistance":0},"ownership":{"default":0,"rYShh2P1DNavdoBD":3},"_stats":{"systemId":"foundryvtt-reve-de-dragon","systemVersion":"10.6.1","coreVersion":"10.291","createdTime":1668808206018,"modifiedTime":1674002002075,"lastModifiedBy":"Hp9ImM4o9YRTSdfu"}}
 {"_id":"ElweMV283IUpqaik","name":"Sable-Poudre","type":"potion","img":"systems/foundryvtt-reve-de-dragon/icons/objets/sable_poudre.webp","effects":[],"folder":null,"sort":0,"flags":{"core":{"sourceId":"Compendium.foundryvtt-reve-de-dragon.equipement.ElweMV283IUpqaik"}},"system":{"description":"<p>Granul&eacute;s. Poudre blanche.</p>","descriptionmj":"","encombrement":0.1,"quantite":1,"qualite":0,"cout":2,"milieu":"","environnement":[{"milieu":"Villages","rarete":"Rarissime","frequence":2},{"milieu":"Villes","rarete":"Rare","frequence":6}],"temporel":{"debut":{"indexDate":-1,"indexMinute":0},"fin":{"indexDate":-1,"indexMinute":0}},"rarete":"","categorie":"Remede","herbe":"","herbebrins":0,"herbebonus":0,"reposalchimique":false,"pr":0,"prpermanent":false,"prdate":0,"soinherbe":"","soinherbebonus":0},"ownership":{"default":0,"rYShh2P1DNavdoBD":3},"_stats":{"systemId":"foundryvtt-reve-de-dragon","systemVersion":"10.6.3","coreVersion":"10.291","createdTime":1668808206019,"modifiedTime":1674255033741,"lastModifiedBy":"Hp9ImM4o9YRTSdfu"}}
@@ -100,7 +100,7 @@
 {"_id":"VsjRwh9Z9PMpFKdI","name":"Craie 1 bâton","type":"objet","img":"systems/foundryvtt-reve-de-dragon/icons/objets/craie.webp","effects":[],"folder":null,"sort":0,"flags":{"core":{"sourceId":"Compendium.foundryvtt-reve-de-dragon.equipement.VsjRwh9Z9PMpFKdI"}},"system":{"description":"","descriptionmj":"","encombrement":0.01,"quantite":1,"qualite":0,"cout":0.01,"milieu":"","environnement":[{"milieu":"Villages","rarete":"Frequente","frequence":18},{"milieu":"Villes","rarete":"Frequente","frequence":18}],"equipe":false,"resistance":0},"ownership":{"default":0,"rYShh2P1DNavdoBD":3},"_stats":{"systemId":"foundryvtt-reve-de-dragon","systemVersion":"10.6.1","coreVersion":"10.291","createdTime":1668808206107,"modifiedTime":1674002002082,"lastModifiedBy":"Hp9ImM4o9YRTSdfu"}}
 {"_id":"WC1jMDKcxEJQWGOR","name":"Burette de fer blanc (40 cl)","type":"conteneur","img":"systems/foundryvtt-reve-de-dragon/icons/objets/burette.webp","effects":[],"folder":null,"sort":0,"flags":{"core":{"sourceId":"Compendium.foundryvtt-reve-de-dragon.equipement.WC1jMDKcxEJQWGOR"}},"system":{"description":"","descriptionmj":"","encombrement":0.2,"quantite":1,"qualite":0,"cout":0.5,"milieu":"","environnement":[{"milieu":"Villages","rarete":"Rare","frequence":6},{"milieu":"Villes","rarete":"Frequente","frequence":18}],"contenu":[],"capacite":0.2,"equipe":false},"ownership":{"default":0,"rYShh2P1DNavdoBD":3},"_stats":{"systemId":"foundryvtt-reve-de-dragon","systemVersion":"10.6.1","coreVersion":"10.291","createdTime":1668808206107,"modifiedTime":1674002002082,"lastModifiedBy":"Hp9ImM4o9YRTSdfu"}}
 {"_id":"WTHZdtgf6lHUSKDx","name":"Fouet","type":"arme","img":"systems/foundryvtt-reve-de-dragon/icons/objets/fouet.webp","effects":[],"folder":null,"sort":0,"flags":{"core":{"sourceId":"Compendium.foundryvtt-reve-de-dragon.equipement.WTHZdtgf6lHUSKDx"}},"system":{"description":"<p>Provoque des d&eacute;g&acirc;ts \"non mortels\".</p>\n<p>Les armures sont major&eacute;es de 2.</p>\n<p>Si la protection atteint une valeur de 5 ou plus, le fouet ne peut causer de d&eacute;g&acirc;t.</p>","descriptionmj":"","equipe":false,"encombrement":0.5,"quantite":1,"qualite":0,"cout":1,"milieu":"","environnement":[{"milieu":"Villages","rarete":"Frequente","frequence":18},{"milieu":"Villes","rarete":"Rare","frequence":6}],"resistance":0,"categorie_parade":"","dommages":"1","penetration":-1,"force":"0","competence":"","lancer":"Fouet","tir":"","portee_courte":2,"portee_moyenne":2,"portee_extreme":3,"magique":false,"ecaille_efficacite":0,"resistance_magique":0,"rapide":false,"deuxmains":false,"unemain":false,"initpremierround":"hast"},"ownership":{"default":0,"rYShh2P1DNavdoBD":3},"_stats":{"systemId":"foundryvtt-reve-de-dragon","systemVersion":"10.6.1","coreVersion":"10.291","createdTime":1668808206107,"modifiedTime":1674002002082,"lastModifiedBy":"Hp9ImM4o9YRTSdfu"}}
-{"_id":"WTWXZeoK5HpCrGFy","name":"Hachette","type":"arme","img":"systems/foundryvtt-reve-de-dragon/icons/objets/hachette.webp","effects":[],"folder":null,"sort":0,"flags":{"core":{"sourceId":"Compendium.foundryvtt-reve-de-dragon.equipement.WTWXZeoK5HpCrGFy"}},"system":{"description":"","descriptionmj":"","equipe":false,"encombrement":1,"quantite":1,"qualite":0,"cout":4,"milieu":"","environnement":[{"milieu":"Villages","rarete":"Commune","frequence":54},{"milieu":"Villes","rarete":"Frequente","frequence":18}],"resistance":6,"categorie_parade":"haches","dommages":"2","penetration":0,"force":"8","competence":"Hache à 1 main","lancer":"","tir":"","portee_courte":0,"portee_moyenne":0,"portee_extreme":0,"magique":false,"ecaille_efficacite":null,"resistance_magique":null,"rapide":false,"deuxmains":false,"unemain":false,"initpremierround":"dague"},"ownership":{"default":0,"Q4cUvqxCxMoTJXDL":3},"_stats":{"systemId":"foundryvtt-reve-de-dragon","systemVersion":"10.6.1","coreVersion":"10.291","createdTime":1668808206107,"modifiedTime":1674002002082,"lastModifiedBy":"Hp9ImM4o9YRTSdfu"}}
+{"_id":"WTWXZeoK5HpCrGFy","name":"Hachette","type":"arme","img":"systems/foundryvtt-reve-de-dragon/icons/objets/hachette.webp","effects":[],"folder":null,"sort":0,"flags":{"core":{"sourceId":"Compendium.foundryvtt-reve-de-dragon.equipement.WTWXZeoK5HpCrGFy"}},"system":{"description":"","descriptionmj":"","equipe":false,"encombrement":1,"quantite":1,"qualite":0,"cout":4,"milieu":"","environnement":[{"milieu":"Villages","rarete":"Commune","frequence":54},{"milieu":"Villes","rarete":"Frequente","frequence":18}],"resistance":6,"categorie_parade":"haches","dommages":"2","penetration":0,"force":"8","competence":"Hache à 1 main","lancer":"","tir":"","portee_courte":0,"portee_moyenne":0,"portee_extreme":0,"magique":false,"ecaille_efficacite":null,"resistance_magique":null,"rapide":true,"deuxmains":false,"unemain":true,"initpremierround":"dague"},"ownership":{"default":0,"Q4cUvqxCxMoTJXDL":3},"_stats":{"systemId":"foundryvtt-reve-de-dragon","systemVersion":"10.6.4","coreVersion":"10.291","createdTime":1668808206107,"modifiedTime":1674572410636,"lastModifiedBy":"F2zvQUIw6mQepDqs"}}
 {"_id":"XTZVrcMNofAviP63","name":"Cire d'abeille 500g","type":"objet","img":"systems/foundryvtt-reve-de-dragon/icons/objets/cire.webp","effects":[],"folder":null,"sort":0,"flags":{"core":{"sourceId":"Compendium.foundryvtt-reve-de-dragon.equipement.XTZVrcMNofAviP63"}},"system":{"description":"","descriptionmj":"","encombrement":0.2,"quantite":1,"qualite":0,"cout":0.15,"milieu":"","environnement":[{"milieu":"Villages","rarete":"Frequente","frequence":18},{"milieu":"Villes","rarete":"Frequente","frequence":18}],"equipe":false,"resistance":0},"ownership":{"default":0,"rYShh2P1DNavdoBD":3},"_stats":{"systemId":"foundryvtt-reve-de-dragon","systemVersion":"10.6.1","coreVersion":"10.291","createdTime":1668808206108,"modifiedTime":1674002002082,"lastModifiedBy":"Hp9ImM4o9YRTSdfu"}}
 {"_id":"XlKp5BvZX8A03fUg","name":"Sac à dos de cuir","type":"conteneur","img":"systems/foundryvtt-reve-de-dragon/icons/objets/sac_a_dos.webp","effects":[],"folder":null,"sort":0,"flags":{"core":{"sourceId":"Compendium.foundryvtt-reve-de-dragon.equipement.XlKp5BvZX8A03fUg"}},"system":{"description":"","descriptionmj":"","encombrement":0.4,"quantite":1,"qualite":0,"cout":1,"milieu":"","environnement":[{"milieu":"Villages","rarete":"Frequente","frequence":18},{"milieu":"Villes","rarete":"Frequente","frequence":18}],"contenu":[],"capacite":25,"equipe":false},"ownership":{"default":0,"rYShh2P1DNavdoBD":3},"_stats":{"systemId":"foundryvtt-reve-de-dragon","systemVersion":"10.6.1","coreVersion":"10.291","createdTime":1668808206108,"modifiedTime":1674002002082,"lastModifiedBy":"Hp9ImM4o9YRTSdfu"}}
 {"_id":"XoslLyWIJYY2RGzz","name":"Fiole de verre (20 cl)","type":"conteneur","img":"systems/foundryvtt-reve-de-dragon/icons/objets/fiole_verre.webp","effects":[],"folder":null,"sort":0,"flags":{"core":{"sourceId":"Compendium.foundryvtt-reve-de-dragon.equipement.XoslLyWIJYY2RGzz"}},"system":{"description":"","descriptionmj":"","encombrement":0.06,"quantite":1,"qualite":0,"cout":0.2,"milieu":"","environnement":[{"milieu":"Villages","rarete":"Rare","frequence":6},{"milieu":"Villes","rarete":"Frequente","frequence":18}],"contenu":[],"capacite":0.1,"equipe":false},"ownership":{"default":0,"rYShh2P1DNavdoBD":3},"_stats":{"systemId":"foundryvtt-reve-de-dragon","systemVersion":"10.6.1","coreVersion":"10.291","createdTime":1668808206108,"modifiedTime":1674002002082,"lastModifiedBy":"Hp9ImM4o9YRTSdfu"}}
@@ -175,7 +175,7 @@
 {"_id":"snupUovwaPAe46aD","name":"Fiole en grès (20 cl)","type":"conteneur","img":"systems/foundryvtt-reve-de-dragon/icons/objets/fiole_gres.webp","effects":[],"folder":null,"sort":0,"flags":{"core":{"sourceId":"Compendium.foundryvtt-reve-de-dragon.equipement.snupUovwaPAe46aD"}},"system":{"description":"","descriptionmj":"","encombrement":0.1,"quantite":1,"qualite":0,"cout":0.1,"milieu":"","environnement":[{"milieu":"Villages","rarete":"Frequente","frequence":18},{"milieu":"Villes","rarete":"Frequente","frequence":18}],"contenu":[],"capacite":0.1,"equipe":false},"ownership":{"default":0,"rYShh2P1DNavdoBD":3},"_stats":{"systemId":"foundryvtt-reve-de-dragon","systemVersion":"10.6.1","coreVersion":"10.291","createdTime":1668808206117,"modifiedTime":1674002002093,"lastModifiedBy":"Hp9ImM4o9YRTSdfu"}}
 {"_id":"szOThadvQvFcS79R","name":"Cuir Epais","type":"armure","img":"systems/foundryvtt-reve-de-dragon/icons/armes_armures/cuir_epais.webp","effects":[],"folder":null,"sort":0,"flags":{"core":{"sourceId":"Compendium.foundryvtt-reve-de-dragon.equipement.szOThadvQvFcS79R"}},"system":{"description":"<p>Cuir très épais comme le cuir de botte. Pectoral de cuir épais + jupon de bandes ou de tresses de cuir ou cuissards de cuir épais sur culottes de cuir souple + bottes dures + casque de cuir.</p>\n<p>&nbsp;</p>","descriptionmj":"","equipe":false,"encombrement":2,"quantite":1,"qualite":0,"cout":10,"milieu":"","environnement":[{"milieu":"Villages","rarete":"Frequente","frequence":18},{"milieu":"Villes","rarete":"Frequente","frequence":18}],"protection":"3","deterioration":0,"malus":-1},"ownership":{"default":0,"rYShh2P1DNavdoBD":3},"_stats":{"systemId":"foundryvtt-reve-de-dragon","systemVersion":"10.6.1","coreVersion":"10.291","createdTime":1668808206117,"modifiedTime":1674002002093,"lastModifiedBy":"Hp9ImM4o9YRTSdfu"}}
 {"_id":"tBFt4h3jqINsOxLI","name":"Outre (2 litres)","type":"conteneur","img":"systems/foundryvtt-reve-de-dragon/icons/objets/outre.webp","effects":[],"folder":null,"sort":0,"flags":{"core":{"sourceId":"Compendium.foundryvtt-reve-de-dragon.equipement.tBFt4h3jqINsOxLI"}},"system":{"description":"","descriptionmj":"","encombrement":0.08,"quantite":1,"qualite":0,"cout":0.2,"milieu":"","environnement":[{"milieu":"Villages","rarete":"Frequente","frequence":18},{"milieu":"Villes","rarete":"Frequente","frequence":18}],"contenu":[],"capacite":1,"equipe":false},"ownership":{"default":0,"rYShh2P1DNavdoBD":3},"_stats":{"systemId":"foundryvtt-reve-de-dragon","systemVersion":"10.6.1","coreVersion":"10.291","createdTime":1668808206117,"modifiedTime":1674002002093,"lastModifiedBy":"Hp9ImM4o9YRTSdfu"}}
-{"_id":"tMWzePiuMtiCQnAU","name":"Marteau","type":"arme","img":"systems/foundryvtt-reve-de-dragon/icons/objets/marteau.webp","effects":[],"folder":null,"sort":0,"flags":{"core":{"sourceId":"Compendium.foundryvtt-reve-de-dragon.equipement.tMWzePiuMtiCQnAU"}},"system":{"description":"","descriptionmj":"","equipe":false,"encombrement":0.3,"quantite":1,"qualite":0,"cout":1,"milieu":"","environnement":[{"milieu":"Villages","rarete":"Frequente","frequence":18},{"milieu":"Villes","rarete":"Frequente","frequence":18}],"resistance":8,"categorie_parade":"","dommages":"2","penetration":0,"force":"7","competence":"Masse à 1 main","lancer":"","tir":"","portee_courte":0,"portee_moyenne":0,"portee_extreme":0,"magique":false,"ecaille_efficacite":0,"resistance_magique":0,"rapide":false,"deuxmains":false,"unemain":false,"initpremierround":"masse"},"ownership":{"default":0,"Q4cUvqxCxMoTJXDL":3},"_stats":{"systemId":"foundryvtt-reve-de-dragon","systemVersion":"10.6.1","coreVersion":"10.291","createdTime":1668808206117,"modifiedTime":1674002002093,"lastModifiedBy":"Hp9ImM4o9YRTSdfu"}}
+{"_id":"tMWzePiuMtiCQnAU","name":"Marteau","type":"arme","img":"systems/foundryvtt-reve-de-dragon/icons/objets/marteau.webp","effects":[],"folder":null,"sort":0,"flags":{"core":{"sourceId":"Compendium.foundryvtt-reve-de-dragon.equipement.tMWzePiuMtiCQnAU"}},"system":{"description":"","descriptionmj":"","equipe":false,"encombrement":0.3,"quantite":1,"qualite":0,"cout":1,"milieu":"","environnement":[{"milieu":"Villages","rarete":"Frequente","frequence":18},{"milieu":"Villes","rarete":"Frequente","frequence":18}],"resistance":8,"categorie_parade":"","dommages":"2","penetration":0,"force":"7","competence":"Masse à 1 main","lancer":"","tir":"","portee_courte":0,"portee_moyenne":0,"portee_extreme":0,"magique":false,"ecaille_efficacite":0,"resistance_magique":0,"rapide":false,"deuxmains":false,"unemain":true,"initpremierround":"masse"},"ownership":{"default":0,"Q4cUvqxCxMoTJXDL":3},"_stats":{"systemId":"foundryvtt-reve-de-dragon","systemVersion":"10.6.4","coreVersion":"10.291","createdTime":1668808206117,"modifiedTime":1674571037073,"lastModifiedBy":"F2zvQUIw6mQepDqs"}}
 {"_id":"tY3shj5FA8nwMgxX","name":"Vin","type":"nourritureboisson","img":"systems/foundryvtt-reve-de-dragon/icons/liquides/liquide_vin.webp","effects":[],"folder":null,"sort":0,"flags":{"core":{"sourceId":"Item.QNNWTG5yqQKmcpJ7"}},"system":{"description":"","descriptionmj":"","encombrement":0.1,"quantite":1,"qualite":0,"cout":0.01,"milieu":"","environnement":[{"milieu":"Villages","rarete":"Frequente","frequence":18},{"milieu":"Villes","rarete":"Commune","frequence":54}],"sust":0,"exotisme":0,"cuisinier":"","boisson":true,"desaltere":0.6,"alcoolise":true,"force":-2,"equipe":false},"ownership":{"default":0,"rYShh2P1DNavdoBD":3},"_stats":{"systemId":"foundryvtt-reve-de-dragon","systemVersion":"10.6.1","coreVersion":"10.291","createdTime":1668808206117,"modifiedTime":1674002002093,"lastModifiedBy":"Hp9ImM4o9YRTSdfu"}}
 {"_id":"tZWQCuRr1ic3S0pL","name":"Souliers","type":"objet","img":"systems/foundryvtt-reve-de-dragon/icons/objets/souliers.webp","effects":[],"folder":null,"sort":0,"flags":{"core":{"sourceId":"Compendium.foundryvtt-reve-de-dragon.equipement.tZWQCuRr1ic3S0pL"}},"system":{"description":"","descriptionmj":"","encombrement":0.2,"quantite":1,"qualite":0,"cout":0.8,"milieu":"","environnement":[{"milieu":"Villages","rarete":"Rare","frequence":6},{"milieu":"Villes","rarete":"Frequente","frequence":18}],"equipe":false,"resistance":0},"ownership":{"default":0,"rYShh2P1DNavdoBD":3},"_stats":{"systemId":"foundryvtt-reve-de-dragon","systemVersion":"10.6.1","coreVersion":"10.291","createdTime":1668808206117,"modifiedTime":1674002002093,"lastModifiedBy":"Hp9ImM4o9YRTSdfu"}}
 {"name":"Repas moyen à l'auberge","type":"nourritureboisson","img":"systems/foundryvtt-reve-de-dragon/icons/objets/provision_cuite.webp","effects":[],"folder":null,"sort":0,"flags":{"core":{"sourceId":"Compendium.foundryvtt-reve-de-dragon.equipement.tn1kvxEVoLyYODyg"}},"_id":"tn1kvxEVoLyYODyg","system":{"description":"","descriptionmj":"","encombrement":0.3,"quantite":1,"qualite":3,"cout":0.1,"milieu":"","environnement":[{"milieu":"Villages","rarete":"Commune","frequence":54},{"milieu":"Villes","rarete":"Commune","frequence":54}],"sust":3,"exotisme":0,"cuisinier":"","boisson":false,"desaltere":0,"alcoolise":false,"force":0},"ownership":{"default":0,"wYnBx3HmLfGzsj7P":3},"_stats":{"systemId":"foundryvtt-reve-de-dragon","systemVersion":"10.6.1","coreVersion":"10.291","createdTime":1668808206117,"modifiedTime":1674002002093,"lastModifiedBy":"Hp9ImM4o9YRTSdfu"}}
--- a/styles/simple.css
+++ b/styles/simple.css
@@ -988,7 +988,7 @@ ul, li {
  margin: 0;
  padding: 0;
 }
-.sheet input.recherche {
+:is(.sheet, div.fenetre-recherche div.section-filters-text) input.recherche {
  background-image: url("img/ui/icon-search.svg");
  background-position: 0.1rem 0.1rem;
  background-size: 1rem;
@@ -1962,26 +1962,26 @@ div.vl {
  width: 1px;
  flex-grow: 0;
 }
-div.fenetre-recherche div.recherche {
+div.fenetre-recherche div.zone-recherche {
  display: flex;
 }
-div.fenetre-recherche div.recherche div.filtres {
+div.fenetre-recherche div.zone-recherche div.filtres {
  width: fit-content;
  min-width: 200px;
  float: left;
 }
-div.fenetre-recherche div.titre-fenetre-recherche {
+div.fenetre-recherche div.titre-resultats-recherche {
  flex-basis: 0;
  max-height: fit-content;
 }
-div.fenetre-recherche div.liste-resultats {
+div.fenetre-recherche div.liste-resultats-recherche {
  display: flex;
  flex: auto;
  flex-flow: row wrap;
  flex-direction: row;
  align-content: flex-start  ;
 }
-div.fenetre-recherche div.liste-resultats div.resultat {
+div.fenetre-recherche div.liste-resultats-recherche div.resultat {
  width: fit-content;
  margin: 0.2rem 0.5rem;
 }
--- a/system.json
+++ b/system.json
@@ -1,8 +1,8 @@
 {
  "id": "foundryvtt-reve-de-dragon",
  "title": "Rêve de Dragon",
-  "version": "10.6.5",
-  "download": "https://www.uberwald.me/gitea/public/foundryvtt-reve-de-dragon/archive/foundryvtt-reve-de-dragon-10.6.5.zip",
+  "version": "10.6.8",
+  "download": "https://www.uberwald.me/gitea/public/foundryvtt-reve-de-dragon/archive/foundryvtt-reve-de-dragon-10.6.8.zip",
  "manifest": "https://www.uberwald.me/gitea/public/foundryvtt-reve-de-dragon/raw/v10/system.json",
  "compatibility": {
    "minimum": "10",
--- a/templates/actor-creature-sheet.html
+++ b/templates/actor-creature-sheet.html
@@ -67,7 +67,7 @@
    {{!-- Description Tab --}}
    <div class="tab description" data-group="primary" data-tab="description">
      <div class="form-group large-editor">
-        {{editor description target="system.description" button=true owner=owner editable=editable engine="prosemirror"}}
+        {{editor description target="system.description" button=true owner=options.isOwner editable=options.editable engine="prosemirror"}}
      </div>

      {{>"systems/foundryvtt-reve-de-dragon/templates/actor/editor-notes-mj.html"}}
--- a/templates/actor-entite-sheet.html
+++ b/templates/actor-entite-sheet.html
@@ -44,7 +44,7 @@
        </div>
      </div>
      <div class="form-group large-editor">
-        {{editor description target="system.description" button=true owner=owner editable=editable engine="prosemirror"}}
+        {{editor description target="system.description" button=true owner=options.isOwner editable=options.editable engine="prosemirror"}}
      </div>
      {{>"systems/foundryvtt-reve-de-dragon/templates/actor/editor-notes-mj.html"}}

--- a/templates/actor-sheet.html
+++ b/templates/actor-sheet.html
@@ -147,14 +147,14 @@
              <label for="system.age">Age :</label>
              <input class="flex-grow" type="text" name="system.age" value="{{system.age}}" data-dtype="String"/>
            </li>
-            <li class="item flexrow list-item">
-              <label for="system.poids">Poids :</label>
-              <input class="flex-grow" type="text" name="system.poids" value="{{system.poids}}" data-dtype="String"/>
-            </li>
            <li class="item flexrow list-item">
              <label for="system.taille">Taille :</label>
              <input class="flex-grow" type="text" name="system.taille" value="{{system.taille}}" data-dtype="String"/>
            </li>
+            <li class="item flexrow list-item">
+              <label for="system.poids">Poids :</label>
+              <input class="flex-grow" type="text" name="system.poids" value="{{system.poids}}" data-dtype="String"/>
+            </li>
          </ul>
          <ul class="item-list alterne-list">
            <li class="item flexrow list-item">
@@ -190,11 +190,11 @@
        <article class="flexcol">
          <h3>Biographie : </h3>
          <div class="form-group large-editor">
-            {{editor biographie target="system.biographie" button=true owner=options.owner editable=true engine="prosemirror"}}
+            {{editor biographie target="system.biographie" button=true owner=options.isOwner editable=options.editable engine="prosemirror"}}
          </div>
          <h3>Notes : </h3>
          <div class="form-group large-editor">
-            {{editor notes target="system.notes" button=true owner=owner editable=true engine="prosemirror"}}
+            {{editor notes target="system.notes" button=true owner=options.isOwner editable=options.editable engine="prosemirror"}}
          </div>
          {{> "systems/foundryvtt-reve-de-dragon/templates/actor/xp-journal.html"}}
          {{> "systems/foundryvtt-reve-de-dragon/templates/actor/editor-notes-mj.html"}}
--- a/templates/actor-vehicule-sheet.html
+++ b/templates/actor-vehicule-sheet.html
@@ -84,7 +84,7 @@
      </div>

      <div class="form-group large-editor">
-        {{editor description target="system.description" button=true owner=owner editable=true engine="prosemirror"}}
+        {{editor description target="system.description" button=true owner=options.isOwner editable=options.editable engine="prosemirror"}}
      </div>
      {{>"systems/foundryvtt-reve-de-dragon/templates/actor/editor-notes-mj.html"}}
    </div>
--- a/templates/actor/carac-derivee.html
+++ b/templates/actor/carac-derivee.html
@@ -1,8 +1,8 @@
 <ul class="carac-list alterne-list">
  <li class="caracteristique flexrow list-item">
    <label class="carac-label" for="system.beaute">Beauté</label>
-    <input class="carac-value" type="number" name="system.beaute" value="{{system.beaute}}" data-dtype="String" {{#unless @root.options.vueDetaillee}}disabled{{/unless}} />
-    <label class="carac-xp"></label>
+    <input class="derivee-value" type="number" name="system.beaute" value="{{system.beaute}}" data-dtype="String" {{#unless @root.options.vueDetaillee}}disabled{{/unless}} />
+    <label class="derivee-value"></label>
  </li>
  <br>
  <li class="caracteristique flexrow list-item">
--- a/templates/actor/commerce-actor-sheet.html
+++ b/templates/actor/commerce-actor-sheet.html
@@ -36,7 +36,7 @@
  {{!-- Sheet Body --}}
  <section class="sheet-body">
    <div class="flexcol form-group medium-editor">
-      {{editor description target="system.description" button=true owner=options.owner editable=options.isOwner engine="prosemirror"}}
+      {{editor description target="system.description" button=true owner=options.isOwner editable=options.isOwner engine="prosemirror"}}
    </div>
    <hr>
    {{> "systems/foundryvtt-reve-de-dragon/templates/actor/commerce-inventaire.html"}}
--- a/templates/actor/commerce-inventaire.html
+++ b/templates/actor/commerce-inventaire.html
@@ -24,13 +24,12 @@
  </li>
  {{#each objets as |item id|}}
    {{#unless item.estContenu}}
-    {{#if (ne item.type 'conteneur')}}
-    {{> "systems/foundryvtt-reve-de-dragon/templates/actor/commerce-inventaire-item.html"
-      item=item vide=true ouvert=true options=../options}}
-    {{/if}}
+      {{#if (ne item.type 'conteneur')}}
+        {{buildLigneInventaire item ../options}}
+      {{/if}}
    {{/unless}}
  {{/each}}
  {{#each conteneurs as |conteneur id|}}
-    {{buildConteneur conteneur 'actor/commerce-inventaire-item.html' ../options}}
+    {{buildLigneInventaire conteneur ../options}}
  {{/each}}
 </ul>
--- a/templates/actor/editor-notes-mj.html
+++ b/templates/actor/editor-notes-mj.html
@@ -1,6 +1,6 @@
 {{#if options.isGM}}
 <h3>Notes du MJ : </h3>
 <div class="form-group large-editor">
-  {{editor notesmj target="system.notesmj" button=true owner=owner editable=true engine="prosemirror"}}
+  {{editor notesmj target="system.notesmj" button=true owner=options.isOwner editable=options.editable engine="prosemirror"}}
 </div>
 {{/if}}
--- a/templates/actor/inventaire-item.html
+++ b/templates/actor/inventaire-item.html
@@ -1,4 +1,4 @@
-{{#if (or @root.options.isObserver (ne item.type 'monnaie'))}}
+{{#if (or options.isObserver (ne item.type 'monnaie'))}}
 <li class="item flexrow list-item" data-item-id="{{item._id}}" draggable="true">
  <span class="equipement-nom {{#if (eq item.type 'conteneur')}}conteneur-name{{/if}} ">
    {{#if (eq item.type 'conteneur')}}
@@ -21,24 +21,24 @@
  </span>
  <span class="equipement-detail">{{numberFormat item.system.encTotal decimals=2}}</span>
  <span class="equipement-actions item-controls">
-    {{#if @root.options.isOwner}}
-    {{#unless item.estContenu}}
-    {{#if (or (eq item.type 'arme') (eq item.type 'armure') )}}
-    <a class="item-equip" title="Equiper">{{#if item.system.equipe}}<i class="fas fa-hand-rock"></i>{{else}}<i class="far fa-hand-paper"></i>{{/if}}</a>
-    {{/if}}
-    {{/unless}}
-    <a class="item-edit" title="Editer"><i class="fas fa-edit"></i></a>
-    <a class="item-delete" title="Supprimer"><i class="fas fa-trash"></i></a>
-    &nbsp;
-    {{#if (ne item.system.quantite 0)}}
-    <a class="item-vendre" title="Vendre ou donner"><i class="fas fa-comments-dollar"></i></a>
-    {{/if}}
+    {{#if options.isOwner}}
+      {{#unless item.estContenu}}
+        {{#if (or (eq item.type 'arme') (eq item.type 'armure') )}}
+        <a class="item-equip" title="Equiper">{{#if item.system.equipe}}<i class="fas fa-hand-rock"></i>{{else}}<i class="far fa-hand-paper"></i>{{/if}}</a>
+        {{/if}}
+      {{/unless}}
+      <a class="item-edit" title="Editer"><i class="fas fa-edit"></i></a>
+      <a class="item-delete" title="Supprimer"><i class="fas fa-trash"></i></a>
+      &nbsp;
+      {{#if (ne item.system.quantite 0)}}
+      <a class="item-vendre" title="Vendre ou donner"><i class="fas fa-comments-dollar"></i></a>
+      {{/if}}
    {{/if}}
    <a class="item-montrer" title="Montrer"><i class="fas fa-comment"></i></a>
-    {{#if @root.options.isOwner}}
-    {{#if item.system.actionPrincipale}}
-    <a class="item-action">{{item.system.actionPrincipale}}</a>
-    {{/if}}
+    {{#if options.isOwner}}
+      {{#if item.system.actionPrincipale}}
+      <a class="item-action">{{item.system.actionPrincipale}}</a>
+      {{/if}}
    {{/if}}
  </span>
 </li>
--- a/templates/actor/inventaire.html
+++ b/templates/actor/inventaire.html
@@ -1,6 +1,8 @@
 <h4>Equipement</h4>
 <span class="item-name">
+  {{#if options.isOwned}}
  <a class="chat-card-button creer-un-objet">Nouvel objet</a>
+  {{/if}}
  {{#if options.isGM}}
  <a class="chat-card-button nettoyer-conteneurs">Tout vider</a>
  {{/if}}
@@ -20,11 +22,11 @@
  {{#each objets as |item id|}}
    {{#unless item.estContenu}}
    {{#if (ne item.type 'conteneur')}}
-      {{> "systems/foundryvtt-reve-de-dragon/templates/actor/inventaire-item.html" item=item vide=true ouvert=true options=@root.options}}
+      {{buildLigneInventaire item @root.options}}
    {{/if}}
    {{/unless}}
  {{/each}}
  {{#each conteneurs as |conteneur id|}}
-    {{buildConteneur this 'actor/inventaire-item.html' @root.options}}
+    {{buildLigneInventaire conteneur @root.options}}
  {{/each}}
 </ul>
--- a/templates/dialog-item-vente.html
+++ b/templates/dialog-item-vente.html
@@ -13,7 +13,7 @@
    <div class="flexrow flex-group-left">
      <label>Nombre de lots</label>
      <div class="flexrow">
-        {{#unless isOwned}}
+        {{#unless options.isOwned}}
        <input name="quantiteIllimite" class="quantiteIllimite flex-shrink" type="checkbox" {{#if
          quantiteIllimite}}checked{{/if}} />
        <label class="label-quantiteIllimite flex-shrink">disponibles</label>
--- a/templates/item-competence-sheet.html
+++ b/templates/item-competence-sheet.html
@@ -3,7 +3,7 @@
        <img class="profile-img" src="{{img}}" data-edit="img" title="{{name}}"/>
        <div class="header-fields">
            <h1 class="charname">
-              {{#if isGM}}
+              {{#if options.isGM}}
              <input name="name" type="text" value="{{name}}" placeholder="Name"/>
              {{else}}
              {{item.name}}
@@ -32,7 +32,7 @@
      </div>
      <div class="form-group">
        <label for="system.base">Niveau de base </label>
-        {{#if isGM}}
+        {{#if options.isGM}}
        <select name="system.base" data-dtype="Number">
                {{#select system.base}}
                {{>"systems/foundryvtt-reve-de-dragon/templates/enum-base-competence.html"}}
--- a/templates/item-conteneur-sheet.html
+++ b/templates/item-conteneur-sheet.html
@@ -13,10 +13,8 @@
        <input class="attribute-value" type="text" name="system.capacite" value="{{system.capacite}}" data-dtype="Number"/>
      </div>
      {{>"systems/foundryvtt-reve-de-dragon/templates/item/partial-inventaire.html"}}
-      
-      {{#if isOwned}}
+      {{#if options.isOwned}}
      <div class="flexcol">
-        <span><label>Contenu : </label></span>
        <ul class="item-list alterne-list">
          <li class="competence-header flexrow">
            <span class="equipement-nom">Nom</span>
@@ -24,7 +22,7 @@
            <span class="equipement-detail">Enc.</span>
            <span class="equipement-actions">Actions</span>
          </li>
-          {{buildContenu this}}
+          {{buildInventaireConteneur actorId id options}}
        </ul>
      </div>
      {{/if}}
--- a/templates/item-extraitpoetique-sheet.html
+++ b/templates/item-extraitpoetique-sheet.html
@@ -12,13 +12,13 @@
    <div class="flexcol">
      <label>Extrait</label>
      <div class="form-group large-editor">
-        {{editor extrait target="system.extrait" button=true owner=owner editable=true engine="prosemirror"}}
+        {{editor extrait target="system.extrait" button=true owner=options.isOwner editable=options.editable engine="prosemirror"}}
      </div>
    </div>
    <div class="flexcol">
      <label>Texte complet</label>
      <div class="form-group large-editor">
-        {{editor texte target="system.texte" button=true owner=owner editable=true engine="prosemirror"}}
+        {{editor texte target="system.texte" button=true owner=options.isOwner editable=options.editable engine="prosemirror"}}
      </div>
    </div>
  </section>
--- a/templates/item-faune-sheet.html
+++ b/templates/item-faune-sheet.html
@@ -29,7 +29,7 @@
          <label>Créature correspondante</label>
          <div>
          {{#if system.actor.id}}
-            {{#if isGM}}
+            {{#if options.isGM}}
            <label>
              {{>'systems/foundryvtt-reve-de-dragon/templates/common/compendium-link.hbs'
                pack=system.actor.pack id=system.actor.id name=system.actor.name}}
--- a/templates/item-livre-sheet.html
+++ b/templates/item-livre-sheet.html
@@ -3,7 +3,7 @@
      <img class="profile-img" src="{{img}}" data-edit="img" title="{{name}}"/>
      <div class="header-fields">
          <h1 class="charname"><input name="name" type="text" value="{{name}}" placeholder="Name"/></h1>
-          {{#if isOwned}}
+          {{#if options.isOwned}}
          <div class="form-group">
            <span for="xp"><a class="creer-tache-livre chat-card-button" data-actor-id="{{actorId}}">Créer une tâche de lecture</a></span>
          </div>
--- a/templates/item-maladie-sheet.html
+++ b/templates/item-maladie-sheet.html
@@ -2,7 +2,7 @@
    <header class="sheet-header">
        <img class="profile-img" src="{{img}}" data-edit="img" title="{{name}}"/>
        <div class="header-fields">
-          {{#if (or isGM system.identifie)}}
+          {{#if (or options.isGM system.identifie)}}
            <h1 class="charname"><input name="name" type="text" value="{{name}}" placeholder="Name"/></h1>
          {{else}}
            <h1 class="charname">Inconnue</h1>
@@ -12,7 +12,7 @@
    
    {{!-- Sheet Body --}}
    <section class="sheet-body">
-      {{#if (or isGM system.identifie)}}
+      {{#if (or options.isGM system.identifie)}}
      <div class="form-group">
        <label for="system.identifie">Identifiée ? </label>
        <input class="attribute-value" type="checkbox" name="system.identifie"  {{#if system.identifie}}checked{{/if}}/>
@@ -36,14 +36,14 @@
        <label for="system.remedesconnus">Remedes Connus ? </label>
        <input class="attribute-value" type="checkbox" name="system.remedesconnus"  {{#if system.remedesconnus}}checked{{/if}}/>
      </div>
-      {{#if (or isGM system.remedesconnus)}}
+      {{#if (or options.isGM system.remedesconnus)}}
      <div class="form-group">
        <label for="system.remedes">Remèdes </label>
        <input class="attribute-value" type="text" name="system.remedes" value="{{system.remedes}}" data-dtype="String"/>
      </div>
      {{/if}}
      {{/if}}
-      {{#if (and isGM isOwned)}}
+      {{#if (and options.isGM options.isOwned)}}
      {{>"systems/foundryvtt-reve-de-dragon/templates/item/temporel.hbs" this labeldebut="Contractée" labelfin="Prochain jet"}}
      {{/if}}

--- a/templates/item-meditation-sheet.html
+++ b/templates/item-meditation-sheet.html
@@ -48,7 +48,7 @@
    </div>
    <div class="form-group">
      <label for="xp">Malus</label>
-      {{#if isGM}}
+      {{#if options.isGM}}
      <select name="system.malus" id="malus" data-dtype="Number">
        {{#select system.malus}}
        <option value="0">0</option>
--- a/templates/item-poison-sheet.html
+++ b/templates/item-poison-sheet.html
@@ -2,7 +2,7 @@
  <header class="sheet-header">
      <img class="profile-img" src="{{img}}" data-edit="img" title="{{name}}"/>
      <div class="header-fields">
-        {{#if (or isGM system.identifie)}}
+        {{#if (or options.isGM system.identifie)}}
          <h1 class="charname"><input name="name" type="text" value="{{name}}" placeholder="Name"/></h1>
        {{else}}
          <h1 class="charname">Inconnue</h1>
@@ -14,9 +14,9 @@
  <section class="sheet-body">
    <div class="form-group">
      <label for="system.active">Actif ? </label>
-      <input class="attribute-value" type="checkbox" name="system.active"  {{#if system.active}}checked{{/if}} {{#unless isGM}}disabled{{/unless}}/>
+      <input class="attribute-value" type="checkbox" name="system.active"  {{#if system.active}}checked{{/if}} {{#unless options.isGM}}disabled{{/unless}}/>
    </div>
-    {{#if (or isGM system.identifie)}}
+    {{#if (or options.isGM system.identifie)}}
    <div class="form-group">
      <label for="system.identifie">Identifiée ? </label>
      <input class="attribute-value" type="checkbox" name="system.identifie"  {{#if system.identifie}}checked{{/if}}/>
@@ -40,14 +40,14 @@
      <label for="system.remedesconnus">Remedes Connus ? </label>
      <input class="attribute-value" type="checkbox" name="system.remedesconnus"  {{#if system.remedesconnus}}checked{{/if}}/>
    </div>
-    {{#if (or isGM system.remedesconnus)}}
+    {{#if (or options.isGM system.remedesconnus)}}
    <div class="form-group">
      <label for="system.remedes">Remèdes </label>
      <input class="attribute-value" type="text" name="system.remedes" value="{{system.remedes}}" data-dtype="String"/>
    </div>
    {{/if}}
    {{/if}}
-    {{#if (and isGM isOwned system.active)}}
+    {{#if (and options.isGM options.isOwned system.active)}}
    {{>"systems/foundryvtt-reve-de-dragon/templates/item/temporel.hbs" this labeldebut="Contracté" labelfin="Prochain jet"}}
    {{/if}}

--- a/templates/item-potion-sheet.html
+++ b/templates/item-potion-sheet.html
@@ -3,7 +3,7 @@
    <img class="profile-img" src="{{img}}" data-edit="img" title="{{name}}" />
    <div class="header-fields">
      <h1 class="charname"><input name="name" type="text" value="{{name}}" placeholder="Name" /></h1>
-      {{#if isOwned}}
+      {{#if options.isOwned}}
      <div class="form-group">
        <span for="xp"><a class="consommer-potion chat-card-button" data-actor-id="{{actorId}}">Consommer cette potion et appliquer ses effets</a></span>
      </div>
--- a/templates/item-queue-sheet.html
+++ b/templates/item-queue-sheet.html
@@ -33,7 +33,7 @@
      <input class="attribute-value" type="text" name="system.refoulement" value="{{system.refoulement}}" data-dtype="Number"/>
    </div>

-    {{#if isOwned}}
+    {{#if options.isOwned}}
    {{>"systems/foundryvtt-reve-de-dragon/templates/item/temporel.hbs" this labeldebut="Depuis le" labelfin="Jusqu'au"}}
    {{/if}}

--- a/templates/item-recettealchimique-sheet.html
+++ b/templates/item-recettealchimique-sheet.html
@@ -9,25 +9,25 @@
    <div class="flexcol">
      <span><label class="alchimie-title">Manipulation : </label></span>
      <div class="form-group medium-editor">
-        {{editor manipulation_update target="system.manipulation" button=true owner=owner editable=true engine="prosemirror"}}
+        {{editor manipulation_update target="system.manipulation" button=true owner=options.isOwner editable=options.editable engine="prosemirror"}}
      </div>
    </div>
    <div class="flexcol">
      <span><label class="alchimie-title">Utilisation : </label></span>
      <div class="form-group small-editor">
-        {{editor utilisation target="system.utilisation" button=true owner=owner editable=true engine="prosemirror"}}
+        {{editor utilisation target="system.utilisation" button=true owner=options.isOwner editable=options.editable engine="prosemirror"}}
      </div>
    </div>
    <div class="flexcol">
      <span><label class="alchimie-title">Enchantement : </label></span>
      <div class="form-group small-editor">
-        {{editor enchantement target="system.enchantement" button=true owner=owner editable=true engine="prosemirror"}}
+        {{editor enchantement target="system.enchantement" button=true owner=options.isOwner editable=options.editable engine="prosemirror"}}
      </div>
    </div>
    <div class="flexcol">
      <span><label class="alchimie-title">Sur-effet : </label></span>
      <div class="form-group small-editor">
-        {{editor sureffet target="system.sureffet" button=true owner=owner editable=true engine="prosemirror"}}
+        {{editor sureffet target="system.sureffet" button=true owner=options.isOwner editable=options.editable engine="prosemirror"}}
      </div>
    </div>

--- a/templates/item-recettecuisine-sheet.html
+++ b/templates/item-recettecuisine-sheet.html
@@ -25,7 +25,7 @@
    <div class="flexcol">
      <span><label>Ingrédients : </label></span>
      <div class="form-group large-editor">
-        {{editor ingredients target="system.ingredients" button=true owner=owner editable=true engine="prosemirror"}}
+        {{editor ingredients target="system.ingredients" button=true owner=options.isOwner editable=options.editable engine="prosemirror"}}
      </div>
    </div>

--- a/templates/item-rencontre-sheet.html
+++ b/templates/item-rencontre-sheet.html
@@ -11,31 +11,31 @@
  </nav>
  <section class="sheet-body">
    <div class="tab items" data-group="primary" data-tab="rencontre">
-      {{#if isOwned}}
+      {{#if options.isOwned}}
      <div class="form-group">
        <label for="system.force">Rêve</label>
        <input type="text" name="system.force" value="{{system.force}}" data-dtype="Number"/>
      </div>
      <div class="form-group">
        <label for="system.coord">Case TMR - {{caseTmr-label system.coord}}</label>
-        <input class="attribute-value" type="text" name="system.coord" value="{{system.coord}}" data-dtype="String" {{#unless isGM}}disabled{{/unless}}/>
+        <input class="attribute-value" type="text" name="system.coord" value="{{system.coord}}" data-dtype="String" {{#unless options.isGM}}disabled{{/unless}}/>
      </div>
      <div class="form-group">
        <label for="system.date">Date/heure</label>
        <div class="flexrow">
-          <input class="attribute-value" type="text" name="system.date" value="{{system.date}}" data-dtype="String" {{#unless isGM}}disabled{{/unless}}/>
-          <input class="attribute-value" type="text" name="system.heure" value="{{system.heure}}" data-dtype="String" {{#unless isGM}}disabled{{/unless}}/>
+          <input class="attribute-value" type="text" name="system.date" value="{{system.date}}" data-dtype="String" {{#unless options.isGM}}disabled{{/unless}}/>
+          <input class="attribute-value" type="text" name="system.heure" value="{{system.heure}}" data-dtype="String" {{#unless options.isGM}}disabled{{/unless}}/>
        </div>
      </div>
      {{>"systems/foundryvtt-reve-de-dragon/templates/item/temporel.hbs" this labeldebut="Rencontrée le" labelfin="Disparaît le"}} 
      {{else}}
      <div class="form-group">
        <label for="system.formule">Rêve</label>
-        <input type="text" name="system.formule" value="{{system.formule}}" data-dtype="String" {{#unless isGM}}disabled{{/unless}}/>
+        <input type="text" name="system.formule" value="{{system.formule}}" data-dtype="String" {{#unless options.isGM}}disabled{{/unless}}/>
      </div>
      <div class="form-group">
        <label for="system.genre">Genre</label>
-        <select type="text" name="system.genre" data-dtype="String" {{#unless isGM}}disabled{{/unless}}>
+        <select type="text" name="system.genre" data-dtype="String" {{#unless options.isGM}}disabled{{/unless}}>
          {{#select  system.genre}}
          <option value=""></option>
          <option value="f">Féminin</option>
@@ -45,26 +45,26 @@
      </div>
      <div class="form-group">
        <label for="system.ordreTri">Position dans la table</label>
-        <input type="number" name="system.ordreTri" value="{{system.ordreTri}}" min="0" max="100" data-dtype="Number" {{#unless isGM}}disabled{{/unless}}/>
+        <input type="number" name="system.ordreTri" value="{{system.ordreTri}}" min="0" max="100" data-dtype="Number" {{#unless options.isGM}}disabled{{/unless}}/>
      </div>
      <div class="form-group">
        <label for="system.presentCite">Offert par les Présents des cités</label>
-        <input type="checkbox" name="system.presentCite" data-dtype="Boolean" {{#if system.presentCite}}checked{{/if}} {{#unless isGM}}disabled{{/unless}}/>
+        <input type="checkbox" name="system.presentCite" data-dtype="Boolean" {{#if system.presentCite}}checked{{/if}} {{#unless options.isGM}}disabled{{/unless}}/>
      </div>
      <div class="form-group">
        <label for="system.refoulement">Refoulement</label>
-        <input type="number" name="system.refoulement" value="{{system.refoulement}}" min="0" max="4" data-dtype="Number" {{#unless isGM}}disabled{{/unless}}/>
+        <input type="number" name="system.refoulement" value="{{system.refoulement}}" min="0" max="4" data-dtype="Number" {{#unless options.isGM}}disabled{{/unless}}/>
      </div>
      {{/if}}
      <div class="form-group">
        <label for="system.mauvaiseRencontre">Mauvaise rencontre</label>
-        <input type="checkbox" name="system.mauvaiseRencontre" data-dtype="Boolean" {{#if system.mauvaiseRencontre}}checked{{/if}} {{#unless isGM}}disabled{{/unless}}/>
+        <input type="checkbox" name="system.mauvaiseRencontre" data-dtype="Boolean" {{#if system.mauvaiseRencontre}}checked{{/if}} {{#unless options.isGM}}disabled{{/unless}}/>
      </div>
      {{#unless isOwned}}
      {{#if system.mauvaiseRencontre}}
      <div class="form-group">
        <label for="system.frequence.mauvaise">Fréquence mauvaise rencontre</label>
-        <input type="number" name="system.frequence.mauvaise" value="{{system.frequence.mauvaise}}" min="0" max="100" data-dtype="Number" {{#unless isGM}}disabled{{/unless}}/>
+        <input type="number" name="system.frequence.mauvaise" value="{{system.frequence.mauvaise}}" min="0" max="100" data-dtype="Number" {{#unless options.isGM}}disabled{{/unless}}/>
      </div>
      {{/if}}
      {{/unless}}
@@ -74,11 +74,11 @@
    <div class="tab items" data-group="primary" data-tab="succes">
      <div class="form-group">
        <label for="system.succes.message">Message</label>
-        <textarea autocomplete="off" title="Message en cas de succès" name="system.succes.message" {{#unless isGM}}disabled{{/unless}}/>{{system.succes.message}}</textarea>
+        <textarea autocomplete="off" title="Message en cas de succès" name="system.succes.message" {{#unless options.isGM}}disabled{{/unless}}/>{{system.succes.message}}</textarea>
      </div>
      <div class="form-group">
        <div class="button-dropdown">
-          {{#if isGM}}
+          {{#if options.isGM}}
          <label class="button-dropbutton" title="Ajouter">Effets <i class="fas fa-plus-circle"></i></label>
          <div class="button-dropdown-content">
            {{#each effets.succes.liste as |effet|}}
@@ -106,12 +106,12 @@
      <hr>
      <div class="form-group">
        <label for="system.succes.reference">Réference</label>
-        <input type="text" name="system.succes.reference" value="{{system.succes.reference}}" data-dtype="String" {{#unless isGM}}disabled{{/unless}}/>
+        <input type="text" name="system.succes.reference" value="{{system.succes.reference}}" data-dtype="String" {{#unless options.isGM}}disabled{{/unless}}/>
      </div>
      <div class="flexcol">
        <label for="system.succes.poesie">Poésie</label>
        <div class="form-group large-editor">
-          {{editor system.succes.poesie target="system.succes.poesie" button=true owner=owner editable=true engine="prosemirror"}}
+          {{editor system.succes.poesie target="system.succes.poesie" button=true owner=options.isOwner editable=options.editable engine="prosemirror"}}
        </div>
      </div>
    </div>
@@ -119,11 +119,11 @@
    <div class="tab items" data-group="primary" data-tab="echec">
      <div class="form-group">
        <label for="system.echec.message">Message</label>
-        <textarea autocomplete="off" title="Message en cas d'échec" name="system.echec.message" {{#unless isGM}}disabled{{/unless}}/>{{system.echec.message}}</textarea>
+        <textarea autocomplete="off" title="Message en cas d'échec" name="system.echec.message" {{#unless options.isGM}}disabled{{/unless}}/>{{system.echec.message}}</textarea>
      </div>
      <div class="form-group">
        <div class="button-dropdown">
-          {{#if isGM}}
+          {{#if options.isGM}}
          <label class="button-dropbutton" title="Ajouter">Effets <i class="fas fa-plus-circle"></i></label>
          <div class="button-dropdown-content">
            {{#each effets.echec.liste as |effet|}}
@@ -151,12 +151,12 @@
      <hr>
      <div class="form-group">
        <label for="system.echec.reference">Réference</label>
-        <input type="text" name="system.echec.reference" value="{{system.echec.reference}}" data-dtype="String" {{#unless isGM}}disabled{{/unless}}/>
+        <input type="text" name="system.echec.reference" value="{{system.echec.reference}}" data-dtype="String" {{#unless options.isGM}}disabled{{/unless}}/>
      </div>
      <div class="flexcol">
        <label for="system.echec.poesie">Poésie</label>
        <div class="form-group large-editor">
-          {{editor system.echec.poesie target="system.echec.poesie" button=true owner=owner editable=true engine="prosemirror"}}
+          {{editor system.echec.poesie target="system.echec.poesie" button=true owner=options.isOwner editable=options.editable engine="prosemirror"}}
        </div>
      </div>
    </div>
@@ -166,59 +166,59 @@
      <hr>
      <div class="form-group">
        <label for="system.frequence.cite">Fréquence en Cité</label>
-        <input type="number" name="system.frequence.cite" value="{{system.frequence.cite}}" min="0" max="100" data-dtype="Number" {{#unless isGM}}disabled{{/unless}}/>
+        <input type="number" name="system.frequence.cite" value="{{system.frequence.cite}}" min="0" max="100" data-dtype="Number" {{#unless options.isGM}}disabled{{/unless}}/>
      </div>
      <div class="form-group">
        <label for="system.frequence.sanctuaire">Fréquence en Sanctuaire</label>
-        <input type="number" name="system.frequence.sanctuaire" value="{{system.frequence.sanctuaire}}" min="0" max="100" data-dtype="Number" {{#unless isGM}}disabled{{/unless}}/>
+        <input type="number" name="system.frequence.sanctuaire" value="{{system.frequence.sanctuaire}}" min="0" max="100" data-dtype="Number" {{#unless options.isGM}}disabled{{/unless}}/>
      </div>
      <div class="form-group">
        <label for="system.frequence.plaines">Fréquence en Plaines</label>
-        <input type="number" name="system.frequence.plaines" value="{{system.frequence.plaines}}" min="0" max="100" data-dtype="Number" {{#unless isGM}}disabled{{/unless}}/>
+        <input type="number" name="system.frequence.plaines" value="{{system.frequence.plaines}}" min="0" max="100" data-dtype="Number" {{#unless options.isGM}}disabled{{/unless}}/>
      </div>
      <div class="form-group">
        <label for="system.frequence.pont">Fréquence en Pont</label>
-        <input type="number" name="system.frequence.pont" value="{{system.frequence.pont}}" min="0" max="100" data-dtype="Number" {{#unless isGM}}disabled{{/unless}}/>
+        <input type="number" name="system.frequence.pont" value="{{system.frequence.pont}}" min="0" max="100" data-dtype="Number" {{#unless options.isGM}}disabled{{/unless}}/>
      </div>
      <div class="form-group">
        <label for="system.frequence.collines">Fréquence en Collines</label>
-        <input type="number" name="system.frequence.collines" value="{{system.frequence.collines}}" min="0" max="100" data-dtype="Number" {{#unless isGM}}disabled{{/unless}}/>
+        <input type="number" name="system.frequence.collines" value="{{system.frequence.collines}}" min="0" max="100" data-dtype="Number" {{#unless options.isGM}}disabled{{/unless}}/>
      </div>
      <div class="form-group">
        <label for="system.frequence.foret">Fréquence en Forêt</label>
-        <input type="number" name="system.frequence.foret" value="{{system.frequence.foret}}" min="0" max="100" data-dtype="Number" {{#unless isGM}}disabled{{/unless}}/>
+        <input type="number" name="system.frequence.foret" value="{{system.frequence.foret}}" min="0" max="100" data-dtype="Number" {{#unless options.isGM}}disabled{{/unless}}/>
      </div>
      <div class="form-group">
        <label for="system.frequence.monts">Fréquence en Monts</label>
-        <input type="number" name="system.frequence.monts" value="{{system.frequence.monts}}" min="0" max="100" data-dtype="Number" {{#unless isGM}}disabled{{/unless}}/>
+        <input type="number" name="system.frequence.monts" value="{{system.frequence.monts}}" min="0" max="100" data-dtype="Number" {{#unless options.isGM}}disabled{{/unless}}/>
      </div>
      <div class="form-group">
        <label for="system.frequence.desert">Fréquence en Désert</label>
-        <input type="number" name="system.frequence.desert" value="{{system.frequence.desert}}" min="0" max="100" data-dtype="Number" {{#unless isGM}}disabled{{/unless}}/>
+        <input type="number" name="system.frequence.desert" value="{{system.frequence.desert}}" min="0" max="100" data-dtype="Number" {{#unless options.isGM}}disabled{{/unless}}/>
      </div>
      <div class="form-group">
        <label for="system.frequence.fleuve">Fréquence en Fleuve</label>
-        <input type="number" name="system.frequence.fleuve" value="{{system.frequence.fleuve}}" min="0" max="100" data-dtype="Number" {{#unless isGM}}disabled{{/unless}}/>
+        <input type="number" name="system.frequence.fleuve" value="{{system.frequence.fleuve}}" min="0" max="100" data-dtype="Number" {{#unless options.isGM}}disabled{{/unless}}/>
      </div>
      <div class="form-group">
        <label for="system.frequence.lac">Fréquence en Lac</label>
-        <input type="number" name="system.frequence.lac" value="{{system.frequence.lac}}" min="0" max="100" data-dtype="Number" {{#unless isGM}}disabled{{/unless}}/>
+        <input type="number" name="system.frequence.lac" value="{{system.frequence.lac}}" min="0" max="100" data-dtype="Number" {{#unless options.isGM}}disabled{{/unless}}/>
      </div>
      <div class="form-group">
        <label for="system.frequence.marais">Fréquence en Marais</label>
-        <input type="number" name="system.frequence.marais" value="{{system.frequence.marais}}" min="0" max="100" data-dtype="Number" {{#unless isGM}}disabled{{/unless}}/>
+        <input type="number" name="system.frequence.marais" value="{{system.frequence.marais}}" min="0" max="100" data-dtype="Number" {{#unless options.isGM}}disabled{{/unless}}/>
      </div>
      <div class="form-group">
        <label for="system.frequence.gouffre">Fréquence en Gouffre</label>
-        <input type="number" name="system.frequence.gouffre" value="{{system.frequence.gouffre}}" min="0" max="100" data-dtype="Number" {{#unless isGM}}disabled{{/unless}}/>
+        <input type="number" name="system.frequence.gouffre" value="{{system.frequence.gouffre}}" min="0" max="100" data-dtype="Number" {{#unless options.isGM}}disabled{{/unless}}/>
      </div>
      <div class="form-group">
        <label for="system.frequence.necropole">Fréquence en Nécropole</label>
-        <input type="number" name="system.frequence.necropole" value="{{system.frequence.necropole}}" min="0" max="100" data-dtype="Number" {{#unless isGM}}disabled{{/unless}}/>
+        <input type="number" name="system.frequence.necropole" value="{{system.frequence.necropole}}" min="0" max="100" data-dtype="Number" {{#unless options.isGM}}disabled{{/unless}}/>
      </div>
      <div class="form-group">
        <label for="system.frequence.desolation">Fréquence en Désolation</label>
-        <input type="number" name="system.frequence.desolation" value="{{system.frequence.desolation}}" min="0" max="100" data-dtype="Number" {{#unless isGM}}disabled{{/unless}}/>
+        <input type="number" name="system.frequence.desolation" value="{{system.frequence.desolation}}" min="0" max="100" data-dtype="Number" {{#unless options.isGM}}disabled{{/unless}}/>
      </div>
    </div>
    {{/unless}}
--- a/templates/item-sort-sheet.html
+++ b/templates/item-sort-sheet.html
@@ -59,7 +59,7 @@
      <label for="system.xp">XP</label>
      <input class="attribute-value" type="text" name="system.xp" value="{{system.xp}}" data-dtype="Number"/>
    </div>
-    {{#if owner}}
+    {{#if options.isOwner}}
    {{#each bonusCaseList as |bcData key|}}
    <div class="form-group">
      <label for="caseValue">Case/Bonus :</label>
--- a/templates/item-souffle-sheet.html
+++ b/templates/item-souffle-sheet.html
@@ -11,7 +11,7 @@
      </select>
    </div>

-    {{#if isOwned}}
+    {{#if options.isOwned}}
    {{>"systems/foundryvtt-reve-de-dragon/templates/item/temporel.hbs" this labeldebut="Depuis le" labelfin="Jusqu'au"}}
    {{/if}}

--- a/templates/item-tache-sheet.html
+++ b/templates/item-tache-sheet.html
@@ -33,7 +33,7 @@
      <label for="xp">Fatigue</label>
      <input class="attribute-value" type="text" name="system.fatigue" value="{{system.fatigue}}" data-dtype="Number"/>
    </div>
-    {{#if isGM}}
+    {{#if options.isGM}}
    <div class="form-group">
      <label for="xp">Cacher les Points de Tâches nécessaires au joueur</label>
      <input class="attribute-value" type="checkbox" name="system.cacher_points_de_tache" value="{{system.cacher_points_de_tache}}" {{checked system.cacher_points_de_tache}}/>
@@ -59,11 +59,11 @@
    </div>
    <div class="form-group">
      <label for="xp">Nombre de Succès</label>
-      <input class="attribute-value" type="text" name="system.nb_jet_succes" value="{{system.nb_jet_succes}}" data-dtype="Number" {{#if isGM}}{{else}}disabled{{/if}}/>
+      <input class="attribute-value" type="text" name="system.nb_jet_succes" value="{{system.nb_jet_succes}}" data-dtype="Number" {{#if options.isGM}}{{else}}disabled{{/if}}/>
    </div>
    <div class="form-group">
      <label for="xp">Nombre d'Echecs</label>
-      <input class="attribute-value" type="text" name="system.nb_jet_echec" value="{{system.nb_jet_echec}}" data-dtype="Number" {{#if isGM}}{{else}}disabled{{/if}}/>
+      <input class="attribute-value" type="text" name="system.nb_jet_echec" value="{{system.nb_jet_echec}}" data-dtype="Number" {{#if options.isGM}}{{else}}disabled{{/if}}/>
    </div>

    {{>"systems/foundryvtt-reve-de-dragon/templates/partial-item-description.html"}}
--- a/templates/item/boutons-comestible.html
+++ b/templates/item/boutons-comestible.html
@@ -1,4 +1,4 @@
-{{#if (and isOwned isComestible)}}
+{{#if (and options.isOwned isComestible)}}
 <div class="form-group">
  {{#if (eq isComestible 'brut')}}
  <span><a class="preparer-nourriture chat-card-button" data-actor-id="{{actorId}}">Cuisiner</a></span>
--- a/templates/item/partial-environnement.html
+++ b/templates/item/partial-environnement.html
@@ -1,4 +1,4 @@
-{{#unless isOwned}}
+{{#unless options.isOwned}}
 {{>'systems/foundryvtt-reve-de-dragon/templates/scripts/autocomplete-script.hbs'}}
 <div class="tab items" data-group="primary" data-tab="environnement">
  <div class="form-group description-milieu">
--- a/templates/item/partial-tab-environnement.html
+++ b/templates/item/partial-tab-environnement.html
@@ -1,3 +1,3 @@
-{{#unless isOwned}}
+{{#unless options.isOwned}}
 <a class="item" data-tab="environnement">Environnement</a>
 {{/unless}}
--- a/templates/partial-item-description.html
+++ b/templates/partial-item-description.html
@@ -1,14 +1,14 @@
 <div class="flexcol">
  <span><label>Description : </label></span>
  <div class="form-group large-editor">
-    {{editor description target="system.description" button=true owner=owner editable=true engine="prosemirror"}}
+    {{editor description target="system.description" button=true owner=options.isOwner editable=options.editable engine="prosemirror"}}
  </div>
 </div>
-{{#if isGM}}
+{{#if options.isGM}}
 <div class="flexcol">
  <span><label>Description (MJ seulement): </label></span>
  <div class="form-group large-editor">
-    {{editor descriptionmj target="system.descriptionmj" button=true owner=owner editable=true engine="prosemirror"}}
+    {{editor descriptionmj target="system.descriptionmj" button=true owner=options.isOwner editable=options.editable engine="prosemirror"}}
  </div>
 </div>
 {{/if}}
--- a/templates/partial-item-frequence.html
+++ b/templates/partial-item-frequence.html
@@ -1,4 +1,4 @@
-{{#if isGM}}
+{{#if options.isGM}}
 <div class="form-group">
  <label for="system.frequence">Fréquence</label>
  <input class="attribute-value" type="text" name="system.frequence" value="{{system.frequence}}" data-dtype="Number"/>
--- a/templates/partial-item-hautrevant.html
+++ b/templates/partial-item-hautrevant.html
@@ -1,4 +1,4 @@
-{{#if isGM}}
+{{#if options.isGM}}
 <div class="form-group">
  <label for="system.hautrevant">Pour haut-rêvants</label>
  <input class="attribute-value" type="checkbox" name="system.hautrevant"  {{#if system.hautrevant}}checked{{/if}}/>
--- a/templates/tirage/fenetre-recherche-tirage.hbs
+++ b/templates/tirage/fenetre-recherche-tirage.hbs
@@ -7,12 +7,16 @@
    <span class="liste-filtres-actifs"></span>
  </div>
  <hr>
-  <div class="recherche">
+  <div class="zone-recherche">
    <div class="filtres">
-      <div class="titre-fenetre-recherche">
+      <div class="titre-resultats-recherche">
        <h3>Filtres</h3>
      </div>
-
+      <div class="section-filters-text">
+        <h4>
+          <input class="recherche flex-grow" type="text" value="{{options.recherche.text}}" name="recherche" size="8" data-dtype="String" placeholder=""/>
+        </h4>
+      </div>
      <div class="section-filters-root">
        <h4>
          <a class="section-filters-toggle">Milieux
@@ -56,10 +60,10 @@
    </div>
    <div class="vl"></div>
    <div class="resultats">
-      <div class="titre-fenetre-recherche">
-      <h3>Résultat de recherche</h3>
+      <div class="titre-resultats-recherche">
+        <h3>Résultat de recherche</h3>
      </div>
-      <div class="liste-resultats">
+      <div class="liste-resultats-recherche">

      </div>
    </div>
--- a/templates/tirage/liste-resultats-recherche.hbs
+++ b/templates/tirage/liste-resultats-recherche.hbs
Author	SHA1	Message	Date
uberwald	9f24aee1f3	Merge pull request 'Recherche par nom' (#618 ) from VincentVk/foundryvtt-reve-de-dragon:v10 into v10 Reviewed-on: public/foundryvtt-reve-de-dragon#618	2023-01-31 07:32:09 +01:00
Vincent Vandemeulebrouck	e605ab405a	Version 10.6.8	2023-01-30 22:08:11 +01:00
Vincent Vandemeulebrouck	86f69566a6	Recherche par nom Dans la fenêtre de recherche, possibilité de chercher sur le nom des objets en plus des autres critères	2023-01-30 22:08:11 +01:00
uberwald	2561a658f2	Merge pull request 'v10.6.7' (#617 ) from VincentVk/foundryvtt-reve-de-dragon:v10 into v10 Reviewed-on: public/foundryvtt-reve-de-dragon#617	2023-01-28 20:50:52 +01:00
Vincent Vandemeulebrouck	8a1d1fd253	Version 10.6.7	2023-01-28 18:08:47 +01:00
Vincent Vandemeulebrouck	e42f384d7f	Masquer le bouton si pas utilisable Pour créer un nouvel objet, il faut être "owner"	2023-01-28 16:46:17 +01:00
Vincent Vandemeulebrouck	d381191692	Monnaie pour gérer la fortune	2023-01-28 16:35:45 +01:00
Vincent Vandemeulebrouck	53a7230f1d	Fix: Actions dans un conteneur Les actions dans un conteneur (ouvrir un des sous conteneurs par exemple) n'étaient pas disponibles. Ceci était lié à la structure des données contenant les droits différente pour les items et les acteurs. La gestion des droits était mélangées et faite de façons différentes. Maintenant, les "options" dans les données du formulaire contiennent les informations de droits d'accès et sont utilisées.	2023-01-28 16:34:09 +01:00
Vincent Vandemeulebrouck	4d5651c2d3	Reprise de l'arbre d'inventaire Soucis lors de l'affichage dans la fenêtre d'un conteneur	2023-01-28 15:43:31 +01:00
Vincent Vandemeulebrouck	61474172a7	Fix: gestion de la fenêtre de vente les nombre de lots ne marchaient plus (toujourts 1 de proposé)	2023-01-28 11:36:22 +01:00
uberwald	083806612b	Merge pull request 'v10.6.7' (#616 ) from VincentVk/foundryvtt-reve-de-dragon:v10 into v10 Reviewed-on: public/foundryvtt-reve-de-dragon#616	2023-01-25 10:26:26 +01:00
Vincent Vandemeulebrouck	1c417d02a1	Version 10.6.6	2023-01-24 22:35:39 +01:00
Vincent Vandemeulebrouck	ee9e7d2adb	Messages compétences troncs en notifications Lors d'une création de perso, ça spamme trop le tchat	2023-01-24 22:33:45 +01:00
Vincent Vandemeulebrouck	fa3334273d	Fix: ligne de carac vide à cause de la beauté Une lighne de carac était ajouée lors de l'édition de la beauté.	2023-01-24 22:33:45 +01:00
Vincent Vandemeulebrouck	05b73a41a5	Inversion: Taille puis poids C'est dans cet ordre dans les scénarios	2023-01-24 22:33:45 +01:00
Vincent Vandemeulebrouck	842243485a	Corrections d'armes rudimentaires	2023-01-24 22:12:43 +01:00