Implementation: Adds raw ores as a valid quest imput. (#16034)

* Stone Age Quests * Tier 0.5 Steam * Tier 1 - LV * Apprentice Thaumaturgy * Tier 2 - MV * Tier 3 - HV * Tier 4 - EV * Tier 5 - IV * Add rawOre to Forestry Miner Backpack, Try 1 * Update MV quest line files Should fix: * #16277 * Set the drops system to be off for now. * Fortune is on again. --------- Co-authored-by: D-Cysteine <[email protected]>
GTNewHorizons · May 22, 2024 · d2337a9 · d2337a9
1 parent bfb0f9e
commit d2337a9
Show file tree

Hide file tree

Showing 35 changed files with 1,888 additions and 202 deletions.
diff --git a/config/GregTech/GregTech.cfg b/config/GregTech/GregTech.cfg
@@ -175,6 +175,16 @@ machines {
     B:wirefire_on_explosion=true
 }
 
+oredropbehaviour {
+    # Settings: 
+    # 'PerDimBlock': Sets the drop to the block variant of the ore block based on dimension, defaults to stone type, 
+    # 'UnifiedBlock': Sets the drop to the stone variant of the ore block, 
+    # 'Block': Sets the drop to the ore  mined, 
+    # 'FortuneItem': Sets the drop to the new ore item and makes it affected by fortune, 
+    # 'Item': Sets the drop to the new ore item, 
+    # Defaults to: 'FortuneItem'
+    S:general=FortuneItem
+}
 
 pollution {
     B:EnablePollution=true

diff --git a/.../QuestLines/Tier2MV-AAAAAAAAAAAAAAAAAAAABA==/TantalumNether-AAAAAAAAAAAAAAAAAAAJeg==.json b/.../QuestLines/Tier2MV-AAAAAAAAAAAAAAAAAAAABA==/TantalumNether-AAAAAAAAAAAAAAAAAAAJeg==.json
diff --git a/...orldTantalu-AAAAAAAAAAAAAAAAAAAHKw==.json → ...TantalumOre-AAAAAAAAAAAAAAAAAAAHKw==.json b/...orldTantalu-AAAAAAAAAAAAAAAAAAAHKw==.json → ...TantalumOre-AAAAAAAAAAAAAAAAAAAHKw==.json
diff --git a/...sts/NoviceThaumaturg-AAAAAAAAAAAAAAAAAAAAFg==/InfusedStones-AAAAAAAAAAAAAAAAAAAA5Q==.json b/...sts/NoviceThaumaturg-AAAAAAAAAAAAAAAAAAAAFg==/InfusedStones-AAAAAAAAAAAAAAAAAAAA5Q==.json
@@ -10,7 +10,7 @@
   "properties:10": {
     "betterquesting:10": {
       "snd_complete:8": "random.levelup",
-      "taskLogic:8": "AND",
+      "taskLogic:8": "OR",
       "partySingleReward:1": 0,
       "visibility:8": "NORMAL",
       "isMain:1": 1,
@@ -54,74 +54,100 @@
           "Count:3": 16,
           "Damage:2": 541,
           "OreDict:8": ""
-        }
-      },
-      "taskID:8": "bq_standard:retrieval"
-    },
-    "1:10": {
-      "partialMatch:1": 1,
-      "autoConsume:1": 0,
-      "groupDetect:1": 0,
-      "ignoreNBT:1": 1,
-      "index:3": 1,
-      "consume:1": 0,
-      "requiredItems:9": {
-        "0:10": {
+        },
+        "2:10": {
           "id:8": "gregtech:gt.blockores",
           "Count:3": 16,
           "Damage:2": 540,
           "OreDict:8": ""
         },
-        "1:10": {
+        "3:10": {
           "id:8": "gregtech:gt.blockores",
           "Count:3": 16,
           "Damage:2": 542,
           "OreDict:8": ""
-        }
-      },
-      "taskID:8": "bq_standard:retrieval"
-    },
-    "2:10": {
-      "partialMatch:1": 1,
-      "autoConsume:1": 0,
-      "groupDetect:1": 0,
-      "ignoreNBT:1": 1,
-      "index:3": 2,
-      "consume:1": 0,
-      "requiredItems:9": {
-        "0:10": {
+        },
+        "4:10": {
           "id:8": "gregtech:gt.blockores",
           "Count:3": 16,
           "Damage:2": 545,
           "OreDict:8": ""
         },
-        "1:10": {
+        "5:10": {
           "id:8": "gregtech:gt.blockores",
           "Count:3": 16,
           "Damage:2": 544,
           "OreDict:8": ""
+        },
+        "6:10": {
+          "id:8": "gregtech:gt.blockores",
+          "Count:3": 16,
+          "Damage:2": 514,
+          "OreDict:8": ""
+        },
+        "7:10": {
+          "id:8": "gregtech:gt.blockores",
+          "Count:3": 16,
+          "Damage:2": 826,
+          "OreDict:8": ""
         }
       },
       "taskID:8": "bq_standard:retrieval"
     },
-    "3:10": {
+    "1:10": {
       "partialMatch:1": 1,
       "autoConsume:1": 0,
       "groupDetect:1": 0,
-      "ignoreNBT:1": 1,
-      "index:3": 3,
+      "ignoreNBT:1": 0,
+      "index:3": 1,
       "consume:1": 0,
       "requiredItems:9": {
         "0:10": {
-          "id:8": "gregtech:gt.blockores",
+          "id:8": "gregtech:gt.metaitem.03",
           "Count:3": 16,
-          "Damage:2": 514,
+          "Damage:2": 5543,
           "OreDict:8": ""
         },
         "1:10": {
-          "id:8": "gregtech:gt.blockores",
+          "id:8": "gregtech:gt.metaitem.03",
           "Count:3": 16,
-          "Damage:2": 826,
+          "Damage:2": 5541,
+          "OreDict:8": ""
+        },
+        "2:10": {
+          "id:8": "gregtech:gt.metaitem.03",
+          "Count:3": 16,
+          "Damage:2": 5540,
+          "OreDict:8": ""
+        },
+        "3:10": {
+          "id:8": "gregtech:gt.metaitem.03",
+          "Count:3": 16,
+          "Damage:2": 5542,
+          "OreDict:8": ""
+        },
+        "4:10": {
+          "id:8": "gregtech:gt.metaitem.03",
+          "Count:3": 16,
+          "Damage:2": 5545,
+          "OreDict:8": ""
+        },
+        "5:10": {
+          "id:8": "gregtech:gt.metaitem.03",
+          "Count:3": 16,
+          "Damage:2": 5544,
+          "OreDict:8": ""
+        },
+        "6:10": {
+          "id:8": "gregtech:gt.metaitem.03",
+          "Count:3": 16,
+          "Damage:2": 5514,
+          "OreDict:8": ""
+        },
+        "7:10": {
+          "id:8": "gregtech:gt.metaitem.03",
+          "Count:3": 16,
+          "Damage:2": 5826,
           "OreDict:8": ""
         }
       },

diff --git a/.../NoviceThaumaturg-AAAAAAAAAAAAAAAAAAAAFg==/LeadGalenaSilver-AAAAAAAAAAAAAAAAAAACYg==.json b/.../NoviceThaumaturg-AAAAAAAAAAAAAAAAAAAAFg==/LeadGalenaSilver-AAAAAAAAAAAAAAAAAAACYg==.json
@@ -10,7 +10,7 @@
   "properties:10": {
     "betterquesting:10": {
       "snd_complete:8": "random.levelup",
-      "taskLogic:8": "AND",
+      "taskLogic:8": "OR",
       "partySingleReward:1": 0,
       "visibility:8": "NORMAL",
       "isMain:1": 1,
@@ -69,6 +69,41 @@
         }
       },
       "taskID:8": "bq_standard:retrieval"
+    },
+    "1:10": {
+      "partialMatch:1": 1,
+      "autoConsume:1": 0,
+      "groupDetect:1": 0,
+      "ignoreNBT:1": 0,
+      "index:3": 1,
+      "consume:1": 0,
+      "requiredItems:9": {
+        "0:10": {
+          "id:8": "gregtech:gt.metaitem.03",
+          "Count:3": 32,
+          "Damage:2": 5830,
+          "OreDict:8": ""
+        },
+        "1:10": {
+          "id:8": "gregtech:gt.metaitem.03",
+          "Count:3": 32,
+          "Damage:2": 5054,
+          "OreDict:8": ""
+        },
+        "2:10": {
+          "id:8": "gregtech:gt.metaitem.03",
+          "Count:3": 32,
+          "Damage:2": 5089,
+          "OreDict:8": ""
+        },
+        "3:10": {
+          "id:8": "gregtech:gt.metaitem.03",
+          "Count:3": 16,
+          "Damage:2": 5699,
+          "OreDict:8": ""
+        }
+      },
+      "taskID:8": "bq_standard:retrieval"
     }
   },
   "rewards:9": {

diff --git a/...ts/NoviceThaumaturg-AAAAAAAAAAAAAAAAAAAAFg==/SourceofNickel-AAAAAAAAAAAAAAAAAAAGTQ==.json b/...ts/NoviceThaumaturg-AAAAAAAAAAAAAAAAAAAAFg==/SourceofNickel-AAAAAAAAAAAAAAAAAAAGTQ==.json
@@ -10,7 +10,7 @@
   "properties:10": {
     "betterquesting:10": {
       "snd_complete:8": "random.levelup",
-      "taskLogic:8": "AND",
+      "taskLogic:8": "OR",
       "partySingleReward:1": 0,
       "visibility:8": "NORMAL",
       "isMain:1": 0,
@@ -69,6 +69,41 @@
         }
       },
       "taskID:8": "bq_standard:retrieval"
+    },
+    "1:10": {
+      "partialMatch:1": 1,
+      "autoConsume:1": 0,
+      "groupDetect:1": 0,
+      "ignoreNBT:1": 0,
+      "index:3": 1,
+      "consume:1": 0,
+      "requiredItems:9": {
+        "0:10": {
+          "id:8": "gregtech:gt.metaitem.03",
+          "Count:3": 32,
+          "Damage:2": 5906,
+          "OreDict:8": ""
+        },
+        "1:10": {
+          "id:8": "gregtech:gt.metaitem.03",
+          "Count:3": 32,
+          "Damage:2": 5034,
+          "OreDict:8": ""
+        },
+        "2:10": {
+          "id:8": "gregtech:gt.metaitem.03",
+          "Count:3": 32,
+          "Damage:2": 5827,
+          "OreDict:8": ""
+        },
+        "3:10": {
+          "id:8": "gregtech:gt.metaitem.03",
+          "Count:3": 16,
+          "Damage:2": 5909,
+          "OreDict:8": ""
+        }
+      },
+      "taskID:8": "bq_standard:retrieval"
     }
   },
   "rewards:9": {

diff --git a/...ltQuests/Quests/Tier05Steam-AAAAAAAAAAAAAAAAAAAAAg==/Gypsum-AAAAAAAAAAAAAAAAAAADZA==.json b/...ltQuests/Quests/Tier05Steam-AAAAAAAAAAAAAAAAAAAAAg==/Gypsum-AAAAAAAAAAAAAAAAAAADZA==.json
@@ -10,7 +10,7 @@
   "properties:10": {
     "betterquesting:10": {
       "snd_complete:8": "random.levelup",
-      "taskLogic:8": "AND",
+      "taskLogic:8": "OR",
       "partySingleReward:1": 0,
       "visibility:8": "NORMAL",
       "isMain:1": 0,
@@ -69,6 +69,41 @@
         }
       },
       "taskID:8": "bq_standard:retrieval"
+    },
+    "1:10": {
+      "partialMatch:1": 1,
+      "autoConsume:1": 0,
+      "groupDetect:1": 0,
+      "ignoreNBT:1": 0,
+      "index:3": 1,
+      "consume:1": 0,
+      "requiredItems:9": {
+        "0:10": {
+          "id:8": "gregtech:gt.metaitem.03",
+          "Count:3": 32,
+          "Damage:2": 5935,
+          "OreDict:8": ""
+        },
+        "1:10": {
+          "id:8": "gregtech:gt.metaitem.03",
+          "Count:3": 32,
+          "Damage:2": 5936,
+          "OreDict:8": ""
+        },
+        "2:10": {
+          "id:8": "gregtech:gt.metaitem.03",
+          "Count:3": 32,
+          "Damage:2": 5928,
+          "OreDict:8": ""
+        },
+        "3:10": {
+          "id:8": "gregtech:gt.metaitem.03",
+          "Count:3": 16,
+          "Damage:2": 5934,
+          "OreDict:8": ""
+        }
+      },
+      "taskID:8": "bq_standard:retrieval"
     }
   },
   "rewards:9": {

diff --git a/...Quests/Tier05Steam-AAAAAAAAAAAAAAAAAAAAAg==/HowtoMakeRubber-AAAAAAAAAAAAAAAAAAAB8A==.json b/...Quests/Tier05Steam-AAAAAAAAAAAAAAAAAAAAAg==/HowtoMakeRubber-AAAAAAAAAAAAAAAAAAAB8A==.json
@@ -14,7 +14,7 @@
   "properties:10": {
     "betterquesting:10": {
       "snd_complete:8": "random.levelup",
-      "taskLogic:8": "AND",
+      "taskLogic:8": "OR",
       "partySingleReward:1": 0,
       "visibility:8": "NORMAL",
       "isMain:1": 1,
@@ -67,6 +67,35 @@
         }
       },
       "taskID:8": "bq_standard:retrieval"
+    },
+    "1:10": {
+      "partialMatch:1": 1,
+      "autoConsume:1": 0,
+      "groupDetect:1": 0,
+      "ignoreNBT:1": 0,
+      "index:3": 1,
+      "consume:1": 0,
+      "requiredItems:9": {
+        "0:10": {
+          "id:8": "gregtech:gt.metaitem.03",
+          "Count:3": 128,
+          "Damage:2": 5022,
+          "OreDict:8": ""
+        },
+        "1:10": {
+          "id:8": "gregtech:gt.metaitem.03",
+          "Count:3": 64,
+          "Damage:2": 5834,
+          "OreDict:8": ""
+        },
+        "2:10": {
+          "id:8": "gregtech:gt.metaitem.03",
+          "Count:3": 32,
+          "Damage:2": 5839,
+          "OreDict:8": ""
+        }
+      },
+      "taskID:8": "bq_standard:retrieval"
     }
   },
   "rewards:9": {