diff --git a/New World of Darkness Official/NWoD_Official.css b/New World of Darkness Official/NWoD_Official.css index 565ed36ac1..6a6f6d520e 100644 --- a/New World of Darkness Official/NWoD_Official.css +++ b/New World of Darkness Official/NWoD_Official.css @@ -98,7 +98,8 @@ span.sheet-edition { } /* hide othertrait dots on changeling 2nd sheets (2e contracts don't have dots) */ -input.sheet-changelingsheet.sheet-2nd:checked ~ div * .sheet-othertrait td.sheet-changeling.sheet-2nd ~ td { +input.sheet-changelingsheet.sheet-2nd:checked ~ div * td.sheet-changeling.sheet-2nd ~ td.sheet-normal, +input.sheet-changelingsheet.sheet-2nd:checked ~ div * tr.sheet-changeling.sheet-2nd ~ tr.sheet-normal { display: none; } diff --git a/New World of Darkness Official/NWoD_Official.html b/New World of Darkness Official/NWoD_Official.html index a025b8815d..29cb9f9738 100644 --- a/New World of Darkness Official/NWoD_Official.html +++ b/New World of Darkness Official/NWoD_Official.html @@ -176,6 +176,7 @@ Small Framed

Bonus Health Levels:

Bonus Willpower Points:

+ Bonus Clarity Points:

Species Factor: Fleet of Foot:

Fast Reflexes: @@ -750,82 +751,82 @@ - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + @@ -1297,13 +1298,18 @@ Satiety - + + + + - +
+ +
- +
@@ -2386,6 +2392,7 @@ on("change:wits", function() { updateRolls("wits"); + updateMoralHealth(); }); on("change:resolve", function() { @@ -2415,6 +2422,7 @@ on("change:composure", function() { updateRolls("composure"); + updateMoralHealth(); }); on("change:academics", function() { @@ -2881,6 +2889,10 @@ on("change:bonus_willpower", function() { updateWillpower(); }); + + on("change:bonus_moralhealth", function() { + updateMoralHealth(); + }); var updateRolls = function(stat) { var type; @@ -3031,6 +3043,17 @@ }); }); }; + + var updateMoralHealth = function() { + getAttrs(["wits", "composure", "bonus_moralhealth", "sheettype"], function(v) { + if (v.sheettype == "changeling2"){ + var moralhealth = parseInt(v.wits, 10) + parseInt(v.composure, 10) + parseInt(v.bonus_moralhealth); + setAttrs({ + moralhealth: moralhealth + }); + } + }); + } var updateAttacks = function() { getAttrs(["strength","attack","attack_initiative0","attack_initiative1","attack_initiative2","attack_initiative3","attack_initiative4","attack_strength0","attack_strength1","attack_strength2","attack_strength3","attack_strength4","armor_flag0","armor_flag1","armor_flag2","armor_strength0","armor_strength1","armor_strength2","health","healthbox_1","healthbox_2","healthbox_3","healthbox_4","healthbox_5","healthbox_6","healthbox_7","healthbox_8","healthbox_9","healthbox_10","healthbox_11","healthbox_12","healthbox_13","healthbox_14","healthbox_15","healthbox_16"], function(v) {