Merge pull request #11474 from Djjus/dev-wfrp4e-165a-fixes
[Warhammer 4e Character Sheet] v1.65a Fixes
This commit is contained in:
Miguel Peres
@@ -81,6 +81,14 @@ Note conditions are not intended for out of combat situations, GM simply makes t
|
||||
|
||||
///// ============ Change Log ============ /////
|
||||
|
||||
February 14th 2022 v1.65a
|
||||
|
||||
- Fixed some skill rolls not always working due to new Besmirched condition bug
|
||||
- Fixed NPC fumble/crit not working from the combat text clicky
|
||||
- Fixed Talent integration description il8n tags
|
||||
- Fixed Channelling so no long removes SL from the Ext Accu SL pool when failing the roll
|
||||
|
||||
|
||||
December 20th 2022 v1.65
|
||||
|
||||
- Added Ranged Weapons to be equipable in Mainhand/Offhand. This allows ranged offhand, and mixing with Melee inclding Dualwield Ranged.
|
||||
|
||||
@@ -1779,27 +1779,27 @@
|
||||
</div>
|
||||
<input type="checkbox" name="attr_NPCUsedWeapon" class="hidden hider" value="1" />
|
||||
<div class="col-1-30 left pad-r-sm block-a">
|
||||
<button type="action" class="npc-combat" name="act_npcattackroll" style="margin-left: 51px" value="@{Whisper} &{template:whfrp2e} {{modvalue=[[?{Modifier (Adv. already added)|0}]]}} {{unconscious=[[@{UnconsciousStat}]]}} {{cond=[[{[[@{ConditionModNPC}]],[[@{ConditionMoveModNPC}]],[[@{ConditionSeeModNPC}]]}kh1]]}} {{fatigued=[[@{FatiguedStat}]]}} {{broken=[[@{BrokenStat}]]}} {{stuned=[[@{StunedStat}]]}} {{poisoned=[[@{PoisonedStat}]]}} {{prone=[[@{ProneStat}]]}} {{entangled=[[@{EntangledStat}]]}} {{blinded=[[@{BlindedStat}]]}} {{deafened=[[0]]}} {{title=@{NPCWeaponName}}} {{character_name=@{npc_name}}} {{attacktype=Attack}} {{advantage=[[@{AdvantageNPCDisplay}]]}} {{target=[[ [[{[[@{ConditionModNPC}]],[[@{ConditionMoveModNPC}]],[[@{ConditionSeeModNPC}]]}kh1]] [COND] + [[@{WeaponSkillNPC}+@{NPCBonus}]] [SKILL] +(@{AdvantageNPC}*10) [ADV] + ?{Modifier (Adv. already added)|0} [MOD] ]]}} {{attacktest=true}} {{showdmg=[[1]]}} {{SLmod=[[?{SL Modifier|0}]]}} {{hitlocation=true}} {{test=[[@{roll_rule}]]}} {{reach=@{NPCMeleeReach}}} {{qualities=@{NPCQualities}}} {{rolltype=[[@{NPCImpale}]]}} {{damage=[[@{NPCStrengthBonus}+@{NPCDamage}]]}} {{NPC=[[1]]}} {{RTcrit=@{NPC-rt-crit}}} {{RTfumble=@{NPC-rt-fumble}}} {{reroll=@{NPC-rep}NPCAttack)}}"><span data-i18n="ABB-ATK">Atk</span></button>
|
||||
<button type="action" class="npc-combat" name="act_npcattackroll" style="margin-left: 51px" ><span data-i18n="ABB-ATK">Atk</span></button>
|
||||
</div>
|
||||
<input type="checkbox" name="attr_NPCUsedWeapon" class="hidden hider" value="2" />
|
||||
<div class="col-1-30 left pad-r-sm block-a">
|
||||
<button type="action" class="npc-combat" name="act_npcattack2roll" style="margin-left: 51px" value="@{Whisper} &{template:whfrp2e} {{modvalue=[[?{Modifier (Adv. already added)|0}]]}} {{unconscious=[[@{UnconsciousStat}]]}} {{cond=[[{[[@{ConditionModNPC}]],[[@{ConditionMoveModNPC}]],[[@{ConditionSeeModNPC}]]}kh1]]}} {{fatigued=[[@{FatiguedStat}]]}} {{broken=[[@{BrokenStat}]]}} {{stuned=[[@{StunedStat}]]}} {{poisoned=[[@{PoisonedStat}]]}} {{prone=[[@{ProneStat}]]}} {{entangled=[[@{EntangledStat}]]}} {{blinded=[[@{BlindedStat}]]}} {{deafened=[[0]]}} {{title=@{NPCWeaponName2}}} {{character_name=@{npc_name}}} {{attacktype=Attack}} {{advantage=[[@{AdvantageNPCDisplay}]]}} {{target=[[ [[{[[@{ConditionModNPC}]],[[@{ConditionMoveModNPC}]],[[@{ConditionSeeModNPC}]]}kh1]] [COND] + [[@{WeaponSkillNPC2}+@{NPCBonus2}]] [SKILL] + [[@{AdvantageNPC}*10]] [ADV] + ?{Modifier (Adv. already added)|0}]]}} {{attacktest=true}} {{showdmg=[[1]]}} {{SLmod=[[?{SL Modifier|0}]]}} {{hitlocation=true}} {{test=[[@{roll_rule}]]}} {{reach=@{NPCMeleeReach2}}} {{qualities=@{NPCQualities2}}} {{rolltype=[[@{NPCImpale2}]]}} {{damage=[[@{NPCStrengthBonus2}+@{NPCDamage2}]]}} {{NPC=[[1]]}} {{RTcrit=@{RT-crit}}} {{RTfumble=@{NPC-rt-fumble}}} {{reroll=@{NPC-rep}NPCAttack2)}}"><span data-i18n="ABB-ATK">Atk</span></button>
|
||||
<button type="action" class="npc-combat" name="act_npcattack2roll" style="margin-left: 51px" ><span data-i18n="ABB-ATK">Atk</span></button>
|
||||
</div>
|
||||
<input type="checkbox" name="attr_NPCUsedWeapon" class="hidden hider" value="3" />
|
||||
<div class="col-1-30 left pad-r-sm block-a">
|
||||
<button type="action" class="npc-combat" name="act_npcattack3roll" style="margin-left: 51px" value="@{Whisper} &{template:whfrp2e} {{modvalue=[[?{Modifier (Adv. already added)|0}]]}} {{unconscious=[[@{UnconsciousStat}]]}} {{cond=[[{[[@{ConditionModNPC}]],[[@{ConditionMoveModNPC}]],[[@{ConditionSeeModNPC}]]}kh1]]}} {{fatigued=[[@{FatiguedStat}]]}} {{broken=[[@{BrokenStat}]]}} {{stuned=[[@{StunedStat}]]}} {{poisoned=[[@{PoisonedStat}]]}} {{prone=[[@{ProneStat}]]}} {{entangled=[[@{EntangledStat}]]}} {{blinded=[[@{BlindedStat}]]}} {{deafened=[[0]]}} {{title=@{NPCWeaponName3}}} {{character_name=@{npc_name}}} {{attacktype=Attack}} {{advantage=[[@{AdvantageNPCDisplay}]]}} {{target=[[ [[{[[@{ConditionModNPC}]],[[@{ConditionMoveModNPC}]],[[@{ConditionSeeModNPC}]]}kh1]] + [[@{WeaponSkillNPC3}+@{NPCBonus3}]] [SKILL] + [[(@{AdvantageNPC}*10)]] [ADV] + ?{Modifier (Adv. already added)|0} [MOD] ]]}} {{attacktest=true}} {{showdmg=[[1]]}} {{SLmod=[[?{SL Modifier|0}]]}} {{hitlocation=true}} {{test=[[@{roll_rule}]]}} {{reach=@{NPCMeleeReach3}}} {{qualities=@{NPCQualities3}}} {{rolltype=[[@{NPCImpale3}]]}} {{damage=[[@{NPCStrengthBonus3}+@{NPCDamage3}]]}} {{NPC=[[1]]}} {{RTcrit=@{RT-crit}}} {{RTfumble=@{NPC-rt-fumble}}} {{reroll=@{NPC-rep}NPCAttack3)}}"><span data-i18n="ABB-ATK">Atk</span></button>
|
||||
<button type="action" class="npc-combat" name="act_npcattack3roll" style="margin-left: 51px" ><span data-i18n="ABB-ATK">Atk</span></button>
|
||||
</div>
|
||||
<input type="checkbox" name="attr_NPCUsedDefensive" class="hidden hider" value="1" />
|
||||
<div class="col-1-30 center pad-r-sm block-a">
|
||||
<button type="action" class="npc-combat" name="act_npcopposedroll" style="margin-left: 52px" value="@{Whisper} &{template:whfrp2e} {{modvalue=[[?{Modifier (Adv. already added)|0}]]}} {{unconscious=[[@{UnconsciousStat}]]}} {{cond=[[{[[@{ConditionModNPC}]],[[@{ConditionMoveModNPC}]],[[@{ConditionSeeModNPC}]]}kh1]]}} {{fatigued=[[@{FatiguedStat}]]}} {{broken=[[@{BrokenStat}]]}} {{stuned=[[@{StunedStat}]]}} {{poisoned=[[@{PoisonedStat}]]}} {{prone=[[@{ProneStat}]]}} {{entangled=[[@{EntangledStat}]]}} {{blindeded=[[@{BlindedStat}]]}} {{deafened=[[0]]}} {{title=@{NPCWeaponName}}} {{character_name=@{npc_name}}} {{attacktype=^{OPPOSED}}} {{advantage=[[@{AdvantageNPCDisplay}]]}} {{target=[[ [[{[[@{ConditionModNPC}]],[[@{ConditionMoveModNPC}]],[[@{ConditionSeeModNPC}]]}kh1]] [COND] + [[@{WeaponSkillNPC}+@{NPCBonus}]] [SKILL] +(@{AdvantageNPC}*10) [ADV] +?{Modifier (Adv. already added)|0} [MOD] ]]}} {{attacktest=true}} {{showdmg=[[1]]}} {{SLmod=[[?{SL Modifier|0}+@{NPCDefensive}]]}} {{test=[[@{roll_rule}]]}} {{reach=@{NPCMeleeReach}}} {{qualities=@{NPCQualities}}} {{rolltype=[[@{NPCImpale}]]}} {{NPC=[[1]]}} {{RTcrit=@{NPC-rt-crit}}} {{RTfumble=@{NPC-rt-fumble}}} {{reroll=@{NPC-rep}NPCOpposed)}}"><span data-i18n="ABB-OPP">Opp</span></button>
|
||||
<button type="action" class="npc-combat" name="act_npcopposedroll" style="margin-left: 52px" ><span data-i18n="ABB-OPP">Opp</span></button>
|
||||
</div>
|
||||
<input type="checkbox" name="attr_NPCUsedDefensive" class="hidden hider" value="2" />
|
||||
<div class="col-1-30 center pad-r-sm block-a">
|
||||
<button type="action" class="npc-combat" name="act_npcopposed2roll" style="margin-left: 52px" value="@{Whisper} &{template:whfrp2e} {{modvalue=[[?{Modifier (Adv. already added)|0}]]}} {{unconscious=[[@{UnconsciousStat}]]}} {{cond=[[{[[@{ConditionModNPC}]],[[@{ConditionMoveModNPC}]],[[@{ConditionSeeModNPC}]]}kh1]]}} {{fatigued=[[@{FatiguedStat}]]}} {{broken=[[@{BrokenStat}]]}} {{stuned=[[@{StunedStat}]]}} {{poisoned=[[@{PoisonedStat}]]}} {{prone=[[@{ProneStat}]]}} {{entangled=[[@{EntangledStat}]]}} {{blinded=[[@{BlindedStat}]]}} {{deafened=[[0]]}} {{title=@{NPCWeaponName2}}} {{character_name=@{npc_name}}} {{attacktype=^{OPPOSED}}} {{advantage=[[@{AdvantageNPCDisplay}]]}} {{target=[[ [[{[[@{ConditionModNPC}]],[[@{ConditionMoveModNPC}]],[[@{ConditionSeeModNPC}]]}kh1]] [COND] + [[@{WeaponSkillNPC2}+@{NPCBonus2}]] [SKILL] + (@{AdvantageNPC}*10) [ADV] + ?{Modifier (Adv. already added)|0} [MOD] ]]}} {{attacktest=true}} {{showdmg=[[1]]}} {{SLmod=[[?{SL Modifier|0}+@{NPCDefensive2}]]}} {{test=[[@{roll_rule}]]}} {{reach=@{NPCMeleeReach2}}} {{qualities=@{NPCQualities2}}} {{rolltype=[[@{NPCImpale2}]]}} {{NPC=[[1]]}} {{RTcrit=@{RT-crit}}} {{RTfumble=@{NPC-rt-fumble}}} {{reroll=@{NPC-rep}NPCOpposed2)}}"><span data-i18n="ABB-OPP">Opp</span></button>
|
||||
<button type="action" class="npc-combat" name="act_npcopposed2roll" style="margin-left: 52px" ><span data-i18n="ABB-OPP">Opp</span></button>
|
||||
</div>
|
||||
<input type="checkbox" name="attr_NPCUsedDefensive" class="hidden hider" value="3" />
|
||||
<div class="col-1-30 center pad-r-sm block-a">
|
||||
<button type="action" class="npc-combat" name="act_npcopposed3roll" style="margin-left: 52px" value="@{Whisper} &{template:whfrp2e} {{modvalue=[[?{Modifier (Adv. already added)|0}]]}} {{unconscious=[[@{UnconsciousStat}]]}} {{cond=[[{[[@{ConditionModNPC}]],[[@{ConditionMoveModNPC}]],[[@{ConditionSeeModNPC}]]}kh1]]}} {{fatigued=[[@{FatiguedStat}]]}} {{broken=[[@{BrokenStat}]]}} {{stuned=[[@{StunedStat}]]}} {{poisoned=[[@{PoisonedStat}]]}} {{prone=[[@{ProneStat}]]}} {{entangled=[[@{EntangledStat}]]}} {{blinded=[[@{BlindedStat}]]}} {{deafened=[[0]]}} {{title=@{NPCWeaponName3}}} {{character_name=@{npc_name}}} {{attacktype=^{OPPOSED}}} {{advantage=[[@{AdvantageNPCDisplay}]]}} {{target=[[ [[{[[@{ConditionModNPC}]],[[@{ConditionMoveModNPC}]],[[@{ConditionSeeModNPC}]]}kh1]] + [[@{WeaponSkillNPC3}+@{NPCBonus3}]] [SKILL] + [[(@{AdvantageNPC}*10)]] [ADV] + ?{Modifier (Adv. already added)|0} [MOD] ]]}} {{attacktest=true}} {{showdmg=1}} {{SLmod{{attacktest=true}} {{showdmg=[[1]]}} {{SLmod=[[?{SL Modifier|0}+@{NPCDefensive3}]]}} {{test=[[@{roll_rule}]]}} {{reach=@{NPCMeleeReach3}}} {{qualities=@{NPCQualities3}}} {{rolltype=[[@{NPCImpale3}]]}} {{NPC=[[1]]}} {{RTcrit=@{RT-crit}}} {{RTfumble=@{NPC-rt-fumble}}} {{reroll=@{NPC-rep}NPCOpposed3)}}"><span data-i18n="ABB-OPP">Opp</span></button>
|
||||
<button type="action" class="npc-combat" name="act_npcopposed3roll" style="margin-left: 52px" ><span data-i18n="ABB-OPP">Opp</span></button>
|
||||
</div>
|
||||
|
||||
</div>
|
||||
@@ -2001,20 +2001,17 @@
|
||||
<input type="hidden" class="center" name="attr_npc-cond" value="[[({[[@{ConditionModNPC}]],[[@{ConditionMoveModNPC}]],[[@{ConditionSeeModNPC}]],[[@{ConditionHearModNPC}]]}kl1)]]" disabled />
|
||||
<input class="hidden" type="textarea" name="attr_rep_ID" />
|
||||
<input class="hidden" type="textarea" name="attr_NPC-rep" value="[1](~@{character_name}|repeating_npc-tab-page_@{rep_ID}_" />
|
||||
<input class="hidden" type="textarea" name="attr_NPC-rt-crit" value="[l](~@{character_name}|repeating_npc-tab-page_@{rep_ID}_CriticalTest)" />
|
||||
<input class="hidden" type="textarea" name="attr_NPC-rt-fumble" value="[l](~@{character_name}|repeating_npc-tab-page_@{rep_ID}_FumbleTest)" />
|
||||
<input class="hidden" type="textarea" name="attr_NPC-rt-crit" value="[l](~@{character_name}|repeating_npc-tab-page_@{rep_ID}_criticalrollnpc)" />
|
||||
<input class="hidden" type="textarea" name="attr_NPC-rt-fumble" value="[l](~@{character_name}|repeating_npc-tab-page_@{rep_ID}_fumbletestnpc)" />
|
||||
<input class="hidden" type="textarea" name="attr_NPC-rt-minor" value="[J](~@{character_name}|repeating_npc-tab-page_@{rep_ID}_Minor)" />
|
||||
<input class="hidden" type="textarea" name="attr_NPC-rt-major" value="[`](~@{character_name}|repeating_npc-tab-page_@{rep_ID}_Major)" />
|
||||
<input class="hidden" type="textarea" name="attr_NPC-rt-wrath" value="[l](~@{character_name}|repeating_npc-tab-page_@{rep_ID}_Wrath)" />
|
||||
|
||||
<div>
|
||||
<div class="row">
|
||||
<span class="spacer"></span>
|
||||
|
||||
|
||||
<div class="col-1">
|
||||
<div class="col-2-3 pad-r-md area-border">
|
||||
|
||||
<div class="row sub-header">
|
||||
<div class="col-1-12 center small-label vert-middle pad-r-sm"><span data-i18n="ABBREVIATE-MOVEMENT">M</span></div>
|
||||
<div class="col-1-12 center small-label vert-middle pad-r-sm"><span data-i18n="ABBREVIATE-WEAPON-SKILL">WS</span></div>
|
||||
@@ -2028,7 +2025,6 @@
|
||||
<div class="col-1-12 center small-label vert-middle pad-r-sm"><span data-i18n="ABBREVIATE-WILL-POWER">WP</span></div>
|
||||
<div class="col-1-12 center small-label vert-middle pad-r-sm"><span data-i18n="ABBREVIATE-FELLOWSHIP">Fel</span></div>
|
||||
<div class="col-1-12 center small-label vert-middle pad-r-sm"><span data-i18n="ABBREVIATE-WOUNDS">W</span></div>
|
||||
|
||||
</div>
|
||||
<span class="spacer"></span>
|
||||
<div class="row">
|
||||
@@ -3992,8 +3988,8 @@
|
||||
<input type="hidden" class="center" name="attr_npc-cond" value="[[({[[@{ConditionModNPC}]],[[@{ConditionMoveModNPC}]],[[@{ConditionSeeModNPC}]],[[@{ConditionHearModNPC}]]}kl1)]]" disabled />
|
||||
<input class="hidden" type="textarea" name="attr_rep_ID" />
|
||||
<input class="hidden" type="textarea" name="attr_NPC-rep" value="[1](~@{character_name}|repeating_npc-tab-page_@{rep_ID}_" />
|
||||
<input class="hidden" type="textarea" name="attr_NPC-rt-crit" value="[l](~@{character_name}|repeating_npc-tab-page_@{rep_ID}_CriticalTest)" />
|
||||
<input class="hidden" type="textarea" name="attr_NPC-rt-fumble" value="[l](~@{character_name}|repeating_npc-tab-page_@{rep_ID}_FumbleTest)" />
|
||||
<input class="hidden" type="textarea" name="attr_NPC-rt-crit" value="[l](~@{character_name}|repeating_npc-tab-page_@{rep_ID}_criticalrollnpc)" />
|
||||
<input class="hidden" type="textarea" name="attr_NPC-rt-fumble" value="[l](~@{character_name}|repeating_npc-tab-page_@{rep_ID}_fumbletestnpc)" />
|
||||
<input class="hidden" type="textarea" name="attr_NPC-rt-minor" value="[J](~@{character_name}|repeating_npc-tab-page_@{rep_ID}_Minor)" />
|
||||
<input class="hidden" type="textarea" name="attr_NPC-rt-major" value="[`](~@{character_name}|repeating_npc-tab-page_@{rep_ID}_Major)" />
|
||||
<input class="hidden" type="textarea" name="attr_NPC-rt-wrath" value="[l](~@{character_name}|repeating_npc-tab-page_@{rep_ID}_Wrath)" />
|
||||
@@ -5954,21 +5950,17 @@
|
||||
<input type="hidden" class="center" name="attr_npc-cond" value="[[({[[@{ConditionModNPC}]],[[@{ConditionMoveModNPC}]],[[@{ConditionSeeModNPC}]],[[@{ConditionHearModNPC}]]}kl1)]]" disabled />
|
||||
<input class="hidden" type="textarea" name="attr_rep_ID" />
|
||||
<input class="hidden" type="textarea" name="attr_NPC-rep" value="[1](~@{character_name}|repeating_npc-tab-page_@{rep_ID}_" />
|
||||
<input class="hidden" type="textarea" name="attr_NPC-rt-crit" value="[l](~@{character_name}|repeating_npc-tab-page_@{rep_ID}_CriticalTest)" />
|
||||
<input class="hidden" type="textarea" name="attr_NPC-rt-fumble" value="[l](~@{character_name}|repeating_npc-tab-page_@{rep_ID}_FumbleTest)" />
|
||||
<input class="hidden" type="textarea" name="attr_NPC-rt-crit" value="[l](~@{character_name}|repeating_npc-tab-page_@{rep_ID}_criticalrollnpc)" />
|
||||
<input class="hidden" type="textarea" name="attr_NPC-rt-fumble" value="[l](~@{character_name}|repeating_npc-tab-page_@{rep_ID}_fumbletestnpc)" />
|
||||
<input class="hidden" type="textarea" name="attr_NPC-rt-minor" value="[J](~@{character_name}|repeating_npc-tab-page_@{rep_ID}_Minor)" />
|
||||
<input class="hidden" type="textarea" name="attr_NPC-rt-major" value="[`](~@{character_name}|repeating_npc-tab-page_@{rep_ID}_Major)" />
|
||||
<input class="hidden" type="textarea" name="attr_NPC-rt-wrath" value="[l](~@{character_name}|repeating_npc-tab-page_@{rep_ID}_Wrath)" />
|
||||
|
||||
<div>
|
||||
|
||||
<div class="row">
|
||||
<span class="spacer"></span>
|
||||
|
||||
|
||||
<div class="col-1">
|
||||
<div class="col-2-3 pad-r-md area-border">
|
||||
|
||||
<div class="row sub-header">
|
||||
<div class="col-1-12 center small-label vert-middle pad-r-sm"><span data-i18n="ABBREVIATE-MOVEMENT">M</span></div>
|
||||
<div class="col-1-12 center small-label vert-middle pad-r-sm"><span data-i18n="ABBREVIATE-WEAPON-SKILL">WS</span></div>
|
||||
@@ -5982,7 +5974,6 @@
|
||||
<div class="col-1-12 center small-label vert-middle pad-r-sm"><span data-i18n="ABBREVIATE-WILL-POWER">WP</span></div>
|
||||
<div class="col-1-12 center small-label vert-middle pad-r-sm"><span data-i18n="ABBREVIATE-FELLOWSHIP">Fel</span></div>
|
||||
<div class="col-1-12 center small-label vert-middle pad-r-sm"><span data-i18n="ABBREVIATE-WOUNDS">W</span></div>
|
||||
|
||||
</div>
|
||||
<span class="spacer"></span>
|
||||
<div class="row">
|
||||
@@ -7974,21 +7965,17 @@
|
||||
<input type="hidden" class="center" name="attr_npc-cond" value="[[({[[@{ConditionModNPC}]],[[@{ConditionMoveModNPC}]],[[@{ConditionSeeModNPC}]],[[@{ConditionHearModNPC}]]}kl1)]]" disabled />
|
||||
<input class="hidden" type="textarea" name="attr_rep_ID" />
|
||||
<input class="hidden" type="textarea" name="attr_NPC-rep" value="[1](~@{character_name}|repeating_npc-tab-page_@{rep_ID}_" />
|
||||
<input class="hidden" type="textarea" name="attr_NPC-rt-crit" value="[l](~@{character_name}|repeating_npc-tab-page_@{rep_ID}_CriticalTest)" />
|
||||
<input class="hidden" type="textarea" name="attr_NPC-rt-fumble" value="[l](~@{character_name}|repeating_npc-tab-page_@{rep_ID}_FumbleTest)" />
|
||||
<input class="hidden" type="textarea" name="attr_NPC-rt-crit" value="[l](~@{character_name}|repeating_npc-tab-page_@{rep_ID}_criticalrollnpc)" />
|
||||
<input class="hidden" type="textarea" name="attr_NPC-rt-fumble" value="[l](~@{character_name}|repeating_npc-tab-page_@{rep_ID}_fumbletestnpc)" />
|
||||
<input class="hidden" type="textarea" name="attr_NPC-rt-minor" value="[J](~@{character_name}|repeating_npc-tab-page_@{rep_ID}_Minor)" />
|
||||
<input class="hidden" type="textarea" name="attr_NPC-rt-major" value="[`](~@{character_name}|repeating_npc-tab-page_@{rep_ID}_Major)" />
|
||||
<input class="hidden" type="textarea" name="attr_NPC-rt-wrath" value="[l](~@{character_name}|repeating_npc-tab-page_@{rep_ID}_Wrath)" />
|
||||
|
||||
<div>
|
||||
|
||||
<div class="row">
|
||||
<span class="spacer"></span>
|
||||
|
||||
|
||||
<div class="col-1">
|
||||
<div class="col-2-3 pad-r-md area-border">
|
||||
|
||||
<div class="row sub-header">
|
||||
<div class="col-1-12 center small-label vert-middle pad-r-sm"><span data-i18n="ABBREVIATE-MOVEMENT">M</span></div>
|
||||
<div class="col-1-12 center small-label vert-middle pad-r-sm"><span data-i18n="ABBREVIATE-WEAPON-SKILL">WS</span></div>
|
||||
@@ -8002,7 +7989,6 @@
|
||||
<div class="col-1-12 center small-label vert-middle pad-r-sm"><span data-i18n="ABBREVIATE-WILL-POWER">WP</span></div>
|
||||
<div class="col-1-12 center small-label vert-middle pad-r-sm"><span data-i18n="ABBREVIATE-FELLOWSHIP">Fel</span></div>
|
||||
<div class="col-1-12 center small-label vert-middle pad-r-sm"><span data-i18n="ABBREVIATE-WOUNDS">W</span></div>
|
||||
|
||||
</div>
|
||||
<span class="spacer"></span>
|
||||
<div class="row">
|
||||
@@ -21837,7 +21823,7 @@
|
||||
<div class="col-1-2 left vert-middle">
|
||||
<span data-i18n="CRAFTSMAN">Craftsman</span>
|
||||
(
|
||||
<div class="col-1-4">
|
||||
<div class="col-2-5">
|
||||
<input class="center" style="height: 13px" type="value" name="attr_Talent_Craftsman1_dis" value="@{Talent_Craftsman1}" disabled />
|
||||
</div>
|
||||
)
|
||||
@@ -21863,7 +21849,7 @@
|
||||
<div class="col-1-2 left vert-middle">
|
||||
<span data-i18n="CRAFTSMAN">Craftsman</span>
|
||||
(
|
||||
<div class="col-1-4">
|
||||
<div class="col-2-5">
|
||||
<input class="center" style="height: 13px" type="value" name="attr_Talent_Craftsman2_dis" value="@{Talent_Craftsman2}" disabled />
|
||||
</div>
|
||||
)
|
||||
@@ -21889,7 +21875,7 @@
|
||||
<div class="col-1-2 left vert-middle">
|
||||
<span data-i18n="CRAFTSMAN">Craftsman</span>
|
||||
(
|
||||
<div class="col-1-4">
|
||||
<div class="col-2-5">
|
||||
<input class="center" style="height: 13px" type="value" name="attr_Talent_Craftsman3_dis" value="@{Talent_Craftsman3}" disabled />
|
||||
</div>
|
||||
)
|
||||
@@ -47664,7 +47650,7 @@ on('clicked:repeating_spellbookarcane:extchannellingloreroll', (eventInfo) => {
|
||||
|
||||
if(v[`repeating_spellbookarcane_${id}_MagicLore`] == lore)
|
||||
{
|
||||
extslout = accuchanexlsl + extsl;
|
||||
extslout = accuchanexlsl + Math.max(extsl, 0);
|
||||
if (extslout < 0) {extslout = 0;}
|
||||
if (chancrit === 1) {extslout += v.WillPowerBonus;}
|
||||
|
||||
@@ -47687,7 +47673,7 @@ on('clicked:repeating_spellbookarcane:extchannellingloreroll', (eventInfo) => {
|
||||
|
||||
if(v[`repeating_spellbookrituals_${id}_MagicLore`] == lore)
|
||||
{
|
||||
extslout = accuchanexlsl + extsl;
|
||||
extslout = accuchanexlsl + Math.max(extsl, 0);
|
||||
if (extslout < 0) {extslout = 0;}
|
||||
|
||||
if (chancrit === 1) {extslout += v.WillPowerBonus;}
|
||||
@@ -48701,7 +48687,7 @@ on('clicked:repeating_divinemiracles:miracle clicked:repeating_divinemiracles:mi
|
||||
} else {besmirch = 0;
|
||||
|
||||
rollBesmirch = ' {{besmirched=[[0]]}}';}
|
||||
} else {besmirch = 0;}
|
||||
} else {besmirch = 0; rollBesmirch = '';}
|
||||
|
||||
startRoll(rollBegins + rollPart + cond + rollBesmirch, (results) => {
|
||||
const target = results.results.target.result
|
||||
@@ -49264,7 +49250,7 @@ on('clicked:AmputationTest', (eventInfo) => {
|
||||
on('clicked:repeating_npc-tab-page:npcattackroll clicked:repeating_npc-tab-page:npcattack2roll clicked:repeating_npc-tab-page:npcattack3roll clicked:repeating_npc-tab-page:npcopposedroll clicked:repeating_npc-tab-page:npcopposed2roll clicked:repeating_npc-tab-page:npcopposed3roll clicked:repeating_npc-tab-page2:npcattackroll clicked:repeating_npc-tab-page2:npcattack2roll clicked:repeating_npc-tab-page2:npcattack3roll clicked:repeating_npc-tab-page2:npcopposedroll clicked:repeating_npc-tab-page2:npcopposed2roll clicked:repeating_npc-tab-page2:npcopposed3roll clicked:repeating_npc-tab-page3:npcattackroll clicked:repeating_npc-tab-page3:npcattack2roll clicked:repeating_npc-tab-page3:npcattack3roll clicked:repeating_npc-tab-page3:npcopposedroll clicked:repeating_npc-tab-page3:npcopposed2roll clicked:repeating_npc-tab-page3:npcopposed3roll clicked:repeating_npc-tab-page4:npcattackroll clicked:repeating_npc-tab-page4:npcattack2roll clicked:repeating_npc-tab-page4:npcattack3roll clicked:repeating_npc-tab-page4:npcopposedroll clicked:repeating_npc-tab-page4:npcopposed2roll clicked:repeating_npc-tab-page4:npcopposed3roll', (eventInfo) => {
|
||||
getAttrs(["GroupAdv", "NPC_AmbidextrousLvl", "Offhandmod", "Offhandmod2", "Offhandmod3"], function(v) {
|
||||
|
||||
let roll = '{{sl=[[0]]}} {{slbonus=[[0>Atk<>Def<]]}} {{sladd=[[0]]}} {{slbonusatk=[[0>Atk<]]}} {{slbonusdef=[[0>Def<]]}} {{modvalue=[[?{Modifier (Adv. already added)|>MOD<}]]}} {{unconscious=[[@{prefix-UnconsciousStat}]]}} {{cond=[[{[[@{prefix-ConditionModNPC}]],[[@{prefix-ConditionMoveModNPC}]],[[@{prefix-ConditionSeeModNPC}]]}kh1]]}} {{fatigued=[[@{prefix-FatiguedStat}]]}} {{broken=[[@{prefix-BrokenStat}]]}} {{stuned=[[@{prefix-StunedStat}]]}} {{poisoned=[[@{prefix-PoisonedStat}]]}} {{prone=[[@{prefix-ProneStat}]]}} {{entangled=[[@{prefix-EntangledStat}]]}} {{blinded=[[@{prefix-BlindedStat}]]}} {{deafened=[[0]]}} {{title=@{prefix-NPCWeaponName>numb<}}} {{character_name=@{prefix-npc_name}}} {{attacktype=^{>Skill<}}} {{advantage=[[@{prefix-AdvantageNPCDisplay}]]}} {{target=[[ [[{[[@{prefix-ConditionModNPC}]],[[@{prefix-ConditionMoveModNPC}]],[[@{prefix-ConditionSeeModNPC}]]}kh1]] [COND] + [[@{prefix-WeaponSkillNPC>numb<}+@{prefix-NPCBonus>numb<}]] [SKILL] + [[@{prefix-AdvantageNPC}*10]] [ADV] + ?{Modifier (Adv. already added)|0}]]}} {{attacktest=true}} {{showdmg=[[1]]}} {{SLmod=[[?{SL Modifier|0}]]}} {{test=[[@{roll_rule}]]}} {{reach=@{prefix-NPCMeleeReach>numb<}}} {{qualities=@{prefix-NPCQualities>numb<}}} {{rolltype=[[@{prefix-MeleeImpale>numb<}]]}} {{NPC=[[1]]}} {{RTcrit=@{RT-crit}}} {{RTfumble=@{prefix-NPC-rt-fumble}}} {{reroll=@{prefix-NPC-rep}reroll-roll)}} >Dmg<';
|
||||
let roll = '{{sl=[[0]]}} {{slbonus=[[0>Atk<>Def<]]}} {{sladd=[[0]]}} {{slbonusatk=[[0>Atk<]]}} {{slbonusdef=[[0>Def<]]}} {{modvalue=[[?{Modifier (Adv. already added)|>MOD<}]]}} {{unconscious=[[@{prefix-UnconsciousStat}]]}} {{cond=[[{[[@{prefix-ConditionModNPC}]],[[@{prefix-ConditionMoveModNPC}]],[[@{prefix-ConditionSeeModNPC}]]}kh1]]}} {{fatigued=[[@{prefix-FatiguedStat}]]}} {{broken=[[@{prefix-BrokenStat}]]}} {{stuned=[[@{prefix-StunedStat}]]}} {{poisoned=[[@{prefix-PoisonedStat}]]}} {{prone=[[@{prefix-ProneStat}]]}} {{entangled=[[@{prefix-EntangledStat}]]}} {{blinded=[[@{prefix-BlindedStat}]]}} {{deafened=[[0]]}} {{title=@{prefix-NPCWeaponName>numb<}}} {{character_name=@{prefix-npc_name}}} {{attacktype=^{>Skill<}}} {{advantage=[[@{prefix-AdvantageNPCDisplay}]]}} {{target=[[ [[{[[@{prefix-ConditionModNPC}]],[[@{prefix-ConditionMoveModNPC}]],[[@{prefix-ConditionSeeModNPC}]]}kh1]] [COND] + [[@{prefix-WeaponSkillNPC>numb<}+@{prefix-NPCBonus>numb<}]] [SKILL] + [[@{prefix-AdvantageNPC}*10]] [ADV] + ?{Modifier (Adv. already added)|0}]]}} {{attacktest=true}} {{showdmg=[[1]]}} {{SLmod=[[?{SL Modifier|0}]]}} {{test=[[@{roll_rule}]]}} {{reach=@{prefix-NPCMeleeReach>numb<}}} {{qualities=@{prefix-NPCQualities>numb<}}} {{rolltype=[[@{prefix-MeleeImpale>numb<}]]}} {{NPC=[[1]]}} {{RTcrit=@{prefix-NPC-rt-crit}}} {{RTfumble=@{prefix-NPC-rt-fumble}}} {{reroll=@{prefix-NPC-rep}reroll-roll)}} >Dmg<';
|
||||
var trigger = eventInfo.triggerName.slice(8, -4);
|
||||
var prefix = trigger.split('_').slice(0,3).join('_') + '_';
|
||||
var prefix2 = eventInfo.triggerName.slice(8, -18);
|
||||
|
||||
@@ -1313,9 +1313,9 @@
|
||||
"NO-RELOAD": "This Weapon doesnt have Reload!",
|
||||
"EXP-REMAINING": "Experience Remaining",
|
||||
"INSUFFICIENT-SL": "Note: Insufficient Accu Ext SL",
|
||||
"SHEET-INTEGRATION": "Talent functions Integrated",
|
||||
"SHEET-INTEGRATION-PART": "Talents functions partly Integrated",
|
||||
"SHEET-INTEGRATION-NO": "Player/GM controlled, Talent functions not Integrated",
|
||||
"INTEGRATION": "Talent functions Integrated",
|
||||
"INTEGRATION-PART": "Talents functions partly Integrated",
|
||||
"INTEGRATION-NO": "Player/GM controlled, Talent functions not Integrated",
|
||||
"COMPENDIUM-LINK": "Compendium Info Link",
|
||||
"USE-REVERSE-DICE": "You may Reverse Dice",
|
||||
"UNCONTROLLED-FALL": "Uncontrolled fall, dmg ignores SL",
|
||||
|
||||
Reference in New Issue
Block a user