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

Fixed #382 dice roll functions not working

Browse Source
This commit is contained in:
ThaumRystra
2024-12-01 22:02:47 +02:00
parent 0e56421c3a
commit 75fe3e8fe2
6 changed files with 62 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
app/imports/api/engine/action/functions/recalculateCalculation.ts
View File

@@ -8,13 +8,10 @@ import { getSingleProperty } from '/imports/api/engine/loadCreatures';
import resolve from '/imports/parser/resolve';
import { getEffectiveActionScope } from '/imports/api/engine/action/functions/getEffectiveActionScope';
import { CalculatedField } from '/imports/api/properties/subSchemas/computedField';
import { ResolveLevel } from '/imports/parser/parseTree/NodeFactory';
import InputProvider from '/imports/api/engine/action/functions/userInput/InputProvider';
import { EngineAction } from '/imports/api/engine/action/EngineActions';
import ResolveLevel from '/imports/parser/types/ResolveLevel';
// TODO Redo the work of
// imports/api/engine/computation/computeComputation/computeByType/computeCalculation.js
// But in the action scope
export default async function recalculateCalculation(
calcObj: CalculatedField,
action,
@@ -27,7 +24,7 @@ export default async function recalculateCalculation(
const {
result: unaffectedResult,
context
} = await resolve(parseLevel, calcObj.parseNode, scope);
} = await resolve(parseLevel, calcObj.parseNode, scope, undefined, userInput);
calcObj.valueNode = unaffectedResult;
// store the unaffected value
@@ -48,7 +45,7 @@ export default async function recalculateCalculation(
// Resolve the modified valueNode, use the same context
const {
result: finalResult
} = await resolve(parseLevel, calcObj.valueNode, scope, context);
} = await resolve(parseLevel, calcObj.valueNode, scope, context, userInput);
// Store the errors
calcObj.errors = context.errors;

2
app/imports/api/engine/action/functions/recalculateInlineCalculations.ts
View File

@@ -13,7 +13,7 @@ export default async function recalculateInlineCalculations(
if (!inlineCalcObj?.inlineCalculations?.length) return;
// Recalculate each calculation with the current scope
for (const calc of inlineCalcObj.inlineCalculations) {
await recalculateCalculation(calc, action, undefined, userInput);
await recalculateCalculation(calc, action, parseLevel, userInput);
}
// Embed the new calculated values
embedInlineCalculations(inlineCalcObj);