From 4c1591453f73b488d93056df8600b80e47d3e559 Mon Sep 17 00:00:00 2001 From: pla Date: Sun, 9 Nov 2025 18:17:24 +0100 Subject: [PATCH] Fix lock with silicone in enginge unit with Krastorio (#1) with K2 - removes silicone from engine-unit and adds it to electric enginge unit - moves filtration plant unlock to silica-processing tech Work with ATOM and without K2 Co-authored-by: pla Reviewed-on: https://git.cacklingfiend.info/cacklingfiend/bzsilicon2/pulls/1 Co-authored-by: pla Co-committed-by: pla --- bzsilicon2/compatibility/krastorio2.lua | 3 ++- bzsilicon2/prototypes/silica-recipe.lua | 7 +++++-- bzsilicon2/recipe-updates.lua | 25 +++++++++++++++---------- 3 files changed, 22 insertions(+), 13 deletions(-) diff --git a/bzsilicon2/compatibility/krastorio2.lua b/bzsilicon2/compatibility/krastorio2.lua index 6750161..06c89d6 100644 --- a/bzsilicon2/compatibility/krastorio2.lua +++ b/bzsilicon2/compatibility/krastorio2.lua @@ -1,4 +1,5 @@ if mods["Krastorio2"] then local k2datautil = require("__Krastorio2__/data-util") - k2datautil.remove_recipe_unlock("kr-silicon-processing", "kr-quartz") + k2datautil.remove_recipe_unlock("kr-silicon-processing", "kr-quartz") + k2datautil.remove_recipe_unlock("kr-silicon-processing", "kr-filtration-plant") end \ No newline at end of file diff --git a/bzsilicon2/prototypes/silica-recipe.lua b/bzsilicon2/prototypes/silica-recipe.lua index d62cc34..e83b468 100644 --- a/bzsilicon2/prototypes/silica-recipe.lua +++ b/bzsilicon2/prototypes/silica-recipe.lua @@ -1,5 +1,5 @@ -- Silica -local util = require("data-util"); +local util = require("data-util") local item_sounds = require('__base__.prototypes.item_sounds') data:extend( { @@ -77,7 +77,10 @@ data:extend( type = "unlock-recipe", recipe = "kr-quartz" }, - }, + { + type = "unlock-recipe", + recipe = "kr-filtration-plant" + },}, prerequisites = {"kr-fluids-chemistry", "kr-stone-processing"}, unit = { diff --git a/bzsilicon2/recipe-updates.lua b/bzsilicon2/recipe-updates.lua index 0988805..1bbd5d8 100644 --- a/bzsilicon2/recipe-updates.lua +++ b/bzsilicon2/recipe-updates.lua @@ -1,4 +1,4 @@ -local util = require("data-util"); +local util = require("data-util") local silicon = util.k2() and "kr-silicon" or "silicon" local si = util.me.more_intermediates() and "silicon-wafer" or silicon @@ -72,12 +72,12 @@ end util.add_ingredient("solar-cell", "lead-plate", 1) if not util.k2() then - util.remove_ingredient("concrete", "stone-brick"); + util.remove_ingredient("concrete", "stone-brick") if mods["Bio_Industries"] or mods["omnimatter"] then - util.add_ingredient("concrete", "stone-brick", 3); - util.add_ingredient("concrete", "silica", 10); + util.add_ingredient("concrete", "stone-brick", 3) + util.add_ingredient("concrete", "silica", 10) else - util.add_ingredient("concrete", "silica", 25); + util.add_ingredient("concrete", "silica", 25) end util.add_prerequisite("concrete", "silica-processing") @@ -138,9 +138,9 @@ if not util.k2() then util.add_prerequisite("solar-energy", "silicon-processing") util.add_prerequisite("modules", util.me.silicon_processing) else - util.add_ingredient("concrete", "silica", 15); + util.add_ingredient("concrete", "silica", 15) if not mods["aai-industry"] then - util.add_ingredient("concrete", "kr-sand", 10); + util.add_ingredient("concrete", "kr-sand", 10) end end @@ -218,10 +218,15 @@ util.add_prerequisite("circuit-network", util.me.silicon_processing) if util.k2() then util.add_ingredient("kr-advanced-lab", "optical-fiber", 10) util.add_ingredient("kr-ai-core", "optical-fiber", 2) + + if util.me.more_intermediates() then + --remove silicone from engine unit, add to electric engine + util.remove_ingredient("engine-unit", "silicone") + util.remove_ingredient("engine-unit", "pipe") + util.add_ingredient("engine-unit", "pipe", 2) + util.add_ingredient("electric-engine-unit", "silicone", 1) + util.add_prerequisite(util.me.silicon_processing, "silica-processing") - util.add_prerequisite(util.me.silicon_processing, "silica-processing") - - if util.me.more_intermediates() then util.add_effect(util.me.silicon_processing, {type = "unlock-recipe", recipe="silicon-wafer"}) util.remove_ingredient("kr-electronic-components", silicon) util.add_ingredient("kr-electronic-components", "silicon-wafer", 2)