Skip to content

Commit

Permalink
Petrochem Cleanup #207
Browse files Browse the repository at this point in the history
  • Loading branch information
KiwiHawk committed Sep 1, 2024
1 parent 82d4e88 commit 9f4380f
Show file tree
Hide file tree
Showing 7 changed files with 138 additions and 30 deletions.
6 changes: 6 additions & 0 deletions SeaBlock/changelog.txt
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,12 @@
Version: 0.5.17
Date: ??.??.??
Changes:
- Petrochem Cleanup #207
- Changed Blue Algae Liquefaction recipe to produce Crude Oil instead of Multi-phase Oil
- Change Cellulose Paste recipe to use Chlorine Gas instead of Chloromethane Gas
- Hid Multi-phase Oil and Chloromethane Gas
- Hid techs Gas Processing, Oil and Gas Extraction, and Sulfur Processing 4
- Hid Oil & Gas Separator and Advanced Gas Refinery
- Added custom Better Victory Screen statistics #323
- Handle Ore Sorting Facility 5 changes #327
- Stop creating recipe, item, and entity in Sea Block
Expand Down
1 change: 0 additions & 1 deletion SeaBlock/data-final-fixes/tech-tree.lua
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,6 @@ seablock.lib.hide_technology("electrolysis-2")
seablock.lib.hide_technology("chemical-processing-1")
seablock.lib.hide_technology("chemical-processing-2")

bobmods.lib.tech.remove_recipe_unlock("angels-advanced-gas-processing", "solid-fuel-methane")
bobmods.lib.tech.remove_prerequisite("circuit-network", "bio-wood-processing-2")
bobmods.lib.tech.add_prerequisite("circuit-network", "bio-paper-1")
bobmods.lib.tech.remove_prerequisite("rubbers", "circuit-network")
Expand Down
2 changes: 1 addition & 1 deletion SeaBlock/data-updates/clowns.lua
Original file line number Diff line number Diff line change
Expand Up @@ -372,5 +372,5 @@ if mods["Clowns-Extended-Minerals"] then
seablock.lib.add_recipe_unlock("clowns-ore-crushing", "sb-slag-processing-clowns-2", 4)
seablock.lib.add_recipe_unlock("clowns-ore-crushing", "sb-slag-processing-clowns-1", 1)
seablock.lib.add_recipe_unlock("water-washing-2", "sb-clowns-resource-1")
seablock.lib.add_recipe_unlock("oil-gas-extraction", "sb-clowns-resource-2")
seablock.lib.add_recipe_unlock("angels-oil-processing", "sb-clowns-resource-2")
end
111 changes: 106 additions & 5 deletions SeaBlock/data-updates/misc.lua
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ end
-- No natural gas, use methane for manganese pellet smelting
seablock.lib.substingredient("pellet-manganese-smelting", "gas-natural-1", "gas-methane")
bobmods.lib.tech.remove_prerequisite("angels-manganese-smelting-3", "oil-gas-extraction")
bobmods.lib.tech.add_prerequisite("angels-manganese-smelting-3", "gas-processing")
bobmods.lib.tech.add_prerequisite("angels-manganese-smelting-3", "angels-advanced-gas-processing")

-- Remove steel's prerequiste on Chemical processing 1
bobmods.lib.tech.remove_prerequisite("steel-processing", "chemical-processing-1")
Expand Down Expand Up @@ -112,6 +112,108 @@ seablock.lib.hide("storage-tank", "bob-overflow-valve")
seablock.lib.hide("storage-tank", "bob-valve")
seablock.lib.hide("storage-tank", "bob-topup-valve")

