Reworked toggles, again, to try and catch more edge cases. Made toggles set the inactive status of their property children in the compute step instead of the inactive denormalisation step
This commit is contained in:
@@ -1,4 +1,5 @@
|
||||
import evaluateCalculation from '/imports/api/creature/computation/engine/evaluateCalculation.js';
|
||||
import applyToggles from '/imports/api/creature/computation/engine/applyToggles.js';
|
||||
import { union } from 'lodash';
|
||||
|
||||
export default function computeToggle(toggle, memo){
|
||||
@@ -16,6 +17,9 @@ export default function computeToggle(toggle, memo){
|
||||
// Before doing any work, mark this toggle as busy
|
||||
toggle.computationDetails.busyComputing = true;
|
||||
|
||||
// Apply any parent toggles
|
||||
applyToggles(toggle, memo);
|
||||
|
||||
// Do work
|
||||
delete toggle.errors;
|
||||
if (toggle.enabled){
|
||||
@@ -41,6 +45,11 @@ export default function computeToggle(toggle, memo){
|
||||
toggle.errors = context.errors;
|
||||
}
|
||||
}
|
||||
if (!toggle.toggleResult){
|
||||
toggle.inactive = true;
|
||||
toggle.deactivatedBySelf = true;
|
||||
toggle.deactivatedByToggle = true;
|
||||
}
|
||||
toggle.computationDetails.computed = true;
|
||||
toggle.computationDetails.busyComputing = false;
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user