From 65768d290290bf438344782b602ee7be57936c57 Mon Sep 17 00:00:00 2001 From: Brevven Date: Sat, 18 Mar 2023 14:42:07 -0700 Subject: [PATCH] further recipe updates and fixes --- prototypes/recipe-updates-se.lua | 31 +++++++++++++++++++++++-------- prototypes/recipe-updates.lua | 20 ++++++++++++-------- 2 files changed, 35 insertions(+), 16 deletions(-) diff --git a/prototypes/recipe-updates-se.lua b/prototypes/recipe-updates-se.lua index a8bcd6c..547e844 100644 --- a/prototypes/recipe-updates-se.lua +++ b/prototypes/recipe-updates-se.lua @@ -2,6 +2,19 @@ local futil = require("util"); local util = require("data-util") if util.se6() then + util.replace_ingredient("se-rocket-launch-pad", "processing-unit", "rocket-control-unit") + util.replace_ingredient("se-space-assembling-machine", "processing-unit", "advanced-circuit", 8) + util.replace_ingredient("space-science-pack", "processing-unit", "advanced-circuit", 5) + util.replace_ingredient("se-meteor-defence", "processing-unit", "advanced-circuit", 200) + util.replace_ingredient("se-energy-beam-defence", "processing-unit", "advanced-circuit", 200) + util.replace_ingredient("se-space-decontamination-facility", "processing-unit", "advanced-circuit", 20) + util.replace_ingredient("se-space-supercomputer-1", "processing-unit", "advanced-circuit", 200) + util.replace_ingredient("se-space-science-lab", "processing-unit", "advanced-circuit", 100) + + util.remove_prerequisite("se-meteor-defence", "advanced-electronics-2") + util.add_prerequisite("se-meteor-defence", "se-rocket-science-pack") + + if util.me.silver() then util.replace_ingredient("se-nutrient-vat", "iron-plate", "silver-plate") else @@ -23,8 +36,9 @@ if util.se6() then util.replace_ingredient("se-condenser-turbine", util.titanium_plate, "titanium-palladium-flange") util.add_ingredient("se-condenser-turbine", "titanium-palladium-flange", 10) util.add_ingredient("se-big-turbine", "titanium-palladium-flange", 50) - util.add_ingredient("se-heavy-assembly", "silver-brazing-alloy", 1) - util.add_ingredient("se-space-assembling-machine", "silver-brazing-alloy", 2) + util.add_ingredient("se-heavy-assembly", "silver-brazing-alloy", 4) + util.add_ingredient("se-space-assembling-machine", "silver-brazing-alloy", 8) + util.replace_ingredient("se-space-pipe", "copper-cable", "silver-brazing-alloy") util.add_ingredient("se-space-thermodynamics-laboratory", "temperature-sensor", 20) util.add_ingredient("se-space-space-hypercooler", "temperature-sensor", 20) @@ -35,16 +49,17 @@ if util.se6() then if util.me.silver() then util.add_ingredient("se-space-decontamination-facility", "silver-plate", 5) - util.add_ingredient("se-space-decontamination-facility", "silver-brazing-alloy", 5) - else - util.add_ingredient("se-space-decontamination-facility", "gold-ingot", 1) end util.multiply_recipe("se-bioscrubber", 10) - util.replace_some_ingredient("se-bioscrubber", "steel-plate", 10, "palladium-ingot", 1) - util.replace_some_ingredient("se-bioscrubber", "steel-plate", 10, "platinum-ingot", 1) - util.replace_some_ingredient("se-bioscrubber", "steel-plate", 10, "silver-plate", 10) + if util.me.palladium() then + util.replace_some_ingredient("se-bioscrubber", "steel-plate", 10, "palladium-ingot", 2) + elseif util.me.platinum() then + util.replace_some_ingredient("se-bioscrubber", "steel-plate", 10, "platinum-ingot", 2) + else + util.replace_some_ingredient("se-bioscrubber", "steel-plate", 10, "silver-plate", 10) + end if util.me.platinum() then util.add_ingredient("se-bioelectrics-data", "platinum-ingot", 1) diff --git a/prototypes/recipe-updates.lua b/prototypes/recipe-updates.lua index 35958c6..c9fa203 100644 --- a/prototypes/recipe-updates.lua +++ b/prototypes/recipe-updates.lua @@ -32,22 +32,25 @@ util.remove_ingredient("speed-module-3", "cermet") util.remove_ingredient("effectivity-module-3", "cermet") util.remove_ingredient("productivity-module-3", "cermet") -util.add_ingredient("gas-extractor", "silver-brazing-alloy", 5) -util.add_ingredient("pumpjack", "silver-brazing-alloy", 5) -util.add_ingredient("assembling-machine-2", "silver-brazing-alloy", 1) +util.add_ingredient("gas-extractor", "silver-brazing-alloy", 10) +util.add_ingredient("pumpjack", "silver-brazing-alloy", 10) +util.add_ingredient("kr-mineral-water-pumpjack", "silver-brazing-alloy", 5) +util.add_ingredient("assembling-machine-2", "silver-brazing-alloy", 5) util.add_ingredient("basic-chemical-plant", "silver-brazing-alloy", 5) util.replace_ingredient("chemical-plant", "solder", "silver-brazing-alloy") -util.add_ingredient("chemical-plant", "silver-brazing-alloy", 5) +util.add_ingredient("chemical-plant", "silver-brazing-alloy", 20) util.add_ingredient("chemical-plant", "silver-plate", 5) util.replace_ingredient("oil-refinery", "solder", "silver-brazing-alloy") -util.add_ingredient("oil-refinery", "silver-brazing-alloy", 5) +util.add_ingredient("oil-refinery", "silver-brazing-alloy", 20) util.add_ingredient("rocket-silo", "silver-brazing-alloy", 100) util.multiply_recipe("solar-cell", 2) util.replace_ingredient("solar-cell", "lead-plate", "silver-plate", 1) util.add_ingredient("solar-cell", "silver-plate", 1) -util.add_ingredient("satellite", "gold-ingot", 10) +if not util.se6() then + util.add_ingredient("satellite", "gold-ingot", 10) +end util.add_ingredient("jet", "platinum-ingot", 10) util.add_ingredient("flying-fortress", "platinum-ingot", 10) @@ -68,8 +71,9 @@ if mods.Krastorio2 and util.me.silver() then local tc = futil.table.deepcopy(data.raw.recipe["blank-tech-card"]) tc.name = "blank-tech-card-silver" data:extend({tc}) - util.replace_ingredient("blank-tech-card-silver", "copper-wire", "silver-wire") - util.set_product_amount("blank-tech-card-silver", "blank-tech-card", 3) + util.replace_ingredient("blank-tech-card-silver", "copper-cable", "silver-wire") + local amt = util.get_amount("blank-tech-card") + util.set_product_amount("blank-tech-card-silver", "blank-tech-card", amt) util.add_icon("blank-tech-card-silver", { icon = "__bzgold__/graphics/icons/silver-wire.png", icon_size = 64, icon_mipmaps = 4, scale = 0.25, shift = {8,-8}