-- Hide Oil & Gas Separator
-- Move Methane to Blue Science
for _, item in pairs({
{ type = "assembling-machine", name = "gas-refinery" },
{ type = "assembling-machine", name = "gas-refinery-2" },
{ type = "assembling-machine", name = "gas-refinery-3" },
{ type = "assembling-machine", name = "gas-refinery-4" },
{ type = "assembling-machine", name = "separator" },
{ type = "assembling-machine", name = "separator-2" },
{ type = "assembling-machine", name = "separator-3" },
{ type = "assembling-machine", name = "separator-4" },
{ type = "fluid", name = "gas-chlor-methane" },
{ type = "fluid", name = "liquid-multi-phase-oil" },
{ type = "item", name = "gas-chlor-methane-barrel" },
{ type = "item", name = "gas-refinery" },
{ type = "item", name = "gas-refinery-2" },
{ type = "item", name = "gas-refinery-3" },
{ type = "item", name = "gas-refinery-4" },
{ type = "item", name = "liquid-multi-phase-oil-barrel" },
{ type = "item", name = "separator" },
{ type = "item", name = "separator-2" },
{ type = "item", name = "separator-3" },
{ type = "item", name = "separator-4" },
}) do
seablock.lib.hide(item.type, item.name)
end

bobmods.lib.recipe.hide("angels-chemical-void-gas-chlor-methane")
bobmods.lib.recipe.hide("angels-chemical-void-liquid-multi-phase-oil")
bobmods.lib.recipe.hide("empty-gas-chlor-methane-barrel")
bobmods.lib.recipe.hide("empty-liquid-multi-phase-oil-barrel")
bobmods.lib.recipe.hide("fill-gas-chlor-methane-barrel")
bobmods.lib.recipe.hide("fill-liquid-multi-phase-oil-barrel")
bobmods.lib.recipe.hide("gas-chlor-methane")
bobmods.lib.recipe.hide("gas-fractioning-synthesis")
bobmods.lib.recipe.hide("gas-refinery")
bobmods.lib.recipe.hide("gas-refinery-2")
bobmods.lib.recipe.hide("gas-refinery-3")
bobmods.lib.recipe.hide("gas-refinery-4")
bobmods.lib.recipe.hide("oil-separation")
bobmods.lib.recipe.hide("separator")
bobmods.lib.recipe.hide("separator-2")
bobmods.lib.recipe.hide("separator-3")
bobmods.lib.recipe.hide("separator-4")

bobmods.lib.tech.remove_recipe_unlock("angels-advanced-chemistry-2", "gas-refinery-small-2")
bobmods.lib.tech.remove_recipe_unlock("angels-advanced-chemistry-2", "separator-2")
bobmods.lib.tech.remove_recipe_unlock("angels-advanced-chemistry-4", "gas-refinery-2")
bobmods.lib.tech.remove_recipe_unlock("angels-advanced-chemistry-4", "separator-3")
bobmods.lib.tech.remove_recipe_unlock("angels-advanced-chemistry-5", "gas-refinery-3")
bobmods.lib.tech.remove_recipe_unlock("angels-advanced-chemistry-5", "separator-4")
bobmods.lib.tech.remove_recipe_unlock("angels-advanced-gas-processing", "gas-fractioning-synthesis")
bobmods.lib.tech.remove_recipe_unlock("angels-advanced-gas-processing", "gas-refinery")
bobmods.lib.tech.remove_recipe_unlock("angels-nitrogen-processing-4", "gas-refinery-4")
bobmods.lib.tech.remove_recipe_unlock("chlorine-processing-2", "gas-chlor-methane")
bobmods.lib.tech.remove_recipe_unlock("flammables", "solid-fuel-methane")
bobmods.lib.tech.remove_recipe_unlock("fluid-barrel-processing", "empty-liquid-multi-phase-oil-barrel")
bobmods.lib.tech.remove_recipe_unlock("fluid-barrel-processing", "fill-liquid-multi-phase-oil-barrel")
bobmods.lib.tech.remove_recipe_unlock("gas-canisters", "empty-gas-chlor-methane-barrel")
bobmods.lib.tech.remove_recipe_unlock("gas-canisters", "fill-gas-chlor-methane-barrel")
bobmods.lib.tech.remove_recipe_unlock("gas-processing", "gas-fractioning")
bobmods.lib.tech.remove_recipe_unlock("gas-processing", "gas-refining")
bobmods.lib.tech.remove_recipe_unlock("steam-cracking-1", "catalyst-steam-cracking-butane")
bobmods.lib.tech.remove_recipe_unlock("steam-cracking-1", "steam-cracking-butane")
bobmods.lib.tech.remove_recipe_unlock("steam-cracking-1", "steam-cracking-ethane")
bobmods.lib.tech.remove_recipe_unlock("steam-cracking-1", "steam-cracking-methane")
bobmods.lib.tech.remove_recipe_unlock("steam-cracking-2", "steam-cracking-oil-residual")

