Minor reformat avant signes draconiques

module/actor-sheet.js

@@ -223,6 +223,11 @@ export class RdDActorSheet extends ActorSheet {
       const item = this.actor.items.get(li.data("item-id"));
       item.sheet.render(true);
     });
+    html.find('.display-label a').click((event) => {
+      let myID = event.currentTarget.attributes['data-item-id'].value;
+      const item = this.actor.getEmbeddedDocument('Item', myID);
+      item.sheet.render(true);
+    });
     html.find('.rencontre-delete').click(ev => {
       const li = $(ev.currentTarget).parents(".item");
       const rencontreKey = li.data("item-id");
@@ -428,26 +433,6 @@ export class RdDActorSheet extends ActorSheet {
     html.find('.enlever-tous-effets').click((event) => {
       this.actor.enleverTousLesEffets();
     });
-    // Display info about queue
-    html.find('.queuesouffle-label a').click((event) => {
-      let myID = event.currentTarget.attributes['data-item-id'].value;
-      const item = this.actor.getEmbeddedDocument('Item', myID);
-      item.sheet.render(true);
-    });
-    // Info sort
-    html.find('.sort-label a').click((event) => {
-      let myID = event.currentTarget.attributes['data-id'].value;
-      const item = this.actor.getEmbeddedDocument('Item', myID);
-      item.sheet.render(true);
-    });
-    // Info sort
-    html.find('.case-label a').click((event) => {
-      let myID = event.currentTarget.attributes['data-id'].value;
-      const item = this.actor.getEmbeddedDocument('Item', myID);
-      item.sheet.render(true);
-    });
-
-    // Display info about queue
     html.find('.conteneur-name a').click((event) => {
       let myID = event.currentTarget.attributes['data-item-id'].value;
       RdDUtility.toggleAfficheContenu(myID);

module/actor.js

@@ -2097,9 +2097,11 @@ export class RdDActor extends Actor {
 
     let draconicList = this.computeDraconicAndSortIndex(sortList);
     const actorData = Misc.data(this);
+    const reve = duplicate(actorData.data.carac.reve);
     let rollData = {
-      forceCarac: { 'reve': duplicate(actorData.data.carac.reve) },
+      carac: { 'reve': reve },
-      selectedCarac: duplicate(actorData.data.carac.reve),
+      forceCarac: { 'reve': reve },
+      selectedCarac: reve,
       draconicList: draconicList,
       sortList: sortList,
       competence: draconicList[0],
@@ -2107,10 +2109,8 @@ export class RdDActor extends Actor {
       tmr: TMRUtility.getTMR(coord),
       diffLibre: RdDItemSort.getDifficulte(sortList[0], -7), // Per default at startup
       coutreve: Array(30).fill().map((item, index) => 1 + index),
-      carac: { 'reve': duplicate(actorData.data.carac.reve) }
     }
 
-    if (this.currentTMR) this.currentTMR.minimize(); // Hide
     const dialog = await RdDRoll.create(this, rollData,
       {
         html: 'systems/foundryvtt-reve-de-dragon/templates/dialog-roll-sort.html',

module/item.js

@@ -25,6 +25,7 @@ export class RdDItem extends Item {
   isConteneur() {
     return Misc.data(this).type == 'conteneur';
   }
+
   isVide() {
     return this.isConteneur() && (Misc.templateData(this).contenu ?? []).length == 0;
   }

module/rdd-main.js

@@ -176,7 +176,7 @@ Hooks.once("init", async function () {
   RdDDice.init();
   RdDCommands.init();
   RdDCombat.init();
-  RdDCombatManager.init(),
+  RdDCombatManager.init();
   RdDTokenHud.init();
   RdDActor.init();
   RddCompendiumOrganiser.init();

module/rdd-tmr-dialog.js

@@ -142,6 +142,7 @@ export class RdDTMRDialog extends Dialog {
   _tokenSortEnReserve(sortEnReserve) {
     return EffetsDraconiques.sortReserve.token(this.pixiTMR, sortEnReserve.sort, () => sortEnReserve.coord);
   }
+
   _tokenDemiReve() {
     const actorData = Misc.data(this.actor);
     return EffetsDraconiques.demiReve.token(this.pixiTMR, actorData, () => actorData.data.reve.tmrpos.coord);
@@ -153,9 +154,13 @@ export class RdDTMRDialog extends Dialog {
     }
   }
 
+  _getActorCoord() {
+    return Misc.data(this.actor).data.reve.tmrpos.coord;
+  }
+
   /* -------------------------------------------- */
   async moveFromKey(move) {
-    let pos = TMRUtility.convertToCellPos(Misc.data(this.actor).data.reve.tmrpos.coord);
+    let pos = TMRUtility.convertToCellPos(this._getActorCoord());
 
     if (move == 'top') pos.y -= 1;
     if (move == 'bottom') pos.y += 1;
@@ -213,7 +218,6 @@ export class RdDTMRDialog extends Dialog {
       this.moveFromKey("bottom");
     });
 
-    
     // Gestion du cout de montée en points de rêve
     let reveCout = ((this.tmrdata.isRapide && !EffetsDraconiques.isDeplacementAccelere(this.actor)) ? -2 : -1) - this.actor.countMonteeLaborieuse();
     if (ReglesOptionelles.isUsing("appliquer-fatigue")) {
@@ -223,7 +227,7 @@ export class RdDTMRDialog extends Dialog {
 
     // Le reste...
     this.updateValuesDisplay();
-    let tmr = TMRUtility.getTMR(Misc.data(this.actor).data.reve.tmrpos.coord);
+    let tmr = TMRUtility.getTMR(this._getActorCoord());
     await this.manageRencontre(tmr, () => {
       this.postRencontre(tmr);
     });
@@ -234,13 +238,13 @@ export class RdDTMRDialog extends Dialog {
     let ptsreve = document.getElementById("tmr-pointsreve-value");
     const actorData = Misc.data(this.actor);
     ptsreve.innerHTML = actorData.data.reve.reve.value;
+    const coord = this._getActorCoord();
 
     let tmrpos = document.getElementById("tmr-pos");
     if (this.cacheTMR) {
-      tmrpos.innerHTML = '?? ('+ TMRUtility.getTMRType( actorData.data.reve.tmrpos.coord ) + ')';  
+      tmrpos.innerHTML = '?? (' + TMRUtility.getTMRType(coord) + ')';
     } else {
-      let tmr = TMRUtility.getTMR(actorData.data.reve.tmrpos.coord);
+      tmrpos.innerHTML = coord + " (" + TMRUtility.getTMRLabel(coord) + ")";
-      tmrpos.innerHTML = actorData.data.reve.tmrpos.coord + " (" + tmr.label + ")";
     }
 
     let etat = document.getElementById("tmr-etatgeneral-value");
@@ -373,7 +377,7 @@ export class RdDTMRDialog extends Dialog {
       rencontre: this.currentRencontre,
       nbRounds: 1,
       canClose: false,
-      tmr: TMRUtility.getTMR(Misc.data(this.actor).data.reve.tmrpos.coord)
+      tmr: TMRUtility.getTMR(this._getActorCoord())
     }
 
     await this._tentativeMaitrise(rencontreData);
@@ -852,7 +856,7 @@ export class RdDTMRDialog extends Dialog {
 
   /* -------------------------------------------- */
   async _onClickTMRPos(eventPos) {
-    let currentPos = TMRUtility.convertToCellPos(Misc.data(this.actor).data.reve.tmrpos.coord);
+    let currentPos = TMRUtility.convertToCellPos(this._getActorCoord());
 
     console.log("deplacerDemiReve >>>>", currentPos, eventPos);
 
@@ -920,7 +924,6 @@ export class RdDTMRDialog extends Dialog {
     // Gestion cases spéciales type Trou noir, etc
     tmr = await this.manageTmrInnaccessible(tmr);
 
-    this.actor.updateCoordTMR(tmr.coord);
     await this.actor.updateCoordTMR(tmr.coord);
 
     this._updateDemiReve();

templates/actor-sheet.html

@@ -310,7 +310,7 @@
         <ul class="item-list alterne-list">
           {{#each taches as |tache id|}}
           <li class="item flexrow list-item" data-item-id="{{tache._id}}"><span class="competence-title tache-label"><a>{{tache.name}} ({{tache.data.points_de_tache_courant}}/{{tache.data.points_de_tache}})</a></span>
-            <div class="item-controls">
+            <div class="item-controls flex-shrink">
               <a class="item-control item-edit" title="Edit Item"><i class="fas fa-edit"></i></a>
               <a class="item-control item-delete" title="Delete Item"><i class="fas fa-trash"></i></a>
             </div>
@@ -340,7 +340,7 @@
         <ul class="item-list alterne-list">
           {{#each jeux as |jeu id|}}
           <li class="item flexrow list-item" data-item-id="{{jeu._id}}"><span class="competence-title jeu-label"><a>{{jeu.name}} (base {{jeu.data.base}})</a></span>
-            <div class="item-controls">
+            <div class="item-controls flex-shrink">
               <a class="item-control item-edit" title="Edit Item"><i class="fas fa-edit"></i></a>
               <a class="item-control item-delete" title="Delete Item"><i class="fas fa-trash"></i></a>
             </div>
@@ -351,7 +351,7 @@
         <ul class="item-list alterne-list">
           {{#each recettesAlchimiques as |recette id|}}
           <li class="item flexrow list-item" data-item-id="{{recette._id}}"><span class="competence-title recette-label item-edit"><a>{{recette.name}}</a></span>
-            <div class="item-controls">
+            <div class="item-controls flex-shrink">
               <a class="item-control item-edit" title="Edit Item"><i class="fas fa-edit"></i></a>
               <a class="item-control item-delete" title="Delete Item"><i class="fas fa-trash"></i></a>
             </div>
@@ -384,20 +384,28 @@
             </li>
             {{/if}}
             <li class="item flexrow">
-              <span class="competence-label">Demi rêve :</span> 
-              <span>
               {{#if options.isGM}}
-                {{caseTmr-label data.reve.tmrpos.coord}}
+              <span class="competence-label flex-shrink">Demi rêve :
+                <span>{{caseTmr-label data.reve.tmrpos.coord}}</span>
+              </span> 
+              <span>
                 <input class="competence-value" type="text" name="data.reve.tmrpos.coord" value="{{data.reve.tmrpos.coord}}" data-dtype="String"/>
+              </span> 
+              
               {{else}}
+              <span class="competence-label flex-shrink">Demi rêve :
+                {{#unless hautreve.cacheTMR}}
+                <span>{{caseTmr-label data.reve.tmrpos.coord}}</span>
+                {{/unless}}
+              </span> 
+              <span>
                 {{#if hautreve.cacheTMR}}
                 ??
                 {{else}}
-                {{caseTmr-label data.reve.tmrpos.coord}}
                 {{data.reve.tmrpos.coord}}
                 {{/if}}
-              {{/if}}
               </span>
+              {{/if}}
             </li>
             {{/if}}
             <li class="item flexrow">
@@ -426,11 +434,11 @@
       {{#if data.attributs.hautrevant.value}}
         <h3>Sorts:</h3>
         <ul class="item-list alterne-list">
-          {{#each sorts as |mysort key|}}
+          {{#each sorts as |sort key|}}
-          <li class="item list-item flexrow" data-item-id="{{mysort._id}}" data-attribute="{{key}}">
+          <li class="item list-item flexrow" data-item-id="{{sort._id}}" data-attribute="{{key}}">
-            <span class="sort-label"> <a data-id="{{mysort._id}}">{{mysort.name}}</a></span> 
+            <span class="display-label flex-grow"> <a data-item-id="{{sort._id}}">{{sort.name}}</a></span> 
-            <span>{{mysort.data.draconic}} / {{mysort.data.difficulte}}</span>
+            <span>{{sort.data.draconic}} / {{sort.data.difficulte}}</span>
-            <div class="item-controls">
+            <div class="item-controls flex-shrink">
               <a class="item-control item-delete" title="Supprimer"><i class="fas fa-trash"></i></a>
             </div>
           </li>
@@ -440,9 +448,15 @@
         <h3>Sorts en Réserve:</h3>
         <ul class="item-list alterne-list">
           {{#each hautreve.sortsReserve as |reserve key|}}
-          <li class="item list-item flexrow" data-item-id="{{mysort._id}}" data-attribute="{{key}}">
+          <li class="item list-item flexrow" data-item-id="{{reserve._id}}" data-attribute="{{key}}">
             <img class="sheet-competence-img" src="{{reserve.sort.img}}" />
-            <span class="sort-label"> {{reserve.sort.name}} - {{reserve.coord}} - {{caseTmr-label reserve.coord}} - r{{reserve.sort.data.ptreve_reel}}</span> 
+            <span class="display-label flex-grow">{{reserve.sort.name}}</span> 
+            <span class="flex-shrink">r{{reserve.sort.data.ptreve_reel}}</span> 
+            <span class="flex-shrink">{{reserve.coord}}</span> 
+            <span>{{caseTmr-label reserve.coord}}</span> 
+            <div class="item-controls flex-shrink">
+              <a class="item-control item-delete flex-shrink" title="Supprimer"><i class="fas fa-trash"></i></a>
+            </div>
           </li>
           {{/each}}
         </ul>
@@ -451,8 +465,8 @@
         <ul class="item-list">
           {{#each meditations as |meditation key|}}
           <li class="item flexrow" data-item-id="{{meditation._id}}" data-attribute="{{key}}">
-            <span class="meditation-label"><a data-id="{{meditation._id}}">{{meditation.name}} - {{meditation.data.competence}}</a></span> 
+            <span class="meditation-label flex-grow"><a data-item-id="{{meditation._id}}">{{meditation.name}} - {{meditation.data.competence}}</a></span> 
-            <div class="item-controls">
+            <div class="item-controls flex-shrink">
               <a class="item-control item-edit" title="Editer"><i class="fas fa-edit"></i></a>
               <a class="item-control item-delete" title="Supprimer"><i class="fas fa-trash"></i></a>
             </div>
@@ -466,8 +480,8 @@
         <ul class="flex-group-left">
           {{#each queues as |queue key|}}
           <li class="item flexrow" data-attribute={{key}} data-item-id="{{queue._id}}">
-            <span class="queuesouffle-label"> <a data-item-id="{{queue._id}}">{{queue.name}}</a></span>
+            <span class="display-label flex-grow"><a data-item-id="{{queue._id}}">{{queue.name}}</a></span>
-            <div class="item-controls">
+            <div class="item-controls flex-shrink">
               <a class="item-control item-delete" title="Delete Item"><i class="fas fa-trash"></i></a>
             </div>
           </li>
@@ -477,8 +491,8 @@
         <ul class="item-list">
           {{#each souffles as |souffle key|}}
           <li class="item flexrow" data-attribute={{key}} data-item-id="{{souffle._id}}">
-            <span class="queuesouffle-label"> <a data-item-id="{{souffle._id}}">{{souffle.name}}</a></span>
+            <span class="display-label flex-grow"><a data-item-id="{{souffle._id}}">{{souffle.name}}</a></span>
-            <div class="item-controls">
+            <div class="item-controls flex-shrink">
               <a class="item-control item-delete" title="Delete Item"><i class="fas fa-trash"></i></a>
             </div>
           </li>
@@ -488,8 +502,8 @@
         <ul class="item-list">
           {{#each tetes as |tete key|}}
           <li class="item flexrow" data-attribute={{key}} data-item-id="{{tete._id}}">
-            <span class="queuesouffle-label"> <a data-item-id="{{tete._id}}">{{tete.name}}</a></span>
+            <span class="display-label flex-grow"><a data-item-id="{{tete._id}}">{{tete.name}}</a></span>
-            <div class="item-controls">
+            <div class="item-controls flex-shrink">
               <a class="item-control item-delete" title="Delete Item"><i class="fas fa-trash"></i></a>
             </div>
           </li>
@@ -499,8 +513,8 @@
         <ul class="item-list">
           {{#each ombres as |ombre key|}}
           <li class="item flexrow" data-attribute={{key}} data-item-id="{{ombre._id}}">
-            <span class="queuesouffle-label"> <a data-item-id="{{ombre._id}}">{{ombre.name}}</a></span>
+            <span class="display-label flex-grow"><a data-item-id="{{ombre._id}}">{{ombre.name}}</a></span>
-            <div class="item-controls">
+            <div class="item-controls flex-shrink">
               <a class="item-control item-delete" title="Delete Item"><i class="fas fa-trash"></i></a>
             </div>
           </li>
@@ -512,8 +526,12 @@
         <ul class="item-list">
           {{#each hautreve.rencontres as |rencontre key|}}
           <li class="item flexrow" data-item-id="{{key}}" data-attribute="{{key}}">
-            <span class="case-label"><a data-id="{{key}}">{{rencontre.rencontre.name}} - {{rencontre.coord}} {{#if rencontre.rencontre.date}}({{rencontre.rencontre.date}} - {{rencontre.rencontre.heure}}){{/if}}</a></span> 
+            <span class="display-label flex-grow"><a data-item-id="{{key}}">{{rencontre.rencontre.name}} - {{rencontre.coord}}</a></span> 
-            <div class="item-controls">
+            <span class="flex-shrink">{{caseTmr-label reserve.coord}}</span> 
+            {{#if rencontre.rencontre.date}}
+            <span>({{rencontre.rencontre.date}} - {{rencontre.rencontre.heure}})</span> 
+            {{/if}}
+            <div class="item-controls flex-shrink">
               <a class="item-control rencontre-delete" title="Supprimer"><i class="fas fa-trash"></i></a>
             </div>
           </li>
@@ -523,11 +541,11 @@
         <h3>Cases Spéciales:</h3>
         <ul class="item-list">
           {{#each hautreve.casesTmr as |casetmr key|}}
-          <li class="item" data-item-id="{{casetmr._id}}" data-attribute="{{key}}">
+          <li class="item flexrow" data-item-id="{{casetmr._id}}" data-attribute="{{key}}">
-            <span class="item-controls">
+            <span class="display-label"><a data-item-id="{{casetmr._id}}">{{casetmr.name}}</a></span> 
+            <span class="item-controls flex-shrink">
               <a class="item-control item-delete" title="Supprimer"><i class="fas fa-trash"></i></a>
             </span>
-            <span class="case-label"><a data-id="{{casetmr._id}}">{{casetmr.name}}</a></span> 
           </li>
           {{/each}}
         </ul>
@@ -544,7 +562,7 @@
             <span class="competence-title competence-label">{{piece.name}}</span>
             <span class="competence-title competence-label">{{piece.data.quantite}}</span>
             <span class="competence-title"><a class="monnaie-plus">+</a><a class="monnaie-moins">-</a></span>
-            <div class="item-controls">
+            <div class="item-controls flex-shrink">
               <a class="item-control item-edit" title="Editer"><i class="fas fa-edit"></i></a>
               <a class="item-control item-delete" title="Supprimer"><i class="fas fa-trash"></i></a>
           </div>
@@ -589,7 +607,7 @@
           <li class="item flexrow list-item" data-actor-id="{{monture.id}}">
             <img class="sheet-competence-img" src="{{monture.img}}" title="{{monture.name}}"/>
             <span class="competence-title subacteur-label"><a>{{monture.name}}</a></span>
-            <div class="item-controls">
+            <div class="item-controls flex-shrink">
               <a class="item-control subacteur-delete" title="Supprimer"><i class="fas fa-trash"></i></a>
           </div>
           </li>
@@ -604,7 +622,7 @@
             <span class="competence-title subacteur-label"><a>{{vehicule.name}}</a></span>
             <span class="competence-title">{{vehicule.categorie}}</span>
             <span class="competence-title">{{vehicule.structure}}</span>
-            <div class="item-controls">
+            <div class="item-controls flex-shrink">
               <a class="item-control subacteur-delete" title="Supprimer"><i class="fas fa-trash"></i></a>
           </div>
           </li>
@@ -617,7 +635,7 @@
           <li class="item flexrow list-item" data-actor-id="{{suivant.id}}">
             <img class="sheet-competence-img" src="{{suivant.img}}" title="{{suivant.name}}"/>
             <span class="competence-title subacteur-label"><a>{{suivant.name}}</a></span>
-            <div class="item-controls">
+            <div class="item-controls flex-shrink">
               <a class="item-control subacteur-delete" title="Supprimer"><i class="fas fa-trash"></i></a>
           </div>
           </li>

templates/dialog-roll-sort.html

@@ -1,4 +1,3 @@
-{{log 'lancer de sort' this}}
 <form class="dialog-roll-sort">
   <h2>Lancer le <span class="sort-ou-rituel">{{#if sort.data.isrituel}}rituel{{else}}sort{{/if}}</span>:
     <select name="sort" class="roll-sort flex-grow" data-dtype="String">