From 8d34cc136951be61f17b96503d70c33f939def1e Mon Sep 17 00:00:00 2001
From: Stefan Zermatten <stefanzermatten@gmail.com>
Date: Fri, 12 Aug 2022 18:10:24 +0200
Subject: [PATCH 01/18] Fixed trigger form hint text mentioning slots instead
 of trigger

---
 app/imports/ui/properties/forms/TriggerForm.vue | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/app/imports/ui/properties/forms/TriggerForm.vue b/app/imports/ui/properties/forms/TriggerForm.vue
index 59e7f479..f32eb85e 100644
--- a/app/imports/ui/properties/forms/TriggerForm.vue
+++ b/app/imports/ui/properties/forms/TriggerForm.vue
@@ -1,5 +1,5 @@
 <template lang="html">
-  <div class="slot-form">
+  <div class="trigger-form">
     <text-field
       ref="focusFirst"
       label="Name"
@@ -23,7 +23,7 @@
       </v-btn>
       <smart-combobox
         label="Tags Required"
-        hint="The slot must be filled with a property which has all the listed tags"
+        hint="The trigger will be fired by a property which has all the listed tags"
         multiple
         chips
         deletable-chips
@@ -48,7 +48,7 @@
         />
         <smart-combobox
           label="Tags"
-          :hint="extras.operation === 'OR' ? 'The slot can be filled with a property that has all of these tags instead' : 'The slot cannot be filled with a property that has any of these tags'"
+          :hint="extras.operation === 'OR' ? 'The trigger can be fired by a property that has all of these tags instead' : 'The trigger won\'t be fired by a property that has any of these tags'"
           class="mx-2"
           multiple
           chips

From b324fb1f03123b23bc0804fdf5284984a2ecefc0 Mon Sep 17 00:00:00 2001
From: Stefan Zermatten <stefanzermatten@gmail.com>
Date: Fri, 12 Aug 2022 19:19:58 +0200
Subject: [PATCH 02/18] Stopped triggers from firing if they are inactive

---
 app/imports/api/engine/actions/applyTriggers.js | 5 +++++
 app/imports/api/engine/actions/doAction.js      | 4 +++-
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/app/imports/api/engine/actions/applyTriggers.js b/app/imports/api/engine/actions/applyTriggers.js
index 22507780..ee2af708 100644
--- a/app/imports/api/engine/actions/applyTriggers.js
+++ b/app/imports/api/engine/actions/applyTriggers.js
@@ -51,6 +51,11 @@ function triggerMatchTags(trigger, prop) {
 }
 
 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
   if (trigger.condition?.parseNode) {
     recalculateCalculation(trigger.condition, scope, log);
diff --git a/app/imports/api/engine/actions/doAction.js b/app/imports/api/engine/actions/doAction.js
index 75a4112c..271e2ba8 100644
--- a/app/imports/api/engine/actions/doAction.js
+++ b/app/imports/api/engine/actions/doAction.js
@@ -98,7 +98,9 @@ export function doActionWork({
 
   // Get the triggers
   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');
   for (let type in creature.triggers) {
     creature.triggers[type] = groupBy(creature.triggers[type], 'timing')

From ecfeeaccd93ce4ac83248a500c8bf8c65eaafe26 Mon Sep 17 00:00:00 2001
From: Stefan Zermatten <stefanzermatten@gmail.com>
Date: Fri, 12 Aug 2022 19:20:23 +0200
Subject: [PATCH 03/18] Breadcrumbs now show when editing property

---
 .../creatureProperties/Breadcrumbs.vue        | 11 ++++++--
 .../CreaturePropertyDialog.vue                | 27 ++++++++++---------
 2 files changed, 24 insertions(+), 14 deletions(-)

diff --git a/app/imports/ui/creature/creatureProperties/Breadcrumbs.vue b/app/imports/ui/creature/creatureProperties/Breadcrumbs.vue
index cf321a10..9896a758 100644
--- a/app/imports/ui/creature/creatureProperties/Breadcrumbs.vue
+++ b/app/imports/ui/creature/creatureProperties/Breadcrumbs.vue
@@ -64,6 +64,7 @@
       },
       noLinks: Boolean,
       noIcons: Boolean,
+      editing: Boolean,
     },
     computed:{
       props(){
@@ -95,7 +96,10 @@
           store.commit('pushDialogStack', {
             component: 'creature-property-dialog',
             elementId: `breadcrumb-${id}`,
-            data: {_id: id},
+            data: {
+              _id: id,
+              startInEditTab: this.editing,
+            },
           });
         }
       },
@@ -120,7 +124,10 @@
           store.commit('pushDialogStack', {
             component: 'creature-root-dialog',
             elementId: 'breadcrumb-root',
-            data: {_id: this.model.ancestors[0].id},
+            data: {
+              _id: this.model.ancestors[0].id,
+              startInEditTab: this.editing,
+            },
           });
         }
       }
diff --git a/app/imports/ui/creature/creatureProperties/CreaturePropertyDialog.vue b/app/imports/ui/creature/creatureProperties/CreaturePropertyDialog.vue
index c77026ba..da516221 100644
--- a/app/imports/ui/creature/creatureProperties/CreaturePropertyDialog.vue
+++ b/app/imports/ui/creature/creatureProperties/CreaturePropertyDialog.vue
@@ -14,6 +14,20 @@
       />
     </template>
     <template v-if="model">
+      <div
+        class="layout mb-4"
+      >
+        <template v-if="!embedded">
+          <breadcrumbs
+            :model="model"
+            :editing="editing"
+          />
+        </template>
+        <v-spacer />
+        <v-chip disabled>
+          {{ typeName }}
+        </v-chip>
+      </div>
       <v-fade-transition
         mode="out-in"
       >
@@ -51,17 +65,6 @@
           </component>
         </div>
         <div v-else>
-          <div
-            class="layout mb-4"
-          >
-            <template v-if="!embedded">
-              <breadcrumbs :model="model" />
-            </template>
-            <v-spacer />
-            <v-chip disabled>
-              {{ typeName }}
-            </v-chip>
-          </div>
           <component
             :is="model.type + 'Viewer'"
             :key="_id"