bobmods.lib.tech.add_recipe_unlock("angels-advanced-gas-processing", "gas-refinery-small-2")
bobmods.lib.tech.add_recipe_unlock("angels-advanced-gas-processing", "gas-refining")
bobmods.lib.tech.add_recipe_unlock("angels-advanced-gas-processing", "gas-fractioning")
bobmods.lib.tech.add_recipe_unlock("angels-advanced-gas-processing", "solid-fuel-methane")
bobmods.lib.tech.add_recipe_unlock("fluid-handling", "angels-storage-tank-1")
bobmods.lib.tech.add_recipe_unlock("steam-cracking-1", "steam-cracking-oil-residual")
bobmods.lib.tech.add_recipe_unlock("steam-cracking-2", "catalyst-steam-cracking-butane")
bobmods.lib.tech.add_recipe_unlock("steam-cracking-2", "steam-cracking-butane")
bobmods.lib.tech.add_recipe_unlock("steam-cracking-2", "steam-cracking-ethane")
bobmods.lib.tech.add_recipe_unlock("steam-cracking-2", "steam-cracking-methane")
seablock.lib.add_recipe_unlock("bio-nutrient-paste", "gas-refinery-small", 2)

bobmods.lib.tech.remove_prerequisite("advanced-material-processing-2", "gas-processing")
bobmods.lib.tech.remove_prerequisite("angels-advanced-gas-processing", "steam-cracking-2")
bobmods.lib.tech.remove_prerequisite("angels-oil-processing", "oil-gas-extraction")
bobmods.lib.tech.remove_prerequisite("angels-sulfur-processing-3", "gas-processing")
bobmods.lib.tech.remove_prerequisite("bio-nutrient-paste", "gas-processing")
bobmods.lib.tech.remove_prerequisite("bio-processing-paste", "chlorine-processing-2")
bobmods.lib.tech.remove_prerequisite("gas-processing", "oil-gas-extraction")
bobmods.lib.tech.remove_prerequisite("steam-cracking-1", "gas-processing")
bobmods.lib.tech.remove_prerequisite("steam-cracking-2", "angels-advanced-chemistry-2")

bobmods.lib.tech.add_prerequisite("angels-advanced-chemistry-2", "steam-cracking-2")
bobmods.lib.tech.add_prerequisite("angels-advanced-gas-processing", "bio-nutrient-paste")
bobmods.lib.tech.add_prerequisite("angels-advanced-gas-processing", "bio-refugium-puffer-1")
bobmods.lib.tech.add_prerequisite("angels-oil-processing", "fluid-handling")
bobmods.lib.tech.add_prerequisite("bio-processing-paste", "chlorine-processing-1")
bobmods.lib.tech.add_prerequisite("steam-cracking-2", "angels-advanced-gas-processing")

bobmods.lib.tech.hide("gas-processing")
bobmods.lib.tech.hide("oil-gas-extraction")

bobmods.lib.recipe.replace_ingredient("paste-cellulose", "gas-chlor-methane", "gas-chlorine")

-- Buff Lime filtering
seablock.lib.substingredient("filter-lime", "solid-lime", nil, 1)
data.raw.recipe["filter-lime"].energy_required = 1
Expand Down Expand Up @@ -371,6 +473,8 @@ bobmods.lib.tech.add_prerequisite("plastics", "automation-2")
if mods["boblogistics"] then
bobmods.lib.tech.add_prerequisite("bob-repair-pack-2", "military")
end
bobmods.lib.tech.add_prerequisite("water-treatment-2", "fluid-handling")
bobmods.lib.tech.add_prerequisite("water-washing-2", "fluid-handling")

