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

Merge branch 'develop' into feature-tabletop

Browse Source
This commit is contained in:
ThaumRystra
2023-09-24 19:10:04 +02:00
parent 64e4d80b5b 593d75a4bc
commit bc83fe98b4
47 changed files with 1166 additions and 562 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/imports/api/engine/computation/computeComputation/computeByType/computeAction.js
View File

@@ -1,6 +1,6 @@
export default function computeAction(computation, node) {
const prop = node.data;
if (prop.uses) {
if (Number.isFinite(prop.uses?.value)) {
prop.usesLeft = prop.uses.value - (prop.usesUsed || 0);
if (!prop.usesLeft) {
prop.insufficientResources = true;

8
app/imports/api/engine/computation/computeComputation/computeByType/computePointBuy.js
View File

@@ -3,8 +3,8 @@ import evaluateCalculation from '../../utility/evaluateCalculation.js';
export default function computePointBuy(computation, node) {
const prop = node.data;
const tableMin = prop.min?.value || null;
const tableMax = prop.max?.value || null;
const min = has(prop, 'min.value') ? prop.min.value : null;
const max = has(prop, 'max.value') ? prop.max.value : null;
prop.spent = 0;
prop.values?.forEach(row => {
// Clean up added properties
@@ -14,9 +14,7 @@ export default function computePointBuy(computation, node) {
row.spent = 0;
if (row.value === undefined) return;
const min = has(row, 'min.value') ? row.min.value : tableMin;
const max = has(row, 'max.value') ? row.max.value : tableMax;
const costFunction = EJSON.clone(row.cost || prop.cost);
const costFunction = EJSON.clone(prop.cost);
if (costFunction) costFunction.parseLevel = 'reduce';
// Check min and max