From c8241e985b878df1bc95597931f4e6a9efd0885d Mon Sep 17 00:00:00 2001 From: Ryan Mandel Date: Tue, 20 Nov 2018 09:01:45 -0800 Subject: [PATCH] fixed bug where is-undead ternaries were always selecting undead --- FFD20/ffd20.html | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/FFD20/ffd20.html b/FFD20/ffd20.html index 8f6cc617f2..c4e9853e75 100644 --- a/FFD20/ffd20.html +++ b/FFD20/ffd20.html @@ -210,7 +210,7 @@ on("change:is-undead change:con-mod change:cha-mod change:level change:class-0-h "class-3-hp": class3, "class-fc-hp": classFC, "total-hp": total, - "hp_max": total + (parseInt(values["is-undead"] ? values["cha-mod"] : values["con-mod"]) * parseInt(values["level"])) + "hp_max": total + (parseInt(values["is-undead"] == "undead" ? values["cha-mod"] : values["con-mod"]) * parseInt(values["level"])) }); }); }); @@ -420,11 +420,13 @@ on("change:is-undead change:con-mod change:cha-mod change:total-fort change:fort if (values["sheet-type"] == "character") { var enhance = parseInt(values["fort-enhance"]) || 0; var misc = parseInt(values["fort-misc"]) || 0; - var temp = parseInt(values["fort-temp"]) || 0; - var total = parseInt(values["is-undead"] ? values["cha-mod"] : values["con-mod"]) + parseInt(values["total-fort"]) + enhance + misc + temp; + var temp = parseInt(values["fort-temp"]) || 0; + var ability = parseInt(values["is-undead"] == "undead" ? values["cha-mod"] : values["con-mod"]) || 0; + var total = parseInt(values["is-undead"] == "undead" ? values["cha-mod"] : values["con-mod"]) + parseInt(values["total-fort"]) + enhance + misc + temp; setAttrs({ "fort": total, - "fort-enhance": enhance, + "fort-enhance": enhance, + "fort-ability": ability, "fort-misc": misc, "fort-temp": temp }); @@ -3393,7 +3395,7 @@ on("change:repeating_spells-9 remove:repeating_spells-9", function() { Fortitude - +