Skip to content

K2update #12

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 4 commits into
base: main
Choose a base branch
from
Open

K2update #12

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
9a18227
Added enriched tin plate to en
pla Apr 22, 2025
05f54ef
K2 compatibility
pla Apr 22, 2025
ff4684a
fixed type needs_stabilizer
pla Apr 22, 2025
77c27ce
Fixed K2 matter util path and 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
9 changes: 3 additions & 6 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 @@ -515,7 +512,7 @@ end
-- k2 matter
-- params: {k2matter}, k2baseicon , {icon}
function util.k2matter(params)
local matter = require("__Krastorio2__/lib/public/data-stages/matter-util")
local matter = require("__Krastorio2__/prototypes/libraries/matter")
if mods["space-exploration"] then
params.k2matter.need_stabilizer = true
end
Expand Down
2 changes: 2 additions & 0 deletions locale/en/tin.cfg
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,6 +54,8 @@ jellyskin-processing=Jellyskin processing
tin-from-organotins=Tin from organotins
metallic-asteroid-crushing-tin=Metallic asteroid crushing for tin
separation=__1__ separation
enriched-tin-plate=Tin plate from enriched tin


[recipe-description]
tin-sulfides=Only possible on Vulcanus, extract tin from the released acidic gases.
Expand Down
18 changes: 9 additions & 9 deletions tin-enriched.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ data:extend(
results =
{
{type = "item", name = "enriched-tin", amount = 6},
{type = "fluid", name = "dirty-water", amount = 25, catalyst_amount = 25}
{type = "fluid", name = "kr-dirty-water", amount = 25, catalyst_amount = 25}
},
crafting_machine_tint =
{
Expand All @@ -67,36 +67,36 @@ data:extend(
always_show_made_in = true,
always_show_products = true,
allow_productivity = true,
ingredients = { {"enriched-tin", 5} },
results = { {"tin-plate", 5} },
ingredients = { {type = "item", name = "enriched-tin", amount = 5} },
results = { {type = "item", name = "tin-plate", amount = 5} },
order = "b[tin-plate]-b[enriched-tin-plate]",
},
{
type = "recipe",
name = "dirty-water-filtration-tin",
category = "fluid-filtration",
category = "kr-fluid-filtration",
icons =
{
{
icon = data.raw.fluid["dirty-water"].icon,
icon_size = data.raw.fluid["dirty-water"].icon_size
icon = data.raw.fluid["kr-dirty-water"].icon,
icon_size = data.raw.fluid["kr-dirty-water"].icon_size or 64
},
{
icon = data.raw.item["tin-ore"].icon,
icon_size = data.raw.item["tin-ore"].icon_size,
scale = 0.20 * (data.raw.fluid["dirty-water"].icon_size/data.raw.item["tin-ore"].icon_size),
scale = 0.20 * ((data.raw.fluid["kr-dirty-water"].icon_size or 64)/data.raw.item["tin-ore"].icon_size),
shift = {0, 4}
}
},
icon_size = data.raw.fluid["dirty-water"].icon_size,
icon_size = data.raw.fluid["kr-dirty-water"].icon_size,
energy_required = 2,
enabled = false,
allow_as_intermediate = false,
always_show_made_in = true,
always_show_products = true,
ingredients =
{
{type = "fluid", name = "dirty-water", amount = 100, catalyst_amount = 100},
{type = "fluid", name = "kr-dirty-water", amount = 100, catalyst_amount = 100},
},
results =
{
Expand Down
106 changes: 84 additions & 22 deletions tin-matter.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,27 +1,89 @@
-- Matter recipes for Krastorio2
-- removed the use of the lib function, K2 function is not universal anymore
-- if mods["Krastorio2"] then
-- local util = require("data-util");
-- util.k2matter({
-- k2matter = {
-- item_name = "tin-ore",
-- matter_value = 5,
-- energy_required = 1,
-- need_stabilizer = false,
-- unlocked_by_technology = "tin-matter-processing",
-- },
-- k2baseicon = "stone",
-- icon = { icon = "__bztin__/graphics/icons/tin-ore.png", icon_size = 64, scale = 1.4}
-- })

-- util.k2matter({
-- k2matter = {
-- item_name = "tin-plate",
-- minimum_conversion_quantity = 10,
-- matter_value = 10,
-- energy_required = 3,
-- only_deconversion = true,
-- need_stabilizer = true,
-- unlocked_by_technology = "tin-matter-processing",
-- },
-- })
-- end

if mods["Krastorio2"] then
local util = require("data-util");
util.k2matter({
k2matter = {
item_name = "tin-ore",
matter_value = 5,
energy_required = 1,
need_stabilizer = false,
unlocked_by_technology = "tin-matter-processing",
local util = require("__bztin__.data-util");
local matter = require("__Krastorio2__/prototypes/libraries/matter")

data:extend(
{
{
type = "technology",
name = "tin-matter-processing",
icons =
{
{
icon = util.k2assets().."/technologies/backgrounds/matter.png",
icon_size = 256,
},
{
icon = "__bztin__/graphics/icons/tin-ore.png",
icon_size = 64,
scale = 0.9,
}
},
prerequisites = {"kr-matter-processing"},
unit =
{
count = 350,
ingredients =
{
{"production-science-pack", 1},
{"utility-science-pack", 1},
{"kr-matter-tech-card", 1}
},
time = 45
},
effects = {}
},
k2baseicon = "stone",
icon = { icon = "__bztin__/graphics/icons/tin-ore.png", icon_size = 64, scale = 1.4}
})

util.k2matter({
k2matter = {
item_name = "tin-plate",
minimum_conversion_quantity = 10,
matter_value = 10,

local tin_ore_matter =
{
material = { type = "item", name = "tin-ore", amount = 10 },
matter_count = 5,
energy_required = 1,
needs_stabilizer = false,
unlocked_by = "tin-matter-processing"
}
matter.make_recipes(tin_ore_matter)


local tin_plate_matter =
{
material = { type = "item", name = "tin-plate", amount = 10 },
matter_count = 10,
energy_required = 3,
only_deconversion = true,
need_stabilizer = true,
unlocked_by_technology = "tin-matter-processing",
},
})
end
-- only_deconversion = true,
needs_stabilizer = true,
unlocked_by = "tin-matter-processing"
}
matter.make_deconversion_recipe(tin_plate_matter)

end
2 changes: 1 addition & 1 deletion tin-recipe-se.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ if string.sub(mods["space-exploration"], 1, 3) == "0.6" then
},
energy_required = 45,
ingredients = {
{name = mods.Krastorio2 and "enriched-tin" or "tin-ore", amount = 24},
{type = "item", name = mods.Krastorio2 and "enriched-tin" or "tin-ore", amount = 24},
{type = "fluid", name = "se-pyroflux", amount = 10},
},
enabled = false,
Expand Down
23 changes: 11 additions & 12 deletions tin-recipe-updates.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,10 +47,10 @@ util.add_ingredient("rocket-silo", "solder", 100)
util.add_ingredient("accumulator", "solder", 2)
util.add_ingredient("se-space-accumulator", "solder", 2)
util.add_ingredient("storage-tank", "solder", 4)
util.add_ingredient("kr-fluid-storage-1", "solder", 4)
util.add_ingredient("kr-fluid-storage-2", "solder", 12)
util.add_ingredient("kr-fluid-stokr-big-storage-tankrage-1", "solder", 4)
util.add_ingredient("kr-huge-storage-tank", "solder", 12)
util.add_ingredient("substation", "solder", 2)
util.add_ingredient("kr-substation-mk2", "solder", 2)
util.add_ingredient("kr-superior-substation", "solder", 2)
util.add_ingredient("se-pylon-substation", "solder", 2)
util.add_ingredient("se-pylon", "solder", 2)
util.add_ingredient("se-holmium-solenoid", "solder", 2)
Expand All @@ -63,9 +63,9 @@ util.add_ingredient("se-holmium-solenoid", "solder", 2)

-- glass
if mods.Krastorio2 then
util.replace_some_ingredient("glass", "sand", 1, "tin-plate", 1)
util.add_product("glass", {type="item", name="tin-plate", amount=1, catalyst_amount=1, probability=0.8})
util.set_main_product("glass", "glass")
util.replace_some_ingredient("kr-glass", "kr-sand", 1, "tin-plate", 1)
util.add_product("kr-glass", {type="item", name="tin-plate", amount=1, catalyst_amount=1, probability=0.8})
util.set_main_product("kr-glass", "kr-glass")
else
if mods.bzfoundry then
if not mods.bzaluminum then
Expand Down Expand Up @@ -97,7 +97,7 @@ end
util.add_ingredient("kr-fuel-refinery", "solder", 5)
util.add_ingredient("kr-electrolysis-plant", "solder", 10)
util.replace_some_ingredient("kr-steel-pipe-to-ground", "steel-plate", 3, "solder", 8)
util.replace_ingredient("kr-biomass-growing", "petroleum-gas", "organotins")
util.replace_ingredient("kr-biomass", "petroleum-gas", "organotins")


util.add_product("se-scrap-recycling", {type="item", name="tin-ore", amount=1, probability=0.05})
Expand All @@ -114,11 +114,11 @@ util.add_ingredient("se-space-biochemical-laboratory", "solder", 8)
util.add_ingredient("se-decontamination-facility", "solder", 10)
util.add_ingredient("se-life-support-facility", "solder", 40)

util.multiply_recipe("lithium-sulfur-battery", 2)
util.replace_some_ingredient("lithium-sulfur-battery", "copper-plate", 1, "tin-plate", 1)
util.multiply_recipe("kr-lithium-sulfur-battery", 2)
util.replace_some_ingredient("kr-lithium-sulfur-battery", "copper-plate", 1, "tin-plate", 1)

util.add_ingredient("roboport", "solder", 20)
util.add_ingredient("kr-large-roboport", "solder", 20)
util.add_ingredient("kr-big-roboport", "solder", 20)
util.add_ingredient("kr-small-roboport", "solder", 10)
util.add_ingredient("se-supercharger", "solder", 15)
util.add_ingredient("kr-filtration-plant", "solder", 4)
Expand Down Expand Up @@ -179,8 +179,7 @@ if util.me.use_bronze() then
local fast_i = mods.bzaluminum and "aluminum-plate" or "iron-plate"
util.replace_some_ingredient("fast-inserter", fast_i, 1, "bronze-plate", 1)
if mods.Krastorio2 then
util.replace_some_ingredient("filter-inserter", fast_i, 1, "bronze-plate", 1)
util.replace_ingredient("kr-steel-pump", "steel-beam", "bronze-plate", 4)
util.replace_ingredient("kr-steel-pump", "kr-steel-beam", "bronze-plate", 4)
end

util.replace_ingredient("pump", "steel-plate", "bronze-plate", 2)
Expand Down