Merge commit 'd9b978cb82109b71c05d03807a8558ba1dc537a4' into feature-tabletop

app/imports/api/engine/actions/applyProperty.js

@@ -19,6 +19,7 @@ const applyPropertyByType = {
   damage,
   folder,
   note,
+  propertySlot: folder,
   roll,
   savingThrow,
   spell: action,
@@ -26,6 +27,7 @@ const applyPropertyByType = {
 };
 
 export default function applyProperty(node, actionContext, ...rest) {
+  if (node.node.deactivatedByToggle) return;
   actionContext.scope[`#${node.node.type}`] = node.node;
   applyPropertyByType[node.node.type]?.(node, actionContext, ...rest);
 }

app/imports/api/engine/actions/applyPropertyByType/applyAction.js

@@ -3,6 +3,7 @@ import recalculateCalculation from './shared/recalculateCalculation.js';
 import rollDice from '/imports/parser/rollDice.js';
 import applyProperty from '../applyProperty.js';
 import CreatureProperties from '/imports/api/creature/creatureProperties/CreatureProperties.js';
+import applyChildren from '/imports/api/engine/actions/applyPropertyByType/shared/applyChildren.js';
 import { adjustQuantityWork } from '/imports/api/creature/creatureProperties/methods/adjustQuantity.js';
 import { damagePropertyWork } from '/imports/api/creature/creatureProperties/methods/damageProperty.js';
 import numberToSignedString from '/imports/api/utility/numberToSignedString.js';
@@ -187,11 +188,6 @@ function applyCrits(value, scope) {
   return { criticalHit, criticalMiss };
 }
 
-function applyChildren(node, actionContext) {
-  applyNodeTriggers(node, 'after', actionContext);
-  node.children.forEach(child => applyProperty(child, actionContext));
-}
-
 function spendResources(prop, actionContext) {
   // Check Uses
   if (prop.usesLeft <= 0) {
@@ -276,9 +272,10 @@ function spendResources(prop, actionContext) {
     recalculateCalculation(attConsumed.quantity, actionContext);
 
     if (!attConsumed.quantity?.value) return;
+    if (!attConsumed.variableName) return;
     let stat = actionContext.scope[attConsumed.variableName];
     if (!stat) {
-      spendLog.push(stat.name + ': ' + ' not found');
+      spendLog.push(attConsumed.variableName + ': ' + ' not found');
       return;
     }
     damagePropertyWork({

app/imports/api/engine/actions/applyPropertyByType/applyAdjustment.js

@@ -1,9 +1,9 @@
-import applyProperty from '../applyProperty.js';
+import applyChildren from '/imports/api/engine/actions/applyPropertyByType/shared/applyChildren.js';
 import recalculateCalculation from './shared/recalculateCalculation.js';
 import { damagePropertyWork } from '/imports/api/creature/creatureProperties/methods/damageProperty.js';
 import { applyNodeTriggers } from '/imports/api/engine/actions/applyTriggers.js';
 
-export default function applyAdjustment(node, actionContext){
+export default function applyAdjustment(node, actionContext) {
   applyNodeTriggers(node, 'before', actionContext);
   const prop = node.node;
   const damageTargets = prop.target === 'self' ? [actionContext.creature] : actionContext.targets;
@@ -39,7 +39,7 @@ export default function applyAdjustment(node, actionContext){
       if (!prop.silent) actionContext.addLog({
         name: 'Attribute damage',
         value: `${prop.stat}${prop.operation === 'set' ? ' set to' : ''}` +
-        ` ${value}`,
+          ` ${value}`,
         inline: true,
       });
     });
@@ -47,15 +47,10 @@ export default function applyAdjustment(node, actionContext){
     if (!prop.silent) actionContext.addLog({
       name: 'Attribute damage',
       value: `${prop.stat}${prop.operation === 'set' ? ' set to' : ''}` +
-      ` ${value}`,
+        ` ${value}`,
       inline: true,
     });
   }
 
   return applyChildren(node, actionContext);
 }
-
-function applyChildren(node, actionContext){
-  applyNodeTriggers(node, 'after', actionContext);
-  node.children.forEach(child => applyProperty(child, actionContext));
-}

app/imports/api/engine/actions/applyPropertyByType/applyBranch.js

@@ -1,21 +1,18 @@
 import applyProperty from '../applyProperty.js';
 import recalculateCalculation from './shared/recalculateCalculation.js';
 import rollDice from '/imports/parser/rollDice.js';
+import applyChildren from '/imports/api/engine/actions/applyPropertyByType/shared/applyChildren.js';
 import { applyNodeTriggers } from '/imports/api/engine/actions/applyTriggers.js';
 
 export default function applyBranch(node, actionContext) {
   applyNodeTriggers(node, 'before', actionContext);
-  const applyChildren = function () {
-    applyNodeTriggers(node, 'after', actionContext);
-    node.children.forEach(child => applyProperty(child, actionContext));
-  };
   const scope = actionContext.scope;
   const targets = actionContext.targets;
   const prop = node.node;
   switch (prop.branchType) {
     case 'if':
       recalculateCalculation(prop.condition, actionContext);
-      if (prop.condition?.value) applyChildren();
+      if (prop.condition?.value) applyChildren(node, actionContext);
       break;
     case 'index':
       if (node.children.length) {
@@ -32,30 +29,31 @@ export default function applyBranch(node, actionContext) {
         if (index > node.children.length) index = node.children.length;
         applyNodeTriggers(node, 'after', actionContext);
         applyProperty(node.children[index - 1], actionContext);
+        applyNodeTriggers(node, 'afterChildren', actionContext);
       }
       break;
     case 'hit':
       if (scope['~attackHit']?.value) {
         if (!targets.length && !prop.silent) actionContext.addLog({ value: '**On hit**' });
-        applyChildren();
+        applyChildren(node, actionContext);
       }
       break;
     case 'miss':
       if (scope['~attackMiss']?.value) {
         if (!targets.length && !prop.silent) actionContext.addLog({ value: '**On miss**' });
-        applyChildren();
+        applyChildren(node, actionContext);
       }
       break;
     case 'failedSave':
       if (scope['~saveFailed']?.value) {
         if (!targets.length && !prop.silent) actionContext.addLog({ value: '**On failed save**' });
-        applyChildren();
+        applyChildren(node, actionContext);
       }
       break;
     case 'successfulSave':
       if (scope['~saveSucceeded']?.value) {
         if (!targets.length && !prop.silent) actionContext.addLog({ value: '**On save**', });
-        applyChildren();
+        applyChildren(node, actionContext);
       }
       break;
     case 'random':
@@ -63,6 +61,7 @@ export default function applyBranch(node, actionContext) {
         let index = rollDice(1, node.children.length)[0] - 1;
         applyNodeTriggers(node, 'after', actionContext);
         applyProperty(node.children[index], actionContext);
+        applyNodeTriggers(node, 'afterChildren', actionContext);
       }
       break;
     case 'eachTarget':
@@ -71,9 +70,10 @@ export default function applyBranch(node, actionContext) {
           applyNodeTriggers(node, 'after', actionContext);
           actionContext.targets = [target]
           node.children.forEach(child => applyProperty(child, actionContext));
+          applyNodeTriggers(node, 'afterChildren', actionContext);
         });
       } else {
-        applyChildren();
+        applyChildren(node, actionContext);
       }
       break;
   }

app/imports/api/engine/actions/applyPropertyByType/applyBuff.js

@@ -77,6 +77,7 @@ export default function applyBuff(node, actionContext) {
     }
   });
   applyNodeTriggers(node, 'after', actionContext);
+  applyNodeTriggers(node, 'afterChildren', actionContext);
 
   // Don't apply the children of the buff, they get copied to the target instead
 }

app/imports/api/engine/actions/applyPropertyByType/applyBuffRemover.js

@@ -5,6 +5,7 @@ import { getProperyAncestors, getPropertiesOfType } from '/imports/api/engine/lo
 import CreatureProperties from '/imports/api/creature/creatureProperties/CreatureProperties.js';
 import { softRemove } from '/imports/api/parenting/softRemove.js';
 import getEffectivePropTags from '/imports/api/engine/computation/utility/getEffectivePropTags.js';
+import applyChildren from '/imports/api/engine/actions/applyPropertyByType/shared/applyChildren.js';
 
 export default function applyBuffRemover(node, actionContext) {
   // Apply triggers
@@ -13,7 +14,7 @@ export default function applyBuffRemover(node, actionContext) {
   const prop = node.node;
 
   // Log Name
-  if (prop.name && !prop.silent){
+  if (prop.name && !prop.silent) {
     actionContext.addLog({ name: prop.name });
   }
 
@@ -53,11 +54,7 @@ export default function applyBuffRemover(node, actionContext) {
       }
     }
   }
-
-  // Apply triggers
-  applyNodeTriggers(node, 'after', actionContext);
-  // Apply children
-  node.children.forEach(child => applyProperty(child, actionContext));
+  applyChildren(node, actionContext);
 }
 
 function removeBuff(buff, actionContext, prop) {

app/imports/api/engine/actions/applyPropertyByType/applyDamage.js

@@ -1,5 +1,5 @@
 import { some, intersection, difference, remove, includes } from 'lodash';
-import applyProperty from '../applyProperty.js';
+import applyChildren from '/imports/api/engine/actions/applyPropertyByType/shared/applyChildren.js';
 import { insertCreatureLog } from '/imports/api/creature/log/CreatureLogs.js';
 import resolve, { Context, toString } from '/imports/parser/resolve.js';
 import logErrors from './shared/logErrors.js';
@@ -13,10 +13,6 @@ import getEffectivePropTags from '/imports/api/engine/computation/utility/getEff
 
 export default function applyDamage(node, actionContext) {
   applyNodeTriggers(node, 'before', actionContext);
-  const applyChildren = function () {
-    applyNodeTriggers(node, 'after', actionContext);
-    node.children.forEach(child => applyProperty(child, actionContext));
-  };
 
   const prop = node.node;
   const scope = actionContext.scope;
@@ -66,7 +62,7 @@ export default function applyDamage(node, actionContext) {
 
   // If we didn't end up with a constant of finite amount, give up
   if (reduced?.parseType !== 'constant' || !isFinite(reduced.value)) {
-    return applyChildren();
+    return applyChildren(node, actionContext);
   }
 
   // Round the damage to a whole number
@@ -133,7 +129,7 @@ export default function applyDamage(node, actionContext) {
     value: logValue.join('\n'),
     inline: true,
   });
-  return applyChildren();
+  return applyChildren(node, actionContext);
 }
 
 function applyDamageMultipliers({ target, damage, damageProp, logValue }) {

app/imports/api/engine/actions/applyPropertyByType/applyFolder.js

@@ -1,11 +1,9 @@
-import recalculateInlineCalculations from './shared/recalculateInlineCalculations.js';
-import applyProperty from '../applyProperty.js';
+import applyChildren from '/imports/api/engine/actions/applyPropertyByType/shared/applyChildren.js';
 import { applyNodeTriggers } from '/imports/api/engine/actions/applyTriggers.js';
 
 export default function applyFolder(node, actionContext) {
   // Apply triggers
   applyNodeTriggers(node, 'before', actionContext);
-  applyNodeTriggers(node, 'after', actionContext);
   // Apply children
-  node.children.forEach(child => applyProperty(child, actionContext));
+  applyChildren(node, actionContext);
 }

app/imports/api/engine/actions/applyPropertyByType/applyNote.js

@@ -1,27 +1,25 @@
 import recalculateInlineCalculations from './shared/recalculateInlineCalculations.js';
-import applyProperty from '../applyProperty.js';
+import applyChildren from '/imports/api/engine/actions/applyPropertyByType/shared/applyChildren.js';
 import { applyNodeTriggers } from '/imports/api/engine/actions/applyTriggers.js';
 
-export default function applyNote(node, actionContext){
+export default function applyNote(node, actionContext) {
   applyNodeTriggers(node, 'before', actionContext);
   const prop = node.node;
 
   // Log Name, summary
   let content = { name: prop.name };
-  if (prop.summary?.text){
+  if (prop.summary?.text) {
     recalculateInlineCalculations(prop.summary, actionContext);
     content.value = prop.summary.value;
   }
-  if (content.name || content.value){
+  if (content.name || content.value) {
     actionContext.addLog(content);
   }
   // Log description
-  if (prop.description?.text){
+  if (prop.description?.text) {
     recalculateInlineCalculations(prop.description, actionContext);
-    actionContext.addLog({value: prop.description.value});
+    actionContext.addLog({ value: prop.description.value });
   }
-  // Apply triggers
-  applyNodeTriggers(node, 'after', actionContext);
   // Apply children
-  node.children.forEach(child => applyProperty(child, actionContext));
+  applyChildren(node, actionContext);
 }

app/imports/api/engine/actions/applyPropertyByType/applyRoll.js

@@ -1,4 +1,4 @@
-import applyProperty from '../applyProperty.js';
+import applyChildren from '/imports/api/engine/actions/applyPropertyByType/shared/applyChildren.js';
 import logErrors from './shared/logErrors.js';
 import applyEffectsToCalculationParseNode from '/imports/api/engine/actions/applyPropertyByType/shared/applyEffectsToCalculationParseNode.js';
 import resolve, { toString } from '/imports/parser/resolve.js';
@@ -8,11 +8,6 @@ export default function applyRoll(node, actionContext) {
   applyNodeTriggers(node, 'before', actionContext);
   const prop = node.node;
 
-  const applyChildren = function () {
-    applyNodeTriggers(node, 'after', actionContext);
-    node.children.forEach(child => applyProperty(child, actionContext));
-  };
-
   if (prop.roll?.calculation) {
     const logValue = [];
 
@@ -42,7 +37,7 @@ export default function applyRoll(node, actionContext) {
 
     // If we didn't end up with a constant or a number of finite value, give up
     if (reduced?.parseType !== 'constant' || (reduced.valueType === 'number' && !isFinite(reduced.value))) {
-      return applyChildren();
+      return applyChildren(node, actionContext);
     }
     const value = reduced.value;
 
@@ -57,5 +52,5 @@ export default function applyRoll(node, actionContext) {
       });
     }
   }
-  return applyChildren();
+  return applyChildren(node, actionContext);
 }

app/imports/api/engine/actions/applyPropertyByType/applySavingThrow.js

@@ -2,6 +2,7 @@ import rollDice from '/imports/parser/rollDice.js';
 import recalculateCalculation from './shared/recalculateCalculation.js';
 import applyProperty from '../applyProperty.js';
 import numberToSignedString from '/imports/api/utility/numberToSignedString.js';
+import applyChildren from '/imports/api/engine/actions/applyPropertyByType/shared/applyChildren.js';
 import { applyNodeTriggers } from '/imports/api/engine/actions/applyTriggers.js';
 import { applyUnresolvedEffects } from '/imports/api/engine/actions/doCheck.js';
 
@@ -34,8 +35,7 @@ export default function applySavingThrow(node, actionContext) {
   if (!saveTargets?.length) {
     scope['~saveFailed'] = { value: true };
     scope['~saveSucceeded'] = { value: true };
-    applyNodeTriggers(node, 'after', actionContext);
-    return node.children.forEach(child => applyProperty(child, actionContext));
+    return applyChildren(node, actionContext);
   }
 
   // Each target makes the saving throw
@@ -45,10 +45,9 @@ export default function applySavingThrow(node, actionContext) {
     delete scope['~saveDiceRoll'];
     delete scope['~saveRoll'];
 
-    const applyChildren = function () {
-      actionContext.targets = [target]
-      applyNodeTriggers(node, 'after', actionContext);
-      node.children.forEach(child => applyProperty(child, actionContext));
+    const applyChildrenToTarget = function () {
+      actionContext.targets = [target];
+      return applyChildren(node, actionContext);
     };
 
     const save = target.variables[prop.stat];
@@ -58,7 +57,7 @@ export default function applySavingThrow(node, actionContext) {
         name: 'Saving throw error',
         value: 'No saving throw found: ' + prop.stat,
       });
-      return applyChildren();
+      return applyChildrenToTarget();
     }
 
     let rollModifierText = numberToSignedString(save.value, true);
@@ -105,7 +104,7 @@ export default function applySavingThrow(node, actionContext) {
       value: resultPrefix + '\n**' + result + '**',
       inline: true,
     });
-    return applyChildren();
+    return applyChildrenToTarget();
   });
   // reset the targets after the save to each child
   actionContext.targets = originalTargets;

app/imports/api/engine/actions/applyPropertyByType/applyToggle.js

@@ -1,13 +1,12 @@
-import applyProperty from '../applyProperty.js';
 import recalculateCalculation from './shared/recalculateCalculation.js';
 import { applyNodeTriggers } from '/imports/api/engine/actions/applyTriggers.js';
+import applyChildren from '/imports/api/engine/actions/applyPropertyByType/shared/applyChildren.js';
 
-export default function applyToggle(node, actionContext){
+export default function applyToggle(node, actionContext) {
   applyNodeTriggers(node, 'before', actionContext);
   const prop = node.node;
   recalculateCalculation(prop.condition, actionContext);
   if (prop.condition?.value) {
-    applyNodeTriggers(node, 'after', actionContext);
-    return node.children.forEach(child => applyProperty(child, actionContext));
+    return applyChildren(node, actionContext);
   }
 }

app/imports/api/engine/actions/applyPropertyByType/shared/applyChildren.js

@@ -0,0 +1,8 @@
+import { applyNodeTriggers } from '/imports/api/engine/actions/applyTriggers.js';
+import applyProperty from '/imports/api/engine/actions/applyProperty.js';
+
+export default function applyChildren(node, actionContext) {
+  applyNodeTriggers(node, 'after', actionContext);
+  node.children.forEach(child => applyProperty(child, actionContext));
+  applyNodeTriggers(node, 'afterChildren', actionContext);
+}

app/imports/api/engine/computation/buildComputation/linkInventory.js

@@ -2,22 +2,22 @@
  * Performs a depth first traversal of the character tree, summing the container
  * and inventory contents on the way up the tree
  */
-export default function linkInventory(forest, dependencyGraph){
+export default function linkInventory(forest, dependencyGraph) {
   // The stack of properties to still navigate
   const stack = [...forest];
   // The current containers we are inside of
   const containerStack = [];
 
-  while(stack.length){
+  while (stack.length) {
     const top = stack[stack.length - 1];
     const prop = top.node;
-    if (prop._computationDetails.inventoryChildrenVisited){
+    if (prop._computationDetails.inventoryChildrenVisited) {
       if (prop.type === 'container') containerStack.pop();
       stack.pop();
       handleProp(prop, containerStack, dependencyGraph);
     } else {
       // Add all containers to the stack when we first visit them
-      if (prop.type === 'container'){
+      if (prop.type === 'container') {
         containerStack.push(top.node);
       }
       // Push children onto the stack and mark this as children are visited
@@ -27,18 +27,18 @@ export default function linkInventory(forest, dependencyGraph){
   }
 }
 
-function handleProp(prop, containerStack, dependencyGraph){
+function handleProp(prop, containerStack, dependencyGraph) {
   // Skip props that aren't part of the inventory
   if (prop.type !== 'item' && prop.type !== 'container') return;
   // Determine if this property is carried, items are carried by default
   let carried = prop.type === 'container' ? prop.carried : true;
 
   // Item-specific links
-  if (prop.type === 'item'){
-    if (prop.attuned){
+  if (prop.type === 'item') {
+    if (prop.attuned) {
       dependencyGraph.addLink('itemsAttuned', prop._id, 'attunedItem');
     }
-    if (prop.equipped){
+    if (prop.equipped) {
       dependencyGraph.addLink('weightEquipment', prop._id, 'equippedItem');
       dependencyGraph.addLink('valueEquipment', prop._id, 'equippedItem');
     }
@@ -47,14 +47,14 @@ function handleProp(prop, containerStack, dependencyGraph){
   // Get the parent container
   const container = containerStack[containerStack.length - 1];
 
-  if (container){
+  if (container) {
     // The container depends on this prop for its contents data
     dependencyGraph.addLink(container._id, prop._id, 'containerContents');
   } else {
     // There is no parent container, the character totals depend on this prop
     dependencyGraph.addLink('weightTotal', prop._id, 'inventoryStats');
     dependencyGraph.addLink('valueTotal', prop._id, 'inventoryStats');
-    if (carried){
+    if (carried) {
       dependencyGraph.addLink('weightCarried', prop._id, 'inventoryStats');
       dependencyGraph.addLink('valueCarried', prop._id, 'inventoryStats');
     }

app/imports/api/engine/computation/buildComputation/linkTypeDependencies.js

@@ -80,6 +80,15 @@ function linkAction(dependencyGraph, prop, { propsById }) {
       key: `resources.attributesConsumed[${index}].quantity`,
     });
   });
+  // Link conditions
+  prop.resources.conditions?.forEach((con, index) => {
+    // Link the property to its condition calculation
+    dependOnCalc({
+      dependencyGraph,
+      prop,
+      key: `resources.conditions[${index}].condition`,
+    });
+  });
 }
 
 function linkAdjustment(dependencyGraph, prop) {

app/imports/api/engine/computation/computeComputation/computeByType/computeAction.js

@@ -8,14 +8,21 @@ export default function computeAction(computation, node) {
   }
   computeResources(computation, node);
   if (!prop.resources) return;
-  prop.resources.itemsConsumed.forEach(itemConsumed => {
+  prop.resources.conditions?.forEach(conObj => {
+    const condition = conObj.condition;
+    if (!condition) return;
+    if (condition.calculation && !condition.value) {
+      prop.insufficientResources = true;
+    }
+  });
+  prop.resources.itemsConsumed?.forEach(itemConsumed => {
     if (!itemConsumed.itemId || itemConsumed.available < itemConsumed.quantity?.value) {
       prop.insufficientResources = true;
     }
   });
-  prop.resources.attributesConsumed.forEach(attConsumed => {
+  prop.resources.attributesConsumed?.forEach(attConsumed => {
     if (!attConsumed.variableName) return;
-    if (attConsumed.available < attConsumed.quantity?.value) {
+    if (!(attConsumed.available >= attConsumed.quantity?.value)) {
       prop.insufficientResources = true;
     }
   });

app/imports/api/engine/computation/computeComputation/computeByType/computeContainer.js

@@ -1,11 +1,17 @@
 import aggregate from './computeVariable/aggregate/index.js';
+import { safeStrip } from '/imports/api/engine/computation/utility/stripFloatingPointOddities.js';
 
-export default function computeContainer(computation, node){
+export default function computeContainer(computation, node) {
   if (!node.data) node.data = {};
   aggregateLinks(computation, node);
+
+  // Clean up floating points
+  const prop = node.data;
+  prop.contentsWeight = safeStrip(prop.contentsWeight);
+  prop.carriedWeight = safeStrip(prop.carriedWeight);
 }
 
-function aggregateLinks(computation, node){
+function aggregateLinks(computation, node) {
   computation.dependencyGraph.forEachLinkedNode(
     node.id,
     (linkedNode, link) => {
@@ -13,7 +19,7 @@ function aggregateLinks(computation, node){
       // Ignore inactive props
       if (linkedNode.data.inactive) return;
       // Aggregate inventory links
-      aggregate.inventory({node, linkedNode, link});
+      aggregate.inventory({ node, linkedNode, link });
     },
     true // enumerate only outbound links
   );

app/imports/api/engine/computation/computeComputation/computeByType/computeVariable/aggregate/aggregateInventory.js

@@ -1,25 +1,25 @@
-export default function aggregateInventory({node, linkedNode, link}){
+export default function aggregateInventory({ node, linkedNode, link }) {
   let linkedProp = linkedNode.data || {};
   const prop = node.data;
 
-  switch (link.data){
+  switch (link.data) {
     case 'attunedItem':
       prop.baseValue = (prop.baseValue || 0) + 1;
       return;
 
     case 'equippedItem':
-      if (node.id === 'weightEquipment'){
+      if (node.id === 'weightEquipment') {
         prop.baseValue = (prop.baseValue || 0) + weight(linkedProp);
-      } else if (node.id === 'valueEquipment'){
+      } else if (node.id === 'valueEquipment') {
         prop.baseValue = (prop.baseValue || 0) + value(linkedProp);
       }
       return;
 
     case 'containerContents':
       // Add this property's weights and values to the container
-      if (!prop.weightless){
+      if (!prop.weightless) {
         prop.contentsWeight = (prop.contentsWeight || 0) + weight(linkedProp);
-        if (prop.carried){
+        if (prop.carried && !prop.contentsWeightless) {
           prop.carriedWeight = (prop.carriedWeight || 0) + carriedWeight(linkedProp);
         }
       }
@@ -30,39 +30,39 @@ export default function aggregateInventory({node, linkedNode, link}){
       return;
 
     case 'inventoryStats':
-      if (node.id === 'weightTotal'){
+      if (node.id === 'weightTotal') {
         prop.baseValue = (prop.baseValue || 0) + weight(linkedProp);
-      } else if (node.id === 'valueTotal'){
+      } else if (node.id === 'valueTotal') {
         prop.baseValue = (prop.baseValue || 0) + value(linkedProp);
-      } else if (node.id === 'weightCarried'){
+      } else if (node.id === 'weightCarried') {
         prop.baseValue = (prop.baseValue || 0) + carriedWeight(linkedProp);
-      } else if (node.id === 'valueCarried'){
+      } else if (node.id === 'valueCarried') {
         prop.baseValue = (prop.baseValue || 0) + carriedValue(linkedProp);
       }
       return;
   }
 }
 
-function quantity(prop){
-  if (typeof prop.quantity === 'number'){
+function quantity(prop) {
+  if (typeof prop.quantity === 'number') {
     return prop.quantity;
   } else {
     return 1;
   }
 }
 
-function weight(prop){
+function weight(prop) {
   return (prop.weight || 0) * quantity(prop) + (prop.contentsWeight || 0);
 }
 
-function carriedWeight(prop){
+function carriedWeight(prop) {
   return (prop.weight || 0) * quantity(prop) + (prop.carriedWeight || 0);
 }
 
-function value (prop){
+function value(prop) {
   return (prop.value || 0) * quantity(prop) + (prop.contentsValue || 0);
 }
 
-function carriedValue (prop){
+function carriedValue(prop) {
   return (prop.value || 0) * quantity(prop) + (prop.carriedValue || 0);
 }

app/imports/api/engine/computation/computeComputation/computeToggles.js

@@ -5,8 +5,26 @@ export default function evaluateToggles(computation, node) {
   if (!toggles) return;
   toggles.forEach(toggle => {
     if (
-      (!toggle.enabled && !toggle.disabled && toggle.condition && !toggle.condition.value)
-      || (toggle.disabled)
+      (
+        // Toggle isn't set to constantly enabled or disabled
+        !toggle.enabled &&
+        !toggle.disabled &&
+        // Toggle is not disabled by another toggle targeting it
+        // Ancestor toggles would've handled this child anyway,
+        // and tag targeted toggles break the link
+        !toggle.deactivatedByToggle &&
+        !toggle.deactivatedByAncestor &&
+        // Toggle has a condition with a falsy value
+        toggle.condition &&
+        !toggle.condition.value
+      )
+      || (
+        // Toggle is disabled manually
+        toggle.disabled &&
+        // Toggle isn't deactivated by something else
+        !toggle.deactivatedByToggle &&
+        !toggle.deactivatedByAncestor
+      )
     ) {
       prop.inactive = true;
       prop.deactivatedByToggle = true;

app/imports/api/engine/computation/utility/stripFloatingPointOddities.js

@@ -1,3 +1,8 @@
-export default function stripFloatingPointOddities(num, precision = 12){
+export default function stripFloatingPointOddities(num, precision = 12) {
   return +parseFloat(num.toPrecision(precision))
 }
+
+export function safeStrip(num, precision = 12) {
+  if (!Number.isFinite(num)) return num;
+  return stripFloatingPointOddities(num, precision);
+}