diff --git a/carbon-recipe-final-k2.lua b/carbon-recipe-final-k2.lua index 80ebb54..fb1a09b 100644 --- a/carbon-recipe-final-k2.lua +++ b/carbon-recipe-final-k2.lua @@ -3,7 +3,7 @@ local util = require("util") if mods.Krastorio2 then if bzutil.me.use_fullerenes() then -- Add extra nanotube recipes. - -- This could be moved to data-updates in future if necessary + -- This could be moved to data-updates in future if necessary data:extend({ { type = "recipe", diff --git a/carbon-recipe-updates.lua b/carbon-recipe-updates.lua index e72bfdc..fc01607 100644 --- a/carbon-recipe-updates.lua +++ b/carbon-recipe-updates.lua @@ -12,6 +12,15 @@ util.add_prerequisite("power-armor-mk2", "graphene") util.add_prerequisite("rocket-control-unit", "graphene") +-- furnace recipe rework w/ crucible, more in data-final-fixes +util.add_effect("advanced-material-processing-2", {type="unlock-recipe", recipe="crucible"}) +for i, ingredient in pairs(util.me.crucible_ingredients) do + util.add_ingredient("crucible", ingredient, 5) +end +for i, furnace in pairs(util.me.furnaces) do + util.add_ingredient(furnace, "crucible", 1) +end + -- fullerenes & nanotubes if util.me.use_fullerenes() then util.add_prerequisite("graphene", "fullerenes") @@ -53,11 +62,7 @@ end util.replace_some_ingredient("electronic-circuit", "copper-cable", 1, "graphite", 1) util.add_ingredient("battery", "graphite", 1) util.add_ingredient("pump", "graphite", 2) -if mods.bzzirconium then --- TODO CRUCIBLE RECIPE HERE -else - util.add_ingredient("electric-furnace", "graphite", 5) -end + util.add_ingredient("speed-module-2", "diamond", 4) util.add_ingredient("effectivity-module-2", "diamond", 4) diff --git a/carbon-recipe.lua b/carbon-recipe.lua index 326f51c..54cb95c 100644 --- a/carbon-recipe.lua +++ b/carbon-recipe.lua @@ -1,5 +1,3 @@ --- Graphite etc - local util = require("__bzcarbon__.data-util"); local graphite_category = "advanced-crafting" @@ -446,4 +444,28 @@ data:extend({ }) end - +if mods.bzzirconium or mods.bztungsten then + data:extend({ + { + type = "item", + name = "crucible", + icon = "__bzcarbon__/graphics/icons/crucible.png", icon_size = 128, + subgroup = "intermediate-product", + order = "g[crucible]", + stack_size = 50, + }, + { + type = "recipe", + name = "crucible", + category = "crafting", + order = "d[graphite]", + enabled = false, + energy_required = 3, + ingredients = { + {type="item", name="graphite", amount=5}, + }, + result = "crucible", + result_count = 1, + }, + }) +end diff --git a/data-final-fixes.lua b/data-final-fixes.lua index 00803f2..893571e 100644 --- a/data-final-fixes.lua +++ b/data-final-fixes.lua @@ -2,7 +2,6 @@ require("carbon-recipe-final-stacking") require("carbon-recipe-final-k2") require("carbon-recipe-final-se") require("carbon-recipe-final-rrr") - require("carbon-recipe-modules") -- Should be last import local util = require("__bzcarbon__.data-util"); @@ -27,3 +26,11 @@ end for i, entity in pairs(data.raw["assembling-machine"]) do diamondsInElectricSmelter(entity) end + +-- furnace recipe rework, remove crucible ingredients +for i, furnace in pairs(furnaces) do + for j, ingredient in pairs(util.me.crucible_ingredients) do + util.remove_ingredient(furnace, ingredient) + end +end + diff --git a/graphics/icons/crucible.png b/graphics/icons/crucible.png new file mode 100644 index 0000000..dfba2c8 Binary files /dev/null and b/graphics/icons/crucible.png differ diff --git a/graphics/icons/crucible.xcf b/graphics/icons/crucible.xcf new file mode 100644 index 0000000..afc7fac Binary files /dev/null and b/graphics/icons/crucible.xcf differ diff --git a/me.lua b/me.lua index 08adde5..dd2f6c0 100644 --- a/me.lua +++ b/me.lua @@ -24,4 +24,17 @@ if me.get_setting(me.name.."-recipe-bypass") then end end +me.crucible_ingredients = {"tungsten-plate", "zirconia", "stone-brick", "silica"} +me.furnaces = { + "electric-furnace", + "electric-foundry", -- BZ + "industrial-furnace", -- AAI + "kr-advanced-furnace", -- K2 + "electric-furnace-mk2", -- FE+ + "electric-furnace-mk3", -- FE+ + "mega-furnace", -- Mega furnace + "advanced-electric-furnace-rampant-industrial", +} + + return me diff --git a/thumbnail.png b/thumbnail.png index 25be720..4d6e489 100644 Binary files a/thumbnail.png and b/thumbnail.png differ diff --git a/thumbnail.xcf b/thumbnail.xcf index 24ec2b3..612998f 100644 Binary files a/thumbnail.xcf and b/thumbnail.xcf differ