Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Gas production overhaul #1184

Open
wants to merge 30 commits into
base: master-ceu
Choose a base branch
from
+1,083 −338
Open

Gas production overhaul #1184

Show file tree
Hide file tree
Changes from 25 commits
Commits
Show all changes
30 commits
Select commit Hold shift + click to select a range
c452e14
start work on gas to liquids
planetme Dec 19, 2024
76ccfdc
add fischer tropsch catalysts
planetme Dec 19, 2024
420b1e0
steam reforming work
planetme Dec 19, 2024
7b906b7
give natgas a definite composition
planetme Dec 19, 2024
d747d97
finish fischer tropsch recipes
planetme Dec 21, 2024
07b756c
methanol synthesis changes
planetme Dec 21, 2024
32e88e3
methanol to gasoline process
planetme Dec 21, 2024
0b07546
prevent duping of cracking catalyst
planetme Dec 21, 2024
d8e7934
add direct coal liquefaction
planetme Dec 22, 2024
70719ae
buff methane speeds
planetme Dec 22, 2024
9063ad8
buff dcl
planetme Dec 22, 2024
279cff8
fix hydrocracking hydrogen consumption
planetme Dec 22, 2024
291c18d
pyrolysis buffs & changes
planetme Dec 22, 2024
a564f68
partial oxidation of hydrocarbons
planetme Dec 22, 2024
06c507b
fuel gas reforming
planetme Dec 22, 2024
1bd4e13
regate methanol synthesis
planetme Dec 22, 2024
cc5dd9e
register all materials
planetme Dec 22, 2024
db1f060
fix clashing ids
planetme Dec 22, 2024
dfce8bf
fixes, powergen balance
planetme Dec 22, 2024
7254636
add more residue feedstocks to partial oxidation
planetme Dec 22, 2024
9043897
add quests
planetme Dec 22, 2024
06869f3
remove counts
planetme Dec 23, 2024
fd95ebf
Merge branch 'master-ceu' into gtl
planetme Dec 28, 2024
e18c09e
add FT wax as a base oil
planetme Dec 28, 2024
1204cb3
add DAO as feedstock to hydrodewaxing, buff it too
planetme Dec 28, 2024
a7e2582
Merge remote-tracking branch 'origin/master-ceu' into gtl
bruberu Dec 31, 2024
b1b6b8f
fix: questbook formatting
bruberu Dec 31, 2024
62a8835
fix: reformed monoxide-rich syngas
bruberu Dec 31, 2024
96656e8
fix: more quests and recipes
bruberu Dec 31, 2024
2c7dc12
Merge branch 'master-ceu' into gtl
bruberu Jan 12, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion config/betterquesting/DefaultQuests/QuestLines/2.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -831,7 +831,7 @@
"x:3": -306,
"y:3": 150
},
"124:10": {
"117:10": {
"id:3": 1766162782,
"sizeX:3": 24,
"sizeY:3": 24,
Expand Down
11 changes: 9 additions & 2 deletions config/betterquesting/DefaultQuests/QuestLines/3.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -881,20 +881,27 @@
"y:3": 162
},
"124:10": {
"id:3": 927023403,
"sizeX:3": 24,
"sizeY:3": 24,
"x:3": 618,
"y:3": 306
},
"125:10": {
"id:3": 1090881854,
"sizeX:3": 24,
"sizeY:3": 24,
"x:3": 408,
"y:3": 162
},
"125:10": {
"126:10": {
"id:3": 1402916517,
"sizeX:3": 24,
"sizeY:3": 24,
"x:3": 318,
"y:3": 18
},
"126:10": {
"127:10": {
"id:3": 1786950658,
"sizeX:3": 24,
"sizeY:3": 24,
Expand Down
51 changes: 36 additions & 15 deletions config/betterquesting/DefaultQuests/QuestLines/4.json
View file
Open in desktop
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,69 +748,90 @@
"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": 1766408250,
"sizeX:3": 60,
"sizeY:3": 60,
"x:3": 336,
"y:3": -222
},
"113:10": {
"115:10": {
"id:3": 1807049983,
"sizeX:3": 24,
"sizeY:3": 24,
"x:3": 60,
"y:3": -252
},
"116:10": {
"id:3": 1837809262,
"sizeX:3": 24,
"sizeY:3": 24,
"x:3": -96,
"y:3": 18
},
"114:10": {
"117: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
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,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
2 changes: 1 addition & 1 deletion config/betterquesting/DefaultQuests/Quests/2/121.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,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
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,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
5 changes: 4 additions & 1 deletion config/betterquesting/DefaultQuests/Quests/3/665.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,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
38 changes: 38 additions & 0 deletions config/betterquesting/DefaultQuests/Quests/3/927023403.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,38 @@
{
"preRequisiteTypes:7": [
1
],
"preRequisites:11": [
243
],
"properties:10": {
"betterquesting:10": {
"desc:8": "susy.quest.db.927023403.desc",
"icon:10": {
"id:8": "forge:bucketfilled",
"tag:10": {
"Amount:3": 1000,
"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"
}
}
}
26 changes: 26 additions & 0 deletions config/betterquesting/DefaultQuests/Quests/4/1807049983.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
{
"preRequisites:11": [
680,
710
],
"properties:10": {
"betterquesting:10": {
"desc:8": "susy.quest.db.1807049983.desc",
"icon:10": {
"id:8": "forge:bucketfilled",
"tag:10": {
"Amount:3": 1000,
"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
View file
Open in desktop
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
27 changes: 27 additions & 0 deletions config/betterquesting/DefaultQuests/Quests/4/239028636.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
{
"preRequisiteTypes:7": [
1
],
"preRequisites:11": [
1193199034
],
"properties:10": {
"betterquesting:10": {
"desc:8": "susy.quest.db.239028636.desc",
"icon:10": {
"id:8": "forge:bucketfilled",
"tag:10": {
"Amount:3": 1000,
"FluidName:8": "hydrogen"
}
},
"name:8": "susy.quest.db.239028636.title"
}
},
"questID:3": 239028636,
"tasks:9": {
"0:10": {
"taskID:8": "bq_standard:checkbox"
}
}
}
32 changes: 32 additions & 0 deletions config/betterquesting/DefaultQuests/Quests/4/707957708.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,32 @@
{
"preRequisites:11": [
710
],
"properties:10": {
"betterquesting:10": {
"desc:8": "susy.quest.db.707957708.desc",
"icon:10": {
"Damage:2": 21,
"id:8": "pyrotech:material"
},
"name:8": "susy.quest.db.707957708.title",
"tasklogic:8": "OR"
}
},
"questID:3": 707957708,
"tasks:9": {
"0:10": {
"requiredFluids:9": {
"0:10": {
"Amount:3": 1000,
"FluidName:8": "liquefaction_oil"
}
},
"taskID:8": "bq_standard:fluid"
},
"1:10": {
"index:3": 1,
"taskID:8": "bq_standard:checkbox"
}
}
}
2 changes: 1 addition & 1 deletion config/betterquesting/DefaultQuests/Quests/MultipleQuestLine/484.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
"id:8": "forge:bucketfilled",
"tag:10": {
"Amount:3": 1000,
"FluidName:8": "vinyl_chloride_solution"
"FluidName:8": "vinyl_chloride_suspension"
}
},
"name:8": "susy.quest.db.484.title",
Expand Down
3 changes: 2 additions & 1 deletion config/betterquesting/DefaultQuests/Quests/MultipleQuestLine/659.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
{
"preRequisites:11": [
181
181,
927023403
],
"properties:10": {
"betterquesting:10": {
Expand Down
Loading