Merge pull request #1044 from MCTian-mi/pyrotech-polishments

Pyrotech polishments
SymmetricDevs · Nov 4, 2024 · 7e916bc · 7e916bc
2 parents a4d1677 + ec3b87b
commit 7e916bc
Show file tree

Hide file tree

Showing 32 changed files with 529 additions and 150 deletions.
diff --git a/config/betterquesting/DefaultQuests/QuestLines/0.json b/config/betterquesting/DefaultQuests/QuestLines/0.json
@@ -156,7 +156,7 @@
       "id:3": 22,
       "sizeX:3": 48,
       "sizeY:3": 48,
-      "x:3": 420,
+      "x:3": 456,
       "y:3": 83
     },
     "21:10": {
@@ -170,7 +170,7 @@
       "id:3": 25,
       "sizeX:3": 40,
       "sizeY:3": 40,
-      "x:3": 424,
+      "x:3": 460,
       "y:3": -21
     },
     "23:10": {
@@ -191,7 +191,7 @@
       "id:3": 30,
       "sizeX:3": 48,
       "sizeY:3": 48,
-      "x:3": 420,
+      "x:3": 456,
       "y:3": -89
     },
     "26:10": {
@@ -205,7 +205,7 @@
       "id:3": 74,
       "sizeX:3": 24,
       "sizeY:3": 24,
-      "x:3": 432,
+      "x:3": 468,
       "y:3": 356
     },
     "28:10": {
@@ -240,8 +240,8 @@
       "id:3": 89,
       "sizeX:3": 48,
       "sizeY:3": 48,
-      "x:3": 112,
-      "y:3": 36
+      "x:3": 396,
+      "y:3": -25
     },
     "33:10": {
       "id:3": 90,
@@ -254,28 +254,28 @@
       "id:3": 91,
       "sizeX:3": 48,
       "sizeY:3": 48,
-      "x:3": 112,
-      "y:3": 128
+      "x:3": 100,
+      "y:3": 43
     },
     "35:10": {
       "id:3": 93,
       "sizeX:3": 24,
       "sizeY:3": 24,
-      "x:3": 71,
+      "x:3": 84,
       "y:3": 260
     },
     "36:10": {
       "id:3": 106,
       "sizeX:3": 24,
       "sizeY:3": 24,
-      "x:3": 432,
+      "x:3": 468,
       "y:3": 304
     },
     "37:10": {
       "id:3": 107,
       "sizeX:3": 24,
       "sizeY:3": 24,
-      "x:3": 432,
+      "x:3": 468,
       "y:3": 249
     },
     "38:10": {
@@ -303,7 +303,7 @@
       "id:3": 129,
       "sizeX:3": 24,
       "sizeY:3": 24,
-      "x:3": 432,
+      "x:3": 468,
       "y:3": 39
     },
     "42:10": {
@@ -317,8 +317,8 @@
       "id:3": 149,
       "sizeX:3": 24,
       "sizeY:3": 24,
-      "x:3": 165,
-      "y:3": 95
+      "x:3": 178,
+      "y:3": 55
     },
     "44:10": {
       "id:3": 187,
@@ -331,15 +331,15 @@
       "id:3": 213,
       "sizeX:3": 24,
       "sizeY:3": 24,
-      "x:3": 476,
-      "y:3": -40
+      "x:3": 512,
+      "y:3": -13
     },
     "46:10": {
       "id:3": 366,
       "sizeX:3": 24,
       "sizeY:3": 24,
-      "x:3": 256,
-      "y:3": -21
+      "x:3": 40,
+      "y:3": 356
     },
     "47:10": {
       "id:3": 441,
@@ -352,8 +352,8 @@
       "id:3": 650,
       "sizeX:3": 48,
       "sizeY:3": 48,
-      "x:3": 536,
-      "y:3": -52
+      "x:3": 555,
+      "y:3": -25
     },
     "49:10": {
       "id:3": 656,
@@ -380,22 +380,22 @@
       "id:3": 722,
       "sizeX:3": 24,
       "sizeY:3": 24,
-      "x:3": 388,
+      "x:3": 512,
       "y:3": -56
     },
     "53:10": {
       "id:3": 723,
       "sizeX:3": 24,
       "sizeY:3": 24,
-      "x:3": 388,
-      "y:3": -28
+      "x:3": 567,
+      "y:3": -56
     },
     "54:10": {
       "id:3": 738,
       "sizeX:3": 24,
       "sizeY:3": 24,
-      "x:3": 388,
-      "y:3": 28
+      "x:3": 567,
+      "y:3": 32
     },
     "55:10": {
       "id:3": 763,
@@ -408,8 +408,8 @@
       "id:3": 861,
       "sizeX:3": 24,
       "sizeY:3": 24,
-      "x:3": 388,
-      "y:3": 0
+      "x:3": 512,
+      "y:3": 32
     },
     "57:10": {
       "id:3": 862,
@@ -450,8 +450,8 @@
       "id:3": 456863075,
       "sizeX:3": 32,
       "sizeY:3": 32,
-      "x:3": 28,
-      "y:3": 256
+      "x:3": 36,
+      "y:3": 240
     },
     "63:10": {
       "id:3": 530373325,
@@ -471,15 +471,15 @@
       "id:3": 744003683,
       "sizeX:3": 24,
       "sizeY:3": 24,
-      "x:3": 71,
+      "x:3": 84,
       "y:3": 300
     },
     "66:10": {
       "id:3": 1107188354,
       "sizeX:3": 32,
       "sizeY:3": 32,
-      "x:3": 176,
-      "y:3": 264
+      "x:3": 166,
+      "y:3": 296
     },
     "67:10": {
       "id:3": 1241306929,
@@ -499,7 +499,7 @@
       "id:3": 1580653524,
       "sizeX:3": 24,
       "sizeY:3": 24,
-      "x:3": 144,
+      "x:3": 127,
       "y:3": 300
     },
     "70:10": {
@@ -520,8 +520,8 @@
       "id:3": 1677924297,
       "sizeX:3": 24,
       "sizeY:3": 24,
-      "x:3": 476,
-      "y:3": -12
+      "x:3": 424,
+      "y:3": -56
     },
     "73:10": {
       "id:3": 1767849062,
@@ -534,8 +534,8 @@
       "id:3": 1867050010,
       "sizeX:3": 24,
       "sizeY:3": 24,
-      "x:3": 476,
-      "y:3": 16
+      "x:3": 424,
+      "y:3": 32
     },
     "75:10": {
       "id:3": 1902566957,
@@ -555,7 +555,7 @@
       "id:3": 2081939483,
       "sizeX:3": 24,
       "sizeY:3": 24,
-      "x:3": 71,
+      "x:3": 84,
       "y:3": 344
     }
   }

