From 039b7046b28a3a0045ca4ae5f82ac84fd6289f86 Mon Sep 17 00:00:00 2001
From: Stefan Zermatten <stefanzermatten@gmail.com>
Date: Mon, 12 Jul 2021 17:03:32 +0200
Subject: [PATCH] Fixed attributes not hiding when redundant

---
 .../computation/engine/computeStat.js         | 29 ++++++++++++-------
 1 file changed, 18 insertions(+), 11 deletions(-)

diff --git a/app/imports/api/creature/computation/engine/computeStat.js b/app/imports/api/creature/computation/engine/computeStat.js
index e2812dc2..3b411e8d 100644
--- a/app/imports/api/creature/computation/engine/computeStat.js
+++ b/app/imports/api/creature/computation/engine/computeStat.js
@@ -102,24 +102,31 @@ export default function computeStat(stat, memo){
         prop: statInstance,
         memo
       });
-      statInstance.baseValue = +result.value;
+      result.value = +result.value;
+      if (!isNaN(result.value)){
+        statInstance.baseValue = result.value;
+      } else {
+        statInstance.baseValue = undefined;
+      }
       statInstance.dependencies = union(statInstance.dependencies, dependencies);
       if (context.errors.length){
         statInstance.baseValueErrors = context.errors;
       }
       // Apply all the base values
-      effects.push({
-        operation: 'base',
-        calculation: statInstance.baseValueCalculation,
-        result: statInstance.baseValue,
-        stats: [statInstance.variableName],
-        dependencies: statInstance.overridden ?
+      if (Number.isFinite(statInstance.baseValue)){
+        effects.push({
+          operation: 'base',
+          calculation: statInstance.baseValueCalculation,
+          result: statInstance.baseValue,
+          stats: [statInstance.variableName],
+          dependencies: statInstance.overridden ?
           union(statInstance.dependencies, [statInstance._id]) :
           [],
-        computationDetails: {
-          computed: true,
-        },
-      });
+          computationDetails: {
+            computed: true,
+          },
+        });
+      }
     }
   });