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

Fixed: buffs

Browse Source
This commit is contained in:
Stefan Zermatten
2021-02-24 15:05:53 +02:00
parent 1e9f0515e5
commit 7e660877e5
2 changed files with 15 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
app/imports/api/creature/actions/applyBuff.js
View File

@@ -4,6 +4,7 @@ import {
} from '/imports/api/parenting/parenting.js'; } from '/imports/api/parenting/parenting.js';
import {setDocToLastOrder} from '/imports/api/parenting/order.js'; import {setDocToLastOrder} from '/imports/api/parenting/order.js';
import CreatureProperties from '/imports/api/creature/creatureProperties/CreatureProperties.js'; import CreatureProperties from '/imports/api/creature/creatureProperties/CreatureProperties.js';
import { recomputeCreatureByDoc } from '/imports/api/creature/computation/methods/recomputeCreature.js';
export default function applyBuff({ export default function applyBuff({
prop, prop,
@@ -57,5 +58,10 @@ function copyNodeListToTarget(propList, target, oldParent){
collection: CreatureProperties, collection: CreatureProperties,
doc: propList[0], doc: propList[0],
}); });
CreatureProperties.batchInsert(propList);
CreatureProperties.batchInsert(propList, () => {
// This insert is racing the main recompute, recmpute again after it's
// certainly finished
recomputeCreatureByDoc(target);
});
} }

15
app/imports/api/creature/actions/applyProperties.js
View File

@@ -52,23 +52,24 @@ function applyProperty(options){
return true; return true;
} }
function applyPropertyAndWalkChildren({prop, child, targets, ...options}){ function applyPropertyAndWalkChildren({prop, children, targets, ...options}){
let shouldKeepWalking = applyProperty({ prop, targets, ...options }); let shouldKeepWalking = applyProperty({ prop, children, targets, ...options });
if (shouldKeepWalking){ if (shouldKeepWalking){
applyProperties({ forest: child.children, targets, ...options,}); applyProperties({ forest: children, targets, ...options,});
} }
} }
export default function applyProperties({ forest, targets, ...options}){ export default function applyProperties({ forest, targets, ...options}){
forest.forEach(child => { forest.forEach(node => {
let prop = child.node; let prop = node.node;
let children = node.children;
if (shouldSplit(prop) && targets.length){ if (shouldSplit(prop) && targets.length){
targets.forEach(target => { targets.forEach(target => {
let targets = [target] let targets = [target]
applyPropertyAndWalkChildren({ targets, prop, child, ...options}); applyPropertyAndWalkChildren({ targets, prop, children, ...options});
}); });
} else { } else {
applyPropertyAndWalkChildren({prop, child, targets, ...options}); applyPropertyAndWalkChildren({prop, children, targets, ...options});
} }
}); });
} }