diff --git a/Deathwatch/DWI.html b/Deathwatch/DWI.html index 273cda600b..c52ebd8a5c 100644 --- a/Deathwatch/DWI.html +++ b/Deathwatch/DWI.html @@ -52,100 +52,100 @@
- +
- +
- +
- +
- +
- +
- +
- +
- +
-
-
-
-
-
-
-
-
- @@ -156,82 +156,82 @@
Adv. - - - - + + + +
Adv. - - - - + + + +
Adv. - - - - + + + +
Adv. - - - - + + + +
Adv. - - - - + + + +
Adv. - - - - + + + +
Adv. - - - - + + + +
Adv. - - - - + + + +
Adv. - - - - + + + +
@@ -4476,7 +4476,7 @@
- @@ -4714,62 +4714,62 @@
- - + +
-
- +
- +
- +
-
- +
- +

Navigator Mutations ♨

-
- +
-

Mutations Gained

-
- +
+
- +
- +
-
+
@@ -4781,8 +4781,8 @@
- - +
- +
- +
- +
- -
- @@ -4817,11 +4817,11 @@
- +
- +
- @@ -4829,21 +4829,21 @@
-
-
- +
- - - + + +
@@ -4860,10 +4860,10 @@
- - - - + + + +
@@ -4966,31 +4966,31 @@

Insanity Points (IP)

-
-
- +
-
-
- @@ -5001,49 +5001,49 @@
- +

Mental Disorders

- +
-
-
- +
- +

Corruption Points (CP)

-
-
- @@ -5054,92 +5054,92 @@
- +

Mutation Tests

-
-
-
-
-
-
-
-
- +
- +
- +
- +
- +
- +
- +

Malignancies

- +
- +
- +

Mutations

