Skip to content

K2update #20

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
pla wants to merge 2 commits into
base: master
Choose a base branch
from
Open

K2update #20

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
86b1a37
K2 compatibility
pla Apr 22, 2025
d543f3a
Fixed K2 stacksize function
pla Apr 29, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
29 changes: 13 additions & 16 deletions data-util.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -116,11 +116,8 @@ function util.fe_plus(sub)
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
if mods.Krastorio2 and kr_adjust_stack_sizes then
return tonumber(200)
end
return default
end
Expand Down Expand Up @@ -549,19 +546,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,
},
Expand Down
4 changes: 2 additions & 2 deletions deadlock-stacking.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)

@stevecheckoway stevecheckoway Jul 12, 2025

Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Is this right? It seems to be changing it to using kr-silicon when Krastorio2 is not being used.

end
if util.me.more_intermediates() then
deadlock.add_stack("silicon-wafer", "__bzsilicon__/graphics/icons/stacked/silicon-wafer-stacked.png" , "deadlock-stacking-2", 64)
Expand All @@ -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")

@stevecheckoway stevecheckoway Jul 12, 2025

Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Same here: using a k2 item when k2 is not being used.

end
if util.me.more_intermediates() then
deadlock_crating.add_crate("silicon-wafer", "deadlock-crating-2")
Expand Down
4 changes: 2 additions & 2 deletions prototypes/gyro.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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


Expand Down
4 changes: 2 additions & 2 deletions prototypes/silica-recipe.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand All @@ -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 =
{
Expand Down
8 changes: 4 additions & 4 deletions prototypes/silicon-recipe.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 = {}
Expand Down Expand Up @@ -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},
Expand Down Expand Up @@ -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},
},
Expand Down
32 changes: 16 additions & 16 deletions recipe-updates.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down Expand Up @@ -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
Expand All @@ -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)
Expand Down Expand Up @@ -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
Expand Down