#50 - bugfix for same value bug on armour type select box

This commit is contained in:
Actoba
2014-08-16 21:43:48 +01:00
parent 0c17f72198
commit d4de4e9bf1
+46 -36
View File
@@ -4185,10 +4185,27 @@
<div class="sheet-section-inventory">
<div class="sheet-row">
<div class="sheet-col-3-5 sheet-padr">
<div class="sheet-row">
<div class="sheet-col-1-2 sheet-padl">
<h4 class="sheet-center">Armour Class <span class="sheet-pictos-three">b</span></h4>
<div class="sheet-row sheet-padb">
<div class="sheet-col-1-2 sheet-small-label sheet-center"><input class="sheet-underlined" type="number" name="attr_AC" value="@{armourtotalACequipped}" disabled="disabled" ><br/>AC</div>
<div class="sheet-col-1-2 sheet-small-label sheet-center"><input class="sheet-underlined" type="number" name="attr_AC_no_armour" value="10" step="1"><br/>AC (no armour)</div>
</div>
</div>
</div>
<h4 class="sheet-center">Armour Class <span class="sheet-pictos-three">b</span></h4>
<p class="sheet-small-note">Add any equipment, effects or items here that give you AC. This includes armour, shields and any magical items or spells. Use the checkbox to indicate whether each row is active/equipped.</p>
<div class="sheet-row sheet-sub-header">
@@ -4209,14 +4226,14 @@
<div class="sheet-col-1-12"><input type="number" name="attr_armourACbase1" value="0" step="1"></div>
<div class="sheet-col-1-6">
<select name="attr_armourtype1">
<option value="0" selected="selected">n/a</option>
<option value="@{dexterity_mod}">Light</option>
<option value="(ceil((@{dexterity_mod}-1)/1e10)*2 - floor((@{dexterity_mod}-2)/1e10)*@{dexterity_mod})">Medium</option>
<option value="0">Heavy</option>
<option value="0.001" selected="selected">n/a</option>
<option value="@{dexterity_mod} + 0.002">Light</option>
<option value="(ceil((@{dexterity_mod}-1)/1e10)*2 - floor((@{dexterity_mod}-2)/1e10)*@{dexterity_mod}) + 0.003">Medium</option>
<option value="0.004">Heavy</option>
</select>
</div>
<div class="sheet-col-1-12"><input type="number" name="attr_armourmagicbonus1" value="0" step="1"></div>
<div class="sheet-col-1-12"><input type="number" name="attr_armourtotalAC1" value="@{armourACbase1}+@{armourtype1}+@{armourmagicbonus1}" disabled="disabled"></div>
<div class="sheet-col-1-12"><input type="number" name="attr_armourtotalAC1" value="@{armourACbase1}+floor(@{armourtype1})+@{armourmagicbonus1}" disabled="disabled"></div>
<div class="sheet-col-1-6">
<select name="attr_armourstealthpen1">
<option value="No Penalty" selected="selected">None</option>
@@ -4236,15 +4253,15 @@
<div class="sheet-col-1-4"><input type="text" name="attr_amourname2"></div>
<div class="sheet-col-1-12"><input type="number" name="attr_armourACbase2" value="0" step="1"></div>
<div class="sheet-col-1-6">
<select name="attr_armourtype2">
<option value="0" selected="selected">n/a</option>
<option value="@{dexterity_mod}">Light</option>
<option value="(ceil((@{dexterity_mod}-1)/1e10)*2 - floor((@{dexterity_mod}-2)/1e10)*@{dexterity_mod})">Medium</option>
<option value="0">Heavy</option>
<select name="attr_armourtype1">
<option value="0.001" selected="selected">n/a</option>
<option value="@{dexterity_mod} + 0.002">Light</option>
<option value="(ceil((@{dexterity_mod}-1)/1e10)*2 - floor((@{dexterity_mod}-2)/1e10)*@{dexterity_mod}) + 0.003">Medium</option>
<option value="0.004">Heavy</option>
</select>
</div>
<div class="sheet-col-1-12"><input type="number" name="attr_armourmagicbonus2" value="0" step="1"></div>
<div class="sheet-col-1-12"><input type="number" name="attr_armourtotalAC2" value="@{armourACbase2}+@{armourtype2}+@{armourmagicbonus2}" disabled="disabled"></div>
<div class="sheet-col-1-12"><input type="number" name="attr_armourtotalAC2" value="@{armourACbase2}+floor(@{armourtype2})+@{armourmagicbonus2}" disabled="disabled"></div>
<div class="sheet-col-1-6">
<select name="attr_armourstealthpen2">
<option value="No Penalty" selected="selected">None</option>
@@ -4264,15 +4281,15 @@
<div class="sheet-col-1-4"><input type="text" name="attr_amourname3"></div>
<div class="sheet-col-1-12"><input type="number" name="attr_armourACbase3" value="0" step="1"></div>
<div class="sheet-col-1-6">
<select name="attr_armourtype3">
<option value="0" selected="selected">n/a</option>
<option value="@{dexterity_mod}">Light</option>
<option value="(ceil((@{dexterity_mod}-1)/1e10)*2 - floor((@{dexterity_mod}-2)/1e10)*@{dexterity_mod})">Medium</option>
<option value="0">Heavy</option>
<select name="attr_armourtype1">
<option value="0.001" selected="selected">n/a</option>
<option value="@{dexterity_mod} + 0.002">Light</option>
<option value="(ceil((@{dexterity_mod}-1)/1e10)*2 - floor((@{dexterity_mod}-2)/1e10)*@{dexterity_mod}) + 0.003">Medium</option>
<option value="0.004">Heavy</option>
</select>
</div>
<div class="sheet-col-1-12"><input type="number" name="attr_armourmagicbonus3" value="0" step="1"></div>
<div class="sheet-col-1-12"><input type="number" name="attr_armourtotalAC3" value="@{armourACbase3}+@{armourtype3}+@{armourmagicbonus3}" disabled="disabled"></div>
<div class="sheet-col-1-12"><input type="number" name="attr_armourtotalAC3" value="@{armourACbase3}+floor(@{armourtype3})+@{armourmagicbonus3}" disabled="disabled"></div>
<div class="sheet-col-1-6">
<select name="attr_armourstealthpen3">
<option value="No Penalty" selected="selected">None</option>
@@ -4292,15 +4309,15 @@
<div class="sheet-col-1-4"><input type="text" name="attr_amourname4"></div>
<div class="sheet-col-1-12"><input type="number" name="attr_armourACbase4" value="0" step="1"></div>
<div class="sheet-col-1-6">
<select name="attr_armourtype4">
<option value="0" selected="selected">n/a</option>
<option value="@{dexterity_mod}">Light</option>
<option value="(ceil((@{dexterity_mod}-1)/1e10)*2 - floor((@{dexterity_mod}-2)/1e10)*@{dexterity_mod})">Medium</option>
<option value="0">Heavy</option>
<select name="attr_armourtype1">
<option value="0.001" selected="selected">n/a</option>
<option value="@{dexterity_mod} + 0.002">Light</option>
<option value="(ceil((@{dexterity_mod}-1)/1e10)*2 - floor((@{dexterity_mod}-2)/1e10)*@{dexterity_mod}) + 0.003">Medium</option>
<option value="0.004">Heavy</option>
</select>
</div>
<div class="sheet-col-1-12"><input type="number" name="attr_armourmagicbonus4" value="0" step="1"></div>
<div class="sheet-col-1-12"><input type="number" name="attr_armourtotalAC4" value="@{armourACbase4}+@{armourtype4}+@{armourmagicbonus4}" disabled="disabled"></div>
<div class="sheet-col-1-12"><input type="number" name="attr_armourtotalAC4" value="@{armourACbase4}+floor(@{armourtype4})+@{armourmagicbonus4}" disabled="disabled"></div>
<div class="sheet-col-1-6">
<select name="attr_armourstealthpen4">
<option value="No Penalty" selected="selected">None</option>
@@ -4320,15 +4337,15 @@
<div class="sheet-col-1-4"><input type="text" name="attr_amourname5"></div>
<div class="sheet-col-1-12"><input type="number" name="attr_armourACbase5" value="0" step="1"></div>
<div class="sheet-col-1-6">
<select name="attr_armourtype5">
<option value="0" selected="selected">n/a</option>
<option value="@{dexterity_mod}">Light</option>
<option value="(ceil((@{dexterity_mod}-1)/1e10)*2 - floor((@{dexterity_mod}-2)/1e10)*@{dexterity_mod})">Medium</option>
<option value="0">Heavy</option>
<select name="attr_armourtype1">
<option value="0.001" selected="selected">n/a</option>
<option value="@{dexterity_mod} + 0.002">Light</option>
<option value="(ceil((@{dexterity_mod}-1)/1e10)*2 - floor((@{dexterity_mod}-2)/1e10)*@{dexterity_mod}) + 0.003">Medium</option>
<option value="0.004">Heavy</option>
</select>
</div>
<div class="sheet-col-1-12"><input type="number" name="attr_armourmagicbonus5" value="0" step="1"></div>
<div class="sheet-col-1-12"><input type="number" name="attr_armourtotalAC5" value="@{armourACbase5}+@{armourtype5}+@{armourmagicbonus5}" disabled="disabled"></div>
<div class="sheet-col-1-12"><input type="number" name="attr_armourtotalAC5" value="@{armourACbase5}+floor(@{armourtype5})+@{armourmagicbonus5}" disabled="disabled"></div>
<div class="sheet-col-1-6">
<select name="attr_armourstealthpen5">
<option value="No Penalty" selected="selected">None</option>
@@ -4342,13 +4359,6 @@
</select>
</div>
</div>
<div class="sheet-row">
<div class="sheet-col-11-24"></div>
<div class="sheet-col-1-6 sheet-small-label sheet-center sheet-margin-top">Total (active) : </div>
<div class="sheet-col-1-12"><input type="number" name="attr_armourtotalACequipped" value="@{armouractive1}+@{armouractive2}+@{armouractive3}+@{armouractive4}+@{armouractive5}" disabled="disabled"></div>
<div class="sheet-col-7-24"></div>
</div>
</div>