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

Stopped triggers from firing if they are inactive

Browse Source
This commit is contained in:
Stefan Zermatten
2022-08-12 19:19:58 +02:00
parent 8d34cc1369
commit b324fb1f03
2 changed files with 8 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
app/imports/api/engine/actions/applyTriggers.js
View File

@@ -51,6 +51,11 @@ function triggerMatchTags(trigger, prop) {
} }
export function applyTrigger(trigger, { creature, targets, scope, log }) { export function applyTrigger(trigger, { creature, targets, scope, log }) {
// Prevent trigger from firing if it's inactive
if (trigger.inactive) {
return;
}
// Prevent triggers from firing if their condition is false // Prevent triggers from firing if their condition is false
if (trigger.condition?.parseNode) { if (trigger.condition?.parseNode) {
recalculateCalculation(trigger.condition, scope, log); recalculateCalculation(trigger.condition, scope, log);

4
app/imports/api/engine/actions/doAction.js
View File

@@ -98,7 +98,9 @@ export function doActionWork({
// Get the triggers // Get the triggers
const triggers = getPropertiesOfType(creature._id, 'trigger'); const triggers = getPropertiesOfType(creature._id, 'trigger');
remove(triggers, trigger => trigger.event !== 'doActionProperty'); // Skip triggers that aren't triggered by action props or are inactive
remove(triggers, trigger => trigger.event !== 'doActionProperty' || trigger.inactive);
// Group the triggers into creature.triggers.<propertyType>.<timing>
creature.triggers = groupBy(triggers, 'actionPropertyType'); creature.triggers = groupBy(triggers, 'actionPropertyType');
for (let type in creature.triggers) { for (let type in creature.triggers) {
creature.triggers[type] = groupBy(creature.triggers[type], 'timing') creature.triggers[type] = groupBy(creature.triggers[type], 'timing')