Merge pull request 'Arbre de conteneurs et recherche améliorée' (#546 ) from VincentVk/foundryvtt-reve-de-dragon:v1.5 into v1.5

Reviewed-on: #546
Arborescence de conteneurs
2022-08-27 19:11:56 +02:00 · 2022-08-26 22:23:09 +02:00 · 2022-08-26 22:23:08 +02:00 · 2022-07-23 18:34:17 +02:00 · 2022-07-23 18:33:32 +02:00 · 2022-07-23 16:48:49 +02:00
11 changed files with 139 additions and 74 deletions
--- a/module/actor-sheet.js
+++ b/module/actor-sheet.js
@@ -37,8 +37,7 @@ export class RdDActorSheet extends ActorSheet {
  /* -------------------------------------------- */
  async getData() {
    const objectData = Misc.data(this.object);
-
-    //this.actor.checkMonnaiePresence(this.actor.data.items); // Always check 
+    this.timerRecherche = undefined;

    let formData = {
      title: this.title,
@@ -78,8 +77,8 @@ export class RdDActorSheet extends ActorSheet {
    };

    formData.competences.forEach(item => {
-      item.visible = this.options.cherchercompetence
-        ? RdDItemCompetence.nomContientTexte(item, this.options.cherchercompetence)
+      item.visible = this.options.recherche
+        ? RdDItemCompetence.nomContientTexte(item, this.options.recherche.text)
        : (!this.options.showCompNiveauBase || !RdDItemCompetence.isNiveauBase(item));
      RdDItemCompetence.levelUp(item, formData.data.compteurs.experience.value);
    });
@@ -424,12 +423,28 @@ export class RdDActorSheet extends ActorSheet {
      this.options.editCaracComp = !this.options.editCaracComp;
      this.render(true);
    });
-    html.find('.cherchercompetence').change(async event => {
-      this.options.cherchercompetence = event.currentTarget.value;
-      this.render(true);
-    });
+
+    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 => {
+        this.options.recherche = this._optionRecherche(event.currentTarget)
+        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)
+      );
    html.find('.vue-detaillee').click(async event => {
-      console.log("CONTROLS", this.options.vueDetaillee)
      this.options.vueDetaillee = !this.options.vueDetaillee;
      this.render(true);
    });
@@ -515,6 +530,17 @@ export class RdDActorSheet extends ActorSheet {
    });
  }