-- Nerf early game glass. Just need a little bit for arboretums
seablock.lib.substingredient("quartz-glass", "quartz", nil, 10)
Expand Down Expand Up @@ -420,10 +524,8 @@ bobmods.lib.tech.add_prerequisite("water-washing-2", "alloy-processing")
bobmods.lib.tech.add_prerequisite("advanced-ore-refining-1", "angels-stone-smelting-1")
bobmods.lib.tech.add_prerequisite("angels-cooling", "angels-stone-smelting-1")
bobmods.lib.tech.add_prerequisite("angels-metallurgy-2", "angels-stone-smelting-1")
bobmods.lib.tech.add_prerequisite("fluid-handling", "angels-stone-smelting-1")
bobmods.lib.tech.add_prerequisite("gardens", "angels-stone-smelting-1")
bobmods.lib.tech.add_prerequisite("oil-gas-extraction", "angels-stone-smelting-1")
bobmods.lib.tech.add_prerequisite("water-treatment-2", "angels-stone-smelting-1")
bobmods.lib.tech.add_prerequisite("water-washing-2", "angels-stone-smelting-1")

-- Brass prerequisites
bobmods.lib.tech.add_prerequisite("angels-advanced-chemistry-2", "zinc-processing")
Expand Down Expand Up @@ -463,7 +565,6 @@ bobmods.lib.tech.add_prerequisite("slag-processing-3", "angels-stone-smelting-3"
bobmods.lib.tech.add_prerequisite("water-treatment-4", "angels-stone-smelting-3")

-- Copper tungsten / tungsten carbide prerequisites
bobmods.lib.tech.add_prerequisite("angels-nitrogen-processing-4", "tungsten-alloy-processing")
bobmods.lib.tech.add_prerequisite("ore-processing-5", "tungsten-alloy-processing")

-- Nitinol prerequisites
Expand Down
7 changes: 7 additions & 0 deletions SeaBlock/data-updates/science-cost-tweaker.lua
Original file line number Diff line number Diff line change
Expand Up @@ -39,4 +39,11 @@ if mods["ScienceCostTweakerM"] then
)
bobmods.lib.tech.add_prerequisite("vehicle-fusion-reactor-equipment-3", "utility-science-pack")
end

-- Move intermediates from Advanced Material Processing to Purple Science
bobmods.lib.tech.remove_recipe_unlock("advanced-material-processing-2", "sct-prod-baked-biopaste")
bobmods.lib.tech.remove_recipe_unlock("advanced-material-processing-2", "sct-prod-biosilicate")
bobmods.lib.tech.add_recipe_unlock("production-science-pack", "sct-prod-baked-biopaste")
bobmods.lib.tech.add_recipe_unlock("production-science-pack", "sct-prod-biosilicate")
bobmods.lib.tech.add_prerequisite("sct-production-science-pack", "angels-advanced-gas-processing")
end
9 changes: 9 additions & 0 deletions SeaBlock/data-updates/sulfur.lua
Original file line number Diff line number Diff line change
Expand Up @@ -33,3 +33,12 @@ bobmods.lib.tech.remove_prerequisite("explosives", "angels-sulfur-processing-2")
bobmods.lib.tech.add_prerequisite("explosives", "basic-chemistry-2")

bobmods.lib.tech.remove_prerequisite("battery", "angels-sulfur-processing-2")

-- Combine Sulfur 3 and 4 and move to Blue Science
seablock.lib.add_recipe_unlock("angels-sulfur-processing-3", "filter-lime", 1)
seablock.lib.add_recipe_unlock("angels-sulfur-processing-3", "angels-sulfur-scrubber", 2)
seablock.lib.add_recipe_unlock("angels-sulfur-processing-3", "filter-lime-used", 3)

