jschaufuss/DiceCloud
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Computations now occupy their own nodes on the dependency graph

Browse Source 
This mitigates most issues with properties having self-loops, 
particularly in cases like Strength where the value `strength` is used 
in the description of Strength
This commit is contained in:
Stefan Zermatten
2021-12-07 21:05:24 +02:00
parent 6698d2fd74
commit e34f29f952
17 changed files with 247 additions and 110 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/imports/api/engine/computation/computeComputation/computeByType.js
View File

@@ -4,9 +4,11 @@ import attribute from './computeByType/computeAttribute.js';
import skill from './computeByType/computeSkill.js';
import slot from './computeByType/computeSlot.js';
import container from './computeByType/computeContainer.js';
import _calculation from './computeByType/computeCalculation.js';
export default Object.freeze({
_variable,
_calculation,
action,
attribute,
container,

6
app/imports/api/engine/computation/computeComputation/computeByType/computeCalculation.js Normal file
View File

@@ -0,0 +1,6 @@
import evaluateCalculation from '../../utility/evaluateCalculation.js';
export default function computeCalculation(computation, node){
const calcObj = node.data;
evaluateCalculation(calcObj, computation.scope);
}

13
app/imports/api/engine/computation/computeComputation/computeCalculations.js
View File

@@ -1,13 +0,0 @@
import embedInlineCalculations from '../utility/embedInlineCalculations.js';
import evaluateCalculation from '../utility/evaluateCalculation.js';
export default function computeCalculations(computation, node){
if (!node.data) return;
// evaluate all the calculations
node.data._computationDetails?.calculations?.forEach(calcObj => {
evaluateCalculation(calcObj, computation.scope)
});
node.data._computationDetails?.inlineCalculations?.forEach(inlineCalcObj => {
embedInlineCalculations(inlineCalcObj);
});
}

14
app/imports/api/engine/computation/computeComputation/tests/computeAttribute.testFn.js
View File

@@ -8,13 +8,13 @@ export default function(){
computeCreatureComputation(computation);
const prop = id => computation.propsById[id];
const scope = variableName => computation.scope[variableName];
assert.equal(prop('emptyId').value, 0);
assert.equal(prop('noVariableNameId').value, 8);
assert.equal(prop('strengthId').value, 12);
assert.equal(prop('strengthId').modifier, 1);
assert.equal(scope('strength').modifier, 1);
assert.equal(prop('referencesDexId').value, 4);
assert.equal(prop('hitDiceId').constitutionMod, 5);
assert.equal(prop('emptyId').value, 0, 'calculates empty props to zero');
assert.equal(prop('noVariableNameId').value, 8, 'Calculates props without a variable name');
assert.equal(prop('strengthId').value, 12, 'applies base values');
assert.equal(prop('strengthId').modifier, 1, 'calculates modifiers for basic properties');
assert.equal(scope('strength').modifier, 1, 'Access properties via variables');
assert.equal(prop('referencesDexId').value, 4, 'Access variable properties in calculations');
assert.equal(prop('hitDiceId').constitutionMod, 5, 'Hit dice get constitution modifier');
assert.equal(prop('overriddenDexId').overridden, true, 'override properties with the same variable name');
assert.equal(
prop('parseErrorId').baseValue.value, null,