Fix combat item use

diff --git a/QuestPaths/2.x - A Realm Reborn/Side Quests/Black Shroud/East Shroud/745_The Blood Price.json b/QuestPaths/2.x - A Realm Reborn/Side Quests/Black Shroud/East Shroud/745_The Blood Price.json
index 67bd616..bcf91cc 100644 (file)
--- a/QuestPaths/2.x - A Realm Reborn/Side Quests/Black Shroud/East Shroud/745_The Blood Price.json
+++ b/QuestPaths/2.x - A Realm Reborn/Side Quests/Black Shroud/East Shroud/745_The Blood Price.json
@@ -13,7 +13,7 @@
                 "Z": 221.75928
             },
             "TerritoryId": 152,
-            "InteractionType": "AcceptQuest",       
+            "InteractionType": "AcceptQuest",
             "Fly": true
           }
         ]
@@ -55,8 +55,6 @@
                     {
                     "DataId": 2264,
                     "MinimumKillCount": 3,
-                    "ItemId": 2000597,
-                    "ItemUseHealthMaxPercent": 49,
                     "RewardItemId": 2000598,
                     "RewardItemCount": 3
                     }
@@ -87,4 +85,3 @@
       }
     ]
   }
-  
\ No newline at end of file

diff --git a/QuestPaths/2.x - A Realm Reborn/Side Quests/Black Shroud/North Shroud/797_Digging in the Dark.json b/QuestPaths/2.x - A Realm Reborn/Side Quests/Black Shroud/North Shroud/797_Digging in the Dark.json
index cbb97f1..d1e9272 100644 (file)
--- a/QuestPaths/2.x - A Realm Reborn/Side Quests/Black Shroud/North Shroud/797_Digging in the Dark.json
+++ b/QuestPaths/2.x - A Realm Reborn/Side Quests/Black Shroud/North Shroud/797_Digging in the Dark.json
@@ -33,11 +33,14 @@
             {
               "DataId": 2266,
               "MinimumKillCount": 2,
-              "ItemId": 2000627,
-              "ItemUseHealthMaxPercent": 50,
               "RewardItemId": 2000628
             }
-          ]
+          ],
+          "CombatItemUse": {
+            "ItemId": 2000627,
+            "Condition": "Health%",
+            "Value": 50
+          }
         }
       ]
     },

diff --git a/QuestPaths/2.x - A Realm Reborn/Side Quests/Black Shroud/North Shroud/798_A Leg Up.json b/QuestPaths/2.x - A Realm Reborn/Side Quests/Black Shroud/North Shroud/798_A Leg Up.json
index 4a484b2..aac5a91 100644 (file)
--- a/QuestPaths/2.x - A Realm Reborn/Side Quests/Black Shroud/North Shroud/798_A Leg Up.json
+++ b/QuestPaths/2.x - A Realm Reborn/Side Quests/Black Shroud/North Shroud/798_A Leg Up.json
@@ -29,7 +29,15 @@
           },
           "TerritoryId": 154,
           "InteractionType": "UseItem",
-          "ItemId": 2000629
+          "ItemId": 2000629,
+          "CompletionQuestVariablesFlags": [
+            null,
+            null,
+            null,
+            null,
+            null,
+            128
+          ]
         },
         {
           "DataId": 2001997,
@@ -40,7 +48,15 @@
           },
           "TerritoryId": 154,
           "InteractionType": "UseItem",
-          "ItemId": 2000629
+          "ItemId": 2000629,
+          "CompletionQuestVariablesFlags": [
+            null,
+            null,
+            null,
+            null,
+            null,
+            64
+          ]
         },
         {
           "DataId": 2001998,
@@ -51,7 +67,15 @@
           },
           "TerritoryId": 154,
           "InteractionType": "UseItem",
-          "ItemId": 2000629
+          "ItemId": 2000629,
+          "CompletionQuestVariablesFlags": [
+            null,
+            null,
+            null,
+            null,
+            null,
+            32
+          ]
         }
       ]
     },

diff --git a/QuestPaths/2.x - A Realm Reborn/Side Quests/Black Shroud/South Shroud/727_Cloven-hoofed Horrors.json b/QuestPaths/2.x - A Realm Reborn/Side Quests/Black Shroud/South Shroud/727_Cloven-hoofed Horrors.json
index 1057c3c..f81eadb 100644 (file)
--- a/QuestPaths/2.x - A Realm Reborn/Side Quests/Black Shroud/South Shroud/727_Cloven-hoofed Horrors.json
+++ b/QuestPaths/2.x - A Realm Reborn/Side Quests/Black Shroud/South Shroud/727_Cloven-hoofed Horrors.json
@@ -34,11 +34,14 @@
           "ComplexCombatData": [
             {
               "DataId": 2187,
-              "MinimumKillCount": 1,
-              "ItemId": 2000828,
-              "ItemUseHealthMaxPercent": 100
+              "MinimumKillCount": 1
             }
-          ]
+          ],
+          "CombatItemUse": {
+            "ItemId": 2000828,
+            "Condition": "MissingStatus",
+            "Value": 22
+          }
         }
       ]
     },

