diff --git a/changelog.txt b/changelog.txt index 5feed5b..55174af 100644 --- a/changelog.txt +++ b/changelog.txt @@ -1,4 +1,10 @@ --------------------------------------------------------------------------------------------------- +Version: 0.5.4 +Date: 2021-07-06 + Features: + - Very basic Industrial Revolution 2 compatibility. + - Nuclear Reprocessing Rebalance compatibility +--------------------------------------------------------------------------------------------------- Version: 0.5.3 Date: 2021-07-01 Features: diff --git a/info.json b/info.json index 233aba3..b9251ae 100644 --- a/info.json +++ b/info.json @@ -1,6 +1,6 @@ { "name": "bzlead", - "version": "0.5.3", + "version": "0.5.4", "factorio_version": "1.1", "title": "Lead", "author": "Brevven", diff --git a/lead-recipe-updates.lua b/lead-recipe-updates.lua index ff04412..cb155fe 100644 --- a/lead-recipe-updates.lua +++ b/lead-recipe-updates.lua @@ -2,7 +2,7 @@ -- local util = require("__bzlead__.util"); -if (not mods["pyrawores"] and not mods["bobplates"] and not mods["angelssmelting"]) then +if (not mods["pyrawores"] and not mods["bobplates"] and not mods["angelssmelting"] and not mods["IndustrialRevolution"]) then util.replace_ingredient("pipe", "iron-plate", "lead-plate") util.replace_ingredient("pipe-to-ground", "iron-plate", "lead-plate") util.replace_some_ingredient("storage-tank", "iron-plate", 10, "lead-plate", 10) diff --git a/lead-recipe.lua b/lead-recipe.lua index dd6e927..e363c20 100644 --- a/lead-recipe.lua +++ b/lead-recipe.lua @@ -2,12 +2,8 @@ local util = require("__bzlead__.util"); - - -if (not mods["pyrawores"] and not mods["bobplates"] and not mods["angelssmelting"]) then - -data:extend( -{ +if (not mods["pyrawores"] and not mods["bobplates"] and not mods["angelssmelting"] and not mods["IndustrialRevolution"]) then +data:extend({ { type = "recipe", name = util.lead_plate, @@ -84,12 +80,58 @@ data:extend( energy_required = 17.5, ingredients = {{"lead-ore", 100}}, results = { - {type="item", name = util.lead_plate, amount=50, probability=5/6}, + {type="item", name = util.me.lead_plate, amount=50, probability=5/6}, {type="item", name = "copper-ore", amount=25, probability=1/3}, } } } or nil, -} -) +}) end +if mods["IndustrialRevolution"] then +data:extend({ + { + type = "recipe", + name = "bz-lead-ingot", + category = "smelting", + subgroup = "raw-material", + order = "d[lead-plate]", + icons = (mods["Krastorio2"] and + { + { icon = "__IndustrialRevolution__/graphics/icons/64/lead-ingot.png", icon_size = 64, icon_mipmaps = 4, }, + { icon = "__bzlead__/graphics/icons/lead-ore.png", icon_size = 64, icon_mipmaps = 3, scale=0.25, shift= {-8, -8}}, + } or { + { icon = "__IndustrialRevolution__/graphics/icons/64/lead-ingot.png", icon_size = 64, icon_mipmaps = 4, }, + }), + normal = (mods["Krastorio2"] and + { + enabled = true, + energy_required = 16, + ingredients = {{"lead-ore", 10}}, + results = { + {type="item", name = "lead-ingot", amount_min=4, amount_max=5}, + {type="item", name = "copper-ore", amount_min=1, amount_max=2}, + } + } or + { + enabled = true, + energy_required = 6.4, + ingredients = {{"lead-ore", 2}}, + results = { + {type="item", name = "lead-ingot", amount=2, probability=5/6}, + {type="item", name = "copper-ore", amount=1, probability=1/3}, + } + }), + expensive = + { + enabled = true, + energy_required = 12.8, + ingredients = {{"lead-ore", 4}}, + results = { + {type="item", name = "lead-ingot", amount=2, probability=5/6}, + {type="item", name = "copper-ore", amount=2, probability=1/3}, + } + } + }, +}) +end diff --git a/locale/de/lead.cfg b/locale/de/lead.cfg index 8f7a941..9193c5b 100644 --- a/locale/de/lead.cfg +++ b/locale/de/lead.cfg @@ -31,6 +31,7 @@ lead-plate=__ITEM__lead-plate__ smelt-compressed-lead-ore=__ITEM__lead-plate__ lead-dust=__ITEM__lead-dust__ dirty-water-filtration-lead=Filtrieren von verunreinigtem Wasser [item=lead-ore] +bz-lead-ingot=Bleibarren [recipe-description] enriched-lead=Anreichern von Bleierz durch Reinigen mit Schwefelsäure [fluid=sulfuric-acid] und Wasser [fluid=water], wodurch die Endausbeute verbessert wird. Es entsteht verunreinigtes Wasser [fluid=dirty-water] als Nebenprodukt. diff --git a/locale/en/lead.cfg b/locale/en/lead.cfg index 7c73b27..3ba4775 100644 --- a/locale/en/lead.cfg +++ b/locale/en/lead.cfg @@ -31,6 +31,7 @@ lead-plate=__ITEM__lead-plate__ smelt-compressed-lead-ore=__ITEM__lead-plate__ lead-dust=__ITEM__lead-dust__ dirty-water-filtration-lead=Filter dirty water [item=lead-ore] +bz-lead-ingot=Lead ingot [recipe-description] enriched-lead=Enrich lead ore, purifying with sulfuric acid [fluid=sulfuric-acid] and water [fluid=water], improving the final yield. Produce dirty water [fluid=dirty-water] as a byproduct. diff --git a/locale/ja/lead.cfg b/locale/ja/lead.cfg index e4f0041..8fe1ca2 100644 --- a/locale/ja/lead.cfg +++ b/locale/ja/lead.cfg @@ -31,6 +31,7 @@ lead-plate=__ITEM__lead-plate__ smelt-compressed-lead-ore=__ITEM__lead-plate__ lead-dust=__ITEM__lead-dust__ dirty-water-filtration-lead=汚水分離[item=lead-ore] +bz-lead-ingot=鉛のインゴット [recipe-description] enriched-lead=鉛鉱石を硫酸[fluid=sulfuric-acid] と水で[fluid=water] 処理し、収量を改善します。副産物として汚水[fluid=dirty-water] を生産します。 diff --git a/locale/pl/lead.cfg b/locale/pl/lead.cfg index b94dc61..00e2a91 100644 --- a/locale/pl/lead.cfg +++ b/locale/pl/lead.cfg @@ -31,6 +31,7 @@ lead-plate=__ITEM__lead-plate__ smelt-compressed-lead-ore=__ITEM__lead-plate__ lead-dust=__ITEM__lead-dust__ dirty-water-filtration-lead=Oczyszczanie ścieku z flotacji [item=lead-ore] +bz-lead-ingot=Sztabka ołowiu [recipe-description] enriched-lead=Wzbogacanie poprzez flotację z użyciem kwasu siarkowego [fluid=sulfuric-acid] i wody [fluid=water], zwiększając koncentrację pierwiastka. Po flotacji pozostają ścieki [fluid=dirty-water]. diff --git a/locale/ru/lead.cfg b/locale/ru/lead.cfg index 3f411fe..b7050d9 100644 --- a/locale/ru/lead.cfg +++ b/locale/ru/lead.cfg @@ -30,6 +30,7 @@ lead-plate=__ITEM__lead-plate__ smelt-compressed-lead-ore=__ITEM__lead-plate__ lead-dust=__ITEM__lead-dust__ dirty-water-filtration-lead=Фильтрация грязной воды [item=lead-ore] +bz-lead-ingot=Свинцовый слиток [recipe-description] enriched-lead=Обогащает свинец серной кислотой [fluid=sulfuric-acid] и водой [fluid=water], увеличивая объёмы продукции. Производит грязную воду [fluid=dirty-water] как побочный продукт.