@@ -33029,9 +33029,9 @@
Critical Hit{{RTcrit}}{{#rollTotal() sptal2 0}} t{{RTminor}} {{RTmajor}}{{/rollTotal() sptal2 0}}
{{#rollGreater() warpstone 0}}
-
Warpstone Crit: Target rolls (+0) Cool/Endurance Test, if failed they gain 1 corruption.
+
Warpstone Crit: Target rolls (+0) Cool/Endurance Test, if failed they gain 1 corruption.
{{/rollGreater() warpstone 0}}
-
+
{{#rollGreater() trapblade 0}}
{{RTtrapblade}}
@@ -33669,6 +33669,9 @@
{{RTtrapblade}}
{{/rollGreater() trapblade 0}}
+ {{#rollGreater() warpstone 0}}
+
+ {{/rollGreater() warpstone 0}}
{{#rollGreater() slash 0}}
{{slash}}
{{/rollGreater() slash 0}}
@@ -33681,6 +33684,9 @@
{{RTtrapblade}}
{{/rollGreater() trapblade 0}}
+ {{#rollGreater() warpstone 0}}
+
+ {{/rollGreater() warpstone 0}}
{{#rollGreater() slash 0}}
{{slash}}
{{/rollGreater() slash 0}}
@@ -33693,6 +33699,9 @@
{{RTtrapblade}}
{{/rollGreater() trapblade 0}}
+ {{#rollGreater() warpstone 0}}
+
+ {{/rollGreater() warpstone 0}}
{{#rollGreater() slash 0}}
{{slash}}
{{/rollGreater() slash 0}}
@@ -33705,6 +33714,9 @@
{{RTtrapblade}}
{{/rollGreater() trapblade 0}}
+ {{#rollGreater() warpstone 0}}
+
+ {{/rollGreater() warpstone 0}}
{{#rollGreater() slash 0}}
{{slash}}
{{/rollGreater() slash 0}}
@@ -33717,6 +33729,9 @@
{{RTtrapblade}}
{{/rollGreater() trapblade 0}}
+ {{#rollGreater() warpstone 0}}
+
+ {{/rollGreater() warpstone 0}}
{{#rollGreater() slash 0}}
{{slash}}
{{/rollGreater() slash 0}}
@@ -33729,6 +33744,9 @@
{{RTtrapblade}}
{{/rollGreater() trapblade 0}}
+ {{#rollGreater() warpstone 0}}
+
+ {{/rollGreater() warpstone 0}}
{{#rollGreater() slash 0}}
{{slash}}
{{/rollGreater() slash 0}}
@@ -33741,6 +33759,9 @@
{{RTtrapblade}}
{{/rollGreater() trapblade 0}}
+ {{#rollGreater() warpstone 0}}
+
+ {{/rollGreater() warpstone 0}}
{{#rollGreater() slash 0}}
{{slash}}
{{/rollGreater() slash 0}}
@@ -33753,6 +33774,9 @@
{{RTtrapblade}}
{{/rollGreater() trapblade 0}}
+ {{#rollGreater() warpstone 0}}
+
+ {{/rollGreater() warpstone 0}}
{{#rollGreater() slash 0}}
{{slash}}
{{/rollGreater() slash 0}}
@@ -33765,6 +33789,9 @@
{{RTtrapblade}}
{{/rollGreater() trapblade 0}}
+ {{#rollGreater() warpstone 0}}
+
+ {{/rollGreater() warpstone 0}}
{{#rollGreater() slash 0}}
{{slash}}
{{/rollGreater() slash 0}}
@@ -33777,51 +33804,75 @@
{{#rollTotal() test 10}}
Critical Hit (Impaled) {{RTcrit}}
+ {{#rollGreater() warpstone 0}}
+
+ {{/rollGreater() warpstone 0}}
{{/rollTotal() test 10}}
{{#rollTotal() test 20}}
Critical Hit (Impaled) {{RTcrit}}
+ {{#rollGreater() warpstone 0}}
+
+ {{/rollGreater() warpstone 0}}
{{/rollTotal() test 20}}
{{#rollTotal() test 30}}
Critical Hit (Impaled) {{RTcrit}}
+ {{#rollGreater() warpstone 0}}
+
+ {{/rollGreater() warpstone 0}}
{{/rollTotal() test 30}}
{{#rollTotal() test 40}}
Critical Hit (Impaled) {{RTcrit}}
+ {{#rollGreater() warpstone 0}}
+
+ {{/rollGreater() warpstone 0}}
{{/rollTotal() test 40}}
{{#rollTotal() test 50}}
Critical Hit (Impaled) {{RTcrit}}
+ {{#rollGreater() warpstone 0}}
+
+ {{/rollGreater() warpstone 0}}
{{/rollTotal() test 50}}
{{#rollTotal() test 60}}
Critical Hit (Impaled) {{RTcrit}}
+ {{#rollGreater() warpstone 0}}
+
+ {{/rollGreater() warpstone 0}}
{{/rollTotal() test 60}}
{{#rollTotal() test 70}}
Critical Hit (Impaled) {{RTcrit}}
+ {{#rollGreater() warpstone 0}}
+
+ {{/rollGreater() warpstone 0}}
{{/rollTotal() test 70}}
{{#rollTotal() test 80}}
Critical Hit (Impaled) {{RTcrit}}
+ {{#rollGreater() warpstone 0}}
+
+ {{/rollGreater() warpstone 0}}
{{/rollTotal() test 80}}
{{#rollTotal() test 90}}
Critical Hit (Impaled) {{RTcrit}}
+ {{#rollGreater() warpstone 0}}
+
+ {{/rollGreater() warpstone 0}}
{{/rollTotal() test 90}}
- {{#rollGreater() warpstone 0}}
-
Warpstone Crit: Target rolls (+0) Cool/Endurance Test, if failed they gain 1 corruption.
- {{/rollGreater() warpstone 0}}
{{/^rollGreater() test target}}
{{/rollTotal() rolltype 4}}
{{/^rollWasCrit() test}}
@@ -36640,9 +36691,6 @@
{{#rollGreater() furiousassault 0}} {{#RTfuriousassault}}
{{RTfuriousassault}}
{{/RTfuriousassault}} {{/rollGreater() furiousassault 0}}
- {{#rollGreater() warpstone 0}}
-
Warpstone: On hit cause exposure to Minor Corruption
- {{/rollGreater() warpstone 0}}
{{#^rollTotal() tiring 0}}
Tiring
{{/^rollTotal() tiring 0}}
@@ -48482,12 +48530,12 @@ on('clicked:meleeattackmain clicked:furiousassaultmain clicked:meleechargemain c
if (v.MeleeMode_WoD == 1) {rollPart4 += " {{wod=[[1]]}}";}
if (v.MeleeMode_STS == 1) {
- if (v.MeleeMode_Aimed == 1) {hitloc = "{{hitlocation=[[1]]}}"; rollPart4 += " {{aimed=[[@{MeleeMode_Aimed}]]}}";} else {hitloc = "{{hitlocation=true}}";}
+ if (v.MeleeMode_Aimed == 1) {hitloc = "{{hitlocation=[[1]]}}"; rollPart4 += " {{aimed=[[MeleeMode_Aimed}]]}}";} else {hitloc = "{{hitlocation=true}}";}
} else {
if (v.MeleeMode_Aimed == 1) {hitloc = "{{hitlocation=[[?{Choose a Hit Location|Head,1|Right Arm,2|Left Arm,3|Body,4|Right Leg,5|Left Leg,6}]]}}"; rollPart4 += " {{aimed=[[@{MeleeMode_Aimed}]]}}";} else {hitloc = "{{hitlocation=true}}";}
}
- if (v.MeleeSizeMod < 0) {rollPart4 += " {{sizemod=[[" + v.MeleeSizeMod + "]]}}";}
+ if (v.MeleeSizeMod < 0) {rollPart4 += " {{sizemod=[[@{MeleeSizeMod}]]}}";}
console.log(hitloc);
rollPart = rollPart4.replaceAll('>addsldf<', addsldf).replaceAll('>adddmg<', adddmg).replaceAll('>hitloc<', hitloc).replaceAll('>sitfail<', sitfail).replaceAll('>atype<', atype);
@@ -48805,7 +48853,7 @@ on('clicked:ripostedmgmain', (eventInfo) => {
on('clicked:meleeattackoff clicked:meleechargeoff clicked:furiousassaultoff clicked:dualwieldoff', (eventInfo) => {
if (eventInfo.sourceType === 'sheetworker') return;
- getAttrs(["Used_DefenseWeaponSkill", "Talent_AmbidextrousLvl","Used_MeleeTwohanded","Advantageinput","LastRollMain","LastCritRoll", "Talent_BattleRageLvl", "Talent_FrenzyLvl", "MeleeMode_Underminer", "MeleeMode_Frenzy", "MeleeMode_VsObject", "MeleeMode_Infight", "MeleeMode_Drilled", "MeleeMode_Charging", "MeleeMode_DualWield", "Used_MeleeBonus", "Used_DefenseBonus", "MeleeMode_STS", "MeleeMode_Aimed", "GroupAdv", "CritTable", "MeleeOffType"], function(values) {
+ getAttrs(["Used_DefenseWeaponSkill", "Talent_AmbidextrousLvl","Used_MeleeTwohanded","Advantageinput","LastRollMain","LastCritRoll", "Talent_BattleRageLvl", "Talent_FrenzyLvl", "MeleeMode_Underminer", "MeleeMode_Frenzy", "MeleeMode_VsObject", "MeleeMode_Infight", "MeleeMode_Drilled", "MeleeMode_Charging", "MeleeMode_DualWield", "Used_MeleeBonus", "Used_DefenseBonus", "MeleeMode_STS", "MeleeMode_Aimed", "GroupAdv", "CritTable", "MeleeOffType", "MeleeSizeMod"], function(values) {
prevcrit = JSON.stringify(values["LastCritRoll"])||0;
if (prevcrit >= 1 && prevcrit <= 9) {
@@ -49061,6 +49109,8 @@ on('clicked:meleeattackoff clicked:meleechargeoff clicked:furiousassaultoff clic
if (values.MeleeMode_Aimed == 1) {hitloc = "{{hitlocation=[[?{Choose a Hit Location|Head,1|Right Arm,2|Left Arm,3|Body,4|Right Leg,5|Left Leg,6}]]}}"; rollPart4 += " {{aimed=[[@{MeleeMode_Aimed}]]}}";} else {hitloc = "{{hitlocation=true}}";}
}
+ if (v.MeleeSizeMod < 0) {rollPart4 += " {{sizemod=[[@{MeleeSizeMod}]]}}";}
+
let rollPart = rollPart4.replaceAll('>ambi<', ambipen).replaceAll('>addsldf<', addsldf).replaceAll('>adddmg<', adddmg).replaceAll('>hitloc<', hitloc).replaceAll('>sitfail<', sitfail).replaceAll('>atype<', atype);
console.log(rollPart);
@@ -51439,10 +51489,10 @@ on('clicked:criticalroll clicked:criticalrollcast', (eventInfo) => {
if (critroll > 9 && critroll < 16) {critname += getTranslationByKey('RINGING-STRIKE'); critdisc += getTranslationByKey('RINGING-STRIKE-DESC-UNARMED'); critdmg += 1 ;}
if (critroll > 15 && critroll < 21) {critname += getTranslationByKey('BLACK-EYE'); critdisc += getTranslationByKey('BLACK-EYE-DESC-UNARMED'); critdmg = 1 ;}
if (critroll > 20 && critroll < 26) {critname += getTranslationByKey('BRUISED-JAW'); critdisc += getTranslationByKey('BRUISED-JAW-DESC-UNARMED'); critdmg += 2 ;}
- if (critroll > 25 && critroll < 31) {critname += getTranslationByKey('HEAVY-BRUISING'); critdisc += getTranslationByKey('HEAVY-BRUISING-DESC-UNARMED'); critdmg += 2 ;}
+ if (critroll > 25 && critroll < 31) {critname += getTranslationByKey('HEAVY-BRUISING'); critdisc += getTranslationByKey('HEAVY-BRUISING-DESC-UNARMED-HEAD'); critdmg += 2 ;}
if (critroll > 30 && critroll < 36) {critname += getTranslationByKey('EYE-POKE'); critdisc += getTranslationByKey('EYE-POKE-DESC-UNARMED'); critdmg += 2 ;}
if (critroll > 35 && critroll < 41) {critname += getTranslationByKey('FRACTURED-JAW'); critdisc += getTranslationByKey('FRACTURED-JAW-DESC-UNARMED'); critdmg += 2 ;}
- if (critroll > 40 && critroll < 46) {critname += getTranslationByKey('BAD-CUT'); critdisc += getTranslationByKey('BAD-CUT-DESC-UNARMED'); critdmg += 3 ;}
+ if (critroll > 40 && critroll < 46) {critname += getTranslationByKey('BAD-CUT'); critdisc += getTranslationByKey('BAD-CUT-DESC-UNARMED-HEAD'); critdmg += 3 ;}
if (critroll > 45 && critroll < 51) {critname += getTranslationByKey('SMASHED-EAR'); critdisc += getTranslationByKey('SMASHED-EAR-DESC-UNARMED'); critdmg += 3 ;}
if (critroll > 50 && critroll < 56) {critname += getTranslationByKey('FLASH-KO'); critdisc += getTranslationByKey('FLASH-KO-DESC-UNARMED'); critdmg += 3 ;}
if (critroll > 55 && critroll < 61) {critname += getTranslationByKey('CLEANED-CLOCK'); critdisc += getTranslationByKey('CLEANED-CLOCK-DESC-UNARMED'); critdmg += 3 ;}
@@ -51461,10 +51511,10 @@ on('clicked:criticalroll clicked:criticalrollcast', (eventInfo) => {
if (critv2 > 9 && critv2 < 16) {critname2 += getTranslationByKey('RINGING-STRIKE'); critdisc2 += getTranslationByKey('RINGING-STRIKE-DESC-UNARMED'); critdmg2 += 1 ;}
if (critv2 > 15 && critv2 < 21) {critname2 += getTranslationByKey('BLACK-EYE'); critdisc2 += getTranslationByKey('BLACK-EYE-DESC-UNARMED'); critdmg2 = 1 ;}
if (critv2 > 20 && critv2 < 26) {critname2 += getTranslationByKey('BRUISED-JAW'); critdisc2 += getTranslationByKey('BRUISED-JAW-DESC-UNARMED'); critdmg2 += 2 ;}
- if (critv2 > 25 && critv2 < 31) {critname2 += getTranslationByKey('HEAVY-BRUISING'); critdisc2 += getTranslationByKey('HEAVY-BRUISING-DESC-UNARMED'); critdmg2 += 2 ;}
+ if (critv2 > 25 && critv2 < 31) {critname2 += getTranslationByKey('HEAVY-BRUISING'); critdisc2 += getTranslationByKey('HEAVY-BRUISING-DESC-UNARMED-HEAD'); critdmg2 += 2 ;}
if (critv2 > 30 && critv2 < 36) {critname2 += getTranslationByKey('EYE-POKE'); critdisc2 += getTranslationByKey('EYE-POKE-DESC-UNARMED'); critdmg2 += 2 ;}
if (critv2 > 35 && critv2 < 41) {critname2 += getTranslationByKey('FRACTURED-JAW'); critdisc2 += getTranslationByKey('FRACTURED-JAW-DESC-UNARMED'); critdmg2 += 2 ;}
- if (critv2 > 40 && critv2 < 46) {critname2 += getTranslationByKey('BAD-CUT'); critdisc2 += getTranslationByKey('BAD-CUT-DESC-UNARMED'); critdmg2 += 3 ;}
+ if (critv2 > 40 && critv2 < 46) {critname2 += getTranslationByKey('BAD-CUT'); critdisc2 += getTranslationByKey('BAD-CUT-DESC-UNARMED-HEAD'); critdmg2 += 3 ;}
if (critv2 > 45 && critv2 < 51) {critname2 += getTranslationByKey('SMASHED-EAR'); critdisc2 += getTranslationByKey('SMASHED-EAR-DESC-UNARMED'); critdmg2 += 3 ;}
if (critv2 > 50 && critv2 < 56) {critname2 += getTranslationByKey('FLASH-KO'); critdisc2 += getTranslationByKey('FLASH-KO-DESC-UNARMED'); critdmg2 += 3 ;}
if (critv2 > 55 && critv2 < 61) {critname2 += getTranslationByKey('CLEANED-CLOCK'); critdisc2 += getTranslationByKey('CLEANED-CLOCK-DESC-UNARMED'); critdmg2 += 3 ;}
@@ -51485,14 +51535,14 @@ on('clicked:criticalroll clicked:criticalrollcast', (eventInfo) => {
if (critroll > 6 && critroll < 10) {critname += getTranslationByKey('SPRAIN'); critdisc += getTranslationByKey('SPRAIN-DESC-UNARMED'); critdmg += 1 ;}
if (critroll > 9 && critroll < 16) {critname += getTranslationByKey('DEAD-ARM'); critdisc += getTranslationByKey('DEAD-ARM-DESC-UNARMED'); critdmg += 1 ;}
if (critroll > 15 && critroll < 21) {critname += getTranslationByKey('STRONG-BLOW'); critdisc += getTranslationByKey('STRONG-BLOW-DESC-UNARMED'); critdmg = 1 ;}
- if (critroll > 20 && critroll < 26) {critname += getTranslationByKey('HEAVY-BRUISING'); critdisc += getTranslationByKey('HEAVY-BRUISING-DESC-UNARMED'); critdmg += 2 ;}
+ if (critroll > 20 && critroll < 26) {critname += getTranslationByKey('HEAVY-BRUISING'); critdisc += getTranslationByKey('HEAVY-BRUISING-DESC-UNARMED-ARM'); critdmg += 2 ;}
if (critroll > 25 && critroll < 31) {critname += getTranslationByKey('CRUSHED-HAND'); critdisc += getTranslationByKey('CRUSHED-HAND-DESC-UNARMED'); critdmg += 2 ;}
if (critroll > 30 && critroll < 36) {critname += getTranslationByKey('TORN-MUSCLES'); critdisc += getTranslationByKey('TORN-MUSCLES-DESC-UNARMED'); critdmg += 2 ;}
if (critroll > 35 && critroll < 41) {critname += getTranslationByKey('CRUNCHING-BLOW'); critdisc += getTranslationByKey('CRUNCHING-BLOW-DESC-UNARMED'); critdmg += 2 ;}
if (critroll > 40 && critroll < 46) {critname += getTranslationByKey('WRENCHED-ARM'); critdisc += getTranslationByKey('WRENCHED-ARM-DESC-UNARMED'); critdmg += 3 ;}
if (critroll > 45 && critroll < 51) {critname += getTranslationByKey('HEAVY-HIT'); critdisc += getTranslationByKey('HEAVY-HIT-DESC-UNARMED'); critdmg += 3 ;}
if (critroll > 50 && critroll < 56) {critname += getTranslationByKey('SEVERE-BRUISING'); critdisc += getTranslationByKey('SEVERE-BRUISING-DESC-UNARMED'); critdmg += 3 ;}
- if (critroll > 55 && critroll < 61) {critname += getTranslationByKey('BAD-CUT'); critdisc += getTranslationByKey('BAD-CUT-DESC-UNARMED'); critdmg += 3 ;}
+ if (critroll > 55 && critroll < 61) {critname += getTranslationByKey('BAD-CUT'); critdisc += getTranslationByKey('BAD-CUT-DESC-UNARMED-ARM'); critdmg += 3 ;}
if (critroll > 60 && critroll < 66) {critname += getTranslationByKey('THUNDEROUS-BLOW'); critdisc += getTranslationByKey('THUNDEROUS-BLOW-DESC-UNARMED'); critdmg += 4 ;}
if (critroll > 65 && critroll < 76) {critname += getTranslationByKey('CLEAN-BREAK'); critdisc += getTranslationByKey('CLEAN-BREAK-DESC-UNARMED'); critdmg += 4 ;}
if (critroll > 75 && critroll < 81) {critname += getTranslationByKey('BROKEN-FINGERS'); critdisc += getTranslationByKey('BROKEN-FINGERS-DESC-UNARMED'); critdmg += 4 ;}
@@ -51507,14 +51557,14 @@ on('clicked:criticalroll clicked:criticalrollcast', (eventInfo) => {
if (critv2 > 6 && critv2 < 10) {critname2 += getTranslationByKey('SPRAIN'); critdisc2 += getTranslationByKey('SPRAIN-DESC-UNARMED'); critdmg2 += 1 ;}
if (critv2 > 9 && critv2 < 16) {critname2 += getTranslationByKey('DEAD-ARM'); critdisc2 += getTranslationByKey('DEAD-ARM-DESC-UNARMED'); critdmg2 += 1 ;}
if (critv2 > 15 && critv2 < 21) {critname2 += getTranslationByKey('STRONG-BLOW'); critdisc2 += getTranslationByKey('STRONG-BLOW-DESC-UNARMED'); critdmg2 = 1 ;}
- if (critv2 > 20 && critv2 < 26) {critname2 += getTranslationByKey('HEAVY-BRUISING'); critdisc2 += getTranslationByKey('HEAVY-BRUISING-DESC-UNARMED'); critdmg2 += 2 ;}
+ if (critv2 > 20 && critv2 < 26) {critname2 += getTranslationByKey('HEAVY-BRUISING'); critdisc2 += getTranslationByKey('HEAVY-BRUISING-DESC-UNARMED-ARM'); critdmg2 += 2 ;}
if (critv2 > 25 && critv2 < 31) {critname2 += getTranslationByKey('CRUSHED-HAND'); critdisc2 += getTranslationByKey('CRUSHED-HAND-DESC-UNARMED'); critdmg2 += 2 ;}
if (critv2 > 30 && critv2 < 36) {critname2 += getTranslationByKey('TORN-MUSCLES'); critdisc2 += getTranslationByKey('TORN-MUSCLES-DESC-UNARMED'); critdmg2 += 2 ;}
if (critv2 > 35 && critv2 < 41) {critname2 += getTranslationByKey('CRUNCHING-BLOW'); critdisc2 += getTranslationByKey('CRUNCHING-BLOW-DESC-UNARMED'); critdmg2 += 2 ;}
if (critv2 > 40 && critv2 < 46) {critname2 += getTranslationByKey('WRENCHED-ARM'); critdisc2 += getTranslationByKey('WRENCHED-ARM-DESC-UNARMED'); critdmg2 += 3 ;}
if (critv2 > 45 && critv2 < 51) {critname2 += getTranslationByKey('HEAVY-HIT'); critdisc2 += getTranslationByKey('HEAVY-HIT-DESC-UNARMED'); critdmg2 += 3 ;}
if (critv2 > 50 && critv2 < 56) {critname2 += getTranslationByKey('SEVERE-BRUISING'); critdisc2 += getTranslationByKey('SEVERE-BRUISING-DESC-UNARMED'); critdmg2 += 3 ;}
- if (critv2 > 55 && critv2 < 61) {critname2 += getTranslationByKey('BAD-CUT'); critdisc2 += getTranslationByKey('BAD-CUT-DESC-UNARMED'); critdmg2 += 3 ;}
+ if (critv2 > 55 && critv2 < 61) {critname2 += getTranslationByKey('BAD-CUT'); critdisc2 += getTranslationByKey('BAD-CUT-DESC-UNARMED-ARM'); critdmg2 += 3 ;}
if (critv2 > 60 && critv2 < 66) {critname2 += getTranslationByKey('THUNDEROUS-BLOW'); critdisc2 += getTranslationByKey('THUNDEROUS-BLOW-DESC-UNARMED'); critdmg2 += 4 ;}
if (critv2 > 65 && critv2 < 76) {critname2 += getTranslationByKey('CLEAN-BREAK'); critdisc2 += getTranslationByKey('CLEAN-BREAK-DESC-UNARMED'); critdmg2 += 4 ;}
if (critv2 > 75 && critv2 < 81) {critname2 += getTranslationByKey('BROKEN-FINGERS'); critdisc2 += getTranslationByKey('BROKEN-FINGERS-DESC-UNARMED'); critdmg2 += 4 ;}
@@ -51743,10 +51793,10 @@ on('clicked:repeating_npc-tab-page:criticalrollnpc', (eventInfo) => {
if (critroll > 9 && critroll < 16) {critname += getTranslationByKey('RINGING-STRIKE'); critdisc += getTranslationByKey('RINGING-STRIKE-DESC-UNARMED'); critdmg += 1 ;}
if (critroll > 15 && critroll < 21) {critname += getTranslationByKey('BLACK-EYE'); critdisc += getTranslationByKey('BLACK-EYE-DESC-UNARMED'); critdmg = 1 ;}
if (critroll > 20 && critroll < 26) {critname += getTranslationByKey('BRUISED-JAW'); critdisc += getTranslationByKey('BRUISED-JAW-DESC-UNARMED'); critdmg += 2 ;}
- if (critroll > 25 && critroll < 31) {critname += getTranslationByKey('HEAVY-BRUISING'); critdisc += getTranslationByKey('HEAVY-BRUISING-DESC-UNARMED'); critdmg += 2 ;}
+ if (critroll > 25 && critroll < 31) {critname += getTranslationByKey('HEAVY-BRUISING'); critdisc += getTranslationByKey('HEAVY-BRUISING-DESC-UNARMED-HEAD'); critdmg += 2 ;}
if (critroll > 30 && critroll < 36) {critname += getTranslationByKey('EYE-POKE'); critdisc += getTranslationByKey('EYE-POKE-DESC-UNARMED'); critdmg += 2 ;}
if (critroll > 35 && critroll < 41) {critname += getTranslationByKey('FRACTURED-JAW'); critdisc += getTranslationByKey('FRACTURED-JAW-DESC-UNARMED'); critdmg += 2 ;}
- if (critroll > 40 && critroll < 46) {critname += getTranslationByKey('BAD-CUT'); critdisc += getTranslationByKey('BAD-CUT-DESC-UNARMED'); critdmg += 3 ;}
+ if (critroll > 40 && critroll < 46) {critname += getTranslationByKey('BAD-CUT'); critdisc += getTranslationByKey('BAD-CUT-DESC-UNARMED-HEAD'); critdmg += 3 ;}
if (critroll > 45 && critroll < 51) {critname += getTranslationByKey('SMASHED-EAR'); critdisc += getTranslationByKey('SMASHED-EAR-DESC-UNARMED'); critdmg += 3 ;}
if (critroll > 50 && critroll < 56) {critname += getTranslationByKey('FLASH-KO'); critdisc += getTranslationByKey('FLASH-KO-DESC-UNARMED'); critdmg += 3 ;}
if (critroll > 55 && critroll < 61) {critname += getTranslationByKey('CLEANED-CLOCK'); critdisc += getTranslationByKey('CLEANED-CLOCK-DESC-UNARMED'); critdmg += 3 ;}
@@ -51768,14 +51818,14 @@ on('clicked:repeating_npc-tab-page:criticalrollnpc', (eventInfo) => {
if (critroll > 6 && critroll < 10) {critname += getTranslationByKey('SPRAIN'); critdisc += getTranslationByKey('SPRAIN-DESC-UNARMED'); critdmg += 1 ;}
if (critroll > 9 && critroll < 16) {critname += getTranslationByKey('DEAD-ARM'); critdisc += getTranslationByKey('DEAD-ARM-DESC-UNARMED'); critdmg += 1 ;}
if (critroll > 15 && critroll < 21) {critname += getTranslationByKey('STRONG-BLOW'); critdisc += getTranslationByKey('STRONG-BLOW-DESC-UNARMED'); critdmg = 1 ;}
- if (critroll > 20 && critroll < 26) {critname += getTranslationByKey('HEAVY-BRUISING'); critdisc += getTranslationByKey('HEAVY-BRUISING-DESC-UNARMED'); critdmg += 2 ;}
+ if (critroll > 20 && critroll < 26) {critname += getTranslationByKey('HEAVY-BRUISING'); critdisc += getTranslationByKey('HEAVY-BRUISING-DESC-UNARMED-ARM'); critdmg += 2 ;}
if (critroll > 25 && critroll < 31) {critname += getTranslationByKey('CRUSHED-HAND'); critdisc += getTranslationByKey('CRUSHED-HAND-DESC-UNARMED'); critdmg += 2 ;}
if (critroll > 30 && critroll < 36) {critname += getTranslationByKey('TORN-MUSCLES'); critdisc += getTranslationByKey('TORN-MUSCLES-DESC-UNARMED'); critdmg += 2 ;}
if (critroll > 35 && critroll < 41) {critname += getTranslationByKey('CRUNCHING-BLOW'); critdisc += getTranslationByKey('CRUNCHING-BLOW-DESC-UNARMED'); critdmg += 2 ;}
if (critroll > 40 && critroll < 46) {critname += getTranslationByKey('WRENCHED-ARM'); critdisc += getTranslationByKey('WRENCHED-ARM-DESC-UNARMED'); critdmg += 3 ;}
if (critroll > 45 && critroll < 51) {critname += getTranslationByKey('HEAVY-HIT'); critdisc += getTranslationByKey('HEAVY-HIT-DESC-UNARMED'); critdmg += 3 ;}
if (critroll > 50 && critroll < 56) {critname += getTranslationByKey('SEVERE-BRUISING'); critdisc += getTranslationByKey('SEVERE-BRUISING-DESC-UNARMED'); critdmg += 3 ;}
- if (critroll > 55 && critroll < 61) {critname += getTranslationByKey('BAD-CUT'); critdisc += getTranslationByKey('BAD-CUT-DESC-UNARMED'); critdmg += 3 ;}
+ if (critroll > 55 && critroll < 61) {critname += getTranslationByKey('BAD-CUT'); critdisc += getTranslationByKey('BAD-CUT-DESC-UNARMED-ARM'); critdmg += 3 ;}
if (critroll > 60 && critroll < 66) {critname += getTranslationByKey('THUNDEROUS-BLOW'); critdisc += getTranslationByKey('THUNDEROUS-BLOW-DESC-UNARMED'); critdmg += 4 ;}
if (critroll > 65 && critroll < 76) {critname += getTranslationByKey('CLEAN-BREAK'); critdisc += getTranslationByKey('CLEAN-BREAK-DESC-UNARMED'); critdmg += 4 ;}
if (critroll > 75 && critroll < 81) {critname += getTranslationByKey('BROKEN-FINGERS'); critdisc += getTranslationByKey('BROKEN-FINGERS-DESC-UNARMED'); critdmg += 4 ;}
@@ -52461,7 +52511,7 @@ on('change:RangedMode_Engaged change:RangedMode_Range change:RangedMode_Size cha
if (mod > 60) {mod = 60}
if (mod < -30) {mod = -30}
-
+
setAttrs(
{
"Used_RangedBonus": mod,
@@ -52560,19 +52610,22 @@ on('change:MeleeMode_Outnumbered change:DefenseMode_Defensive change:MeleeMode_P
}
}
- if (v.MeleeMode_Size < v.Size) {
- melmod += 10; diff = v.Size - v.MeleeMode_Size;}
+ if (v.MeleeMode_Size < v.Size) {melmod += 10;}
+ diff = v.Size*1 - v.MeleeMode_Size*1;
+ console.log("test size");
+ console.log(v.Size*1);
+ console.log(v.MeleeMode_Size);
+ console.log(diff);
+ console.log("test size");
+
if (melmod > 60) {melmod = 60}
if (melmod < -30) {melmod = -30}
if (oppmod > 60) {oppmod = 60}
if (oppmod < -30) {oppmod = -30}
if (oppdefmod > 60) {oppdefmod = 60}
if (oppdefmod < -30) {oppdefmod = -30}
-
- console.log(oppmod);
- console.log(oppdefmod);
-
+
setAttrs(
{
"Used_MeleeBonus": melmod,
@@ -52792,7 +52845,7 @@ on('change:MeleeMode_VsObject', function(event){
});
-on('change:Talent_DrilledLvl change:Talent_DualWielderLvl change:Talent_BreakandEnterLvl change:Talent_DisarmLvl change:Talent_InFighterLvl change:Talent_FrenzyLvl change:Talent_FeintLvl change:Talent_FrenzyLvl change:Talent_StriketoStunLvl change:Talent_BeatBladeLvl change:Talent_FastShotLvl change:Talent_UnderminerLvl change:Talent_WhirlwindofDeathLvl', function(event){
+on('sheet:opened change:Talent_DrilledLvl change:Talent_DualWielderLvl change:Talent_BreakandEnterLvl change:Talent_DisarmLvl change:Talent_InFighterLvl change:Talent_FrenzyLvl change:Talent_FeintLvl change:Talent_FrenzyLvl change:Talent_StriketoStunLvl change:Talent_BeatBladeLvl change:Talent_FastShotLvl change:Talent_UnderminerLvl change:Talent_WhirlwindofDeathLvl', function(event){
if (event.sourceType === 'sheetworker') return;
console.log("Modifier reset");
getAttrs(["Talent_DrilledLvl", "Talent_DualWielderLvl", "Talent_BreakandEnterLvl", "Talent_DisarmLvl", "Talent_InFighterLvl", "Talent_FeintLvl", "Talent_FastShotLvl", "Talent_FrenzyLvl", "Talent_StriketoStunLvl", "Talent_BeatBladeLvl", "Talent_UnderminerLvl", "Talent_WhirlwindofDeathLvl"], function(v) {
diff --git a/Warhammer 4e Character Sheet/translation.json b/Warhammer 4e Character Sheet/translation.json
index 2ab33929d6..a29524d066 100644
--- a/Warhammer 4e Character Sheet/translation.json
+++ b/Warhammer 4e Character Sheet/translation.json
@@ -369,7 +369,7 @@
"SLASH": "Slash",
"XA": "XA",
"WARPSTONE": "Warpstone",
- "WARPSTONE-EFFECT": "Warpstone: On hit inflicts Minor Corruption",
+ "WARPSTONE-EFFECT": "Warpstone: On crit inflicts Minor Corruption",
"ZZAP": "ZZAP!",
"ZZAP-EFFECT": "ZZAP!: -1 AP & Ignore Metal AP",
"SLASH-EFFECT": "Slash: +1 Bleeding (Inc. by 1, for",
@@ -392,12 +392,11 @@
"BRUISED-JAW": "Bruised Jaw",
"BRUISED-JAW-DESC-UNARMED": "The strike cracks your chin. Make an b>Endurance Test (-10) or gain a Stunned condition and lose a tooth amputation – Easy.",
"HEAVY-BRUISING": "Heavy Bruising",
- "HEAVY-BRUISING-DESC-UNARMED": "That hit bruises your face badly – suffer a -10 to fellowship for 10-TB days as it clears up.",
+ "HEAVY-BRUISING-DESC-UNARMED-HEAD": "That hit bruises your face badly – suffer a -10 to fellowship for 10-TB days as it clears up.",
"EYE-POKE": "Eye Poke",
"EYE-POKE-DESC-UNARMED": "Something goes into your eye socket. Gain b>2 Blinded Conditions and make an b>Endurance Test (0) or lose the use of your eye for 10-TB hours, Amputation Easy.",
"FRACTURED-JAW-DESC-UNARMED": "The blow fractures your jaw. Gain 1 Stunned Conditions. Suffer a Broken Bone (Minor) injury.",
- "BAD-CUT": "Bad Cut",
- "BAD-CUT-DESC-UNARMED": "The blow opens a bad cut on your face or head. Gain 1 Bleeding condition and make an endurance test (-10) or gain a stunned condition.",
+ "BAD-CUT-DESC-UNARMED-HEAD": "The blow opens a bad cut on your face or head. Gain 1 Bleeding condition and make an endurance test (-10) or gain a stunned condition.",
"SMASHED-EAR": "Smashed Ear",
"SMASHED-EAR-DESC-UNARMED": "A powerful blow hits your ear and severely damages it. Gain 1 bleeding condition and 1 deafened condition that cannot be removed without medical attention",
"FLASH-KO": "Flash KO",
@@ -420,7 +419,7 @@
"DEAD-ARM-DESC-UNARMED": "Your arm is useless for the next 1d10-TB rounds (minimum 1) – count as amputated",
"STRONG-BLOW": "Strong Blow",
"STRONG-BLOW-DESC-UNARMED": "You are rocked by the blow, take an endurance test (0) or gain a stunned condition",
- "HEAVY-BRUISING-DESC-UNARMED": "Your arm takes a nasty hit, and you are at -10 to any actions using it until you can pass an endurance test )-10. Also, drop anything held in that hand.",
+ "HEAVY-BRUISING-DESC-UNARMED-ARM": "Your arm takes a nasty hit, and you are at -10 to any actions using it until you can pass an endurance test )-10. Also, drop anything held in that hand.",
"CRUSHED-HAND": "Crushed Hand",
"CRUSHED-HAND-DESC-UNARMED": "Your hand takes the brunt of the attack. Make an endurance test (+20) and break 5-SLs fingers ",
"TORN-MUSCLES-DESC-UNARMED": "The blow slams into your forearm, tearing something inside. Gain a Torn Muscle (Minor) injury.",
@@ -433,7 +432,7 @@
"HEAVY-HIT-DESC-UNARMED": "Gain a stunned condition.",
"SEVERE-BRUISING": "Severe Bruising",
"SEVERE-BRUISING-DESC-UNARMED": "Your am is deeply bruised by the blow, causing you to suffer a -10 to any actions using that arm until medical attention is received.",
- "BAD-CUT-DESC-UNARMED": "The strike opens a cut on your arm. Gain a bleeding condition",
+ "BAD-CUT-DESC-UNARMED-ARM": "The strike opens a cut on your arm. Gain a bleeding condition",
"THUNDEROUS-BLOW": "Thunderous blow",
"THUNDEROUS-BLOW-DESC-UNARMED": "You take the hit on your arm, sending waves of pain and shock through your body. Gain a stunned condition and take an endurance test (-10) or gain a second stunned condition",
"CLEAN-BREAK-DESC-UNARMED": "Drop whatever was held in that hand and gain a Broken Bone (Minor) injury. Pass a Difficult (–10) Endurance Test or gain a Stunned Condition.",
@@ -451,17 +450,13 @@
"FIERCE-BLOW-DESC-UNARMED": "You take a strong hit that saps your strength. Suffer a -10 to to strength and agility for 1d10 turns.",
"BRUISED": "Bruised",
"BRUISED-DESC-UNARMED": "The blows are hard, and leave their marks. Make an endurance test (0) or gain a fatigued condition",
- "GUT-BLOW": "Gut Blow",
"GUT-BLOW-DESC-UNARMED": "Gain 1 Stunned Condition. Pass an Easy (+40) Endurance Test or vomit, gaining the Prone Condition.",
- "WINDED": "Winded",
"WINDED-DESC-UNARMED": "Gain a Stunned Condition. Make an Average (+20) Endurance Test, or gain the Prone Condition. Movement is halved for 1d10 Rounds as you get your breath back.",
"WRENCHED-MUSCLES": "Wrenched muscles",
"WRENCHED-MUSCLES-DESC-UNARMED": "Suffer a torn muscle (minor) injury.",
"OFF-BALANCE": "Off balance",
"OFF-BALANCE-DESC-UNARMED": "The strike knocks you off balance. Make an athletics test (-10) or gain the prone condition.",
- "LOW-BLOW": "Low Blow!",
"LOW-BLOW-DESC-UNARMED": "GROINED! Make an endurance test (-20) or gain 2 stunned coniditions",
- "BRUISED-RIBS": "Bruised Ribs",
"BRUISED-RIBS-DESC-UNARMED": "All Agility-based Tests suffer a –10 penalty for 1d10 days.",
"SWEET-SPOT": "Sweet spot",
"SWEET-SPOT-DESC-UNARMED": "You get hit right in the solar plexus, gain a stunned condition and make an endurance test (-10) or gain prone condition",
@@ -469,7 +464,6 @@
"MY-CHEST-DESC-UNARMED": "A cut is opened, gain 1 bleeding condition.",
"WRENCHED-COLLAR-BONE-DESC-UNARMED": "Randomly select one arm. Drop whatever is held in that hand; the arm is useless for 1d10 Rounds (see Amputated Parts).",
"CRACKED-RIBS-DESC-UNARMED": "The hit cracks one or more ribs. Gain a Stunned Condition. Gain a Broken Bone (Minor) injury.",
- "PULLED-BACK": "Pulled Back",
"PULLED-BACK-DESC-UNARMED": "Your back turns to white pain as you pull a muscle. Suffer a Torn Muscle (Major) injury.",
"KIDNEY-BLOW": "Kidney Blow",
"KIDNEY-BLOW-DESC-UNARMED": "Gain the disease symptom Nausea until you can either rest or get medical attention (heal at -10 to fix or a remedy).",
@@ -1826,7 +1820,6 @@
"VEHICLE-NAME": "Vehicle Name",
"VEHICLE-INVENTORY": "Vehicle Inventory",
"VEHICLE-MPH": "Miles per hour",
- "ENTERPRISE-INVENTORY": "Enterprise Inventory",
"MANUFACTURER": "Manufacturer",
"ENTERPRISE": "Enterprise",
"ENTERPRISE-NAME": "Enterprise Name",