From ccdfa75e574f20f5eccefd508db3e1ef4def58c7 Mon Sep 17 00:00:00 2001
From: John Nolan <me@johnnolan.dev>
Date: Tue, 22 Nov 2022 21:11:45 +0000
Subject: [PATCH] #minor Fix for non midi criticals are tracked in combat
 (#399)

* Fix for non midi criticals are tracked in combat

This allows for weapons with custom critical thresholds

Fixes #282
---
 scripts/stats/DND5eStat.test.ts | 2 +-
 scripts/stats/DND5eStat.ts      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/scripts/stats/DND5eStat.test.ts b/scripts/stats/DND5eStat.test.ts
index cab95394..279e5be7 100644
--- a/scripts/stats/DND5eStat.test.ts
+++ b/scripts/stats/DND5eStat.test.ts
@@ -51,6 +51,7 @@ const encounterDefaultWorkflowDamage: EncounterWorkflow = {
   },
   damageTotal: 41,
   damageMultipleEnemiesTotal: 41,
+  isCritical: false,
   type: CombatDetailType.Damage,
 };
 
@@ -136,7 +137,6 @@ describe("DND5eStat", () => {
         },
         round: 1,
         attackTotal: 19,
-        isCritical: false,
         isFumble: false,
         advantage: true,
         disadvantage: false,
diff --git a/scripts/stats/DND5eStat.ts b/scripts/stats/DND5eStat.ts
index 092b2cfc..ae67af2c 100644
--- a/scripts/stats/DND5eStat.ts
+++ b/scripts/stats/DND5eStat.ts
@@ -27,9 +27,9 @@ export default class DND5eStat extends Stat {
         newCombatantEvent.damageTotal = workflow.damageTotal;
         newCombatantEvent.damageMultipleEnemiesTotal =
           workflow.damageMultipleEnemiesTotal;
+        newCombatantEvent.isCritical = workflow.isCritical;
       } else if (workflow.type === CombatDetailType.Attack) {
         newCombatantEvent.attackTotal = workflow.attackTotal;
-        newCombatantEvent.isCritical = workflow.isCritical;
         newCombatantEvent.isFumble = workflow.isFumble;
         newCombatantEvent.advantage = workflow.advantage;
         newCombatantEvent.disadvantage = workflow.disadvantage;