From 734d85a582120b5eb1118dc903ad8b156e9549de Mon Sep 17 00:00:00 2001 From: trainvoi Date: Tue, 13 Feb 2024 21:22:30 -0500 Subject: [PATCH 1/3] add checkbox for cryogenic fluids + more OR task logic --- config/betterquesting/DefaultQuests.json | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/config/betterquesting/DefaultQuests.json b/config/betterquesting/DefaultQuests.json index 0c2b27938..b9ad0dbc9 100644 --- a/config/betterquesting/DefaultQuests.json +++ b/config/betterquesting/DefaultQuests.json @@ -30070,6 +30070,10 @@ } }, "taskID:8": "bq_standard:fluid" + }, + "1:10": { + "index:3": 1, + "taskID:8": "bq_standard:checkbox" } } }, @@ -30137,6 +30141,10 @@ } }, "taskID:8": "bq_standard:fluid" + }, + "1:10": { + "index:3": 1, + "taskID:8": "bq_standard:checkbox" } } }, @@ -34647,6 +34655,7 @@ "ignoresview:1": 0, "name:8": "susy.quest.db.808.title", "questlogic:8": "OR", + "tasklogic:8": "OR", "visibility:8": "ALWAYS" } }, @@ -36818,6 +36827,10 @@ } }, "taskID:8": "bq_standard:fluid" + }, + "1:10": { + "index:3": 1, + "taskID:8": "bq_standard:checkbox" } } } From 30ff8faea57e77ed1a7020ea5f721cfd9f8f7959 Mon Sep 17 00:00:00 2001 From: trainvoi Date: Tue, 13 Feb 2024 21:24:56 -0500 Subject: [PATCH 2/3] Update DefaultQuests.json --- config/betterquesting/DefaultQuests.json | 3 +++ 1 file changed, 3 insertions(+) diff --git a/config/betterquesting/DefaultQuests.json b/config/betterquesting/DefaultQuests.json index b9ad0dbc9..a4772f104 100644 --- a/config/betterquesting/DefaultQuests.json +++ b/config/betterquesting/DefaultQuests.json @@ -30056,6 +30056,7 @@ }, "ignoresview:1": 0, "name:8": "susy.quest.db.675.title", + "tasklogic:8": "OR", "visibility:8": "ALWAYS" } }, @@ -30127,6 +30128,7 @@ }, "ignoresview:1": 0, "name:8": "susy.quest.db.677.title", + "tasklogic:8": "OR", "visibility:8": "ALWAYS" } }, @@ -36813,6 +36815,7 @@ }, "ignoresview:1": 0, "name:8": "susy.quest.db.882.title", + "tasklogic:8": "OR", "visibility:8": "ALWAYS" } }, From 70c5541fe692556805f3d62bbe6a0980f3e57b8a Mon Sep 17 00:00:00 2001 From: trainvoi Date: Sun, 3 Mar 2024 12:54:35 -0500 Subject: [PATCH 3/3] more quest fixes (#767) * Update DefaultQuests.json * Revert "Update DefaultQuests.json" This reverts commit 73ee8495336e6a881753a793568dd29d1e426931. * Update DefaultQuests.json * allow steam machine quests to accept high pressure variants --- config/betterquesting/DefaultQuests.json | 169 ++++++++++++++++++++++- 1 file changed, 165 insertions(+), 4 deletions(-) diff --git a/config/betterquesting/DefaultQuests.json b/config/betterquesting/DefaultQuests.json index a4772f104..d3a9792c6 100644 --- a/config/betterquesting/DefaultQuests.json +++ b/config/betterquesting/DefaultQuests.json @@ -1,5 +1,4 @@ { - "build:8": "4.1.0", "format:8": "2.0.0", "questDatabase:9": { "0:10": { @@ -1447,6 +1446,7 @@ "ignoresview:1": 0, "ismain:1": 1, "name:8": "susy.quest.db.31.title", + "tasklogic:8": "OR", "visibility:8": "ALWAYS" } }, @@ -1463,6 +1463,18 @@ } }, "taskID:8": "bq_standard:retrieval" + }, + "1:10": { + "index:3": 1, + "partialMatch:1": 1, + "requiredItems:9": { + "0:10": { + "Count:3": 1, + "Damage:2": 2, + "id:8": "gregtech:machine" + } + }, + "taskID:8": "bq_standard:retrieval" } } }, @@ -1480,6 +1492,7 @@ "ignoresview:1": 0, "ismain:1": 1, "name:8": "susy.quest.db.32.title", + "tasklogic:8": "OR", "visibility:8": "ALWAYS" } }, @@ -1496,6 +1509,18 @@ } }, "taskID:8": "bq_standard:retrieval" + }, + "1:10": { + "index:3": 1, + "partialMatch:1": 1, + "requiredItems:9": { + "0:10": { + "Count:3": 1, + "Damage:2": 18, + "id:8": "gregtech:machine" + } + }, + "taskID:8": "bq_standard:retrieval" } } }, @@ -1513,6 +1538,7 @@ "ignoresview:1": 0, "ismain:1": 1, "name:8": "susy.quest.db.33.title", + "tasklogic:8": "OR", "visibility:8": "ALWAYS" } }, @@ -1529,6 +1555,18 @@ } }, "taskID:8": "bq_standard:retrieval" + }, + "1:10": { + "index:3": 1, + "partialMatch:1": 1, + "requiredItems:9": { + "0:10": { + "Count:3": 1, + "Damage:2": 10, + "id:8": "gregtech:machine" + } + }, + "taskID:8": "bq_standard:retrieval" } } }, @@ -1606,6 +1644,7 @@ "ignoresview:1": 0, "ismain:1": 1, "name:8": "susy.quest.db.35.title", + "tasklogic:8": "OR", "visibility:8": "ALWAYS" } }, @@ -1622,6 +1661,18 @@ } }, "taskID:8": "bq_standard:retrieval" + }, + "1:10": { + "index:3": 1, + "partialMatch:1": 1, + "requiredItems:9": { + "0:10": { + "Count:3": 1, + "Damage:2": 14511, + "id:8": "gregtech:machine" + } + }, + "taskID:8": "bq_standard:retrieval" } } }, @@ -1706,6 +1757,7 @@ "ignoresview:1": 0, "ismain:1": 1, "name:8": "susy.quest.db.38.title", + "tasklogic:8": "OR", "visibility:8": "ALWAYS" } }, @@ -1722,6 +1774,18 @@ } }, "taskID:8": "bq_standard:retrieval" + }, + "1:10": { + "index:3": 1, + "partialMatch:1": 1, + "requiredItems:9": { + "0:10": { + "Count:3": 1, + "Damage:2": 14680, + "id:8": "gregtech:machine" + } + }, + "taskID:8": "bq_standard:retrieval" } } }, @@ -1739,7 +1803,8 @@ "ignoresview:1": 0, "ismain:1": 1, "name:8": "susy.quest.db.39.title", - "visibility:8": "ALWAYS" + "tasklogic:8": "OR", + "visibility:8": "COMPLETED" } }, "questID:3": 39, @@ -1755,6 +1820,18 @@ } }, "taskID:8": "bq_standard:retrieval" + }, + "1:10": { + "index:3": 1, + "partialMatch:1": 1, + "requiredItems:9": { + "0:10": { + "Count:3": 1, + "Damage:2": 12, + "id:8": "gregtech:machine" + } + }, + "taskID:8": "bq_standard:retrieval" } } }, @@ -1772,6 +1849,7 @@ "ignoresview:1": 0, "ismain:1": 1, "name:8": "susy.quest.db.40.title", + "tasklogic:8": "OR", "visibility:8": "ALWAYS" } }, @@ -1788,6 +1866,18 @@ } }, "taskID:8": "bq_standard:retrieval" + }, + "1:10": { + "index:3": 1, + "partialMatch:1": 1, + "requiredItems:9": { + "0:10": { + "Count:3": 1, + "Damage:2": 14, + "id:8": "gregtech:machine" + } + }, + "taskID:8": "bq_standard:retrieval" } } }, @@ -1807,6 +1897,7 @@ "ismain:1": 1, "name:8": "susy.quest.db.41.title", "questlogic:8": "OR", + "tasklogic:8": "OR", "visibility:8": "ALWAYS" } }, @@ -1823,6 +1914,18 @@ } }, "taskID:8": "bq_standard:retrieval" + }, + "1:10": { + "index:3": 1, + "partialMatch:1": 1, + "requiredItems:9": { + "0:10": { + "Count:3": 1, + "Damage:2": 14516, + "id:8": "gregtech:machine" + } + }, + "taskID:8": "bq_standard:retrieval" } } }, @@ -1947,6 +2050,7 @@ "ignoresview:1": 0, "ismain:1": 1, "name:8": "susy.quest.db.45.title", + "tasklogic:8": "OR", "visibility:8": "ALWAYS" } }, @@ -1963,6 +2067,18 @@ } }, "taskID:8": "bq_standard:retrieval" + }, + "1:10": { + "index:3": 1, + "partialMatch:1": 1, + "requiredItems:9": { + "0:10": { + "Count:3": 1, + "Damage:2": 14537, + "id:8": "gregtech:machine" + } + }, + "taskID:8": "bq_standard:retrieval" } } }, @@ -2374,6 +2490,7 @@ "ignoresview:1": 0, "name:8": "susy.quest.db.57.title", "questlogic:8": "OR", + "tasklogic:8": "OR", "visibility:8": "ALWAYS" } }, @@ -2390,6 +2507,18 @@ } }, "taskID:8": "bq_standard:retrieval" + }, + "1:10": { + "index:3": 1, + "partialMatch:1": 1, + "requiredItems:9": { + "0:10": { + "Count:3": 1, + "Damage:2": 6, + "id:8": "gregtech:machine" + } + }, + "taskID:8": "bq_standard:retrieval" } } }, @@ -2408,6 +2537,7 @@ "ignoresview:1": 0, "name:8": "susy.quest.db.58.title", "questlogic:8": "OR", + "tasklogic:8": "OR", "visibility:8": "ALWAYS" } }, @@ -2424,6 +2554,18 @@ } }, "taskID:8": "bq_standard:retrieval" + }, + "1:10": { + "index:3": 1, + "partialMatch:1": 1, + "requiredItems:9": { + "0:10": { + "Count:3": 1, + "Damage:2": 4, + "id:8": "gregtech:machine" + } + }, + "taskID:8": "bq_standard:retrieval" } } }, @@ -3102,6 +3244,7 @@ "ignoresview:1": 0, "ismain:1": 1, "name:8": "susy.quest.db.78.title", + "questlogic:8": "OR", "visibility:8": "ALWAYS" } }, @@ -3118,6 +3261,18 @@ } }, "taskID:8": "bq_standard:retrieval" + }, + "1:10": { + "index:3": 1, + "partialMatch:1": 1, + "requiredItems:9": { + "0:10": { + "Count:3": 1, + "Damage:2": 14539, + "id:8": "gregtech:machine" + } + }, + "taskID:8": "bq_standard:retrieval" } } }, @@ -5586,6 +5741,7 @@ }, "ignoresview:1": 0, "name:8": "susy.quest.db.147.title", + "tasklogic:8": "OR", "visibility:8": "ALWAYS" } }, @@ -15589,6 +15745,7 @@ "taskID:8": "bq_standard:fluid" }, "1:10": { + "index:3": 1, "requiredFluids:9": { "0:10": { "Amount:3": 1000, @@ -15651,7 +15808,7 @@ }, "questID:3": 436, "rewards:9": {}, - "tasks:9": { + "tasks:9": { "0:10": { "taskID:8": "bq_standard:checkbox" } @@ -35190,7 +35347,6 @@ "ignoresview:1": 0, "name:8": "susy.quest.db.823.title", "tasklogic:8": "OR", - "tasklogic:8": "OR", "visibility:8": "ALWAYS" } }, @@ -36284,6 +36440,7 @@ }, "ignoresview:1": 0, "name:8": "susy.quest.db.865.title", + "tasklogic:8": "OR", "visibility:8": "ALWAYS" } }, @@ -36796,6 +36953,10 @@ } }, "taskID:8": "bq_standard:fluid" + }, + "1:10": { + "index:3": 1, + "taskID:8": "bq_standard:checkbox" } } },