From c9e2ca3ff167fdbc2fa50393a8505ec369820899 Mon Sep 17 00:00:00 2001 From: Simon Brodtmann Date: Mon, 6 Oct 2025 14:45:18 +0200 Subject: [PATCH 01/10] gitignore --- .gitignore | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitignore b/.gitignore index 72c1b51..318cbef 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,3 @@ *.bak *.blend* +.idea \ No newline at end of file From fb66c85d9f5082406eb0a3e36cd23d55c830e45c Mon Sep 17 00:00:00 2001 From: Simon Brodtmann Date: Mon, 6 Oct 2025 15:21:30 +0200 Subject: [PATCH 02/10] SE compatibility fixes --- carbon-recipe-se.lua | 10 ++++------ data-util.lua | 43 ++++++++++++++----------------------------- 2 files changed, 18 insertions(+), 35 deletions(-) diff --git a/carbon-recipe-se.lua b/carbon-recipe-se.lua index 2af1e21..485ee8a 100644 --- a/carbon-recipe-se.lua +++ b/carbon-recipe-se.lua @@ -15,9 +15,7 @@ se_delivery_cannon_recipes["diamond"] = {name= "diamond"} if util.me.use_flake_graphite() then util.se_landfill({ore="flake-graphite"}) se_delivery_cannon_recipes["flake-graphite"] = {name= "flake-graphite"} - if mods["space-exploration"] > "0.6" then - util.se_matter({ore="flake-graphite", energy_required=1, quant_out=10, stream_out=60}) - end + util.se_matter({ore="flake-graphite", energy_required=1, quant_out=10, stream_out=60}) end if util.me.use_rough_diamond() then se_delivery_cannon_recipes["rough-diamond"] = {name= "rough-diamond"} @@ -37,11 +35,11 @@ data:extend({ always_show_made_in = true, allow_as_intermediate = false, ingredients = { - {name = "graphite", amount = 20}, - {name = "se-vulcanite-block", amount = 1}, + {type = "item", name = "graphite", amount = 20}, + {type = "item", name = "se-vulcanite-block", amount = 1}, }, results = { - {name = "diamond", amount = 3}, + {type = "item", name = "diamond", amount = 3}, }, icons = { diff --git a/data-util.lua b/data-util.lua index ddf7a5d..d867278 100644 --- a/data-util.lua +++ b/data-util.lua @@ -504,8 +504,8 @@ function util.se_landfill(params) category = "hard-recycling", order = "z-b-"..params.ore, subgroup = "terrain", - result = "landfill", - ingredients = {{params.ore, 50}}, + results = {{type="item", name="landfill", amount=1}}, + ingredients = {{type="item", name=params.ore, amount=50}}, } }) util.add_unlock("se-recycling-facility", lname) @@ -584,7 +584,6 @@ end -- se matter -- params: ore, energy_required, quant_out, quant_in, icon_size, stream_out function util.se_matter(params) - if mods["space-exploration"] > "0.6" then if not params.quant_in then params.quant_in = params.quant_out end if not params.icon_size then params.icon_size = 64 end local fname = "matter-fusion-"..params.ore @@ -611,20 +610,20 @@ function util.se_matter(params) energy_required = params.energy_required, enabled = false, ingredients = { - {sedata, 1}, + {type="item", name=sedata, amount=1}, {type="fluid", name="se-particle-stream", amount=50}, {type="fluid", name="se-space-coolant-supercooled", amount=25}, }, results = { - {params.ore, params.quant_out}, - {"se-contaminated-scrap", 1}, - {type=item, name=sedata, amount=1, probability=.99}, - {type=item, name=sejunk, amount=1, probability=.01}, + {type="item", name=params.ore, amount=params.quant_out}, + {type="item", name="se-contaminated-scrap", amount=1}, + {type="item", name=sedata, amount=1, probability=.99}, + {type="item", name=sejunk, amount=1, probability=.01}, {type="fluid", name="se-space-coolant-hot", amount=25, ignored_by_stats=25, ignored_by_productivity=25}, } } }) - util.add_unlock("se-space-matter-fusion", fname) + util.add_unlock("se-space-matter-fusion", fname) if util.k2() then local lname = params.ore.."-to-particle-stream" @@ -650,13 +649,13 @@ function util.se_matter(params) energy_required = 30, enabled = false, ingredients = { - {"se-kr-matter-liberation-data", 1}, - {params.ore, params.quant_in}, + {type="item", name="se-kr-matter-liberation-data", amount=1}, + {type="item", name=params.ore, amount=params.quant_in}, {type="fluid", name="se-particle-stream", amount=50}, }, results = { - {type=item, name="se-kr-matter-liberation-data", amount=1, probability=.99}, - {type=item, name=sejunk, amount=1, probability=.01}, + {type="item", name="se-kr-matter-liberation-data", amount=1, probability=.99}, + {type="item", name=sejunk, amount=1, probability=.01}, {type="fluid", name="se-particle-stream", amount=params.stream_out, ignored_by_stats=50, ignored_by_productivity=50}, } } @@ -687,16 +686,15 @@ function util.se_matter(params) {"kr-matter-tech-card", 1}, {"se-deep-space-science-pack-1", 1}, } - + }, prerequisites = {"se-kr-advanced-stream-production"}, }, }) end - util.add_unlock("bz-advanced-stream-production", lname) + util.add_unlock("bz-advanced-stream-production", lname) end end -end -- deprecated -- Get the normal prototype for a recipe -- either .normal or the recipe itself @@ -1119,7 +1117,6 @@ end function replace_some_product(recipe, old, old_amount, new, new_amount) if recipe ~= nil then - if recipe.result == new then return end if recipe.results then for i, existing in pairs(recipe.results) do if existing.name == new then @@ -1211,10 +1208,6 @@ function set_product_amount(recipe, product, amount) end end end - if not recipe.results and not recipe.result_count then - -- implicit one item result - recipe.result_count = amount - end end end @@ -1348,10 +1341,6 @@ function replace_product(recipe, old, new, options) if recipe.main_product == old then recipe.main_product = new end - if recipe.result == old then - recipe.result = new - return - end if recipe.results then for i, result in pairs(recipe.results) do if result.name == old then result.name = new end @@ -1611,10 +1600,6 @@ end function add_to_product(recipe, product, amount) if recipe ~= nil and recipe.results ~= nil then - if recipe.result == product then - recipe.result_count = recipe.result_count + amount - return - end for i, result in pairs(recipe.results) do if result.name == product then result.amount = result.amount + amount From 0db93ccdcae65727a0c9bde3d63669a14d06c2af Mon Sep 17 00:00:00 2001 From: Simon Brodtmann Date: Mon, 6 Oct 2025 20:29:26 +0200 Subject: [PATCH 03/10] Fix carbon-fiber ingredients --- prototypes/carbon-fiber.lua | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/prototypes/carbon-fiber.lua b/prototypes/carbon-fiber.lua index 5a91526..38b6926 100644 --- a/prototypes/carbon-fiber.lua +++ b/prototypes/carbon-fiber.lua @@ -84,8 +84,8 @@ else energy_required = 24, ingredients = { {type="fluid", name="epoxy", amount = 20}, - {"plastic-bar", 2}, - {"polyacrylonitrile", 4}, + { type = "item", name = "plastic-bar", amount = 2 }, + { type = "item", name = "polyacrylonitrile", amount = 4 }, }, results = { {type="item", name= "carbon-fiber", amount=8}, From b05be63736b70d1a4e155075ec3007b8b7ed8e2d Mon Sep 17 00:00:00 2001 From: Simon Brodtmann Date: Wed, 8 Oct 2025 22:03:05 +0200 Subject: [PATCH 04/10] Support MDbobelectronics2 --- data-final-fixes.lua | 2 +- info.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/data-final-fixes.lua b/data-final-fixes.lua index 8d6cca5..74f5df1 100644 --- a/data-final-fixes.lua +++ b/data-final-fixes.lua @@ -32,7 +32,7 @@ end -- Green circuits in final fixes due to K2 shenanigans -if mods.MDbobelectronics or mods.bobelectronics then +if mods.MDbobelectronics or mods.MDbobelectronics2 or mods.bobelectronics then util.replace_ingredient("basic-electronic-components", "coal", "graphite") util.replace_ingredient("basic-electronic-components", "coke", "graphite") else diff --git a/info.json b/info.json index 87f6cfe..3cc817e 100644 --- a/info.json +++ b/info.json @@ -17,7 +17,7 @@ "? aai-industry", "? Krastorio2", "? Krastorio2-spaced-out", - "? 248k", + "? 248k-Redux", "(?) modmashsplintersubspacelogistics", "? deadlock-beltboxes-loaders", "? DeadlockCrating" From bf1f5763379388efde5c55480fa1d8a8158c55a2 Mon Sep 17 00:00:00 2001 From: Simon Brodtmann Date: Sat, 11 Oct 2025 18:19:36 +0200 Subject: [PATCH 05/10] Mod compatibility fixes --- carbon-recipe.lua | 19 +++++++++---------- prototypes/activated-carbon.lua | 4 ++-- prototypes/carbon-asteroid-updates.lua | 2 +- prototypes/carbon-fiber.lua | 10 +++++----- 4 files changed, 17 insertions(+), 18 deletions(-) diff --git a/carbon-recipe.lua b/carbon-recipe.lua index df8d3de..dc1ff86 100644 --- a/carbon-recipe.lua +++ b/carbon-recipe.lua @@ -277,7 +277,6 @@ data:extend({ order = "b-b" }, }) -local ammonia = mods.Krastorio2 and "kr-ammonia" or "ammonia" data:extend({ -- graphene { @@ -303,7 +302,7 @@ data:extend({ energy_required = 5, ingredients = (mods["space-age"] or util.k2()) and { {type="item", name="graphite", amount=1}, - {type="fluid", name=ammonia, amount=5}, + {type="fluid", name="kr-ammonia", amount=5}, {type="fluid", name="sulfuric-acid", amount=5}, } or { {type="item", name="graphite", amount=1}, @@ -611,7 +610,7 @@ if mods["space-age"] then data:extend({ { type = "surface-property", - name = "oxygen", + name = "kr-oxygen", default_value = 19, }, -- make graphite from diamonds on some surfaces @@ -628,7 +627,7 @@ if mods["space-age"] then allow_productivity=true, energy_required = 16, surface_conditions = { - {property = "oxygen", max = 20}, + {property = "kr-oxygen", max = 20}, }, ingredients = { {type="item", name="rough-diamond", amount=1}, @@ -676,10 +675,10 @@ if mods["space-age"] then }) util.add_unlock("biochamber", "graphite-synthesis") util.set_recipe_time("burnt-spoilage", 4) - util.set_surface_property("nauvis", "oxygen", 21) - util.set_surface_property("gleba", "oxygen", 30) - util.set_surface_property("fulgora", "oxygen", 15) - util.set_surface_property("vulcanus", "oxygen", 12) - util.set_surface_property("aquilo", "oxygen", 10) - util.set_surface_property("space-platform", "oxygen", 0) + util.set_surface_property("nauvis", "kr-oxygen", 21) + util.set_surface_property("gleba", "kr-oxygen", 30) + util.set_surface_property("fulgora", "kr-oxygen", 15) + util.set_surface_property("vulcanus", "kr-oxygen", 12) + util.set_surface_property("aquilo", "kr-oxygen", 10) + util.set_surface_property("space-platform", "kr-oxygen", 0) end diff --git a/prototypes/activated-carbon.lua b/prototypes/activated-carbon.lua index 6b68a38..160732f 100644 --- a/prototypes/activated-carbon.lua +++ b/prototypes/activated-carbon.lua @@ -20,7 +20,7 @@ if mods["wood-industry"] then precursor = "charcoal" end order = "d[graphite-carbon-fiber]", enabled = false, energy_required = 2.5, - ingredients = data.raw.fluid["ammonia"] and + ingredients = data.raw.fluid["kr-ammonia"] and { util.item(precursor), util.fluid("steam"), @@ -45,7 +45,7 @@ if mods["wood-industry"] then precursor = "charcoal" end order = "d[graphite-carbon-fiber]", enabled = false, energy_required = 2.5, - ingredients = data.raw.fluid["ammonia"] and + ingredients = data.raw.fluid["kr-ammonia"] and { util.item("carbon-black", 5), util.fluid("steam"), diff --git a/prototypes/carbon-asteroid-updates.lua b/prototypes/carbon-asteroid-updates.lua index 866b6bb..8e2b30a 100644 --- a/prototypes/carbon-asteroid-updates.lua +++ b/prototypes/carbon-asteroid-updates.lua @@ -21,7 +21,7 @@ if mods["space-age"] then {icon="__bzcarbon__/graphics/icons/flake-graphite.png", icon_size=128, scale=0.125, shift={8,0}}, {icon="__bzcarbon__/graphics/icons/rough-diamond.png", icon_size=128, scale=0.125, shift={-8,0}}, }, - category = "crushing", + category = "kr-crushing", subgroup="space-crushing", order = "b-a-z-b", auto_recycle = false, diff --git a/prototypes/carbon-fiber.lua b/prototypes/carbon-fiber.lua index 38b6926..a693eab 100644 --- a/prototypes/carbon-fiber.lua +++ b/prototypes/carbon-fiber.lua @@ -19,7 +19,7 @@ if mods["space-age"] then util.item("spoilage", 1), }, results = { - util.fluid("ammonia", 10), + util.fluid("kr-ammonia", 10), }, } }) @@ -41,10 +41,10 @@ data:extend({ order = "d[graphite-carbon-fiber]", enabled = false, energy_required = 1, - ingredients = data.raw.fluid["ammonia"] and + ingredients = data.raw.fluid["kr-ammonia"] and { {type="fluid", name="petroleum-gas", amount=5}, - {type="fluid", name="ammonia", amount=5}, + {type="fluid", name="kr-ammonia", amount=5}, } or { {type="fluid", name="petroleum-gas", amount=10}, }, @@ -58,8 +58,8 @@ if mods["space-age"] then util.remove_ingredient("polyacrylonitrile", "petroleum-gas") util.add_ingredient("polyacrylonitrile", "jelly", 10) util.add_ingredient("polyacrylonitrile", "jelly", 10) - util.add_ingredient("polyacrylonitrile", "ammonia", 10) - util.add_ingredient("carbon-fiber", "ammonia", 10) + util.add_ingredient("polyacrylonitrile", "kr-ammonia", 10) + util.add_ingredient("carbon-fiber", "kr-ammonia", 10) util.replace_ingredient("carbon-fiber", "carbon", "polyacrylonitrile") util.set_item_icons("carbon-fiber", { {icon = "__bzcarbon__/graphics/icons/carbon-fiber.png", icon_size = 128,} }) util.add_unlock("biochamber", "ammonia-from-spoilage") From 31cb3a31db98cd7c9303de866a06f84ccf45d259 Mon Sep 17 00:00:00 2001 From: Simon Brodtmann Date: Mon, 13 Oct 2025 12:20:15 +0200 Subject: [PATCH 06/10] Fix processing unit tech name --- carbon-recipe-updates.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/carbon-recipe-updates.lua b/carbon-recipe-updates.lua index cdc7185..17ef7cb 100644 --- a/carbon-recipe-updates.lua +++ b/carbon-recipe-updates.lua @@ -4,7 +4,7 @@ local util = require("data-util"); util.add_prerequisite("steel-processing", "graphite-processing") util.add_prerequisite("low-density-structure", "diamond-processing") -util.add_prerequisite("advanced-electronics-2", "diamond-processing") +util.add_prerequisite("processing-unit", "diamond-processing") util.add_prerequisite("laser", "diamond-processing") -- update carbon black alternate recipe if possible From 0e3af88f7629a2043b6a10d7ab277d3dbae392de Mon Sep 17 00:00:00 2001 From: Simon Brodtmann Date: Mon, 13 Oct 2025 17:54:17 +0200 Subject: [PATCH 07/10] Remove SE 0.6 checks --- carbon-recipe-k2.lua | 3 +-- carbon-recipe.lua | 2 +- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/carbon-recipe-k2.lua b/carbon-recipe-k2.lua index 0cad48b..1b42ba0 100644 --- a/carbon-recipe-k2.lua +++ b/carbon-recipe-k2.lua @@ -5,8 +5,7 @@ if util.k2() then -- HCL graphite processing if util.me.use_flake_graphite() then local gsubgroup = "raw-material" -if mods["space-exploration"] and string.sub(mods["space-exploration"], 1, 3) == "0.6" and -data.raw["item-subgroup"]["carbon"] then +if mods["space-exploration"] and data.raw["item-subgroup"]["carbon"] then gsubgroup = "carbon" end data:extend({ diff --git a/carbon-recipe.lua b/carbon-recipe.lua index dc1ff86..e8182f4 100644 --- a/carbon-recipe.lua +++ b/carbon-recipe.lua @@ -581,7 +581,7 @@ end -- Space exploration subgroups -if mods["space-exploration"] and string.sub(mods["space-exploration"], 1, 3) == "0.6" then +if mods["space-exploration"] then data:extend({ { type = "item-subgroup", From bd9e2c2dcc3015ab3572e84d79149728ac1eb91d Mon Sep 17 00:00:00 2001 From: Simon Brodtmann Date: Thu, 16 Oct 2025 00:17:40 +0200 Subject: [PATCH 08/10] K2 fixes --- carbon-recipe.lua | 4 ++-- data-final-fixes.lua | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/carbon-recipe.lua b/carbon-recipe.lua index e8182f4..fb222ec 100644 --- a/carbon-recipe.lua +++ b/carbon-recipe.lua @@ -88,7 +88,7 @@ data:extend({ -- If no graphite ore, make it from coal or coke if not util.me.use_flake_graphite() then - if data.raw.item["coke"] then + if data.raw.item[mods["Krastorio2"] and "kr-coke" or "coke"] then data:extend({ { type = "recipe", @@ -98,7 +98,7 @@ if not util.me.use_flake_graphite() then order = "d[graphite]", enabled = false, energy_required = 0.5, - ingredients = {util.item("coke", 1)}, + ingredients = {util.item(mods["Krastorio2"] and "kr-coke" or "coke", 1)}, results = {util.item("graphite", 2)}, } }) diff --git a/data-final-fixes.lua b/data-final-fixes.lua index 74f5df1..18ca3a2 100644 --- a/data-final-fixes.lua +++ b/data-final-fixes.lua @@ -34,7 +34,7 @@ end -- Green circuits in final fixes due to K2 shenanigans if mods.MDbobelectronics or mods.MDbobelectronics2 or mods.bobelectronics then util.replace_ingredient("basic-electronic-components", "coal", "graphite") - util.replace_ingredient("basic-electronic-components", "coke", "graphite") + util.replace_ingredient("basic-electronic-components", mods["Krastorio2"] and "kr-coke" or "coke", "graphite") else -- Electronic circuits need final fixes function modify_ec(recipe_name, to_replace) From dbcbdaeaa02719d7e3d9efa2bac87dc3334630cc Mon Sep 17 00:00:00 2001 From: Simon Brodtmann Date: Thu, 16 Oct 2025 17:37:12 +0200 Subject: [PATCH 09/10] K2 fixes --- carbon-recipe-updates.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/carbon-recipe-updates.lua b/carbon-recipe-updates.lua index 17ef7cb..2a97954 100644 --- a/carbon-recipe-updates.lua +++ b/carbon-recipe-updates.lua @@ -82,7 +82,7 @@ if util.me.use_fullerenes() then -- K2 util.add_ingredient("kr-biter-virus", "fullerenes", 100) util.add_ingredient("kr-creep-virus", "fullerenes", 100) - util.replace_some_ingredient("kr-biomass-growing", "petroleum-gas", 25, "fullerenes", 25) + util.replace_some_ingredient("kr-biomass", "petroleum-gas", 25, "fullerenes", 25) -- SE util.add_ingredient("se-vitalic-reagent", "fullerenes", 4) From e282b6df53d58cd4fc213b842369f42ebacc930b Mon Sep 17 00:00:00 2001 From: Simon Brodtmann Date: Sat, 18 Oct 2025 22:11:57 +0200 Subject: [PATCH 10/10] Fix SA compatibility --- carbon-recipe.lua | 2 +- prototypes/activated-carbon.lua | 4 ++-- prototypes/carbon-asteroid-updates.lua | 2 +- prototypes/carbon-fiber.lua | 6 +++--- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/carbon-recipe.lua b/carbon-recipe.lua index fb222ec..2126012 100644 --- a/carbon-recipe.lua +++ b/carbon-recipe.lua @@ -302,7 +302,7 @@ data:extend({ energy_required = 5, ingredients = (mods["space-age"] or util.k2()) and { {type="item", name="graphite", amount=1}, - {type="fluid", name="kr-ammonia", amount=5}, + {type="fluid", name=util.k2() and "kr-ammonia" or "ammonia", amount=5}, {type="fluid", name="sulfuric-acid", amount=5}, } or { {type="item", name="graphite", amount=1}, diff --git a/prototypes/activated-carbon.lua b/prototypes/activated-carbon.lua index 160732f..6b68a38 100644 --- a/prototypes/activated-carbon.lua +++ b/prototypes/activated-carbon.lua @@ -20,7 +20,7 @@ if mods["wood-industry"] then precursor = "charcoal" end order = "d[graphite-carbon-fiber]", enabled = false, energy_required = 2.5, - ingredients = data.raw.fluid["kr-ammonia"] and + ingredients = data.raw.fluid["ammonia"] and { util.item(precursor), util.fluid("steam"), @@ -45,7 +45,7 @@ if mods["wood-industry"] then precursor = "charcoal" end order = "d[graphite-carbon-fiber]", enabled = false, energy_required = 2.5, - ingredients = data.raw.fluid["kr-ammonia"] and + ingredients = data.raw.fluid["ammonia"] and { util.item("carbon-black", 5), util.fluid("steam"), diff --git a/prototypes/carbon-asteroid-updates.lua b/prototypes/carbon-asteroid-updates.lua index 8e2b30a..866b6bb 100644 --- a/prototypes/carbon-asteroid-updates.lua +++ b/prototypes/carbon-asteroid-updates.lua @@ -21,7 +21,7 @@ if mods["space-age"] then {icon="__bzcarbon__/graphics/icons/flake-graphite.png", icon_size=128, scale=0.125, shift={8,0}}, {icon="__bzcarbon__/graphics/icons/rough-diamond.png", icon_size=128, scale=0.125, shift={-8,0}}, }, - category = "kr-crushing", + category = "crushing", subgroup="space-crushing", order = "b-a-z-b", auto_recycle = false, diff --git a/prototypes/carbon-fiber.lua b/prototypes/carbon-fiber.lua index a693eab..6d7febd 100644 --- a/prototypes/carbon-fiber.lua +++ b/prototypes/carbon-fiber.lua @@ -19,7 +19,7 @@ if mods["space-age"] then util.item("spoilage", 1), }, results = { - util.fluid("kr-ammonia", 10), + util.fluid("ammonia", 10), }, } }) @@ -58,8 +58,8 @@ if mods["space-age"] then util.remove_ingredient("polyacrylonitrile", "petroleum-gas") util.add_ingredient("polyacrylonitrile", "jelly", 10) util.add_ingredient("polyacrylonitrile", "jelly", 10) - util.add_ingredient("polyacrylonitrile", "kr-ammonia", 10) - util.add_ingredient("carbon-fiber", "kr-ammonia", 10) + util.add_ingredient("polyacrylonitrile", "ammonia", 10) + util.add_ingredient("carbon-fiber", "ammonia", 10) util.replace_ingredient("carbon-fiber", "carbon", "polyacrylonitrile") util.set_item_icons("carbon-fiber", { {icon = "__bzcarbon__/graphics/icons/carbon-fiber.png", icon_size = 128,} }) util.add_unlock("biochamber", "ammonia-from-spoilage")