Sync with head

This commit is contained in:
2020-05-24 20:19:57 +02:00
parent c144b2473c
commit 003d548f1f
10 changed files with 754 additions and 175 deletions

View File

@ -1,20 +1,18 @@
<form class="{{cssClass}}" autocomplete="off">
<form class="{{cssClass}} flexcol" autocomplete="off">
{{!-- Sheet Header --}}
<header class="sheet-header">
<img class="profile-img" src="{{actor.img}}" data-edit="img" title="{{actor.name}}" height="100" width="100"/>
<div class="header-fields">
<h1 class="charname"><input name="name" type="text" value="{{actor.name}}" placeholder="Name"/></h1>
<div class="resource">
<input type="text" name="data.sante.vie.value" value="{{data.sante.vie.value}}" data-dtype="Number"/>
<span> / </span>
<input type="text" name="data.sante.vie.max" value="{{data.sante.vie.max}}" data-dtype="Number"/>
<h1 class="charname"><input name="name" type="text" value="{{actor.name}}" placeholder="Name"/></h1>
<div class="grid grid-2col">
<div class="flex-group-center">
<input class="resource-content flexrow flex-center flex-between" type="text" name="data.sante.vie.value" value="{{data.sante.vie.value}}" data-dtype="Number"/>/{{data.sante.vie.max}}
</div>
<div class="resource">
<input type="text" name="data.sante.fatigue.value" value="{{data.sante.fatigue.value}}" data-dtype="Number"/>
<span> / </span>
<input type="text" name="data.sante.fatigue.max" value="{{data.sante.fatigue.max}}" data-dtype="Number"/>
<div class="flex-group-center">
<input class="resource-content flexrow flex-center flex-between" type="text" name="data.sante.fatigue.value" value="{{data.sante.fatigue.value}}" data-dtype="Number"/>/{{data.sante.fatigue.max}}
</div>
</div>
</div>
</header>
@ -31,23 +29,45 @@
<section class="sheet-body">
{{!-- Carac Tab --}}
<div class="tab carac" data-group="primary" data-tab="carac">
<header class="carac-header flexrow">
<span class="carac-title">Nom</span>
<span class="carac-title">Valeur</span>
<span class="carac-title">XP</span>
</header>
<ol class="competence-list">
{{#each data.carac as |carac key|}}
<li class="competence flexrow" data-attribute="{{key}}">
<span class="competence-label" name="data.carac.{{key}}.label">{{carac.label}}</span>
<input class="competence-value" type="text" name="data.carac.{{key}}.value" value="{{carac.value}}" data-dtype="{{carac.type}}"/>
<input class="competence-xp" type="text" name="data.carac.{{key}}.xp" value="{{carac.xp}}" data-dtype="number"/>
</li>
{{/each}}
</ol>
<div class="tab" data-group="primary" data-tab="carac">
<div class="grid grid-2col">
<div class="flex-group-center">
<header class="carac-header flexrow">
<span class="carac-title">Nom</span>
<span class="carac-title">Valeur</span>
<span class="carac-title">XP</span>
</header>
<ol class="carac-list">
{{#each data.carac as |carac key|}}
<li class="competence flexrow" data-attribute="{{key}}">
<span class="competence-label" name="data.carac.{{key}}.label">{{carac.label}}</span>
{{#if carac.derivee}}
<label class="competence-value">{{carac.value}}</label>
{{else}}
<input class="competence-value" type="text" name="data.carac.{{key}}.value" value="{{carac.value}}" data-dtype="{{carac.type}}"/>
<input class="competence-xp" type="text" name="data.carac.{{key}}.xp" value="{{carac.xp}}" data-dtype="number"/>
{{/if}}
</li>
{{/each}}
</ol>
</div>
<div class="flex-group-center" >
<header class="attributs-header flexrow">
<span class="attributs-title">Nom</span>
<span class="attributs-title">Valeur</span>
</header>
<ol class="attributs-list">
{{#each data.attributs as |attr key|}}
<li class="attribut flexrow" data-attribute="{{key}}">
<span class="attribut-label" name="data.attributs.{{key}}.label">{{attr.label}}</span>
<label class="attribut-value">{{attr.value}}</label>
</li>
{{/each}}
</ol>
</div>
</div>
</div>
{{!-- Compétences Tab --}}
<div class="tab competences" data-group="primary" data-tab="competences">
<header class="competence-header flexrow">
@ -59,7 +79,7 @@
{{#each data.competenceByCategory.generale as |comp key|}}
<li class="item flexrow" data-attribute="{{key}}">
<span class="competence-label" name="data.competenceByCategory.generale[{{key}}].name"><a>{{comp.name}}</a></span>
<input class="competence-value" type="text" name="data.competenceByCategory.generale[{{key}}].data.niveau" value="{{comp.data.niveau}}" data-dtype="number"/>
<input class="competence-value" type="text" name="data.competenceByCategory.generale[{{key}}].data.niveau" value="{{numberFormat comp.data.niveau decimals=0 sign=true}}" data-dtype="number"/>
<input class="competence-xp" type="text" name="data.competenceByCategory.generale[{{key}}].data.xp" value="{{comp.data.xp}}" data-dtype="number"/>
</li>
{{/each}}

View File

@ -0,0 +1,67 @@
<form class="skill-roll-dialog">
<h2 class="compdialog" id="compdialogTitle"></h2>
<div class="form-group">
<label for="categorie">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>
</div>
<div class="form-group">
<label for="categorie">Bonus/Malus</label>
<select name="bonusmalus" id="bonusmalus" data-dtype="number">
{{#select bonusmalus}}
{{#each bonusmalusTable as |bmvalue key|}}
<option value={{bmvalue}}>{{bmvalue}}</option>
{{/each}}
{{/select}}
</select>
</div>
<div class="form-group">
<label>Résultat : </label><label id="roll-param">10 / 0</label>
</div>
<div id="resolutionTable">
</div>
</form>
<script>
// Get the rollData stuff
var rollData = CONFIG.currentRollData;
function updateRollResult( rollData ) {
rollData.finalLevel = parseInt(rollData.competence.data.niveau) + parseInt(rollData.bmValue);
$(".table-resolution").remove();
game.data.RdDUtility.makeHTMLResolutionTable( $("#resolutionTable"), rollData.selectedCarac.value-2, parseInt(rollData.selectedCarac.value) + 2 );
rollData.finalLevelStr = (rollData.finalLevel > 0 ) ? "+" + rollData.finalLevel : rollData.finalLevel;
$("#roll-param").text( rollData.selectedCarac.value + " / " + rollData.finalLevelStr );
rollData.rollTarget = game.data.RdDUtility.getResolutionField( rollData.selectedCarac.value, rollData.finalLevel);
$("#compdialogTitle").text( rollData.competence.name + " - " + rollData.competence.data.niveau + " - " + rollData.selectedCarac.label );
}
// Setup everything onload
$(function() {
// Set the default carac from the competence item
rollData.selectedCarac = rollData.carac[rollData.competence.data.carac_defaut];
// Update html, according to data
$("#carac").val( rollData.competence.data.carac_defaut );
$("#bonusmalus").val( rollData.bmValue );
updateRollResult(rollData);
});
// Update !
$('#bonusmalus').click((event) => {
rollData.bmValue = event.currentTarget.value; // Update the selected bonus/malus
console.log("BM CLICKED !!!", rollData.bmValue, rollData.competence.data.niveau, parseInt(rollData.competence.data.niveau) + parseInt(rollData.bmValue) );
updateRollResult(rollData);
});
$('#carac').click((event) => {
let caracKey = event.currentTarget.value;
rollData.selectedCarac = rollData.carac[caracKey]; // Update the selectedCarac
console.log("CARAC CLICKED !!!", rollData.selectedCarac, rollData.competence.data.niveau, rollData.bmValue);
updateRollResult(rollData);
});
</script>