Merge pull request #7949 from starshipsandsteel/JohnCarterofMars_Dec192020

Update to John Carter of Mars Character Sheet
2020-12-21 11:17:03 -03:00
parent 49792bcd8b bb2febb7db
commit fb646c9163
1 changed files with 16 additions and 3 deletions
@@ -697,9 +697,22 @@ attributes.forEach(maxup => {
            var pas=parseInt(values.passion)||0;
            var dar=parseInt(values.daring)||0;
            var rea=parseInt(values.reason)||0;
-            var mxcon=emp+rea;
-            var mxfear=dar+pas;
-            var mxinj=cun+mig;
+            if (emp>rea){
+                mxcon=emp;
+            } else {
+                mxcon=rea;
+            }
+            if (dar>pas){
+                mxfear=dar;
+            } else {
+                mxfear=pas;
+            }
+            if (cun>mig){
+                mxinj=cun;
+            } else {
+                mxinj=mig;
+            }
+
            var poolmom=Math.min(emp,cun,mig,pas,dar,rea);
            setAttrs({
               maxconfusion:mxcon,