Merge branch 'v1.4-dialogs' into 'v1.4'

V1.4 dialogs See merge request LeRatierBretonnien/foundryvtt-reve-de-dragon!210
2021-04-21 09:18:48 +00:00 · 2021-04-21 09:18:48 +00:00 · 226319b067
commit 226319b067
parent 3c793296a6 a20037698b
22 changed files with 240 additions and 277 deletions
--- a/module/actor.js
+++ b/module/actor.js
@ -2315,15 +2315,17 @@ export class RdDActor extends Actor {
  /* -------------------------------------------- */
  async _rollArt(artData, selected, oeuvre, callBackResult = r => this._resultArt(r)) {
    const actorData = Misc.data(this);
-    mergeObject(artData, {
+    mergeObject(artData,
+      {
        oeuvre: oeuvre,
        art: oeuvre.type,
-      competence: Misc.data(this.getCompetence(oeuvre.data.competence ?? artData.art)),
+        competence: duplicate(Misc.data(this.getCompetence(oeuvre.data.competence ?? artData.art))),
        diffLibre: - (oeuvre.data.niveau ?? 0),
        diffConditions: 0,
        use: { libre: false, conditions: true },
        selectedCarac: duplicate(actorData.data.carac[selected])
-    });
+      },
+      { overwrite: false });
    artData.competence.data.defaut_carac = selected;
    if (!artData.forceCarac) {
      artData.forceCarac = {};
@ -2366,13 +2368,13 @@ export class RdDActor extends Actor {
    const actorData = Misc.data(this);
    const artData = { art: 'danse', verbe: 'Danser', forceCarac: {} };
    const oeuvre = duplicate(this.getItemOfType(id, artData.art));
-    const selectedCarac = this._getCaracDanse(oeuvre);
    if (oeuvre.data.agilite) {
      artData.forceCarac['agilite'] = duplicate(actorData.data.carac.agilite);
    }
    if (oeuvre.data.apparence) {
      artData.forceCarac['apparence'] = duplicate(actorData.data.carac.apparence);
    }
+    const selectedCarac = this._getCaracDanse(oeuvre);
    await this._rollArt(artData, selectedCarac, oeuvre);
  }

@ -2434,12 +2436,21 @@ export class RdDActor extends Actor {

  /* -------------------------------------------- */
  async rollJeu(id) {
+    const actorData = Misc.data(this);
+    const oeuvre = Misc.data(this.getJeu(id));
+
+    const listCarac = oeuvre.data.caraccomp.toLowerCase().split(/[.,:\/-]/).map(it => it.trim());
+    const carac = listCarac.length > 0 ? listCarac[0] : 'chance'
    const artData = {
      art: 'jeu', verbe: 'Jeu',
      use: { libre: true, conditions: true, },
+      competence: duplicate(Misc.data(this.getCompetence('jeu'))),
+      forceCarac: {}
    };
-    const oeuvre = duplicate(this.getJeu(id));
-    await this._rollArt(artData, oeuvre.data?.caraccomp.toLowerCase() ?? 'chance', oeuvre);
+    listCarac.forEach(c => artData.forceCarac[c] = actorData.data.carac[c]);
+    artData.competence.data.niveauReel = artData.competence.data.niveau;
+    artData.competence.data.niveau = Math.max(artData.competence.data.niveau, oeuvre.data.base);
+    await this._rollArt(artData, carac, oeuvre);
  }

  async rollOeuvre(id) {
@ -2597,9 +2608,8 @@ export class RdDActor extends Actor {
      let xpComp = 0;
      if (competence) {
        xpComp = xp - xpCarac;
-        competence = duplicate(competence);
-        competence.data.xp = Misc.toInt(competence.data.xp) + xpComp;
-        await this.updateEmbeddedDocuments('Item', [competence]);
+        let update = { _id: competence.id, 'data.xp': Misc.toInt(competence.data.xp) + xpComp };
+        await this.updateEmbeddedDocuments('Item', [update]);
      } else {
        xpCarac = Math.max(xpCarac, 1);
      }
@ -3202,24 +3212,33 @@ export class RdDActor extends Actor {
  }

  /* -------------------------------------------- */
-  async effectuerTacheAlchimie(recetteId, alchimieName, alchimieData) {
-    let recette = this.getItemOfType(recetteId, 'recettealchimique');
+  async effectuerTacheAlchimie(recetteId, tacheAlchimie, texteTache) {
+    let recetteData = Misc.data(this.getItemOfType(recetteId, 'recettealchimique'));
    const actorData = Misc.data(this);
-    if (recette) {
-      let competence = Misc.data(this.getCompetence("alchimie"));
-      let diffAlchimie = RdDAlchimie.getDifficulte(alchimieData);
+    if (recetteData) {
+      if (tacheAlchimie != "couleur" && tacheAlchimie != "consistance") {
+        ui.notifications.warn(`L'étape alchimique ${tacheAlchimie} - ${texteTache} est inconnue`);
+        return;
+      }
+
+      const sansCristal = tacheAlchimie == "couleur" && this.data.items.filter(it => it.isCristalAlchimique()).length == 0;
+      const caracTache = RdDAlchimie.getCaracTache(tacheAlchimie);
+      const alchimieData = Misc.data(this.getCompetence("alchimie"));
+
      let rollData = {
-        recette: recette,
-        competence: competence,
-        diffLibre: diffAlchimie // Per default at startup
+        recette: recetteData,
+        carac: { [caracTache]: actorData.data.carac[caracTache] },
+        selectedCarac: actorData.data.carac[caracTache],
+        competence: alchimieData,
+        diffLibre: RdDAlchimie.getDifficulte(texteTache),
+        diffConditions: sansCristal ? -4 : 0,
+        alchimie: {
+          tache: Misc.upperFirst(tacheAlchimie),
+          texte: texteTache,
+          sansCristal: sansCristal
        }
-      if (alchimieName == "couleur") {
-        rollData.selectedCarac = actorData.data.carac.vue,
-          rollData.alchimieTexte = `Couleurs ${alchimieData} (${diffAlchimie}) (Malus de -4 si vous ne possédez pas de Cristal Alchimique)`;
-      } else {
-        rollData.selectedCarac = actorData.data.carac.dexterite,
-          rollData.alchimieTexte = `Consistances ${alchimieData} (${diffAlchimie})`;
      }
+      rollData.competence.data.defaut_carac = caracTache;

      const dialog = await RdDRoll.create(this, rollData,
        {
@ -3239,6 +3258,10 @@ export class RdDActor extends Actor {
    }
  }

+  isCristalAlchimique(it) {
+    return it.type == 'objet' && Grammar.toLowerCaseNoAccent(it.name) == 'cristal alchimique' && it.data.quantite > 0;
+  }
+
  /* -------------------------------------------- */
  _alchimieResult(rollData) {
    RdDResolutionTable.displayRollData(rollData, this, 'chat-resultat-alchimie.html');
--- a/module/item.js
+++ b/module/item.js
@ -34,6 +34,12 @@ export class RdDItem extends Item {
    return RdDItem.getTypeObjetsEquipement().includes(Misc.data(this).type);
  }
  
+  isCristalAlchimique() {
+    const itemData = Misc.data(this);
+    return itemData.type == 'objet' && Grammar.toLowerCaseNoAccent(itemData.name) == 'cristal alchimique' && itemData.data.quantite > 0;
+  }
+
+
  getEnc() {
    const itemData = Misc.data(this);
    switch (itemData.type) {
--- a/module/rdd-alchimie.js
+++ b/module/rdd-alchimie.js
@ -53,4 +53,13 @@ export class RdDAlchimie {
    }
    return Math.min(0, -composantes);
  }
+
+  static getCaracTache(tache) {
+    switch (tache) {
+      case "consistance": return 'dexterite';
+      case "couleur": return 'vue';
+    }
+    return 'intellect';
+  }
+
 }
--- a/module/rdd-roll.js
+++ b/module/rdd-roll.js
@ -285,7 +285,7 @@ export class RdDRoll extends Dialog {
    HtmlUtility._showControlWhen($("#ajust-astrologique"), RdDResolutionTable.isAjustementAstrologique(rollData));

    // Mise à jour valeurs
-    $("#compdialogTitle").text(this._getTitle(rollData));
+    $(".dialog-roll-title").text(this._getTitle(rollData));
    $('#coupsNonMortels').prop('checked', rollData.coupsNonMortels);
    $(".dmg-arme-actor").text(dmgText);
    $('.table-ajustement').remove();
@ -299,7 +299,7 @@ export class RdDRoll extends Dialog {

  /* -------------------------------------------- */
  async buildAjustements(rollData) {
-    const html = await renderTemplate(`systems/foundryvtt-reve-de-dragon/templates/dialog-roll-ajustements.html`, rollData);
+    const html = await renderTemplate(`systems/foundryvtt-reve-de-dragon/templates/partial-roll-ajustements.html`, rollData);
    return html;
  }

--- a/module/rdd-utility.js
+++ b/module/rdd-utility.js
@ -147,7 +147,6 @@ export class RdDUtility {
      'systems/foundryvtt-reve-de-dragon/templates/niveau-ethylisme.html',
      'systems/foundryvtt-reve-de-dragon/templates/casetmr-specific-list.html',
      // Dialogs
-      'systems/foundryvtt-reve-de-dragon/templates/dialog-roll-ajustements.html',
      'systems/foundryvtt-reve-de-dragon/templates/dialog-roll-resolution.html',
      'systems/foundryvtt-reve-de-dragon/templates/dialog-competence.html',
      'systems/foundryvtt-reve-de-dragon/templates/dialog-roll-carac.html',
@ -155,10 +154,16 @@ export class RdDUtility {
      'systems/foundryvtt-reve-de-dragon/templates/dialog-roll-encaisser.html',
      'systems/foundryvtt-reve-de-dragon/templates/dialog-roll-meditation.html',
      'systems/foundryvtt-reve-de-dragon/templates/dialog-tmr.html',
-      'systems/foundryvtt-reve-de-dragon/templates/dialog-roll-surenc.html',
-      'systems/foundryvtt-reve-de-dragon/templates/dialog-roll-enctotal.html',
      'systems/foundryvtt-reve-de-dragon/templates/dialog-roll-alchimie.html',
      'systems/foundryvtt-reve-de-dragon/templates/dialog-astrologie-joueur.html',
+      // Partials
+      'systems/foundryvtt-reve-de-dragon/templates/partial-roll-ajustements.html',
+      'systems/foundryvtt-reve-de-dragon/templates/partial-roll-diffLibre.html',
+      'systems/foundryvtt-reve-de-dragon/templates/partial-roll-diffCondition.html',
+      'systems/foundryvtt-reve-de-dragon/templates/partial-roll-surenc.html',
+      'systems/foundryvtt-reve-de-dragon/templates/partial-roll-enctotal.html',
+      'systems/foundryvtt-reve-de-dragon/templates/partial-roll-moral.html',
+      'systems/foundryvtt-reve-de-dragon/templates/partial-select-carac.html',
      // Calendrier
      'systems/foundryvtt-reve-de-dragon/templates/calendar-template.html',
      'systems/foundryvtt-reve-de-dragon/templates/calendar-editor-template.html',
--- a/styles/simple.css
+++ b/styles/simple.css
@ -528,6 +528,12 @@ section.sheet-body:after {
  text-align: left;
  width: 50px;
 }
+.select-carac {
+  display: inline-block;
+  text-align: left;
+  width: 100%;
+  max-width: 90%;
+}

 #vie-plus, #vie-moins, #endurance-plus, #endurance-moins, #fatigue-plus, #fatigue-moins, #ptreve-actuel-plus, #ptreve-actuel-moins, .monnaie-plus, .monnaie-moins {
  display: inline-block;
--- a/templates/dialog-competence.html
+++ b/templates/dialog-competence.html
@ -1,17 +1,12 @@
 <form class="skill-roll-dialog">
-<h2 class="compdialog" id="compdialogTitle"></h2>
+<h2 class="dialog-roll-title"></h2>

 <div class="grid grid-2col">
  <div class="flex-group-left">
+    <img class="chat-icon" src="{{competence.img}}" alt="{{competence.name}}"/>
    <div class="flexrow">
      <label>Caractéristique</label>
-      <select name="carac" id="carac" data-dtype="String">
-        {{#select carac}}
-        {{#each carac as |caracitem key|}}
-        <option value={{key}}>{{caracitem.label}}</option>
-        {{/each}}
-        {{/select}}
-      </select>
+      {{>"systems/foundryvtt-reve-de-dragon/templates/partial-select-carac.html"}}
    </div>
    {{#if arme}}
    {{#if attackerRoll}}
@ -63,47 +58,22 @@
      {{/unless}}
    {{/if}}    

-    {{>"systems/foundryvtt-reve-de-dragon/templates/dialog-roll-surenc.html"}}
-    {{>"systems/foundryvtt-reve-de-dragon/templates/dialog-roll-enctotal.html"}}
+    {{>"systems/foundryvtt-reve-de-dragon/templates/partial-roll-surenc.html"}}
+    {{>"systems/foundryvtt-reve-de-dragon/templates/partial-roll-enctotal.html"}}
  </div>
  
  <div class="flex-group-left">
-    <div class="flexrow">
    {{#if attackerRoll}}
+    <div class="flexrow">
      <label>Difficulté</label>
      <label>{{diffLibre}}</label>
+    </div>
    {{else}}
-      <label>Difficulté libre</label>
-      <select name="diffLibre" id="diffLibre" data-dtype="number" {{#unless use.libre}}disabled{{/unless}}>
-        {{#select diffLibre}}
-        {{#each difficultesLibres as |key|}}
-        <option value={{key}}>{{numberFormat key decimals=0 sign=true}}</option>
-        {{/each}}
-        {{/select}}
-      </select>
+      {{>"systems/foundryvtt-reve-de-dragon/templates/partial-roll-diffLibre.html"}}
    {{/if}}
-    </div>
-    <div class="flexrow">
-    </div>
-    <div class="flexrow">
-      <label>Conditions</label>
-      <select name="diffConditions" id="diffConditions" data-dtype="number" {{#unless use.conditions}}disabled{{/unless}}>
-          {{#select diffConditions}}
-          {{#each ajustementsConditions  as |key|}}
-          <option value={{key}}>{{numberFormat key decimals=0 sign=true}}</option>
-          {{/each}}
-          {{/select}}
-      </select>
-    </div>
-    <div class="flexrow">
-      <label class="diffMoral">Moral: {{#if (gt moral 0)}}+{{/if}}{{moral}}</label>
-      <div class="tooltipAppelAuMoral divAppelAuMoral">
-        <img class="imgAppelAuMoral small-button-container" src="/systems/foundryvtt-reve-de-dragon/icons/moral-neutre.svg">
-        <span class="tooltipAppelAuMoralText">Sans appel au moral</span>
-      </div>
-    </div>
-    <div id="tableAjustements" class="flexrow">
-    </div>
+    {{>"systems/foundryvtt-reve-de-dragon/templates/partial-roll-diffCondition.html"}}
+    {{>"systems/foundryvtt-reve-de-dragon/templates/partial-roll-moral.html"}}
+    <div id="tableAjustements" class="flexrow"></div>
  </div>
 </div>

--- a/templates/dialog-roll-alchimie.html
+++ b/templates/dialog-roll-alchimie.html
@ -1,41 +1,34 @@
+{{log 'recette alchimique' this}}
 <form class="rdddialog">
-<div class="form-group">
-  <ul>
-    <li><label>Recette : {{recetteName}}</label></li>
-    <li><label>Tâche Alchimique : {{alchimieTexte}}</label></li>
-    <li><label>Jet : {{selectedCarac.label}} / {{competence.name}}</label></li>
-  </ul>
-  <div class="tooltipAppelAuMoral divAppelAuMoral">
-    <img class="imgAppelAuMoral small-button-container" src="/systems/foundryvtt-reve-de-dragon/icons/moral-neutre.svg">
-    <span class="tooltipAppelAuMoralText">Sans appel au moral</span>
+  <h2>Fabrication: {{recette.name}}</h2>
+  <div class="grid grid-2col">
+    <div class="flex-group-left">
+      <img class="chat-icon" src="{{competence.img}}" alt="{{competence.name}}"/>
+      <div class="grid grid-2col">
+        <label>{{alchimie.tache}}:</label><label class="flex-grow">{{alchimie.texte}}</label>
+        <label>Caractéristique: </label><label class="flex-grow">{{selectedCarac.label}}</label>
+        <label>{{competence.name}}:</label><label class="flex-grow">{{numberFormat competence.data.niveau decimals=0 sign=true}}</label></label>
      </div>
    </div>
-
-<div class="form-group">
-  <label>conditions</label>
-  <select name="diffConditions" id="diffConditions" data-dtype="number">
-      {{#select diffConditions}}
-      {{#each ajustementsConditions as |key|}}
-      <option value={{key}}>{{numberFormat key decimals=0 sign=true}}</option>
-      {{/each}}
-      {{/select}}
-  </select>
+    <div class="flex-group-left">
+      <div class="flexrow">
        <label>Difficulté</label>
-  <select name="diffLibre" id="diffLibre" data-dtype="number">
-    {{#select diffLibre}}
-    {{#each difficultesLibres  as |key|}}
-    <option value={{key}}>{{numberFormat key decimals=0 sign=true}}</option>
-    {{/each}}
-  {{/select}}
-  </select>
+        <label>{{numberFormat diffLibre decimals=0 sign=true}}</label>
+      </div>
+      {{>"systems/foundryvtt-reve-de-dragon/templates/partial-roll-diffCondition.html"}}
+      {{#if alchimie.sansCristal}}
+      <div class="flexrow">
+        <label></label>
+        <label>(-4 sans Cristal Alchimique)</label>
+      </div>
+      {{/if}}
+      {{>"systems/foundryvtt-reve-de-dragon/templates/partial-roll-moral.html"}}
+      <div id="tableAjustements" class="flexrow"></div>
+    </div>
  </div>

-<div id="tableAjustements">
-</div>
-<div id="tableResolution">
-</div>
-<div id="tableProbaReussite">  
-</div>
+  <div id="tableResolution"></div>
+  <div id="tableProbaReussite"></div>
 </form>

 <script>
--- a/templates/dialog-roll-carac.html
+++ b/templates/dialog-roll-carac.html
@ -1,32 +1,20 @@
 <form class="skill-roll-dialog">
-  <h2 class="compdialog" id="compdialogTitle"></h2>
-  <div class="form-group">
-    <label>Difficulté libre</label>
-    <select name="diffLibre" id="diffLibre" data-dtype="number">
-      {{#select diffLibre}}
-      {{#each difficultesLibres as |key|}}
-      <option value={{key}}>{{numberFormat key decimals=0 sign=true}}</option>
-      {{/each}}
-      {{/select}}
-    </select>
-    <label>conditions</label>
-    <select name="diffConditions" id="diffConditions" data-dtype="number">
-      {{#select diffConditions}}
-      {{#each ajustementsConditions as |key|}}
-      <option value={{key}}>{{numberFormat key decimals=0 sign=true}}</option>
-      {{/each}}
-      {{/select}}
-    </select>
-    <label class="diffMoral">Moral: {{#if (gt moral 0)}}+{{/if}}{{moral}}</label>
-    <div class="tooltipAppelAuMoral divAppelAuMoral">
-      <img class="imgAppelAuMoral small-button-container"
-        src="/systems/foundryvtt-reve-de-dragon/icons/moral-neutre.svg">
-      <span class="tooltipAppelAuMoralText">Sans appel au moral</span>
+  <h2 class="dialog-roll-title"></h2>
+
+  <div class="grid grid-2col">
+    <div class="flex-group-left">
+      <div class="flexrow">
+      </div>
+      {{>"systems/foundryvtt-reve-de-dragon/templates/partial-roll-surenc.html"}}
+    </div>
+    <div class="flex-group-left">
+      {{>"systems/foundryvtt-reve-de-dragon/templates/partial-roll-diffLibre.html"}}
+      {{>"systems/foundryvtt-reve-de-dragon/templates/partial-roll-diffCondition.html"}}
+      {{>"systems/foundryvtt-reve-de-dragon/templates/partial-roll-moral.html"}}
+      <div id="tableAjustements" class="flexrow"></div>
    </div>
  </div>  
-  {{>"systems/foundryvtt-reve-de-dragon/templates/dialog-roll-surenc.html"}}
-  <div id="tableAjustements">
-  </div>
+  
  <div id="tableResolution">
  </div>
  <div id="tableProbaReussite">
--- a/templates/dialog-roll-chant.html
+++ b/templates/dialog-roll-chant.html
@ -1,36 +1,26 @@
 <form class="rdddialog">
-<div class="form-group">
-  <ul>
-    <li><label>Chant : {{oeuvre.name}}</label></li>
-    <li><label>Jet : OUIE / {{competence.name}}</label></li>
-  </ul>
-  <div class="tooltipAppelAuMoral divAppelAuMoral">
-    <img class="imgAppelAuMoral small-button-container" src="/systems/foundryvtt-reve-de-dragon/icons/moral-neutre.svg">
-    <span class="tooltipAppelAuMoralText">Sans appel au moral</span>
-  </div>
-</div> 
+<h2>Chanter: {{oeuvre.name}}</h2>

-<div class="form-group">
-  <label>conditions</label>
-  <select name="diffConditions" id="diffConditions" data-dtype="number">
-      {{#select diffConditions}}
-      {{#each ajustementsConditions as |key|}}
-      <option value={{key}}>{{numberFormat key decimals=0 sign=true}}</option>
-      {{/each}}
-      {{/select}}
-  </select>
+<div class="grid grid-2col">
+  <div class="flex-group-left">
+    <img class="chat-icon" src="{{competence.img}}" alt="{{competence.name}}"/>
+    <div class="grid grid-2col">
+      <label>Caractéristique: </label><label class="flex-grow">{{selectedCarac.label}}</label>
+      <label>{{competence.name}}:</label><label class="flex-grow">{{numberFormat competence.data.niveau decimals=0 sign=true}}</label></label>
+    </div>
+    {{> "systems/foundryvtt-reve-de-dragon/templates/chat-poesie.html" oeuvre.data}}
+  </div>
+  <div class="flex-group-left">
+    <div class="flexrow">
      <label>Difficulté</label>
-  <select name="diffLibre" id="diffLibre" data-dtype="number">
-    {{#select diffLibre}}
-    {{#each difficultesLibres  as |key|}}
-    <option value={{key}}>{{numberFormat key decimals=0 sign=true}}</option>
-    {{/each}}
-  {{/select}}
-  </select>
+      <label>{{numberFormat diffLibre decimals=0 sign=true}}</label>
+    </div>
+    {{>"systems/foundryvtt-reve-de-dragon/templates/partial-roll-diffCondition.html"}}
+    {{>"systems/foundryvtt-reve-de-dragon/templates/partial-roll-moral.html"}}
+    <div id="tableAjustements" class="flexrow"></div>
+  </div>
 </div>

-<div id="tableAjustements">
-</div>
 <div id="tableResolution">
 </div>
 <div id="tableProbaReussite">  
--- a/templates/dialog-roll-danse.html
+++ b/templates/dialog-roll-danse.html
@ -1,47 +1,26 @@
 <form class="dialog-roll-danse">
-  <div class="form-group">
-    <ul>
-      <li><label>Danse : {{oeuvre.name}}</label></li>
-      <li><label>Jet : APPARENCE ou AGILITE / {{competence.name}}</label></li>
-    </ul>
-  </div>
+  <h2>Danser: {{oeuvre.name}}</h2>

-  <div class="form-group">
-    <label>Caractéristique</label>
-    <select name="carac" id="carac" class="select-diff" data-dtype="String">
-      {{#select carac}}
-      {{#each carac as |caracitem key|}}
-      <option value={{key}}>{{caracitem.label}}</option>
-      {{/each}}
-      {{/select}}
-    </select>
-    <div class="tooltipAppelAuMoral divAppelAuMoral">
-      <img class="imgAppelAuMoral small-button-container" src="/systems/foundryvtt-reve-de-dragon/icons/moral-neutre.svg">
-      <span class="tooltipAppelAuMoralText">Sans appel au moral</span>
+  <div class="grid grid-2col">
+    <div class="flex-group-left">
+      <img class="chat-icon" src="{{competence.img}}" alt="{{competence.name}}"/>
+      <div class="grid grid-2col">
+        <label for="carac">Caractéristique:</label>{{>"systems/foundryvtt-reve-de-dragon/templates/partial-select-carac.html"}}
+        <label>{{competence.name}}:</label><label class="flex-grow">{{numberFormat competence.data.niveau decimals=0 sign=true}}</label></label>
      </div>
+      {{> "systems/foundryvtt-reve-de-dragon/templates/chat-poesie.html" oeuvre.data}}
    </div>
-
-  <div class="form-group">
-    <label>conditions</label>
-    <select name="diffConditions" id="diffConditions" data-dtype="number">
-      {{#select diffConditions}}
-      {{#each ajustementsConditions as |key|}}
-      <option value={{key}}>{{numberFormat key decimals=0 sign=true}}</option>
-      {{/each}}
-      {{/select}}
-    </select>
+    <div class="flex-group-left">
+      <div class="flexrow">
        <label>Difficulté</label>
-    <select name="diffLibre" id="diffLibre" data-dtype="number">
-      {{#select diffLibre}}
-      {{#each difficultesLibres as |key|}}
-      <option value={{key}}>{{numberFormat key decimals=0 sign=true}}</option>
-      {{/each}}
-      {{/select}}
-    </select>
+        <label>{{numberFormat diffLibre decimals=0 sign=true}}</label>
+      </div>
+      {{>"systems/foundryvtt-reve-de-dragon/templates/partial-roll-diffCondition.html"}}
+      {{>"systems/foundryvtt-reve-de-dragon/templates/partial-roll-moral.html"}}
+      <div id="tableAjustements" class="flexrow"></div>
+    </div>
  </div>

-  <div id="tableAjustements">
-  </div>
  <div id="tableResolution">
  </div>
  <div id="tableProbaReussite">
--- a/templates/dialog-roll-jeu.html
+++ b/templates/dialog-roll-jeu.html
@ -1,47 +1,25 @@
 <form class="rdddialog">
-  <div class="form-group">
-    <ul>
-      <li><label for="competence-label">Jouer à : {{oeuvre.name}}</label></li>
-      <li><label for="competence-label">Type : {{oeuvre.data.type}}</label></li>
-      <li><label for="competence-label">Base : {{oeuvre.data.base}}</label></li>
-      <li><label for="competence-label">Carac/Compétence : {{oeuvre.data.caraccomp}}</label></li>
-    </ul>
-  </div>
-  <div class="form-group">
-    <label>Caractéristique</label>
-    <select name="carac" id="carac" class="select-diff" data-dtype="String">
-      {{#select carac}}
-      {{#each carac as |caracitem key|}}
-      <option value={{key}}>{{caracitem.label}}</option>
-      {{/each}}
-      {{/select}}
-    </select>
-    <div class="tooltipAppelAuMoral divAppelAuMoral">
-      <img class="imgAppelAuMoral small-button-container" src="/systems/foundryvtt-reve-de-dragon/icons/moral-neutre.svg">
-      <span class="tooltipAppelAuMoralText">Sans appel au moral</span>
-    </div>
-  </div>
-  <div class="form-group">
-    <label>Conditions</label>
-    <select name="diffConditions" id="diffConditions" data-dtype="number">
-      {{#select diffConditions}}
-      {{#each ajustementsConditions as |key|}}
-      <option value={{key}}>{{numberFormat key decimals=0 sign=true}}</option>
-      {{/each}}
-      {{/select}}
-    </select>
-    <label>Difficulté </label>
-    <select name="diffLibre" id="diffLibre" data-dtype="number">
-      {{#select diffLibre}}
-      {{#each difficultesLibres as |key|}}
-      <option value={{key}}>{{numberFormat key decimals=0 sign=true}}</option>
-      {{/each}}
-      {{/select}}
-    </select>
-  </div>
+  <h2>Jouer à : {{oeuvre.name}}</h2>

-  <div id="tableAjustements">
+  <div class="grid grid-2col">
+    <div class="flex-group-left">
+      <img class="chat-icon" src="{{competence.img}}" alt="{{competence.name}}"/>
+      <div class="grid grid-2col">
+        <label>Type:</label><label class="flex-grow">{{oeuvre.data.type}}</label>
+        <label for="carac">Caractéristique:</label>{{>"systems/foundryvtt-reve-de-dragon/templates/partial-select-carac.html"}}
+        <label>{{competence.name}}:</label><label class="flex-grow">{{numberFormat competence.data.niveauReel decimals=0 sign=true}}</label></label>
+        <label>Niveau de base:</label><label class="flex-grow">{{oeuvre.data.base}}</label>
      </div>
+    </div>
+    <div class="flex-group-left">
+      {{>"systems/foundryvtt-reve-de-dragon/templates/partial-roll-diffLibre.html"}}
+      {{>"systems/foundryvtt-reve-de-dragon/templates/partial-roll-diffCondition.html"}}
+      {{>"systems/foundryvtt-reve-de-dragon/templates/partial-roll-moral.html"}}
+      <div id="tableAjustements" class="flexrow"></div>
+    </div>
+  </div>
+  {{> "systems/foundryvtt-reve-de-dragon/templates/chat-poesie.html" oeuvre.data}}
+
  <div id="tableResolution">
  </div>
  <div id="tableProbaReussite">
--- a/templates/dialog-roll-maitrise-tmr.html
+++ b/templates/dialog-roll-maitrise-tmr.html
@ -14,7 +14,7 @@
      </select>
    </span>
  </div>
-  {{>"systems/foundryvtt-reve-de-dragon/templates/dialog-roll-surenc.html"}}
+  {{>"systems/foundryvtt-reve-de-dragon/templates/partial-roll-surenc.html"}}
  <div id="tableAjustements">
  </div>
  <div id="tableResolution">
--- a/templates/dialog-roll-resolution.html
+++ b/templates/dialog-roll-resolution.html
@ -1,29 +1,11 @@
 <form class="resolution-roll-dialog">
-<div class="flexrow flex-group-left">
+<div class="grid grid-4col">
+  <div class="flexrow">
    <label>Caractéristique</label>
-  <select name="carac" id="carac" class="select-diff" data-dtype="String">
-      {{#select carac}}
-      {{#each carac as |caracitem key|}}
-      <option value={{key}}>{{caracitem.label}}</option>
-      {{/each}}
-      {{/select}}
-  </select>
-  <label>Difficulté libre</label>
-  <select name="diffLibre" id="diffLibre" class="select-diff" data-dtype="number">
-    {{#select diffLibre}}
-    {{#each difficultesLibres as |key|}}
-    <option value={{key}}>{{numberFormat key decimals=0 sign=true}}</option>
-    {{/each}}
-    {{/select}}
-  </select>
-  <label>&nbsp;&nbsp;Conditions</label>
-  <select name="diffConditions" id="diffConditions" class="select-diff" data-dtype="number">
-    {{#select diffConditions}}
-    {{#each ajustementsConditions as |key|}}
-    <option value={{key}}>{{numberFormat key decimals=0 sign=true}}</option>
-    {{/each}}
-    {{/select}}
-  </select>
+    {{>"systems/foundryvtt-reve-de-dragon/templates/partial-select-carac.html"}}
+  </div>
+  {{>"systems/foundryvtt-reve-de-dragon/templates/partial-roll-diffLibre.html"}}
+  {{>"systems/foundryvtt-reve-de-dragon/templates/partial-roll-diffCondition.html"}}
  <button id="lancer" type="button">Lancer les dés</button>
 </div>
 <div id="tableResolution">  
--- a/templates/dialog-roll-reve-de-dragon.html
+++ b/templates/dialog-roll-reve-de-dragon.html
@ -1,5 +1,5 @@
 <form class="skill-roll-dialog">
-  <h2 class="compdialog">Rêve de Dragon de force {{rencontre.force}}!</h2>
+  <h2>Rêve de Dragon de force {{rencontre.force}}!</h2>
  <div class="form-group">
  </div>
  <div id="tableAjustements"></div>
--- a/templates/partial-roll-ajustements.html
+++ b/templates/partial-roll-ajustements.html
--- a/templates/partial-roll-diffCondition.html
+++ b/templates/partial-roll-diffCondition.html
@ -0,0 +1,10 @@
+<div class="flexrow">
+  <label for="diffConditions">Conditions</label>
+  <select name="diffConditions" id="diffConditions" data-dtype="number" {{#unless use.conditions}}disabled{{/unless}}>
+      {{#select diffConditions}}
+      {{#each ajustementsConditions  as |key|}}
+      <option value={{key}}>{{numberFormat key decimals=0 sign=true}}</option>
+      {{/each}}
+      {{/select}}
+  </select>
+</div>
--- a/templates/partial-roll-diffLibre.html
+++ b/templates/partial-roll-diffLibre.html
@ -0,0 +1,10 @@
+<div class="flexrow">
+  <label for="diffLibre">Difficulté libre</label>
+  <select name="diffLibre" id="diffLibre" data-dtype="number" {{#unless use.libre}}disabled{{/unless}}>
+    {{#select diffLibre}}
+    {{#each difficultesLibres as |key|}}
+    <option value={{key}}>{{numberFormat key decimals=0 sign=true}}</option>
+    {{/each}}
+    {{/select}}
+  </select>
+</div>
--- a/templates/partial-roll-enctotal.html
+++ b/templates/partial-roll-enctotal.html
--- a/templates/partial-roll-moral.html
+++ b/templates/partial-roll-moral.html
@ -0,0 +1,7 @@
+<div class="flexrow">
+  <label class="diffMoral">Moral: {{#if (gt moral 0)}}+{{/if}}{{moral}}</label>
+  <div class="tooltipAppelAuMoral divAppelAuMoral">
+    <img class="imgAppelAuMoral small-button-container" src="/systems/foundryvtt-reve-de-dragon/icons/moral-neutre.svg">
+    <span class="tooltipAppelAuMoralText">Sans appel au moral</span>
+  </div>
+</div>
--- a/templates/partial-roll-surenc.html
+++ b/templates/partial-roll-surenc.html
--- a/templates/partial-select-carac.html
+++ b/templates/partial-select-carac.html
@ -0,0 +1,7 @@
+<select name="carac" id="carac" class="flex-grow select-carac" data-dtype="String">
+  {{#select carac}}
+  {{#each carac as |caracitem key|}}
+  <option value={{key}}>{{caracitem.label}}</option>
+  {{/each}}
+  {{/select}}
+</select>