Nighthawk/roll20-character-sheets
1
0
Fork 0
mirror of https://github.com/Nighthawk42/roll20-character-sheets.git synced 2026-09-01 20:52:29 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix double other xp issue

Browse Source
This commit is contained in:
Djjus
2021-07-05 01:56:23 +01:00
parent 9fe70c63ad
commit 9468fa3e00
1 changed files with 10 additions and 51 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Warhammer 4e Character Sheet/Warhammer 4e Character Sheet.html
+10 -51
View File
@@ -6126,9 +6126,8 @@
<input type="hidden" name="attr_XP_Skills" value="0" readonly />
<input type="hidden" name="attr_XP_SkillsRep" value="[[@{XP_Art}+@{XP_Entertain}+@{XP_Ride}+@{XP_Stealth}+@{XP_AnimalTraining}+@{XP_Language}+@{XP_Lore}+@{XP_Perform}+@{XP_Play}+@{XP_Sail}+@{XP_SecretSigns}+@{XP_Trade}]]" disabled />
<input type="hidden" name="attr_XP_Talents" value="0" readonly />
<input type="hidden" name="attr_XP_OtherPlus" value="0" readonly />
<input type="hidden" name="attr_XP_OtherMinus" value="0" readonly />
<input type="number" name="attr_XP_SpentAuto" value="@{XP_Char}+@{XP_Skills}+@{XP_SkillsRep}+@{XP_Talents}+@{XP_OtherMinus}-@{XP_OtherPlus}" disabled />
<input type="hidden" name="attr_XP_Other" value="0" readonly />
<input type="number" name="attr_XP_SpentAuto" value="@{XP_Char}+@{XP_Skills}+@{XP_SkillsRep}+@{XP_Talents}+@{XP_Other}" disabled />
</div>
<div class="sheet-col-1-4 sheet-pad-r-sm sheet-vert-top">
<input type="number" name="attr_XP_TotalAuto" value="[[@{xp}-(@{XP_SpentAuto})]]" disabled />
@@ -6155,12 +6154,12 @@
<div class="sheet-row">
<div class="sheet-col-21-100 sheet-center sheet-pad-r-sm" style="height: 20.5px; padding-top: 1px;">
<select class="sheet-select-no-arrow-center2" name="attr_OtherXPType" style="height: 20.5px;padding-top: 0px;">
<option value="0" data-i18n="FREE-CHAR-DESC" selected="selected">Free Characteristic - (deducts from XP spent)</option>
<option value="1" data-i18n="FREE-SKILL-DESC">Free Skill ----------- (deducts from XP spent)</option>
<option value="2" data-i18n="FREE-TALENT-DESC">Free Talent ---------- (deducts from XP spent)</option>
<option value="3" data-i18n="FREE-OTHER-DESC">Free Other ---------- (adds to XP spent)</option>
<option value="4" data-i18n="CAREER-CHANGE-DESC">Career Change ------- (adds to XP spent)</option>
<option value="5" data-i18n="OTHER-SPENT-DESC">Other XP spent ------ (adds to XP spent)</option>
<option value="-1" data-i18n="FREE-CHAR-DESC" selected="selected">Free Characteristic - (deducts from XP spent)</option>
<option value="-1" data-i18n="FREE-SKILL-DESC">Free Skill ----------- (deducts from XP spent)</option>
<option value="-1" data-i18n="FREE-TALENT-DESC">Free Talent ---------- (deducts from XP spent)</option>
<option value="1" data-i18n="FREE-OTHER-DESC">Free Other ---------- (adds to XP spent)</option>
<option value="1" data-i18n="CAREER-CHANGE-DESC">Career Change ------- (adds to XP spent)</option>
<option value="1" data-i18n="OTHER-SPENT-DESC">Other XP spent ------ (adds to XP spent)</option>
</select>
</div>
<input class="sheet-hidden" type="number" name="attr_OtherXP" readonly />
@@ -6168,52 +6167,16 @@
<div class="sheet-col-1-3 sheet-pad-r-sm sheet-vert-middle">
<input class="sheet-center" type="text" name="attr_OtherXPDesc" />
</div>
<input type="checkbox" name="attr_OtherXPType" class="sheet-hidden sheet-hider" value="0" checked="checked" />
<input type="checkbox" name="attr_OtherXPType" class="sheet-hidden sheet-hider" value="-1" checked="checked" />
<div class="sheet-col-1-10 sheet-center sheet-pad-r-sm sheet-vert-middle">
<input type="text" name="attr_OtherXPAdv" style="height: 21px;" value="0" />
</div>
<input type="checkbox" name="attr_OtherXPType" class="sheet-hidden sheet-hider" value="1" checked="checked" />
<div class="sheet-col-1-10 sheet-center sheet-pad-r-sm sheet-vert-middle">
<input type="text" name="attr_OtherXPAdv" style="height: 21px;" value="0" />
</div>
<input type="checkbox" name="attr_OtherXPType" class="sheet-hidden sheet-hider" value="2" checked="checked" />
<div class="sheet-col-1-10 sheet-center sheet-pad-r-sm sheet-vert-middle">
<input type="text" name="attr_OtherXPAdv" style="height: 21px;" value="0" />
</div>
<input type="checkbox" name="attr_OtherXPType" class="sheet-hidden sheet-hider" value="3" checked="checked" />
<div class="sheet-col-1-10 sheet-center sheet-pad-r-sm sheet-vert-middle">
<input type="text" name="attr_OtherXPAdv" style="height: 21px;" value="0" />
</div>
<input type="checkbox" name="attr_OtherXPType" class="sheet-hidden sheet-hider" value="4" checked="checked" />
<div class="sheet-col-1-10 sheet-center sheet-pad-r-sm sheet-vert-middle">
</div>
<input type="checkbox" name="attr_OtherXPType" class="sheet-hidden sheet-hider" value="5" checked="checked" />
<div class="sheet-col-1-10 sheet-center sheet-pad-r-sm sheet-vert-middle">
</div>
<input type="checkbox" name="attr_OtherXPType" class="sheet-hidden sheet-hider" value="0" checked="checked" />
<div class="sheet-col-1-10 sheet-center sheet-pad-r-sm sheet-vert-middle">
<input class="sheet-center" type="number" name="attr_OtherXP" value="0" min"0" />
</div>
<input type="checkbox" name="attr_OtherXPType" class="sheet-hidden sheet-hider" value="1" checked="checked" />
<div class="sheet-col-1-10 sheet-center sheet-pad-r-sm sheet-vert-middle">
<input class="sheet-center" type="number" name="attr_OtherXP" value="0" min"0" />
</div>
<input type="checkbox" name="attr_OtherXPType" class="sheet-hidden sheet-hider" value="2" checked="checked" />
<div class="sheet-col-1-10 sheet-center sheet-pad-r-sm sheet-vert-middle">
<input class="sheet-center" type="number" name="attr_OtherXP" value="0" min"0" />
</div>
<input type="checkbox" name="attr_OtherXPType" class="sheet-hidden sheet-hider" value="3" checked="checked" />
<div class="sheet-col-1-10 sheet-center sheet-pad-r-sm sheet-vert-middle">
<input class="sheet-center" type="number" name="attr_OtherXP" value="0" min"0" />
</div>
<input type="checkbox" name="attr_OtherXPType" class="sheet-hidden sheet-hider" value="4" checked="checked" />
<div class="sheet-col-1-10 sheet-center sheet-pad-r-sm sheet-vert-middle">
<input class="sheet-center" type="number" name="attr_OtherXP2" value="0" min"0" />
</div>
<input type="checkbox" name="attr_OtherXPType" class="sheet-hidden sheet-hider" value="5" checked="checked" />
<div class="sheet-col-1-10 sheet-center sheet-pad-r-sm sheet-vert-middle">
<input class="sheet-center" type="number" name="attr_OtherXP2" value="0" min"0" />
</div>
</div>
<span class="sheet-spacer"></span>
</fieldset>
@@ -27641,11 +27604,7 @@ on('sheet:opened change:repeating_otherxp:otherxp change:repeating_otherxp:other
});
on('sheet:opened change:repeating_otherxp remove:repeating_otherxp', function() {
repeatingSum('XP_OtherPlus', "otherxp", 'OtherXP');
});
on('sheet:opened change:repeating_otherxp remove:repeating_otherxp', function() {
repeatingSum('XP_OtherMinus', "otherxp", 'OtherXP2');
repeatingSum('XP_Other', "otherxp",['OtherXPType','OtherXP']);
});
on("change:repeating_InvContainer1 remove:repeating_InvContainer1", function(eventInfo) {