slaguru666/roll20-character-sheets-tester
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[Warhammer 4e Character Sheet] impale fix (#7162)

Browse Source 
* impale fix

* oppesed impale fix
This commit is contained in:
Djjus
2020-08-10 10:42:14 -04:00
committed by GitHub
parent c8b6b8d46d
commit 5b8cf8a775
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Warhammer 4e Character Sheet/Warhammer 4e Character Sheet.html
+4 -4
View File
@@ -525,7 +525,7 @@
</button>
</div>
<div class="sheet-col-1-2 sheet-center" style="width: 15%;">
<button type="roll" class="sheet-combat-actions" name="roll_MeleeOpposed" value="@{Whisper} &{template:whfrp2e} {{modvalue=[[?{Opposed Defense Roll, Add Modifier (Adv. already added)|0}]]}} {{title=@{Used_DefenseWeapon}}} {{character_name=@{character_name}}} {{advantage=[[@{AdvantageDisplay}]]}} {{unconscious=[[@{UnconsciousMod}]]}} {{fatigued=[[@{FatiguedMod}]]}} {{broken=[[@{BrokenMod}]]}} {{stuned=[[@{StunedMod}]]}} {{poisoned=[[@{PoisonedMod}]]}} {{prone=[[@{ProneMod}]]}} {{entangled=[[@{EntangledMod}]]}} {{blinded=[[@{BlindedMod}]]}} {{attacktype=^{OPPOSED}}} {{target=[[([[{[[@{ConditionMod}]],[[@{ConditionMoveMod}]],[[@{ConditionSeeMod}]]}kl1]])+@{Used_DefenseWeaponSkill}+@{Used_DefenseBonus}+(@{Advantage}*10)+?{Opposed Defense Roll, Add Modifier (Adv. already added)|0}]]}} {{attacktest=true}} {{SLmod=[[?{SL Modifier|0}+@{Used_DefenseDefensive}]]}} {{test=[[@{roll_rule}]]}} {{reach=@{Used_DefenseReach}}} {{impale=[[@{Used_MeleeImpale}]]}} {{qualities=@{Used_DefenseQualities}}} {{armorqualities=@{armorQuality}}} ">
<button type="roll" class="sheet-combat-actions" name="roll_MeleeOpposed" value="@{Whisper} &{template:whfrp2e} {{modvalue=[[?{Opposed Defense Roll, Add Modifier (Adv. already added)|0}]]}} {{title=@{Used_DefenseWeapon}}} {{character_name=@{character_name}}} {{advantage=[[@{AdvantageDisplay}]]}} {{unconscious=[[@{UnconsciousMod}]]}} {{fatigued=[[@{FatiguedMod}]]}} {{broken=[[@{BrokenMod}]]}} {{stuned=[[@{StunedMod}]]}} {{poisoned=[[@{PoisonedMod}]]}} {{prone=[[@{ProneMod}]]}} {{entangled=[[@{EntangledMod}]]}} {{blinded=[[@{BlindedMod}]]}} {{attacktype=^{OPPOSED}}} {{target=[[([[{[[@{ConditionMod}]],[[@{ConditionMoveMod}]],[[@{ConditionSeeMod}]]}kl1]])+@{Used_DefenseWeaponSkill}+@{Used_DefenseBonus}+(@{Advantage}*10)+?{Opposed Defense Roll, Add Modifier (Adv. already added)|0}]]}} {{attacktest=true}} {{SLmod=[[?{SL Modifier|0}+@{Used_DefenseDefensive}]]}} {{test=[[@{roll_rule}]]}} {{reach=@{Used_DefenseReach}}} {{impale=[[@{Used_DefenseImpale}]]}} {{qualities=@{Used_DefenseQualities}}} {{armorqualities=@{armorQuality}}} ">
<span></span>
</button>
</div>
@@ -9685,7 +9685,7 @@
<div class="sheet-col-1 sheet-seperator-cap sheet-left sheet-mar-t-lg sheet-mar-l-md">
<span style="font-size: 14px;">MELEE WEAPONS</span>
<div class="sheet-col-1-13 sheet-center"style="float: right; margin-right: 15px;">
<button type="roll" class="sheet-combat-actions-rep" name="roll_MeleeOpposed" value="@{Whisper} &{template:whfrp2e} {{modvalue=[[?{Opposed Defense Roll, Add Modifier (Adv. already added)|0}]]}} {{title=@{Used_DefenseWeapon}}} {{character_name=@{character_name}}} {{advantage=[[@{AdvantageDisplay}]]}} {{unconscious=[[@{UnconsciousMod}]]}} {{fatigued=[[@{FatiguedMod}]]}} {{broken=[[@{BrokenMod}]]}} {{stuned=[[@{StunedMod}]]}} {{poisoned=[[@{PoisonedMod}]]}} {{prone=[[@{ProneMod}]]}} {{entangled=[[@{EntangledMod}]]}} {{blinded=[[@{BlindedMod}]]}} {{attacktype=^{OPPOSED}}} {{target=[[([[{[[@{ConditionMod}]],[[@{ConditionMoveMod}]],[[@{ConditionSeeMod}]]}kl1]])+@{Used_DefenseWeaponSkill}+@{Used_DefenseBonus}+(@{Advantage}*10)+?{Opposed Defense Roll, Add Modifier (Adv. already added)|0}]]}} {{attacktest=true}} {{SLmod=[[?{SL Modifier|0}+@{Used_DefenseDefensive}]]}} {{test=[[@{roll_rule}]]}} {{reach=@{Used_DefenseReach}}} {{impale=[[@{Used_MeleeImpale}]]}} {{qualities=@{Used_DefenseQualities}}} {{armorqualities=@{armorQuality}}} "><span>Opposed</span></button>
<button type="roll" class="sheet-combat-actions-rep" name="roll_MeleeOpposed" value="@{Whisper} &{template:whfrp2e} {{modvalue=[[?{Opposed Defense Roll, Add Modifier (Adv. already added)|0}]]}} {{title=@{Used_DefenseWeapon}}} {{character_name=@{character_name}}} {{advantage=[[@{AdvantageDisplay}]]}} {{unconscious=[[@{UnconsciousMod}]]}} {{fatigued=[[@{FatiguedMod}]]}} {{broken=[[@{BrokenMod}]]}} {{stuned=[[@{StunedMod}]]}} {{poisoned=[[@{PoisonedMod}]]}} {{prone=[[@{ProneMod}]]}} {{entangled=[[@{EntangledMod}]]}} {{blinded=[[@{BlindedMod}]]}} {{attacktype=^{OPPOSED}}} {{target=[[([[{[[@{ConditionMod}]],[[@{ConditionMoveMod}]],[[@{ConditionSeeMod}]]}kl1]])+@{Used_DefenseWeaponSkill}+@{Used_DefenseBonus}+(@{Advantage}*10)+?{Opposed Defense Roll, Add Modifier (Adv. already added)|0}]]}} {{attacktest=true}} {{SLmod=[[?{SL Modifier|0}+@{Used_DefenseDefensive}]]}} {{test=[[@{roll_rule}]]}} {{reach=@{Used_DefenseReach}}} {{impale=[[@{Used_DefenseImpale}]]}} {{qualities=@{Used_DefenseQualities}}} {{armorqualities=@{armorQuality}}} "><span>Opposed</span></button>
</div>
<div class="sheet-col-1-13 sheet-center" style="float: right;">
<button type="roll" class="sheet-combat-actions-rep" name="roll_MeleeAttack" value="@{Whisper} &{template:whfrp2e} {{modvalue=[[?{Opposed Attack Roll, Add Modifier (Adv. already added)|0}]]}} {{title=@{Used_MeleeWeapon}}} {{advantage=[[@{AdvantageDisplay}]]}} {{unconscious=[[@{UnconsciousMod}]]}} {{fatigued=[[@{FatiguedMod}]]}} {{broken=[[@{BrokenMod}]]}} {{stuned=[[@{StunedMod}]]}} {{poisoned=[[@{PoisonedMod}]]}} {{prone=[[@{ProneMod}]]}} {{entangled=[[@{EntangledMod}]]}} {{blinded=[[@{BlindedMod}]]}} {{character_name=@{character_name}}} {{attacktype=^{MELEE}}} {{target=[[([[{[[@{ConditionMod}]],[[@{ConditionMoveMod}]],[[@{ConditionSeeMod}]]}kl1]])+@{Used_MeleeWeaponSkill}+@{Used_MeleeBonus}+(@{Advantage}*10)+?{Opposed Attack Roll, Add Modifier (Adv. already added)|0}]]}} {{attacktest=true}} {{SLmod=[[?{SL Modifier|0}]]}} {{hitlocation=true}} {{test=[[@{roll_rule}]]}} {{reach=@{Used_MeleeReach}}} {{impale=[[@{Used_MeleeImpale}]]}} {{qualities=@{Used_MeleeQualities}}} {{damage=[[@{Used_MeleeStrengthBonus}+@{Used_MeleeDamageBonus}]]}}"><span class>Attack</span></button>
@@ -13064,7 +13064,7 @@
<!-- IMPALE CRTICAL -->
{{#^rollWasCrit() test}}
{{#rollBetween() impale 0 1}}
{{#rollTotal() impale 1}}
{{#^rollGreater() test target}}
{{#rollTotal() test 10}}
<div class="sheet-row">
@@ -13112,7 +13112,7 @@
</div>
{{/rollTotal() test 90}}
{{/^rollGreater() test target}}
{{/rollBetween() impale 0 1}}
{{/rollTotal() impale 1}}
{{/^rollWasCrit() test}}
{{#^rollWasCrit() test}}
{{#rollGreater() impale 1}}