From 86b1a3732ff72de6354b4cd6922e357d79ec3c01 Mon Sep 17 00:00:00 2001 From: pla Date: Tue, 22 Apr 2025 17:37:02 +0200 Subject: [PATCH 1/2] K2 compatibility --- data-util.lua | 28 +++++++++++++--------------- deadlock-stacking.lua | 4 ++-- prototypes/gyro.lua | 4 ++-- prototypes/silica-recipe.lua | 4 ++-- prototypes/silicon-recipe.lua | 8 ++++---- recipe-updates.lua | 32 ++++++++++++++++---------------- 6 files changed, 39 insertions(+), 41 deletions(-) diff --git a/data-util.lua b/data-util.lua index fb70b99..4046b9d 100644 --- a/data-util.lua +++ b/data-util.lua @@ -117,10 +117,8 @@ end function util.get_stack_size(default) if mods.Krastorio2 then - local size = get_setting("kr-stack-size") - if size and tonumber(size) then - return tonumber(size) - end + -- no more stacksize setting in K2 + return 200 end return default end @@ -549,19 +547,19 @@ function util.k2matter(params, only_deconversion) count = 350, ingredients = mods["space-exploration"] and { - {"automation-science-pack", 1}, - {"logistic-science-pack", 1}, - {"chemical-science-pack", 1}, - {"se-astronomic-science-pack-4", 1}, - {"se-energy-science-pack-4", 1}, - {"se-material-science-pack-4", 1}, - {"se-deep-space-science-pack-2", 1}, - {"se-kr-matter-science-pack-2", 1}, + {type = "item", name = "automation-science-pack", amount = 1}, + {type = "item", name = "logistic-science-pack", amount = 1}, + {type = "item", name = "chemical-science-pack", amount = 1}, + {type = "item", name = "se-astronomic-science-pack-4", amount = 1}, + {type = "item", name = "se-energy-science-pack-4", amount = 1}, + {type = "item", name = "se-material-science-pack-4", amount = 1}, + {type = "item", name = "se-deep-space-science-pack-2", amount = 1}, + {type = "item", name = "se-kr-matter-science-pack-2", amount = 1}, } or { - {"production-science-pack", 1}, - {"utility-science-pack", 1}, - {"matter-tech-card", 1} + {type = "item", name = "production-science-pack", amount = 1}, + {type = "item", name = "utility-science-pack", amount = 1}, + {type = "item", name = "kr-matter-tech-card", amount = 1} }, time = 45, }, diff --git a/deadlock-stacking.lua b/deadlock-stacking.lua index 246ceb2..5e7c1f1 100644 --- a/deadlock-stacking.lua +++ b/deadlock-stacking.lua @@ -5,7 +5,7 @@ if deadlock and deadlock["add_stack"] then deadlock.add_stack("silica", "__bzsilicon__/graphics/icons/stacked/silica-stacked.png" , "deadlock-stacking-1", 64) deadlock.add_stack("optical-fiber", "__bzsilicon__/graphics/icons/stacked/optical-fiber-stacked.png" , "deadlock-stacking-2", 64) if not mods["Krastorio2"] then - deadlock.add_stack("silicon", "__bzsilicon__/graphics/icons/stacked/silicon-stacked.png" , "deadlock-stacking-2", 64) + deadlock.add_stack("kr-silicon", "__bzsilicon__/graphics/icons/stacked/silicon-stacked.png" , "deadlock-stacking-2", 64) end if util.me.more_intermediates() then deadlock.add_stack("silicon-wafer", "__bzsilicon__/graphics/icons/stacked/silicon-wafer-stacked.png" , "deadlock-stacking-2", 64) @@ -21,7 +21,7 @@ if deadlock_crating then deadlock_crating.add_crate("silica", "deadlock-crating-1") deadlock_crating.add_crate("optical-fiber", "deadlock-crating-2") if not mods["Krastorio2"] then - deadlock_crating.add_crate("silicon", "deadlock-crating-2") + deadlock_crating.add_crate("kr-silicon", "deadlock-crating-2") end if util.me.more_intermediates() then deadlock_crating.add_crate("silicon-wafer", "deadlock-crating-2") diff --git a/prototypes/gyro.lua b/prototypes/gyro.lua index ea1f150..7e91cc6 100644 --- a/prototypes/gyro.lua +++ b/prototypes/gyro.lua @@ -5,7 +5,7 @@ if util.me.use_gyros() then gyro_ingredients = { -- outputs 4 util.item("copper-cable", 2), util.item("silica", 1), - util.item("silicon", 4)} + util.item(mods["Krastorio2"] and "kr-silicon" or "silicon", 4)} gyro_prereqs = {util.me.silicon_processing} if mods.bzcarbon then @@ -19,7 +19,7 @@ elseif mods.bztitanium and data.raw.item["titanium-plate"] then table.insert(gyro_ingredients, util.item("titanium-plate", 1)) table.insert(gyro_prereqs, "titanium-processing") elseif mods.Krastorio2 then - table.insert(gyro_ingredients, util.item("rare-metals", 1)) + table.insert(gyro_ingredients, util.item("kr-rare-metals", 1)) end diff --git a/prototypes/silica-recipe.lua b/prototypes/silica-recipe.lua index 8fc5efc..74afd50 100644 --- a/prototypes/silica-recipe.lua +++ b/prototypes/silica-recipe.lua @@ -62,7 +62,7 @@ data:extend( type = "item", name = "silica", icon = "__bzsilicon__/graphics/icons/silica.png", - icon_size = 64, icon_mipmaps = 3, + icon_size = 64, inventory_move_sound = item_sounds.sulfur_inventory_move, pick_sound = item_sounds.resource_inventory_pickup, drop_sound = item_sounds.sulfur_inventory_move, @@ -74,7 +74,7 @@ data:extend( mods["Krastorio2"] and { type = "technology", name = "silica-processing", - icon_size = 256, icon_mipmaps = 4, + icon_size = 256, icon = "__bzsilicon__/graphics/technology/silica-processing.png", effects = { diff --git a/prototypes/silicon-recipe.lua b/prototypes/silicon-recipe.lua index e52db34..d74fea7 100644 --- a/prototypes/silicon-recipe.lua +++ b/prototypes/silicon-recipe.lua @@ -5,7 +5,7 @@ if mods["Krastorio2"] then util.remove_raw("recipe", "silicon-2") util.remove_recipe_effect("kr-silicon-processing", "silicon-2") if mods["Sebs-Electrics"] then - util.add_unlock("kr-silicon-processing", "silicon") + util.add_unlock("kr-silicon-processing", "kr-silicon") end end local prerequisites = {} @@ -120,8 +120,8 @@ data:extend({ energy_required = 2, allow_productivity = true, ingredients = (mods["Krastorio2"] and { - {type= "item", name="silicon", amount=2}, - {type= "fluid", name="hydrogen-chloride", amount=5}, + {type= "item", name="kr-silicon", amount=2}, + {type= "fluid", name="kr-hydrogen-chloride", amount=5}, } or { {type= "item", name="silicon", amount=2}, {type= "fluid", name="sulfuric-acid", amount=5}, @@ -149,7 +149,7 @@ data:extend({ energy_required = 10, allow_productivity = true, ingredients = { - {type= "item", name="silicon", amount=10}, + {type= "item", name= mods["Krastorio2"] and "kr-silicon" or "silicon", amount=10}, {type= "item", name="copper-plate", amount=1}, {type= "fluid", name="water", amount=20}, }, diff --git a/recipe-updates.lua b/recipe-updates.lua index d55a015..819bd30 100644 --- a/recipe-updates.lua +++ b/recipe-updates.lua @@ -24,7 +24,7 @@ if util.me.use_gyros() then util.add_prerequisite("jetpack-2", "gyro") --K2 - util.add_ingredient("advanced-exoskeleton-equipment", "gyro", 4) + util.add_ingredient("kr-advanced-exoskeleton-equipment", "gyro", 4) util.add_ingredient("kr-laser-artillery-turret", "gyro", 4) util.add_ingredient("kr-railgun-turret", "gyro", 4) util.add_ingredient("kr-advanced-tank", "gyro", 4) @@ -115,21 +115,21 @@ if not mods["Krastorio2"] then util.add_prerequisite("advanced-circuit", util.me.silicon_processing) else - util.replace_some_ingredient("solar-panel", "electronic-circuit", 10, "silicon", 10) + util.replace_some_ingredient("solar-panel", "electronic-circuit", 10, "kr-silicon", 10) - util.replace_some_ingredient("processing-unit", "electronic-circuit", 10, "silicon", 6) + util.replace_some_ingredient("processing-unit", "electronic-circuit", 10, "kr-silicon", 6) util.remove_ingredient("efficiency-module", "electronic-circuit") - util.add_ingredient("efficiency-module", "silicon", 3) + util.add_ingredient("efficiency-module", "kr-silicon", 3) util.remove_ingredient("quality-module", "electronic-circuit") - util.add_ingredient("quality-module", "silicon", 3) + util.add_ingredient("quality-module", "kr-silicon", 3) util.remove_ingredient("productivity-module", "electronic-circuit") - util.add_ingredient("productivity-module", "silicon", 3) + util.add_ingredient("productivity-module", "kr-silicon", 3) util.remove_ingredient("speed-module", "electronic-circuit") - util.add_ingredient("speed-module", "silicon", 3) + util.add_ingredient("speed-module", "kr-silicon", 3) if not mods.modmashsplinterelectonics then - util.replace_some_ingredient("advanced-circuit", "electronic-circuit", 1, "silicon", 1) + util.replace_some_ingredient("advanced-circuit", "electronic-circuit", 1, "kr-silicon", 1) end util.add_prerequisite("advanced-circuit", util.me.silicon_processing) end @@ -155,9 +155,9 @@ local useful_combinators = {"timer-combinator", "counting-combinator", "random-c "statistic-combinator", "pollution-combinator", "emitter-combinator", "receiver-combinator"} util.replace_ingredient("green-wire", "copper-cable", "optical-fiber") -util.replace_ingredient("green-wire", "electronic-circuit", "silicon") +util.replace_ingredient("green-wire", "electronic-circuit", "kr-silicon") util.replace_ingredient("red-wire", "copper-cable", "optical-fiber") -util.replace_ingredient("red-wire", "electronic-circuit", "silicon") +util.replace_ingredient("red-wire", "electronic-circuit", "kr-silicon") if not mods["IndustrialRevolution"] then util.add_ingredient("arithmetic-combinator", si, 1) @@ -215,21 +215,21 @@ util.add_prerequisite("circuit-network", "fiber-optics") util.add_prerequisite("circuit-network", util.me.silicon_processing) if mods["Krastorio2"] then - util.add_ingredient("biusart-lab", "optical-fiber", 10) - util.add_ingredient("ai-core", "optical-fiber", 2) + util.add_ingredient("kr-advanced-lab", "optical-fiber", 10) + util.add_ingredient("kr-ai-core", "optical-fiber", 2) 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("electronic-components", "silicon") - util.add_ingredient("electronic-components", "silicon-wafer", 1) + util.remove_ingredient("kr-electronic-components", "kr-silicon") + util.add_ingredient("kr-electronic-components", "silicon-wafer", 1) util.multiply_recipe("electronic-components-lithium", 2) - util.remove_ingredient("electronic-components-lithium", "silicon") + util.remove_ingredient("electronic-components-lithium", "kr-silicon") util.add_ingredient("electronic-components-lithium", "silicon-wafer", 3) util.replace_ingredient("solar-panel", "electronic-circuit", "solar-cell") - util.remove_ingredient("solar-panel", "silicon") + util.remove_ingredient("solar-panel", "kr-silicon") util.replace_ingredient("solar-panel-equipment", "solar-panel", "solar-cell") util.add_effect("solar-energy", {type = "unlock-recipe", recipe="solar-cell"}) end From d543f3a67c277b3440f8bf7c9c53c5074e04e8bf Mon Sep 17 00:00:00 2001 From: pla Date: Tue, 29 Apr 2025 11:24:19 +0200 Subject: [PATCH 2/2] Fixed K2 stacksize function --- data-util.lua | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/data-util.lua b/data-util.lua index 4046b9d..d6e34d5 100644 --- a/data-util.lua +++ b/data-util.lua @@ -116,9 +116,8 @@ function util.fe_plus(sub) end function util.get_stack_size(default) - if mods.Krastorio2 then - -- no more stacksize setting in K2 - return 200 + if mods.Krastorio2 and kr_adjust_stack_sizes then + return tonumber(200) end return default end