Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/Nuclear_Questline' into dev
Browse files Browse the repository at this point in the history
  • Loading branch information
@Dream-Master
Dream-Master committed Jun 12, 2022
2 parents 4c8d78d + f760ac1 commit 664d9a8
Show file tree
Hide file tree
Showing 3 changed files with 4,062 additions and 949 deletions.
181 changes: 141 additions & 40 deletions config/betterquesting/DefaultQuests-us.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8142,6 +8142,7 @@
"80:10": {
"questID:3": 80,
"preRequisites:11": [
838,
1148
],
"properties:10": {
Expand Down Expand Up @@ -63567,6 +63568,7 @@
"651:10": {
"questID:3": 651,
"preRequisites:11": [
80,
160
],
"properties:10": {
Expand Down Expand Up @@ -63718,6 +63720,7 @@
"652:10": {
"questID:3": 652,
"preRequisites:11": [
80,
160,
1870
],
Expand Down Expand Up @@ -68456,6 +68459,7 @@
"691:10": {
"questID:3": 691,
"preRequisites:11": [
65,
685
],
"properties:10": {
Expand Down Expand Up @@ -80435,7 +80439,7 @@
"questID:3": 796,
"preRequisites:11": [
753,
794
838
],
"properties:10": {
"betterquesting:10": {
Expand Down Expand Up @@ -80607,7 +80611,7 @@
"requiredItems:9": {
"0:10": {
"id:8": "gregtech:gt.metaitem.01",
"Count:3": 8,
"Count:3": 4,
"Damage:2": 17526,
"OreDict:8": ""
},
Expand All @@ -80618,10 +80622,10 @@
"OreDict:8": ""
},
"2:10": {
"id:8": "IC2:itemPartCircuitAdv",
"id:8": "gregtech:gt.metaitem.01",
"Count:3": 4,
"Damage:2": 0,
"OreDict:8": "circuitAdvanced"
"Damage:2": 32704,
"OreDict:8": "circuitData"
},
"3:10": {
"id:8": "IC2:reactorHeatSwitchSpread",
Expand Down Expand Up @@ -86981,7 +86985,12 @@
"850:10": {
"questID:3": 850,
"preRequisites:11": [
852
852,
1744
],
"preRequisiteTypes:7": [
0,
1
],
"properties:10": {
"betterquesting:10": {
Expand Down Expand Up @@ -87012,23 +87021,6 @@
},
"tasks:9": {
"0:10": {
"partialMatch:1": 1,
"autoConsume:1": 0,
"groupDetect:1": 0,
"ignoreNBT:1": 1,
"index:3": 0,
"consume:1": 0,
"requiredItems:9": {
"0:10": {
"id:8": "gregtech:gt.blockmachines",
"Count:3": 1,
"Damage:2": 422,
"OreDict:8": ""
}
},
"taskID:8": "bq_standard:optional_retrieval"
},
"1:10": {
"partialMatch:1": 1,
"autoConsume:1": 0,
"groupDetect:1": 0,
Expand All @@ -87051,7 +87043,7 @@
},
"taskID:8": "bq_standard:retrieval"
},
"2:10": {
"1:10": {
"partialMatch:1": 1,
"autoConsume:1": 0,
"groupDetect:1": 0,
Expand Down Expand Up @@ -157222,8 +157214,7 @@
"1491:10": {
"questID:3": 1491,
"preRequisites:11": [
86,
1410
86
],
"properties:10": {
"betterquesting:10": {
Expand Down Expand Up @@ -161570,12 +161561,6 @@
"consume:1": 0,
"requiredItems:9": {
"0:10": {
"id:8": "gregtech:gt.metaitem.01",
"Count:3": 192,
"Damage:2": 5391,
"OreDict:8": ""
},
"1:10": {
"id:8": "gregtech:gt.metaitem.01",
"Count:3": 192,
"Damage:2": 5324,
Expand Down Expand Up @@ -166057,9 +166042,9 @@
"consume:1": 0,
"requiredItems:9": {
"0:10": {
"id:8": "minecraft:string",
"id:8": "witchery:ingredient",
"Count:3": 4,
"Damage:2": 0,
"Damage:2": 102,
"OreDict:8": ""
},
"1:10": {
Expand Down Expand Up @@ -168218,9 +168203,9 @@
"consume:1": 0,
"requiredItems:9": {
"0:10": {
"id:8": "minecraft:string",
"id:8": "witchery:ingredient",
"Count:3": 4,
"Damage:2": 0,
"Damage:2": 102,
"OreDict:8": ""
},
"1:10": {
Expand Down Expand Up @@ -180856,8 +180841,7 @@
"preRequisites:11": [
1412,
1533,
1535,
1538
1535
],
"properties:10": {
"betterquesting:10": {
Expand Down Expand Up @@ -289435,7 +289419,28 @@
"taskID:8": "bq_standard:retrieval"
}
},
"rewards:9": {}
"rewards:9": {
"0:10": {
"rewardID:8": "bq_standard:item",
"index:3": 0,
"rewards:9": {
"0:10": {
"id:8": "enhancedlootbags:lootbag",
"Count:3": 1,
"tag:10": {
"ench:9": {
"0:10": {
"lvl:2": 3,
"id:2": 35
}
}
},
"Damage:2": 42,
"OreDict:8": ""
}
}
}
}
},
"2761:10": {
"questID:3": 2761,
Expand Down Expand Up @@ -328076,6 +328081,95 @@
}
}
}
},
"3144:10": {
"questID:3": 3144,
"preRequisites:11": [
2760
],
"properties:10": {
"betterquesting:10": {
"snd_complete:8": "random.levelup",
"taskLogic:8": "AND",
"visibility:8": "NORMAL",
"isMain:1": 0,
"simultaneous:1": 0,
"icon:10": {
"id:8": "gregtech:gt.blockmachines",
"Count:3": 1,
"Damage:2": 31027,
"OreDict:8": ""
},
"snd_update:8": "random.levelup",
"repeatTime:3": -1,
"globalShare:1": 0,
"questLogic:8": "AND",
"repeat_relative:1": 1,
"name:8": "gtnh.quest3144.name",
"lockedProgress:1": 0,
"autoClaim:1": 0,
"isSilent:1": 0,
"desc:8": "gtnh.quest3144.desc"
}
},
"tasks:9": {
"0:10": {
"partialMatch:1": 1,
"autoConsume:1": 0,
"groupDetect:1": 0,
"ignoreNBT:1": 1,
"index:3": 0,
"consume:1": 0,
"requiredItems:9": {
"0:10": {
"id:8": "gregtech:gt.blockmachines",
"Count:3": 1,
"Damage:2": 31027,
"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": {
"id:8": "gregtech:gt.blockmachines",
"Count:3": 1,
"Damage:2": 31028,
"OreDict:8": ""
}
},
"taskID:8": "bq_standard:retrieval"
}
},
"rewards:9": {
"0:10": {
"rewardID:8": "bq_standard:item",
"index:3": 0,
"rewards:9": {
"0:10": {
"id:8": "enhancedlootbags:lootbag",
"Count:3": 1,
"tag:10": {
"ench:9": {
"0:10": {
"lvl:2": 3,
"id:2": 35
}
}
},
"Damage:2": 41,
"OreDict:8": ""
}
}
}
}
}
},
"questLines:9": {
Expand Down Expand Up @@ -331387,7 +331481,7 @@
},
"68:10": {
"sizeX:3": 24,
"x:3": 516,
"x:3": 492,
"y:3": 444,
"id:3": 850,
"sizeY:3": 24
Expand Down Expand Up @@ -341006,6 +341100,13 @@
"y:3": 0,
"id:3": 2764,
"sizeY:3": 24
},
"34:10": {
"sizeX:3": 24,
"x:3": 408,
"y:3": 96,
"id:3": 3144,
"sizeY:3": 24
}
},
"lineID:3": 17,
Expand Down
Loading

0 comments on commit 664d9a8

Please sign in to comment.