diff --git a/QuestPaths/2.x - A Realm Reborn/Side Quests/Black Shroud/South Shroud/728_The Trees Have Eyes.json b/QuestPaths/2.x - A Realm Reborn/Side Quests/Black Shroud/South Shroud/728_The Trees Have Eyes.json
index ef6a96b..3a9053a 100644 (file)
--- a/QuestPaths/2.x - A Realm Reborn/Side Quests/Black Shroud/South Shroud/728_The Trees Have Eyes.json
+++ b/QuestPaths/2.x - A Realm Reborn/Side Quests/Black Shroud/South Shroud/728_The Trees Have Eyes.json
@@ -36,6 +36,14 @@
               "RewardItemId": 2000582,
               "RewardItemCount": 4
             }
+          ],
+          "CompletionQuestVariablesFlags": [
+            null,
+            4,
+            null,
+            null,
+            null,
+            null
           ]
         },
         {
@@ -54,6 +62,14 @@
               "RewardItemId": 2000583,
               "RewardItemCount": 2
             }
+          ],
+          "CompletionQuestVariablesFlags": [
+            null,
+            null,
+            32,
+            null,
+            null,
+            null
           ]
         }
       ]

diff --git a/QuestPaths/2.x - A Realm Reborn/Side Quests/Black Shroud/South Shroud/770_Wretched Hive of Villainy.json b/QuestPaths/2.x - A Realm Reborn/Side Quests/Black Shroud/South Shroud/770_Wretched Hive of Villainy.json
index bc0c2fe..7b88ba9 100644 (file)
--- a/QuestPaths/2.x - A Realm Reborn/Side Quests/Black Shroud/South Shroud/770_Wretched Hive of Villainy.json
+++ b/QuestPaths/2.x - A Realm Reborn/Side Quests/Black Shroud/South Shroud/770_Wretched Hive of Villainy.json
@@ -32,15 +32,45 @@
           "ComplexCombatData": [
             {
               "DataId": 87,
-              "MinimumKillCount": 1
+              "MinimumKillCount": 1,
+              "CompletionQuestVariablesFlags": [
+                null,
+                {
+                  "High": 1
+                },
+                null,
+                null,
+                null,
+                null
+              ]
             },
             {
               "DataId": 86,
-              "MinimumKillCount": 1
+              "MinimumKillCount": 1,
+              "CompletionQuestVariablesFlags": [
+                null,
+                {
+                  "Low": 1
+                },
+                null,
+                null,
+                null,
+                null
+              ]
             },
             {
               "DataId": 84,
-              "MinimumKillCount": 1
+              "MinimumKillCount": 1,
+              "CompletionQuestVariablesFlags": [
+                {
+                  "Low": 1
+                },
+                null,
+                null,
+                null,
+                null,
+                null
+              ]
             }
           ]
         }

diff --git a/QuestPaths/2.x - A Realm Reborn/Side Quests/Thanalan/Southern Thanalan/830_U Don't Know Me.json b/QuestPaths/2.x - A Realm Reborn/Side Quests/Thanalan/Southern Thanalan/830_U Don't Know Me.json
index 16a1480..045ee06 100644 (file)
--- a/QuestPaths/2.x - A Realm Reborn/Side Quests/Thanalan/Southern Thanalan/830_U Don't Know Me.json
+++ b/QuestPaths/2.x - A Realm Reborn/Side Quests/Thanalan/Southern Thanalan/830_U Don't Know Me.json
@@ -61,15 +61,16 @@
           "TerritoryId": 146,
           "InteractionType": "Combat",
           "EnemySpawnType": "OverworldEnemies",
-          "KillEnemyDataIds": [
-            2268
+          "ComplexCombatData": [
+            {
+              "DataId": 2268,
+              "MinimumKillCount": 3
+            }
           ],
           "CombatItemUse": {
-            "DataId": 2268,
             "Condition": "Health%",
             "Value": 50,
-            "ItemId": 2000647,
-            "MinimumKillCount": 3
+            "ItemId": 2000647
           },
           "Fly": true
         }

diff --git a/QuestPaths/4.x - Stormblood/Side Quests/Yanxia/2750_Fresh Flesh.json b/QuestPaths/4.x - Stormblood/Side Quests/Yanxia/2750_Fresh Flesh.json
index 79b79e9..0f90fd5 100644 (file)
--- a/QuestPaths/4.x - Stormblood/Side Quests/Yanxia/2750_Fresh Flesh.json
+++ b/QuestPaths/4.x - Stormblood/Side Quests/Yanxia/2750_Fresh Flesh.json
@@ -33,7 +33,7 @@
           "ComplexCombatData": [
             {
               "DataId": 6682,
-              "KillCount": 3
+              "MinimumKillCount": 3
             }
           ]
         }

diff --git a/QuestPaths/quest-v1.json b/QuestPaths/quest-v1.json
index 0c59410..11e72b6 100644 (file)
--- a/QuestPaths/quest-v1.json
+++ b/QuestPaths/quest-v1.json
@@ -697,11 +697,15 @@
                     },
                     "IgnoreQuestMarker": {
                       "type": "boolean"
+                    },
+                    "$": {
+                      "type": "string"
                     }
                   },
                   "required": [
                     "DataId"
-                  ]
+                  ],
+                  "additionalProperties": false
                 }
               },
               "CombatItemUse": {
@@ -727,7 +731,8 @@
                 "required": [
                   "ItemId",
                   "Condition"
-                ]
+                ],
+                "additionalProperties": false
               },
               "CombatDelaySecondsAtStart": {
                 "type": "number"