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

Computation engine rewrite continues

Browse Source
This commit is contained in:
Stefan Zermatten
2021-09-10 19:51:03 +02:00
parent 28ec7082ee
commit b877a8b45f
15 changed files with 235 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
app/imports/api/creature/computation/newEngine/buildComputation/computeInventory.js
View File

@@ -59,12 +59,12 @@ function handleProp(prop, containerStack, data, dependencyGraph){
// Sum the item-specific data
if (prop.type === 'item'){
dependencyGraph.addLink('itemsAttuned', prop._id);
dependencyGraph.addLink('itemsAttuned', prop._id, 'inventory');
if (prop.attuned) data.itemsAttuned += 1;
if (prop.equipped){
dependencyGraph.addLink('weightEquipment', prop._id);
dependencyGraph.addLink('weightEquipment', prop._id, 'inventory');
data.weightEquipment += weight;
dependencyGraph.addLink('valueEquipment', prop._id);
dependencyGraph.addLink('valueEquipment', prop._id, 'inventory');
data.valueEquipment += value;
}
}
@@ -74,7 +74,7 @@ function handleProp(prop, containerStack, data, dependencyGraph){
if (container){
// The container depends on this prop for its contents data
dependencyGraph.addLink(container._id, prop._id);
dependencyGraph.addLink(container._id, prop._id, 'inventory');
// Add this property's weights and values to the container
if (!container.weightless){
container.contentsWeight += weight;
@@ -84,14 +84,14 @@ function handleProp(prop, containerStack, data, dependencyGraph){
if (carried) container.carriedValue += carriedValue;
} else {
// There is no parent container, add weights/value to the character data
dependencyGraph.addLink('weightTotal', prop._id);
dependencyGraph.addLink('weightTotal', prop._id, 'inventory');
data.weightTotal += weight;
dependencyGraph.addLink('valueTotal', prop._id);
dependencyGraph.addLink('valueTotal', prop._id, 'inventory');
data.valueTotal += value;
if (carried){
dependencyGraph.addLink('weightCarried', prop._id);
dependencyGraph.addLink('weightCarried', prop._id, 'inventory');
data.weightCarried += carriedWeight;
dependencyGraph.addLink('valueCarried', prop._id);
dependencyGraph.addLink('valueCarried', prop._id, 'inventory');
data.valueCarried += carriedValue;
}
}

2
app/imports/api/creature/computation/newEngine/buildComputation/computeSlotQuantityFilled.js
View File

@@ -7,7 +7,7 @@ export default function computeSlotQuantityFilled(node, dependencyGraph){
slot.totalFilled = 0;
node.children.forEach(child => {
let childProp = child.node;
dependencyGraph.addLink(slot._id, childProp._id)
dependencyGraph.addLink(slot._id, childProp._id, 'slotFill')
if (childProp.type === 'slotFiller'){
slot.totalFilled += child.slotQuantityFilled;
} else {

2
app/imports/api/creature/computation/newEngine/buildComputation/computeToggleDependencies.js
View File

@@ -11,6 +11,6 @@ export default function computeToggleDependencies(node, dependencyGraph){
) return;
walkDown(node.children, child => {
child.node._computationDetails.toggleAncestors.push(prop._id);
dependencyGraph.addLink(child.node._id, prop._id, prop.condition);
dependencyGraph.addLink(child.node._id, prop._id, 'toggle');
});
}

43
app/imports/api/creature/computation/newEngine/buildComputation/linkCalculationDependencies.js
View File

@@ -4,21 +4,40 @@ import findAncestorByType from 'imports/api/creature/computation/newEngine/utili
export default function linkCalculationDependencies(dependencyGraph, prop, propsById){
prop._computationDetails.calculations.forEach(calcObj => {
// Store resolved ancestors
let memo = {
// ancestors: {} //this gets added if there are resolved ancestors
};
// Traverse the parsed calculation looking for variable names
calcObj._parsedCalculation.travese(node => {
if (node instanceof SymbolNode || node instanceof AccessorNode){
// Link ancestor references as direct property dependencies
if (node.name[0] === '#'){
let ancestorProp = findAncestorByType(
prop, node.name.slice(1), propsById
);
if (!ancestorProp) return;
dependencyGraph.addLink(prop._id, ancestorProp._id, calcObj);
} else {
// Link variable name references as variable dependencies
dependencyGraph.addLink(prop._id, node.name, calcObj);
}
// Skip nodes that aren't symbols or accessors
if (!(node instanceof SymbolNode || node instanceof AccessorNode)) return;
// Link ancestor references as direct property dependencies
if (node.name[0] === '#'){
let ancestorProp = getAncestorProp(
node.name.slice(1), memo, prop, propsById
);
if (!ancestorProp) return;
dependencyGraph.addLink(prop._id, ancestorProp._id, calcObj);
} else {
// Link variable name references as variable dependencies
dependencyGraph.addLink(prop._id, node.name, calcObj);
}
});
// Store the resolved ancestors in this calculation's local scope
if (memo.ancestors) {
calcObj._localScope = { ...calcObj._localScope, ...memo.ancestors};
}
});
}
function getAncestorProp(type, memo, prop, propsById){
if (memo.ancestors && memo.ancestors['#' + type]){
return memo.ancestors['#' + type];
} else {
var ancestorProp = findAncestorByType( prop, type, propsById );
if (!memo.ancestors) memo.ancestors = {};
memo.ancestors['#' + type] = ancestorProp;
return ancestorProp;
}
}

8
app/imports/api/creature/computation/newEngine/buildComputation/linkTypeDependencies.js
View File

@@ -15,13 +15,13 @@ export default function linkTypeDependencies(dependencyGraph, prop){
function linkVariableName(dependencyGraph, prop){
// The variableName of the prop depends on the prop
if (prop.variableName){
dependencyGraph.addLink(prop.variableName, prop._id);
dependencyGraph.addLink(prop.variableName, prop._id, 'definition');
}
}
function linkDamageMultiplier(dependencyGraph, prop){
prop.damageTypes.forEach(damageType => {
dependencyGraph.addLink(`${damageType}Multiplier`, prop._id);
dependencyGraph.addLink(`${damageType}Multiplier`, prop._id, 'damageMultiplier');
});
}
@@ -29,12 +29,12 @@ function linkStats(dependencyGraph, prop){
// The stats a prop references depend on that prop
prop.stats.forEach(variableName => {
if (!variableName) return;
dependencyGraph.addLink(variableName, prop._id);
dependencyGraph.addLink(variableName, prop._id, 'statChange');
});
}
function linkSkill(dependencyGraph, prop){
linkVariableName(dependencyGraph, prop);
// The prop depends on the variable references as the ability
if (prop.ability) dependencyGraph.addLink(prop._id, prop.ability);
if (prop.ability) dependencyGraph.addLink(prop._id, prop.ability, 'skillAbilityScore');
}

7
app/imports/api/creature/computation/newEngine/buildComputation/parseCalculationFields.js
View File

@@ -9,15 +9,20 @@ export default function parseCalculationFields(prop, schemas){
if (key.slice(-12) !== '.calculation') return;
const calcKey = key.sclice(0, -12);
// Determine the level the calculation should compute down to
let parseLevel = schemas[prop.type].getDefinition(calcKey).parseLevel;
// For all fields matching they keys
// supports `keys.$.with.$.arrays`
applyFnToKey(prop, calcKey, calcObj => {
// Store a reference to all the calculations
prop._computationDetails.calculations.push(calcObj);
// Store the level to compute down to later
calcObj._parseLevel = parseLevel;
// Parse the calculation
parseCalculation(calcObj);
});
});
}