Skip to content

Commit

Permalink
Merge pull request #985 from MCTian-mi/primitive-smelting
Browse files Browse the repository at this point in the history 
Pyrotech integration
  • Loading branch information
@bruberu
bruberu authored Oct 6, 2024
2 parents 63a67cd + 08175ad commit 7848742
Show file tree
Hide file tree
Showing 125 changed files with 10,037 additions and 622 deletions.
460 changes: 307 additions & 153 deletions config/betterquesting/DefaultQuests/QuestLines/0.json
View file

Large diffs are not rendered by default.

15 changes: 3 additions & 12 deletions config/betterquesting/DefaultQuests/Quests/0/0.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,28 +5,19 @@
"desc:8": "susy.quest.db.0.desc",
"frame:8": "GATE",
"icon:10": {
"OreDict:8": "rockStone",
"id:8": "notreepunching:rock/stone"
"id:8": "biomesoplenty:earth"
},
"ignoresview:1": 0,
"ismain:1": 1,
"name:8": "susy.quest.db.0.title",
"questlogic:8": "NAND",
"visibility:8": "ALWAYS"
}
},
"rewards:9": {},
"tasks:9": {
"0:10": {
"entryLogic:8": "AND",
"partialMatch:1": 1,
"requiredItems:9": {
"0:10": {
"Count:3": 1,
"OreDict:8": "rock",
"id:8": "notreepunching:rock/stone"
}
},
"taskID:8": "bq_standard:retrieval"
"taskID:8": "bq_standard:checkbox"
}
}
}
42 changes: 35 additions & 7 deletions config/betterquesting/DefaultQuests/Quests/0/106.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
"desc:8": "susy.quest.db.106.desc",
"frame:8": "GATE",
"icon:10": {
"Damage:2": 352,
"Damage:2": 351,
"id:8": "gregtech:meta_item_1"
},
"ignoresview:1": 0,
Expand All @@ -23,22 +23,50 @@
"partialMatch:1": 1,
"requiredItems:9": {
"0:10": {
"Count:3": 1,
"Damage:2": 2525,
"Count:3": 8,
"Damage:2": 351,
"id:8": "gregtech:meta_item_1"
}
},
"taskID:8": "bq_standard:retrieval"
},
"1:10": {
"entryLogic:8": "AND",
"index:3": 1,
"partialMatch:1": 1,
"requiredItems:9": {
"0:10": {
"Count:3": 4,
"Damage:2": 2049,
"id:8": "gregtech:meta_dust"
},
"1:10": {
"Count:3": 1,
"Damage:2": 351,
"id:8": "gregtech:meta_item_1"
"Count:3": 4,
"Damage:2": 154,
"id:8": "gregtech:meta_item_2"
},
"2:10": {
"Count:3": 4,
"Damage:2": 8100,
"id:8": "gregtech:meta_dust"
},
"3:10": {
"Count:3": 4,
"Damage:2": 2063,
"id:8": "gregtech:meta_dust"
},
"4:10": {
"Count:3": 8,
"Damage:2": 2525,
"id:8": "gregtech:meta_dust"
},
"5:10": {
"Count:3": 1,
"Damage:2": 348,
"id:8": "gregtech:meta_item_1"
}
},
"taskID:8": "bq_standard:retrieval"
"taskID:8": "bq_standard:optional_retrieval"
}
}
}
13 changes: 7 additions & 6 deletions config/betterquesting/DefaultQuests/Quests/0/107.json
View file
Original file line number Diff line number Diff line change
@@ -1,14 +1,15 @@
{
"preRequisites:11": [
106
106,
577792334
],
"properties:10": {
"betterquesting:10": {
"desc:8": "susy.quest.db.107.desc",
"frame:8": "GATE",
"icon:10": {
"Damage:2": 1,
"id:8": "gregtech:metal_casing"
"Damage:2": 352,
"id:8": "gregtech:meta_item_1"
},
"ignoresview:1": 0,
"ismain:1": 1,
Expand All @@ -23,9 +24,9 @@
"partialMatch:1": 1,
"requiredItems:9": {
"0:10": {
"Count:3": 1,
"Damage:2": 1,
"id:8": "gregtech:metal_casing"
"Count:3": 8,
"Damage:2": 352,
"id:8": "gregtech:meta_item_1"
}
},
"taskID:8": "bq_standard:retrieval"
Expand Down
31 changes: 31 additions & 0 deletions config/betterquesting/DefaultQuests/Quests/0/1107188354.json
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,31 @@
{
"preRequisites:11": [
1580653524
],
"properties:10": {
"betterquesting:10": {
"desc:8": "susy.quest.db.1107188354.desc",
"frame:8": "GATE",
"icon:10": {
"id:8": "pyrotech:anvil_granite"
},
"ignoresview:1": 0,
"name:8": "susy.quest.db.1107188354.title",
"visibility:8": "ALWAYS"
}
},
"rewards:9": {},
"tasks:9": {
"0:10": {
"entryLogic:8": "AND",
"partialMatch:1": 1,
"requiredItems:9": {
"0:10": {
"Count:3": 1,
"id:8": "pyrotech:anvil_granite"
}
},
"taskID:8": "bq_standard:retrieval"
}
}
}
2 changes: 1 addition & 1 deletion config/betterquesting/DefaultQuests/Quests/0/117.json
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"preRequisites:11": [
87
58115670
],
"properties:10": {
"betterquesting:10": {
Expand Down
3 changes: 2 additions & 1 deletion config/betterquesting/DefaultQuests/Quests/0/118.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,8 @@
"desc:8": "susy.quest.db.118.desc",
"frame:8": "ROUNDED_SQUARE",
"icon:10": {
"id:8": "gregtechfoodoption:gtfo_casing"
"Damage:2": 44,
"id:8": "gregtechfoodoption:gtfo_meta_item"
},
"ignoresview:1": 0,
"name:8": "susy.quest.db.118.title",
Expand Down
140 changes: 137 additions & 3 deletions config/betterquesting/DefaultQuests/Quests/0/12.json
View file
Original file line number Diff line number Diff line change
@@ -1,13 +1,32 @@
{
"preRequisites:11": [
9
3,
19,
6
],
"properties:10": {
"betterquesting:10": {
"desc:8": "susy.quest.db.12.desc",
"frame:8": "GATE",
"icon:10": {
"id:8": "minecraft:furnace"
"id:8": "gregtech:axe",
"tag:10": {
"DisallowContainerItem:1": 0,
"GT.Behaviours:10": {
"DisableShields:1": 1,
"TreeFelling:1": 1
},
"GT.Tool:10": {
"AttackDamage:5": 6.0,
"AttackSpeed:5": -3.2,
"Durability:3": 0,
"HarvestLevel:3": 1,
"Material:8": "gregtech:stone",
"MaxDurability:3": 31,
"ToolSpeed:5": 1.0
},
"HideFlags:3": 2
}
},
"ignoresview:1": 0,
"ismain:1": 1,
Expand All @@ -23,10 +42,125 @@
"requiredItems:9": {
"0:10": {
"Count:3": 1,
"id:8": "minecraft:furnace"
"id:8": "gregtech:axe",
"tag:10": {
"DisallowContainerItem:1": 0,
"GT.Behaviours:10": {
"DisableShields:1": 1,
"TreeFelling:1": 1
},
"GT.Tool:10": {
"AttackDamage:5": 6.0,
"AttackSpeed:5": -3.2,
"Durability:3": 0,
"HarvestLevel:3": 1,
"Material:8": "gregtech:stone",
"MaxDurability:3": 31,
"ToolSpeed:5": 1.0
},
"HideFlags:3": 2
}
},
"1:10": {
"Count:3": 1,
"id:8": "gregtech:pickaxe",
"tag:10": {
"DisallowContainerItem:1": 0,
"GT.Behaviours:10": {
"TorchPlacing:1": 1
},
"GT.Tool:10": {
"AttackDamage:5": 2.0,
"AttackSpeed:5": -2.8,
"Durability:3": 0,
"HarvestLevel:3": 1,
"Material:8": "gregtech:stone",
"MaxDurability:3": 95,
"ToolSpeed:5": 6.0
},
"HideFlags:3": 2
}
}
},
"taskID:8": "bq_standard:retrieval"
},
"1:10": {
"entryLogic:8": "AND",
"index:3": 1,
"partialMatch:1": 1,
"requiredItems:9": {
"0:10": {
"Count:3": 1,
"id:8": "gregtech:shovel",
"tag:10": {
"DisallowContainerItem:1": 0,
"GT.Behaviours:10": {},
"GT.Tool:10": {
"AttackDamage:5": 2.5,
"AttackSpeed:5": -3.0,
"Durability:3": 0,
"HarvestLevel:3": 1,
"Material:8": "gregtech:stone",
"MaxDurability:3": 95,
"ToolSpeed:5": 2.0
},
"HideFlags:3": 2
}
},
"1:10": {
"Count:3": 1,
"id:8": "gregtech:hoe",
"tag:10": {
"DisallowContainerItem:1": 0,
"GT.Behaviours:10": {},
"GT.Tool:10": {
"AttackDamage:5": 0.0,
"AttackSpeed:5": -1.0,
"Durability:3": 0,
"HarvestLevel:3": 1,
"Material:8": "gregtech:stone",
"MaxDurability:3": 95
},
"HideFlags:3": 2
}
},
"2:10": {
"Count:3": 1,
"id:8": "gregtech:hammer",
"tag:10": {
"DisallowContainerItem:1": 0,
"GT.Behaviours:10": {},
"GT.Tool:10": {
"AttackDamage:5": 5.0,
"AttackSpeed:5": -3.8,
"Durability:3": 0,
"HarvestLevel:3": 1,
"Material:8": "gregtech:stone",
"MaxDurability:3": 95,
"ToolSpeed:5": 3.0
},
"HideFlags:3": 2
}
},
"3:10": {
"Count:3": 1,
"id:8": "gregtech:knife",
"tag:10": {
"DisallowContainerItem:1": 0,
"GT.Behaviours:10": {},
"GT.Tool:10": {
"AttackDamage:5": 1.0,
"AttackSpeed:5": 2.5,
"Durability:3": 0,
"HarvestLevel:3": 0,
"Material:8": "gregtech:stone",
"MaxDurability:3": 31
},
"HideFlags:3": 2
}
}
},
"taskID:8": "bq_standard:optional_retrieval"
}
}
}
31 changes: 31 additions & 0 deletions config/betterquesting/DefaultQuests/Quests/0/1241306929.json
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,31 @@
{
"preRequisites:11": [
7
],
"properties:10": {
"betterquesting:10": {
"desc:8": "susy.quest.db.1241306929.desc",
"frame:8": "ROUNDED_SQUARE",
"icon:10": {
"id:8": "pyrotech:chopping_block"
},
"ignoresview:1": 0,
"name:8": "susy.quest.db.1241306929.title",
"visibility:8": "ALWAYS"
}
},
"rewards:9": {},
"tasks:9": {
"0:10": {
"entryLogic:8": "AND",
"partialMatch:1": 1,
"requiredItems:9": {
"0:10": {
"Count:3": 1,
"id:8": "pyrotech:chopping_block"
}
},
"taskID:8": "bq_standard:retrieval"
}
}
}
2 changes: 1 addition & 1 deletion config/betterquesting/DefaultQuests/Quests/0/13.json
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"preRequisites:11": [
12
97148971
],
"properties:10": {
"betterquesting:10": {
Expand Down
Loading

0 comments on commit 7848742

Please sign in to comment.