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

Fixed dependency graph not building correctly for resources consumed

Browse Source
This commit is contained in:
Stefan Zermatten
2022-02-28 00:02:55 +02:00
parent e6c7d79d7d
commit afe6c044cd
2 changed files with 3 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
app/imports/api/engine/computation/buildComputation/linkTypeDependencies.js
View File

@@ -30,7 +30,6 @@ function dependOnCalc({dependencyGraph, prop, key}){
let calc = get(prop, key);
if (!calc) return;
if (calc.type !== '_calculation'){
console.log(calc);
throw `Expected calculation got ${calc.type}`
}
dependencyGraph.addLink(prop._id, `${prop._id}.${key}`, 'calculation');
@@ -63,7 +62,7 @@ function linkAction(dependencyGraph, prop, {propsById}){
dependOnCalc({
dependencyGraph,
prop,
key: `${prop._id}.resources.itemsConsumed.${index}.quantity`,
key: `resources.itemsConsumed[${index}].quantity`,
});
});
// Link attributes consumed
@@ -74,7 +73,7 @@ function linkAction(dependencyGraph, prop, {propsById}){
dependOnCalc({
dependencyGraph,
prop,
key: `${prop._id}.resources.attributesConsumed.${index}.quantity`,
key: `resources.attributesConsumed[${index}].quantity`,
});
});
}

3
app/imports/api/engine/computeCreature.js
View File

@@ -11,14 +11,13 @@ export default function computeCreature(creatureId){
computeCreatureComputation(computation);
writeAlteredProperties(computation);
writeScope(creatureId, computation.scope);
writeErrors(creatureId, computation.errors);
} catch (e){
computation.errors.push({
type: 'crash',
details: e.reason,
});
} finally {
writeErrors(creatureId, [...computation.errors]);
writeErrors(creatureId, computation.errors);
}
}