diff --git a/changelog.txt b/changelog.txt index 218efbc..789f350 100644 --- a/changelog.txt +++ b/changelog.txt @@ -1,9 +1,8 @@ --------------------------------------------------------------------------------------------------- -Version: 0.1.5 -Date: 2021-01-24 - Changes: - - Lead used to make colored items for some mods. - - Update Krastorio 2 matter tech icon. +Version: 0.2.0 +Date: 2021-01-25 + Features: + - 5dims compatibility --------------------------------------------------------------------------------------------------- Version: 0.1.4 Date: 2021-01-22 diff --git a/data-final-fixes.lua b/data-final-fixes.lua index 8e2a024..0b64b8b 100644 --- a/data-final-fixes.lua +++ b/data-final-fixes.lua @@ -1,6 +1,7 @@ require("lead-recipe-final-stacking") require("lead-recipe-modules") require("lead-recipe-colors") +require("lead-recipe-final-5d") ---- diff --git a/info.json b/info.json index 6fa5247..cc49b37 100644 --- a/info.json +++ b/info.json @@ -1,6 +1,6 @@ { "name": "bzlead", - "version": "0.1.5", + "version": "0.2.0", "factorio_version": "1.1", "title": "Lead", "author": "Brevven", diff --git a/lead-recipe-final-5d.lua b/lead-recipe-final-5d.lua new file mode 100644 index 0000000..3e7d99e --- /dev/null +++ b/lead-recipe-final-5d.lua @@ -0,0 +1,122 @@ +local util = require("__bzlead__.util"); + +if mods["5dim_core"] then + + data.raw.item["lead-plate"].subgroup = "plates-plates" + data.raw.recipe["lead-plate"].subgroup = "plates-plates" + data.raw.item["lead-ore"].subgroup = "plates-ore" + + -- Industrial furnace + data:extend({ + { + type = "recipe", + name = "lead-plate-industrial-ore", + category = "industrial-furnace", + subgroup = "plates-industrial-ore", + order = "ad[lead-plate]", + icon = "__bzlead__/graphics/icons/lead-plate.png", + icon_size = 64, + enabled = true, + energy_required = 65, + ingredients = {{"lead-ore", 85}}, + result = util.lead_plate, + result_count = 100, + } + }) + + -- Lead dust + data:extend( + { + { + type = "item", + name = "lead-dust", + icon_size = 32, + subgroup = "plates-dust", + order = "d[lead-plate]", + icon = "__bzlead__/graphics/icons/lead-powder.png", + icon_size = 64, + stack_size = 200 + }, + { + type = "recipe", + name = "lead-plate-dust", + icon = "__bzlead__/graphics/icons/lead-plate.png", + icon_size = 64, + subgroup = "plates-plates2", + order = "d[lead-plate]", + category = "smelting", + energy_required = 3.2, + enabled = true, + ingredients = { + {"lead-dust", 1} + }, + result = util.lead_plate + }, + { + type = "recipe", + name = "lead-dust", + icon = "__bzlead__/graphics/icons/lead-powder.png", + icon_size = 64, + category = "mashering", + subgroup = "", + order = "d[lead-plate]", + energy_required = 3.2, + enabled = true, + ingredients = { + {"lead-ore", 1} + }, + results = { + {type="item", name = "lead-dust", amount=2}, + } + }, + { + type = "recipe", + name = "lead-plate-industrial-dust", + category = "industrial-furnace", + subgroup = "plates-industrial-dust", + order = "ad[lead-plate]", + icon = "__bzlead__/graphics/icons/lead-plate.png", + icon_size = 64, + enabled = true, + energy_required = 65, + ingredients = {{"lead-dust", 85}}, + result = util.lead_plate, + result_count = 100, + } + }) + + if mods["5dim_resources"] then + local mks = {"01", "02", "03", "04", "05", "06", "07", "08", "09", "10"} + local items = {"5d-masher-"} + for i, mk in pairs(mks) do + for j, item in pairs(items) do + util.add_ingredient(item..mk, "lead-plate", 2) + end + end + + end + + if mods["5dim_energy"] then + local mks = {"02", "03", "04", "05", "06", "07", "08", "09", "10"} + local items = {"5d-substation-", "5d-big-electric-pole-", "5d-solar-panel-"} + for i, mk in pairs(mks) do + for j, item in pairs(items) do + util.add_ingredient(item..mk, "lead-plate", 2) + end + end + end + + if mods["5dim_battlefield"] then + local mks = {"01", "02", "03", "04", "05", "06", "07", "08", "09", "10"} + local items = {"5d-gun-turret-", "5d-gun-turret-big-", "5d-gun-turret-small-"} + for i, mk in pairs(mks) do + for j, item in pairs(items) do + util.replace_some_ingredient(item..mk, "iron-plate", "lead-plate", 2) + end + util.replace_some_ingredient("5d-gun-turret-sniper-"..mk, "steel-plate", "lead-plate", 1) + end + + end + + +end diff --git a/lead-recipe.lua b/lead-recipe.lua index c0e4771..9926f46 100644 --- a/lead-recipe.lua +++ b/lead-recipe.lua @@ -47,8 +47,8 @@ data:extend( energy_required = 12.8, ingredients = {{"lead-ore", 4}}, results = { - {type="item", name = util.lead_plate, amount=2, probability=0.8333}, - {type="item", name = "copper-ore", amount=2, probability=0.333}, + {type="item", name = util.lead_plate, amount=2, probability=5/6}, + {type="item", name = "copper-ore", amount=2, probability=1/3}, } } }, diff --git a/locale/en/lead.cfg b/locale/en/lead.cfg index c692ad6..cbd8ec6 100644 --- a/locale/en/lead.cfg +++ b/locale/en/lead.cfg @@ -25,6 +25,7 @@ enriched-lead=Enrich lead ore, purifying with sulfuric acid [fluid=sulfuric-acid [recipe-name] enriched-lead=__ITEM__enriched-lead__ lead-plate=__ITEM__lead-plate__ +lead-dust=__ITEM__lead-dust__ dirty-water-filtration-lead=Filter dirty water [item=lead-ore] [recipe-description]