Rework dialog-competence
This commit is contained in:
Vincent Vandemeulebrouck
parent
f0af45d106
commit
0e9bc372bf
@ -268,7 +268,7 @@ export class RdDRoll extends Dialog {
|
||||
let dmgText = Misc.toSignedString(rollData.dmg.total);
|
||||
|
||||
if (rollData.coupsNonMortels) {
|
||||
dmgText = '(' + dmgText + ')';
|
||||
dmgText = `(${dmgText}) non-mortel`
|
||||
}
|
||||
if (rollData.selectedSort) {
|
||||
rollData.bonus = RdDItemSort.getCaseBonus(rollData.selectedSort, rollData.tmr.coord);
|
||||
@ -287,7 +287,7 @@ export class RdDRoll extends Dialog {
|
||||
// Mise à jour valeurs
|
||||
$("#compdialogTitle").text(this._getTitle(rollData));
|
||||
$('#coupsNonMortels').prop('checked', rollData.coupsNonMortels);
|
||||
$("#dmg-arme-actor").text(dmgText);
|
||||
$(".dmg-arme-actor").text(dmgText);
|
||||
$('.table-ajustement').remove();
|
||||
$(".table-resolution").remove();
|
||||
$(".table-proba-reussite").remove();
|
||||
@ -353,9 +353,9 @@ export class RdDRoll extends Dialog {
|
||||
const niveau = Misc.toSignedString(rollData.competence.data.niveau);
|
||||
if (compName == carac) {
|
||||
// cas des créatures
|
||||
return carac + " " + niveau
|
||||
return carac + " Niveau " + niveau
|
||||
}
|
||||
const armeTitle = (rollData.arme) ? " (" + rollData.arme.name + ") " : "";
|
||||
return carac + "/" + compName + armeTitle + " " + niveau
|
||||
return carac + "/" + compName + armeTitle + " Niveau " + niveau
|
||||
}
|
||||
}
|
||||
|
||||
@ -855,8 +855,7 @@ ul, li {
|
||||
/* Position the tooltip text */
|
||||
position: absolute;
|
||||
z-index: 1;
|
||||
top: -10px;
|
||||
left: 18%;
|
||||
left: 25px;
|
||||
|
||||
/* Fade in tooltip */
|
||||
visibility: hidden;
|
||||
|
||||
@ -1,6 +1,9 @@
|
||||
<form class="skill-roll-dialog">
|
||||
<h2 class="compdialog" id="compdialogTitle"></h2>
|
||||
<div class="form-group">
|
||||
|
||||
<div class="grid grid-2col">
|
||||
<div class="flex-group-left">
|
||||
<div class="flexrow">
|
||||
<label>Caractéristique </label>
|
||||
<select name="carac" id="carac" data-dtype="String">
|
||||
{{#select carac}}
|
||||
@ -9,14 +12,63 @@
|
||||
{{/each}}
|
||||
{{/select}}
|
||||
</select>
|
||||
</div>
|
||||
{{#if arme}}
|
||||
{{#if attackerRoll}}
|
||||
{{#if attackerRoll.tactique}}
|
||||
<div class="flexrow">
|
||||
<label>Tactique: </label><label>{{attackerRoll.tactique}}</label>
|
||||
</div>
|
||||
{{/if}}
|
||||
{{else}}
|
||||
<div class="flexrow">
|
||||
<label>Tactique:</label>
|
||||
<span class="tooltip">
|
||||
<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="charge">Charge</option>
|
||||
<option value="feinte">Feinte</option>
|
||||
</select>
|
||||
<div class="tooltiptext ttt-ajustements">
|
||||
<div>
|
||||
<strong>Charge</strong> : Les longueurs d'armes n'interviennent pas dans la charge, il faut gérer une initiative aléatoire dans ce cas.
|
||||
<br><strong>Feinte</strong> : Vous devez avoir l'initative sur votre adversaire et y renoncer.
|
||||
</div>
|
||||
</div>
|
||||
</span>
|
||||
</div>
|
||||
{{/if}}
|
||||
{{#if ajustements.attaqueDefenseurSurpris.used}}
|
||||
<div class="flexrow">
|
||||
<label id="defenseur-surprise">{{ajustements.attaqueDefenseurSurpris.label}}</label>
|
||||
</div>
|
||||
{{/if}}
|
||||
{{/if}}
|
||||
|
||||
<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>
|
||||
{{#if arme}}
|
||||
{{#unless attackerRoll}}
|
||||
<div class="flexrow">
|
||||
{{#if (eq arme.data.mortalite 'non-mortel')}}
|
||||
<label>Dégats:</label><label class="dmg-arme-actor"></label>
|
||||
{{else}}
|
||||
<label>Dégats:
|
||||
</label>
|
||||
<span>
|
||||
<input class="attribute-value" type="checkbox" id="coupsNonMortels" name="coupsNonMortels" {{#if coupsNonMortels}}checked{{/if}}/>
|
||||
<label class="dmg-arme-actor">
|
||||
</label>
|
||||
</span>
|
||||
{{/if}}
|
||||
</div>
|
||||
{{/unless}}
|
||||
{{/if}}
|
||||
|
||||
{{>"systems/foundryvtt-reve-de-dragon/templates/dialog-roll-surenc.html"}}
|
||||
{{>"systems/foundryvtt-reve-de-dragon/templates/dialog-roll-enctotal.html"}}
|
||||
</div>
|
||||
<div class="form-group">
|
||||
|
||||
<div class="flex-group-left">
|
||||
<div class="flexrow">
|
||||
{{#if attackerRoll}}
|
||||
<label>Difficulté</label>
|
||||
<label>{{diffLibre}}</label>
|
||||
@ -30,7 +82,11 @@
|
||||
{{/select}}
|
||||
</select>
|
||||
{{/if}}
|
||||
<label> Conditions</label>
|
||||
</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|}}
|
||||
@ -39,44 +95,18 @@
|
||||
{{/select}}
|
||||
</select>
|
||||
</div>
|
||||
{{#if arme}}
|
||||
<div class="form-group">
|
||||
{{#if attackerRoll}}
|
||||
{{#if attackerRoll.tactique}}
|
||||
<label>Tactique: {{attackerRoll.tactique}}</label>
|
||||
{{/if}}
|
||||
<label>Dégats:</label><label id="dmg-arme-actor"></label>
|
||||
<label></label>
|
||||
{{else}}
|
||||
<span class="tooltip">
|
||||
<label>Tactique:</label>
|
||||
<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="charge">Charge</option>
|
||||
<option value="feinte">Feinte</option>
|
||||
</select>
|
||||
<div class="tooltiptext ttt-ajustements">
|
||||
<div>
|
||||
<strong>Charge</strong> : Les longueurs d'armes n'interviennent pas dans la charge, il faut gérer une initiative aléatoire dans ce cas.
|
||||
<br><strong>Feinte</strong> : Vous devez avoir l'initative sur votre adversaire et y renoncer.
|
||||
<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>
|
||||
</div>
|
||||
</span>
|
||||
<label>Dégats:</label><label id="dmg-arme-actor"></label>
|
||||
<label>Non Mortel</label>
|
||||
<input class="attribute-value" type="checkbox" id="coupsNonMortels" name="coupsNonMortels" {{#if coupsNonMortels}}checked{{/if}}/>
|
||||
{{/if}}
|
||||
{{#if ajustements.attaqueDefenseurSurpris.used}}
|
||||
<label id="defenseur-surprise">{{ajustements.attaqueDefenseurSurpris.label}}</label>
|
||||
{{/if}}
|
||||
</div>
|
||||
{{/if}}
|
||||
|
||||
{{>"systems/foundryvtt-reve-de-dragon/templates/dialog-roll-surenc.html"}}
|
||||
{{>"systems/foundryvtt-reve-de-dragon/templates/dialog-roll-enctotal.html"}}
|
||||
|
||||
<div id="tableAjustements">
|
||||
</div>
|
||||
<div id="tableResolution">
|
||||
</div>
|
||||
<div id="tableProbaReussite">
|
||||
|
||||
@ -1,6 +1,8 @@
|
||||
{{#if ajustements.encTotal.visible}}
|
||||
<div class="form-group">
|
||||
<label>Appliquer l'encombrement total comme malus ({{encTotal}}) ? </label>
|
||||
<div class="flexrow">
|
||||
<label>
|
||||
<input class="attribute-value checkbox-by-name" type="checkbox" name="useMalusEncTotal" {{#if useMalusEncTotal}}checked{{/if}}/>
|
||||
Appliquer l'encombrement comme malus ({{encTotal}}) ?
|
||||
</label>
|
||||
</div>
|
||||
{{/if}}
|
||||
|
||||
@ -1,6 +1,8 @@
|
||||
{{#if surencMalusFlag}}
|
||||
<div class="form-group">
|
||||
<label for="xp">Appliquer le malus de sur-encombrement ? </label>
|
||||
<div class="flexrow">
|
||||
<label>
|
||||
<input class="attribute-value checkbox-by-name" type="checkbox" name="useMalusSurenc" {{#if useMalusSurenc}}checked{{/if}}/>
|
||||
Appliquer le sur-encombrement
|
||||
</label>
|
||||
</div>
|
||||
{{/if}}
|
||||
|
||||
Loading…
Reference in New Issue
Block a user