diff --git a/Warhammer 4e Character Sheet/README.md b/Warhammer 4e Character Sheet/README.md index 3a3adf9246..1c0301aae2 100644 --- a/Warhammer 4e Character Sheet/README.md +++ b/Warhammer 4e Character Sheet/README.md @@ -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. diff --git a/Warhammer 4e Character Sheet/Warhammer 4e Character Sheet.html b/Warhammer 4e Character Sheet/Warhammer 4e Character Sheet.html index 00df8bf941..39897be538 100644 --- a/Warhammer 4e Character Sheet/Warhammer 4e Character Sheet.html +++ b/Warhammer 4e Character Sheet/Warhammer 4e Character Sheet.html @@ -1779,27 +1779,27 @@
- +
- +
- +
- +
- +
- +
@@ -2001,20 +2001,17 @@ - - + + -
-
-
M
WS
@@ -2028,7 +2025,6 @@
WP
Fel
W
-
@@ -3992,8 +3988,8 @@ - - + + @@ -5954,21 +5950,17 @@ - - + + -
-
-
-
M
WS
@@ -5982,7 +5974,6 @@
WP
Fel
W
-
@@ -7974,21 +7965,17 @@ - - + + -
-
-
-
M
WS
@@ -8002,7 +7989,6 @@
WP
Fel
W
-
@@ -21837,7 +21823,7 @@
Craftsman ( -
+
) @@ -21863,7 +21849,7 @@
Craftsman ( -
+
) @@ -21889,7 +21875,7 @@
Craftsman ( -
+
) @@ -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); diff --git a/Warhammer 4e Character Sheet/translation.json b/Warhammer 4e Character Sheet/translation.json index 7e924c0ab5..1837acc869 100644 --- a/Warhammer 4e Character Sheet/translation.json +++ b/Warhammer 4e Character Sheet/translation.json @@ -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",