From 2eabc31fc334a6eb41b2cafb4dc69e8e32aee7d0 Mon Sep 17 00:00:00 2001 From: Djjus <59532170+Djjus@users.noreply.github.com> Date: Sat, 24 Dec 2022 02:33:36 +0000 Subject: [PATCH] fix rdg main off pen --- .../Warhammer 4e Character Sheet.html | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Warhammer 4e Character Sheet/Warhammer 4e Character Sheet.html b/Warhammer 4e Character Sheet/Warhammer 4e Character Sheet.html index 3af17e8a8d..00df8bf941 100644 --- a/Warhammer 4e Character Sheet/Warhammer 4e Character Sheet.html +++ b/Warhammer 4e Character Sheet/Warhammer 4e Character Sheet.html @@ -46059,7 +46059,7 @@ on('clicked:meleeattackmain clicked:furiousassaultmain clicked:meleechargemain c getAttrs(["Used_MainRangedAmmo","AutoAmmo","RangedMode_Engaged","RangedMode_Moved","Used_OffRangedBonus","RangedMode_Aim","RangedMode_Range", "RangedMode_Called", "RangedMode_Size", "GroupAdv", "Used_MainRangedAccurate", "Talent_DeadeyeShotLvl"], function(v) { - let roll = '{{sl=[[0 [Roll SL]]]}} {{slbonus=[[@{Used_MainRangedPrecise}+@{Used_MainRangedPractical}-@{Used_MainRangedImprecise}+@{RangedMode_FastShot}>addsl< [SL TOTAL]]]}} {{slbonusatk=[[@{slbonusRgd}+@{RangedMode_FastShot}>addsl<]]}} {{sladd=[[0]]}} {{test=[[>test<]]}} {{offpen=[[>ambi<]]}} {{rangedeng=[[@{RangedMode_Engaged}]]}} {{rangedsize=[[>size<]]}} {{modvalue=[[?{Ranged Attack Modifier|@{Used_RangedBonus}}]]}} {{ammo=[[@{Used_MainRangedAmmo}]]}} {{title=@{Used_MainRangedWeaponName}}} {{advantage=[[@{AdvantageDisplay}]]}} {{character_name=@{character_name}}} {{attacktype=^{RANGED}}} {{target=[[ [[@{condgen_see_move}*-1]] [COND] + [[>ambi<]] [PEN] + [[@{Used_MainRangedBalisticSkill}]] [SKILL] + [[@{Advantage}*10]] [ADV] +?{Ranged Attack Modifier|0} [MOD] ]]}} {{attacktest=true}} {{showdmg=[[1]]}} {{SLmod=[[?{SL Modifier|0} [SL Mod]]]}} >hitloc< {{damaging=[[@{Used_MainRangedDamaging}]]}} {{reach=@{Used_MainWeaponRange}}} {{rolltype=[[@{Used_MainRangedImpale}]]}} {{pummel=[[@{Used_MainRangedPummel}]]}} {{qualities=@{Used_MainRangedQualities}}} {{damage=[[@{Used_MainRangedStrengthBonus}+@{Used_MainRangedDamage}+@{Talent_AccurateShotLvl}-{[[@{Used_MainRangedDmgTaken}-@{Used_MainRangedDurable}]],[[0]]}kh1]]}} {{ammotype=@{Used_MainRangedAmmoType}}} {{unconscious=[[@{UnconsciousMod}]]}} {{cond=[[@{condgen_see_move}-@{DrunkMod}]]}} {{drunk=[[@{DrunkMod}]]}} {{fatigued=[[@{FatiguedMod}]]}} {{broken=[[@{BrokenMod}]]}} {{stuned=[[@{StunedMod}]]}} {{poisoned=[[@{PoisonedMod}]]}} {{prone=[[@{ProneMod}]]}} {{entangled=[[@{EntangledMod}]]}} {{blinded=[[@{BlindedMod}]]}} {{deafened=[[0]]}} {{mod1type=[[@{Used_MainRanged_modtype1}]]}} {{mod1=@{Used_MainRanged_mod1}}} {{mod2type=[[@{Used_MainRanged_modtype2}]]}} {{mod2=@{Used_MainRanged_mod2}}} {{mod3type=[[@{Used_MainRanged_modtype3}]]}} {{mod3=@{Used_MainRanged_mod3}}} {{NPC=[[0]]}} {{sitmod=[[@{Talent_DualWielderLvl}]]}} {{RTcrit=@{RT-critical}}} {{RTfumble=@{RT-fumble}}} {{precise=[[@{Used_MainRangedPrecise}]]}} {{imprecise=[[@{Used_MainRangedImprecise}]]}} {{blast=[[@{Used_RangedBlast}*@{Used_MainRangedBlastRating}]]}} {{repeater=[[@{Used_MainRangedRepeater}*@{Used_MainRangedRepeaterRating}]]}} {{entangle=[[@{Used_MainRangedEntangle}]]}} {{penetrating=[[@{Used_MainRangedPenetrating}]]}} {{warpstone=[[@{Used_MeleeWarpstone}]]}} {{zzap=[[@{Used_MeleeZZAP}]]}} {{tiring=[[0]]}} {{blackpowder=[[@{Used_MainRangedBlackpowder}]]}} {{practical=[[@{Used_MainRangedPractical}]]}} {{accurate=[[@{Used_MainRangedAccurate}*10]]}} {{hack=[[@{Used_MainRangedHack}]]}} {{dangerous=[[@{Used_MainRangedDangerous}]]}} {{impact=[[@{Used_MainRangedImpact}]]}} {{deadeyeshot=[[@{Talent_DeadeyeShotLvl}]]}} {{fastshot=[[@{RangedMode_FastShot}]]}} {{autoammo=[[@{AutoAmmo}]]}} {{sniper=[[@{Talent_SniperLvl}]]}} {{targetrange=[[@{RangedMode_Range}]]}} {{sureshot=[[@{Talent_SureShotLvl}]]}} {{usedmagic=[[@{Used_MainRangedMagic}]]}} {{usedmagiceffect=@{Used_MainRangedMagicEffect}}} {{dualwield=[[@{Talent_DualWielderLvl}]]}}'; + let roll = '{{sl=[[0 [Roll SL]]]}} {{slbonus=[[@{Used_MainRangedPrecise}+@{Used_MainRangedPractical}-@{Used_MainRangedImprecise}+@{RangedMode_FastShot}>addsl< [SL TOTAL]]]}} {{slbonusatk=[[@{slbonusRgd}+@{RangedMode_FastShot}>addsl<]]}} {{sladd=[[0]]}} {{test=[[>test<]]}} {{rangedeng=[[@{RangedMode_Engaged}]]}} {{rangedsize=[[>size<]]}} {{modvalue=[[?{Ranged Attack Modifier|@{Used_RangedBonus}}]]}} {{ammo=[[@{Used_MainRangedAmmo}]]}} {{title=@{Used_MainRangedWeaponName}}} {{advantage=[[@{AdvantageDisplay}]]}} {{character_name=@{character_name}}} {{attacktype=^{RANGED}}} {{target=[[ [[@{condgen_see_move}*-1]] [COND] + [[@{Used_MainRangedBalisticSkill}]] [SKILL] + [[@{Advantage}*10]] [ADV] +?{Ranged Attack Modifier|0} [MOD] ]]}} {{attacktest=true}} {{showdmg=[[1]]}} {{SLmod=[[?{SL Modifier|0} [SL Mod]]]}} >hitloc< {{damaging=[[@{Used_MainRangedDamaging}]]}} {{reach=@{Used_MainWeaponRange}}} {{rolltype=[[@{Used_MainRangedImpale}]]}} {{pummel=[[@{Used_MainRangedPummel}]]}} {{qualities=@{Used_MainRangedQualities}}} {{damage=[[@{Used_MainRangedStrengthBonus}+@{Used_MainRangedDamage}+@{Talent_AccurateShotLvl}-{[[@{Used_MainRangedDmgTaken}-@{Used_MainRangedDurable}]],[[0]]}kh1]]}} {{ammotype=@{Used_MainRangedAmmoType}}} {{unconscious=[[@{UnconsciousMod}]]}} {{cond=[[@{condgen_see_move}-@{DrunkMod}]]}} {{drunk=[[@{DrunkMod}]]}} {{fatigued=[[@{FatiguedMod}]]}} {{broken=[[@{BrokenMod}]]}} {{stuned=[[@{StunedMod}]]}} {{poisoned=[[@{PoisonedMod}]]}} {{prone=[[@{ProneMod}]]}} {{entangled=[[@{EntangledMod}]]}} {{blinded=[[@{BlindedMod}]]}} {{deafened=[[0]]}} {{mod1type=[[@{Used_MainRanged_modtype1}]]}} {{mod1=@{Used_MainRanged_mod1}}} {{mod2type=[[@{Used_MainRanged_modtype2}]]}} {{mod2=@{Used_MainRanged_mod2}}} {{mod3type=[[@{Used_MainRanged_modtype3}]]}} {{mod3=@{Used_MainRanged_mod3}}} {{NPC=[[0]]}} {{sitmod=[[@{Talent_DualWielderLvl}]]}} {{RTcrit=@{RT-critical}}} {{RTfumble=@{RT-fumble}}} {{precise=[[@{Used_MainRangedPrecise}]]}} {{imprecise=[[@{Used_MainRangedImprecise}]]}} {{blast=[[@{Used_RangedBlast}*@{Used_MainRangedBlastRating}]]}} {{repeater=[[@{Used_MainRangedRepeater}*@{Used_MainRangedRepeaterRating}]]}} {{entangle=[[@{Used_MainRangedEntangle}]]}} {{penetrating=[[@{Used_MainRangedPenetrating}]]}} {{warpstone=[[@{Used_MeleeWarpstone}]]}} {{zzap=[[@{Used_MeleeZZAP}]]}} {{tiring=[[0]]}} {{blackpowder=[[@{Used_MainRangedBlackpowder}]]}} {{practical=[[@{Used_MainRangedPractical}]]}} {{accurate=[[@{Used_MainRangedAccurate}*10]]}} {{hack=[[@{Used_MainRangedHack}]]}} {{dangerous=[[@{Used_MainRangedDangerous}]]}} {{impact=[[@{Used_MainRangedImpact}]]}} {{deadeyeshot=[[@{Talent_DeadeyeShotLvl}]]}} {{fastshot=[[@{RangedMode_FastShot}]]}} {{autoammo=[[@{AutoAmmo}]]}} {{sniper=[[@{Talent_SniperLvl}]]}} {{targetrange=[[@{RangedMode_Range}]]}} {{sureshot=[[@{Talent_SureShotLvl}]]}} {{usedmagic=[[@{Used_MainRangedMagic}]]}} {{usedmagiceffect=@{Used_MainRangedMagicEffect}}} {{dualwield=[[@{Talent_DualWielderLvl}]]}}'; var trigger = eventInfo.triggerName.slice(8); var prefix = trigger.split('_').slice(0,3).join('_') + '_'; let rollBegins = '@{Whisper} &{template:whfrp2e}'; @@ -46110,7 +46110,7 @@ on('clicked:meleeattackmain clicked:furiousassaultmain clicked:meleechargemain c if (v.RangedMode_Size == 2) {mod += 40; size = 2;} if (v.RangedMode_Size == 3) {mod += 20; size = 3;} - let rollPart = rollPart4.replaceAll('>ambi<', ambipen).replaceAll('>hitloc<', hitloc).replaceAll('>size<', size); + let rollPart = rollPart4.replaceAll('>hitloc<', hitloc).replaceAll('>size<', size); console.log(rollPart);