Fixed a lot of UI to match new parenting API

app/imports/api/engine/action/applyProperties/applyActionProperty.test.ts

@@ -16,7 +16,7 @@ const [
   creatureId, targetCreatureId, targetCreature2Id, emptyActionId, selfActionId, attackActionId,
   usesActionId, attackMissId, attackNoTargetId, usesResourcesActionId, ammoId, resourceAttId,
   consumeAmmoId, consumeResourceId, noUsesActionId, insufficientResourcesActionId,
-  attributeResetByEventId, eventActionId, advantageAttackId, advantageEffectId
+  attributeResetByEventId, eventActionId, advantageAttackId, advantageEffectId, disadvantageAttackId, disadvantageEffectId,
 ] = randomIds;
 
 const actionTestCreature = {
@@ -60,6 +60,20 @@ const actionTestCreature = {
       targetByTags: true,
       targetTags: ['hasAdvantage'],
     },
+    // Attack that has Disadvantage
+    {
+      _id: disadvantageAttackId,
+      type: 'action',
+      attackRoll: { calculation: '0' },
+      tags: ['hasDisadvantage'],
+    },
+    {
+      _id: disadvantageEffectId,
+      type: 'effect',
+      operation: 'disadvantage',
+      targetByTags: true,
+      targetTags: ['hasDisadvantage'],
+    },
     // Attack that has no target
     {
       _id: attackNoTargetId,
@@ -333,6 +347,26 @@ describe('Apply Action Properties', function () {
     assert.deepEqual(allMutations(action), expectedMutations);
   });
 
+  it('should make attack rolls that roll with disadvantage', async function () {
+    const prop = await CreatureProperties.findOneAsync(disadvantageAttackId);
+    assert.equal(prop.attackRoll.disadvantage, 1, 'The attack roll should have disadvantage');
+    const action = await runActionById(disadvantageAttackId, [targetCreatureId]);
+    const expectedMutations: Mutation[] = [
+      {
+        contents: [{ name: 'Action' }],
+        targetIds: [targetCreatureId],
+      }, {
+        contents: [{
+          inline: true,
+          name: 'Hit! (Disadvantage)',
+          value: '1d20 [ 10, ~~11~~ ] + 0\n**10**',
+        }],
+        targetIds: [targetCreatureId],
+      }
+    ];
+    assert.deepEqual(allMutations(action), expectedMutations);
+  });
+
   it('actions should consume resources', async function () {
     const action = await runActionById(usesResourcesActionId, []);
     const expectedMutations: Mutation[] = [
@@ -401,7 +435,7 @@ describe('Apply Action Properties', function () {
         contents: [
           {
             inline: true,
-            name: 'Attribute damaged',
+            name: 'Attribute restored',
             value: '+13 Attribute Reset By testEvent Event',
           },
         ],

app/imports/api/engine/action/applyProperties/applyActionProperty.ts

@@ -1,8 +1,7 @@
 import { EngineAction } from '/imports/api/engine/action/EngineActions';
 import { PropTask } from '../tasks/Task';
 import TaskResult, { LogContent } from '../tasks/TaskResult';
-import { getPropertiesOfType, getVariables } from '/imports/api/engine/loadCreatures';
-import applyTask from '/imports/api/engine/action/tasks/applyTask';
+import { getVariables } from '/imports/api/engine/loadCreatures';
 import getPropertyTitle from '/imports/api/utility/getPropertyTitle';
 import recalculateInlineCalculations from '/imports/api/engine/action/functions/recalculateInlineCalculations';
 import spendResources from '/imports/api/engine/action/functions/spendResources';
@@ -115,7 +114,7 @@ async function applyAttackToTarget(
   if (targetArmor !== undefined) {
     let name = criticalHit ? 'Critical Hit!' :
       criticalMiss ? 'Critical Miss!' :
-        result > targetArmor ? 'Hit!' : 'Miss!';
+        result >= targetArmor ? 'Hit!' : 'Miss!';
     if (advantage === 1) {
       name += ' (Advantage)';
     } else if (advantage === -1) {
@@ -170,18 +169,19 @@ async function applyAttackWithoutTarget(action, prop, attack, taskResult: TaskRe
     result,
     criticalHit,
     criticalMiss,
+    advantage,
   } = await rollAttack(attack, scope, taskResult.pushScope, userInput);
   let name = criticalHit ? 'Critical Hit!' : criticalMiss ? 'Critical Miss!' : 'To Hit';
-  if (scope['~attackAdvantage']?.value === 1) {
+  if (advantage === 1) {
     name += ' (Advantage)';
-  } else if (scope['~attackAdvantage']?.value === -1) {
+  } else if (advantage === -1) {
     name += ' (Disadvantage)';
   }
   if (!criticalMiss) {
-    scope['~attackHit'] = { value: true }
+    taskResult.pushScope['~attackHit'] = { value: true }
   }
   if (!criticalHit) {
-    scope['~attackMiss'] = { value: true };
+    taskResult.pushScope['~attackMiss'] = { value: true };
   }
   taskResult.mutations.push({
     contents: [{