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

Présentation des fenêtre de dialogue

See merge request LeRatierBretonnien/foundryvtt-reve-de-dragon!211
This commit is contained in:
Leratier Bretonnien 2021-04-21 21:20:48 +00:00
commit 3646fd2033
21 changed files with 378 additions and 437 deletions

View File

@ -1590,7 +1590,8 @@ export class RdDActor extends Actor {
etat: this.getEtatGeneral({ ethylisme: true }), etat: this.getEtatGeneral({ ethylisme: true }),
diffNbDoses: -Number(actorData.data.compteurs.ethylisme.nb_doses || 0), diffNbDoses: -Number(actorData.data.compteurs.ethylisme.nb_doses || 0),
finalLevel: 0, finalLevel: 0,
diffConditions: 0 diffConditions: 0,
ajustementsForce: CONFIG.RDD.difficultesLibres,
} }
let html = await renderTemplate('systems/foundryvtt-reve-de-dragon/templates/dialog-roll-ethylisme.html', rollData); let html = await renderTemplate('systems/foundryvtt-reve-de-dragon/templates/dialog-roll-ethylisme.html', rollData);
new RdDRollDialogEthylisme(html, rollData, this, r => this.performEthylisme(r)).render(true); new RdDRollDialogEthylisme(html, rollData, this, r => this.performEthylisme(r)).render(true);
@ -2334,10 +2335,14 @@ export class RdDActor extends Actor {
console.log("rollArt !!!", artData); console.log("rollArt !!!", artData);
const dialog = await RdDRoll.create(this, artData, { html: `systems/foundryvtt-reve-de-dragon/templates/dialog-roll-${artData.art}.html` }, { const dialog = await RdDRoll.create(this, artData,
{
html: `systems/foundryvtt-reve-de-dragon/templates/dialog-roll-${oeuvre.type}.html`,
options: { height: 500, }
},
{
name: `jet-${artData.art}`, name: `jet-${artData.art}`,
label: `${artData.verbe} ${oeuvre.name}`, label: `${artData.verbe} ${oeuvre.name}`,
height: 600,
callbacks: [ callbacks: [
this.createCallbackExperience(), this.createCallbackExperience(),
this.createCallbackAppelAuMoral(), this.createCallbackAppelAuMoral(),
@ -2395,13 +2400,13 @@ export class RdDActor extends Actor {
/* -------------------------------------------- */ /* -------------------------------------------- */
async rollRecetteCuisine(id) { async rollRecetteCuisine(id) {
const oeuvre = Misc.data(this.getRecetteCuisine(id));
const artData = { const artData = {
art: 'cuisine', art: 'cuisine',
verbe: 'Cuisiner', verbe: 'Cuisiner',
proportions: 1, proportions: 1,
ajouterEquipement: false ajouterEquipement: false
}; };
const oeuvre = Misc.data(this.getRecetteCuisine(id));
await this._rollArt(artData, 'odoratgout', oeuvre, r => this._resultRecetteCuisine(r)); await this._rollArt(artData, 'odoratgout', oeuvre, r => this._resultRecetteCuisine(r));
} }
@ -2481,10 +2486,14 @@ export class RdDActor extends Actor {
console.log("rollMeditation !!!", meditationData); console.log("rollMeditation !!!", meditationData);
const dialog = await RdDRoll.create(this, meditationData, { html: 'systems/foundryvtt-reve-de-dragon/templates/dialog-roll-meditation.html' }, { const dialog = await RdDRoll.create(this, meditationData,
{
html: 'systems/foundryvtt-reve-de-dragon/templates/dialog-roll-meditation.html',
options: { height: 575, }
},
{
name: 'jet-meditation', name: 'jet-meditation',
label: 'Jet de Meditation ' + meditation.name, label: "Jet de méditation",
height: 600,
callbacks: [ callbacks: [
this.createCallbackExperience(), this.createCallbackExperience(),
{ condition: r => r.rolled.isETotal, action: r => this._meditationETotal(r) }, { condition: r => r.rolled.isETotal, action: r => this._meditationETotal(r) },

View File

@ -16,7 +16,7 @@ export class RdDRollDialogEthylisme extends Dialog {
default: "rollButton", default: "rollButton",
buttons: { "rollButton": { label: "Test d'éthylisme", callback: html => this.onButton(html) } } buttons: { "rollButton": { label: "Test d'éthylisme", callback: html => this.onButton(html) } }
}; };
let dialogOptions = { classes: ["rdddialog"], width: 400, height: 220, 'z-index': 99999 } let dialogOptions = { classes: ["rdddialog"], width: 400, height: 270, 'z-index': 99999 }
super(dialogConf, dialogOptions) super(dialogConf, dialogOptions)
//console.log("ETH", rollData); //console.log("ETH", rollData);
@ -36,28 +36,27 @@ export class RdDRollDialogEthylisme extends Dialog {
this.bringToTop(); // Ensure top level this.bringToTop(); // Ensure top level
// Get the rollData stuff // Get the rollData stuff
var rollData = this.rollData; var rollData = this.rollData;
var dialog = this;
function updateRollResult(rollData) {
rollData.finalLevel = Number(rollData.etat) + Number(rollData.forceAlcool) + rollData.diffNbDoses;
// Mise à jour valeurs
$("#roll-param").text(rollData.vieValue + " / " + Misc.toSignedString(rollData.finalLevel));
$(".table-resolution").remove();
$("#resolutionTable").append(RdDResolutionTable.buildHTMLTableExtract(rollData.vieValue, rollData.finalLevel));
}
// Setup everything onload // Setup everything onload
$(function () { $(function () {
$("#forceAlcool").val(Misc.toInt(rollData.forceAlcool)); $("#forceAlcool").val(Misc.toInt(rollData.forceAlcool));
updateRollResult(rollData); dialog.updateRollResult();
}); });
// Update ! // Update !
html.find('#forceAlcool').change((event) => { html.find('#forceAlcool').change((event) => {
rollData.forceAlcool = Misc.toInt(event.currentTarget.value); // Update the selected bonus/malus rollData.forceAlcool = Misc.toInt(event.currentTarget.value); // Update the selected bonus/malus
updateRollResult(rollData); dialog.updateRollResult();
}); });
} }
async updateRollResult() {
this.rollData.finalLevel = Number(this.rollData.etat) + Number(this.rollData.forceAlcool) + this.rollData.diffNbDoses;
// Mise à jour valeurs
$("#roll-param").text(this.rollData.vieValue + " / " + Misc.toSignedString(this.rollData.finalLevel));
$(".table-resolution").remove();
}
} }

View File

@ -655,7 +655,7 @@ export class RdDTMRDialog extends Dialog {
const dialog = await RdDRoll.create(this.actor, rollData, const dialog = await RdDRoll.create(this.actor, rollData,
{ {
html: 'systems/foundryvtt-reve-de-dragon/templates/dialog-roll-maitrise-tmr.html', html: 'systems/foundryvtt-reve-de-dragon/templates/dialog-roll-maitrise-tmr.html',
options: { height: 350 }, options: { height: 420 },
close: html => { this.maximize(); } // Re-display TMR close: html => { this.maximize(); } // Re-display TMR
}, },
{ {

View File

@ -1292,6 +1292,9 @@ display: inline-flex;
.tooltip { .tooltip {
position: relative; position: relative;
display: inline-block; display: inline-block;
}
.tooltip-dotted {
border-bottom: 1px dotted black; /* If you want dots under the hoverable text */ border-bottom: 1px dotted black; /* If you want dots under the hoverable text */
} }
@ -1332,9 +1335,16 @@ display: inline-flex;
padding: 3px 0; padding: 3px 0;
} }
.tooltip-nobottom { .tooltip .ttt-titre {
border-bottom: unset; /* If you want dots under the hoverable text */ text-align: justify;
width: 100%;
top: 30px;
background: rgba(220,220,210,0.95);
border-radius: 6px;
font-size: 0.9rem;
padding: 3px;
} }
.tooltip .ttt-xp { .tooltip .ttt-xp {
width: 250px; width: 250px;
background: rgba(220,220,210,0.95); background: rgba(220,220,210,0.95);

View File

@ -6,7 +6,7 @@
{{/if}} {{/if}}
<img class="sheet-competence-img" src="{{img}}" /> <img class="sheet-competence-img" src="{{img}}" />
{{#if data.isLevelUp}} {{#if data.isLevelUp}}
<span class="competence-label tooltip tooltip-nobottom"> <span class="competence-label tooltip">
<span class="tooltiptext ttt-xp"> <span class="tooltiptext ttt-xp">
Vous pouvez dépenser {{data.xpNext}} points d'Experience pour augmenter de 1 votre compétence {{name}} Vous pouvez dépenser {{data.xpNext}} points d'Experience pour augmenter de 1 votre compétence {{name}}
</span> </span>

View File

@ -66,7 +66,7 @@
{{/if}} {{/if}}
</div> </div>
<div class="flexrow"> <div class="flexrow">
<span class="tooltip">Malus de fatigue : {{calc.fatigue.malus}} <span class="tooltip tooltip-dotted">Malus de fatigue : {{calc.fatigue.malus}}
<span class="tooltiptext ttt-fatigue">{{{calc.fatigue.html}}}</span> <span class="tooltiptext ttt-fatigue">{{{calc.fatigue.html}}}</span>
</span> </span>
<span>{{calc.resumeBlessures}}</span> <span>{{calc.resumeBlessures}}</span>
@ -134,13 +134,13 @@
<label class="carac-xp flexrow"/> <label class="carac-xp flexrow"/>
{{else}} {{else}}
{{#if carac.isLevelUp}} {{#if carac.isLevelUp}}
<span class="carac-label flexrow tooltip tooltip-nobottom" name="data.carac.{{key}}.label"> <span class="carac-label flexrow tooltip" name="data.carac.{{key}}.label">
<span class="tooltiptext ttt-xp"> <span class="tooltiptext ttt-xp">
Vous pouvez dépenser {{carac.xpNext}} points d'Experience pour augmenter de 1 votre caractéristique {{carac.label}} Vous pouvez dépenser {{carac.xpNext}} points d'Experience pour augmenter de 1 votre caractéristique {{carac.label}}
</span> </span>
<a name={{key}}>{{carac.label}}</a></span> <a name={{key}}>{{carac.label}}</a></span>
{{else}} {{else}}
<span class="carac-label flexrow tooltip tooltip-nobottom" name="data.carac.{{key}}.label"><a name={{key}}>{{carac.label}}</a></span> <span class="carac-label flexrow tooltip" name="data.carac.{{key}}.label"><a name={{key}}>{{carac.label}}</a></span>
{{/if}} {{/if}}
<input class="carac-value flexrow" type="text" name="data.carac.{{key}}.value" value="{{carac.value}}" data-dtype="{{carac.type}}" {{#unless @root.options.editCaracComp}}disabled{{/unless}} /> <input class="carac-value flexrow" type="text" name="data.carac.{{key}}.value" value="{{carac.value}}" data-dtype="{{carac.type}}" {{#unless @root.options.editCaracComp}}disabled{{/unless}} />
<input class="carac-xp flexrow" type="text" name="data.carac.{{key}}.xp" value="{{carac.xp}}" data-dtype="number" {{#unless @root.options.editCaracComp}}disabled{{/unless}} /> <input class="carac-xp flexrow" type="text" name="data.carac.{{key}}.xp" value="{{carac.xp}}" data-dtype="number" {{#unless @root.options.editCaracComp}}disabled{{/unless}} />

View File

@ -1,5 +1,5 @@
<div> <div>
<span {{#if ajustements}}class="tooltip" {{/if}}> <span {{#if ajustements}}class="tooltip tooltip-dotted" {{/if}}>
{{rolled.caracValue}} à {{numberFormat rolled.finalLevel decimals=0 sign=true}} {{rolled.caracValue}} à {{numberFormat rolled.finalLevel decimals=0 sign=true}}
{{#if ajustements}} {{#if ajustements}}
<div class="tooltiptext ttt-ajustements"> <div class="tooltiptext ttt-ajustements">

View File

@ -1,7 +1,7 @@
<form class="skill-roll-dialog"> <form class="skill-roll-dialog">
<h2 class="dialog-roll-title"></h2> <h2 class="dialog-roll-title"></h2>
<div class="grid grid-2col"> <div class="grid grid-2col">
<div class="flex-group-left"> <div class="flex-group-left">
<img class="chat-icon" src="{{competence.img}}" alt="{{competence.name}}"/> <img class="chat-icon" src="{{competence.img}}" alt="{{competence.name}}"/>
<div class="flexrow"> <div class="flexrow">
@ -18,7 +18,7 @@
{{else}} {{else}}
<div class="flexrow"> <div class="flexrow">
<label>Tactique:</label> <label>Tactique:</label>
<span class="tooltip"> <span class="tooltip tooltip-dotted">
<select class="select-by-name" name="tactique" id="tactique-combat" data-dtype="String" {{#unless use.conditions}}disabled{{/unless}}> <select class="select-by-name" name="tactique" id="tactique-combat" data-dtype="String" {{#unless use.conditions}}disabled{{/unless}}>
<option value="Attaque normale">Attaque normale</option> <option value="Attaque normale">Attaque normale</option>
<option value="charge">Charge</option> <option value="charge">Charge</option>
@ -75,13 +75,10 @@
{{>"systems/foundryvtt-reve-de-dragon/templates/partial-roll-moral.html"}} {{>"systems/foundryvtt-reve-de-dragon/templates/partial-roll-moral.html"}}
<div id="tableAjustements" class="flexrow"></div> <div id="tableAjustements" class="flexrow"></div>
</div> </div>
</div> </div>
<div id="tableResolution">
</div>
<div id="tableProbaReussite">
</div>
<div id="tableResolution"></div>
<div id="tableProbaReussite"></div>
</form> </form>
<script> <script>

View File

@ -1,4 +1,3 @@
{{log 'recette alchimique' this}}
<form class="rdddialog"> <form class="rdddialog">
<h2>Fabrication: {{recette.name}}</h2> <h2>Fabrication: {{recette.name}}</h2>
<div class="grid grid-2col"> <div class="grid grid-2col">

View File

@ -1,9 +1,9 @@
<form class="rdddialog"> <form class="rdddialog">
<h2>Chanter: {{oeuvre.name}}</h2> <h2>Chanter: {{oeuvre.name}}</h2>
<div class="grid grid-2col"> <div class="grid grid-2col">
<div class="flex-group-left"> <div class="flex-group-left">
<img class="chat-icon" src="{{competence.img}}" alt="{{competence.name}}"/> <img class="chat-icon" src="{{competence.img}}" alt="{{competence.name}}" />
<div class="grid grid-2col"> <div class="grid grid-2col">
<label>Caractéristique: </label><label class="flex-grow">{{selectedCarac.label}}</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> <label>{{competence.name}}:</label><label class="flex-grow">{{numberFormat competence.data.niveau decimals=0 sign=true}}</label></label>
@ -19,12 +19,10 @@
{{>"systems/foundryvtt-reve-de-dragon/templates/partial-roll-moral.html"}} {{>"systems/foundryvtt-reve-de-dragon/templates/partial-roll-moral.html"}}
<div id="tableAjustements" class="flexrow"></div> <div id="tableAjustements" class="flexrow"></div>
</div> </div>
</div> </div>
<div id="tableResolution"> <div id="tableResolution"></div>
</div> <div id="tableProbaReussite"></div>
<div id="tableProbaReussite">
</div>
</form> </form>
<script> <script>

View File

@ -3,7 +3,7 @@
<div class="grid grid-2col"> <div class="grid grid-2col">
<div class="flex-group-left"> <div class="flex-group-left">
<img class="chat-icon" src="{{competence.img}}" alt="{{competence.name}}"/> <img class="chat-icon" src="{{competence.img}}" alt="{{competence.name}}" />
<div class="grid grid-2col"> <div class="grid grid-2col">
<label for="carac">Caractéristique:</label>{{>"systems/foundryvtt-reve-de-dragon/templates/partial-select-carac.html"}} <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> <label>{{competence.name}}:</label><label class="flex-grow">{{numberFormat competence.data.niveau decimals=0 sign=true}}</label></label>
@ -21,10 +21,8 @@
</div> </div>
</div> </div>
<div id="tableResolution"> <div id="tableResolution"></div>
</div> <div id="tableProbaReussite"></div>
<div id="tableProbaReussite">
</div>
</form> </form>
<script> <script>

View File

@ -1,29 +1,19 @@
<form class="rdddialog"> <form class="rdddialog">
<h2>Boire</h2>
<div class="form-group"> <img class="chat-icon" src="systems/foundryvtt-reve-de-dragon/icons/objets/chope_gres.webp" alt="Chope d'alcool"/>
<label>Vie : {{vieValue}}</label> <div class="grid grid-2col">
<label>Etat général : {{etat}}</label> <label>Vie</label><label class="flexrow"> {{vieValue}}</label>
<label>Déjà bu : {{diffNbDoses}}</label> <label>Etat général</label><label class="flexrow">{{etat}}</label>
</div> <label>Déjà bu</label><label class="flexrow">{{diffNbDoses}}</label>
<label>Force du breuvage</label>
<div class="form-group" id="div-sort-difficulte">
<label>Force du breuvage </label>
<select name="forceAlcool" id="forceAlcool" data-dtype="number"> <select name="forceAlcool" id="forceAlcool" data-dtype="number">
{{#select forceAlcool}} {{#select forceAlcool}}
{{#each ajustementsConditions as |key|}} {{#each ajustementsForce as |key|}}
<option value={{key}}>{{numberFormat key decimals=0 sign=true}}</option> <option value={{key}}>{{key}}</option>
{{/each}} {{/each}}
{{/select}} {{/select}}
</select> </select>
</div> <label>Ajustement final</label><label id="roll-param">10 / 0</label>
<div class="form-group">
<label>Ajustement final : <label id="roll-param">10 / 0</label>&nbsp;&nbsp;&nbsp;<label name="addon-message" id="addon-message"></label></label>
</div> </div>
<div id="tableResolution">
</div>
<div id="tableProbaReussite">
</div>
</form> </form>

View File

@ -20,10 +20,8 @@
</div> </div>
{{> "systems/foundryvtt-reve-de-dragon/templates/chat-poesie.html" oeuvre.data}} {{> "systems/foundryvtt-reve-de-dragon/templates/chat-poesie.html" oeuvre.data}}
<div id="tableResolution"> <div id="tableResolution"></div>
</div> <div id="tableProbaReussite"></div>
<div id="tableProbaReussite">
</div>
</form> </form>
<script> <script>

View File

@ -1,28 +1,26 @@
<form class="skill-roll-dialog"> <form class="skill-roll-dialog">
<div class="form-group"> <h2>Maîtrise {{tmr.label}} ({{tmr.coord}})</h2>
<label>{{tmr.label}} ({{tmr.coord}})</label> <div class="grid grid-2col">
<label>Rêve actuel à {{diffLibre}}</label> <div class="flex-group-left">
<span> <img class="chat-icon" src="{{competence.img}}" alt="{{competence.name}}"/>
<div class="grid grid-2col">
<label for="carac">Rêve actuel:</label><label class="flex-grow" name="carac">{{selectedCarac.value}}</label>
<label for="draconic">{{competence.name}}:</label><label class="flex-grow" name="draconic">{{numberFormat competence.data.niveau decimals=0 sign=true}}</label>
</div>
</div>
<div class="flex-group-left">
<div class="flexrow">
<label>Difficulté</label>
<label>{{numberFormat diffLibre decimals=0 sign=true}}</label>
</div>
{{>"systems/foundryvtt-reve-de-dragon/templates/partial-roll-diffCondition.html"}}
<div id="tableAjustements" class="flexrow"></div>
</div>
</div>
<label>Conditions</label> <div id="tableResolution"></div>
<select name="diffConditions" id="diffConditions" data-dtype="number"> <div id="tableProbaReussite"></div>
{{#select diffConditions}} </form>
{{#each ajustementsConditions as |key|}}
<option value={{key}}>{{numberFormat key decimals=0 sign=true}}</option>
{{/each}}
{{/select}}
</select>
</span>
</div>
{{>"systems/foundryvtt-reve-de-dragon/templates/partial-roll-surenc.html"}}
<div id="tableAjustements">
</div>
<div id="tableResolution">
</div>
<div id="tableProbaReussite">
</div>
</form>
<script>
</script>
<script>
</script>

View File

@ -1,62 +1,47 @@
<form class="dialog-roll-meditation"> <form class="dialog-roll-meditation">
<div class="form-group"> <h2>{{meditation.name}}</h2>
<ul class="item-list"> <div class="grid grid-2col">
<li class="item flexrow"> <div class="flex-group-left">
<label><strong>Thème : {{meditation.data.theme}} </strong></label> <img class="chat-icon" src="{{competence.img}}" alt="{{competence.name}}" />
<label>Intellect {{numberFormat carac.intellect.value decimals=0 sign=false}} / {{competence.name}} {{numberFormat competence.data.niveau decimals=0 sign=true}}</label> <div class="flexcol">
</li> <label><strong>{{meditation.data.theme}}</strong></label>
<li class="item flexrow"> <hr>
<label>Sujet : {{competence.name}} ({{meditation.data.theme}})</label> <label>Support: <strong>{{upperFirst meditation.data.support}}</strong></label>
<label>Durée : 60 minutes</label> <label>Case TMR: <strong>{{upperFirst meditation.data.tmr}}</strong></label>
</li> <label>Durée: 60 minutes</label>
<li class="item flexrow"> <hr>
<label>Support : {{meditation.data.support}}</label> <label>Intellect / {{competence.name}}:
<label>Malus spécial : {{meditation.data.malus}}</label> {{numberFormat carac.intellect.value decimals=0 sign=false}} / {{numberFormat competence.data.niveau decimals=0 sign=true}}</label>
</li> </div>
<li class="item flexrow"><label>Case TMR : {{meditation.data.tmr}}</label></li> </div>
</ul> <div class="flex-group-left">
</div> <div class="flexrow">
<label><strong>Conditions Optionnelles : </strong></label>
</div>
<div class="flexrow">
<label>Comportement antérieur : {{upperFirst meditation.data.comportement}}</label>
<input class="attribute-value conditionMeditation" type="checkbox" id="isComportement" {{#if conditionMeditation.isComportement}}checked{{/if}} />
</div>
<div class="flexrow">
<label>Heure : {{upperFirst meditation.data.heure}}</label>
<input class="attribute-value conditionMeditation" type="checkbox" id="isHeure" {{#if conditionMeditation.isHeure}}checked{{/if}} />
</div>
<div class="flexrow">
<label>Purification : {{upperFirst meditation.data.purification}}</label>
<input class="attribute-value conditionMeditation" type="checkbox" id="isPurification" {{#if conditionMeditation.isPurification}}checked{{/if}} />
</div>
<div class="flexrow">
<label>Vêture : {{upperFirst meditation.data.veture}}</label>
<input class="attribute-value conditionMeditation" type="checkbox" id="isVeture" {{#if conditionMeditation.isVeture}}checked{{/if}} />
</div>
<hr>
{{>"systems/foundryvtt-reve-de-dragon/templates/partial-roll-diffCondition.html"}}
<div id="tableAjustements"></div>
</div>
</div>
<div class="form-group"> <div id="tableResolution"></div>
<label class="h4"><strong>Conditions Optionnelles : </strong></label> <div id="tableProbaReussite"></div>
</div>
<div class="form-group">
<ul class="item-list">
<li class="item flexrow">
<label>Heure : {{meditation.data.heure}}</label>
<input class="attribute-value conditionMeditation" type="checkbox" id="isHeure" {{#if conditionMeditation.isHeure}}checked{{/if}}/>
</li>
<li class="item flexrow">
<label>Purification : {{meditation.data.purification}}</label>
<input class="attribute-value conditionMeditation" type="checkbox" id="isPurification" {{#if conditionMeditation.isPurification}}checked{{/if}}/>
</li>
<li class="item flexrow">
<label>Vêture : {{meditation.data.veture}}</label>
<input class="attribute-value conditionMeditation" type="checkbox" id="isVeture" {{#if conditionMeditation.isVeture}}checked{{/if}}/>
</li>
<li class="item flexrow">
<label>Comportement antérieur : {{meditation.data.comportement}}</label>
<input class="attribute-value conditionMeditation" type="checkbox" id="isComportement" {{#if conditionMeditation.isComportement}}checked{{/if}}/>
</li>
</ul>
</div>
<label>Conditions supplémentaires : </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>
<div id="tableAjustements">
</div>
<div id="tableResolution">
</div>
<div id="tableProbaReussite">
</div>
</form> </form>
<script> <script>

View File

@ -1,40 +1,28 @@
<form class="rdddialog"> <form class="rdddialog">
<div class="form-group"> <h2>Interpréter la mélodie: {{oeuvre.name}}</h2>
<ul>
<li><label>Jouer une Musique : {{oeuvre.name}}</label></li> <div class="grid grid-2col">
<li><label>Jet : OUIE / {{competence.name}}</label></li> <div class="flex-group-left">
</ul> <img class="chat-icon" src="{{competence.img}}" alt="{{competence.name}}" />
<div class="tooltipAppelAuMoral divAppelAuMoral"> <div class="grid grid-2col">
<img class="imgAppelAuMoral small-button-container" src="/systems/foundryvtt-reve-de-dragon/icons/moral-neutre.svg"> <label>Caractéristique: </label><label class="flex-grow">{{selectedCarac.label}}</label>
<span class="tooltipAppelAuMoralText">Sans appel au moral</span> <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>
<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>
</div>
<div class="form-group"> <div id="tableResolution"></div>
<label>conditions</label> <div id="tableProbaReussite"></div>
<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>
<div id="tableAjustements">
</div>
<div id="tableResolution">
</div>
<div id="tableProbaReussite">
</div>
</form> </form>
<script> <script>

View File

@ -1,40 +1,29 @@
<form class="rdddialog"> <form class="rdddialog">
<div class="form-group"> <h2>Interpréter une Œuvre: {{oeuvre.name}}</h2>
<ul>
<li><label>Interpréter une Oeuvre : {{oeuvre.name}}</label></li> <div class="grid grid-2col">
<li><label>Jet : {{upperFirst oeuvre.data.default_carac}} / {{competence.name}}</label></li> <div class="flex-group-left">
</ul> <img class="chat-icon" src="{{competence.img}}" alt="{{competence.name}}" />
<div class="tooltipAppelAuMoral divAppelAuMoral"> <div class="grid grid-2col">
<img class="imgAppelAuMoral small-button-container" src="/systems/foundryvtt-reve-de-dragon/icons/moral-neutre.svg"> <label>Caractéristique: </label><label class="flex-grow">{{selectedCarac.label}}
<span class="tooltipAppelAuMoralText">Sans appel au moral</span> </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>
<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>
</div>
<div class="form-group"> <div id="tableResolution"></div>
<label>conditions</label> <div id="tableProbaReussite"></div>
<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>
<div id="tableAjustements">
</div>
<div id="tableResolution">
</div>
<div id="tableProbaReussite">
</div>
</form> </form>
<script> <script>

View File

@ -1,58 +1,46 @@
<form class="rdddialog"> <form class="rdddialog">
<h2 class="tooltip" style="width: 100%;">Cuisiner: {{oeuvre.name}}
<div class="tooltiptext ttt-titre">
{{> "systems/foundryvtt-reve-de-dragon/templates/chat-poesie.html" oeuvre.data}}
</div>
</h2>
<div class="grid grid-2col"> <div class="grid grid-2col">
<div class="flex-group-left"> <div class="flex-group-left">
<ul> <img class="chat-icon" src="{{competence.img}}" alt="{{competence.name}}" />
<li><label>Cuisiner : {{oeuvre.name}}</label></li> <div>
<li><label>Jet : ODORAT-GOUT / {{competence.name}}</label></li>
<li><label>Exotisme : {{oeuvre.data.exotisme}}</label></li>
</ul>
</div>
<div class="flex-group-left">
<div class="flexrow"> <div class="flexrow">
<label class="competence-label">Multiplier les proportions</label> <label>Caractéristique: </label><label>{{selectedCarac.label}}</label>
<input class="competence-value cuisine-proportions" type="number" size="4" name="proportions" value="{{proportions}}" data-dtype="Number" />
</div> </div>
<div class="flexrow"> <div class="flexrow">
<label class="competence-label">Ajouter à l'équipement</label> <label>{{competence.name}}: </label><label>{{numberFormat competence.data.niveau decimals=0 sign=true}}</label></label>
</div>
<div class="flexrow">
<label>Exotisme: </label><label>{{oeuvre.data.exotisme}}</label>
</div>
<div class="flexrow">
<label for="proportions">Proportions: </label>
<input class="cuisine-proportions" type="number" size="4" name="proportions" value="{{proportions}}" data-dtype="Number" />
</div>
<div class="flexrow">
<label for="ajouterEquipement">Ajouter à l'équipement</label>
<input class="checkbox-by-name" type="checkbox" name="ajouterEquipement" {{#if ajouterEquipement}}checked{{/if}} /> <input class="checkbox-by-name" type="checkbox" name="ajouterEquipement" {{#if ajouterEquipement}}checked{{/if}} />
</div> </div>
</div> </div>
</div> </div>
<div class="grid grid-3col">
<div class="flex-group-left">
<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>
<div class="flex-group-left"> <div class="flex-group-left">
<div class="flexrow">
<label>Difficulté</label> <label>Difficulté</label>
<select name="diffLibre" id="diffLibre" data-dtype="number"> <label>{{numberFormat diffLibre decimals=0 sign=true}}</label>
{{#select diffLibre}}
{{#each difficultesLibres as |key|}}
<option value={{key}}>{{numberFormat key decimals=0 sign=true}}</option>
{{/each}}
{{/select}}
</select>
</div> </div>
<div class="flex-group-right flexrow"> {{>"systems/foundryvtt-reve-de-dragon/templates/partial-roll-diffCondition.html"}}
<div class="tooltipAppelAuMoral divAppelAuMoral"> {{>"systems/foundryvtt-reve-de-dragon/templates/partial-roll-moral.html"}}
<img class="imgAppelAuMoral small-button-container" src="/systems/foundryvtt-reve-de-dragon/icons/moral-neutre.svg"> <div id="tableAjustements" class="flexrow"></div>
<span class="tooltipAppelAuMoralText">Sans appel au moral</span>
</div> </div>
</div> </div>
</div>
<div id="tableAjustements"> <div id="tableResolution"></div>
</div> <div id="tableProbaReussite"></div>
<div id="tableResolution">
</div>
<div id="tableProbaReussite">
</div>
</form> </form>
<script> <script>

View File

@ -1,5 +1,5 @@
<form class="resolution-roll-dialog"> <form class="resolution-roll-dialog">
<div class="grid grid-4col"> <div class="grid grid-4col">
<div class="flexrow"> <div class="flexrow">
<label>Caractéristique</label> <label>Caractéristique</label>
{{>"systems/foundryvtt-reve-de-dragon/templates/partial-select-carac.html"}} {{>"systems/foundryvtt-reve-de-dragon/templates/partial-select-carac.html"}}
@ -7,10 +7,7 @@
{{>"systems/foundryvtt-reve-de-dragon/templates/partial-roll-diffLibre.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-diffCondition.html"}}
<button id="lancer" type="button">Lancer les dés</button> <button id="lancer" type="button">Lancer les dés</button>
</div> </div>
<div id="tableResolution"> <div id="tableResolution"></div>
</div> <div id="tableProbaReussite"></div>
<div id="tableProbaReussite">
</div>
</form> </form>

View File

@ -1,10 +1,10 @@
<form class="dialog-roll-sort"> <form class="dialog-roll-sort">
<div class="form-group"> <div class="form-group">
<label>Rêve : <label>{{numberFormat selectedCarac.value decimals=0 sign=false}}</label></label> <label>Rêve : <label>{{numberFormat selectedCarac.value decimals=0 sign=false}}</label></label>
<label>TMR : {{tmr.label}} ({{tmr.coord}})</label> <label>TMR : {{tmr.label}} ({{tmr.coord}})</label>
</div> </div>
<div class="form-group"> <div class="form-group">
<label>Draconic </label> <label>Draconic </label>
<select name="draconic" id="draconic" data-dtype="String"> <select name="draconic" id="draconic" data-dtype="String">
{{#select draconic}} {{#select draconic}}
@ -21,9 +21,9 @@
{{/each}} {{/each}}
{{/select}} {{/select}}
</select> </select>
</div> </div>
<div class="form-group"> <div class="form-group">
<label>Sort </label> <label>Sort </label>
<select name="sort" id="sort" data-dtype="String"> <select name="sort" id="sort" data-dtype="String">
{{#select sort}} {{#select sort}}
@ -32,9 +32,9 @@
{{/each}} {{/each}}
{{/select}} {{/select}}
</select> </select>
</div> </div>
<div class="form-group" id="div-sort-difficulte"> <div class="form-group" id="div-sort-difficulte">
<label>Difficulté </label> <label>Difficulté </label>
<select name="diffLibre" id="diffLibre" data-dtype="number"> <select name="diffLibre" id="diffLibre" data-dtype="number">
{{#select diffLibre}} {{#select diffLibre}}
@ -43,9 +43,9 @@
{{/each}} {{/each}}
{{/select}} {{/select}}
</select> </select>
</div> </div>
<div class="form-group" id="div-sort-ptreve"> <div class="form-group" id="div-sort-ptreve">
<label>Couts en Points de Rêve </label> <label>Couts en Points de Rêve </label>
<select name="ptreve-variable" id="ptreve-variable" data-dtype="number"> <select name="ptreve-variable" id="ptreve-variable" data-dtype="number">
{{#select ptreve-variable}} {{#select ptreve-variable}}
@ -54,14 +54,12 @@
{{/each}} {{/each}}
{{/select}} {{/select}}
</select> </select>
</div> </div>
<div id="tableAjustements"> <div id="tableAjustements">
</div> </div>
<div id="tableResolution"> <div id="tableResolution"></div>
</div> <div id="tableProbaReussite"></div>
<div id="tableProbaReussite">
</div>
</form> </form>
<script> <script>

View File

@ -1,5 +1,5 @@
<div class="table-ajustement"> <div class="table-ajustement">
<span class="tooltip"> <span class="tooltip tooltip-dotted">
<span>Ajustement Final:</span> <span>Ajustement Final:</span>
<span id="roll-param">{{selectedCarac.value}} / {{numberFormat finalLevel decimals=0 sign=true}}</span> <span id="roll-param">{{selectedCarac.value}} / {{numberFormat finalLevel decimals=0 sign=true}}</span>
<div class="tooltiptext ttt-ajustements"> <div class="tooltiptext ttt-ajustements">