+  _optionRecherche(target) {
+    if (!target.value?.length){
+      return undefined;
+    }
+    return {
+      text: target.value,
+      start: target.selectionStart,
+      end: target.selectionEnd,
+    };
+  }
+
  _getEventArmeCombat(event) {
    const li = $(event.currentTarget)?.parents(".item");
    let armeName = li.data("arme-name");
--- a/module/actor.js
+++ b/module/actor.js
@@ -33,7 +33,8 @@ import { RollDataAjustements } from "./rolldata-ajustements.js";
 import { DialogItemAchat } from "./dialog-item-achat.js";
 import { RdDItem } from "./item.js";
 import { RdDPossession } from "./rdd-possession.js";
-import { SYSTEM_RDD, SYSTEM_SOCKET_ID } from "./constants.js";
+import { ENTITE_BLURETTE, ENTITE_INCARNE, ENTITE_NONINCARNE, SYSTEM_RDD, SYSTEM_SOCKET_ID } from "./constants.js";
+

 /* -------------------------------------------- */
 /**
@@ -239,7 +240,7 @@ export class RdDActor extends Actor {
  }
  /* -------------------------------------------- */
  getForce() {
-    if (this.isEntiteCauchemar()) {
+    if (this.isEntite()) {
      return Misc.toInt(Misc.templateData(this).carac.reve?.value);
    }
    return Misc.toInt(Misc.templateData(this).carac.force?.value);
@@ -612,7 +613,10 @@ export class RdDActor extends Actor {
      content: "Remise à neuf de " + this.name
    };
    const actorData = Misc.data(this);
-    if (this.isEntiteCauchemar()) {
+    if (this.isEntite([ENTITE_NONINCARNE])) {
+      return;
+    }
+    if (this.isEntite([ENTITE_INCARNE, ENTITE_BLURETTE])) {
      await this.santeIncDec("endurance", actorData.data.sante.endurance.max - actorData.data.sante.endurance.value);
    }
    else {
@@ -1622,7 +1626,7 @@ export class RdDActor extends Actor {

  /* -------------------------------------------- */
  async setSonne(sonne = true) {
-    if (this.isEntiteCauchemar()) {
+    if (this.isEntite()) {
      return;
    }
    if (!game.combat && sonne) {
@@ -1634,7 +1638,7 @@ export class RdDActor extends Actor {

  /* -------------------------------------------- */
  getSConst() {
-    if (this.isEntiteCauchemar()) {
+    if (this.isEntite()) {
      return 0;
    }
    return RdDCarac.calculSConst(Misc.templateData(this).carac.constitution.value);
@@ -1751,7 +1755,7 @@ export class RdDActor extends Actor {
    result.newValue = Math.max(minValue, Math.min(compteur.value + inc, compteur.max));
    //console.log("New value ", inc, minValue, result.newValue);
    let fatigue = 0;
-    if (name == "endurance" && !this.isEntiteCauchemar()) {
+    if (name == "endurance" && !this.isEntite()) {
      if (result.newValue == 0 && inc < 0 && !isCritique) { // perte endurance et endurance devient 0 (sauf critique) -> -1 vie
        sante.vie.value--;
        result.perteVie = true;
@@ -1788,7 +1792,7 @@ export class RdDActor extends Actor {
  }

  isDead() {
-    return !this.isEntiteCauchemar() && Misc.templateData(this).sante.vie.value < -this.getSConst()
+    return !this.isEntite() && Misc.templateData(this).sante.vie.value < -this.getSConst()
  }

  /* -------------------------------------------- */
@@ -3347,7 +3351,7 @@ export class RdDActor extends Actor {
    let encaissement = await this.jetEncaissement(rollData);

    this.ajouterBlessure(encaissement); // Will upate the result table
-    const perteVie = this.isEntiteCauchemar()
+    const perteVie = this.isEntite()
      ? { newValue: 0 }
      : await this.santeIncDec("vie", - encaissement.vie);
    const perteEndurance = await this.santeIncDec("endurance", -encaissement.endurance, encaissement.critiques > 0);
@@ -3362,7 +3366,7 @@ export class RdDActor extends Actor {
      sonne: perteEndurance.sonne,
      jetEndurance: perteEndurance.jetEndurance,
      endurance: santeOrig.endurance.value - perteEndurance.newValue,
-      vie: this.isEntiteCauchemar() ? 0 : (santeOrig.vie.value - perteVie.newValue),
+      vie: this.isEntite() ? 0 : (santeOrig.vie.value - perteVie.newValue),
      show: defenderRoll?.show ?? {}
    });

@@ -3552,8 +3556,8 @@ export class RdDActor extends Actor {
  /* -------------------------------------------- */
  async accorder(entite, when = 'avant-encaissement') {
    if (when != game.settings.get(SYSTEM_RDD, "accorder-entite-cauchemar")
-      || !entite.isEntiteCauchemar()
-      || entite.isEntiteCauchemarAccordee(this)) {
+      || !entite.isEntite([ENTITE_INCARNE])
+      || entite.isEntiteAccordee(this)) {
      return true;
    }
    const tplData = Misc.templateData(this);
@@ -3577,20 +3581,21 @@ export class RdDActor extends Actor {
  }

  /* -------------------------------------------- */
-  isEntiteCauchemar() {
-    return this.data.type == 'entite';
+  isEntite(typeentite = [] ) {
+    return this.data.type == 'entite' && (typeentite.length == 0 || typeentite.includes(this.data.data.typeentite));
  }

  /* -------------------------------------------- */
-  isEntiteCauchemarAccordee(attaquant) {
-    if (!this.isEntiteCauchemar()) { return true; }
+  isEntiteAccordee(attaquant) {
+    if (!this.isEntite([ENTITE_INCARNE]))
+    { return true; }
    let resonnance = Misc.templateData(this).sante.resonnance;
    return (resonnance.actors.find(it => it == attaquant.id));
  }

  /* -------------------------------------------- */
  async setEntiteReveAccordee(attaquant) {
-    if (!this.isEntiteCauchemar()) {
+    if (!this.isEntite([ENTITE_INCARNE])) {
      ui.notifications.error("Impossible de s'accorder à " + this.name + ": ce n'est pas une entite de cauchemer/rêve");
      return;
    }
@@ -4153,7 +4158,7 @@ export class RdDActor extends Actor {

  /* -------------------------------------------- */
  async setStatusEffect(label, status, updates = {}) {
-    if (this.isEntiteCauchemar() || this.data.type == 'vehicule') {
+    if (this.isEntite() || this.data.type == 'vehicule') {
      return;
    }
    console.log("setStatusEffect", label, status, updates)
--- a/module/constants.js
+++ b/module/constants.js
@@ -3,3 +3,7 @@ export const SYSTEM_SOCKET_ID = 'system.foundryvtt-reve-de-dragon';

 export const HIDE_DICE = 'hide';
 export const SHOW_DICE = 'show';
+
+export const ENTITE_INCARNE = 'incarne';
+export const ENTITE_NONINCARNE = 'nonincarne';
+export const ENTITE_BLURETTE = 'blurette';
--- a/module/rdd-combat.js
+++ b/module/rdd-combat.js
@@ -1,5 +1,5 @@
 import { ChatUtility } from "./chat-utility.js";
-import { HIDE_DICE, SYSTEM_RDD, SYSTEM_SOCKET_ID } from "./constants.js";
+import { ENTITE_INCARNE, ENTITE_NONINCARNE, HIDE_DICE, SYSTEM_RDD, SYSTEM_SOCKET_ID } from "./constants.js";
 import { Grammar } from "./grammar.js";
 import { RdDItemArme } from "./item-arme.js";
 import { RdDItemCompetence } from "./item-competence.js";
@@ -457,7 +457,7 @@ export class RdDCombat {
    else {
      const defender = target?.actor;
      const defenderTokenId = target?.data._id;
-      if ( defender.type == 'entite' && defender.data.data.definition.typeentite == 'nonincarne') {
+      if ( defender.type == 'entite' && defender.data.data.definition.typeentite == ENTITE_NONINCARNE) {
        ui.notifications.warn("Vous ne pouvez pas cibler une entité non incarnée !!!!");
      } else {
        return this.create(attacker, defender, defenderTokenId, target)
@@ -799,7 +799,7 @@ export class RdDCombat {
  async _onAttaqueNormale(attackerRoll) {
    console.log("RdDCombat.onAttaqueNormale >>>", attackerRoll);

-    attackerRoll.dmg = RdDBonus.dmg(attackerRoll, this.attacker.getBonusDegat(), this.defender.isEntiteCauchemar());
+    attackerRoll.dmg = RdDBonus.dmg(attackerRoll, this.attacker.getBonusDegat(), this.defender.isEntite());
    let defenderRoll = { attackerRoll: attackerRoll, passeArme: attackerRoll.passeArme, show: {} }
    attackerRoll.show = {
      cible: this.target ? this.defender.data.name : 'la cible',
@@ -1249,8 +1249,8 @@ export class RdDCombat {
  async accorderEntite(when = 'avant-encaissement') {
    if (when != game.settings.get(SYSTEM_RDD, "accorder-entite-cauchemar")
      || this.defender == undefined
-      || !this.defender.isEntiteCauchemar()
-      || this.defender.isEntiteCauchemarAccordee(this.attacker)) {
+      || !this.defender.isEntite([ENTITE_INCARNE])
+      || this.defender.isEntiteAccordee(this.attacker)) {
      return true;
    }

--- a/module/rdd-roll-encaisser.js
+++ b/module/rdd-roll-encaisser.js
@@ -1,3 +1,5 @@
+import { ENTITE_BLURETTE, ENTITE_INCARNE, ENTITE_NONINCARNE } from "./constants.js";
+
 /**
 * Extend the base Dialog entity by defining a custom window to perform roll.
 * @extends {Dialog}
@@ -7,15 +9,19 @@ export class RdDEncaisser extends Dialog {
  /* -------------------------------------------- */
  constructor(html, actor) {
    // Common conf
-    const buttonsCreatures = {
-      "mortel": { label: "Mortel", callback: html => this.performEncaisser("mortel") },
-      "non-mortel": { label: "Non-mortel", callback: html => this.performEncaisser("non-mortel") },
-      "sonne": { label: "Sonné", callback: html => this.actor.setSonne() },
-    };
-    const buttonsEntitesCauchemar = {
-      "cauchemar": { label: "cauchemar", callback: html => this.performEncaisser("cauchemar") }
-    };
-    const buttons = actor.isEntiteCauchemar() ? buttonsEntitesCauchemar : buttonsCreatures;
+    let buttons = {};
+    if (!actor.isEntite()){
+      buttons = {
+        "mortel": { label: "Mortel", callback: html => this.performEncaisser("mortel") },
+        "non-mortel": { label: "Non-mortel", callback: html => this.performEncaisser("non-mortel") },
+        "sonne": { label: "Sonné", callback: html => this.actor.setSonne() },
+      };
+    }
+    else if (actor.isEntite([ENTITE_BLURETTE, ENTITE_INCARNE])){
+      buttons = {
+        "cauchemar": { label: "cauchemar", callback: html => this.performEncaisser("cauchemar") }
+      }
+    }

    let dialogConf = {
      title: "Jet d'Encaissement",
@@ -24,7 +30,6 @@ export class RdDEncaisser extends Dialog {
      default: "mortel"
    }

-
    let dialogOptions = {
      classes: ["rdddialog"],
      width: 320,
--- a/module/rdd-utility.js
+++ b/module/rdd-utility.js
@@ -465,34 +465,32 @@ export class RdDUtility {
  /** Construit la structure récursive des conteneurs, avec imbrication potentielle
   * 
   */
-  static buildConteneur(objet, niveau) {
-    if (!niveau) niveau = 1;
-    objet.niveau = niveau;
-    //console.log("OBJ:", objet);
-    let str = Handlebars.partials['systems/foundryvtt-reve-de-dragon/templates/actor-sheet-inventaire-conteneur.html']({ item: objet });
-    if (objet.type == 'conteneur') {
-      const afficherContenu = this.getAfficheContenu(objet._id);
-      str = str + RdDUtility.buildContenu(objet, niveau, afficherContenu);
-    }
-    return str;
+  static buildConteneur(objet, profondeur) {
+    if (!profondeur) profondeur = 1;
+    objet.niveau = profondeur;
+    const isConteneur = objet.type == 'conteneur';
+    const isOuvert = isConteneur && this.getAfficheContenu(objet._id);
+    const isVide = isConteneur && Misc.templateData(objet).contenu.length == 0;
+    const conteneur = Handlebars.partials['systems/foundryvtt-reve-de-dragon/templates/actor-sheet-inventaire-conteneur.html']({
+      item: objet,
+      vide: isVide,
+      ouvert: isOuvert
+    });
+    const contenu = isConteneur ? RdDUtility.buildContenu(objet, profondeur, isOuvert) : '';
+    return conteneur + contenu;
  }

  /* -------------------------------------------- */
-  static buildContenu(objet, niveau, afficherContenu) {
-    if (!niveau) niveau = 1;
-    objet.niveau = niveau;
-    let strContenu = "";
+  static buildContenu(objet, profondeur, afficherContenu) {
+    if (!profondeur) profondeur = 1;
+    objet.niveau = profondeur;
+    const display = afficherContenu ? 'item-display-show' : 'item-display-hide';
    //console.log("ITEM DISPLAYED", objet );
-    if (afficherContenu) {
-      strContenu = "<ul class='item-list alterne-list item-display-show list-item-margin" + niveau + "'>";
-    } else {
-      strContenu = "<ul class='item-list alterne-list item-display-hide list-item-margin" + niveau + "'>";
-    }
+    let strContenu = `<ul class='item-list alterne-list ${display} list-item-margin${profondeur}'>`;
    for (let subItem of objet.subItems) {
-      strContenu = strContenu + this.buildConteneur(subItem, niveau + 1);
+      strContenu += this.buildConteneur(subItem, profondeur + 1);
    }
-    strContenu = strContenu + "</ul>";
-    return strContenu;
+    return strContenu + "</ul>";
  }

  /* -------------------------------------------- */
--- a/styles/simple.css
+++ b/styles/simple.css
@@ -806,16 +806,22 @@ ul, li {
 }

 .list-item-margin1 {
-  margin-left: 1rem;
+  margin-left: 0.5rem;
 }
 .list-item-margin2 {
-  margin-left: 2rem;
+  margin-left: 1rem;
 }
 .list-item-margin3 {
-  margin-left: 3rem;
+  margin-left: 1.5rem;
 }
 .list-item-margin4 {
-  margin-left: 4rem;
+  margin-left: 2rem;
+}
+.list-item-margin5 {
+  margin-left: 2.5rem;
+}
+.list-item-margin6 {
+  margin-left: 3rem;
 }

 .sheet-competence-img {
--- a/system.json
+++ b/system.json
@@ -29,7 +29,7 @@
  "url": "https://www.uberwald.me/gitea/public/foundryvtt-reve-de-dragon/",
  "license": "LICENSE.txt",
  "flags": {},
-  "version": "1.5.83",
+  "version": "1.5.85",
  "minimumCoreVersion": "0.8.0",
  "compatibleCoreVersion": "9",
  "scripts": [],
@@ -500,7 +500,7 @@
  "dependencies": [],
  "socket": true,
  "manifest": "https://www.uberwald.me/gitea/public/foundryvtt-reve-de-dragon/raw/v1.5/system.json",
-  "download": "https://www.uberwald.me/gitea/public/foundryvtt-reve-de-dragon/archive/foundryvtt-reve-de-dragon-1.5.83.zip",
+  "download": "https://www.uberwald.me/gitea/public/foundryvtt-reve-de-dragon/archive/foundryvtt-reve-de-dragon-1.5.85.zip",
  "protected": false,
  "gridDistance": 1,
  "gridUnits": "m",
--- a/templates/actor-entite-sheet.html
+++ b/templates/actor-entite-sheet.html
@@ -65,6 +65,7 @@
                {{#select data.definition.typeentite}}
                <option value="incarne">Incarnée</option>
                <option value="nonincarne">Non Incarnée</option>
+                <option value="blurette">Blurete</option>
                {{/select}}
              </select>
            </li>
--- a/templates/actor-sheet-inventaire-conteneur.html
+++ b/templates/actor-sheet-inventaire-conteneur.html
@@ -1,9 +1,28 @@
 <li class="item flexrow list-item" data-item-id="{{item._id}}" draggable="true">
-  <img class="sheet-competence-img" src="{{item.img}}" title="{{item.name}}"/>
-
  {{#if (eq item.type 'conteneur')}}
-  <span class="item-name conteneur-name flex-grow"><a data-item-id="{{item._id}}">+{{item.name}}</a></span>
+    <span class="sheet-competence-img conteneur-name">
+      {{#if vide}}
+       <i class="far fa-square"></i>
+      {{else}}
+        <a data-item-id="{{item._id}}">
+        {{#if ouvert}}
+        <i class="far fa-minus-square"></i>
+        <!-- <i class="far fa-caret-square-down"></i> -->
+        {{else}}
+        <i class="far fa-plus-square"></i>
+        <!-- <i class="fas fa-caret-square-right"></i> -->
+        {{/if}}
+        </a>
+      {{/if}}
+    </span>
+    <span class="item-name conteneur-name flex-grow">
+      <a data-item-id="{{item._id}}">
+        <img class="sheet-competence-img" src="{{item.img}}" title="{{item.name}}"/>
+        {{item.name}}
+      </a>
+    </span>
  {{else}}
+  <img class="sheet-competence-img" src="{{item.img}}" title="{{item.name}}"/>
  <span class="item-name flex-grow">{{item.name}}</span>
  {{/if}}
  <span class="item-quantite">{{item.data.quantite}}
@@ -30,3 +49,4 @@
    {{/if}}
  </div>
 </li>
+
--- a/templates/actor-sheet.html
+++ b/templates/actor-sheet.html
@@ -217,7 +217,7 @@
              {{#if options.editCaracComp}}Verrouiller{{else}}Déverrouiller{{/if}}</a></span>
            <span class="flexrow">
              <i class="fas fa-search"></i>
-              <input class="cherchercompetence" type="text" value="{{options.cherchercompetence}}" name="cherchercompetence" 
+              <input class="recherche" type="text" value="{{options.recherche.text}}" name="recherche" 
                size="8" data-dtype="String" placeholder="chercher"/>
              <span></span>
            </span>
@@ -690,7 +690,7 @@
          {{#each objets as |item id|}}
            {{#unless item.estContenu}}
            {{#if (ne item.type 'conteneur')}}
-              {{> "systems/foundryvtt-reve-de-dragon/templates/actor-sheet-inventaire-conteneur.html" item=item }}
+              {{> "systems/foundryvtt-reve-de-dragon/templates/actor-sheet-inventaire-conteneur.html" item=item vide=true ouvert=true }}
            {{/if}}
            {{/unless}}
          {{/each}}
Author	SHA1	Message	Date
uberwald	d4fddf8600	Merge pull request 'Arbre de conteneurs et recherche améliorée' (#546 ) from VincentVk/foundryvtt-reve-de-dragon:v1.5 into v1.5 Reviewed-on: #546	2022-08-27 19:11:56 +02:00
Vincent Vandemeulebrouck	4b1862fa48	Arborescence de conteneurs Les conteneurs sont maintenant précédés d'une icone: * pour ouvrir: '+' * pour fermer: '-' * si vide: carré vide	2022-08-26 22:23:09 +02:00
Vincent Vandemeulebrouck	82115ed8d7	Amélioration recherche La recherche de compétence fonctionne sur timer	2022-08-26 22:23:08 +02:00
sladecraven	3359492f13	v0.5 fixes	2022-07-23 18:34:17 +02:00
uberwald	676e6739a6	Merge pull request 'Fix import' (#545 ) from VincentVk/foundryvtt-reve-de-dragon:v1.5 into v1.5 Reviewed-on: #545	2022-07-23 18:33:32 +02:00
Vincent Vandemeulebrouck	872d3fff31	Fix import	2022-07-23 16:48:49 +02:00
sladecraven	9c71827baa	Add Blurette	2022-07-22 22:45:41 +02:00
uberwald	fc9ef06e7b	Merge pull request 'Support des blurettes' (#544 ) from VincentVk/foundryvtt-reve-de-dragon:v1.5 into v1.5 Reviewed-on: #544	2022-07-22 22:44:49 +02:00
Vincent Vandemeulebrouck	9e63706de6	Support des blurettes On peut définir Blurette comme type d'entité. Pas de jet poour s'accorder aux blurettes.	2022-07-22 21:38:20 +02:00