From b521c4776f0b4b12e3aca15693616c46d881d935 Mon Sep 17 00:00:00 2001
From: Djjus <59532170+Djjus@users.noreply.github.com>
Date: Tue, 14 Feb 2023 14:38:26 +0000
Subject: [PATCH 1/6] Update Warhammer 4e Character Sheet.html
---
.../Warhammer 4e Character Sheet.html | 46 +++++++------------
1 file changed, 16 insertions(+), 30 deletions(-)
diff --git a/Warhammer 4e Character Sheet/Warhammer 4e Character Sheet.html b/Warhammer 4e Character Sheet/Warhammer 4e Character Sheet.html
index 00df8bf941..a2accd7d7d 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 @@
@@ -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);
From 588406d9937f5ca6d46d81d70a27936a33dd33ed Mon Sep 17 00:00:00 2001
From: Djjus <59532170+Djjus@users.noreply.github.com>
Date: Tue, 14 Feb 2023 14:38:59 +0000
Subject: [PATCH 2/6] Update README.md
---
Warhammer 4e Character Sheet/README.md | 6 ++++++
1 file changed, 6 insertions(+)
diff --git a/Warhammer 4e Character Sheet/README.md b/Warhammer 4e Character Sheet/README.md
index 3a3adf9246..ca9c4c0ad5 100644
--- a/Warhammer 4e Character Sheet/README.md
+++ b/Warhammer 4e Character Sheet/README.md
@@ -81,6 +81,12 @@ 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
+
+
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.
From 19f4ffa5bcbef1ab6ad333cb97035520faa348b3 Mon Sep 17 00:00:00 2001
From: Djjus <59532170+Djjus@users.noreply.github.com>
Date: Tue, 14 Feb 2023 15:22:22 +0000
Subject: [PATCH 3/6] Update translation.json
---
Warhammer 4e Character Sheet/translation.json | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
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",
From 74e17e9039492f43c92969387884076d153b0b3d Mon Sep 17 00:00:00 2001
From: Djjus <59532170+Djjus@users.noreply.github.com>
Date: Tue, 14 Feb 2023 15:23:31 +0000
Subject: [PATCH 4/6] Update README.md
---
Warhammer 4e Character Sheet/README.md | 1 +
1 file changed, 1 insertion(+)
diff --git a/Warhammer 4e Character Sheet/README.md b/Warhammer 4e Character Sheet/README.md
index ca9c4c0ad5..64a27a30be 100644
--- a/Warhammer 4e Character Sheet/README.md
+++ b/Warhammer 4e Character Sheet/README.md
@@ -85,6 +85,7 @@ 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 discrptions il8n tags
December 20th 2022 v1.65
From 6807e0690db3a268cde56fe20a5c6c6f380f117a Mon Sep 17 00:00:00 2001
From: Djjus <59532170+Djjus@users.noreply.github.com>
Date: Tue, 14 Feb 2023 16:13:16 +0000
Subject: [PATCH 5/6] Update Warhammer 4e Character Sheet.html
---
.../Warhammer 4e Character Sheet.html | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/Warhammer 4e Character Sheet/Warhammer 4e Character Sheet.html b/Warhammer 4e Character Sheet/Warhammer 4e Character Sheet.html
index a2accd7d7d..2361eb0b2e 100644
--- a/Warhammer 4e Character Sheet/Warhammer 4e Character Sheet.html
+++ b/Warhammer 4e Character Sheet/Warhammer 4e Character Sheet.html
@@ -21823,7 +21823,7 @@
Craftsman
(
-
+
)
@@ -21849,7 +21849,7 @@
Craftsman
(
-
+
)
@@ -21875,7 +21875,7 @@
Craftsman
(
-
+
)
From 77bd98ba603f6897493d6ead33658f7a3719ba40 Mon Sep 17 00:00:00 2001
From: Djjus <59532170+Djjus@users.noreply.github.com>
Date: Wed, 15 Feb 2023 00:56:01 +0000
Subject: [PATCH 6/6] channelling fail fix
---
Warhammer 4e Character Sheet/README.md | 3 ++-
.../Warhammer 4e Character Sheet.html | 4 ++--
2 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/Warhammer 4e Character Sheet/README.md b/Warhammer 4e Character Sheet/README.md
index 64a27a30be..1c0301aae2 100644
--- a/Warhammer 4e Character Sheet/README.md
+++ b/Warhammer 4e Character Sheet/README.md
@@ -85,7 +85,8 @@ 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 discrptions il8n tags
+- 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
diff --git a/Warhammer 4e Character Sheet/Warhammer 4e Character Sheet.html b/Warhammer 4e Character Sheet/Warhammer 4e Character Sheet.html
index 2361eb0b2e..39897be538 100644
--- a/Warhammer 4e Character Sheet/Warhammer 4e Character Sheet.html
+++ b/Warhammer 4e Character Sheet/Warhammer 4e Character Sheet.html
@@ -47650,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;}
@@ -47673,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;}