diff --git a/bzaluminum2/aluminum-matter.lua b/bzaluminum2/aluminum-matter.lua index 92caa5c..bacd77f 100644 --- a/bzaluminum2/aluminum-matter.lua +++ b/bzaluminum2/aluminum-matter.lua @@ -1,68 +1,62 @@ -- Matter recipes for Krastorio2 if mods["Krastorio2"] then -local util = require("data-util"); -local matter = require("__Krastorio2__/prototypes/libraries/matter") + local util = require("data-util") + local matter = require("__Krastorio2__/prototypes/libraries/matter") -data:extend( -{ - { - type = "technology", - name = "aluminum-matter-processing", - icons = + data:extend({ { - { - icon = util.k2assets().."/technologies/matter-coal.png", - icon_size = 256, + type = "technology", + name = "aluminum-matter-processing", + icons = { + { + icon = util.k2assets() .. "/technologies/backgrounds/matter.png", + icon_size = 256, + }, + { + icon = "__bzaluminum2__/graphics/icons/aluminum-ore.png", + icon_size = 64, + scale = 1, + }, + }, + effects = {}, + prerequisites = { "kr-matter-processing" }, + unit = { + count = 350, + ingredients = { + { "production-science-pack", 1 }, + { "utility-science-pack", 1 }, + { "kr-matter-tech-card", 1 }, + }, + time = 45, }, - { - icon = "__bzaluminum2__/graphics/icons/aluminum-ore.png", - icon_size = 64, - scale = 1.4, - } }, - prerequisites = {"kr-matter-processing"}, - unit = - { - count = 350, - ingredients = - { - {"production-science-pack", 1}, - {"utility-science-pack", 1}, - {"kr-matter-tech-card", 1} - }, - time = 45 - } - }, -}) + }) -local aluminum_ore_matter = - { - material = { type = "item", name = "aluminum-ore", amount = 10 }, + local aluminum_ore_matter = { + material = { type = "item", name = "aluminum-ore", amount = 10 }, matter_count = 5, energy_required = 1, - need_stabilizer = false, - unlocked_by_technology = "aluminum-matter-processing" - } -matter.make_recipes(aluminum_ore_matter) + needs_stabilizer = false, + unlocked_by = "aluminum-matter-processing", + } + matter.make_recipes(aluminum_ore_matter) -local alumina_matter = - { - material = { type = "item", name = "alumina", amount = 10 }, + local alumina_matter = { + material = { type = "item", name = "alumina", amount = 10 }, matter_count = 7.5, energy_required = 2, - only_deconversion = true, - need_stabilizer = true, - unlocked_by_technology = "aluminum-matter-processing" - } -matter.make_recipes(alumina_matter) -local aluminum_plate_matter = - { - material = { type = "item", name = "aluminum-plate", amount = 10 }, + -- only_deconversion = true, + needs_stabilizer = true, + unlocked_by = "aluminum-matter-processing", + } + matter.make_deconversion_recipe(alumina_matter) + local aluminum_plate_matter = { + material = { type = "item", name = "aluminum-plate", amount = 10 }, matter_count = 10, energy_required = 3, - only_deconversion = true, - need_stabilizer = true, - unlocked_by_technology = "aluminum-matter-processing" - } -matter.make_recipes(aluminum_plate_matter) + -- only_deconversion = true, + needs_stabilizer = true, + unlocked_by = "aluminum-matter-processing", + } + matter.make_deconversion_recipe(aluminum_plate_matter) end diff --git a/bzaluminum2/data-util.lua b/bzaluminum2/data-util.lua index e69f0d5..fe2226b 100644 --- a/bzaluminum2/data-util.lua +++ b/bzaluminum2/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,11 +163,16 @@ function util.k2matter(params) }, time = 45, }, + effects = {}, localised_name = {"technology-name.k2-conversion", {"item-name."..params.k2matter.item_name}}, }, }) 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