@@ -200,7 +203,7 @@ export default {
   watch: {
     _id: {
       immediate: true,
-      handler(newId){
+      handler(newId) {
         this.$nextTick(() => {
           this.currentId = newId;
         });

From 13fc0c0b120218de9d64a7ebf36e5648e9c7dcb5 Mon Sep 17 00:00:00 2001
From: Stefan Zermatten <stefanzermatten@gmail.com>
Date: Fri, 12 Aug 2022 19:52:58 +0200
Subject: [PATCH 04/18] Triggers can fire on character sheet checks

---
 .../api/engine/actions/applyTriggers.js       | 72 ++++++++++---------
 app/imports/api/engine/actions/doCheck.js     | 33 +++++++++
 app/imports/api/properties/Triggers.js        |  2 +
 3 files changed, 73 insertions(+), 34 deletions(-)

diff --git a/app/imports/api/engine/actions/applyTriggers.js b/app/imports/api/engine/actions/applyTriggers.js
index ee2af708..d0863ed4 100644
--- a/app/imports/api/engine/actions/applyTriggers.js
+++ b/app/imports/api/engine/actions/applyTriggers.js
@@ -11,46 +11,18 @@ export default function applyTriggers(node, { creature, targets, scope, log }, t
   const type = prop.type;
   if (creature.triggers?.[type]?.[timing]) {
     creature.triggers[type][timing].forEach(trigger => {
-      if (triggerMatchTags(trigger, prop)) {
-        applyTrigger(trigger, { creature, targets, scope, log });
-      }
+      applyTrigger(trigger, { creature, prop, targets, scope, log });
     });
   }
 }
 
-function triggerMatchTags(trigger, prop) {
-  let matched = false;
-  const propTags = getEffectivePropTags(prop);
-  // Check the target tags
-  if (
-    !trigger.targetTags?.length ||
-    difference(trigger.targetTags, propTags).length === 0
-  ) {
-    matched = true;
+export function applyTrigger(trigger, { creature, prop, targets, scope, log }) {
+  // If there is a prop we are applying the trigger from,
+  // don't fire if the tags don't match
+  if (!triggerMatchTags(trigger, prop)) {
+    return;
   }
-  // Check the extra tags
-  trigger.extraTags?.forEach(extra => {
-    if (extra.operation === 'OR') {
-      if (matched) return;
-      if (
-        !extra.tags.length ||
-        difference(extra.tags, propTags).length === 0
-      ) {
-        matched = true;
-      }
-    } else if (extra.operation === 'NOT') {
-      if (
-        extra.tags.length &&
-        intersection(extra.tags, propTags)
-      ) {
-        return false;
-      }
-    }
-  });
-  return matched;
-}
 
-export function applyTrigger(trigger, { creature, targets, scope, log }) {
   // Prevent trigger from firing if it's inactive
   if (trigger.inactive) {
     return;
@@ -102,3 +74,35 @@ export function applyTrigger(trigger, { creature, targets, scope, log }) {
 
   trigger.firing = false;
 }
+
+function triggerMatchTags(trigger, prop) {
+  let matched = false;
+  const propTags = getEffectivePropTags(prop);
+  // Check the target tags
+  if (
+    !trigger.targetTags?.length ||
+    difference(trigger.targetTags, propTags).length === 0
+  ) {
+    matched = true;
+  }
+  // Check the extra tags
+  trigger.extraTags?.forEach(extra => {
+    if (extra.operation === 'OR') {
+      if (matched) return;
+      if (
+        !extra.tags.length ||
+        difference(extra.tags, propTags).length === 0
+      ) {
+        matched = true;
+      }
+    } else if (extra.operation === 'NOT') {
+      if (
+        extra.tags.length &&
+        intersection(extra.tags, propTags)
+      ) {
+        return false;
+      }
+    }
+  });
+  return matched;
+}
diff --git a/app/imports/api/engine/actions/doCheck.js b/app/imports/api/engine/actions/doCheck.js
index 9f139f2c..0a5fef41 100644
--- a/app/imports/api/engine/actions/doCheck.js
+++ b/app/imports/api/engine/actions/doCheck.js
@@ -3,10 +3,15 @@ import { ValidatedMethod } from 'meteor/mdg:validated-method';
 import { RateLimiterMixin } from 'ddp-rate-limiter-mixin';
 import getRootCreatureAncestor from '/imports/api/creature/creatureProperties/getRootCreatureAncestor.js';
 import CreatureProperties from '/imports/api/creature/creatureProperties/CreatureProperties.js';
+import {
+  getPropertiesOfType, getVariables
+} from '/imports/api/engine/loadCreatures.js';
+import { groupBy, remove } from 'lodash';
 import { CreatureLogSchema, insertCreatureLogWork } from '/imports/api/creature/log/CreatureLogs.js';
 import { assertEditPermission } from '/imports/api/creature/creatures/creaturePermissions.js';
 import rollDice from '/imports/parser/rollDice.js';
 import numberToSignedString from '/imports/ui/utility/numberToSignedString.js';
+import { applyTrigger } from '/imports/api/engine/actions/applyTriggers.js';
 
 const doCheck = new ValidatedMethod({
   name: 'creatureProperties.doCheck',
@@ -45,12 +50,40 @@ export function doCheckWork({
     creatureName: creature.name,
   });
 
+  // Add the variables to the creature document
+  const variables = getVariables(creature._id);
+  delete variables._id;
+  delete variables._creatureId;
+  creature.variables = variables;
+  const scope = creature.variables;
+
+  // Get the triggers
+  let triggers = getPropertiesOfType(creature._id, 'trigger');
+  remove(triggers, trigger => trigger.event !== 'check');
+  triggers = groupBy(triggers, 'timing');
+
+  // Set the creature as the target
+  const targets = [creature];
+
+  applyTriggers(triggers, 'before', { creature, prop, targets, scope, log });
   rollCheck({prop, log, methodScope});
+  applyTriggers(triggers, 'after', { creature, prop, targets, scope, log });
 
   // Insert the log
   insertCreatureLogWork({log, creature, method});
 }
 
+function applyTriggers(triggers, timing, opts) {
+  // Get matching triggers
+  let selectedTriggers = triggers[timing] || [];
+  // Sort the triggers
+  selectedTriggers.sort((a, b) => a.order - b.order);
+  // Apply the triggers
+  selectedTriggers.forEach(trigger => {
+    applyTrigger(trigger, opts)
+  });
+}
+
 function rollCheck({prop, log, methodScope}){
   // get the modifier for the roll
   let rollModifier;
diff --git a/app/imports/api/properties/Triggers.js b/app/imports/api/properties/Triggers.js
index 3b9b0d13..da99fddc 100644
--- a/app/imports/api/properties/Triggers.js
+++ b/app/imports/api/properties/Triggers.js
@@ -5,6 +5,7 @@ import STORAGE_LIMITS from '/imports/constants/STORAGE_LIMITS.js';
 const eventOptions = {
   doActionProperty: 'Do action',
   // receiveActionProperty: 'Receiving action property',
+  check: 'Roll check',
   // flipToggle: 'Toggle changed',
   // adjustProperty: 'Attribute adjusted',
   anyRest: 'Short or long rest',
@@ -26,6 +27,7 @@ const actionPropertyTypeOptions = {
   note: 'Note',
   roll: 'Roll',
   savingThrow: 'Saving throw',
+  spell: 'Spell',
   toggle: 'Toggle',
 }
 

From ee0e76429452b2c996d205461084d478a1aaa2d2 Mon Sep 17 00:00:00 2001
From: Stefan Zermatten <stefanzermatten@gmail.com>
Date: Sat, 13 Aug 2022 00:22:32 +0200
Subject: [PATCH 05/18] Refactored entire action engine Triggers needed action
 context to function outside of the action engine proper, so now it's been
 abstracted into its own class

---
 .../methods/damagePropertiesByName.js         |  53 ------
 .../methods/damageProperty.js                 | 108 ++++++++----
 .../creatureProperties/methods/dealDamage.js  |  70 --------
 .../creatureProperties/methods/index.js       |   2 -
 .../creatures/methods/restCreature.js         |  81 ++++-----
 .../api/engine/actions/ActionContext.js       |  78 +++++++++
 .../api/engine/actions/applyProperty.js       |  12 +-
 .../applyPropertyByType/applyAction.js        |  80 ++++-----
 .../applyPropertyByType/applyAdjustment.js    |  31 ++--
 .../applyPropertyByType/applyBranch.js        |  37 ++---
 .../actions/applyPropertyByType/applyBuff.js  |  18 +-
 .../applyPropertyByType/applyDamage.js        |  80 +++++++--
 .../actions/applyPropertyByType/applyNote.js  |  14 +-
 .../actions/applyPropertyByType/applyRoll.js  |  20 +--
 .../applyPropertyByType/applySavingThrow.js   |  30 ++--
 .../applyPropertyByType/applyToggle.js        |  10 +-
 .../applyEffectsToCalculationParseNode.js     |   4 +-
 .../applyPropertyByType/shared/logErrors.js   |   4 +-
 .../shared/recalculateCalculation.js          |   8 +-
 .../shared/recalculateInlineCalculations.js   |   4 +-
 .../api/engine/actions/applyTriggers.js       |  35 ++--
 app/imports/api/engine/actions/doAction.js    |  72 ++------
 app/imports/api/engine/actions/doCastSpell.js |  73 ++++----
 app/imports/api/engine/actions/doCheck.js     |  69 ++------
 app/imports/api/properties/Attributes.js      |  27 +++
 app/imports/api/properties/Triggers.js        |   4 +-
 .../components/attributes/HealthBar.vue       | 156 +++++++++---------
 .../components/attributes/ResourceCard.vue    |   9 +-
 .../ui/properties/forms/AttributeForm.vue     |  54 +++++-
 29 files changed, 626 insertions(+), 617 deletions(-)
 delete mode 100644 app/imports/api/creature/creatureProperties/methods/damagePropertiesByName.js
 delete mode 100644 app/imports/api/creature/creatureProperties/methods/dealDamage.js
 create mode 100644 app/imports/api/engine/actions/ActionContext.js

diff --git a/app/imports/api/creature/creatureProperties/methods/damagePropertiesByName.js b/app/imports/api/creature/creatureProperties/methods/damagePropertiesByName.js
deleted file mode 100644
index 6428eeb3..00000000
--- a/app/imports/api/creature/creatureProperties/methods/damagePropertiesByName.js
+++ /dev/null
@@ -1,53 +0,0 @@
-import { ValidatedMethod } from 'meteor/mdg:validated-method';
-import { RateLimiterMixin } from 'ddp-rate-limiter-mixin';
-import SimpleSchema from 'simpl-schema';
-import CreatureProperties from '/imports/api/creature/creatureProperties/CreatureProperties.js';
-import Creatures from '/imports/api/creature/creatures/Creatures.js';
-import { assertEditPermission } from '/imports/api/sharing/sharingPermissions.js';
-import { damagePropertyWork } from '/imports/api/creature/creatureProperties/methods/damageProperty.js';
-
-const damagePropertiesByName = new ValidatedMethod({
-  name: 'CreatureProperties.damagePropertiesByName',
-  validate: new SimpleSchema({
-    creatureId: SimpleSchema.RegEx.Id,
-    variableName: {
-      type: String,
-    },
-    operation: {
-      type: String,
-      allowedValues: ['set', 'increment']
-    },
-    value: Number,
-  }).validator(),
-  mixins: [RateLimiterMixin],
-  rateLimit: {
-    numRequests: 20,
-    timeInterval: 5000,
-  },
-  run({creatureId, variableName, operation, value}) {
-		// Check permissions
-    let creature = Creatures.findOne(creatureId, {
-      fields: {
-        variables: 1,
-        owner: 1,
-        readers: 1,
-        writers: 1,
-      },
-    });
-    assertEditPermission(creature, this.userId);
-    CreatureProperties.find({
-      'ancestors.id': creatureId,
-      variableName,
-      removed: {$ne: false},
-      inactive: {$ne: true},
-    }).forEach(property => {
-      // Check if property can take damage
-      let schema = CreatureProperties.simpleSchema(property);
-      if (!schema.allowsKey('damage')) return;
-      // Damage the property
-      damagePropertyWork({property, operation, value});
-    });
-  }
-});
-
-export default damagePropertiesByName;
diff --git a/app/imports/api/creature/creatureProperties/methods/damageProperty.js b/app/imports/api/creature/creatureProperties/methods/damageProperty.js
index 315b6f2c..d9af78f5 100644
--- a/app/imports/api/creature/creatureProperties/methods/damageProperty.js
+++ b/app/imports/api/creature/creatureProperties/methods/damageProperty.js
@@ -2,8 +2,9 @@ import { ValidatedMethod } from 'meteor/mdg:validated-method';
 import { RateLimiterMixin } from 'ddp-rate-limiter-mixin';
 import SimpleSchema from 'simpl-schema';
 import CreatureProperties from '/imports/api/creature/creatureProperties/CreatureProperties.js';
-import getRootCreatureAncestor from '/imports/api/creature/creatureProperties/getRootCreatureAncestor.js';
 import { assertEditPermission } from '/imports/api/sharing/sharingPermissions.js';
+import { applyTriggers } from '/imports/api/engine/actions/applyTriggers.js';
+import ActionContext from '/imports/api/engine/actions/ActionContext.js';
 
 const damageProperty = new ValidatedMethod({
   name: 'creatureProperties.damage',
@@ -20,58 +21,105 @@ const damageProperty = new ValidatedMethod({
     numRequests: 20,
     timeInterval: 5000,
   },
-  run({_id, operation, value}) {
-    // Check permissions
-		let property = CreatureProperties.findOne(_id);
-    if (!property) throw new Meteor.Error(
+  run({ _id, operation, value }) {
+    
+    // Get action context
+    const prop = CreatureProperties.findOne(_id);
+    if (!prop) throw new Meteor.Error(
       'Damage property failed', 'Property doesn\'t exist'
     );
-    let rootCreature = getRootCreatureAncestor(property);
-    assertEditPermission(rootCreature, this.userId);
+    const creatureId = prop.ancestors[0].id;
+    const actionContext = new ActionContext(creatureId, [creatureId], this);
+    
+		// Check permissions
+    assertEditPermission(actionContext.creature, this.userId);
+
 		// Check if property can take damage
-		let schema = CreatureProperties.simpleSchema(property);
+		let schema = CreatureProperties.simpleSchema(prop);
 		if (!schema.allowsKey('damage')){
 			throw new Meteor.Error(
 				'Damage property failed',
-				`Property of type "${property.type}" can't be damaged`
+				`Property of type "${prop.type}" can't be damaged`
 			);
-		}
-    let result = damagePropertyWork({ property, operation, value });
+    }
+    
+    const result = damagePropertyWork({ prop, operation, value, actionContext });
+  
+    // Insert the log
+    actionContext.writeLog();
     return result;
   },
 });
 
-export function damagePropertyWork({property, operation, value}){
-  let damage, newValue;
+export function damagePropertyWork({ prop, operation, value, actionContext }) {
+
+  // Save the value to the scope before applying the before triggers
+  if (operation === 'increment') {
+    if (value >= 0) {
+      actionContext.scope['$damage'] = value;
+    } else {
+      actionContext.scope['$healing'] = -value;
+    }
+  } else {
+    actionContext.scope['$set'] = value;
+  }
+
+  applyTriggers(actionContext.triggers?.damageProperty?.before, prop, actionContext);
+
+  // fetch the value from the scope after the before triggers, in case they changed them
+  if (operation === 'increment') {
+    if (value >= 0) {
+      value = actionContext.scope['$damage'];
+    } else {
+      value = -actionContext.scope['$healing'];
+    }
+  } else {
+    value = actionContext.scope['$set'];
+  }
+
+  let damage, newValue, increment;
   if (operation === 'set'){
-    const total = property.total || 0;
+    const total = prop.total || 0;
     // Set represents what we want the value to be after damage
     // So we need the actual damage to get to that value
     damage = total - value;
     // Damage can't exceed total value
-    if (damage > total) damage = total;
+    if (damage > total && !prop.ignoreLowerLimit) damage = total;
     // Damage must be positive
-    if (damage < 0) damage = 0;
-    newValue = property.total - damage;
+    if (damage < 0 && !prop.ignoreUpperLimit) damage = 0;
+    newValue = prop.total - damage;
+    // Write the results
+    CreatureProperties.update(prop._id, {
+      $set: { damage, value: newValue, dirty: true }
+    }, {
+      selector: prop
+    });
   } else if (operation === 'increment'){
-    let currentValue = property.value || 0;
-    let currentDamage = property.damage || 0;
-    let increment = value;
+    let currentValue = prop.value || 0;
+    let currentDamage = prop.damage || 0;
+    increment = value;
     // Can't increase damage above the remaining value
-    if (increment > currentValue) increment = currentValue;
+    if (increment > currentValue && !prop.ignoreLowerLimit) increment = currentValue;
     // Can't decrease damage below zero
-    if (-increment > currentDamage) increment = -currentDamage;
+    if (-increment > currentDamage && !prop.ignoreUpperLimit) increment = -currentDamage;
     damage = currentDamage + increment;
-    newValue = property.total - damage;
+    newValue = prop.total - damage;
+    // Write the results
+    CreatureProperties.update(prop._id, {
+      $inc: { damage: increment, value: -increment },
+      $set: { dirty: true },
+    }, {
+      selector: prop
+    });
   }
 
-  // Write the results
-  CreatureProperties.update(property._id, {
-    $set: {damage, value: newValue, dirty: true}
-  }, {
-    selector: property
-  });
-  return damage;
+  applyTriggers(actionContext.triggers?.damageProperty?.after, prop, actionContext);
+
+  if (operation === 'set') {
+    return damage;
+  } else if (operation === 'increment') {
+    return increment;
+  }
 }
 
 export default damageProperty;
diff --git a/app/imports/api/creature/creatureProperties/methods/dealDamage.js b/app/imports/api/creature/creatureProperties/methods/dealDamage.js
deleted file mode 100644
index ddb3dcc1..00000000
--- a/app/imports/api/creature/creatureProperties/methods/dealDamage.js
+++ /dev/null
@@ -1,70 +0,0 @@
-import { ValidatedMethod } from 'meteor/mdg:validated-method';
-import { RateLimiterMixin } from 'ddp-rate-limiter-mixin';
-import SimpleSchema from 'simpl-schema';
-import CreatureProperties from '/imports/api/creature/creatureProperties/CreatureProperties.js';
-import Creatures from '/imports/api/creature/creatures/Creatures.js';
-import { assertEditPermission } from '/imports/api/sharing/sharingPermissions.js';
-import { damagePropertyWork } from '/imports/api/creature/creatureProperties/methods/damageProperty.js';
-
-const dealDamage = new ValidatedMethod({
-  name: 'creatureProperties.dealDamage',
-  validate: new SimpleSchema({
-    creatureId: SimpleSchema.RegEx.Id,
-    damageType: {
-      type: String,
-    },
-    amount: Number,
-  }).validator(),
-  mixins: [RateLimiterMixin],
-  rateLimit: {
-    numRequests: 20,
-    timeInterval: 5000,
-  },
-  run({creatureId, damageType, amount}) {
-    // permissions
-    let creature = Creatures.findOne(creatureId, {
-      fields: {
-        owner: 1,
-        readers: 1,
-        writers: 1,
-      },
-    });
-    assertEditPermission(creature, this.userId);
-
-    const totalDamage = dealDamageWork({creature, damageType, amount})
-    return totalDamage;
-  },
-});
-
-export function dealDamageWork({creature, damageType, amount}){
-  // Get all the health bars and do damage to them
-  let healthBars = CreatureProperties.find({
-    'ancestors.id': creature._id,
-    type: 'attribute',
-    attributeType:'healthBar',
-    removed: {$ne: true},
-    inactive: {$ne: true},
-  }, {
-    sort: {order: -1},
-  });
-  //let multiplier = creature.damageMultipliers[damageType];
-  //if (multiplier === undefined) multiplier = 1;
-  //let totalDamage = Math.floor(amount * multiplier);
-  const totalDamage = amount;
-  let damageLeft = totalDamage;
-  if (damageType === 'healing') damageLeft = -totalDamage;
-  let propertyIds = [];
-  healthBars.forEach(healthBar => {
-    if (damageLeft === 0) return;
-    let damageAdded = damagePropertyWork({
-      property: healthBar,
-      operation: 'increment',
-      value: damageLeft,
-    });
-    damageLeft -= damageAdded;
-    propertyIds.push(healthBar._id);
-  });
-  return totalDamage;
-}
-
-export default dealDamage;
diff --git a/app/imports/api/creature/creatureProperties/methods/index.js b/app/imports/api/creature/creatureProperties/methods/index.js
index 45a0e323..b71515e9 100644
--- a/app/imports/api/creature/creatureProperties/methods/index.js
+++ b/app/imports/api/creature/creatureProperties/methods/index.js
@@ -1,7 +1,5 @@
 import '/imports/api/creature/creatureProperties/methods/adjustQuantity.js';
-import '/imports/api/creature/creatureProperties/methods/damagePropertiesByName.js';
 import '/imports/api/creature/creatureProperties/methods/damageProperty.js';
-import '/imports/api/creature/creatureProperties/methods/dealDamage.js';
 import '/imports/api/creature/creatureProperties/methods/duplicateProperty.js';
 import '/imports/api/creature/creatureProperties/methods/equipItem.js';
 import '/imports/api/creature/creatureProperties/methods/insertProperty.js';
diff --git a/app/imports/api/creature/creatures/methods/restCreature.js b/app/imports/api/creature/creatures/methods/restCreature.js
index 6eafbbcc..7af25d1e 100644
--- a/app/imports/api/creature/creatures/methods/restCreature.js
+++ b/app/imports/api/creature/creatures/methods/restCreature.js
@@ -3,12 +3,9 @@ import { ValidatedMethod } from 'meteor/mdg:validated-method';
 import { RateLimiterMixin } from 'ddp-rate-limiter-mixin';
 import CreatureProperties from '/imports/api/creature/creatureProperties/CreatureProperties.js';
 import { assertEditPermission } from '/imports/api/creature/creatures/creaturePermissions.js';
-import { groupBy, remove, union } from 'lodash';
-import {
-  getCreature, getVariables, getPropertiesOfType
-} from '/imports/api/engine/loadCreatures.js';
-import { CreatureLogSchema, insertCreatureLogWork } from '/imports/api/creature/log/CreatureLogs.js';
-import { applyTrigger } from '/imports/api/engine/actions/applyTriggers.js';
+import { union } from 'lodash';
+import ActionContext from '/imports/api/engine/actions/ActionContext.js';
+import { applyTriggers } from '/imports/api/engine/actions/applyTriggers.js';
 
 const restCreature = new ValidatedMethod({
   name: 'creature.methods.rest',
@@ -27,59 +24,37 @@ const restCreature = new ValidatedMethod({
     numRequests: 5,
     timeInterval: 5000,
   },
-  run({creatureId, restType}) {
+  run({ creatureId, restType }) {
+    // Get action context
+    const actionContext = new ActionContext(creatureId, [creatureId], this);
     // Check permissions
-    let creature = getCreature(creatureId);
-    assertEditPermission(creature, this.userId);
+    assertEditPermission(actionContext.creature, this.userId);
 
-    // Add the variables to the creature document
-    const variables = getVariables(creatureId);
-    delete variables._id;
-    delete variables._creatureId;
-    creature.variables = variables;
-    const scope = creature.variables;
+    // Join, sort, and apply before triggers
+    const beforeTriggers = union(
+      actionContext.triggers.anyRest?.before, actionContext.triggers[restType]?.before
+    ).sort((a, b) => a.order - b.order);
+    applyTriggers(beforeTriggers, null, actionContext);
 
-    // Get the triggers
-    let triggers = getPropertiesOfType(creatureId, 'trigger');
-    remove(triggers, trigger =>
-      trigger.event !== 'anyRest' &&
-      trigger.event !== 'longRest' &&
-      trigger.event !== 'shortRest'
-    );
-    triggers = groupBy(triggers, 'event');
-    for (let type in triggers) {
-      triggers[type] = groupBy(triggers[type], 'timing')
-    }
-
-    // Create the log
-    const log = CreatureLogSchema.clean({
-      creatureId: creature._id,
-      creatureName: creature.name,
+    // Rest
+    actionContext.addLog({
+      name: restType === 'shortRest' ? 'Short rest' : 'Long rest',
     });
+    doRestWork(restType, actionContext);
 
-    const targets = [creature];
+    // Join, sort, and apply after triggers
+    const afterTriggers = union(
+      actionContext.triggers.anyRest?.after, actionContext.triggers[restType]?.after
+    ).sort((a, b) => a.order - b.order);
+    applyTriggers(afterTriggers, null, actionContext);
 
-    applyTriggers(triggers, restType, 'before', { creature, targets, scope, log });
-    doRestWork(creature, restType);
-    applyTriggers(triggers, restType, 'after', { creature, targets, scope, log });
-
-    insertCreatureLogWork({log, creature, method: this});
+    // Insert log
+    actionContext.writeLog();    
   },
 });
 
-function applyTriggers(triggers, restType, timing, opts) {
-  // Get matching triggers
-  let selectedTriggers = triggers[restType]?.[timing] || [];
-  // Get any rest triggers as well
-  selectedTriggers = union(selectedTriggers, triggers['anyRest']?.[timing]);
-  selectedTriggers.sort((a, b) => a.order - b.order);
-  // Apply the triggers
-  selectedTriggers.forEach(trigger => {
-    applyTrigger(trigger, opts)
-  });
-}
-
-function doRestWork(creature, restType) {
+function doRestWork(restType, actionContext) {
+  const creatureId = actionContext.creature._id;
   // Long rests reset short rest properties as well
   let resetFilter;
   if (restType === 'shortRest'){
@@ -89,7 +64,7 @@ function doRestWork(creature, restType) {
   }
   // Only apply to active properties
   let filter = {
-    'ancestors.id': creature._id,
+    'ancestors.id': creatureId,
     reset: resetFilter,
     removed: { $ne: true },
     inactive: { $ne: true },
@@ -123,7 +98,7 @@ function doRestWork(creature, restType) {
   // Reset half hit dice on a long rest, starting with the highest dice
   if (restType === 'longRest'){
     let hitDice = CreatureProperties.find({
-      'ancestors.id': creature._id,
+      'ancestors.id': creatureId,
       type: 'attribute',
       attributeType: 'hitDice',
       removed: {$ne: true},
@@ -144,7 +119,7 @@ function doRestWork(creature, restType) {
     hitDice.sort(compare);
     // Get the total number of hit dice that can be recovered this rest
     let totalHd = hitDice.reduce((sum, hd) => sum + (hd.value || 0), 0);
-    let resetMultiplier = creature.settings.hitDiceResetMultiplier || 0.5;
+    let resetMultiplier = actionContext.creature.settings.hitDiceResetMultiplier || 0.5;
     let recoverableHd = Math.max(Math.floor(totalHd*resetMultiplier), 1);
     // recover each hit dice in turn until the recoverable amount is used up
     let amountToRecover, resultingDamage;
diff --git a/app/imports/api/engine/actions/ActionContext.js b/app/imports/api/engine/actions/ActionContext.js
new file mode 100644
index 00000000..9c5e2e50
--- /dev/null
+++ b/app/imports/api/engine/actions/ActionContext.js
@@ -0,0 +1,78 @@
+import { CreatureLogSchema, insertCreatureLogWork } from '/imports/api/creature/log/CreatureLogs.js';
+import {
+  getCreature, getVariables, getPropertiesOfType
+} from '/imports/api/engine/loadCreatures.js';
+import { groupBy, remove } from 'lodash';
+
+export default class ActionContext{
+  constructor(creatureId, targetIds = [], method) {
+    // Get the creature
+    this.creature = getCreature(creatureId)
+
+    if (!this.creature) {
+      throw new Meteor.Error('No Creature', `No creature could be found with id: ${creatureId}`)
+    }
+    // Create a log
+    this.log = CreatureLogSchema.clean({
+      creatureId: creatureId,
+      creatureName: this.creature.name,
+    });
+
+    // Get the variables of the acting creature
+    this.creature.variables = getVariables(creatureId);
+    delete this.creature.variables._id;
+    delete this.creature.variables._creatureId;
+    // Alias as scope
+    this.scope = this.creature.variables;
+
+    // Get the targets and their variables
+    this.targets = [];
+    targetIds.forEach(targetId => {
+      let target;
+      if (targetId === creatureId) {
+        target = this.creature;
+      } else {
+        target = getCreature(targetId);
+        target.variables = getVariables(targetId);
+        delete target.variables._id;
+        delete target.variables._creatureId;
+      }
+      this.targets.push(target);
+    });
+
+    // Store a reference to the method for inserting the log
+    this.method = method;
+
+    // Get triggers
+    this.triggers = getPropertiesOfType(creatureId, 'trigger');
+    // Remove deleted or inactive triggers
+    remove(this.triggers, trigger => trigger.removed || trigger.inactive);
+    // Sort triggers by order
+    this.triggers.sort((a, b) => a.order - b.order);
+    // Group the triggers into triggers.<event>.<timing> or
+    // triggers.doActionProperty.<propertyType>.<timing>
+    this.triggers = groupBy(this.triggers, 'event');
+    for (let event in this.triggers) {
+      if (event === 'doActionProperty') {
+        this.triggers[event] = groupBy(this.triggers[event], 'actionPropertyType');
+        for (let propertyType in this.triggers[event]) {
+          this.triggers[event][propertyType] = groupBy(this.triggers[event][propertyType], 'timing');
+        }
+      } else {
+        this.triggers[event] = groupBy(this.triggers[event], 'timing');
+      }
+    }
+  }
+  addLog(content) {
+    if (content.name || content.value){
+      this.log.content.push(content);
+    }
+  }
+  writeLog() {
+    insertCreatureLogWork({
+      log: this.log,
+      creature: this.creature,
+      method: this.method,
+    });
+  }
+}
\ No newline at end of file
diff --git a/app/imports/api/engine/actions/applyProperty.js b/app/imports/api/engine/actions/applyProperty.js
index 5930a93d..2a8b3add 100644
--- a/app/imports/api/engine/actions/applyProperty.js
+++ b/app/imports/api/engine/actions/applyProperty.js
@@ -7,7 +7,7 @@ import note from './applyPropertyByType/applyNote.js';
 import roll from './applyPropertyByType/applyRoll.js';
 import savingThrow from './applyPropertyByType/applySavingThrow.js';
 import toggle from './applyPropertyByType/applyToggle.js';
-import applyTriggers from '/imports/api/engine/actions/applyTriggers.js';
+import { applyNodeTriggers } from '/imports/api/engine/actions/applyTriggers.js';
 
 const applyPropertyByType = {
   action,
@@ -22,9 +22,9 @@ const applyPropertyByType = {
   toggle,
 };
 
-export default function applyProperty(node, opts, ...rest) {
-  applyTriggers(node, opts, 'before');
-  opts.scope[`#${node.node.type}`] = node.node;
-  applyPropertyByType[node.node.type]?.(node, opts, ...rest);
-  applyTriggers(node, opts, 'after');
+export default function applyProperty(node, actionContext, ...rest) {
+  applyNodeTriggers(node, actionContext, 'before');
+  actionContext.scope[`#${node.node.type}`] = node.node;
+  applyPropertyByType[node.node.type]?.(node, actionContext, ...rest);
+  applyNodeTriggers(node, actionContext, 'after');
 }
diff --git a/app/imports/api/engine/actions/applyPropertyByType/applyAction.js b/app/imports/api/engine/actions/applyPropertyByType/applyAction.js
index 0366bf49..19481501 100644
--- a/app/imports/api/engine/actions/applyPropertyByType/applyAction.js
+++ b/app/imports/api/engine/actions/applyPropertyByType/applyAction.js
@@ -7,22 +7,21 @@ import { adjustQuantityWork } from '/imports/api/creature/creatureProperties/met
 import { damagePropertyWork } from '/imports/api/creature/creatureProperties/methods/damageProperty.js';
 import numberToSignedString from '/imports/ui/utility/numberToSignedString.js';
 
-export default function applyAction(node, {creature, targets, scope, log}){
+export default function applyAction(node, actionContext){
   const prop = node.node;
-  if (prop.target === 'self') targets = [creature];
+  let targets = actionContext.targets;
+  if (prop.target === 'self') targets = [actionContext.creature];
 
   // Log the name and summary
   let content = { name: prop.name };
   if (prop.summary?.text){
-    recalculateInlineCalculations(prop.summary, scope, log);
+    recalculateInlineCalculations(prop.summary, actionContext);
     content.value = prop.summary.value;
   }
-  if (content.name || content.value){
-    log.content.push(content);
-  }
+  actionContext.addLog(content);
 
   // Spend the resources
-  const failed = spendResources({prop, log, scope});
+  const failed = spendResources(prop, actionContext);
   if (failed) return;
 
   const attack = prop.attackRoll || prop.attackRollBonus;
@@ -31,28 +30,29 @@ export default function applyAction(node, {creature, targets, scope, log}){
   if (attack && attack.calculation){
     if (targets.length){
       targets.forEach(target => {
-        applyAttackToTarget({attack, target, scope, log});
+        applyAttackToTarget({attack, target, actionContext});
         // Apply the children, but only to the current target
-        applyChildren(node, {creature, targets: [target], scope, log});
+        actionContext.targets = [target];
+        applyChildren(node, actionContext);
       });
     } else {
-      applyAttackWithoutTarget({attack, scope, log});
-      applyChildren(node, {creature, targets, scope, log});
+      applyAttackWithoutTarget({attack, actionContext});
+      applyChildren(node, actionContext);
     }
   } else {
-    applyChildren(node, {creature, targets, scope, log});
+    applyChildren(node, actionContext);
   }
 }
 
-function applyAttackWithoutTarget({attack, scope, log}){
-  delete scope['$attackHit'];
-  delete scope['$attackMiss'];
-  delete scope['$criticalHit'];
-  delete scope['$criticalMiss'];
-  delete scope['$attackRoll'];
-
-  recalculateCalculation(attack, scope, log);
+function applyAttackWithoutTarget({attack, actionContext}){
+  delete actionContext.scope['$attackHit'];
+  delete actionContext.scope['$attackMiss'];
+  delete actionContext.scope['$criticalHit'];
+  delete actionContext.scope['$criticalMiss'];
+  delete actionContext.scope['$attackRoll'];
 
+  recalculateCalculation(attack, actionContext);
+  const scope = actionContext.scope;
   let {
     resultPrefix,
     result,
@@ -72,14 +72,15 @@ function applyAttackWithoutTarget({attack, scope, log}){
     scope['$attackMiss'] = {value: true};
   }
 
-  log.content.push({
+  actionContext.addLog({
     name,
     value: `${resultPrefix}\n**${result}**`,
     inline: true,
   });
 }
 
-function applyAttackToTarget({attack, target, scope, log}){
+function applyAttackToTarget({attack, target, actionContext}){
+  const scope = actionContext.scope;
   delete scope['$attackHit'];
   delete scope['$attackMiss'];
   delete scope['$criticalHit'];
@@ -87,7 +88,7 @@ function applyAttackToTarget({attack, target, scope, log}){
   delete scope['$attackDiceRoll'];
   delete scope['$attackRoll'];
 
-  recalculateCalculation(attack, scope, log);
+  recalculateCalculation(attack, actionContext);
 
   let {
     resultPrefix,
@@ -108,7 +109,7 @@ function applyAttackToTarget({attack, target, scope, log}){
       name += ' (Disadvantage)';
     }
 
-    log.content.push({
+    actionContext.addLog({
       name,
       value: `${resultPrefix}\n**${result}**`,
       inline: true,
@@ -119,11 +120,11 @@ function applyAttackToTarget({attack, target, scope, log}){
       scope['$attackHit'] = {value: true};
     }
   } else {
-    log.content.push({
+    actionContext.addLog({
       name: 'Error',
       value:'Target has no `armor`',
     });
-    log.content.push({
+    actionContext.addLog({
       name: criticalHit ? 'Critical Hit!' : criticalMiss ? 'Critical Miss!' : 'To Hit',
       value: `${resultPrefix}\n**${result}**`,
       inline: true,
@@ -177,14 +178,14 @@ function applyCrits(value, scope){
   return {criticalHit, criticalMiss};
 }
 
-function applyChildren(node, args){
-  node.children.forEach(child => applyProperty(child, args));
+function applyChildren(node, actionContext){
+  node.children.forEach(child => applyProperty(child, actionContext));
 }
 
-function spendResources({prop, log, scope}){
+function spendResources(prop, actionContext){
   // Check Uses
   if (prop.usesLeft <= 0){
-    log.content.push({
+    actionContext.addLog({
       name: 'Error',
       value: `${prop.name || 'action'} does not have enough uses left`,
     });
@@ -192,7 +193,7 @@ function spendResources({prop, log, scope}){
   }
   // Resources
   if (prop.insufficientResources){
-    log.content.push({
+    actionContext.addLog({
       name: 'Error',
       value: 'This creature doesn\'t have sufficient resources to perform this action',
     });
@@ -204,7 +205,7 @@ function spendResources({prop, log, scope}){
   let gainLog = [];
   try {
     prop.resources.itemsConsumed.forEach(itemConsumed => {
-      recalculateCalculation(itemConsumed.quantity, scope, log);
+      recalculateCalculation(itemConsumed.quantity, actionContext);
       if (!itemConsumed.itemId){
         throw 'No ammo was selected for this prop';
       }
@@ -235,7 +236,7 @@ function spendResources({prop, log, scope}){
       }
     });
   } catch (e){
-    log.content.push({
+    actionContext.addLog({
       name: 'Error',
       value: e,
     });
@@ -253,7 +254,7 @@ function spendResources({prop, log, scope}){
     }, {
       selector: prop
     });
-    log.content.push({
+    actionContext.addLog({
       name: 'Uses left',
       value: prop.usesLeft - 1,
       inline: true,
@@ -262,18 +263,19 @@ function spendResources({prop, log, scope}){
 
   // Damage stats
   prop.resources.attributesConsumed.forEach(attConsumed => {
-    recalculateCalculation(attConsumed.quantity, scope, log);
+    recalculateCalculation(attConsumed.quantity, actionContext);
 
     if (!attConsumed.quantity?.value) return;
-    let stat = scope[attConsumed.variableName];
+    let stat = actionContext.scope[attConsumed.variableName];
     if (!stat){
       spendLog.push(stat.name + ': ' + ' not found');
       return;
     }
     damagePropertyWork({
-      property: stat,
+      prop: stat,
       operation: 'increment',
       value: attConsumed.quantity.value,
+      actionContext,
     });
     if (attConsumed.quantity.value > 0){
       spendLog.push(stat.name + ': ' + attConsumed.quantity.value);
@@ -283,12 +285,12 @@ function spendResources({prop, log, scope}){
   });
 
   // Log all the spending
-  if (gainLog.length) log.content.push({
+  if (gainLog.length) actionContext.addLog({
     name: 'Gained',
     value: gainLog.join('\n'),
     inline: true,
   });
-  if (spendLog.length) log.content.push({
+  if (spendLog.length) actionContext.addLog({
     name: 'Spent',
     value: spendLog.join('\n'),
     inline: true,
diff --git a/app/imports/api/engine/actions/applyPropertyByType/applyAdjustment.js b/app/imports/api/engine/actions/applyPropertyByType/applyAdjustment.js
index b920283b..525f980c 100644
--- a/app/imports/api/engine/actions/applyPropertyByType/applyAdjustment.js
+++ b/app/imports/api/engine/actions/applyPropertyByType/applyAdjustment.js
@@ -2,40 +2,39 @@ import applyProperty from '../applyProperty.js';
 import recalculateCalculation from './shared/recalculateCalculation.js';
 import { damagePropertyWork } from '/imports/api/creature/creatureProperties/methods/damageProperty.js';
 
-export default function applyAdjustment(node, {
-  creature, targets, scope, log
-}){
+export default function applyAdjustment(node, actionContext){
   const prop = node.node;
-  const damageTargets = prop.target === 'self' ? [creature] : targets;
+  const damageTargets = prop.target === 'self' ? [actionContext.creature] : actionContext.targets;
 
   if (!prop.amount) {
-    return applyChildren(node, {creature, targets, scope, log});
+    return applyChildren(node, actionContext);
   }
 
   // Evaluate the amount
-  recalculateCalculation(prop.amount, scope, log);
+  recalculateCalculation(prop.amount, actionContext);
 
   const value = +prop.amount.value;
   if (!isFinite(value)) {
-    return applyChildren(node, {creature, targets, scope, log});
+    return applyChildren(node, actionContext);
   }
 
   if (damageTargets?.length) {
     damageTargets.forEach(target => {
       let stat = target.variables[prop.stat];
       if (!stat?.type) {
-        log.content.push({
+        actionContext.addLog({
           name: 'Error',
           value: `Could not apply attribute damage, creature does not have \`${prop.stat}\` set`
         });
-        return applyChildren(node, {creature, targets, scope, log});
+        return applyChildren(node, actionContext);
       }
       damagePropertyWork({
-        property: stat,
+        prop: stat,
         operation: prop.operation,
-        value: value,
+        value,
+        actionContext,
       });
-      log.content.push({
+      actionContext.addLog({
         name: 'Attribute damage',
         value: `${prop.stat}${prop.operation === 'set' ? ' set to' : ''}` +
         ` ${value}`,
@@ -43,7 +42,7 @@ export default function applyAdjustment(node, {
       });
     });
   } else {
-    log.content.push({
+    actionContext.addLog({
       name: 'Attribute damage',
       value: `${prop.stat}${prop.operation === 'set' ? ' set to' : ''}` +
       ` ${value}`,
@@ -51,9 +50,9 @@ export default function applyAdjustment(node, {
     });
   }
 
-  return applyChildren(node, {creature, targets, scope, log});
+  return applyChildren(node, actionContext);
 }
 
-function applyChildren(node, args){
-  node.children.forEach(child => applyProperty(child, args));
+function applyChildren(node, actionContext){
+  node.children.forEach(child => applyProperty(child, actionContext));
 }
diff --git a/app/imports/api/engine/actions/applyPropertyByType/applyBranch.js b/app/imports/api/engine/actions/applyPropertyByType/applyBranch.js
index 6a46e07c..6e0ddd06 100644
--- a/app/imports/api/engine/actions/applyPropertyByType/applyBranch.js
+++ b/app/imports/api/engine/actions/applyPropertyByType/applyBranch.js
@@ -2,25 +2,23 @@ import applyProperty from '../applyProperty.js';
 import recalculateCalculation from './shared/recalculateCalculation.js';
 import rollDice from '/imports/parser/rollDice.js';
 
-export default function applyBranch(node, {
-  creature, targets, scope, log
-}){
+export default function applyBranch(node, actionContext){
   const applyChildren = function(){
-    node.children.forEach(child => applyProperty(child, {
-      creature, targets, scope, log
-    }));
+    node.children.forEach(child => applyProperty(child, actionContext));
   };
+  const scope = actionContext.scope;
+  const targets = actionContext.targets;
   const prop = node.node;
   switch(prop.branchType){
     case 'if':
-      recalculateCalculation(prop.condition, scope, log);
+      recalculateCalculation(prop.condition, actionContext);
       if (prop.condition?.value) applyChildren();
       break;
     case 'index':
       if (node.children.length){
-        recalculateCalculation(prop.condition, scope, log);
+        recalculateCalculation(prop.condition, actionContext);
         if (!isFinite(prop.condition?.value)) {
-          log.content.push({
+          actionContext.addLog({
             name: 'Branch Error',
             value: 'Index did not resolve into a valid number'
           });
@@ -29,49 +27,44 @@ export default function applyBranch(node, {
         let index = Math.floor(prop.condition?.value);
         if (index < 1) index = 1;
         if (index > node.children.length) index = node.children.length;
-        applyProperty(node.children[index - 1], {
-          creature, targets, scope, log
-        });
+        applyProperty(node.children[index - 1], actionContext);
       }
       break;
     case 'hit':
       if (scope['$attackHit']?.value){
-        if (!targets.length) log.content.push({value: '**On hit**'});
+        if (!targets.length) actionContext.addLog({value: '**On hit**'});
         applyChildren();
       }
       break;
     case 'miss':
       if (scope['$attackMiss']?.value){
-        if (!targets.length) log.content.push({value: '**On miss**'});
+        if (!targets.length) actionContext.addLog({value: '**On miss**'});
         applyChildren();
       }
       break;
     case 'failedSave':
       if (scope['$saveFailed']?.value){
-        if (!targets.length) log.content.push({value: '**On failed save**'});
+        if (!targets.length) actionContext.addLog({value: '**On failed save**'});
         applyChildren();
       }
       break;
     case 'successfulSave':
       if (scope['$saveSucceeded']?.value){
-        if (!targets.length) log.content.push({value: '**On save**',});
+        if (!targets.length) actionContext.addLog({value: '**On save**',});
         applyChildren();
       }
       break;
     case 'random':
       if (node.children.length){
         let index = rollDice(1, node.children.length)[0] - 1;
-        applyProperty(node.children[index], {
-          creature, targets, scope, log
-        });
+        applyProperty(node.children[index], actionContext);
       }
       break;
     case 'eachTarget':
       if (targets.length){
         targets.forEach(target => {
-          node.children.forEach(child => applyProperty(child, {
-            creature, targets: [target], scope, log
-          }));
+          actionContext.targets = [target]
+          node.children.forEach(child => applyProperty(child, actionContext));
         });
       } else {
         applyChildren();
diff --git a/app/imports/api/engine/actions/applyPropertyByType/applyBuff.js b/app/imports/api/engine/actions/applyPropertyByType/applyBuff.js
index 66857f6c..f36d5ae5 100644
--- a/app/imports/api/engine/actions/applyPropertyByType/applyBuff.js
+++ b/app/imports/api/engine/actions/applyPropertyByType/applyBuff.js
@@ -13,9 +13,9 @@ import logErrors from './shared/logErrors.js';
 import { insertCreatureLog } from '/imports/api/creature/log/CreatureLogs.js';
 import cyrb53 from '/imports/api/engine/computation/utility/cyrb53.js';
 
-export default function applyBuff(node, {creature, targets, scope, log}){
+export default function applyBuff(node, actionContext){
   const prop = node.node;
-  let buffTargets = prop.target === 'self' ? [creature] : targets;
+  let buffTargets = prop.target === 'self' ? [actionContext.creature] : actionContext.targets;
 
   // Then copy the decendants of the buff to the targets
   let propList = [prop];
@@ -26,7 +26,7 @@ export default function applyBuff(node, {creature, targets, scope, log}){
     });
   }
   addChildrenToPropList(node.children);
-  crystalizeVariables({propList, scope, log});
+  crystalizeVariables({propList, actionContext});
 
   let oldParent = {
     id: prop.parent.id,
@@ -38,9 +38,9 @@ export default function applyBuff(node, {creature, targets, scope, log}){
 
     //Log the buff
     if (prop.name || prop.description?.value){
-      if (target._id === creature._id){
+      if (target._id === actionContext.creature._id){
         // Targeting self
-        log.content.push({
+        actionContext.addLog({
           name: prop.name,
           value: prop.description?.value,
         });
@@ -83,7 +83,7 @@ function copyNodeListToTarget(propList, target, oldParent){
  * Replaces all variables with their resolved values
  * except variables of the form `$target.thing.total` become `thing.total`
  */
-function crystalizeVariables({propList, scope, log}){
+function crystalizeVariables({propList, actionContext}){
   propList.forEach(prop => {
     computedSchemas[prop.type].computedFields().forEach( calcKey => {
       applyFnToKey(prop, calcKey, (prop, key) => {
@@ -104,7 +104,7 @@ function crystalizeVariables({propList, scope, log}){
               }
             } else {
               // Can't strip symbols
-              log.content.push({
+              actionContext.addLog({
                 name: 'Error',
                 value: 'Variable `$target` should not be used without a property: $target.property',
               });
@@ -112,8 +112,8 @@ function crystalizeVariables({propList, scope, log}){
             return node;
           } else {
             // Resolve all other variables
-            const {result, context} = resolve('reduce', node, scope);
-            logErrors(context.errors, log);
+            const {result, context} = resolve('reduce', node, actionContext.scope);
+            logErrors(context.errors, actionContext);
             return result;
           }
         });
diff --git a/app/imports/api/engine/actions/applyPropertyByType/applyDamage.js b/app/imports/api/engine/actions/applyPropertyByType/applyDamage.js
index f8b6eb8b..4d9145b3 100644
--- a/app/imports/api/engine/actions/applyPropertyByType/applyDamage.js
+++ b/app/imports/api/engine/actions/applyPropertyByType/applyDamage.js
@@ -1,27 +1,27 @@
-import { some, intersection, difference } from 'lodash';
+import { some, intersection, difference, remove } from 'lodash';
 import applyProperty from '../applyProperty.js';
-import { dealDamageWork } from '/imports/api/creature/creatureProperties/methods/dealDamage.js';
 import {insertCreatureLog} from '/imports/api/creature/log/CreatureLogs.js';
 import resolve, { Context, toString } from '/imports/parser/resolve.js';
 import logErrors from './shared/logErrors.js';
 import applyEffectsToCalculationParseNode from '/imports/api/engine/actions/applyPropertyByType/shared/applyEffectsToCalculationParseNode.js';
+import { damagePropertyWork } from '/imports/api/creature/creatureProperties/methods/damageProperty.js';
+import {
+  getPropertiesOfType
+} from '/imports/api/engine/loadCreatures.js';
 
-export default function applyDamage(node, {
-  creature, targets, scope, log
-}){
+export default function applyDamage(node, actionContext){
   const applyChildren = function(){
-    node.children.forEach(child => applyProperty(child, {
-      creature, targets, scope, log
-    }));
+    node.children.forEach(child => applyProperty(child, actionContext));
   };
 
   const prop = node.node;
+  const scope = actionContext.scope;
 
   // Skip if there is no parse node to work with
   if (!prop.amount?.parseNode) return;
 
   // Choose target
-  let damageTargets = prop.target === 'self' ? [creature] : targets;
+  let damageTargets = prop.target === 'self' ? [actionContext.creature] : actionContext.targets;
   // Determine if the hit is critical
   let criticalHit = scope['$criticalHit']?.value &&
     prop.damageType !== 'healing' // Can't critically heal
@@ -36,19 +36,19 @@ export default function applyDamage(node, {
   const logName = prop.damageType === 'healing' ? 'Healing' : 'Damage';
 
   // roll the dice only and store that string
-  applyEffectsToCalculationParseNode(prop.amount, log);
+  applyEffectsToCalculationParseNode(prop.amount, actionContext.log);
   const {result: rolled} = resolve('roll', prop.amount.parseNode, scope, context);
   if (rolled.parseType !== 'constant'){
     logValue.push(toString(rolled));
   }
-  logErrors(context.errors, log);
+  logErrors(context.errors, actionContext);
 
   // Reset the errors so we don't log the same errors twice
   context.errors = [];
 
   // Resolve the roll to a final value
   const {result: reduced} = resolve('reduce', rolled, scope, context);
-  logErrors(context.errors, log);
+  logErrors(context.errors, actionContext);
 
   // Store the result
   if (reduced.parseType === 'constant'){
@@ -94,15 +94,17 @@ export default function applyDamage(node, {
         logValue
       });
 
+      actionContext.target = [target];
       // Deal the damage to the target
-      let damageDealt = dealDamageWork({
-        creature: target,
+      let damageDealt = dealDamage({
+        target,
         damageType: prop.damageType,
         amount: damage,
+        actionContext
       });
 
       // Log the damage done
-      if (target._id === creature._id){
+      if (target._id === actionContext.creature._id){
         // Target is same as self, log damage as such
         logValue.push(`**${damageDealt}** ${suffix}  to self`);
       } else {
@@ -123,7 +125,7 @@ export default function applyDamage(node, {
     // There are no targets, just log the result
     logValue.push(`**${damage}** ${suffix}`);
   }
-  log.content.push({
+  actionContext.addLog({
     name: logName,
     value: logValue.join('\n'),
     inline: true,
@@ -178,3 +180,49 @@ function multiplierAppliesTo(damageProp){
     return hasRequiredTags && hasNoExcludedTags;
   }
 }
+
+function dealDamage({target, damageType, amount, actionContext}){
+  // Get all the health bars and do damage to them
+  let healthBars = getPropertiesOfType(target._id, 'attribute');
+
+  // Keep only the healthbars that can take damage/healing
+  remove(healthBars, (bar) =>
+    bar.attributeType !== 'healthBar' ||
+    bar.inactive ||
+    bar.removed ||
+    bar.overridden ||
+    (amount >= 0 && bar.healthBarNoDamage) ||
+    (amount < 0 && bar.healthBarNoHealing)
+  );
+
+  // Sort healthbars by damage/healing order or tree order as a fallback
+  healthBars.sort((a, b) => {
+    let diff;
+    if (amount >= 0) {
+      diff = a.healthBarDamageOrder - b.healthBarDamageOrder;
+    } else {
+      diff = a.healthBarHealingOrder - b.healthBarHealingOrder;
+    }
+    if (Number.isFinite(diff)) {
+      return diff;
+    } else {
+      return a.order - b.order;
+    }
+  });
+
+  // Deal the damage to each healthbar in order until all damage is done
+  const totalDamage = amount;
+  let damageLeft = totalDamage;
+  if (damageType === 'healing') damageLeft = -totalDamage;
+  healthBars.forEach(healthBar => {
+    if (damageLeft === 0) return;
+    let damageAdded = damagePropertyWork({
+      prop: healthBar,
+      operation: 'increment',
+      value: damageLeft,
+      actionContext
+    });
+    damageLeft -= damageAdded;
+  });
+  return totalDamage;
+}
diff --git a/app/imports/api/engine/actions/applyPropertyByType/applyNote.js b/app/imports/api/engine/actions/applyPropertyByType/applyNote.js
index 2d460ee2..b1b5e37a 100644
--- a/app/imports/api/engine/actions/applyPropertyByType/applyNote.js
+++ b/app/imports/api/engine/actions/applyPropertyByType/applyNote.js
@@ -1,25 +1,23 @@
 import recalculateInlineCalculations from './shared/recalculateInlineCalculations.js';
 import applyProperty from '../applyProperty.js';
 
-export default function applyNote(node, {creature, targets, scope, log}){
+export default function applyNote(node, actionContext){
   const prop = node.node;
 
   // Log Name, summary
   let content = { name: prop.name };
   if (prop.summary?.text){
-    recalculateInlineCalculations(prop.summary, scope, log);
+    recalculateInlineCalculations(prop.summary, actionContext);
     content.value = prop.summary.value;
   }
   if (content.name || content.value){
-    log.content.push(content);
+    actionContext.addLog(content);
   }
   // Log description
   if (prop.description?.text){
-    recalculateInlineCalculations(prop.description, scope, log);
-    log.content.push({value: prop.description.value});
+    recalculateInlineCalculations(prop.description, actionContext);
+    actionContext.addLog({value: prop.description.value});
   }
   // Apply children
-  node.children.forEach(child => applyProperty(child, {
-    creature, targets, scope, log
-  }));
+  node.children.forEach(child => applyProperty(child, actionContext));
 }
diff --git a/app/imports/api/engine/actions/applyPropertyByType/applyRoll.js b/app/imports/api/engine/actions/applyPropertyByType/applyRoll.js
index 8d923e4e..194c52a2 100644
--- a/app/imports/api/engine/actions/applyPropertyByType/applyRoll.js
+++ b/app/imports/api/engine/actions/applyPropertyByType/applyRoll.js
@@ -3,32 +3,30 @@ import logErrors from './shared/logErrors.js';
 import applyEffectsToCalculationParseNode from '/imports/api/engine/actions/applyPropertyByType/shared/applyEffectsToCalculationParseNode.js';
 import resolve, { toString } from '/imports/parser/resolve.js';
 
-export default function applyRoll(node, {creature, targets, scope, log}){
+export default function applyRoll(node, actionContext){
   const prop = node.node;
 
   const applyChildren = function(){
-    node.children.forEach(child => applyProperty(child, {
-      creature, targets, scope, log
-    }));
+    node.children.forEach(child => applyProperty(child, actionContext));
   };
 
   if (prop.roll?.calculation){
     const logValue = [];
 
     // roll the dice only and store that string
-    applyEffectsToCalculationParseNode(prop.roll, log);
-    const {result: rolled, context} = resolve('roll', prop.roll.parseNode, scope);
+    applyEffectsToCalculationParseNode(prop.roll, actionContext);
+    const {result: rolled, context} = resolve('roll', prop.roll.parseNode, actionContext.scope);
     if (rolled.parseType !== 'constant'){
       logValue.push(toString(rolled));
     }
-    logErrors(context.errors, log);
+    logErrors(context.errors, actionContext);
 
     // Reset the errors so we don't log the same errors twice
     context.errors = [];
 
     // Resolve the roll to a final value
-    const {result: reduced} = resolve('reduce', rolled, scope, context);
-    logErrors(context.errors, log);
+    const {result: reduced} = resolve('reduce', rolled, actionContext.scope, context);
+    logErrors(context.errors, actionContext);
 
     // Store the result
     if (reduced.parseType === 'constant'){
@@ -45,11 +43,11 @@ export default function applyRoll(node, {creature, targets, scope, log}){
     }
     const value = reduced.value;
 
-    scope[prop.variableName] = value;
+    actionContext.scope[prop.variableName] = value;
     logValue.push(`**${value}**`);
 
     if (!prop.silent){
-      log.content.push({
+      actionContext.addLog({
         name: prop.name,
         value: logValue.join('\n'),
         inline: true,
diff --git a/app/imports/api/engine/actions/applyPropertyByType/applySavingThrow.js b/app/imports/api/engine/actions/applyPropertyByType/applySavingThrow.js
index 503442ab..0fe34329 100644
--- a/app/imports/api/engine/actions/applyPropertyByType/applySavingThrow.js
+++ b/app/imports/api/engine/actions/applyPropertyByType/applySavingThrow.js
@@ -3,37 +3,34 @@ import recalculateCalculation from './shared/recalculateCalculation.js';
 import applyProperty from '../applyProperty.js';
 import numberToSignedString from '/imports/ui/utility/numberToSignedString.js';
 
-export default function applySavingThrow(node, {creature, targets, scope, log}){
+export default function applySavingThrow(node, actionContext){
   const prop = node.node;
 
-  let saveTargets = prop.target === 'self' ? [creature] : targets;
+  let saveTargets = prop.target === 'self' ? [actionContext.creature] : actionContext.targets;
 
-  recalculateCalculation(prop.dc, scope, log);
+  recalculateCalculation(prop.dc, actionContext);
 
   const dc = (prop.dc?.value);
   if (!isFinite(dc)){
-    log.content.push({
+    actionContext.addLog({
       name: 'Error',
       value: 'Saving throw requires a DC',
     });
-    return node.children.forEach(child => applyProperty(child, {
-      creature, targets, scope, log
-    }));
+    return node.children.forEach(child => applyProperty(child, actionContext));
   }
-  log.content.push({
+  actionContext.addLog({
     name: prop.name,
     value: `DC **${dc}**`,
     inline: true,
   });
+  const scope = actionContext.scope;
 
   // If there are no save targets, apply all children as if the save both
   // succeeeded and failed
   if (!saveTargets?.length){
     scope['$saveFailed'] = {value: true};
     scope['$saveSucceeded'] = {value: true};
-    return node.children.forEach(child => applyProperty(child, {
-      creature, targets, scope, log
-    }));
+    return node.children.forEach(child => applyProperty(child, actionContext));
   }
 
   // Each target makes the saving throw
@@ -43,16 +40,15 @@ export default function applySavingThrow(node, {creature, targets, scope, log}){
     delete scope['$saveDiceRoll'];
     delete scope['$saveRoll'];
 
-    const applyChildren = function(){
-      node.children.forEach(child => applyProperty(child, {
-        creature, targets: [target], scope, log
-      }));
+    const applyChildren = function () {
+      actionContext.targets = [target]
+      node.children.forEach(child => applyProperty(child, actionContext));
     };
 
     const save = target.variables[prop.stat];
 
     if (!save){
-      log.content.push({
+      actionContext.addLog({
         name: 'Saving throw error',
         value: 'No saving throw found: ' + prop.stat,
       });
@@ -94,7 +90,7 @@ export default function applySavingThrow(node, {creature, targets, scope, log}){
     } else {
       scope['$saveFailed'] = {value: true};
     }
-    log.content.push({
+    actionContext.addLog({
       name: saveSuccess ? 'Successful save' : 'Failed save',
       value: resultPrefix + '\n**' + result + '**',
       inline: true,
diff --git a/app/imports/api/engine/actions/applyPropertyByType/applyToggle.js b/app/imports/api/engine/actions/applyPropertyByType/applyToggle.js
index 5162c41f..16a97412 100644
--- a/app/imports/api/engine/actions/applyPropertyByType/applyToggle.js
+++ b/app/imports/api/engine/actions/applyPropertyByType/applyToggle.js
@@ -1,14 +1,10 @@
 import applyProperty from '../applyProperty.js';
 import recalculateCalculation from './shared/recalculateCalculation.js';
 
-export default function applyToggle(node, {
-  creature, targets, scope, log
-}){
+export default function applyToggle(node, actionContext){
   const prop = node.node;
-  recalculateCalculation(prop.condition, scope, log);
+  recalculateCalculation(prop.condition, actionContext);
   if (prop.condition?.value) {
-    return node.children.forEach(child => applyProperty(child, {
-      creature, targets, scope, log
-    }));
+    return node.children.forEach(child => applyProperty(child, actionContext));
   }
 }
diff --git a/app/imports/api/engine/actions/applyPropertyByType/shared/applyEffectsToCalculationParseNode.js b/app/imports/api/engine/actions/applyPropertyByType/shared/applyEffectsToCalculationParseNode.js
index be625eea..0ada4ea1 100644
--- a/app/imports/api/engine/actions/applyPropertyByType/shared/applyEffectsToCalculationParseNode.js
+++ b/app/imports/api/engine/actions/applyPropertyByType/shared/applyEffectsToCalculationParseNode.js
@@ -2,7 +2,7 @@ import operator from '/imports/parser/parseTree/operator.js';
 import { parse } from '/imports/parser/parser.js';
 import logErrors from './logErrors.js';
 
-export default function applyEffectsToCalculationParseNode(calcObj, log){
+export default function applyEffectsToCalculationParseNode(calcObj, actionContext){
   if (!calcObj.effects) return;
   calcObj.effects.forEach(effect => {
     if (effect.operation !== 'add') return;
@@ -18,7 +18,7 @@ export default function applyEffectsToCalculationParseNode(calcObj, log){
         fn: 'add'
       });
     } catch (e){
-      logErrors([e], log)
+      logErrors([e], actionContext)
     }
   });
 }
diff --git a/app/imports/api/engine/actions/applyPropertyByType/shared/logErrors.js b/app/imports/api/engine/actions/applyPropertyByType/shared/logErrors.js
index 219fddd5..9ea760e6 100644
--- a/app/imports/api/engine/actions/applyPropertyByType/shared/logErrors.js
+++ b/app/imports/api/engine/actions/applyPropertyByType/shared/logErrors.js
@@ -1,7 +1,7 @@
-export default function logErrors(errors, log){
+export default function logErrors(errors, actionContext){
   errors?.forEach(error => {
     if (error.type !== 'info'){
-      log.content.push({name: 'Error', value: error.message});
+      actionContext.addLog({name: 'Error', value: error.message});
     }
   });
 }
diff --git a/app/imports/api/engine/actions/applyPropertyByType/shared/recalculateCalculation.js b/app/imports/api/engine/actions/applyPropertyByType/shared/recalculateCalculation.js
index a10340be..53e98e2d 100644
--- a/app/imports/api/engine/actions/applyPropertyByType/shared/recalculateCalculation.js
+++ b/app/imports/api/engine/actions/applyPropertyByType/shared/recalculateCalculation.js
@@ -2,10 +2,10 @@ import evaluateCalculation from '/imports/api/engine/computation/utility/evaluat
 import applyEffectsToCalculationParseNode from '/imports/api/engine/actions/applyPropertyByType/shared/applyEffectsToCalculationParseNode.js';
 import logErrors from './logErrors.js';
 
-export default function recalculateCalculation(calc, scope, log, context){
+export default function recalculateCalculation(calc, actionContext, context){
   if (!calc?.parseNode) return;
   calc._parseLevel = 'reduce';
-  applyEffectsToCalculationParseNode(calc, log);
-  evaluateCalculation(calc, scope, context);
-  logErrors(calc.errors, log);
+  applyEffectsToCalculationParseNode(calc, actionContext.log);
+  evaluateCalculation(calc, actionContext.scope, context);
+  logErrors(calc.errors, actionContext.log);
 }
diff --git a/app/imports/api/engine/actions/applyPropertyByType/shared/recalculateInlineCalculations.js b/app/imports/api/engine/actions/applyPropertyByType/shared/recalculateInlineCalculations.js
index e4b49be0..1a2b1cb7 100644
--- a/app/imports/api/engine/actions/applyPropertyByType/shared/recalculateInlineCalculations.js
+++ b/app/imports/api/engine/actions/applyPropertyByType/shared/recalculateInlineCalculations.js
@@ -1,12 +1,12 @@
 import embedInlineCalculations from '/imports/api/engine/computation/utility/embedInlineCalculations.js';
 import recalculateCalculation from './recalculateCalculation.js'
 
-export default function recalculateInlineCalculations(inlineCalcObj, scope, log){
+export default function recalculateInlineCalculations(inlineCalcObj, actionContext){
   // Skip if there are no calculations
   if (!inlineCalcObj?.inlineCalculations?.length) return;
   // Recalculate each calculation with the current scope
   inlineCalcObj.inlineCalculations.forEach(calc => {
-    recalculateCalculation(calc, scope, log);
+    recalculateCalculation(calc, actionContext);
   });
   // Embed the new calculated values
   embedInlineCalculations(inlineCalcObj);
diff --git a/app/imports/api/engine/actions/applyTriggers.js b/app/imports/api/engine/actions/applyTriggers.js
index d0863ed4..f8346163 100644
--- a/app/imports/api/engine/actions/applyTriggers.js
+++ b/app/imports/api/engine/actions/applyTriggers.js
@@ -6,20 +6,28 @@ import applyProperty from '/imports/api/engine/actions/applyProperty.js';
 import { difference, intersection } from 'lodash';
 import getEffectivePropTags from '/imports/api/engine/computation/utility/getEffectivePropTags.js';
 
-export default function applyTriggers(node, { creature, targets, scope, log }, timing) {
+export function applyNodeTriggers(node, timing, actionContext) {
   const prop = node.node;
   const type = prop.type;
-  if (creature.triggers?.[type]?.[timing]) {
-    creature.triggers[type][timing].forEach(trigger => {
-      applyTrigger(trigger, { creature, prop, targets, scope, log });
+  const triggers = actionContext.triggers?.doActionProperty?.[type]?.[timing];
+  if (triggers) {
+    triggers.forEach(trigger => {
+      applyTrigger(trigger, prop, actionContext);
     });
   }
 }
 
-export function applyTrigger(trigger, { creature, prop, targets, scope, log }) {
+export function applyTriggers(triggers = [], prop, actionContext) {
+  // Apply the triggers
+  triggers.forEach(trigger => {
+    applyTrigger(trigger, prop, actionContext)
+  });
+}
+
+export function applyTrigger(trigger, prop, actionContext) {
   // If there is a prop we are applying the trigger from,
   // don't fire if the tags don't match
-  if (!triggerMatchTags(trigger, prop)) {
+  if (prop && !triggerMatchTags(trigger, prop)) {
     return;
   }
 
@@ -30,7 +38,7 @@ export function applyTrigger(trigger, { creature, prop, targets, scope, log }) {
   
   // Prevent triggers from firing if their condition is false
   if (trigger.condition?.parseNode) {
-    recalculateCalculation(trigger.condition, scope, log);
+    recalculateCalculation(trigger.condition, actionContext);
     if (!trigger.condition.value) return;
   }
 
@@ -54,22 +62,17 @@ export function applyTrigger(trigger, { creature, prop, targets, scope, log }) {
     inline: false,
   }
   if (trigger.summary?.text){
-    recalculateInlineCalculations(trigger.summary, scope, log);
+    recalculateInlineCalculations(trigger.summary, actionContext);
     content.value = trigger.summary.value;
   }
-  log.content.push(content);
+  actionContext.addLog(content);
 
   // Get all the trigger's properties and apply them
-  const properties = getPropertyDecendants(creature._id, trigger._id);
+  const properties = getPropertyDecendants(actionContext.creature._id, trigger._id);
   properties.sort((a, b) => a.order - b.order);
   const propertyForest = nodeArrayToTree(properties);
   propertyForest.forEach(node => {
-    applyProperty(node, {
-      creature,
-      targets,
-      scope,
-      log,
-    });
+    applyProperty(node, actionContext);
   });
 
   trigger.firing = false;
diff --git a/app/imports/api/engine/actions/doAction.js b/app/imports/api/engine/actions/doAction.js
index 271e2ba8..51934483 100644
--- a/app/imports/api/engine/actions/doAction.js
+++ b/app/imports/api/engine/actions/doAction.js
@@ -1,16 +1,15 @@
 import SimpleSchema from 'simpl-schema';
 import { ValidatedMethod } from 'meteor/mdg:validated-method';
 import { RateLimiterMixin } from 'ddp-rate-limiter-mixin';
-import { CreatureLogSchema, insertCreatureLogWork } from '/imports/api/creature/log/CreatureLogs.js';
 import { assertEditPermission } from '/imports/api/creature/creatures/creaturePermissions.js';
 import { nodeArrayToTree } from '/imports/api/parenting/nodesToTree.js';
 import {
-  getCreature, getVariables, getProperyAncestors, getPropertyDecendants, getPropertiesOfType
+  getProperyAncestors, getPropertyDecendants
 } from '/imports/api/engine/loadCreatures.js';
 import Creatures from '/imports/api/creature/creatures/Creatures.js';
 import CreatureProperties from '/imports/api/creature/creatureProperties/CreatureProperties.js';
 import applyProperty from './applyProperty.js';
-import { groupBy, remove } from 'lodash';
+import ActionContext from '/imports/api/engine/actions/ActionContext.js';
 
 const doAction = new ValidatedMethod({
   name: 'creatureProperties.doAction',
@@ -37,32 +36,16 @@ const doAction = new ValidatedMethod({
     numRequests: 10,
     timeInterval: 5000,
   },
-  run({actionId, targetIds = [], scope}) {
+  run({ actionId, targetIds = [], scope }) {
+    // Get action context
     let action = CreatureProperties.findOne(actionId);
-		// Check permissions
     const creatureId = action.ancestors[0].id;
-    let creature = getCreature(action.ancestors[0].id);
-    assertEditPermission(creature, this.userId);
-
-    // Add the variables to the creature document
-    const variables = getVariables(creatureId);
-    delete variables._id;
-    delete variables._creatureId;
-    creature.variables = variables;
-
-    // Get all the targets and make sure we can edit them
-    let targets = [];
-    targetIds.forEach(targetId => {
-      let target = getCreature(targetId);
+    const actionContext = new ActionContext(creatureId, targetIds, this);
+    
+		// Check permissions
+    assertEditPermission(actionContext.creature, this.userId);
+    actionContext.targets.forEach(target => {
       assertEditPermission(target, this.userId);
-
-      // add the variables to the target documents
-      const variables = getVariables(creatureId);
-      delete variables._id;
-      delete variables._creatureId;
-      target.variables = variables;
-
-      targets.push(target);
     });
 
     const ancestors = getProperyAncestors(creatureId, action._id);
@@ -73,11 +56,11 @@ const doAction = new ValidatedMethod({
     properties.sort((a, b) => a.order - b.order);
 
     // Do the action
-    doActionWork({creature, targets, properties, ancestors, method: this, methodScope: scope});
+    doActionWork({properties, ancestors, actionContext, methodScope: scope});
 
     // Recompute all involved creatures
     Creatures.update({
-      _id: { $in: [creature._id, ...targetIds] }
+      _id: { $in: [creatureId, ...targetIds] }
     }, {
       $set: {dirty: true},
     });
@@ -87,7 +70,7 @@ const doAction = new ValidatedMethod({
 export default doAction;
 
 export function doActionWork({
-  creature, targets, properties, ancestors, method, methodScope = {}, log
+  properties, ancestors, actionContext, methodScope = {},
 }){
   // get the docs
   const ancestorScope = getAncestorScope(ancestors);
@@ -96,38 +79,15 @@ export function doActionWork({
     throw new Meteor.Error(`The action has ${propertyForest.length} top level properties, expected 1`);
   }
 
-  // Get the triggers
-  const triggers = getPropertiesOfType(creature._id, 'trigger');
-  // 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');
-  for (let type in creature.triggers) {
-    creature.triggers[type] = groupBy(creature.triggers[type], 'timing')
-  }
-
-  // Create the log
-  if (!log) log = CreatureLogSchema.clean({
-    creatureId: creature._id,
-    creatureName: creature.name,
-  });
+  // Include the ancestry and method scope in the context scope
+  Object.assign(actionContext.scope, ancestorScope, methodScope);
 
   // Apply the top level property, it is responsible for applying its children
   // recursively
-  const scope = {
-    ...creature.variables,
-    ...ancestorScope,
-    ...methodScope
-  }
-  applyProperty(propertyForest[0], {
-    creature,
-    targets,
-    scope,
-    log,
-  });
+  applyProperty(propertyForest[0], actionContext);
 
   // Insert the log
-  insertCreatureLogWork({log, creature, method});
+  actionContext.writeLog();
 }
 
 // Assumes ancestors are in tree order already
diff --git a/app/imports/api/engine/actions/doCastSpell.js b/app/imports/api/engine/actions/doCastSpell.js
index e403e271..95169e90 100644
--- a/app/imports/api/engine/actions/doCastSpell.js
+++ b/app/imports/api/engine/actions/doCastSpell.js
@@ -1,13 +1,16 @@
 import SimpleSchema from 'simpl-schema';
 import { ValidatedMethod } from 'meteor/mdg:validated-method';
 import { RateLimiterMixin } from 'ddp-rate-limiter-mixin';
-import getRootCreatureAncestor from '/imports/api/creature/creatureProperties/getRootCreatureAncestor.js';
 import Creatures from '/imports/api/creature/creatures/Creatures.js';
+import {
+  getProperyAncestors, getPropertyDecendants
+} from '/imports/api/engine/loadCreatures.js';
 import CreatureProperties from '/imports/api/creature/creatureProperties/CreatureProperties.js';
 import { assertEditPermission } from '/imports/api/creature/creatures/creaturePermissions.js';
 import { damagePropertyWork } from '/imports/api/creature/creatureProperties/methods/damageProperty.js';
 import { doActionWork } from '/imports/api/engine/actions/doAction.js';
 import { CreatureLogSchema } from '/imports/api/creature/log/CreatureLogs.js';
+import ActionContext from '/imports/api/engine/actions/ActionContext.js';
 
 const doAction = new ValidatedMethod({
   name: 'creatureProperties.doCastSpell',
@@ -39,47 +42,31 @@ const doAction = new ValidatedMethod({
     numRequests: 10,
     timeInterval: 5000,
   },
-  run({spellId, slotId, targetIds = [], scope = {}}) {
+  run({ spellId, slotId, targetIds = [], scope = {} }) {
+		// Get action context
     let spell = CreatureProperties.findOne(spellId);
+    const creatureId = spell.ancestors[0].id;
+    const actionContext = new ActionContext(creatureId, targetIds, this);
+
 		// Check permissions
-    let creature = getRootCreatureAncestor(spell);
-
-    assertEditPermission(creature, this.userId);
-
-    // Get all the targets and make sure we can edit them
-    let targets = [];
-    targetIds.forEach(targetId => {
-      let target = Creatures.findOne(targetId);
+    assertEditPermission(actionContext.creature, this.userId);
+    actionContext.targets.forEach(target => {
       assertEditPermission(target, this.userId);
-      targets.push(target);
     });
 
-    // Fetch all the action's ancestor creatureProperties
-    const ancestorIds = [];
-    spell.ancestors.forEach(ref => {
-      if (ref.collection === 'creatureProperties') {
-        ancestorIds.push(ref.id);
-      }
-    });
+    const ancestors = getProperyAncestors(creatureId, spell._id);
+    ancestors.sort((a, b) => a.order - b.order);
 
-    // Get cursor of ancestors
-    const ancestors = CreatureProperties.find({
-      _id: {$in: ancestorIds},
-    }, {
-      sort: {order: 1},
-    });
-
-    // Get cursor of the properties
-    const properties = CreatureProperties.find({
-      $or: [{_id: spell._id}, {'ancestors.id': spell._id}],
-      removed: {$ne: true},
-    }, {
-      sort: {order: 1},
-    });
+    const properties = getPropertyDecendants(creatureId, spell._id);
+    properties.push(spell);
+    properties.sort((a, b) => a.order - b.order);
 
     // Spend the appropriate slot
     let slotLevel = spell.level || 0;
     let slot;
+
+    actionContext.scope['slotLevel'] = slotLevel;
+
     if (slotId && !spell.castWithoutSpellSlots){
       slot = CreatureProperties.findOne(slotId);
       if (!slot){
@@ -104,34 +91,32 @@ const doAction = new ValidatedMethod({
       }
       slotLevel = slot.spellSlotLevel.value;
       damagePropertyWork({
-        property: slot,
+        prop: slot,
         operation: 'increment',
         value: 1,
+        actionContext,
       });
     }
 
-    scope['slotLevel'] = slotLevel;
-
     // Post the slot level spent to the log
-    const log = CreatureLogSchema.clean({
-      creatureId: creature._id,
-      creatureName: creature.name,
-    });
     if (slot?.spellSlotLevel?.value){
-      log.content.push({
+      actionContext.addLog({
         name: `Casting using a level ${slotLevel} spell slot`
       });
     } else if (slotLevel) {
-      log.content.push({
+      actionContext.addLog({
         name: `Casting at level ${slotLevel}`
       });
     }
 
     // Do the action
-    doActionWork({ creature, targets, properties, ancestors, method: this, methodScope: scope, log });
-    
+    doActionWork({
+      properties, ancestors, actionContext, methodScope: scope,
+    });
+
+    // Force the characters involved to recalculate
     Creatures.update({
-      _id: { $in: [creature._id, ...targetIds] }
+      _id: { $in: [creatureId, ...targetIds] }
     }, {
       $set: { dirty: true },
     });
diff --git a/app/imports/api/engine/actions/doCheck.js b/app/imports/api/engine/actions/doCheck.js
index 0a5fef41..42e98f61 100644
--- a/app/imports/api/engine/actions/doCheck.js
+++ b/app/imports/api/engine/actions/doCheck.js
@@ -1,17 +1,12 @@
 import SimpleSchema from 'simpl-schema';
 import { ValidatedMethod } from 'meteor/mdg:validated-method';
 import { RateLimiterMixin } from 'ddp-rate-limiter-mixin';
-import getRootCreatureAncestor from '/imports/api/creature/creatureProperties/getRootCreatureAncestor.js';
 import CreatureProperties from '/imports/api/creature/creatureProperties/CreatureProperties.js';
-import {
-  getPropertiesOfType, getVariables
-} from '/imports/api/engine/loadCreatures.js';
-import { groupBy, remove } from 'lodash';
-import { CreatureLogSchema, insertCreatureLogWork } from '/imports/api/creature/log/CreatureLogs.js';
 import { assertEditPermission } from '/imports/api/creature/creatures/creaturePermissions.js';
 import rollDice from '/imports/parser/rollDice.js';
 import numberToSignedString from '/imports/ui/utility/numberToSignedString.js';
-import { applyTrigger } from '/imports/api/engine/actions/applyTriggers.js';
+import { applyTriggers } from '/imports/api/engine/actions/applyTriggers.js';
+import ActionContext from '/imports/api/engine/actions/ActionContext.js';
 
 const doCheck = new ValidatedMethod({
   name: 'creatureProperties.doCheck',
@@ -29,62 +24,32 @@ const doCheck = new ValidatedMethod({
   },
   run({propId, scope}) {
     const prop = CreatureProperties.findOne(propId);
-    const creature = getRootCreatureAncestor(prop);
+    const creatureId = prop.ancestors[0].id;
+    const actionContext = new ActionContext(creatureId, [creatureId], this);
+    Object.assign(actionContext.scope, scope);
 
     // Check permissions
-    assertEditPermission(creature, this.userId);
+    assertEditPermission(actionContext.creature, this.userId);
 
     // Do the check
-    doCheckWork({creature, prop, method: this, methodScope: scope});
+    doCheckWork({prop, actionContext});
   },
 });
 
 export default doCheck;
 
-export function doCheckWork({
-  creature, prop, method, methodScope = {}
-}){
-  // Create the log
-  let log = CreatureLogSchema.clean({
-    creatureId: creature._id,
-    creatureName: creature.name,
-  });
+export function doCheckWork({prop, actionContext}){
 
-  // Add the variables to the creature document
-  const variables = getVariables(creature._id);
-  delete variables._id;
-  delete variables._creatureId;
-  creature.variables = variables;
-  const scope = creature.variables;
-
-  // Get the triggers
-  let triggers = getPropertiesOfType(creature._id, 'trigger');
-  remove(triggers, trigger => trigger.event !== 'check');
-  triggers = groupBy(triggers, 'timing');
-
-  // Set the creature as the target
-  const targets = [creature];
-
-  applyTriggers(triggers, 'before', { creature, prop, targets, scope, log });
-  rollCheck({prop, log, methodScope});
-  applyTriggers(triggers, 'after', { creature, prop, targets, scope, log });
+  applyTriggers(actionContext.triggers.check?.before, prop, actionContext);
+  rollCheck(prop, actionContext);
+  applyTriggers(actionContext.triggers.check?.after, prop, actionContext);
 
   // Insert the log
-  insertCreatureLogWork({log, creature, method});
+  actionContext.writeLog();
 }
 
-function applyTriggers(triggers, timing, opts) {
-  // Get matching triggers
-  let selectedTriggers = triggers[timing] || [];
-  // Sort the triggers
-  selectedTriggers.sort((a, b) => a.order - b.order);
-  // Apply the triggers
-  selectedTriggers.forEach(trigger => {
-    applyTrigger(trigger, opts)
-  });
-}
-
-function rollCheck({prop, log, methodScope}){
+function rollCheck(prop, actionContext) {
+  const scope = actionContext.scope;
   // get the modifier for the roll
   let rollModifier;
   let logName = `${prop.name} check`;
@@ -110,7 +75,7 @@ function rollCheck({prop, log, methodScope}){
   const rollModifierText = numberToSignedString(rollModifier, true);
 
   let value, values, resultPrefix;
-  if (methodScope['$checkAdvantage'] === 1){
+  if (scope['$checkAdvantage'] === 1){
     logName += ' (Advantage)';
     const [a, b] = rollDice(2, 20);
     if (a >= b) {
@@ -120,7 +85,7 @@ function rollCheck({prop, log, methodScope}){
       value = b;
       resultPrefix = `1d20 [ ~~${a}~~, ${b} ] ${rollModifierText} = `;
     }
-  } else if (methodScope['$checkAdvantage'] === -1){
+  } else if (scope['$checkAdvantage'] === -1){
     logName += ' (Disadvantage)';
     const [a, b] = rollDice(2, 20);
     if (a <= b) {
@@ -136,7 +101,7 @@ function rollCheck({prop, log, methodScope}){
     resultPrefix = `1d20 [ ${value} ] ${rollModifierText} = `
   }
   const result = (value + rollModifier) || 0;
-  log.content.push({
+  actionContext.addLog({
     name: logName,
     value: `${resultPrefix} **${result}**`,
   });
diff --git a/app/imports/api/properties/Attributes.js b/app/imports/api/properties/Attributes.js
index 4b4537c0..38721928 100644
--- a/app/imports/api/properties/Attributes.js
+++ b/app/imports/api/properties/Attributes.js
@@ -59,6 +59,23 @@ let AttributeSchema = createPropertySchema({
 		type: String,
 		regEx: /^#([a-f0-9]{3}){1,2}\b$/i,
 		optional: true,
+  },
+  // Control how the health bar takes damage or healing
+  healthBarNoDamage: {
+    type: Boolean,
+    optional: true,
+  },
+  healthBarNoHealing: {
+    type: Boolean,
+    optional: true,
+  },  
+  healthBarDamageOrder: {
+    type: SimpleSchema.Integer,
+    optional: true,
+  },
+  healthBarHealingOrder: {
+    type: SimpleSchema.Integer,
+    optional: true,
   },
 	// The starting value, before effects
 	baseValue: {
@@ -79,6 +96,16 @@ let AttributeSchema = createPropertySchema({
   decimal: {
     type: Boolean,
     optional: true,
+  },
+  // Can the total after damage be negative
+  ignoreLowerLimit: {
+    type: Boolean,
+    optional: true,
+  },
+  // Can the damage value be negative
+  ignoreUpperLimit: {
+    type: Boolean,
+    optional: true,
   },
 	// Automatically zero the adjustment on these conditions
   reset: {
diff --git a/app/imports/api/properties/Triggers.js b/app/imports/api/properties/Triggers.js
index da99fddc..ce886d3d 100644
--- a/app/imports/api/properties/Triggers.js
+++ b/app/imports/api/properties/Triggers.js
@@ -7,7 +7,9 @@ const eventOptions = {
   // receiveActionProperty: 'Receiving action property',
   check: 'Roll check',
   // flipToggle: 'Toggle changed',
-  // adjustProperty: 'Attribute adjusted',
+  // itemEquipped: 'Item equipped'
+  // itemUnequipped: 'Item unequipped'
+  damageProperty: 'Attribute damaged or healed',
   anyRest: 'Short or long rest',
   longRest: 'Long rest',
   shortRest: 'Short rest',
diff --git a/app/imports/ui/properties/components/attributes/HealthBar.vue b/app/imports/ui/properties/components/attributes/HealthBar.vue
index f71f8d89..ae9b3bce 100644
--- a/app/imports/ui/properties/components/attributes/HealthBar.vue
+++ b/app/imports/ui/properties/components/attributes/HealthBar.vue
@@ -41,7 +41,7 @@
             style="height: 100%; transform-origin: left; transition: all 0.5s ease;"
             :style="{
               backgroundColor: barColor,
-              transform: `scaleX(${value / maxValue})`,
+              transform: `scaleX(${fillFraction})`,
             }"
           />
           <div
@@ -92,87 +92,93 @@ import IncrementMenu from '/imports/ui/components/IncrementMenu.vue';
 import isDarkColor from '/imports/ui/utility/isDarkColor.js';
 import chroma from 'chroma-js';
 
-	export default {
-    components: {
-      IncrementMenu
-    },
-    inject: {
-      theme: {
-        default: {
-          isDark: false,
-        },
+export default {
+  components: {
+    IncrementMenu
+  },
+  inject: {
+    theme: {
+      default: {
+        isDark: false,
       },
     },
-		props: {
-			value: Number,
-			maxValue: Number,
-			name: String,
-      color: {
-        type: String,
-        default() {
-          return this.$vuetify.theme.currentTheme.primary
-        },
+  },
+  props: {
+    value: Number,
+    maxValue: Number,
+    name: String,
+    color: {
+      type: String,
+      default() {
+        return this.$vuetify.theme.currentTheme.primary
       },
-      midColor: {
-        type: String,
-        default: undefined,
-      },
-      lowColor: {
-        type: String,
-        default: undefined,
-      },
-			_id: String,
-		},
-		data() {
-			return {
-				editing: false,
-				hover: false,
-			};
-		},
-    computed: {
-      barColor() {
-        const fraction = this.value / this.maxValue;
-        if (!Number.isFinite(fraction)) return this.color;
-        if (fraction > 0.5){
-          return this.color;
-        } else if (this.midColor && this.lowColor) {
-          return chroma.mix(this.lowColor, this.midColor, fraction * 2).hex();
-        } else if (this.midColor){
-          return this.midColor;
-        }
+    },
+    midColor: {
+      type: String,
+      default: undefined,
+    },
+    lowColor: {
+      type: String,
+      default: undefined,
+    },
+    _id: String,
+  },
+  data() {
+    return {
+      editing: false,
+      hover: false,
+    };
+  },
+  computed: {
+    fillFraction() {
+      let fraction = this.value / this.maxValue;
+      if (fraction < 0) fraction = 0;
+      if (fraction > 1) fraction = 1;
+      return fraction;
+    },
+    barColor() {
+      const fraction = this.value / this.maxValue;
+      if (!Number.isFinite(fraction)) return this.color;
+      if (fraction > 0.5){
         return this.color;
-      },
-      barBackgroundColor(){
-        return chroma(this.barColor)
-        .darken(1.5)
-        .desaturate(1.5)
-        .hex();
-      },
-      isTextLight(){
-        return isDarkColor(this.barBackgroundColor);
-        /* Change color at the halfway mark
-        const fraction = this.value / this.maxValue;
-        if (fraction >= 0.5){
-          return isDarkColor(this.barColor);
-        } else {
-          return isDarkColor(this.barBackgroundColor);
-        }
-        */
+      } else if (this.midColor && this.lowColor) {
+        return chroma.mix(this.lowColor, this.midColor, fraction * 2).hex();
+      } else if (this.midColor){
+        return this.midColor;
       }
+      return this.color;
     },
-		methods: {
-			edit() {
-				this.editing = true;
-			},
-			cancelEdit() {
-				this.editing = false;
-			},
-      changeIncrementMenu(e){
-        this.$emit('change', e);
-        this.editing = false;
+    barBackgroundColor(){
+      return chroma(this.barColor)
+      .darken(1.5)
+      .desaturate(1.5)
+      .hex();
+    },
+    isTextLight(){
+      return isDarkColor(this.barBackgroundColor);
+      /* Change color at the halfway mark
+      const fraction = this.value / this.maxValue;
+      if (fraction >= 0.5){
+        return isDarkColor(this.barColor);
+      } else {
+        return isDarkColor(this.barBackgroundColor);
       }
-		},
-	};
+      */
+    }
+  },
+  methods: {
+    edit() {
+      this.editing = true;
+    },
+    cancelEdit() {
+      this.editing = false;
+    },
+    changeIncrementMenu(e){
+      this.$emit('change', e);
+      this.editing = false;
+    }
+  },
+};
 </script>
 
 <style>
diff --git a/app/imports/ui/properties/components/attributes/ResourceCard.vue b/app/imports/ui/properties/components/attributes/ResourceCard.vue
index 04d20220..44390756 100644
--- a/app/imports/ui/properties/components/attributes/ResourceCard.vue
+++ b/app/imports/ui/properties/components/attributes/ResourceCard.vue
@@ -8,7 +8,7 @@
         <v-btn
           icon
           small
-          :disabled="model.value >= model.total || context.editPermission === false"
+          :disabled="(model.value >= model.total && !model.ignoreUpperLimit) || context.editPermission === false"
           @click="increment(1)"
         >
           <v-icon>mdi-chevron-up</v-icon>
@@ -16,7 +16,7 @@
         <v-btn
           icon
           small
-          :disabled="model.value <= 0 || context.editPermission === false"
+          :disabled="(model.value <= 0 && !model.ignoreLowerLimit) || context.editPermission === false"
           @click="increment(-1)"
         >
           <v-icon>mdi-chevron-down</v-icon>
@@ -28,7 +28,10 @@
         <div class="text-h4">
           {{ model.value }}
         </div>
-        <div class="text-h6 ml-2 max-value">
+        <div
+          v-if="model.total !== 0"
+          class="text-h6 ml-2 max-value"
+        >
           /{{ model.total }}
         </div>
       </div>
diff --git a/app/imports/ui/properties/forms/AttributeForm.vue b/app/imports/ui/properties/forms/AttributeForm.vue
index b07c394f..0b23d1df 100644
--- a/app/imports/ui/properties/forms/AttributeForm.vue
+++ b/app/imports/ui/properties/forms/AttributeForm.vue
@@ -78,7 +78,6 @@
         <form-section
           v-if="model.attributeType === 'healthBar'"
           name="Health Bar Settings"
-          standalone
         >
           <color-picker
             :value="model.healthBarColorMid"
@@ -90,6 +89,47 @@
             label="Empty color"
             @input="value => $emit('change', {path: ['healthBarColorLow'], value})"
           />
+          <v-layout
+            wrap
+            class="mt-4"
+          >
+            <text-field
+              label="Damage order"
+              type="number"
+              style="max-width: 300px;"
+              hint="Lower ordered health bars will take damage before higher ordered ones"
+              class="mr-4"
+              :disabled="model.healthBarNoDamage"
+              :value="model.healthBarDamageOrder"
+              :error-messages="errors.healthBarDamageOrder"
+              @change="change('healthBarDamageOrder', ...arguments)"
+            />
+            <smart-switch
+              label="Ignore damage"
+              :value="model.healthBarNoDamage"
+              :error-messages="errors.healthBarNoDamage"
+              @change="change('healthBarNoDamage', ...arguments)"
+            />
+          </v-layout>
+          <v-layout wrap>
+            <text-field
+              label="Healing order"
+              type="number"
+              style="max-width: 300px;"
+              hint="Lower ordered health bars will take healing before higher ordered ones"
+              class="mr-4"
+              :disabled="model.healthBarNoHealing"
+              :value="model.healthBarHealingOrder"
+              :error-messages="errors.healthBarHealingOrder"
+              @change="change('healthBarHealingOrder', ...arguments)"
+            />
+            <smart-switch
+              label="Ignore healing"
+              :value="model.healthBarNoHealing"
+              :error-messages="errors.healthBarNoHealing"
+              @change="change('healthBarNoHealing', ...arguments)"
+            />
+          </v-layout>
         </form-section>
       </v-expand-transition>
 
@@ -121,6 +161,18 @@
             :error-messages="errors.decimal"
             @change="change('decimal', ...arguments)"
           />
+          <smart-switch
+            label="Can be damaged into negative values"
+            :value="model.ignoreLowerLimit"
+            :error-messages="errors.ignoreLowerLimit"
+            @change="change('ignoreLowerLimit', ...arguments)"
+          />
+          <smart-switch
+            label="Can be incremented above total"
+            :value="model.ignoreUpperLimit"
+            :error-messages="errors.ignoreUpperLimit"
+            @change="change('ignoreUpperLimit', ...arguments)"
+          />
           <div
             class="layout justify-center"
             style="align-self: stretch;"

From 263f2d8424d54bed458aaa535c2cda35ad581b48 Mon Sep 17 00:00:00 2001
From: Stefan Zermatten <stefanzermatten@gmail.com>
Date: Mon, 15 Aug 2022 09:38:34 +0200
Subject: [PATCH 06/18] Fixed failing tests

---
 .../api/engine/actions/doAction.test.js       | 46 ++++++++++++++++++-
 .../actions/tests/createAction.testFn.js      | 26 -----------
 .../tests/testTypes/applyAction.testFn.js     |  0
 .../actions/tests/testTypes/index.testFn.js   |  6 ---
 .../migrations/server/dbv1/dbv1.test.js       |  2 +
 5 files changed, 46 insertions(+), 34 deletions(-)
 delete mode 100644 app/imports/api/engine/actions/tests/createAction.testFn.js
 delete mode 100644 app/imports/api/engine/actions/tests/testTypes/applyAction.testFn.js
 delete mode 100644 app/imports/api/engine/actions/tests/testTypes/index.testFn.js

diff --git a/app/imports/api/engine/actions/doAction.test.js b/app/imports/api/engine/actions/doAction.test.js
index 19560704..56c365cb 100644
--- a/app/imports/api/engine/actions/doAction.test.js
+++ b/app/imports/api/engine/actions/doAction.test.js
@@ -1,11 +1,53 @@
 import '/imports/api/simpleSchemaConfig.js';
 //import testTypes from './testTypes/index.js';
 import { doActionWork } from './doAction.js';
-import createAction from './tests/createAction.testFn.js';
+import { CreatureLogSchema } from '/imports/api/creature/log/CreatureLogs.js';
+import CreatureProperties from '/imports/api/creature/creatureProperties/CreatureProperties.js';
+import Creatures from '/imports/api/creature/creatures/Creatures.js';
+
+function cleanProp(prop){
+  let schema = CreatureProperties.simpleSchema(prop);
+  return schema.clean(prop);
+}
+
+function cleanCreature(creature){
+  let schema = Creatures.simpleSchema(creature);
+  return schema.clean(creature);
+}
+
+// Fake ActionContext to test actions with
+const creatureId = 'actionTestCreatureId';
+const creatureName = 'Action Test Creature';
+const testActionContext = {
+  creature: cleanCreature({
+    _id: creatureId,
+  }),
+  log: CreatureLogSchema.clean({
+    creatureId: creatureId,
+    creatureName: creatureName,
+  }),
+  scope: {},
+  addLog(content) {
+    if (content.name || content.value){
+      this.log.content.push(content);
+    }
+  },
+  writeLog: () => { },
+}
+
+const action = cleanProp({
+  type: 'action',
+});
+const actionAncestors = [];
 
 describe('Do Action', function(){
   it('Does an empty action', function(){
-    doActionWork(createAction({properties: [{type: 'action'}]}));
+    doActionWork({
+      properties: [action],
+      ancestors: actionAncestors,
+      actionContext: testActionContext,
+      methodScope: {},
+    });
   });
   //testTypes.forEach(test => it(test.text, test.fn));
 });
diff --git a/app/imports/api/engine/actions/tests/createAction.testFn.js b/app/imports/api/engine/actions/tests/createAction.testFn.js
deleted file mode 100644
index 84ffa907..00000000
--- a/app/imports/api/engine/actions/tests/createAction.testFn.js
+++ /dev/null
@@ -1,26 +0,0 @@
-import CreatureProperties from '/imports/api/creature/creatureProperties/CreatureProperties.js';
-import Creatures from '/imports/api/creature/creatures/Creatures.js';
-
-export default function createAction({
-  creature = {_id: 'creatureId'},
-  targets = [],
-  properties = [],
-  ancestors = [],
-  method
-} = {}){
-  properties = properties.map(cleanProp);
-  ancestors = ancestors.map(cleanProp);
-  creature = cleanCreature(creature);
-  ancestors = ancestors.map(cleanCreature);
-  return {creature, targets, properties, ancestors, method};
-}
-
-function cleanProp(prop){
-  let schema = CreatureProperties.simpleSchema(prop);
-  return schema.clean(prop);
-}
-
-function cleanCreature(creature){
-  let schema = Creatures.simpleSchema(creature);
-  return schema.clean(creature);
-}
diff --git a/app/imports/api/engine/actions/tests/testTypes/applyAction.testFn.js b/app/imports/api/engine/actions/tests/testTypes/applyAction.testFn.js
deleted file mode 100644
index e69de29b..00000000
diff --git a/app/imports/api/engine/actions/tests/testTypes/index.testFn.js b/app/imports/api/engine/actions/tests/testTypes/index.testFn.js
deleted file mode 100644
index e8a4b486..00000000
--- a/app/imports/api/engine/actions/tests/testTypes/index.testFn.js
+++ /dev/null
@@ -1,6 +0,0 @@
-import applyAction from './applyAction.testFn.js';
-
-export default [{
-  text: 'Applies actions',
-  fn: applyAction,
-},];
diff --git a/app/imports/migrations/server/dbv1/dbv1.test.js b/app/imports/migrations/server/dbv1/dbv1.test.js
index 9a0887ac..efbd4fdd 100644
--- a/app/imports/migrations/server/dbv1/dbv1.test.js
+++ b/app/imports/migrations/server/dbv1/dbv1.test.js
@@ -124,6 +124,7 @@ const expectedMigratedAttribute = {
   damage: 3,
   value: 17,
   constitutionMod: 2,
+  dirty: true,
 }
 
 const exampleAttack = {
@@ -221,6 +222,7 @@ describe('migrateProperty', function() {
       prop: newAction,
       reversed: true,
     });
+    delete reversedAction.dirty;
     assert.deepEqual(action, exampleAction, 'action should not be bashed');
     assert.deepEqual(exampleAction, reversedAction, 'operation should be reversible');
   });

From 2bb3265356d84bf486077a30b7b73d71a8e180b2 Mon Sep 17 00:00:00 2001
From: Stefan Zermatten <stefanzermatten@gmail.com>
Date: Mon, 15 Aug 2022 10:32:27 +0200
Subject: [PATCH 07/18] Fixed client error in creature form

---
 app/imports/ui/creature/CreatureForm.vue | 1 +
 1 file changed, 1 insertion(+)

diff --git a/app/imports/ui/creature/CreatureForm.vue b/app/imports/ui/creature/CreatureForm.vue
index ad35a5e1..1a0f82e0 100644
--- a/app/imports/ui/creature/CreatureForm.vue
+++ b/app/imports/ui/creature/CreatureForm.vue
@@ -201,6 +201,7 @@ export default {
     },
     librariesSelectedByCollections() {
       let ids = [];
+      if (!this.model.allowedLibraryCollections) return ids;
       LibraryCollections.find({
         _id: { $in: this.model.allowedLibraryCollections }
       }).forEach(collection => {

From 99e4e8d6bb99819f910b9ca87acbd3234a652f67 Mon Sep 17 00:00:00 2001
From: Stefan Zermatten <stefanzermatten@gmail.com>
Date: Mon, 15 Aug 2022 10:53:38 +0200
Subject: [PATCH 08/18] Fixed some issues with effect tag targeting

---
 .../computation/buildComputation/linkTypeDependencies.js      | 4 ++--
 app/imports/api/properties/subSchemas/computedField.js        | 1 +
 app/imports/ui/properties/viewers/shared/PropertyField.vue    | 1 +
 3 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/app/imports/api/engine/computation/buildComputation/linkTypeDependencies.js b/app/imports/api/engine/computation/buildComputation/linkTypeDependencies.js
index 5e907acc..ad566b58 100644
--- a/app/imports/api/engine/computation/buildComputation/linkTypeDependencies.js
+++ b/app/imports/api/engine/computation/buildComputation/linkTypeDependencies.js
@@ -178,8 +178,8 @@ function getTargetListFromTags(tags, computation){
   const targetTagIdLists = [];
   if (!tags) return [];
   tags.forEach(tag => {
-    const idList = computation.propsWithTag[tag];
-    if (idList) targetTagIdLists.push(idList);
+    const idList = computation.propsWithTag[tag] || [];
+    targetTagIdLists.push(idList);
   });
   const targets = intersection(...targetTagIdLists);
   return targets;
diff --git a/app/imports/api/properties/subSchemas/computedField.js b/app/imports/api/properties/subSchemas/computedField.js
index 0f0ef37b..0d7ad114 100644
--- a/app/imports/api/properties/subSchemas/computedField.js
+++ b/app/imports/api/properties/subSchemas/computedField.js
@@ -28,6 +28,7 @@ function computedOnlyField(field){
     [`${field}.effects`]: {
       type: Array,
       optional: true,
+      removeBeforeCompute: true,
     },
     [`${field}.effects.$`]: {
       type: Object,
diff --git a/app/imports/ui/properties/viewers/shared/PropertyField.vue b/app/imports/ui/properties/viewers/shared/PropertyField.vue
index fa48a003..4f9084b1 100644
--- a/app/imports/ui/properties/viewers/shared/PropertyField.vue
+++ b/app/imports/ui/properties/viewers/shared/PropertyField.vue
@@ -51,6 +51,7 @@
         <div
           v-if="calculation && calculation.effects"
           class="flex-grow-1"
+          style="max-width: 100%;"
         >
           <inline-effect
             v-if="typeof calculation.value === 'number'"

From 1d22f4c0542cdb56ae34415b92df8725d48516f5 Mon Sep 17 00:00:00 2001
From: Stefan Zermatten <stefanzermatten@gmail.com>
Date: Mon, 15 Aug 2022 10:59:35 +0200
Subject: [PATCH 09/18] Hid tags on trigger form when they're not needed

---
 .../ui/properties/forms/TriggerForm.vue       | 73 +++++++++++--------
 1 file changed, 42 insertions(+), 31 deletions(-)

diff --git a/app/imports/ui/properties/forms/TriggerForm.vue b/app/imports/ui/properties/forms/TriggerForm.vue
index f32eb85e..c568019a 100644
--- a/app/imports/ui/properties/forms/TriggerForm.vue
+++ b/app/imports/ui/properties/forms/TriggerForm.vue
@@ -8,7 +8,39 @@
       @change="change('name', ...arguments)"
     />
 
-    <v-layout align-center>
+    <smart-select
+      label="Timing"
+      style="flex-basis: 300px;"
+      hint="When this trigger will fire"
+      :items="timingOptions"
+      :value="model.timing"
+      :error-messages="errors.timing"
+      @change="change('timing', ...arguments)"
+    />
+    <smart-select
+      label="Event"
+      style="flex-basis: 300px;"
+      hint="What causes this trigger to fire"
+      :items="eventOptions"
+      :value="model.event"
+      :error-messages="errors.event"
+      @change="change('event', ...arguments)"
+    />
+    <smart-select
+      v-if="model.event === 'doActionProperty' || model.event === 'receiveActionProperty'"
+      label="Event Type"
+      style="flex-basis: 300px;"
+      hint="Which action event causes this trigger to fire"
+      :items="actionPropertyTypeOptions"
+      :value="model.actionPropertyType"
+      :error-messages="errors.actionPropertyType"
+      @change="change('actionPropertyType', ...arguments)"
+    />
+
+    <v-layout
+      v-show="showTags"
+      align-center
+    >
       <v-btn
         icon
         style="margin-top: -30px;"
@@ -32,7 +64,10 @@
         @change="change('targetTags', ...arguments)"
       />
     </v-layout>
-    <v-slide-x-transition group>
+    <v-slide-x-transition
+      v-show="showTags"
+      group
+    >
       <div
         v-for="(extras, i) in model.extraTags"
         :key="extras._id"
@@ -66,35 +101,6 @@
       </div>
     </v-slide-x-transition>
 
-    <smart-select
-      label="Timing"
-      style="flex-basis: 300px;"
-      hint="When this trigger will fire"
-      :items="timingOptions"
-      :value="model.timing"
-      :error-messages="errors.timing"
-      @change="change('timing', ...arguments)"
-    />
-    <smart-select
-      label="Event"
-      style="flex-basis: 300px;"
-      hint="What causes this trigger to fire"
-      :items="eventOptions"
-      :value="model.event"
-      :error-messages="errors.event"
-      @change="change('event', ...arguments)"
-    />
-    <smart-select
-      v-if="model.event === 'doActionProperty' || model.event === 'receiveActionProperty'"
-      label="Event Type"
-      style="flex-basis: 300px;"
-      hint="Which action event causes this trigger to fire"
-      :items="actionPropertyTypeOptions"
-      :value="model.actionPropertyType"
-      :error-messages="errors.actionPropertyType"
-      @change="change('actionPropertyType', ...arguments)"
-    />
-
     <computed-field
       label="Condition"
       hint="A caclulation to determine if this trigger should fire"
@@ -183,6 +189,11 @@ export default {
       if (!this.model.extraTags) return false;
       let maxCount = TriggerSchema.get('extraTags', 'maxCount');
       return this.model.extraTags.length >= maxCount;
+    },
+    showTags() {
+      return this.model.event !== 'shortRest' &&
+        this.model.event !== 'longRest' &&
+        this.model.event !== 'anyRest';
     }
   },
   methods: {

From 36b3b808506a0d49c74a9d1d78cbe497781ecf96 Mon Sep 17 00:00:00 2001
From: Stefan Zermatten <stefanzermatten@gmail.com>
Date: Mon, 15 Aug 2022 12:07:57 +0200
Subject: [PATCH 10/18] Moved triggers in action props to run before children

---
 app/imports/api/engine/actions/applyProperty.js           | 3 ---
 .../api/engine/actions/applyPropertyByType/applyAction.js | 7 +++++--
 .../engine/actions/applyPropertyByType/applyAdjustment.js | 3 +++
 .../api/engine/actions/applyPropertyByType/applyBranch.js | 8 +++++++-
 .../api/engine/actions/applyPropertyByType/applyBuff.js   | 3 +++
 .../api/engine/actions/applyPropertyByType/applyDamage.js | 3 +++
 .../api/engine/actions/applyPropertyByType/applyNote.js   | 4 ++++
 .../api/engine/actions/applyPropertyByType/applyRoll.js   | 3 +++
 .../actions/applyPropertyByType/applySavingThrow.js       | 3 +++
 .../api/engine/actions/applyPropertyByType/applyToggle.js | 3 +++
 10 files changed, 34 insertions(+), 6 deletions(-)

diff --git a/app/imports/api/engine/actions/applyProperty.js b/app/imports/api/engine/actions/applyProperty.js
index 2a8b3add..ec9c28d9 100644
--- a/app/imports/api/engine/actions/applyProperty.js
+++ b/app/imports/api/engine/actions/applyProperty.js
@@ -7,7 +7,6 @@ import note from './applyPropertyByType/applyNote.js';
 import roll from './applyPropertyByType/applyRoll.js';
 import savingThrow from './applyPropertyByType/applySavingThrow.js';
 import toggle from './applyPropertyByType/applyToggle.js';
-import { applyNodeTriggers } from '/imports/api/engine/actions/applyTriggers.js';
 
 const applyPropertyByType = {
   action,
@@ -23,8 +22,6 @@ const applyPropertyByType = {
 };
 
 export default function applyProperty(node, actionContext, ...rest) {
-  applyNodeTriggers(node, actionContext, 'before');
   actionContext.scope[`#${node.node.type}`] = node.node;
   applyPropertyByType[node.node.type]?.(node, actionContext, ...rest);
-  applyNodeTriggers(node, actionContext, 'after');
 }
diff --git a/app/imports/api/engine/actions/applyPropertyByType/applyAction.js b/app/imports/api/engine/actions/applyPropertyByType/applyAction.js
index 19481501..f666bad9 100644
--- a/app/imports/api/engine/actions/applyPropertyByType/applyAction.js
+++ b/app/imports/api/engine/actions/applyPropertyByType/applyAction.js
@@ -6,8 +6,10 @@ import CreatureProperties from '/imports/api/creature/creatureProperties/Creatur
 import { adjustQuantityWork } from '/imports/api/creature/creatureProperties/methods/adjustQuantity.js';
 import { damagePropertyWork } from '/imports/api/creature/creatureProperties/methods/damageProperty.js';
 import numberToSignedString from '/imports/ui/utility/numberToSignedString.js';
+import { applyNodeTriggers } from '/imports/api/engine/actions/applyTriggers.js';
 
-export default function applyAction(node, actionContext){
+export default function applyAction(node, actionContext) {
+  applyNodeTriggers(node, 'before', actionContext);
   const prop = node.node;
   let targets = actionContext.targets;
   if (prop.target === 'self') targets = [actionContext.creature];
@@ -178,7 +180,8 @@ function applyCrits(value, scope){
   return {criticalHit, criticalMiss};
 }
 
-function applyChildren(node, actionContext){
+function applyChildren(node, actionContext) {
+  applyNodeTriggers(node, 'after', actionContext);
   node.children.forEach(child => applyProperty(child, actionContext));
 }
 
diff --git a/app/imports/api/engine/actions/applyPropertyByType/applyAdjustment.js b/app/imports/api/engine/actions/applyPropertyByType/applyAdjustment.js
index 525f980c..cc63f53a 100644
--- a/app/imports/api/engine/actions/applyPropertyByType/applyAdjustment.js
+++ b/app/imports/api/engine/actions/applyPropertyByType/applyAdjustment.js
@@ -1,8 +1,10 @@
 import applyProperty from '../applyProperty.js';
 import recalculateCalculation from './shared/recalculateCalculation.js';
 import { damagePropertyWork } from '/imports/api/creature/creatureProperties/methods/damageProperty.js';
+import { applyNodeTriggers } from '/imports/api/engine/actions/applyTriggers.js';
 
 export default function applyAdjustment(node, actionContext){
+  applyNodeTriggers(node, 'before', actionContext);
   const prop = node.node;
   const damageTargets = prop.target === 'self' ? [actionContext.creature] : actionContext.targets;
 
@@ -54,5 +56,6 @@ export default function applyAdjustment(node, actionContext){
 }
 
 function applyChildren(node, actionContext){
+  applyNodeTriggers(node, 'after', actionContext);
   node.children.forEach(child => applyProperty(child, actionContext));
 }
diff --git a/app/imports/api/engine/actions/applyPropertyByType/applyBranch.js b/app/imports/api/engine/actions/applyPropertyByType/applyBranch.js
index 6e0ddd06..3106b88b 100644
--- a/app/imports/api/engine/actions/applyPropertyByType/applyBranch.js
+++ b/app/imports/api/engine/actions/applyPropertyByType/applyBranch.js
@@ -1,9 +1,12 @@
 import applyProperty from '../applyProperty.js';
 import recalculateCalculation from './shared/recalculateCalculation.js';
 import rollDice from '/imports/parser/rollDice.js';
+import { applyNodeTriggers } from '/imports/api/engine/actions/applyTriggers.js';
 
 export default function applyBranch(node, actionContext){
+  applyNodeTriggers(node, 'before', actionContext);
   const applyChildren = function(){
+    applyNodeTriggers(node, 'after', actionContext);
     node.children.forEach(child => applyProperty(child, actionContext));
   };
   const scope = actionContext.scope;
@@ -27,6 +30,7 @@ export default function applyBranch(node, actionContext){
         let index = Math.floor(prop.condition?.value);
         if (index < 1) index = 1;
         if (index > node.children.length) index = node.children.length;
+        applyNodeTriggers(node, 'after', actionContext);
         applyProperty(node.children[index - 1], actionContext);
       }
       break;
@@ -57,12 +61,14 @@ export default function applyBranch(node, actionContext){
     case 'random':
       if (node.children.length){
         let index = rollDice(1, node.children.length)[0] - 1;
+        applyNodeTriggers(node, 'after', actionContext);
         applyProperty(node.children[index], actionContext);
       }
       break;
     case 'eachTarget':
-      if (targets.length){
+      if (targets.length) {
         targets.forEach(target => {
+          applyNodeTriggers(node, 'after', actionContext);
           actionContext.targets = [target]
           node.children.forEach(child => applyProperty(child, actionContext));
         });
diff --git a/app/imports/api/engine/actions/applyPropertyByType/applyBuff.js b/app/imports/api/engine/actions/applyPropertyByType/applyBuff.js
index f36d5ae5..b6e7d682 100644
--- a/app/imports/api/engine/actions/applyPropertyByType/applyBuff.js
+++ b/app/imports/api/engine/actions/applyPropertyByType/applyBuff.js
@@ -12,8 +12,10 @@ import symbol from '/imports/parser/parseTree/symbol.js';
 import logErrors from './shared/logErrors.js';
 import { insertCreatureLog } from '/imports/api/creature/log/CreatureLogs.js';
 import cyrb53 from '/imports/api/engine/computation/utility/cyrb53.js';
+import { applyNodeTriggers } from '/imports/api/engine/actions/applyTriggers.js';
 
 export default function applyBuff(node, actionContext){
+  applyNodeTriggers(node, 'before', actionContext);
   const prop = node.node;
   let buffTargets = prop.target === 'self' ? [actionContext.creature] : actionContext.targets;
 
@@ -58,6 +60,7 @@ export default function applyBuff(node, actionContext){
       }
     }
   });
+  applyNodeTriggers(node, 'after', actionContext);
 
   // Don't apply the children of the buff, they get copied to the target instead
 }
diff --git a/app/imports/api/engine/actions/applyPropertyByType/applyDamage.js b/app/imports/api/engine/actions/applyPropertyByType/applyDamage.js
index 4d9145b3..0ee3bbd7 100644
--- a/app/imports/api/engine/actions/applyPropertyByType/applyDamage.js
+++ b/app/imports/api/engine/actions/applyPropertyByType/applyDamage.js
@@ -8,9 +8,12 @@ import { damagePropertyWork } from '/imports/api/creature/creatureProperties/met
 import {
   getPropertiesOfType
 } from '/imports/api/engine/loadCreatures.js';
+import { applyNodeTriggers } from '/imports/api/engine/actions/applyTriggers.js';
 
 export default function applyDamage(node, actionContext){
+  applyNodeTriggers(node, 'before', actionContext);
   const applyChildren = function(){
+    applyNodeTriggers(node, 'after', actionContext);
     node.children.forEach(child => applyProperty(child, actionContext));
   };
 
diff --git a/app/imports/api/engine/actions/applyPropertyByType/applyNote.js b/app/imports/api/engine/actions/applyPropertyByType/applyNote.js
index b1b5e37a..0d5f9e84 100644
--- a/app/imports/api/engine/actions/applyPropertyByType/applyNote.js
+++ b/app/imports/api/engine/actions/applyPropertyByType/applyNote.js
@@ -1,7 +1,9 @@
 import recalculateInlineCalculations from './shared/recalculateInlineCalculations.js';
 import applyProperty from '../applyProperty.js';
+import { applyNodeTriggers } from '/imports/api/engine/actions/applyTriggers.js';
 
 export default function applyNote(node, actionContext){
+  applyNodeTriggers(node, 'before', actionContext);
   const prop = node.node;
 
   // Log Name, summary
@@ -18,6 +20,8 @@ export default function applyNote(node, actionContext){
     recalculateInlineCalculations(prop.description, actionContext);
     actionContext.addLog({value: prop.description.value});
   }
+  // Apply triggers
+  applyNodeTriggers(node, 'after', actionContext);
   // Apply children
   node.children.forEach(child => applyProperty(child, actionContext));
 }
diff --git a/app/imports/api/engine/actions/applyPropertyByType/applyRoll.js b/app/imports/api/engine/actions/applyPropertyByType/applyRoll.js
index 194c52a2..7d860948 100644
--- a/app/imports/api/engine/actions/applyPropertyByType/applyRoll.js
+++ b/app/imports/api/engine/actions/applyPropertyByType/applyRoll.js
@@ -2,11 +2,14 @@ import applyProperty from '../applyProperty.js';
 import logErrors from './shared/logErrors.js';
 import applyEffectsToCalculationParseNode from '/imports/api/engine/actions/applyPropertyByType/shared/applyEffectsToCalculationParseNode.js';
 import resolve, { toString } from '/imports/parser/resolve.js';
+import { applyNodeTriggers } from '/imports/api/engine/actions/applyTriggers.js';
 
 export default function applyRoll(node, actionContext){
+  applyNodeTriggers(node, 'before', actionContext);
   const prop = node.node;
 
   const applyChildren = function(){
+    applyNodeTriggers(node, 'after', actionContext);
     node.children.forEach(child => applyProperty(child, actionContext));
   };
 
diff --git a/app/imports/api/engine/actions/applyPropertyByType/applySavingThrow.js b/app/imports/api/engine/actions/applyPropertyByType/applySavingThrow.js
index 0fe34329..3a11e935 100644
--- a/app/imports/api/engine/actions/applyPropertyByType/applySavingThrow.js
+++ b/app/imports/api/engine/actions/applyPropertyByType/applySavingThrow.js
@@ -2,8 +2,10 @@ import rollDice from '/imports/parser/rollDice.js';
 import recalculateCalculation from './shared/recalculateCalculation.js';
 import applyProperty from '../applyProperty.js';
 import numberToSignedString from '/imports/ui/utility/numberToSignedString.js';
+import { applyNodeTriggers } from '/imports/api/engine/actions/applyTriggers.js';
 
 export default function applySavingThrow(node, actionContext){
+  applyNodeTriggers(node, 'before', actionContext);
   const prop = node.node;
 
   let saveTargets = prop.target === 'self' ? [actionContext.creature] : actionContext.targets;
@@ -41,6 +43,7 @@ export default function applySavingThrow(node, actionContext){
     delete scope['$saveRoll'];
 
     const applyChildren = function () {
+      applyNodeTriggers(node, 'after', actionContext);
       actionContext.targets = [target]
       node.children.forEach(child => applyProperty(child, actionContext));
     };
diff --git a/app/imports/api/engine/actions/applyPropertyByType/applyToggle.js b/app/imports/api/engine/actions/applyPropertyByType/applyToggle.js
index 16a97412..be80b012 100644
--- a/app/imports/api/engine/actions/applyPropertyByType/applyToggle.js
+++ b/app/imports/api/engine/actions/applyPropertyByType/applyToggle.js
@@ -1,10 +1,13 @@
 import applyProperty from '../applyProperty.js';
 import recalculateCalculation from './shared/recalculateCalculation.js';
+import { applyNodeTriggers } from '/imports/api/engine/actions/applyTriggers.js';
 
 export default function applyToggle(node, actionContext){
+  applyNodeTriggers(node, 'before', actionContext);
   const prop = node.node;
   recalculateCalculation(prop.condition, actionContext);
   if (prop.condition?.value) {
+    applyNodeTriggers(node, 'after', actionContext);
     return node.children.forEach(child => applyProperty(child, actionContext));
   }
 }

From a8f163ff33cd64769d15dc8fb2a7bf2fdb58729f Mon Sep 17 00:00:00 2001
From: Stefan Zermatten <stefanzermatten@gmail.com>
Date: Mon, 15 Aug 2022 12:29:58 +0200
Subject: [PATCH 11/18] Removed trigger.summary

---
 .../api/engine/actions/applyTriggers.js       |  8 +-
 app/imports/api/properties/Triggers.js        |  4 -
 .../ui/properties/forms/TriggerForm.vue       |  9 ---
 .../ui/properties/viewers/TriggerViewer.vue   | 73 +++++++++----------
 4 files changed, 40 insertions(+), 54 deletions(-)

diff --git a/app/imports/api/engine/actions/applyTriggers.js b/app/imports/api/engine/actions/applyTriggers.js
index f8346163..9343e1ac 100644
--- a/app/imports/api/engine/actions/applyTriggers.js
+++ b/app/imports/api/engine/actions/applyTriggers.js
@@ -58,12 +58,12 @@ export function applyTrigger(trigger, prop, actionContext) {
   // Fire the trigger
   const content = {
     name: trigger.name || 'Trigger',
-    value: trigger.summary,
+    value: trigger.description,
     inline: false,
   }
-  if (trigger.summary?.text){
-    recalculateInlineCalculations(trigger.summary, actionContext);
-    content.value = trigger.summary.value;
+  if (trigger.description?.text){
+    recalculateInlineCalculations(trigger.description, actionContext);
+    content.value = trigger.description.value;
   }
   actionContext.addLog(content);
 
diff --git a/app/imports/api/properties/Triggers.js b/app/imports/api/properties/Triggers.js
index ce886d3d..f8f6c4a3 100644
--- a/app/imports/api/properties/Triggers.js
+++ b/app/imports/api/properties/Triggers.js
@@ -44,10 +44,6 @@ let TriggerSchema = createPropertySchema({
     optional: true,
     max: STORAGE_LIMITS.name,
   },
-  summary: {
-    type: 'inlineCalculationFieldToCompute',
-    optional: true,
-  },
   description: {
     type: 'inlineCalculationFieldToCompute',
     optional: true,
diff --git a/app/imports/ui/properties/forms/TriggerForm.vue b/app/imports/ui/properties/forms/TriggerForm.vue
index c568019a..2a8e3d8a 100644
--- a/app/imports/ui/properties/forms/TriggerForm.vue
+++ b/app/imports/ui/properties/forms/TriggerForm.vue
@@ -111,15 +111,6 @@
         $emit('change', {path: ['condition', ...path], value, ack})"
     />
 
-    <inline-computation-field
-      label="Summary"
-      hint="This will appear in the feature card in the character sheet"
-      :model="model.summary"
-      :error-messages="errors.summary"
-      @change="({path, value, ack}) =>
-        $emit('change', {path: ['summary', ...path], value, ack})"
-    />
-
     <inline-computation-field
       label="Description"
       hint="The rest of the description that doesn't fit in the summary goes here"
diff --git a/app/imports/ui/properties/viewers/TriggerViewer.vue b/app/imports/ui/properties/viewers/TriggerViewer.vue
index dbecd9c3..ce7e1f44 100644
--- a/app/imports/ui/properties/viewers/TriggerViewer.vue
+++ b/app/imports/ui/properties/viewers/TriggerViewer.vue
@@ -1,10 +1,18 @@
 <template lang="html">
   <div class="trigger-viewer">
     <v-row dense>
+      <property-field
+        name="Timing"
+        :value="timingText"
+      />
       <property-field
         name="Event"
         :value="eventText"
       />
+      <property-field
+        name="Event Type"
+        :value="actionPropertyText"
+      />
       <property-field
         v-if="(model.targetTags && model.targetTags.length) || (model.extraTags && model.extraTags.length)"
         name="Tags Required"
@@ -23,10 +31,6 @@
           </div>
         </div>
       </property-field>
-      <property-description
-        name="Summary"
-        :model="model.summary"
-      />
       <property-description
         name="Description"
         :model="model.description"
@@ -36,39 +40,34 @@
 </template>
 
 <script lang="js">
-	import propertyViewerMixin from '/imports/ui/properties/viewers/shared/propertyViewerMixin.js'
-  import { getPropertyName } from '/imports/constants/PROPERTIES.js';
-  import FillSlotButton from '/imports/ui/creature/buildTree/FillSlotButton.vue';
+import propertyViewerMixin from '/imports/ui/properties/viewers/shared/propertyViewerMixin.js'
+import { getPropertyName } from '/imports/constants/PROPERTIES.js';
+import { timingOptions, eventOptions, actionPropertyTypeOptions } from '/imports/api/properties/Triggers.js';
 
-  const eventText = {
-    doActionProperty: 'Do action property',
-    receiveActionProperty: 'Receiving action property',
-    flipToggle: 'Toggle changed',
-    adjustProperty: 'Attribute adjusted',
-    anyRest: 'Short or long rest',
-    longRest: 'Long rest',
-    shortRest: 'Short rest',
+export default {
+  mixins: [propertyViewerMixin],
+  inject: {
+    context: {
+      default: {},
+    },
+  },
+  computed: {
+    slotTypeName(){
+      if (!this.model.slotType) return;
+      return getPropertyName(this.model.slotType);
+    },
+    timingText(){
+      if (!this.model.timing) return;
+      return timingOptions[this.model.timing];
+    },
+    actionPropertyText(){
+      if (!this.model.actionPropertyType) return;
+      return actionPropertyTypeOptions[this.model.actionPropertyType];
+    },
+    eventText(){
+      if (!this.model.event) return;
+      return eventOptions[this.model.event];
+    },
   }
-
-	export default {
-    components: {
-      FillSlotButton,
-    },
-		mixins: [propertyViewerMixin],
-    inject: {
-      context: {
-        default: {},
-      },
-    },
-    computed: {
-      slotTypeName(){
-        if (!this.model.slotType) return;
-        return getPropertyName(this.model.slotType);
-      },
-      eventText(){
-        if (!this.model.event) return;
-        return eventText[this.model.event]
-      },
-    }
-	}
+}
 </script>

From 360df7900469e674d75d310b5a460ea4e27f3840 Mon Sep 17 00:00:00 2001
From: Stefan Zermatten <stefanzermatten@gmail.com>
Date: Mon, 15 Aug 2022 12:31:56 +0200
Subject: [PATCH 12/18] Fixed after save trigger not firing when no targets

---
 .../api/engine/actions/applyPropertyByType/applySavingThrow.js | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/app/imports/api/engine/actions/applyPropertyByType/applySavingThrow.js b/app/imports/api/engine/actions/applyPropertyByType/applySavingThrow.js
index 3a11e935..6064e3bd 100644
--- a/app/imports/api/engine/actions/applyPropertyByType/applySavingThrow.js
+++ b/app/imports/api/engine/actions/applyPropertyByType/applySavingThrow.js
@@ -31,7 +31,8 @@ export default function applySavingThrow(node, actionContext){
   // succeeeded and failed
   if (!saveTargets?.length){
     scope['$saveFailed'] = {value: true};
-    scope['$saveSucceeded'] = {value: true};
+    scope['$saveSucceeded'] = { value: true };
+    applyNodeTriggers(node, 'after', actionContext);
     return node.children.forEach(child => applyProperty(child, actionContext));
   }
 

From 8164b79667d685087355f6882882030dd64daf5f Mon Sep 17 00:00:00 2001
From: Stefan Zermatten <stefanzermatten@gmail.com>
Date: Mon, 15 Aug 2022 14:19:42 +0200
Subject: [PATCH 13/18] Improved markdown formatting Fixed pre-code breaking
 out of containers

---
 app/imports/ui/components/MarkdownText.vue |  7 --
 app/imports/ui/styles/markdown.css         | 90 ++++++++++++++++++++++
 app/imports/ui/styles/stylesIndex.js       |  1 +
 3 files changed, 91 insertions(+), 7 deletions(-)
 create mode 100644 app/imports/ui/styles/markdown.css

diff --git a/app/imports/ui/components/MarkdownText.vue b/app/imports/ui/components/MarkdownText.vue
index 681878d2..ab9d35b2 100644
--- a/app/imports/ui/components/MarkdownText.vue
+++ b/app/imports/ui/components/MarkdownText.vue
@@ -24,10 +24,3 @@
     },
 	}
 </script>
-
-<style lang="css">
-  .markdown img {
-    max-width: 100%;
-    margin: 8px 0;
-  }
-</style>
diff --git a/app/imports/ui/styles/markdown.css b/app/imports/ui/styles/markdown.css
new file mode 100644
index 00000000..27d4c1cb
--- /dev/null
+++ b/app/imports/ui/styles/markdown.css
@@ -0,0 +1,90 @@
+.markdown h1,
+.markdown h2,
+.markdown h3,
+.markdown h4,
+.markdown h5,
+.markdown h6 {
+  line-height: initial;
+  margin-bottom: 12px;
+}
+
+.markdown h1:not(:first-child),
+.markdown h2:not(:first-child),
+.markdown h3:not(:first-child),
+.markdown h4:not(:first-child),
+.markdown h5:not(:first-child),
+.markdown h6:not(:first-child) {
+  margin-top: 24px;
+}
+
+:not(:first-child) .markdown h1 {
+  font-size: 2rem;
+  letter-spacing: -.0083333333em;
+  font-weight: 300;
+}
+
+.markdown h2 {
+  font-size: 1.5rem;
+  font-weight: 400;
+}
+
+.markdown h3 {
+  font-size: 1.25rem;
+  letter-spacing: .0073529412em;
+  font-weight: 400;
+}
+
+.markdown h4 {
+  font-size: 1rem;
+  letter-spacing: .0125em;
+  font-weight: 500;
+}
+
+.markdown h5 {
+  font-size: 0.95rem;
+  letter-spacing: .0125em;
+  font-weight: 500;
+}
+
+.markdown h6 {
+  font-size: 0.875rem;
+  letter-spacing: .0125em;
+  font-weight: 500;
+}
+
+.markdown pre code {
+  display: block;
+  overflow: auto;
+}
+
+.theme--dark.v-application .markdown hr {
+  border-color: rgba(255, 255, 255, 0.2);
+}
+
+.markdown img {
+  max-width: 100%;
+  margin: 8px 0;
+}
+
+.markdown table {
+  min-width: 100%;
+  border-spacing: 0;
+  margin-bottom: 16px;
+}
+
+.markdown th {
+  font-weight: initial;
+  padding: 4px;
+}
+
+.markdown td {
+  padding: 2px 4px;
+}
+
+.markdown tbody>tr:nth-child(odd) {
+  background-color: rgba(0, 0, 0, 0.1)
+}
+
+.theme--dark.v-application .markdown tbody>tr:nth-child(odd) {
+  background-color: rgba(255, 255, 255, 0.1)
+}
\ No newline at end of file
diff --git a/app/imports/ui/styles/stylesIndex.js b/app/imports/ui/styles/stylesIndex.js
index 383664b1..f9a49d9c 100644
--- a/app/imports/ui/styles/stylesIndex.js
+++ b/app/imports/ui/styles/stylesIndex.js
@@ -6,5 +6,6 @@ import './fitAvatars.css';
 import './inheritBackgrounds.css';
 import './largeFormatInputs.css';
 import './lineClamp.css';
+import './markdown.css';
 import './speedDial.css';
 import './toolbarFlex.css';

From 1cf9f3b5fdc58c72ff77a2e0da6281ebdcf23a50 Mon Sep 17 00:00:00 2001
From: Stefan Zermatten <stefanzermatten@gmail.com>
Date: Mon, 15 Aug 2022 14:36:20 +0200
Subject: [PATCH 14/18] Fixed conditional benefits on abilities not showing on
 skills

---
 .../computeByType/computeVariable/computeVariableAsSkill.js     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/imports/api/engine/computation/computeComputation/computeByType/computeVariable/computeVariableAsSkill.js b/app/imports/api/engine/computation/computeComputation/computeByType/computeVariable/computeVariableAsSkill.js
index 828059c0..37b6afdd 100644
--- a/app/imports/api/engine/computation/computeComputation/computeByType/computeVariable/computeVariableAsSkill.js
+++ b/app/imports/api/engine/computation/computeComputation/computeByType/computeVariable/computeVariableAsSkill.js
@@ -86,7 +86,7 @@ function aggregateAbilityEffects({computation, skillNode, abilityNode}){
       // to a skill from its ability
       if (link.data === 'effect'){
         if (![
-          'advantage', 'disadvantage', 'passiveAdd', 'fail'
+          'advantage', 'disadvantage', 'passiveAdd', 'fail', 'conditional'
         ].includes(linkedNode.data.operation)){
           return;
         }

From 4d6cdf50bd92ff573ed1a8acae829989e0e971dc Mon Sep 17 00:00:00 2001
From: Stefan Zermatten <stefanzermatten@gmail.com>
Date: Mon, 15 Aug 2022 14:47:36 +0200
Subject: [PATCH 15/18] Fixed tree search input missing types

---
 .../ui/components/tree/TreeSearchInput.vue    | 32 +++++++------------
 app/imports/ui/styles/markdown.css            |  4 +++
 2 files changed, 15 insertions(+), 21 deletions(-)

diff --git a/app/imports/ui/components/tree/TreeSearchInput.vue b/app/imports/ui/components/tree/TreeSearchInput.vue
index 9c843b9a..5abac7e5 100644
--- a/app/imports/ui/components/tree/TreeSearchInput.vue
+++ b/app/imports/ui/components/tree/TreeSearchInput.vue
@@ -13,6 +13,16 @@
 </template>
 
 <script lang="js">
+import PROPERTIES from '/imports/constants/PROPERTIES.js';
+const filterOptions = [];
+for (let key in PROPERTIES) {
+  if (key === 'reference') continue;
+  filterOptions.push({
+    text: PROPERTIES[key].name,
+    value: key,
+  });
+}
+
 export default {
   props: {
     value: {
@@ -22,27 +32,7 @@ export default {
   },
   data(){return {
     filterTerms: [],
-    filterOptions: [
-      {text: 'Actions', value: 'action'},
-      {text: 'Attacks', value: 'attack'},
-      {text: 'Attributes', value: 'attribute'},
-      {text: 'Buffs', value: 'buff'},
-      {text: 'Class Levels', value: 'classLevel'},
-      {text: 'Damage Multipliers', value: 'damageMultiplier'},
-      {text: 'Effects', value: 'effect'},
-      {text: 'Experiences', value: 'experience'},
-      {text: 'Features', value: 'feature'},
-      {text: 'Folders', value: 'folder'},
-      {text: 'Notes', value: 'note'},
-      {text: 'Proficiencies', value: 'proficiency'},
-      {text: 'Rolls', value: 'roll'},
-      {text: 'Saving Throws', value: 'savingThrow'},
-      {text: 'Skills', value: 'skill'},
-      {text: 'Spell Lists', value: 'spellList'},
-      {text: 'Spells', value: 'spell'},
-      {text: 'Containers', value: 'container'},
-      {text: 'Items', value: 'item'},
-    ],
+    filterOptions,
   }},
   computed: {
     filter(){
diff --git a/app/imports/ui/styles/markdown.css b/app/imports/ui/styles/markdown.css
index 27d4c1cb..2839add3 100644
--- a/app/imports/ui/styles/markdown.css
+++ b/app/imports/ui/styles/markdown.css
@@ -1,3 +1,7 @@
+.markdown {
+  width: 100%;
+}
+
 .markdown h1,
 .markdown h2,
 .markdown h3,

From 23e848fe401e88c0cdb66e088e4afbd0f506c94c Mon Sep 17 00:00:00 2001
From: Stefan Zermatten <stefanzermatten@gmail.com>
Date: Mon, 15 Aug 2022 15:12:14 +0200
Subject: [PATCH 16/18] Fixed hit dice recovery calculation on long rest

---
 app/imports/api/creature/creatures/methods/restCreature.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/imports/api/creature/creatures/methods/restCreature.js b/app/imports/api/creature/creatures/methods/restCreature.js
index 7af25d1e..49d228aa 100644
--- a/app/imports/api/creature/creatures/methods/restCreature.js
+++ b/app/imports/api/creature/creatures/methods/restCreature.js
@@ -107,7 +107,7 @@ function doRestWork(restType, actionContext) {
       fields: {
         hitDiceSize: 1,
         damage: 1,
-        value: 1,
+        total: 1,
       }
     }).fetch();
     // Use a collator to do sorting in natural order
@@ -118,7 +118,7 @@ function doRestWork(restType, actionContext) {
     let compare = (a, b) => collator.compare(b.hitDiceSize, a.hitDiceSize)
     hitDice.sort(compare);
     // Get the total number of hit dice that can be recovered this rest
-    let totalHd = hitDice.reduce((sum, hd) => sum + (hd.value || 0), 0);
+    let totalHd = hitDice.reduce((sum, hd) => sum + (hd.total || 0), 0);
     let resetMultiplier = actionContext.creature.settings.hitDiceResetMultiplier || 0.5;
     let recoverableHd = Math.max(Math.floor(totalHd*resetMultiplier), 1);
     // recover each hit dice in turn until the recoverable amount is used up

From 38c3b6ff1fed80a6e268b894a7baa9b88c179e45 Mon Sep 17 00:00:00 2001
From: Stefan Zermatten <stefanzermatten@gmail.com>
Date: Mon, 15 Aug 2022 15:38:36 +0200
Subject: [PATCH 17/18] Fixed tier paid benefit error text

---
 app/imports/api/users/patreon/tiers.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/imports/api/users/patreon/tiers.js b/app/imports/api/users/patreon/tiers.js
index 2d789993..edd1d44a 100644
--- a/app/imports/api/users/patreon/tiers.js
+++ b/app/imports/api/users/patreon/tiers.js
@@ -110,8 +110,8 @@ export function getUserTier(user){
 export function assertUserHasPaidBenefits(user){
   let tier = getUserTier(user);
   if (!tier.paidBenefits){
-    throw new Meteor.Error('Creatures.methods.insert.denied',
-    `The ${tier.name} tier does not allow you to insert a creature`);
+    throw new Meteor.Error('no paid benefits',
+    `The ${tier.name} tier does not have the required benefits`);
   }
 }
 

From f2a18612798a55d7c40d2aa3d16805beab1c9e02 Mon Sep 17 00:00:00 2001
From: Stefan Zermatten <stefanzermatten@gmail.com>
Date: Mon, 15 Aug 2022 15:38:57 +0200
Subject: [PATCH 18/18] Fixed Slot cards not using markdown

---
 app/imports/ui/creature/slots/SlotCard.vue | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/app/imports/ui/creature/slots/SlotCard.vue b/app/imports/ui/creature/slots/SlotCard.vue
index b282bfff..16f33e1c 100644
--- a/app/imports/ui/creature/slots/SlotCard.vue
+++ b/app/imports/ui/creature/slots/SlotCard.vue
@@ -17,8 +17,11 @@
     <v-card-title>
       {{ model.name }}
     </v-card-title>
-    <v-card-text v-if="model.description">
-      {{ model.description.value }}
+    <v-card-text>
+      <property-description
+        text
+        :model="model.description"
+      />
     </v-card-text>
     <v-spacer />
     <v-card-actions>
@@ -36,10 +39,12 @@
 
 <script lang="js">
 import CardHighlight from '/imports/ui/components/CardHighlight.vue';
+import PropertyDescription from '/imports/ui/properties/viewers/shared/PropertyDescription.vue';
 
 export default {
   components: {
     CardHighlight,
+    PropertyDescription,
   },
   inject: {
     theme: {