k2 updates

This commit is contained in:
Brevven 2025-05-03 03:48:35 -07:00
parent 3ed2781720
commit ab65faccfb
4 changed files with 26 additions and 22 deletions

View file

@ -37,23 +37,23 @@ data:extend({
}, },
results = { results = {
{type="item", name="graphite", amount=18}, {type="item", name="graphite", amount=18},
{type="fluid", name="dirty-water", amount=25, catalyst_amount=25}, {type="fluid", name="kr-dirty-water", amount=25, catalyst_amount=25},
}, },
}, },
{ {
type = "recipe", type = "recipe",
name = "dirty-water-filtration-graphite", name = "kr-dirty-water-filtration-graphite",
category = "fluid-filtration", category = "fluid-filtration",
icons = icons =
{ {
{ {
icon = data.raw.fluid["dirty-water"].icon, icon = data.raw.fluid["kr-dirty-water"].icon,
icon_size = data.raw.fluid["dirty-water"].icon_size icon_size = data.raw.fluid["kr-dirty-water"].icon_size
}, },
{ {
icon = data.raw.item["flake-graphite"].icon, icon = data.raw.item["flake-graphite"].icon,
icon_size = data.raw.item["flake-graphite"].icon_size, icon_size = data.raw.item["flake-graphite"].icon_size,
scale = 0.20 * (data.raw.fluid["dirty-water"].icon_size/data.raw.item["flake-graphite"].icon_size), scale = 0.20 * 64 / (data.raw.item["flake-graphite"].icon_size or 64),
shift = {0, 4} shift = {0, 4}
} }
}, },
@ -64,7 +64,7 @@ data:extend({
always_show_products = true, always_show_products = true,
ingredients = ingredients =
{ {
{type = "fluid", name = "dirty-water", amount = 100, catalyst_amount = 100}, {type = "fluid", name = "kr-dirty-water", amount = 100, catalyst_amount = 100},
}, },
results = results =
{ {

View file

@ -1,4 +1,9 @@
--------------------------------------------------------------------------------------------------- ---------------------------------------------------------------------------------------------------
Version: 2.0.17
Date: 2025-05-03
Changes:
- K2: Compatbility updates
---------------------------------------------------------------------------------------------------
Version: 2.0.16 Version: 2.0.16
Date: 2025-04-20 Date: 2025-04-20
Changes: Changes:

View file

@ -115,12 +115,9 @@ function util.fe_plus(sub)
end end
end end
function util.get_stack_size(default) function util.get_stack_size(default)
if mods.Krastorio2 then if mods.Krastorio2 and kr_adjust_stack_sizes then
local size = get_setting("kr-stack-size") return tonumber(200)
if size and tonumber(size) then
return tonumber(size)
end
end end
return default return default
end end
@ -515,14 +512,11 @@ end
-- k2 matter -- k2 matter
-- params: {k2matter}, k2baseicon , {icon} -- params: {k2matter}, k2baseicon , {icon}
function util.k2matter(params) 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 if mods["space-exploration"] then
params.k2matter.need_stabilizer = true params.k2matter.needs_stabilizer = true
end end
if not params.k2matter.minimum_conversion_quantity then if not data.raw.technology[params.k2matter.unlocked_by] then
params.k2matter.minimum_conversion_quantity = 10
end
if not data.raw.technology[params.k2matter.unlocked_by_technology] then
local icon = "" local icon = ""
if params.k2baseicon then if params.k2baseicon then
icon = util.k2assets().."/technologies/matter-"..params.k2baseicon..".png" icon = util.k2assets().."/technologies/matter-"..params.k2baseicon..".png"
@ -534,7 +528,7 @@ function util.k2matter(params)
{ {
{ {
type = "technology", type = "technology",
name = params.k2matter.unlocked_by_technology, name = params.k2matter.unlocked_by,
icons = icons =
{ {
{ {
@ -561,15 +555,20 @@ function util.k2matter(params)
{ {
{"production-science-pack", 1}, {"production-science-pack", 1},
{"utility-science-pack", 1}, {"utility-science-pack", 1},
{"matter-tech-card", 1} {"kr-matter-tech-card", 1}
}, },
time = 45, time = 45,
}, },
effects = {}
-- (ignore for now) localised_name = {"technology-name.k2-conversion", {"item-name."..params.k2matter.item_name}}, -- (ignore for now) localised_name = {"technology-name.k2-conversion", {"item-name."..params.k2matter.item_name}},
}, },
}) })
end end
matter.createMatterRecipe(params.k2matter) if params.k2matter.only_deconversion then
matter.make_deconversion_recipe(params.k2matter)
else
matter.make_recipes(params.k2matter)
end
end end

View file

@ -1,6 +1,6 @@
{ {
"name": "bzcarbon", "name": "bzcarbon",
"version": "2.0.16", "version": "2.0.17",
"factorio_version": "2.0", "factorio_version": "2.0",
"title": "Graphite & Diamonds", "title": "Graphite & Diamonds",
"author": "Brevven", "author": "Brevven",