Various fixes and ehnagcements

This commit is contained in:
2022-08-01 21:39:17 +02:00
parent e7faf7937b
commit 277cf7075c
13 changed files with 128 additions and 66 deletions

View File

@@ -63,7 +63,7 @@
<label class="short-label">Ability</label>
</span>
<span class="item-field-label-short">
<label class="short-label">Score</label>
<label class="short-label">Dice</label>
</span>
<span class="item-field-label-long">
<label class="short-label">Background</label>
@@ -75,7 +75,7 @@
src="{{skill.img}}" /></a>
<span class="item-name-label"><a class="roll-skill">{{skill.name}}</a></span>
<span class="item-field-label-short">{{upper skill.data.ability}}</span>
<span class="item-field-label-short">{{skill.data.level}}d8</span>
<span class="item-field-label-short">{{skill.data.skilldice}}</span>
<span class="item-field-label-long">&nbsp;-&nbsp;</span>
<div class="item-filler">&nbsp;</div>
<div class="item-controls item-controls-fixed">
@@ -107,7 +107,7 @@
<li class="item flexrow list-item list-item-shadow" data-item-id="{{weapon._id}}">
<a class="item-edit item-name-img" title="Edit Item"><img class="sheet-competence-img"
src="{{weapon.img}}" /></a>
<span class="item-name-label-long">{{weapon.name}}</span>
<span class="item-name-label-long"><a class ="roll-weapon">{{weapon.name}}</a></span>
<span class="item-field-label-short">{{weapon.data.ability}}</span>

View File

@@ -47,7 +47,15 @@
{{#if (eq rollAdvantage "roll-disadvantage")}}
<li>Roll with Disadvantage !</li>
{{/if}}
{{#if skillArmorPenalty}}
<li>Armor Penalty : {{skillArmorPenalty}} Disadvantage Dice </li>
{{/if}}
{{#if hasBonusDice}}
<li>Skill bonus dice : {{hasBonusDice}} </li>
{{/if}}
{{#if complexSkillDisadvantage}}
<li>Roll with Disadvantage because of Complex Skill at SL 0 !</li>
{{/if}}

View File

@@ -23,12 +23,12 @@
</select>
</li>
<li class="flexrow"><label class="generic-label">Subject to Armor Penalty ?</label>
<label class="attribute-value checkbox"><input type="checkbox" name="data.armorpenalty" {{checked data.armorpenalty}}/></label>
<li class="flexrow"><label class="generic-label">Is Feat Die (or SL +2) ?</label>
<label class="attribute-value checkbox"><input type="checkbox" name="data.isfeatdie" {{checked data.isfeatdie}}/></label>
</li>
<li class="flexrow"><label class="generic-label">Is Proficient ?</label>
<label class="attribute-value checkbox"><input type="checkbox" name="data.isproficient" {{checked data.isproficient}}/></label>
<li class="flexrow"><label class="generic-label">Subject to Armor Penalty ?</label>
<label class="attribute-value checkbox"><input type="checkbox" name="data.armorpenalty" {{checked data.armorpenalty}}/></label>
</li>
<li class="flexrow"><label class="generic-label">Skill Type</label>
@@ -41,19 +41,7 @@
</li>
<li class="flexrow"><label class="generic-label">Skill Dice</label>
<select class="competence-base flexrow" type="text" name="data.level" value="{{data.level}}" data-dtype="Number">
{{#select data.level}}
<option value="0">0</option>
<option value="1">1</option>
<option value="2">2</option>
<option value="3">3</option>
<option value="4">4</option>
<option value="5">5</option>
<option value="6">6</option>
<option value="7">7</option>
<option value="8">8</option>
{{/select}}
</select>
<input type="text" class="" name="data.skilldice" value="{{data.skilldice}} (level {{data.level}})" data-dtype="String" disabled/>
</li>
<li class="flexrow"><label class="generic-label">Is Innate ?</label>
@@ -96,7 +84,11 @@
<input type="text" class="" name="data.class" value="{{data.class}}" data-dtype="Number"/>
</li>
<li class="flexrow"><label class="generic-label">Exp</label>
<li class="flexrow"><label class="generic-label">Exp level</label>
<input type="text" class="" name="data.explevel" value="{{data.explevel}}" data-dtype="Number"/>
</li>
<li class="flexrow"><label class="generic-label">Gained exp (+1 to Exp level at 25)</label>
<input type="text" class="" name="data.exp" value="{{data.exp}}" data-dtype="Number"/>
</li>

View File

@@ -31,7 +31,7 @@
</li>
<li class="flexrow"><label class="generic-label">Associated skill</label>
<select class="competence-base flexrow" type="text" name="data.skill" value="{{data.skill}}" data-dtype="Number">
<select class="competence-base flexrow" type="text" name="data.skill" value="{{data.skill}}" data-dtype="String">
{{#select data.skill}}
{{#each weaponSkills as |skill idx|}}
<option value="{{skill.name}}">{{skill.name}}</option>

View File

@@ -13,20 +13,40 @@
<span class="roll-dialog-label">{{ability.value}}d6</span>
</div>
{{#if weapon}}
<div class="flexrow">
<span class="roll-dialog-label">Weapon : </span>
<span class="roll-dialog-label">{{weapon.name}}</span>
</div>
{{/if}}
{{#if skill}}
<div class="flexrow">
<span class="roll-dialog-label">Skill : </span>
<span class="roll-dialog-label">{{skill.name}} - {{skill.data.level}}d8</span>
<span class="roll-dialog-label">{{skill.name}} - {{skill.data.skilldice}}</span>
</div>
<div class="flexrow">
<span class="roll-dialog-label">Feature die or SL+2? : </span>
<span class="roll-dialog-label">{{#if skill.data.isfeatdie}} Yes {{else}} No {{/if}}</span>
</div>
{{/if}}
<div class="flexrow">
<span class="roll-dialog-label">Advantage/Disadvantage : </span>
<span class="roll-dialog-label">Advantage : </span>
<select class="status-small-label color-class-common" type="text" id="advantage" value="{{advantage}}" data-dtype="String" >
{{#select advantage}}
<option value="none">None</option>
<option value="advantage1">1 Advantage</option>
<option value="advantage2">2 Advantages</option>
{{/select}}
</select>
</div>
<div class="flexrow">
<span class="roll-dialog-label">Disadvantage : </span>
<select class="status-small-label color-class-common" type="text" id="disadvantage" value="{{disadvantage}}" data-dtype="String" >
{{#select isadvantage}}
<option value="none">None</option>
<option value="disadvantage1">1 Disadvantage</option>
<option value="disadvantage2">2 Disadvantages</option>
{{/select}}
@@ -44,30 +64,6 @@
</select>
</div>
<div class="flexrow">
<span class="roll-dialog-label">Feature Die : </span>
<select class="status-small-label color-class-common" type="text" id="featDieName" value="{{featDieName}}" data-dtype="String" >
{{#select featDieName}}
<option value="none">None</option>
{{#each featsDie as |feat idx|}}
<option value="{{feat.name}}">{{feat.name}}</option>
{{/each}}
{{/select}}
</select>
</div>
<div class="flexrow">
<span class="roll-dialog-label">Feature SL : </span>
<select class="status-small-label color-class-common" type="text" id="featSLName" value="{{featSLName}}" data-dtype="String" >
{{#select featSLName}}
<option value="none">None</option>
{{#each featsSL as |feat idx|}}
<option value="{{feat.name}}">{{feat.name}} ({{feat.data.sl}})</option>
{{/each}}
{{/select}}
</select>
</div>
</div>
</form>