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

Fixed rolling straight to the log to use new parser interface

Browse Source
This commit is contained in:
Stefan Zermatten
2021-12-08 10:24:06 +02:00
parent a58fd8860d
commit 86f5da3ca5
2 changed files with 15 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
app/imports/api/creature/log/CreatureLogs.js
View File

@@ -4,11 +4,8 @@ import LogContentSchema from '/imports/api/creature/log/LogContentSchema.js';
import { ValidatedMethod } from 'meteor/mdg:validated-method';
import { RateLimiterMixin } from 'ddp-rate-limiter-mixin';
import {assertEditPermission} from '/imports/api/creature/creatures/creaturePermissions.js';
import {
parse,
CompilationContext,
prettifyParseError
} from '/imports/parser/parser.js';
import {parse, prettifyParseError} from '/imports/parser/parser.js';
import resolve, { toString } from '/imports/parser/resolve.js';
const PER_CREATURE_LOG_LIMIT = 100;
import STORAGE_LIMITS from '/imports/constants/STORAGE_LIMITS.js';
@@ -175,26 +172,29 @@ const logRoll = new ValidatedMethod({
logContent.push({name: 'Parse Error', value: error});
}
if (parsedResult) try {
let rollContext = new CompilationContext();
let compiled = parsedResult.compile(creature.variables, rollContext);
let compiledString = compiled.toString();
let {
result: compiled,
context
} = resolve('compile', parsedResult, creature.variables);
const compiledString = toString(compiled);
if (!equalIgnoringWhitespace(compiledString, roll)) logContent.push({
value: roll
});
logContent.push({
value: compiledString
});
let rolled = compiled.roll(creature.variables, rollContext);
let rolledString = rolled.toString();
let {result: rolled} = resolve('roll', compiled, creature.variables, context);
let rolledString = toString(rolled);
if (rolledString !== compiledString) logContent.push({
value: rolled.toString()
});
let result = rolled.reduce(creature.variables, rollContext);
let resultString = result.toString();
let {result} = resolve('reduce', rolled, creature.variables, context);
let resultString = toString(result);
if (resultString !== rolledString) logContent.push({
value: resultString
});
} catch (e){
console.error(e);
logContent = [{name: 'Calculation error'}];
}
const log = {