From 6e7ade5ee74ac2044a3d5dd47de1e1f47e1ff7e2 Mon Sep 17 00:00:00 2001
From: pot0to <xxuemma@gmail.com>
Date: Thu, 22 Aug 2024 15:33:18 -0700
Subject: [PATCH] resolved merge conflicts

---
 QuestPaths/quest-v1.json                                 | 1 +
 Questionable.Model/Questing/Converter/ActionConverter.cs | 1 +
 Questionable.Model/Questing/EAction.cs                   | 1 +
 3 files changed, 3 insertions(+)

diff --git a/QuestPaths/quest-v1.json b/QuestPaths/quest-v1.json
index 0a3be732..ff535a8f 100644
--- a/QuestPaths/quest-v1.json
+++ b/QuestPaths/quest-v1.json
@@ -838,6 +838,7 @@
                 "description": "The action to use",
                 "enum": [
                   "Heavy Swing",
+                  "Heavy Shot",
                   "Cure",
                   "Esuna",
                   "Physick",
diff --git a/Questionable.Model/Questing/Converter/ActionConverter.cs b/Questionable.Model/Questing/Converter/ActionConverter.cs
index 5410e44b..42e6e384 100644
--- a/Questionable.Model/Questing/Converter/ActionConverter.cs
+++ b/Questionable.Model/Questing/Converter/ActionConverter.cs
@@ -8,6 +8,7 @@ public sealed class ActionConverter() : EnumConverter<EAction>(Values)
     private static readonly Dictionary<EAction, string> Values = new()
     {
         { EAction.HeavySwing, "Heavy Swing" },
+        { EAction.HeavyShot, "Heavy Shot" },
         { EAction.Cure, "Cure" },
         { EAction.Esuna, "Esuna" },
         { EAction.Physick, "Physick" },
diff --git a/Questionable.Model/Questing/EAction.cs b/Questionable.Model/Questing/EAction.cs
index 08f71d5a..15e7f842 100644
--- a/Questionable.Model/Questing/EAction.cs
+++ b/Questionable.Model/Questing/EAction.cs
@@ -7,6 +7,7 @@ namespace Questionable.Model.Questing;
 public enum EAction
 {
     HeavySwing = 31,
+    HeavyShot = 97,
     Cure = 120,
     Esuna = 7568,
     Physick = 190,