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

Fixed errors with empty quantity ammo resources

Browse Source
This commit is contained in:
Stefan Zermatten
2023-06-23 12:21:51 +02:00
parent 33576e02fa
commit 2c89323764
2 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
app/imports/api/engine/actions/applyPropertyByType/applyAction.js
View File

@@ -225,7 +225,7 @@ function spendResources(prop, actionContext) {
throw 'The prop\'s ammo was not found on the creature'; throw 'The prop\'s ammo was not found on the creature';
} }
if ( if (
!itemConsumed.quantity.value || !itemConsumed?.quantity?.value ||
!isFinite(itemConsumed.quantity.value) !isFinite(itemConsumed.quantity.value)
) return; ) return;
itemQuantityAdjustments.push({ itemQuantityAdjustments.push({
@@ -247,8 +247,9 @@ function spendResources(prop, actionContext) {
} catch (e) { } catch (e) {
actionContext.addLog({ actionContext.addLog({
name: 'Error', name: 'Error',
value: e, value: e.toString(),
}); });
console.error(e);
return true; return true;
} }
// No more errors should be thrown after this line // No more errors should be thrown after this line

4
app/imports/api/engine/computation/buildComputation/linkTypeDependencies.js
View File

@@ -29,9 +29,9 @@ export default function linkTypeDependencies(dependencyGraph, prop, computation)
function dependOnCalc({ dependencyGraph, prop, key }) { function dependOnCalc({ dependencyGraph, prop, key }) {
let calc = get(prop, key); let calc = get(prop, key);
if (!calc) return; if (!calc?.type) return;
if (calc.type !== '_calculation') { if (calc.type !== '_calculation') {
throw `Expected calculation got ${calc.type}` throw `Failed to dependOnCal for prop: ${prop._id}, key: ${key}. Expected calculation got ${calc.type}`
} }
dependencyGraph.addLink(prop._id, `${prop._id}.${key}`, 'calculation'); dependencyGraph.addLink(prop._id, `${prop._id}.${key}`, 'calculation');
} }