resolved merge conflicts

diff --git a/QuestPaths/quest-v1.json b/QuestPaths/quest-v1.json
index 0a3be7325675167d5e3b9d196bab365bbc331752..ff535a8ff584130a4c7b915eba0f1f2ca80adedf 100644 (file)
--- 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 5410e44b030e14d8a21d4d6c521c646b3b54a2f5..42e6e3845bf122e5b79e3b4e6fd36abbfdee5faf 100644 (file)
--- 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 08f71d5ae3c3312019bcdbc992c2f018c3b5a209..15e7f8429e31b8b6fec19dfba2ff26ed7d18ec05 100644 (file)
--- 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,