Skip to content

Commit

Permalink
Merge pull request #1184 from SymmetricDevs/gtl
Browse files Browse the repository at this point in the history
Gas production overhaul
  • Loading branch information
bruberu authored Jan 18, 2025
2 parents 0abe2a8 + 14ac346 commit 25156fe
Show file tree
Hide file tree
Showing 48 changed files with 1,083 additions and 338 deletions.
15 changes: 11 additions & 4 deletions config/betterquesting/DefaultQuests/QuestLines/3.json
Original file line number Diff line number Diff line change
Expand Up @@ -902,34 +902,41 @@
"y:3": -292
},
"127:10": {
"id:3": 927023403,
"sizeX:3": 24,
"sizeY:3": 24,
"x:3": 618,
"y:3": 306
},
"128:10": {
"id:3": 1090881854,
"sizeX:3": 24,
"sizeY:3": 24,
"x:3": 408,
"y:3": 162
},
"128:10": {
"129:10": {
"id:3": 1402916517,
"sizeX:3": 24,
"sizeY:3": 24,
"x:3": 318,
"y:3": 18
},
"129:10": {
"130:10": {
"id:3": 1786950658,
"sizeX:3": 24,
"sizeY:3": 24,
"x:3": 276,
"y:3": 18
},
"130:10": {
"131:10": {
"id:3": 1994804951,
"sizeX:3": 24,
"sizeY:3": 24,
"x:3": 260,
"y:3": -292
},
"131:10": {
"132:10": {
"id:3": 1996974870,
"sizeX:3": 24,
"sizeY:3": 24,
Expand Down
53 changes: 37 additions & 16 deletions config/betterquesting/DefaultQuests/QuestLines/4.json
Original file line number Diff line number Diff line change
Expand Up @@ -415,8 +415,8 @@
"id:3": 680,
"sizeX:3": 36,
"sizeY:3": 36,
"x:3": 54,
"y:3": -150
"x:3": 108,
"y:3": -258
},
"58:10": {
"id:3": 681,
Expand Down Expand Up @@ -583,8 +583,8 @@
"id:3": 710,
"sizeX:3": 36,
"sizeY:3": 36,
"x:3": 108,
"y:3": -120
"x:3": 0,
"y:3": -258
},
"82:10": {
"id:3": 713,
Expand All @@ -611,8 +611,8 @@
"id:3": 716,
"sizeX:3": 24,
"sizeY:3": 24,
"x:3": 156,
"y:3": -114
"x:3": -36,
"y:3": -252
},
"86:10": {
"id:3": 717,
Expand Down Expand Up @@ -748,76 +748,97 @@
"y:3": 54
},
"105:10": {
"id:3": 239028636,
"sizeX:3": 24,
"sizeY:3": 24,
"x:3": -204,
"y:3": 126
},
"106:10": {
"id:3": 326901357,
"sizeX:3": 24,
"sizeY:3": 24,
"x:3": -60,
"y:3": -18
},
"106:10": {
"107:10": {
"id:3": 618527753,
"sizeX:3": 24,
"sizeY:3": 24,
"x:3": -60,
"y:3": 54
},
"107:10": {
"108:10": {
"id:3": 707957708,
"sizeX:3": 24,
"sizeY:3": 24,
"x:3": 6,
"y:3": -294
},
"109:10": {
"id:3": 943634333,
"sizeX:3": 24,
"sizeY:3": 24,
"x:3": -60,
"y:3": 18
},
"108:10": {
"110:10": {
"id:3": 1056118460,
"sizeX:3": 24,
"sizeY:3": 24,
"x:3": -96,
"y:3": 54
},
"109:10": {
"111:10": {
"id:3": 1177038065,
"sizeX:3": 24,
"sizeY:3": 24,
"x:3": -60,
"y:3": 126
},
"110:10": {
"112:10": {
"id:3": 1193199034,
"sizeX:3": 36,
"sizeY:3": 36,
"x:3": -24,
"y:3": 84
},
"111:10": {
"113:10": {
"id:3": 1529184698,
"sizeX:3": 24,
"sizeY:3": 24,
"x:3": -132,
"y:3": 54
},
"112:10": {
"114:10": {
"id:3": 1617418058,
"sizeX:3": 24,
"sizeY:3": 24,
"x:3": -18,
"y:3": 54
},
"113:10": {
"115:10": {
"id:3": 1766408250,
"sizeX:3": 60,
"sizeY:3": 60,
"x:3": 336,
"y:3": -222
},
"114:10": {
"116:10": {
"id:3": 1807049983,
"sizeX:3": 24,
"sizeY:3": 24,
"x:3": 60,
"y:3": -252
},
"117:10": {
"id:3": 1837809262,
"sizeX:3": 24,
"sizeY:3": 24,
"x:3": -96,
"y:3": 18
},
"115:10": {
"118:10": {
"id:3": 2096017803,
"sizeX:3": 24,
"sizeY:3": 24,
Expand Down
5 changes: 4 additions & 1 deletion config/betterquesting/DefaultQuests/Quests/16/569.json
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,10 @@
"requiredFluids:9": {
"0:10": {
"Amount:3": 1000,
"FluidName:8": "reformed_syngas"
"FluidName:8": "betterquesting.placeholder",
"Tag:10": {
"orig_id:8": "reformed_syngas"
}
}
},
"taskID:8": "bq_standard:fluid"
Expand Down
4 changes: 2 additions & 2 deletions config/betterquesting/DefaultQuests/Quests/2/121.json
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
"icon:10": {
"id:8": "appliedenergistics2:dummy_fluid_item",
"tag:10": {
"FluidName:8": "syngas"
"FluidName:8": "monoxide_rich_syngas"
}
},
"name:8": "susy.quest.db.121.title",
Expand All @@ -21,7 +21,7 @@
"requiredFluids:9": {
"0:10": {
"Amount:3": 1000,
"FluidName:8": "syngas"
"FluidName:8": "monoxide_rich_syngas"
}
},
"taskID:8": "bq_standard:fluid"
Expand Down
5 changes: 4 additions & 1 deletion config/betterquesting/DefaultQuests/Quests/27/790.json
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,10 @@
"requiredFluids:9": {
"0:10": {
"Amount:3": 1000,
"FluidName:8": "syngas"
"FluidName:8": "betterquesting.placeholder",
"Tag:10": {
"orig_id:8": "syngas"
}
}
},
"taskID:8": "bq_standard:fluid"
Expand Down
14 changes: 12 additions & 2 deletions config/betterquesting/DefaultQuests/Quests/3/665.json
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
"icon:10": {
"id:8": "appliedenergistics2:dummy_fluid_item",
"tag:10": {
"FluidName:8": "reformed_syngas"
"FluidName:8": "reformed_hydrogen_rich_syngas"
}
},
"name:8": "susy.quest.db.665.title",
Expand All @@ -28,13 +28,23 @@
"requiredFluids:9": {
"0:10": {
"Amount:3": 1000,
"FluidName:8": "reformed_syngas"
"FluidName:8": "reformed_hydrogen_rich_syngas"
}
},
"taskID:8": "bq_standard:fluid"
},
"1:10": {
"index:3": 1,
"requiredFluids:9": {
"0:10": {
"Amount:3": 1000,
"FluidName:8": "reformed_monoxide_rich_syngas"
}
},
"taskID:8": "bq_standard:fluid"
},
"2:10": {
"index:3": 2,
"taskID:8": "bq_standard:checkbox"
}
}
Expand Down
37 changes: 37 additions & 0 deletions config/betterquesting/DefaultQuests/Quests/3/927023403.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,37 @@
{
"preRequisiteTypes:7": [
1
],
"preRequisites:11": [
243
],
"properties:10": {
"betterquesting:10": {
"desc:8": "susy.quest.db.927023403.desc",
"icon:10": {
"id:8": "appliedenergistics2:dummy_fluid_item",
"tag:10": {
"FluidName:8": "lt_syncrude"
}
},
"name:8": "susy.quest.db.927023403.title",
"tasklogic:8": "OR"
}
},
"questID:3": 927023403,
"tasks:9": {
"0:10": {
"requiredFluids:9": {
"0:10": {
"Amount:3": 1000,
"FluidName:8": "lt_syncrude"
}
},
"taskID:8": "bq_standard:fluid"
},
"1:10": {
"index:3": 1,
"taskID:8": "bq_standard:checkbox"
}
}
}
25 changes: 25 additions & 0 deletions config/betterquesting/DefaultQuests/Quests/4/1807049983.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
{
"preRequisites:11": [
680,
710
],
"properties:10": {
"betterquesting:10": {
"desc:8": "susy.quest.db.1807049983.desc",
"icon:10": {
"id:8": "appliedenergistics2:dummy_fluid_item",
"tag:10": {
"FluidName:8": "methanol"
}
},
"name:8": "susy.quest.db.1807049983.title"
}
},
"questID:3": 1807049983,
"tasks:9": {
"0:10": {
"index:3": 1,
"taskID:8": "bq_standard:checkbox"
}
}
}
4 changes: 3 additions & 1 deletion config/betterquesting/DefaultQuests/Quests/4/2096017803.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,13 +3,15 @@
1,
0,
0,
0,
0
],
"preRequisites:11": [
479,
394,
775,
181
181,
239028636
],
"properties:10": {
"betterquesting:10": {
Expand Down
26 changes: 26 additions & 0 deletions config/betterquesting/DefaultQuests/Quests/4/239028636.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
{
"preRequisiteTypes:7": [
1
],
"preRequisites:11": [
1193199034
],
"properties:10": {
"betterquesting:10": {
"desc:8": "susy.quest.db.239028636.desc",
"icon:10": {
"id:8": "appliedenergistics2:dummy_fluid_item",
"tag:10": {
"FluidName:8": "hydrogen"
}
},
"name:8": "susy.quest.db.239028636.title"
}
},
"questID:3": 239028636,
"tasks:9": {
"0:10": {
"taskID:8": "bq_standard:checkbox"
}
}
}
Loading

0 comments on commit 25156fe

Please sign in to comment.