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

Big improvements in UX for tabletop actions

Browse Source
This commit is contained in:
ThaumRystra
2025-01-24 16:13:36 +02:00
parent 5b68190570
commit 0b499b9c98
15 changed files with 225 additions and 205 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
app/imports/api/engine/action/functions/writeActionResults.ts
View File

@@ -27,10 +27,12 @@ export default async function writeActionResults(action: EngineAction) {
content: logContents,
creatureId: action.creatureId,
tabletopId: action.tabletopId,
actionId: action._id,
});
// Write the bulk updates
const bulkWritePromise = bulkWrite(creaturePropUpdates, CreatureProperties);
// Write the bulk updates, force them to sequential mode means we immediately get the results
// in the subscription, rather than waiting for oplog tailing to catch up
const bulkWritePromise = bulkWrite(creaturePropUpdates, CreatureProperties, true);
await Promise.all([engineActionPromise, logPromise, bulkWritePromise]);

39
app/imports/api/engine/action/tasks/applyDamagePropTask.ts
View File

@@ -116,24 +116,27 @@ export default async function applyDamagePropTask(
if (increment > currentValue && !targetProp.ignoreLowerLimit) increment = currentValue;
// Can't decrease damage below zero
if (-increment > currentDamage && !targetProp.ignoreUpperLimit) increment = -currentDamage;
damage = currentDamage + increment;
newValue = targetProp.total - damage;
// Write the results
result.mutations.push({
targetIds: [targetId],
updates: [{
propId: targetProp._id,
inc: { damage: increment, value: -increment },
type: targetProp.type,
}],
contents: [{
name: increment >= 0 ? 'Attribute damaged' : 'Attribute restored',
value: `${numberToSignedString(-increment)} ${getPropertyTitle(targetProp)}`,
inline: true,
...task.silent && { silenced: true },
}]
});
if (targetId === action.creatureId) setScope(result, targetProp, newValue, damage);
// Only increment if the increment is non-zero
if (increment !== 0) {
damage = currentDamage + increment;
newValue = targetProp.total - damage;
// Write the results
result.mutations.push({
targetIds: [targetId],
updates: [{
propId: targetProp._id,
inc: { damage: increment, value: -increment },
type: targetProp.type,
}],
contents: [{
name: increment >= 0 ? 'Attribute damaged' : 'Attribute restored',
value: `${numberToSignedString(-increment)} ${getPropertyTitle(targetProp)}`,
inline: true,
...task.silent && { silenced: true },
}]
});
if (targetId === action.creatureId) setScope(result, targetProp, newValue, damage);
}
}
await applyTriggers(action, targetProp, [targetId], 'damageTriggerIds.after', userInput);
await applyTriggers(action, targetProp, [targetId], 'damageTriggerIds.afterChildren', userInput);