diff --git a/data-final-fixes.lua b/data-final-fixes.lua index 9ae9778..9e96f6d 100644 --- a/data-final-fixes.lua +++ b/data-final-fixes.lua @@ -38,8 +38,6 @@ end if mods["space-exploration"] then -- Organization - data.raw.item["lead-plate"].subgroup = "plates" - data.raw.recipe["lead-plate"].subgroup = "plates" -- core mining balancing util.add_to_product("se-core-fragment-omni", "lead-ore", -4) diff --git a/graphics/icons/lead-ingot.png b/graphics/icons/lead-ingot.png new file mode 100644 index 0000000..4a2bf53 Binary files /dev/null and b/graphics/icons/lead-ingot.png differ diff --git a/graphics/icons/lead-ingot.xcf b/graphics/icons/lead-ingot.xcf new file mode 100644 index 0000000..7672748 Binary files /dev/null and b/graphics/icons/lead-ingot.xcf differ diff --git a/graphics/icons/molten-lead.png b/graphics/icons/molten-lead.png new file mode 100644 index 0000000..1af5691 Binary files /dev/null and b/graphics/icons/molten-lead.png differ diff --git a/graphics/icons/molten-lead.xcf b/graphics/icons/molten-lead.xcf new file mode 100644 index 0000000..51588b6 Binary files /dev/null and b/graphics/icons/molten-lead.xcf differ diff --git a/lead-recipe-final-stacking.lua b/lead-recipe-final-stacking.lua index 94d56cc..acc0808 100644 --- a/lead-recipe-final-stacking.lua +++ b/lead-recipe-final-stacking.lua @@ -5,6 +5,9 @@ if deadlock then if mods["Krastorio2"] then deadlock.add_stack("enriched-lead", "__bzlead__/graphics/icons/stacked/enriched-lead-stacked.png" , "deadlock-stacking-1", 64) end + if data.raw.item["lead-ingot"] then + deadlock_crating.add_stack("lead-ingot", nil, "deadlock-stacking-1", nil) + end end -- Deadlock crating recipes @@ -14,5 +17,8 @@ if deadlock_crating then if mods["Krastorio2"] then deadlock_crating.add_crate("enriched-lead", "deadlock-crating-1") end + if data.raw.item["lead-ingot"] then + deadlock_crating.add_crate("lead-ingot", "deadlock-crating-1") + end end diff --git a/lead-recipe-se.lua b/lead-recipe-se.lua index 663e792..090058e 100644 --- a/lead-recipe-se.lua +++ b/lead-recipe-se.lua @@ -1,5 +1,5 @@ -- Additional recipes if Space Exploration mod is enabled -local util = require("__bzlead__.data-util"); +local util = require("data-util"); if mods["space-exploration"] then se_delivery_cannon_recipes[util.me.lead_ore] = {name= util.me.lead_ore} @@ -21,6 +21,103 @@ if mods["space-exploration"] then } }) +if string.sub(mods["space-exploration"], 1, 3) == "0.6" then + data:extend({ + { + type = "item-subgroup", + name = "lead", + group = "resources", + order = "a-h-z-a", + } + }) + data.raw.item["lead-plate"].subgroup = "lead" + data:extend({ + { + type = "item", + name = "lead-ingot", + icons = {{icon = "__bzlead__/graphics/icons/lead-ingot.png", icon_size = 128}}, + order = "b-b", + stack_size = 50, + subgroup = "lead", + }, + { + type = "fluid", + name = "molten-lead", + default_temperature = 600, + max_temperature = 600, + base_color = {r=121, g=80, b=80}, + flow_color = {r=121, g=80, b=80}, + icons = {{icon = "__bzlead__/graphics/icons/molten-lead.png", icon_size = 128}}, + order = "a[molten]-a", + pressure_to_speed_ratio = 0.4, + flow_to_energy_ratio = 0.59, + auto_barrel = false, + subgroup = "fluid", + }, + { + type = "recipe", + category = "smelting", + name = "molten-lead", + subgroup = "lead", + results = { + {type = "fluid", name = "molten-lead", amount = mods.Krastorio2 and 750 or 900}, + }, + energy_required = 60, + ingredients = { + {name = mods.Krastorio2 and "enriched-lead" or "lead-ore", amount = 24}, + {type = "fluid", name = "se-pyroflux", amount = 10}, + }, + enabled = false, + always_show_made_in = true, + allow_as_intermediate = false, + order = "a-a" + }, + { + type = "recipe", + name = "lead-ingot", + category = "casting", + results = {{"lead-ingot", 1}}, + energy_required = 100, + ingredients = { + {type = "fluid", name = "molten-lead", amount = 250}, + }, + enabled = false, + always_show_made_in = true, + allow_as_intermediate = false, + }, + { + type = "recipe", + category = "crafting", + name = "lead-ingot-to-plate", + + icons = { + {icon = "__bzlead__/graphics/icons/lead-plate.png", icon_size = 64, icon_mipmaps = 3}, + {icon = "__bzlead__/graphics/icons/lead-ingot.png", icon_size = 128, scale = 0.25, shift = {-8, -8}}, + }, + results = { + {name = "lead-plate", amount = 10}, + }, + energy_required = 5, + ingredients = { + {name = "lead-ingot", amount = 1} + }, + enabled = false, + always_show_made_in = true, + allow_decomposition = false, + order = "a-c-b" + }, + }) + util.add_effect("se-vulcanite-smelting", {type = "unlock-recipe", recipe= "molten-lead"}) + util.add_effect("se-vulcanite-smelting", {type = "unlock-recipe", recipe= "lead-ingot"}) + util.add_effect("se-vulcanite-smelting", {type = "unlock-recipe", recipe= "lead-ingot-to-plate"}) + if mods["Krastorio2"] then + data.raw.recipe["enriched-lead-plate"].order= "d[lead-plate]" + se_delivery_cannon_recipes["enriched-lead"] = {name= "enriched-lead"} + else + util.add_product("molten-lead", {"copper-ore", 6}) + end +else + data.raw.item["lead-plate"].subgroup = "plates" if mods["Krastorio2"] then data:extend({ { @@ -84,3 +181,4 @@ if mods["space-exploration"] then {type = "unlock-recipe", recipe= "lead-smelting-vulcanite"}) end end +end diff --git a/locale/en/lead.cfg b/locale/en/lead.cfg index 945d09b..593b452 100644 --- a/locale/en/lead.cfg +++ b/locale/en/lead.cfg @@ -9,6 +9,7 @@ lead-ore=[item=lead-ore] Lead ore lead-ore=Lead ore lead-dust=Lead dust lead-plate=Lead plate +lead-ingot=Lead ingot lead-alloy=__ITEM__lead-plate__ enriched-lead=Enriched lead lead-chest=Lead chest @@ -18,6 +19,9 @@ compressed-lead-ore=Compressed lead ore lead-ore=Can be smelted into lead plates enriched-lead=Can be efficiently smelted into lead plates +[fluid-name] +molten-lead=Molten lead + [technology-name] enriched-lead=Enriched Lead lead-matter-processing=Lead conversion