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

began work to get inactive state of properties denormalised

Browse Source
This commit is contained in:
Stefan Zermatten
2020-11-03 15:57:14 +02:00
parent 3f7ddd62fc
commit 2fb0ba79c6
9 changed files with 106 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/imports/api/creature/computation/computeToggle.js
View File

@@ -27,7 +27,7 @@ export default function computeToggle(toggle, memo){
toggle.toggleResult = !!+toggle.condition;
} else {
let {value, errors} = evaluateCalculation(toggle.condition, memo);
toggle.toggleResult = value;
toggle.toggleResult = !!value;
if (errors.length){
toggle.errors = errors;
}

14
app/imports/api/creature/computation/recomputeCreature.js
View File

@@ -3,11 +3,13 @@ import { RateLimiterMixin } from 'ddp-rate-limiter-mixin';
import SimpleSchema from 'simpl-schema';
import { assertEditPermission } from '/imports/api/creature/creaturePermissions.js';
import ComputationMemo from '/imports/api/creature/computation/ComputationMemo.js';
import CreatureProperties from '/imports/api/creature/CreatureProperties.js';
import computeMemo from '/imports/api/creature/computation/computeMemo.js';
import getActiveProperties from '/imports/api/creature/getActiveProperties.js';
import writeAlteredProperties from '/imports/api/creature/computation/writeAlteredProperties.js';
import writeCreatureVariables from '/imports/api/creature/computation/writeCreatureVariables.js';
import { recomputeDamageMultipliersById } from '/imports/api/creature/damageMultiplierDenormalise/recomputeDamageMultipliers.js';
import { recomputeDamageMultipliersById } from '/imports/api/creature/denormalise/recomputeDamageMultipliers.js';
import recomputeInactiveProperties from '/imports/api/creature/denormalise/recomputeInactiveProperties.js';
import Creatures from '/imports/api/creature/Creatures.js';
export const recomputeCreature = new ValidatedMethod({
@@ -95,12 +97,18 @@ export function recomputeCreatureById(creatureId){
*/
export function recomputeCreatureByDoc(creature){
const creatureId = creature._id;
let props = getActiveProperties({
recomputeInactiveProperties(creatureId);
let props = CreatureProperties.find({
'ancestors.id': creatureId,
inactive: {$ne: true},
type: {$in: calculationPropertyTypes},
}).fetch();
/*getActiveProperties({
ancestorId: creatureId,
filter: {type: {$in: calculationPropertyTypes}},
includeUntoggled: true,
// TODO filter out expensive fields, particularly icon field
});
});*/
let computationMemo = new ComputationMemo(props, creature);
computeMemo(computationMemo);
writeAlteredProperties(computationMemo);