Moral sur les oeuvres

Simplification de l'appel au moral pour les oeuvres

Ajout de la possibilité d'utiliser le moral sur les oeuvres

Affichage du moral/appel selon la caractéristique
This commit is contained in:
Vincent Vandemeulebrouck 2021-03-16 21:49:21 +01:00
parent dab371578d
commit 98de1a6922
14 changed files with 199 additions and 178 deletions

View File

@ -489,15 +489,15 @@ export class RdDActorSheet extends ActorSheet {
this.actor.transformerStress(); this.actor.transformerStress();
this.render(true); this.render(true);
}); });
html.find('#moral-malheureux').click((event) => { html.find('.moral-malheureux').click((event) => {
this.actor.jetDeMoral('malheureuse'); this.actor.jetDeMoral('malheureuse');
this.render(true); this.render(true);
}); });
html.find('#moral-neutre').click((event) => { html.find('.moral-neutre').click((event) => {
this.actor.jetDeMoral('neutre'); this.actor.jetDeMoral('neutre');
this.render(true); this.render(true);
}); });
html.find('#moral-heureux').click((event) => { html.find('.moral-heureux').click((event) => {
this.actor.jetDeMoral('heureuse'); this.actor.jetDeMoral('heureuse');
this.render(true); this.render(true);
}); });

View File

