From a9892d0c961e4df128c1dd69807807339b460edc Mon Sep 17 00:00:00 2001 From: Brevven Date: Fri, 10 Mar 2023 02:36:18 -0800 Subject: [PATCH] se, k2 compat --- prototypes/processing-unit-updates.lua | 18 +-- prototypes/recipe-updates-se.lua | 172 +++++++++++++------------ prototypes/recipe-updates.lua | 12 +- prototypes/rich-copper.lua | 51 +++++--- prototypes/tech-updates.lua | 2 + 5 files changed, 139 insertions(+), 116 deletions(-) diff --git a/prototypes/processing-unit-updates.lua b/prototypes/processing-unit-updates.lua index 1db3675..f0ec8a3 100644 --- a/prototypes/processing-unit-updates.lua +++ b/prototypes/processing-unit-updates.lua @@ -1,14 +1,10 @@ local util = require("data-util") -if mods.bzsilicon then - util.remove_ingredient("processing-unit", "silicon") - util.remove_ingredient("processing-unit", "silicon-wafer") - util.remove_ingredient("processing-unit", "sulfuric-acid") - util.remove_ingredient("processing-unit", "electronic-circuit") - util.remove_ingredient("processing-unit", "advanced-circuit") - --util.set_ingredient("processing-unit", "electronic-circuit", 1) - --util.set_ingredient("processing-unit", "advanced-circuit", 1) - util.add_ingredient("processing-unit", "cpu", 1) - util.set_recipe_time("processing-unit", 4) -end +util.remove_ingredient("processing-unit", "silicon") +util.remove_ingredient("processing-unit", "silicon-wafer") +util.remove_ingredient("processing-unit", "sulfuric-acid") +util.remove_ingredient("processing-unit", "electronic-circuit") +util.remove_ingredient("processing-unit", "advanced-circuit") +util.add_ingredient("processing-unit", "cpu", 1) +util.set_recipe_time("processing-unit", 4) util.add_ingredient("processing-unit", "mainboard", 1) diff --git a/prototypes/recipe-updates-se.lua b/prototypes/recipe-updates-se.lua index b17644f..a8bcd6c 100644 --- a/prototypes/recipe-updates-se.lua +++ b/prototypes/recipe-updates-se.lua @@ -1,88 +1,92 @@ local futil = require("util"); local util = require("data-util") --- SE -if util.me.silver() then - util.replace_ingredient("se-nutrient-vat", "iron-plate", "silver-plate") -else - util.multiply_recipe("se-nutrient-vat", 10) - util.replace_ingredient("se-nutrient-vat", "iron-plate", "platinum-ingot") - util.replace_ingredient("se-nutrient-vat", "iron-plate", "palladium-ingot") +if util.se6() then + if util.me.silver() then + util.replace_ingredient("se-nutrient-vat", "iron-plate", "silver-plate") + else + util.multiply_recipe("se-nutrient-vat", 10) + util.replace_ingredient("se-nutrient-vat", "iron-plate", "platinum-ingot") + util.replace_ingredient("se-nutrient-vat", "iron-plate", "palladium-ingot") + end + + if util.me.silver() then + util.replace_ingredient("se-space-mirror", "steel-plate", "silver-plate", 6) + elseif util.me.palladium() then + util.multiply_recipe("se-space-mirror", 10) + util.replace_some_ingredient("se-space-mirror", "steel-plate", 20, "platinum-ingot", 1) + elseif util.me.platinum() then + util.multiply_recipe("se-space-mirror", 10) + util.replace_some_ingredient("se-space-mirror", "steel-plate", 20, "palladium-ingot", 1) + end + + 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-space-thermodynamics-laboratory", "temperature-sensor", 20) + util.add_ingredient("se-space-space-hypercooler", "temperature-sensor", 20) + util.add_ingredient("se-space-space-radiator", "temperature-sensor", 10) + + util.multiply_recipe("se-heavy-bearing", 5) + util.replace_some_ingredient("se-heavy-bearing", "se-iridium-plate", 5, "gold-ingot", 1) + + 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.platinum() then + util.add_ingredient("se-bioelectrics-data", "platinum-ingot", 1) + util.add_product("se-bioelectrics-data", {type=item, name="platinum-ingot", amount=1, probability=.9}) + elseif util.me.palladium() then + util.add_ingredient("se-bioelectrics-data", "palladium-ingot", 1) + util.add_product("se-bioelectrics-data", {type=item, name="palladium-ingot", amount=1, probability=.9}) + elseif util.me.silver() then + util.add_ingredient("se-bioelectrics-data", "silver-plate", 1) + util.add_product("se-bioelectrics-data", {type=item, name="silver-plate", amount=1, probability=.8}) + else + util.add_ingredient("se-bioelectrics-data", "gold-ingot", 1) + util.add_product("se-bioelectrics-data", {type=item, name="gold-ingot", amount=1, probability=.8}) + end + + + + + -------- + --TODO rebalance SE modules more completely + + util.replace_ingredient("effectivity-module-5", "se-holmium-cable", "platinum-ingot", 10) + util.replace_ingredient("effectivity-module-5", "se-holmium-cable", "silver-plate") + util.replace_ingredient("effectivity-module-5", "se-holmium-cable", "palladium-ingot", 10) + util.replace_ingredient("effectivity-module-5", "se-holmium-cable", "gold-ingot", 10) + + util.replace_ingredient("speed-module-5", "se-heavy-girder", "gold-ingot", 10) + util.replace_ingredient("speed-module-5", "se-heavy-girder", "palladium-ingot", 10) + util.replace_ingredient("speed-module-5", "se-heavy-girder", "platinum-ingot", 10) + util.replace_ingredient("speed-module-5", "se-heavy-girder", "silver-plate") + + + + -- SE data card + local dc = futil.table.deepcopy(data.raw.recipe["se-empty-data"]) + dc.name = "se-empty-data-gold" + data:extend({dc}) + util.replace_some_ingredient("se-empty-data-gold", "copper-plate", 4, "gold-ingot", 1) + util.set_product_amount("se-empty-data-gold", "se-empty-data", 3) + util.add_icon("se-empty-data-gold", { + icon = "__bzgold__/graphics/icons/gold-ingot.png", + icon_size = 128, scale = 0.20, shift = {8,-8} + }) + util.add_unlock("se-space-data-card", "se-empty-data-gold") end - -if util.me.silver() then - util.replace_some_ingredient("se-space-mirror", "steel-plate", 2, "silver-plate", 1) -elseif util.me.palladium() then - util.multiply_recipe("se-space-mirror", 10) - util.replace_some_ingredient("se-space-mirror", "steel-plate", 20, "platinum-ingot", 1) -elseif util.me.platinum() then - util.multiply_recipe("se-space-mirror", 10) - util.replace_some_ingredient("se-space-mirror", "steel-plate", 20, "palladium-ingot", 1) -end - -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-space-thermodynamics-laboratory", "temperature-sensor", 20) -util.add_ingredient("se-space-space-hypercooler", "temperature-sensor", 20) -util.add_ingredient("se-space-space-radiator", "temperature-sensor", 10) - -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.platinum() then - util.add_ingredient("se-bioelectrics-data", "platinum-ingot", 1) - util.add_product("se-bioelectrics-data", {type=item, name="platinum-ingot", amount=1, probability=.9}) -elseif util.me.palladium() then - util.add_ingredient("se-bioelectrics-data", "palladium-ingot", 1) - util.add_product("se-bioelectrics-data", {type=item, name="palladium-ingot", amount=1, probability=.9}) -elseif util.me.silver() then - util.add_ingredient("se-bioelectrics-data", "silver-plate", 1) - util.add_product("se-bioelectrics-data", {type=item, name="silver-plate", amount=1, probability=.8}) -else - util.add_ingredient("se-bioelectrics-data", "gold-ingot", 1) - util.add_product("se-bioelectrics-data", {type=item, name="gold-ingot", amount=1, probability=.8}) -end - - - - --------- ---TODO rebalance SE modules more completely - -util.replace_ingredient("effectivity-module-5", "se-holmium-cable", "platinum-ingot", 10) -util.replace_ingredient("effectivity-module-5", "se-holmium-cable", "silver-plate") -util.replace_ingredient("effectivity-module-5", "se-holmium-cable", "palladium-ingot", 10) -util.replace_ingredient("effectivity-module-5", "se-holmium-cable", "gold-ingot", 10) - -util.replace_ingredient("speed-module-5", "se-heavy-girder", "gold-ingot", 10) -util.replace_ingredient("speed-module-5", "se-heavy-girder", "palladium-ingot", 10) -util.replace_ingredient("speed-module-5", "se-heavy-girder", "platinum-ingot", 10) -util.replace_ingredient("speed-module-5", "se-heavy-girder", "silver-plate") - - - --- SE data card -local dc = futil.table.deepcopy(data.raw.recipe["se-empty-data"]) -dc.name = "se-empty-data-gold" -data:extend({dc}) -util.replace_some_ingredient("se-empty-data-gold", "copper-plate", 4, "gold-ingot", 1) -util.set_product_amount("se-empty-data-gold", "se-empty-data", 3) -util.add_icon("se-empty-data-gold", { - icon = "__bzgold__/graphics/icons/gold-ingot.png", - icon_size = 128, scale = 0.20, shift = {8,-8} - }) -util.add_unlock("se-space-data-card", "se-empty-data-gold") diff --git a/prototypes/recipe-updates.lua b/prototypes/recipe-updates.lua index cc2093f..35958c6 100644 --- a/prototypes/recipe-updates.lua +++ b/prototypes/recipe-updates.lua @@ -32,6 +32,10 @@ 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("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-plate", 5) @@ -43,8 +47,12 @@ util.multiply_recipe("solar-cell", 2) util.replace_ingredient("solar-cell", "lead-plate", "silver-plate", 1) util.add_ingredient("solar-cell", "silver-plate", 1) --- K2 +util.add_ingredient("satellite", "gold-ingot", 10) +util.add_ingredient("jet", "platinum-ingot", 10) +util.add_ingredient("flying-fortress", "platinum-ingot", 10) + +-- K2 util.add_ingredient("kr-bio-lab", "silver-plate", 1) util.add_ingredient("kr-quantum-computer", "mlcc", 50) @@ -56,7 +64,7 @@ elseif util.me.platinum() then end -- K2 blank tech card -if util.me.silver() then +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}) diff --git a/prototypes/rich-copper.lua b/prototypes/rich-copper.lua index b46ae0e..35ce91f 100644 --- a/prototypes/rich-copper.lua +++ b/prototypes/rich-copper.lua @@ -12,18 +12,17 @@ if mods.Krastorio2 then -- no rich copper util.set_main_product("rare-metals", "rare-metals") util.set_main_product("rare-metals-2", "rare-metals") - util.add_product("enriched-rare-metals", {"sulfur", 1}) if util.me.platinum() and util.me.palladium() then - util.replace_some_product("rare-metals", "rare-metals", 2, "platinum-ingot", 2, {force=true}) - util.replace_some_product("rare-metals", "rare-metals", 2, "palladium-ingot", 2, {force=true}) - util.replace_some_product("rare-metals-2", "rare-metals", 3, "platinum-ingot", 3, {force=true}) - util.replace_some_product("rare-metals-2", "rare-metals", 3, "palladium-ingot", 3, {force=true}) + util.replace_some_product("rare-metals", "rare-metals", 2, "platinum-powder", 2, {force=true}) + util.replace_some_product("rare-metals", "rare-metals", 2, "palladium-powder", 2, {force=true}) + util.replace_some_product("rare-metals-2", "rare-metals", 3, "platinum-powder", 3, {force=true}) + util.replace_some_product("rare-metals-2", "rare-metals", 3, "palladium-powder", 3, {force=true}) elseif util.me.platinum() then - util.replace_some_product("rare-metals", "rare-metals", 3, "platinum-ingot", 3, {force=true}) - util.replace_some_product("rare-metals-2", "rare-metals", 6, "platinum-ingot", 6, {force=true}) + util.replace_some_product("rare-metals", "rare-metals", 3, "platinum-powder", 3, {force=true}) + util.replace_some_product("rare-metals-2", "rare-metals", 6, "platinum-powder", 6, {force=true}) elseif util.me.palladium() then - util.replace_some_product("rare-metals", "rare-metals", 3, "palladium-ingot", 3, {force=true}) - util.replace_some_product("rare-metals-2", "rare-metals", 6, "palladium-ingot", 6, {force=true}) + util.replace_some_product("rare-metals", "rare-metals", 3, "palladium-powder", 3, {force=true}) + util.replace_some_product("rare-metals-2", "rare-metals", 6, "palladium-powder", 6, {force=true}) end else @@ -91,23 +90,28 @@ if data.raw.resource["copper-ore"] then end end +if util.se6() then + data:extend({ + { + type = "autoplace-control", + category = "resource", + name = "rich-copper-ore", + richness = true, + order = "zzzzzzzzzzz" + }, + }) +end + data:extend({ - --{ - -- type = "autoplace-control", - -- category = "resource", - -- name = "rich-copper-ore", - -- richness = true, - -- order = "b-e" - --}, { type = "noise-layer", name = "rich-copper-ore" }, { type = "resource", - icon_size = 64, icon_mipmaps = 3, name = "rich-copper-ore", icon = "__bzgold__/graphics/icons/rich-copper-ore.png", + icon_size = 64, icon_mipmaps = 4, flags = {"placeable-neutral"}, order="a-b-a", map_color = {r=0.9, g=0.5, b=0.4}, @@ -125,11 +129,11 @@ data:extend({ autoplace = resource_autoplace.resource_autoplace_settings{ name = "rich-copper-ore", - autoplace_control_name = "copper-ore", + autoplace_control_name = util.se6() and "rich-copper-ore" or "copper-ore", order = "b-z", base_density = 4, base_spots_per_km2 = 1, - has_starting_area_placement = true, -- TODO CHANGE THIS + has_starting_area_placement = false, regular_rq_factor_multiplier = 1, starting_rq_factor_multiplier = 1, }, @@ -196,5 +200,14 @@ data:extend({ }) util.add_unlock("platinum-processing", "rich-copper") util.add_unlock("palladium-processing", "rich-copper") + +if util.se6() then + se_resources["rich-copper-ore"] = { + order = "b-z-c", + has_starting_area_placement = false, + base_density = 4, + base_spots_per_km2 = 1, + } +end end end diff --git a/prototypes/tech-updates.lua b/prototypes/tech-updates.lua index 85412d2..59f788e 100644 --- a/prototypes/tech-updates.lua +++ b/prototypes/tech-updates.lua @@ -8,6 +8,8 @@ else util.add_prerequisite("oil-processing", "silver-processing") end +util.add_prerequisite("gas-extraction", "silver-processing") + util.add_prerequisite("advanced-electronics-2", "gold-processing") util.remove_prerequisite("advanced-electronics-2", "chemical-science-pack") util.add_prerequisite("advanced-electronics-2", "temperature-regulation")