bobmods.lib.tech.hide("angels-sulfur-processing-4")
bobmods.lib.tech.add_new_science_pack("angels-sulfur-processing-3", "chemical-science-pack", 1)
bobmods.lib.tech.add_prerequisite("angels-sulfur-processing-3", "chemical-science-pack")
32 changes: 9 additions & 23 deletions SeaBlock/prototypes/recipe.lua
Original file line number Diff line number Diff line change
Expand Up @@ -77,53 +77,39 @@ data:extend({
-- Balance assuming blue algae is about equal to green algae in MJ value.
-- 1 blue cellulose = 2MJ (1 green cellulose = 1MJ but converting to wood pellets doubles it.
-- Wrong, but I'll stick with it to avoid increasing the cost of all petrochem recipes)
-- Now for multi phase oil MJ value:
-- 100 naphtha = 50MJ
-- 50 fuel oil = 50MJ
-- basic oil refining is 100 crude oil -> 30 fuel oil + 50 naphtha (and other stuff i'll ignore)
-- 100 crude oil = 30MJ (fuel oil) + 25MJ (naphtha) = 55MJ
-- 100 multiphase oil = 55*70/100 = 38.5 MJ.
-- Let's round that up to 40MJ or 20 blue cellulose fiber.
-- This is being generous, haven't counted natural gas liquids and base mineral oil.
-- 45 crude oil = 27MJ (fuel oil) + 22.5MJ (naphtha) = 49.5MJ
-- Let's round that up to 50MJ for 20 blue cellulose fiber.
-- This is being generous, haven't counted base mineral oil.

-- 100 sulfuric waste water -> 40 blue algae
-- 40 blue algae -> 20 blue cellulose
-- 20 blue cellulose -> 100 multi phase oil + 60 sulfuric waste water
-- 100 multi phase oil -> 10 sulfuric waste water
-- 20 blue cellulose -> 90 crude oil + 70 sulfuric waste water
-- 70% of sulfuric waste water is recycled
-- Almost forgot +20 raw gas
-- 20 raw gas -> 4 acid gas
-- 4 acid gas -> 2.4 hydrogen sulfide
-- 2.4 hydrogen sulfide -> 0.12 sulfur
-- 0.12 sulfur -> 7.2 sulfur dioxide
-- 7.2 sulfur dioxide -> 4.8 sulfuric acid
-- 4.8 sulfuric acid -> 16 slag slurry
-- 16 slag slurry -> 12.8 sulfuric waste water (coal filtering)
-- So closer to 80% sulfur return
type = "recipe",
name = "sb-blue-algae-liquefaction",
icons = angelsmods.functions.create_liquid_recipe_icon({
"blue-cellulose-fiber",
}, { { 100, 100, 100 }, { 171, 161, 055 }, { 127, 163, 109 } }),
category = "petrochem-separation",
category = "oil-processing",
enabled = false,
energy_required = 5,
ingredients = {
{ type = "item", name = "blue-cellulose-fiber", amount = 20 },
{ type = "fluid", name = "steam", amount = 100 },
},
results = {
{ type = "fluid", name = "water-yellow-waste", amount = 60 },
{ type = "fluid", name = "liquid-multi-phase-oil", amount = 100 },
{ type = "fluid", name = "crude-oil", amount = 90 },
{ type = "fluid", name = "water-yellow-waste", amount = 70 },
{ type = "fluid", name = "gas-carbon-dioxide", amount = 20 },
},
subgroup = "bio-processing-blue",
order = "d[blue-algae-liquefaction]",
},
})

bobmods.lib.tech.add_prerequisite("oil-gas-extraction", "bio-processing-blue")
bobmods.lib.tech.add_recipe_unlock("oil-gas-extraction", "sb-blue-algae-liquefaction")
bobmods.lib.tech.add_prerequisite("angels-oil-processing", "bio-processing-blue")
bobmods.lib.tech.add_recipe_unlock("angels-oil-processing", "sb-blue-algae-liquefaction")

-- Setup recipe bases

Expand Down

0 comments on commit 9f4380f

Please sign in to comment.