- +
-
- +
- +
@@ -5316,27 +5316,27 @@ on("change:Rank sheet:opened", function() { }); /* --- script for psy power dice battle psyker--- */ -on("change:psyRating change:powerlevel sheet:opened", function() { - getAttrs(["powerlevel", "psyRating"], function(values) { - var pl = parseInt(values["powerlevel"]); - var pr = parseInt(values["psyRating"]); +on("change:psyRating change:powerLevel sheet:opened", function() { + getAttrs(["powerLevel", "psyRating"], function(values) { + var powerLevel = parseInt(values["powerLevel"]); + var psyRating = parseInt(values["psyRating"]); var effectivePsyRating = ""; var psyDice = ""; - console.log(values, pl, pr); - if (pl == 1) { - effectivePsyRating = Math.ceil(pr / 2); - } else if (pl == 2) { - effectivePsyRating = pr; - } else if (pl == 3) { - effectivePsyRating = pr +3; - } else if (pl == 4) { - effectivePsyRating = pr +4; + console.log(values, powerLevel, psyRating); + if (powerLevel == 1) { + effectivePsyRating = Math.ceil(psyRating / 2); + } else if (powerLevel == 2) { + effectivePsyRating = psyRating; + } else if (powerLevel == 3) { + effectivePsyRating = psyRating +3; + } else if (powerLevel == 4) { + effectivePsyRating = psyRating +4; } - if (pr>effectivePsyRating) { + if (psyRating>effectivePsyRating) { psyDice = "1d100cs101cf>91"; - } else if (pr == effectivePsyRating) { + } else if (psyRating == effectivePsyRating) { psyDice = "1d100cs11cs22cs33cs44cs55cs66cs77cs88cs99cs100cf>91"; - } else if (pr < effectivePsyRating) { + } else if (psyRating < effectivePsyRating) { psyDice = "1d100cs>0cf>91"; } setAttrs({"psyDice":psyDice, "effectivePsyRating":effectivePsyRating}); @@ -5381,146 +5381,146 @@ on('change:repeating_psypowers3:sustainingpower3 remove:repeating_psypowers3',fu repeatingSum("sustainingPowerTotal3","psypowers3","sustainingpower3"); }); on('change:repeating_advancements:advancement1xp remove:repeating_advancements',function(){ - repeatingSum("advtotal1","advancements","advancement1xp"); + repeatingSum("advancementTotal1","advancements","advancement1xp"); }); on('change:repeating_advancements:advancement2xp remove:repeating_advancements',function(){ - repeatingSum("advtotal2","advancements","advancement2xp"); + repeatingSum("advancementTotal2","advancements","advancement2xp"); }); on('change:repeating_advancements:advancement3xp remove:repeating_advancements',function(){ - repeatingSum("advtotal3","advancements","advancement3xp"); + repeatingSum("advancementTotal3","advancements","advancement3xp"); }); /* ---- script worker for characteristics ---- */ -on("change:startingWS change:advancedWS1 change:advancedWS2 change:advancedWS3 change:advancedWS4 change:fatiguePenalty sheet:opened", function() { - getAttrs(["startingWS","advancedWS1","advancedWS2","advancedWS3","advancedWS4","fatiguePenalty"], function(values) { - var startingWS = parseInt(values["startingWS"])||0; - var advancedWS1 = parseInt(values["advancedWS1"])||0; - var advancedWS2 = parseInt(values["advancedWS2"])||0; - var advancedWS3 = parseInt(values["advancedWS3"])||0; - var advancedWS4 = parseInt(values["advancedWS4"])||0; +on("change:startingWeaponSkill change:advancedWeaponSkill1 change:advancedWeaponSkill2 change:advancedWeaponSkill3 change:advancedWeaponSkill4 change:fatiguePenalty sheet:opened", function() { + getAttrs(["startingWeaponSkill","advancedWeaponSkill1","advancedWeaponSkill2","advancedWeaponSkill3","advancedWeaponSkill4","fatiguePenalty"], function(values) { + var startingWeaponSkill = parseInt(values["startingWeaponSkill"])||0; + var advancedWeaponSkill1 = parseInt(values["advancedWeaponSkill1"])||0; + var advancedWeaponSkill2 = parseInt(values["advancedWeaponSkill2"])||0; + var advancedWeaponSkill3 = parseInt(values["advancedWeaponSkill3"])||0; + var advancedWeaponSkill4 = parseInt(values["advancedWeaponSkill4"])||0; var fatiguePenalty = parseInt(values["fatiguePenalty"])||0; - var output = startingWS + advancedWS1 + advancedWS2 + advancedWS3 + advancedWS4 - fatiguePenalty + var output = startingWeaponSkill + advancedWeaponSkill1 + advancedWeaponSkill2 + advancedWeaponSkill3 + advancedWeaponSkill4 - fatiguePenalty setAttrs({ - "weaponSKill": output + "weaponSkill": output }); }); }); -on("change:startingBS change:advancedBS1 change:advancedBS2 change:advancedBS3 change:advancedBS4 change:fatiguePenalty sheet:opened", function() { - getAttrs(["startingBS","advancedBS1","advancedBS2","advancedBS3","advancedBS4","fatiguePenalty"], function(values) { - var startingBS = parseInt(values["startingBS"])||0; - var advancedBS1 = parseInt(values["advancedBS1"])||0; - var advancedBS2 = parseInt(values["advancedBS2"])||0; - var advancedBS3 = parseInt(values["advancedBS3"])||0; - var advancedBS4 = parseInt(values["advancedBS4"])||0; +on("change:startingBallisticSkill change:advancedBallisticSkill1 change:advancedBallisticSkill2 change:advancedBallisticSkill3 change:advancedBallisticSkill4 change:fatiguePenalty sheet:opened", function() { + getAttrs(["startingBallisticSkill","advancedBallisticSkill1","advancedBallisticSkill2","advancedBallisticSkill3","advancedBallisticSkill4","fatiguePenalty"], function(values) { + var startingBallisticSkill = parseInt(values["startingBallisticSkill"])||0; + var advancedBallisticSkill1 = parseInt(values["advancedBallisticSkill1"])||0; + var advancedBallisticSkill2 = parseInt(values["advancedBallisticSkill2"])||0; + var advancedBallisticSkill3 = parseInt(values["advancedBallisticSkill3"])||0; + var advancedBallisticSkill4 = parseInt(values["advancedBallisticSkill4"])||0; var fatiguePenalty = parseInt(values["fatiguePenalty"])||0; - var output = startingBS + advancedBS1 + advancedBS2 + advancedBS3 + advancedBS4 - fatiguePenalty + var output = startingBallisticSkill + advancedBallisticSkill1 + advancedBallisticSkill2 + advancedBallisticSkill3 + advancedBallisticSkill4 - fatiguePenalty setAttrs({ "ballisticSKill": output }); }); }); -on("change:startingS change:advancedS1 change:advancedS2 change:advancedS3 change:advancedS4 change:fatiguePenalty change:powerArmourStrength sheet:opened", function() { - getAttrs(["startingS","advancedS1","advancedS2","advancedS3","advancedS4","fatiguePenalty","powerArmourStrength"], function(values) { - var startingS = parseInt(values["startingS"])||0; - var advancedS1 = parseInt(values["advancedS1"])||0; - var advancedS2 = parseInt(values["advancedS2"])||0; - var advancedS3 = parseInt(values["advancedS3"])||0; - var advancedS4 = parseInt(values["advancedS4"])||0; +on("change:startingStrength change:advancedStrength1 change:advancedStrength2 change:advancedStrength3 change:advancedStrength4 change:fatiguePenalty change:powerArmourStrength sheet:opened", function() { + getAttrs(["startingStrength","advancedStrength1","advancedStrength2","advancedStrength3","advancedStrength4","fatiguePenalty","powerArmourStrength"], function(values) { + var startingStrength = parseInt(values["startingStrength"])||0; + var advancedStrength1 = parseInt(values["advancedStrength1"])||0; + var advancedStrength2 = parseInt(values["advancedStrength2"])||0; + var advancedStrength3 = parseInt(values["advancedStrength3"])||0; + var advancedStrength4 = parseInt(values["advancedStrength4"])||0; var powerArmourStrength = parseInt(values["powerArmourStrength"])||0; var fatiguePenalty = parseInt(values["fatiguePenalty"])||0; - var output = startingS + advancedS1 + advancedS2 + advancedS3 + advancedS4 + powerArmourStrength - fatiguePenalty + var output = startingStrength + advancedStrength1 + advancedStrength2 + advancedStrength3 + advancedStrength4 + powerArmourStrength - fatiguePenalty setAttrs({ "strength": output }); }); }); -on("change:startingT change:advancedT1 change:advancedT2 change:advancedT3 change:advancedT4 change:fatiguePenalty sheet:opened", function() { - getAttrs(["startingT","advancedT1","advancedT2","advancedT3","advancedT4","fatiguePenalty"], function(values) { - var startingT = parseInt(values["startingT"])||0; - var advancedT1 = parseInt(values["advancedT1"])||0; - var advancedT2 = parseInt(values["advancedT2"])||0; - var advancedT3 = parseInt(values["advancedT3"])||0; - var advancedT4 = parseInt(values["advancedT4"])||0; +on("change:startingToughness change:advancedToughness1 change:advancedToughness2 change:advancedToughness3 change:advancedToughness4 change:fatiguePenalty sheet:opened", function() { + getAttrs(["startingToughness","advancedToughness1","advancedToughness2","advancedToughness3","advancedToughness4","fatiguePenalty"], function(values) { + var startingToughness = parseInt(values["startingToughness"])||0; + var advancedToughness1 = parseInt(values["advancedToughness1"])||0; + var advancedToughness2 = parseInt(values["advancedToughness2"])||0; + var advancedToughness3 = parseInt(values["advancedToughness3"])||0; + var advancedToughness4 = parseInt(values["advancedToughness4"])||0; var fatiguePenalty = parseInt(values["fatiguePenalty"])||0; - var output = startingT + advancedT1 + advancedT2 + advancedT3 + advancedT4 - fatiguePenalty + var output = startingToughness + advancedToughness1 + advancedToughness2 + advancedToughness3 + advancedToughness4 - fatiguePenalty setAttrs({ "toughness": output }); }); }); -on("change:startingAG change:advancedAg1 change:advancedAg2 change:advancedAg3 change:advancedAg4 change:fatiguePenalty sheet:opened", function() { - getAttrs(["startingAG","advancedAg1","advancedAg2","advancedAg3","advancedAg4","fatiguePenalty"], function(values) { - var startingAG = parseInt(values["startingAG"])||0; - var advancedAg1 = parseInt(values["advancedAg1"])||0; - var advancedAg2 = parseInt(values["advancedAg2"])||0; - var advancedAg3 = parseInt(values["advancedAg3"])||0; - var advancedAg4 = parseInt(values["advancedAg4"])||0; +on("change:startingAgility change:advancedAgility1 change:advancedAgility2 change:advancedAgility3 change:advancedAgility4 change:fatiguePenalty sheet:opened", function() { + getAttrs(["startingAgility","advancedAgility1","advancedAgility2","advancedAgility3","advancedAgility4","fatiguePenalty"], function(values) { + var startingAgility = parseInt(values["startingAgility"])||0; + var advancedAgility1 = parseInt(values["advancedAgility1"])||0; + var advancedAgility2 = parseInt(values["advancedAgility2"])||0; + var advancedAgility3 = parseInt(values["advancedAgility3"])||0; + var advancedAgility4 = parseInt(values["advancedAgility4"])||0; var fatiguePenalty = parseInt(values["fatiguePenalty"])||0; - var output = startingAG + advancedAg1 + advancedAg2 + advancedAg3 + advancedAg4 - fatiguePenalty + var output = startingAgility + advancedAgility1 + advancedAgility2 + advancedAgility3 + advancedAgility4 - fatiguePenalty setAttrs({ "agility": output }); }); }); -on("change:startingINT change:advancedInt1 change:advancedInt2 change:advancedInt3 change:advancedInt4 change:fatiguePenalty sheet:opened", function() { - getAttrs(["startingINT","advancedInt1","advancedInt2","advancedInt3","advancedInt4","fatiguePenalty"], function(values) { - var startingINT = parseInt(values["startingINT"])||0; - var advancedInt1 = parseInt(values["advancedInt1"])||0; - var advancedInt2 = parseInt(values["advancedInt2"])||0; - var advancedInt3 = parseInt(values["advancedInt3"])||0; - var advancedInt4 = parseInt(values["advancedInt4"])||0; +on("change:startingIntelligence change:advancedIntelligence1 change:advancedIntelligence2 change:advancedIntelligence3 change:advancedIntelligence4 change:fatiguePenalty sheet:opened", function() { + getAttrs(["startingIntelligence","advancedIntelligence1","advancedIntelligence2","advancedIntelligence3","advancedIntelligence4","fatiguePenalty"], function(values) { + var startingIntelligence = parseInt(values["startingIntelligence"])||0; + var advancedIntelligence1 = parseInt(values["advancedIntelligence1"])||0; + var advancedIntelligence2 = parseInt(values["advancedIntelligence2"])||0; + var advancedIntelligence3 = parseInt(values["advancedIntelligence3"])||0; + var advancedIntelligence4 = parseInt(values["advancedIntelligence4"])||0; var fatiguePenalty = parseInt(values["fatiguePenalty"])||0; - var output = startingINT + advancedInt1 + advancedInt2 + advancedInt3 + advancedInt4 - fatiguePenalty + var output = startingIntelligence + advancedIntelligence1 + advancedIntelligence2 + advancedIntelligence3 + advancedIntelligence4 - fatiguePenalty setAttrs({ "intelligence": output }); }); }); -on("change:startingPER change:advancedPer1 change:advancedPer2 change:advancedPer3 change:advancedPer4 change:fatiguePenalty sheet:opened", function() { - getAttrs(["startingPER","advancedPer1","advancedPer2","advancedPer3","advancedPer4","fatiguePenalty"], function(values) { - var startingPER = parseInt(values["startingPER"])||0; - var advancedPer1 = parseInt(values["advancedPer1"])||0; - var advancedPer2 = parseInt(values["advancedPer2"])||0; - var advancedPer3 = parseInt(values["advancedPer3"])||0; - var advancedPer4 = parseInt(values["advancedPer4"])||0; +on("change:startingPerception change:advancedPerception1 change:advancedPerception2 change:advancedPerception3 change:advancedPerception4 change:fatiguePenalty sheet:opened", function() { + getAttrs(["startingPerception","advancedPerception1","advancedPerception2","advancedPerception3","advancedPerception4","fatiguePenalty"], function(values) { + var startingPerception = parseInt(values["startingPerception"])||0; + var advancedPerception1 = parseInt(values["advancedPerception1"])||0; + var advancedPerception2 = parseInt(values["advancedPerception2"])||0; + var advancedPerception3 = parseInt(values["advancedPerception3"])||0; + var advancedPerception4 = parseInt(values["advancedPerception4"])||0; var fatiguePenalty = parseInt(values["fatiguePenalty"])||0; - var output = startingPER + advancedPer1 + advancedPer2 + advancedPer3 + advancedPer4 - fatiguePenalty + var output = startingPerception + advancedPerception1 + advancedPerception2 + advancedPerception3 + advancedPerception4 - fatiguePenalty setAttrs({ "perception": output }); }); }); -on("change:startingWP change:advancedWp1 change:advancedWp2 change:advancedWp3 change:advancedWp4 change:fatiguePenalty sheet:opened", function() { - getAttrs(["startingWP","advancedWp1","advancedWp2","advancedWp3","advancedWp4","fatiguePenalty"], function(values) { - var startingWP = parseInt(values["startingWP"])||0; - var advancedWp1 = parseInt(values["advancedWp1"])||0; - var advancedWp2 = parseInt(values["advancedWp2"])||0; - var advancedWp3 = parseInt(values["advancedWp3"])||0; - var advancedWp4 = parseInt(values["advancedWp4"])||0; +on("change:startingWillpower change:advancedWillpower1 change:advancedWillpower2 change:advancedWillpower3 change:advancedWillpower4 change:fatiguePenalty sheet:opened", function() { + getAttrs(["startingWillpower","advancedWillpower1","advancedWillpower2","advancedWillpower3","advancedWillpower4","fatiguePenalty"], function(values) { + var startingWillpower = parseInt(values["startingWillpower"])||0; + var advancedWillpower1 = parseInt(values["advancedWillpower1"])||0; + var advancedWillpower2 = parseInt(values["advancedWillpower2"])||0; + var advancedWillpower3 = parseInt(values["advancedWillpower3"])||0; + var advancedWillpower4 = parseInt(values["advancedWillpower4"])||0; var fatiguePenalty = parseInt(values["fatiguePenalty"])||0; - var output = startingWP + advancedWp1 + advancedWp2 + advancedWp3 + advancedWp4 - fatiguePenalty + var output = startingWillpower + advancedWillpower1 + advancedWillpower2 + advancedWillpower3 + advancedWillpower4 - fatiguePenalty setAttrs({ "willpower": output }); }); }); -on("change:startingFEL change:advancedFel1 change:advancedFel2 change:advancedFel3 change:advancedFel4 change:fatiguePenalty sheet:opened", function() { - getAttrs(["startingFEL","advancedFel1","advancedFel2","advancedFel3","advancedFel4","fatiguePenalty"], function(values) { - var startingFEL = parseInt(values["startingFEL"])||0; - var advancedFel1 = parseInt(values["advancedFel1"])||0; - var advancedFel2 = parseInt(values["advancedFel2"])||0; - var advancedFel3 = parseInt(values["advancedFel3"])||0; - var advancedFel4 = parseInt(values["advancedFel4"])||0; +on("change:startingFellowship change:advancedFellowship1 change:advancedFellowship2 change:advancedFellowship3 change:advancedFellowship4 change:fatiguePenalty sheet:opened", function() { + getAttrs(["startingFellowship","advancedFellowship1","advancedFellowship2","advancedFellowship3","advancedFellowship4","fatiguePenalty"], function(values) { + var startingFellowship = parseInt(values["startingFellowship"])||0; + var advancedFellowship1 = parseInt(values["advancedFellowship1"])||0; + var advancedFellowship2 = parseInt(values["advancedFellowship2"])||0; + var advancedFellowship3 = parseInt(values["advancedFellowship3"])||0; + var advancedFellowship4 = parseInt(values["advancedFellowship4"])||0; var fatiguePenalty = parseInt(values["fatiguePenalty"])||0; - var output = startingFEL + advancedFel1 + advancedFel2 + advancedFel3 + advancedFel4 - fatiguePenalty + var output = startingFellowship + advancedFellowship1 + advancedFellowship2 + advancedFellowship3 + advancedFellowship4 - fatiguePenalty setAttrs({ "fellowship": output });