diff --git a/Warhammer Fantasy Roleplay 4e Official/src/js/sheetworkers.js b/Warhammer Fantasy Roleplay 4e Official/src/js/sheetworkers.js index 294a78997e..024c826371 100644 --- a/Warhammer Fantasy Roleplay 4e Official/src/js/sheetworkers.js +++ b/Warhammer Fantasy Roleplay 4e Official/src/js/sheetworkers.js @@ -224,9 +224,8 @@ const wfrpModule = ( () => { const toggleInitOption = (new_value) => { const init = (new_value === "1") ? `{{init=[[@{initiative}+@{init_bonus} &{tracker}]]}}` : (new_value === "2") ? `{{init=[[@{initiative}+1d10+@{init_bonus} &{tracker}]]}}` : - (new_value === "3") ? `{{init=[[@{agility_bonus}+@{initiatve_bonus}+1d10+@{init_bonus} &{tracker}]]}}` : - `{{init=[[@{initiative}+@{init_bonus}]]}}`; - + (new_value === "3") ? `{{init=[[@{agility_bonus}+@{initiative_bonus}+1d10+@{init_bonus} &{tracker}]]}}` : + `{{init=[[@{initiative}]]}}`; setAttrs({roll_init:init}); } diff --git a/Warhammer Fantasy Roleplay 4e Official/src/pug/wfrp4.pug b/Warhammer Fantasy Roleplay 4e Official/src/pug/wfrp4.pug index bc056a9a44..b04b670417 100644 --- a/Warhammer Fantasy Roleplay 4e Official/src/pug/wfrp4.pug +++ b/Warhammer Fantasy Roleplay 4e Official/src/pug/wfrp4.pug @@ -3,7 +3,7 @@ include rolls.pug include components/_component-index.pug -input(name="attr_sheet_version", type="hidden", value="1.0.4") +input(name="attr_sheet_version", type="hidden", value="1.0.5") input(name="attr_npc", type="hidden", value="0") input(name="attr_nav", type="hidden", value="main") input(name="attr_difficulty_query", type="hidden", value="?{Difficulty|Average (+20), 20|Very Easy (+60), 60|Easy (+40), 40|Average (+20), 20|Challenging (0), 0|Difficult (-10), -10|Hard (-20), -20|Very Hard (-30), -30}") @@ -12,7 +12,7 @@ input(name="attr_roll_query", type="hidden", value="?{Bonus|0}") input(name="attr_roll_slbonus", type="hidden", value="{{roll_slbonus=?{SL Bonus|0}}}") input(name="attr_roll_cf", type="hidden", value="96") input(name="attr_roll_cs", type="hidden", value="5") -input(name="attr_roll_init", type="hidden", value="{{init=[[@{initiative}+@{initiative_bonus} &{tracker}]]}}") +input(name="attr_roll_init", type="hidden", value="{{init=[[@{initiative}+@{init_bonus} &{tracker}]]}}") input(name="attr_roll_cs", type="hidden", value="5") input(name="attr_roll_whisper", type="hidden", value="") diff --git a/Warhammer Fantasy Roleplay 4e Official/wfrp4.html b/Warhammer Fantasy Roleplay 4e Official/wfrp4.html index 4ffceaae09..82300b221e 100644 --- a/Warhammer Fantasy Roleplay 4e Official/wfrp4.html +++ b/Warhammer Fantasy Roleplay 4e Official/wfrp4.html @@ -1,5 +1,5 @@ - + @@ -8,7 +8,7 @@ - + @@ -9098,9 +9098,8 @@ const toggleInitOption = (new_value) => { const init = (new_value === "1") ? `{{init=[[@{initiative}+@{init_bonus} &{tracker}]]}}` : (new_value === "2") ? `{{init=[[@{initiative}+1d10+@{init_bonus} &{tracker}]]}}` : - (new_value === "3") ? `{{init=[[@{agility_bonus}+@{initiatve_bonus}+1d10+@{init_bonus} &{tracker}]]}}` : - `{{init=[[@{initiative}+@{init_bonus}]]}}`; - + (new_value === "3") ? `{{init=[[@{agility_bonus}+@{initiative_bonus}+1d10+@{init_bonus} &{tracker}]]}}` : + `{{init=[[@{initiative}]]}}`; setAttrs({roll_init:init}); }