From ab1e487efab4d385e30979106dbb11e33438fe5e Mon Sep 17 00:00:00 2001
From: Integer Limit <103940576+IntegerLimit@users.noreply.github.com>
Date: Wed, 28 Aug 2024 23:19:07 +1000
Subject: [PATCH] Fix Auto Completing HPCA Quest (#971)

[QB]
---
 .../config-overrides/expert/betterquesting/DefaultQuests.json | 2 +-
 .../config-overrides/normal/betterquesting/DefaultQuests.json | 2 +-
 overrides/config/betterquesting/DefaultQuests.json            | 2 +-
 .../config/betterquesting/saved_quests/ExpertQuests.json      | 2 +-
 tools/storage/savedQBPorter.json                              | 4 ++++
 5 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/overrides/config-overrides/expert/betterquesting/DefaultQuests.json b/overrides/config-overrides/expert/betterquesting/DefaultQuests.json
index aac9bb0..de8cf80 100644
--- a/overrides/config-overrides/expert/betterquesting/DefaultQuests.json
+++ b/overrides/config-overrides/expert/betterquesting/DefaultQuests.json
@@ -54790,7 +54790,7 @@
           "simultaneous:1": 0,
           "snd_complete:8": "minecraft:entity.player.levelup",
           "snd_update:8": "minecraft:entity.player.levelup",
-          "tasklogic:8": "OR",
+          "tasklogic:8": "AND",
           "visibility:8": "ALWAYS"
         }
       },
diff --git a/overrides/config-overrides/normal/betterquesting/DefaultQuests.json b/overrides/config-overrides/normal/betterquesting/DefaultQuests.json
index b4cb901..584b237 100644
--- a/overrides/config-overrides/normal/betterquesting/DefaultQuests.json
+++ b/overrides/config-overrides/normal/betterquesting/DefaultQuests.json
@@ -64563,7 +64563,7 @@
           "simultaneous:1": 0,
           "snd_complete:8": "minecraft:entity.player.levelup",
           "snd_update:8": "minecraft:entity.player.levelup",
-          "tasklogic:8": "OR",
+          "tasklogic:8": "AND",
           "visibility:8": "ALWAYS"
         }
       },
diff --git a/overrides/config/betterquesting/DefaultQuests.json b/overrides/config/betterquesting/DefaultQuests.json
index b4cb901..584b237 100644
--- a/overrides/config/betterquesting/DefaultQuests.json
+++ b/overrides/config/betterquesting/DefaultQuests.json
@@ -64563,7 +64563,7 @@
           "simultaneous:1": 0,
           "snd_complete:8": "minecraft:entity.player.levelup",
           "snd_update:8": "minecraft:entity.player.levelup",
-          "tasklogic:8": "OR",
+          "tasklogic:8": "AND",
           "visibility:8": "ALWAYS"
         }
       },
diff --git a/overrides/config/betterquesting/saved_quests/ExpertQuests.json b/overrides/config/betterquesting/saved_quests/ExpertQuests.json
index aac9bb0..de8cf80 100644
--- a/overrides/config/betterquesting/saved_quests/ExpertQuests.json
+++ b/overrides/config/betterquesting/saved_quests/ExpertQuests.json
@@ -54790,7 +54790,7 @@
           "simultaneous:1": 0,
           "snd_complete:8": "minecraft:entity.player.levelup",
           "snd_update:8": "minecraft:entity.player.levelup",
-          "tasklogic:8": "OR",
+          "tasklogic:8": "AND",
           "visibility:8": "ALWAYS"
         }
       },
diff --git a/tools/storage/savedQBPorter.json b/tools/storage/savedQBPorter.json
index 344f64b..394ea70 100644
--- a/tools/storage/savedQBPorter.json
+++ b/tools/storage/savedQBPorter.json
@@ -420,6 +420,10 @@
       "normal": 1035,
       "expert": 1035
     },
+    {
+      "normal": 1036,
+      "expert": 1036
+    },
     {
       "normal": 1037,
       "expert": 1037