@ -18,7 +18,7 @@ export class RdDRoll extends Dialog {
/* -------------------------------------------- */ /* -------------------------------------------- */
static async create(actor, rollData, dialogConfig, ...actions) { static async create(actor, rollData, dialogConfig, ...actions) {
if (actor.isRollWindowsOpened() ) { if (actor.isRollWindowsOpened()) {
ui.notifications.warn("Vous avez déja une fenêtre de Test ouverte, il faut la fermer avant d'en ouvrir une autre.") ui.notifications.warn("Vous avez déja une fenêtre de Test ouverte, il faut la fermer avant d'en ouvrir une autre.")
return; return;
} }
@ -49,20 +49,21 @@ export class RdDRoll extends Dialog {
diffConditions: 0, diffConditions: 0,
diffLibre: rollData.competence?.data.default_diffLibre ?? 0, diffLibre: rollData.competence?.data.default_diffLibre ?? 0,
malusArmureValue: actor.getMalusArmure(), malusArmureValue: actor.getMalusArmure(),
surencMalusFlag: actor.isPersonnage() ? (actor.data.data.compteurs.surenc.value < 0) : false, surencMalusFlag: actor.isPersonnage() ? (actor.data.data.compteurs.surenc.value < 0) : false,
surencMalusValue: actor.getSurenc(), surencMalusValue: actor.getSurenc(),
useMalusSurenc: false, useMalusSurenc: false,
appelAuMoralPossible : false, /* Est-ce que l'appel au moral est possible ? Variable utisé pour l'affichage ou non de la ligne concernant le moral */ useMoral: false, /* Est-ce que le joueur demande d'utiliser le moral ? Utile si le joueur change plusieurs fois de carac associée. */
appelAuMoralDemander :false, /* Est-ce que le joueur demande d'utiliser le moral ? Utile si le joueur change plusieurs fois de carac associée. */ perteMoralEchec: false, /* Pour l'affichage dans le chat */
perteMoralEchec : false, /* Pour l'affichage dans le chat */ use: { libre: true, conditions: true, surenc: false, encTotal: false },
use: { libre: true, conditions: true, surenc: false, encTotal: false, appelAuMoral : false /* Le jet se fait ou non en utilisant l'appel au moral */},
isMalusEncombrementTotal: RdDItemCompetence.isMalusEncombrementTotal(rollData.competence), isMalusEncombrementTotal: RdDItemCompetence.isMalusEncombrementTotal(rollData.competence),
useMalusEncTotal: false, useMalusEncTotal: false,
encTotal: actor.getEncTotal(), encTotal: actor.getEncTotal(),
ajustementAstrologique: actor.ajustementAstrologique(), ajustementAstrologique: actor.ajustementAstrologique(),
surprise: actor.getSurprise(false), surprise: actor.getSurprise(false),
canClose: true canClose: true
} };
mergeObject(rollData, defaultRollData, { recursive: true, overwrite: false }); mergeObject(rollData, defaultRollData, { recursive: true, overwrite: false });
if (rollData.forceCarac) { if (rollData.forceCarac) {
rollData.carac = rollData.forceCarac; rollData.carac = rollData.forceCarac;
@ -120,7 +121,7 @@ export class RdDRoll extends Dialog {
await RdDResolutionTable.rollData(this.rollData); await RdDResolutionTable.rollData(this.rollData);
console.log("RdDRoll -=>", this.rollData, this.rollData.rolled); console.log("RdDRoll -=>", this.rollData, this.rollData.rolled);
this.actor.setRollWindowsOpened(false); this.actor.setRollWindowsOpened(false);
if (action.callbacks) if (action.callbacks)
for (let callback of action.callbacks) { for (let callback of action.callbacks) {
if (callback.condition == undefined || callback.condition(this.rollData)) { if (callback.condition == undefined || callback.condition(this.rollData)) {
@ -206,27 +207,22 @@ export class RdDRoll extends Dialog {
this.rollData.useMalusEncTotal = event.currentTarget.checked; this.rollData.useMalusEncTotal = event.currentTarget.checked;
this.updateRollResult(); this.updateRollResult();
}); });
html.find('#iconeSmile').change((event) => { html.find('.imgAppelAuMoral').click((event) => { /* l'appel au moral, qui donne un bonus de +1 */
console.log("iconeSmile"); this.rollData.useMoral = !this.rollData.useMoral;
console.log(html.find('.iconeSmile')); if (this.rollData.useMoral) {
if (this.rollData.moral > 0) {
html.find('.imgAppelAuMoral')[0].src = "/systems/foundryvtt-reve-de-dragon/icons/moral-heureux.svg";
html.find('.tooltipAppelAuMoralText')[0].innerHTML = "Appel au moral";
} else {
html.find('.imgAppelAuMoral')[0].src = "/systems/foundryvtt-reve-de-dragon/icons/moral-malheureux.svg";
html.find('.tooltipAppelAuMoralText')[0].innerHTML = "Appel à l'énergie du désespoir";
}
} else {
html.find('.imgAppelAuMoral')[0].src = "/systems/foundryvtt-reve-de-dragon/icons/moral-neutre.svg";
html.find('.tooltipAppelAuMoralText')[0].innerHTML = "Sans appel au moral";
}
this.updateRollResult(); this.updateRollResult();
}); });
html.find('#iconeSmile').click((event) => { /* l'appel au moral, qui donne un bonus de +1 */
this.rollData.appelAuMoralDemander = ! this.rollData.appelAuMoralDemander;
if ( this.rollData.appelAuMoralDemander ) {
if ( this.rollData.moral > 0 ) {
html.find('#iconeSmile')[0].src = "/systems/foundryvtt-reve-de-dragon/icons/moral-heureux.svg";
html.find('#tooltipAppelAuMoralText')[0].innerHTML = "Appel au moral";
} else {
html.find('#iconeSmile')[0].src = "/systems/foundryvtt-reve-de-dragon/icons/moral-malheureux.svg";
html.find('#tooltipAppelAuMoralText')[0].innerHTML = "Appel à l'énergie du désespoir";
}
} else {
html.find('#iconeSmile')[0].src = "/systems/foundryvtt-reve-de-dragon/icons/moral-neutre.svg";
html.find('#tooltipAppelAuMoralText')[0].innerHTML = "Sans appel au moral";
}
this.updateRollResult();
});
// Section Méditation // Section Méditation
html.find('.conditionMeditation').change((event) => { html.find('.conditionMeditation').change((event) => {
let condition = event.currentTarget.attributes['id'].value; let condition = event.currentTarget.attributes['id'].value;
@ -238,10 +234,11 @@ export class RdDRoll extends Dialog {
/* -------------------------------------------- */ /* -------------------------------------------- */
async updateRollResult() { async updateRollResult() {
let rollData = this.rollData; let rollData = this.rollData;
rollData.dmg = rollData.attackerRoll?.dmg ?? RdDBonus.dmg(rollData, this.actor.getBonusDegat()); rollData.dmg = rollData.attackerRoll?.dmg ?? RdDBonus.dmg(rollData, this.actor.getBonusDegat());
rollData.caracValue = parseInt(rollData.selectedCarac.value); rollData.caracValue = parseInt(rollData.selectedCarac.value);
rollData.coupsNonMortels = (rollData.attackerRoll?.dmg.mortalite ?? rollData.dmg.mortalite) == 'non-mortel'; rollData.coupsNonMortels = (rollData.attackerRoll?.dmg.mortalite ?? rollData.dmg.mortalite) == 'non-mortel';
rollData.use.appelAuMoral = this.actor.isPersonnage() && RdDCarac.isActionPhysique(rollData.selectedCarac);
let dmgText = Misc.toSignedString(rollData.dmg.total); let dmgText = Misc.toSignedString(rollData.dmg.total);
if (rollData.coupsNonMortels) { if (rollData.coupsNonMortels) {
@ -252,21 +249,12 @@ export class RdDRoll extends Dialog {
HtmlUtility._showControlWhen($("#div-sort-difficulte"), RdDItemSort.isDifficulteVariable(rollData.selectedSort)) HtmlUtility._showControlWhen($("#div-sort-difficulte"), RdDItemSort.isDifficulteVariable(rollData.selectedSort))
HtmlUtility._showControlWhen($("#div-sort-ptreve"), RdDItemSort.isCoutVariable(rollData.selectedSort)) HtmlUtility._showControlWhen($("#div-sort-ptreve"), RdDItemSort.isCoutVariable(rollData.selectedSort))
} }
if ( ! RdDCarac.isActionPhysique(rollData.selectedCarac || ! actor.isPersonnage() ) ) {
rollData.appelAuMoralPossible = false;
rollData.use.appelAuMoral = false;
} else {
rollData.appelAuMoralPossible = true;
rollData.use.appelAuMoral = rollData.appelAuMoralDemander;
}
RollDataAjustements.calcul(rollData, this.actor); RollDataAjustements.calcul(rollData, this.actor);
rollData.finalLevel = this._computeFinalLevel(rollData); rollData.finalLevel = this._computeFinalLevel(rollData);
HtmlUtility._showControlWhen($(".diffMoral"), rollData.ajustements.moralTotal.used); HtmlUtility._showControlWhen($(".diffMoral"), rollData.ajustements.moralTotal.used);
HtmlUtility._showControlWhen($("#divAppelAuMoral"), rollData.appelAuMoralPossible ); HtmlUtility._showControlWhen($(".divAppelAuMoral"), rollData.use.appelAuMoral);
HtmlUtility._showControlWhen($("#etat-general"), !RdDCarac.isIgnoreEtatGeneral(rollData.selectedCarac, rollData.competence)); HtmlUtility._showControlWhen($("#etat-general"), !RdDCarac.isIgnoreEtatGeneral(rollData.selectedCarac, rollData.competence));
HtmlUtility._showControlWhen($("#ajust-astrologique"), RdDResolutionTable.isAjustementAstrologique(rollData)); HtmlUtility._showControlWhen($("#ajust-astrologique"), RdDResolutionTable.isAjustementAstrologique(rollData));

View File

@ -73,8 +73,8 @@ export const referenceAjustements = {
getValue: (rollData, actor) => actor.getSurenc() getValue: (rollData, actor) => actor.getSurenc()
}, },
moral: { moral: {
isVisible: (rollData, actor) => RdDCarac.isActionPhysique(rollData.selectedCarac), isVisible: (rollData, actor) => actor.isPersonnage() && RdDCarac.isActionPhysique(rollData.selectedCarac) && rollData.useMoral,
isUsed: (rollData, actor) => rollData.use?.appelAuMoral, isUsed: (rollData, actor) => rollData.useMoral,
getLabel: (rollData, actor) => 'Appel au moral', getLabel: (rollData, actor) => 'Appel au moral',
getValue: (rollData, actor) => 1 getValue: (rollData, actor) => 1
}, },

View File

@ -825,7 +825,7 @@ ul, li {
display: none !important; display: none !important;
} }
.iconeSmile { .imgAppelAuMoral {
height: 20px; height: 20px;
width: 20px; width: 20px;
border:none; border:none;

View File

@ -1,4 +1,3 @@
{{log "handlebar actor-sheet" this}}
<form class="{{cssClass}}" autocomplete="off"> <form class="{{cssClass}}" autocomplete="off">
{{!-- Sheet Header --}} {{!-- Sheet Header --}}
@ -198,9 +197,9 @@
{{else if (eq compteur.label 'Ethylisme')}} {{else if (eq compteur.label 'Ethylisme')}}
<a class="item-control ethylisme-test" id="ethylisme-test" title="Jet d'Ethylisme">Jet d'Ethylisme</a> <a class="item-control ethylisme-test" id="ethylisme-test" title="Jet d'Ethylisme">Jet d'Ethylisme</a>
{{else if (eq compteur.label 'Moral')}} {{else if (eq compteur.label 'Moral')}}
<a id="moral-malheureux" title="Jet de moral situation malheureuse"><img class="small-button-container" src="systems/foundryvtt-reve-de-dragon/icons/moral-malheureux.svg" alt="Jet de moral situation malheureuse"/></a> <a class="moral-malheureux" title="Jet de moral situation malheureuse"><img class="small-button-container" src="systems/foundryvtt-reve-de-dragon/icons/moral-malheureux.svg" alt="Jet de moral situation malheureuse"/></a>
<a id="moral-neutre" title="Jet de moral situation neutre"><img class="small-button-container" src="systems/foundryvtt-reve-de-dragon/icons/moral-neutre.svg" alt="Jet de moral situation neutre"/></a> <a class="moral-neutre" title="Jet de moral situation neutre"><img class="small-button-container" src="systems/foundryvtt-reve-de-dragon/icons/moral-neutre.svg" alt="Jet de moral situation neutre"/></a>
<a id="moral-heureux" title="Jet de moral situation heureuse"><img class="small-button-container" src="systems/foundryvtt-reve-de-dragon/icons/moral-heureux.svg" alt="Jet de moral situation heureuse"/></a> <a class="moral-heureux" title="Jet de moral situation heureuse"><img class="small-button-container" src="systems/foundryvtt-reve-de-dragon/icons/moral-heureux.svg" alt="Jet de moral situation heureuse"/></a>
{{else}} {{else}}
<label></label> <label></label>
{{/if}} {{/if}}

View File

@ -1,7 +1,7 @@
<form class="skill-roll-dialog"> <form class="skill-roll-dialog">
<h2 class="compdialog" id="compdialogTitle"></h2> <h2 class="compdialog" id="compdialogTitle"></h2>
<div class="form-group"> <div class="form-group">
<label for="categorie">Caractéristique </label> <label>Caractéristique </label>
<select name="carac" id="carac" data-dtype="String"> <select name="carac" id="carac" data-dtype="String">
{{#select carac}} {{#select carac}}
{{#each carac as |caracitem key|}} {{#each carac as |caracitem key|}}
@ -9,21 +9,19 @@
{{/each}} {{/each}}
{{/select}} {{/select}}
</select> </select>
<label></label>
<div class="form-group" id="divAppelAuMoral" > <label class="diffMoral">Moral: {{#if (gt moral 0)}}+{{/if}}{{moral}}</label>
<div class="tooltipAppelAuMoral"> <div class="tooltipAppelAuMoral divAppelAuMoral">
<input class="diffAppelAuMoral" id="useAppelAuMoralCheckbox" type="checkbox" name="appelAuMoralDemander" /> <img class="imgAppelAuMoral small-button-container" src="/systems/foundryvtt-reve-de-dragon/icons/moral-neutre.svg">
<img for="useAppelAuMoralCheckbox" class="iconeSmile" id="iconeSmile" src="/systems/foundryvtt-reve-de-dragon/icons/moral-neutre.svg"> <span class="tooltipAppelAuMoralText">Sans appel au moral</span>
<span class="tooltipAppelAuMoralText" id="tooltipAppelAuMoralText">Sans appel au moral</span> </div>
</div>
</div>
</div> </div>
<div class="form-group"> <div class="form-group">
{{#if attackerRoll}} {{#if attackerRoll}}
<label for="categorie">Difficulté</label> <label>Difficulté</label>
<label>{{diffLibre}}</label> <label>{{diffLibre}}</label>
{{else}} {{else}}
<label for="categorie">Difficulté libre</label> <label>Difficulté libre</label>
<select name="diffLibre" id="diffLibre" data-dtype="number" {{#unless use.libre}}disabled{{/unless}}> <select name="diffLibre" id="diffLibre" data-dtype="number" {{#unless use.libre}}disabled{{/unless}}>
{{#select diffLibre}} {{#select diffLibre}}
{{#each difficultesLibres as |key|}} {{#each difficultesLibres as |key|}}
@ -32,7 +30,7 @@
{{/select}} {{/select}}
</select> </select>
{{/if}} {{/if}}
<label for="categorie">&nbsp;&nbsp;Conditions</label> <label>&nbsp;&nbsp;Conditions</label>
<select name="diffConditions" id="diffConditions" data-dtype="number" {{#unless use.conditions}}disabled{{/unless}}> <select name="diffConditions" id="diffConditions" data-dtype="number" {{#unless use.conditions}}disabled{{/unless}}>
{{#select diffConditions}} {{#select diffConditions}}
{{#each ajustementsConditions as |key|}} {{#each ajustementsConditions as |key|}}
@ -40,19 +38,18 @@
{{/each}} {{/each}}
{{/select}} {{/select}}
</select> </select>
<label class="diffMoral" for="categorie">Moral: {{#if (gt moral 0)}}+{{/if}}{{moral}}</label>
</div> </div>
{{#if arme}} {{#if arme}}
<div class="form-group"> <div class="form-group">
{{#if attackerRoll}} {{#if attackerRoll}}
{{#if attackerRoll.tactique}} {{#if attackerRoll.tactique}}
<label for="categorie">Tactique: {{attackerRoll.tactique}}</label> <label>Tactique: {{attackerRoll.tactique}}</label>
{{/if}} {{/if}}
<label for="categorie">D&eacute;gats:</label><label id="dmg-arme-actor"></label> <label>D&eacute;gats:</label><label id="dmg-arme-actor"></label>
<label></label> <label></label>
{{else}} {{else}}
<span class="tooltip"> <span class="tooltip">
<label for="categorie">Tactique:</label> <label>Tactique:</label>
<select name="tactique-combat" id="tactique-combat" data-dtype="String" {{#unless use.conditions}}disabled{{/unless}}> <select name="tactique-combat" 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>
@ -65,12 +62,12 @@
</div> </div>
</div> </div>
</span> </span>
<label for="categorie">D&eacute;gats:</label><label id="dmg-arme-actor"></label> <label>D&eacute;gats:</label><label id="dmg-arme-actor"></label>
<label>Non Mortel</label> <label>Non Mortel</label>
<input class="attribute-value" type="checkbox" id="coupsNonMortels" name="coupsNonMortels" {{#if coupsNonMortels}}checked{{/if}}/> <input class="attribute-value" type="checkbox" id="coupsNonMortels" name="coupsNonMortels" {{#if coupsNonMortels}}checked{{/if}}/>
{{/if}} {{/if}}
{{#if ajustements.attaqueDefenseurSurpris.used}} {{#if ajustements.attaqueDefenseurSurpris.used}}
<label for="categorie" id="defenseur-surprise">{{ajustements.attaqueDefenseurSurpris.label}}</label> <label id="defenseur-surprise">{{ajustements.attaqueDefenseurSurpris.label}}</label>
{{/if}} {{/if}}
</div> </div>
{{/if}} {{/if}}

View File

@ -1,14 +1,18 @@
<form class="dialog-roll-sort"> <form class="dialog-roll-sort">
<div class="form-group"> <div class="form-group">
<ul> <ul>
<li><label for="categorie">Recette : {{recetteName}}</label></li> <li><label>Recette : {{recetteName}}</label></li>
<li><label for="categorie">Tâche Alchimique : {{alchimieTexte}}</label></li> <li><label>Tâche Alchimique : {{alchimieTexte}}</label></li>
<li><label for="categorie">Jet : {{selectedCarac.label}} / {{competence.name}}</label></li> <li><label>Jet : {{selectedCarac.label}} / {{competence.name}}</label></li>
</ul> </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> </div>
<div class="form-group"> <div class="form-group">
<label for="categorie">conditions</label> <label>conditions</label>
<select name="diffConditions" id="diffConditions" data-dtype="number"> <select name="diffConditions" id="diffConditions" data-dtype="number">
{{#select diffConditions}} {{#select diffConditions}}
{{#each ajustementsConditions as |key|}} {{#each ajustementsConditions as |key|}}
@ -16,7 +20,7 @@
{{/each}} {{/each}}
{{/select}} {{/select}}
</select> </select>
<label for="categorie">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}}
{{#each difficultesLibres as |key|}} {{#each difficultesLibres as |key|}}

View File

@ -1,32 +1,37 @@
<form class="skill-roll-dialog"> <form class="skill-roll-dialog">
<h2 class="compdialog" id="compdialogTitle"></h2> <h2 class="compdialog" id="compdialogTitle"></h2>
<div class="form-group"> <div class="form-group">
<label for="categorie">Difficulté libre</label> <label>Difficulté libre</label>
<select name="diffLibre" id="diffLibre" data-dtype="number"> <select name="diffLibre" id="diffLibre" data-dtype="number">
{{#select diffLibre}} {{#select diffLibre}}
{{#each difficultesLibres as |key|}} {{#each difficultesLibres as |key|}}
<option value={{key}}>{{numberFormat key decimals=0 sign=true}}</option> <option value={{key}}>{{numberFormat key decimals=0 sign=true}}</option>
{{/each}} {{/each}}
{{/select}} {{/select}}
</select> </select>
<label for="categorie">conditions</label> <label>conditions</label>
<select name="diffConditions" id="diffConditions" data-dtype="number"> <select name="diffConditions" id="diffConditions" data-dtype="number">
{{#select diffConditions}} {{#select diffConditions}}
{{#each ajustementsConditions as |key|}} {{#each ajustementsConditions as |key|}}
<option value={{key}}>{{numberFormat key decimals=0 sign=true}}</option> <option value={{key}}>{{numberFormat key decimals=0 sign=true}}</option>
{{/each}} {{/each}}
{{/select}} {{/select}}
</select> </select>
<label class="diffMoral" for="categorie">Moral: {{#if (gt moral 0)}}+{{/if}}{{moral}}</label> <label class="diffMoral">Moral: {{#if (gt moral 0)}}+{{/if}}{{moral}}</label>
</div> <div class="tooltipAppelAuMoral divAppelAuMoral">
{{>"systems/foundryvtt-reve-de-dragon/templates/dialog-roll-surenc.html"}} <img class="imgAppelAuMoral small-button-container"
<div id="tableAjustements"> src="/systems/foundryvtt-reve-de-dragon/icons/moral-neutre.svg">
</div> <span class="tooltipAppelAuMoralText">Sans appel au moral</span>
<div id="tableResolution"> </div>
</div> </div>
<div id="tableProbaReussite"> {{>"systems/foundryvtt-reve-de-dragon/templates/dialog-roll-surenc.html"}}
</div> <div id="tableAjustements">
</div>
<div id="tableResolution">
</div>
<div id="tableProbaReussite">
</div>
</form> </form>
<script> <script>
</script> </script>

View File

@ -1,13 +1,17 @@
<form class="dialog-roll-sort"> <form class="dialog-roll-sort">
<div class="form-group"> <div class="form-group">
<ul> <ul>
<li><label for="categorie">Chant : {{chant.name}}</label></li> <li><label>Chant : {{oeuvre.name}}</label></li>
<li><label for="categorie">Jet : OUIE / {{competence.name}}</label></li> <li><label>Jet : OUIE / {{competence.name}}</label></li>
</ul> </ul>
</div> <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"> <div class="form-group">
<label for="categorie">conditions</label> <label>conditions</label>
<select name="diffConditions" id="diffConditions" data-dtype="number"> <select name="diffConditions" id="diffConditions" data-dtype="number">
{{#select diffConditions}} {{#select diffConditions}}
{{#each ajustementsConditions as |key|}} {{#each ajustementsConditions as |key|}}
@ -15,7 +19,7 @@
{{/each}} {{/each}}
{{/select}} {{/select}}
</select> </select>
<label for="categorie">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}}
{{#each difficultesLibres as |key|}} {{#each difficultesLibres as |key|}}

View File

@ -1,46 +1,52 @@
<form class="dialog-roll-danse"> <form class="dialog-roll-danse">
<div class="form-group"> <div class="form-group">
<ul> <ul>
<li><label for="categorie">Danse : {{danse.name}}</label></li> <li><label>Danse : {{oeuvre.name}}</label></li>
<li><label for="categorie">Jet : APPARENCE ou AGILITE / {{competence.name}}</label></li> <li><label>Jet : APPARENCE ou AGILITE / {{competence.name}}</label></li>
</ul> </ul>
</div> </div>
<label for="categorie">Caractéristique</label> <div class="form-group">
<select name="carac" id="carac" class="select-diff" data-dtype="String"> <label>Caractéristique</label>
{{#select carac}} <select name="carac" id="carac" class="select-diff" data-dtype="String">
{{#each carac as |caracitem key|}} {{#select carac}}
<option value={{key}}>{{caracitem.label}}</option> {{#each carac as |caracitem key|}}
{{/each}} <option value={{key}}>{{caracitem.label}}</option>
{{/select}} {{/each}}
</select> {{/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"> <div class="form-group">
<label for="categorie">conditions</label> <label>conditions</label>
<select name="diffConditions" id="diffConditions" data-dtype="number"> <select name="diffConditions" id="diffConditions" data-dtype="number">
{{#select diffConditions}} {{#select diffConditions}}
{{#each ajustementsConditions as |key|}} {{#each ajustementsConditions as |key|}}
<option value={{key}}>{{numberFormat key decimals=0 sign=true}}</option> <option value={{key}}>{{numberFormat key decimals=0 sign=true}}</option>
{{/each}} {{/each}}
{{/select}} {{/select}}
</select> </select>
<label for="categorie">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}}
{{#each difficultesLibres as |key|}} {{#each difficultesLibres as |key|}}
<option value={{key}}>{{numberFormat key decimals=0 sign=true}}</option> <option value={{key}}>{{numberFormat key decimals=0 sign=true}}</option>
{{/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 id="tableProbaReussite">
</div> </div>
</form> </form>
<script> <script>
</script> </script>

View File

@ -1,46 +1,52 @@
<form class="dialog-roll-sort"> <form class="dialog-roll-sort">
<div class="form-group"> <div class="form-group">
<ul> <ul>
<li><label for="competence-label">Jouer à : {{oeuvre.name}}</label></li> <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">Type : {{oeuvre.data.type}}</label></li>
<li><label for="competence-label">Base : {{oeuvre.data.base}}</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> <li><label for="competence-label">Carac/Compétence : {{oeuvre.data.caraccomp}}</label></li>
</ul> </ul>
</div> </div>
<div class="form-group"> <div class="form-group">
<label for="categorie">Caractéristique</label> <label>Caractéristique</label>
<select name="carac" id="carac" class="select-diff" data-dtype="String"> <select name="carac" id="carac" class="select-diff" data-dtype="String">
{{#select carac}} {{#select carac}}
{{#each carac as |caracitem key|}} {{#each carac as |caracitem key|}}
<option value={{key}}>{{caracitem.label}}</option> <option value={{key}}>{{caracitem.label}}</option>
{{/each}} {{/each}}
{{/select}} {{/select}}
</select> </select>
<label for="categorie">conditions</label> <div class="tooltipAppelAuMoral divAppelAuMoral">
<select name="diffConditions" id="diffConditions" data-dtype="number"> <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}} {{#select diffConditions}}
{{#each ajustementsConditions as |key|}} {{#each ajustementsConditions as |key|}}
<option value={{key}}>{{numberFormat key decimals=0 sign=true}}</option> <option value={{key}}>{{numberFormat key decimals=0 sign=true}}</option>
{{/each}} {{/each}}
{{/select}} {{/select}}
</select> </select>
<label for="categorie">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}}
{{#each difficultesLibres as |key|}} {{#each difficultesLibres as |key|}}
<option value={{key}}>{{numberFormat key decimals=0 sign=true}}</option> <option value={{key}}>{{numberFormat key decimals=0 sign=true}}</option>
{{/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 id="tableProbaReussite">
</div> </div>
</form> </form>
<script> <script>
</script> </script>

View File

@ -1,13 +1,17 @@
<form class="dialog-roll-sort"> <form class="dialog-roll-sort">
<div class="form-group"> <div class="form-group">
<ul> <ul>
<li><label for="categorie">Jouer une Musique : {{musique.name}}</label></li> <li><label>Jouer une Musique : {{oeuvre.name}}</label></li>
<li><label for="categorie">Jet : OUIE / {{competence.name}}</label></li> <li><label>Jet : OUIE / {{competence.name}}</label></li>
</ul> </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> </div>
<div class="form-group"> <div class="form-group">
<label for="categorie">conditions</label> <label>conditions</label>
<select name="diffConditions" id="diffConditions" data-dtype="number"> <select name="diffConditions" id="diffConditions" data-dtype="number">
{{#select diffConditions}} {{#select diffConditions}}
{{#each ajustementsConditions as |key|}} {{#each ajustementsConditions as |key|}}
@ -15,7 +19,7 @@
{{/each}} {{/each}}
{{/select}} {{/select}}
</select> </select>
<label for="categorie">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}}
{{#each difficultesLibres as |key|}} {{#each difficultesLibres as |key|}}

View File

@ -1,13 +1,17 @@
<form class="dialog-roll-sort"> <form class="dialog-roll-sort">
<div class="form-group"> <div class="form-group">
<ul> <ul>
<li><label for="categorie">Interpréter une Oeuvre : {{oeuvre.name}}</label></li> <li><label>Interpréter une Oeuvre : {{oeuvre.name}}</label></li>
<li><label for="categorie">Jet : {{upperFirst oeuvre.data.default_carac}} / {{competence.name}}</label></li> <li><label>Jet : {{upperFirst oeuvre.data.default_carac}} / {{competence.name}}</label></li>
</ul> </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> </div>
<div class="form-group"> <div class="form-group">
<label for="categorie">conditions</label> <label>conditions</label>
<select name="diffConditions" id="diffConditions" data-dtype="number"> <select name="diffConditions" id="diffConditions" data-dtype="number">
{{#select diffConditions}} {{#select diffConditions}}
{{#each ajustementsConditions as |key|}} {{#each ajustementsConditions as |key|}}
@ -15,7 +19,7 @@
{{/each}} {{/each}}
{{/select}} {{/select}}
</select> </select>
<label for="categorie">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}}
{{#each difficultesLibres as |key|}} {{#each difficultesLibres as |key|}}

View File

@ -2,14 +2,18 @@
<div class="form-group"> <div class="form-group">
<ul> <ul>
<li><label for="categorie">Cuisiner : {{oeuvre.name}}</label></li> <li><label>Cuisiner : {{oeuvre.name}}</label></li>
<li><label for="categorie">Jet : ODORAT-GOUT / {{competence.name}}</label></li> <li><label>Jet : ODORAT-GOUT / {{competence.name}}</label></li>
<li><label for="categorie">Exotisme : {{oeuvre.data.exotisme}}</label></li> <li><label>Exotisme : {{oeuvre.data.exotisme}}</label></li>
</ul> </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> </div>
<div class="form-group"> <div class="form-group">
<label for="categorie">conditions</label> <label>conditions</label>
<select name="diffConditions" id="diffConditions" data-dtype="number"> <select name="diffConditions" id="diffConditions" data-dtype="number">
{{#select diffConditions}} {{#select diffConditions}}
{{#each ajustementsConditions as |key|}} {{#each ajustementsConditions as |key|}}
@ -17,7 +21,7 @@
{{/each}} {{/each}}
{{/select}} {{/select}}
</select> </select>
<label for="categorie">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}}
{{#each difficultesLibres as |key|}} {{#each difficultesLibres as |key|}}