Add logic for using items on the Spotted Mudpuppy in 'Factual Folklore'

diff --git a/QuestPaths/2.x - A Realm Reborn/MSQ-2/B9-Coerthas Central Highlands, Whitebrim Front/927_Factual Folklore.json b/QuestPaths/2.x - A Realm Reborn/MSQ-2/B9-Coerthas Central Highlands, Whitebrim Front/927_Factual Folklore.json
index b9550d58501f3a36050d62db3cadf21c2434d025..924c6a9d04f0f16e0caeef50b91bd045474e9e29 100644 (file)
--- a/QuestPaths/2.x - A Realm Reborn/MSQ-2/B9-Coerthas Central Highlands, Whitebrim Front/927_Factual Folklore.json
+++ b/QuestPaths/2.x - A Realm Reborn/MSQ-2/B9-Coerthas Central Highlands, Whitebrim Front/927_Factual Folklore.json
@@ -35,10 +35,13 @@
             "Z": 89.58569
           },
           "TerritoryId": 155,
-          "InteractionType": "Instruction",
-          "Comment": "Use Quest item on enemy to weaken it first",
-          "$": "Status Effects: 22 (HP Penalty) + 62 (Damage Down)",
+          "InteractionType": "Combat",
           "EnemySpawnType": "AfterInteraction",
+          "CombatItemUse": {
+            "ItemId": 2000961,
+            "Condition": "MissingStatus",
+            "Value": 22
+          },
           "ComplexCombatData": [
             {
               "DataId": 2196

diff --git a/QuestPaths/quest-v1.json b/QuestPaths/quest-v1.json
index 99105c93c7ff6c2eef9dab193dfd89b94f542b48..f0f826370839c75da38f8fd31f0f3ca5f7fec7e7 100644 (file)
--- a/QuestPaths/quest-v1.json
+++ b/QuestPaths/quest-v1.json
@@ -183,7 +183,8 @@
             "null"
           ],
           "description": "The Item to use",
-          "exclusiveMinimum": 0
+          "exclusiveMinimum": 0,
+          "maximum": 2010000
         },
         "SkipConditions": {
           "type": "object",
@@ -648,13 +649,15 @@
                 "type": "object",
                 "properties": {
                   "ItemId": {
-                    "type": "integer"
+                    "type": "integer",
+                    "maximum": 2010000
                   },
                   "Condition": {
                     "type": "string",
                     "enum": [
                       "Incapacitated",
-                      "Health%"
+                      "Health%",
+                      "MissingStatus"
                     ]
                   },
                   "Value": {

diff --git a/Questionable.Model/Questing/Converter/CombatItemUseConditionConverter.cs b/Questionable.Model/Questing/Converter/CombatItemUseConditionConverter.cs
index 1b4086ffd07b3545bb3d634af9be229a7ddeacb0..deadc4f6b3c9668a394eade64e0da90d0b32bd6e 100644 (file)
--- a/Questionable.Model/Questing/Converter/CombatItemUseConditionConverter.cs
+++ b/Questionable.Model/Questing/Converter/CombatItemUseConditionConverter.cs
@@ -9,5 +9,6 @@ public sealed class CombatItemUseConditionConverter() : EnumConverter<ECombatIte
     {
         { ECombatItemUseCondition.Incapacitated, "Incapacitated" },
         { ECombatItemUseCondition.HealthPercent, "Health%" },
+        { ECombatItemUseCondition.MissingStatus, "MissingStatus" },
     };
 }

diff --git a/Questionable.Model/Questing/ECombatItemUseCondition.cs b/Questionable.Model/Questing/ECombatItemUseCondition.cs
index 7bb4e2b2092daf9a730a989ff5a5f3a55f7edc01..fbbea236656d86c8e63ecbf8b8934e9b02d22221 100644 (file)
--- a/Questionable.Model/Questing/ECombatItemUseCondition.cs
+++ b/Questionable.Model/Questing/ECombatItemUseCondition.cs
@@ -5,4 +5,5 @@ public enum ECombatItemUseCondition
     None,
     Incapacitated,
     HealthPercent,
+    MissingStatus,
 }

diff --git a/Questionable/Controller/CombatModules/ItemUseModule.cs b/Questionable/Controller/CombatModules/ItemUseModule.cs
index 26a92ff32c4f6c7b31551f5b7f517572cd5b6289..95dbea568e52abcb5b0e44ac79aa9fd551a80d5d 100644 (file)
--- a/Questionable/Controller/CombatModules/ItemUseModule.cs
+++ b/Questionable/Controller/CombatModules/ItemUseModule.cs
@@ -108,6 +108,7 @@ internal sealed class ItemUseModule : ICombatModule
                     _delegate.Stop();
                     unsafe
                     {
+                        _logger.LogInformation("Using item {ItemId}", _combatData.CombatItemUse.ItemId);
                         AgentInventoryContext.Instance()->UseItem(_combatData.CombatItemUse.ItemId);
                     }
                     _continueAt = DateTime.Now.AddSeconds(2);
@@ -147,6 +148,9 @@ internal sealed class ItemUseModule : ICombatModule
 
             if (_combatData.CombatItemUse.Condition == ECombatItemUseCondition.HealthPercent)
                 return (100f * battleChara->Health / battleChara->MaxHealth) < _combatData.CombatItemUse.Value;
+
+            if (_combatData.CombatItemUse.Condition == ECombatItemUseCondition.MissingStatus)
+                return !battleChara->StatusManager.HasStatus((uint)_combatData.CombatItemUse.Value);
         }
 
         return false;