diff --git a/config/betterquesting/DefaultQuests/QuestLines/1.json b/config/betterquesting/DefaultQuests/QuestLines/1.json
@@ -430,15 +430,15 @@
       "id:3": 518,
       "sizeX:3": 24,
       "sizeY:3": 24,
-      "x:3": -174,
-      "y:3": -60
+      "x:3": -175,
+      "y:3": -72
     },
     "60:10": {
       "id:3": 535,
       "sizeX:3": 24,
       "sizeY:3": 24,
-      "x:3": -204,
-      "y:3": -90
+      "x:3": -228,
+      "y:3": -72
     },
     "61:10": {
       "id:3": 536,

diff --git a/config/betterquesting/DefaultQuests/Quests/0/117.json b/config/betterquesting/DefaultQuests/Quests/0/117.json
@@ -1,6 +1,11 @@
 {
+  "preRequisiteTypes:7": [
+    0,
+    2
+  ],
   "preRequisites:11": [
-    58115670
+    58115670,
+    1677924297
   ],
   "properties:10": {
     "betterquesting:10": {
@@ -12,6 +17,7 @@
       },
       "ignoresview:1": 0,
       "name:8": "susy.quest.db.117.title",
+      "questlogic:8": "OR",
       "visibility:8": "ALWAYS"
     }
   },

diff --git a/config/betterquesting/DefaultQuests/Quests/0/1958019111.json b/config/betterquesting/DefaultQuests/Quests/0/1958019111.json
@@ -1,7 +1,6 @@
 {
   "preRequisites:11": [
-    1107188354,
-    1580653524
+    1107188354
   ],
   "properties:10": {
     "betterquesting:10": {

diff --git a/config/betterquesting/DefaultQuests/Quests/0/366.json b/config/betterquesting/DefaultQuests/Quests/0/366.json
@@ -1,6 +1,6 @@
 {
   "preRequisites:11": [
-    21
+    87
   ],
   "properties:10": {
     "betterquesting:10": {

diff --git a/config/betterquesting/DefaultQuests/Quests/0/58115670.json b/config/betterquesting/DefaultQuests/Quests/0/58115670.json
@@ -11,6 +11,7 @@
       },
       "ignoresview:1": 0,
       "name:8": "susy.quest.db.58115670.title",
+      "tasklogic:8": "OR",
       "visibility:8": "ALWAYS"
     }
   },

diff --git a/config/betterquesting/DefaultQuests/Quests/0/744003683.json b/config/betterquesting/DefaultQuests/Quests/0/744003683.json
@@ -1,7 +1,6 @@
 {
   "preRequisites:11": [
-    87,
-    456863075
+    87
   ],
   "properties:10": {
     "betterquesting:10": {

diff --git a/config/betterquesting/DefaultQuests/Quests/0/89.json b/config/betterquesting/DefaultQuests/Quests/0/89.json
@@ -1,6 +1,6 @@
 {
   "preRequisites:11": [
-    149
+    25
   ],
   "properties:10": {
     "betterquesting:10": {

diff --git a/config/betterquesting/DefaultQuests/Quests/1/10.json b/config/betterquesting/DefaultQuests/Quests/1/10.json
@@ -1,6 +1,6 @@
 {
   "preRequisites:11": [
-    9
+    12
   ],
   "properties:10": {
     "betterquesting:10": {

diff --git a/config/betterquesting/DefaultQuests/Quests/1/34.json b/config/betterquesting/DefaultQuests/Quests/1/34.json
@@ -24,26 +24,39 @@
       "requiredItems:9": {
         "0:10": {
           "Count:3": 1,
-          "Damage:2": 16,
+          "Damage:2": 18,
           "id:8": "gregtech:meta_item_1"
         },
         "1:10": {
           "Count:3": 1,
-          "Damage:2": 12,
+          "Damage:2": 17,
           "id:8": "gregtech:meta_item_1"
-        },
-        "2:10": {
+        }
+      },
+      "taskID:8": "bq_standard:retrieval"
+    },
+    "1:10": {
+      "entryLogic:8": "AND",
+      "index:3": 1,
+      "partialMatch:1": 1,
+      "requiredItems:9": {
+        "0:10": {
           "Count:3": 1,
           "Damage:2": 13,
           "id:8": "gregtech:meta_item_1"
         },
-        "3:10": {
+        "1:10": {
           "Count:3": 1,
-          "Damage:2": 17,
+          "Damage:2": 23,
+          "id:8": "gregtech:meta_item_1"
+        },
+        "2:10": {
+          "Count:3": 1,
+          "Damage:2": 16,
           "id:8": "gregtech:meta_item_1"
         }
       },
-      "taskID:8": "bq_standard:retrieval"
+      "taskID:8": "bq_standard:optional_retrieval"
     }
   }
 }
diff --git a/config/betterquesting/DefaultQuests/Quests/1/518.json b/config/betterquesting/DefaultQuests/Quests/1/518.json
@@ -1,6 +1,6 @@
 {
   "preRequisites:11": [
-    32
+    97148971
   ],
   "properties:10": {
     "betterquesting:10": {

diff --git a/config/betterquesting/DefaultQuests/Quests/25/150.json b/config/betterquesting/DefaultQuests/Quests/25/150.json
@@ -22,6 +22,7 @@
       "requiredItems:9": {
         "0:10": {
           "Count:3": 1,
+          "OreDict:8": "chest",
           "id:8": "minecraft:chest"
         }
       },