From 4f07ae58ad065296561aacfcd6305498fc877ac4 Mon Sep 17 00:00:00 2001 From: pla Date: Sat, 25 Oct 2025 16:21:03 +0200 Subject: [PATCH 1/6] Adjust icon scale for gold and silver K2 dirty water recipe --- bzgold2/prototypes/enriched-gold.lua | 4 ++-- bzgold2/prototypes/enriched-silver.lua | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/bzgold2/prototypes/enriched-gold.lua b/bzgold2/prototypes/enriched-gold.lua index 6190f58..a8d9734 100644 --- a/bzgold2/prototypes/enriched-gold.lua +++ b/bzgold2/prototypes/enriched-gold.lua @@ -1,4 +1,4 @@ -local util = require("data-util"); +local util = require("data-util") if mods.Krastorio2 then @@ -92,7 +92,7 @@ data:extend({ { icon = data.raw.item["gold-ore"].icon, icon_size = data.raw.item["gold-ore"].icon_size, - scale = 0.2, + scale = 0.2 * 64 / (data.raw.item["gold-ore"].icon_size or 64), shift = {0, 4} } }, diff --git a/bzgold2/prototypes/enriched-silver.lua b/bzgold2/prototypes/enriched-silver.lua index c5a8495..0914e19 100644 --- a/bzgold2/prototypes/enriched-silver.lua +++ b/bzgold2/prototypes/enriched-silver.lua @@ -1,4 +1,4 @@ -local util = require("data-util"); +local util = require("data-util") if mods.Krastorio2 and util.me.silver() then data:extend({ @@ -111,7 +111,7 @@ data:extend({ { icon = data.raw.item["silver-ore"].icon, icon_size = data.raw.item["silver-ore"].icon_size, - scale = 0.2, + scale = 0.2 * 64 / (data.raw.item["silver-ore"].icon_size or 64), shift = {0, 4} } }, -- 2.39.5 From 230d08585651e1e536b8a2e32612b77b950cd238 Mon Sep 17 00:00:00 2001 From: pla Date: Sat, 25 Oct 2025 18:24:56 +0200 Subject: [PATCH 2/6] Fix K2 matter tech generation --- bzgold2/data-util.lua | 9 +++++---- bzgold2/matter.lua | 14 ++++++-------- 2 files changed, 11 insertions(+), 12 deletions(-) diff --git a/bzgold2/data-util.lua b/bzgold2/data-util.lua index 3825ac6..33619f2 100644 --- a/bzgold2/data-util.lua +++ b/bzgold2/data-util.lua @@ -115,12 +115,12 @@ end function util.k2matter(params) local matter = require("__Krastorio2__/prototypes/libraries/matter") if mods["space-exploration"] then - params.k2matter.need_stabilizer = true + params.k2matter.needs_stabilizer = true end if not params.k2matter.minimum_conversion_quantity then params.k2matter.minimum_conversion_quantity = 10 end - if not data.raw.technology[params.k2matter.unlocked_by_technology] then + if not data.raw.technology[params.k2matter.unlocked_by] then local icon = "" if params.k2baseicon then icon = util.k2assets().."/technologies/matter-"..params.k2baseicon..".png" @@ -132,7 +132,7 @@ function util.k2matter(params) { { type = "technology", - name = params.k2matter.unlocked_by_technology, + name = params.k2matter.unlocked_by, icons = { { @@ -163,7 +163,8 @@ function util.k2matter(params) }, time = 45, }, - localised_name = {"technology-name.k2-conversion", {"item-name."..params.k2matter.item_name}}, + effects = {}, + -- localised_name = {"technology-name.k2-conversion", {"item-name."..params.k2matter.item_name}}, }, }) end diff --git a/bzgold2/matter.lua b/bzgold2/matter.lua index 10ea30c..a23bb0b 100644 --- a/bzgold2/matter.lua +++ b/bzgold2/matter.lua @@ -8,11 +8,10 @@ if mods["Krastorio2"] then item_name = "gold-ore", matter_count = 30, energy_required = 10, - need_stabilizer = false, - unlocked_by_technology = "gold-matter-processing", + needs_stabilizer = false, + unlocked_by = "gold-matter-processing", }, - k2baseicon = "stone", - icon = {icon = "__bzgold2__/graphics/icons/gold-ore.png", icon_size = 128, scale = 1} + icon = {icon = "__bzgold2__/graphics/icons/gold-ore.png", icon_size = 128, scale = 0.5} }) util.k2matter({ @@ -21,10 +20,9 @@ if mods["Krastorio2"] then item_name = "silver-ore", matter_count = 8, energy_required = 5, - need_stabilizer = false, - unlocked_by_technology = "silver-matter-processing", + needs_stabilizer = false, + unlocked_by = "silver-matter-processing", }, - k2baseicon = "stone", - icon = {icon = "__bzgold2__/graphics/icons/silver-ore.png", icon_size = 128, scale = 1} + icon = {icon = "__bzgold2__/graphics/icons/silver-ore.png", icon_size = 128, scale = 0.5} }) end -- 2.39.5 From 4de0ae6962ed64dfad71ff7f9a54288c0d4eb79c Mon Sep 17 00:00:00 2001 From: pla Date: Sat, 25 Oct 2025 19:11:45 +0200 Subject: [PATCH 3/6] Check if K2 matter conversion is already done for gold ore (Error with ThemTharHills) --- bzgold2/matter.lua | 28 +++++++++++++++------------- 1 file changed, 15 insertions(+), 13 deletions(-) diff --git a/bzgold2/matter.lua b/bzgold2/matter.lua index a23bb0b..336b06c 100644 --- a/bzgold2/matter.lua +++ b/bzgold2/matter.lua @@ -1,18 +1,20 @@ -- Matter recipes for Krastorio2 if mods["Krastorio2"] then - local util = require("data-util"); - - util.k2matter({ - k2matter = { - material = { type = "item", name = "gold-ore", amount = 30 }, - item_name = "gold-ore", - matter_count = 30, - energy_required = 10, - needs_stabilizer = false, - unlocked_by = "gold-matter-processing", - }, - icon = {icon = "__bzgold2__/graphics/icons/gold-ore.png", icon_size = 128, scale = 0.5} - }) + local util = require("data-util") + + if not data.raw.recipe["kr-gold-ore-to-matter"] then + util.k2matter({ + k2matter = { + material = { type = "item", name = "gold-ore", amount = 30 }, + item_name = "gold-ore", + matter_count = 30, + energy_required = 10, + needs_stabilizer = false, + unlocked_by = "gold-matter-processing", + }, + icon = {icon = "__bzgold2__/graphics/icons/gold-ore.png", icon_size = 128, scale = 0.5} + }) + end util.k2matter({ k2matter = { -- 2.39.5 From b91b89e10997196b1879689feabeaf28d67563a7 Mon Sep 17 00:00:00 2001 From: pla Date: Fri, 31 Oct 2025 15:11:34 +0100 Subject: [PATCH 4/6] make use of the make_deconversion_recipe funtion in K2 --- bzgold2/data-util.lua | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/bzgold2/data-util.lua b/bzgold2/data-util.lua index 33619f2..8c0697f 100644 --- a/bzgold2/data-util.lua +++ b/bzgold2/data-util.lua @@ -168,7 +168,11 @@ function util.k2matter(params) }, }) end - matter.make_recipes(params.k2matter) + if params.k2matter.only_deconversion then + matter.make_deconversion_recipe(params.k2matter) + else + matter.make_recipes(params.k2matter) + end end -- 2.39.5 From 4b691d654c58df784504e56026b96ac43bf7c6ec Mon Sep 17 00:00:00 2001 From: pla Date: Fri, 31 Oct 2025 15:12:33 +0100 Subject: [PATCH 5/6] Fix K2 matter to silver only when bzgold-silver setting is is enabled --- bzgold2/matter.lua | 29 +++++++++++++++-------------- 1 file changed, 15 insertions(+), 14 deletions(-) diff --git a/bzgold2/matter.lua b/bzgold2/matter.lua index 336b06c..827fee0 100644 --- a/bzgold2/matter.lua +++ b/bzgold2/matter.lua @@ -1,7 +1,7 @@ -- Matter recipes for Krastorio2 if mods["Krastorio2"] then local util = require("data-util") - + if not data.raw.recipe["kr-gold-ore-to-matter"] then util.k2matter({ k2matter = { @@ -12,19 +12,20 @@ if mods["Krastorio2"] then needs_stabilizer = false, unlocked_by = "gold-matter-processing", }, - icon = {icon = "__bzgold2__/graphics/icons/gold-ore.png", icon_size = 128, scale = 0.5} + icon = { icon = "__bzgold2__/graphics/icons/gold-ore.png", icon_size = 128, scale = 0.5 }, + }) + end + if settings["bzgold-silver"].value then + util.k2matter({ + k2matter = { + material = { type = "item", name = "silver-ore", amount = 8 }, + item_name = "silver-ore", + matter_count = 8, + energy_required = 5, + needs_stabilizer = false, + unlocked_by = "silver-matter-processing", + }, + icon = { icon = "__bzgold2__/graphics/icons/silver-ore.png", icon_size = 128, scale = 0.5 }, }) end - - util.k2matter({ - k2matter = { - material = { type = "item", name = "silver-ore", amount = 8 }, - item_name = "silver-ore", - matter_count = 8, - energy_required = 5, - needs_stabilizer = false, - unlocked_by = "silver-matter-processing", - }, - icon = {icon = "__bzgold2__/graphics/icons/silver-ore.png", icon_size = 128, scale = 0.5} - }) end -- 2.39.5 From 7c1201c133c9af7b377b4e7e67fb05919f10f002 Mon Sep 17 00:00:00 2001 From: pla Date: Fri, 31 Oct 2025 15:18:06 +0100 Subject: [PATCH 6/6] Fix setting bzgold-silver --- bzgold2/matter.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bzgold2/matter.lua b/bzgold2/matter.lua index 827fee0..728e9da 100644 --- a/bzgold2/matter.lua +++ b/bzgold2/matter.lua @@ -15,7 +15,7 @@ if mods["Krastorio2"] then icon = { icon = "__bzgold2__/graphics/icons/gold-ore.png", icon_size = 128, scale = 0.5 }, }) end - if settings["bzgold-silver"].value then + if settings.startup["bzgold-silver"].value then util.k2matter({ k2matter = { material = { type = "item", name = "silver-ore", amount = 8 }, -- 2.39.5