diff --git a/changelog.txt b/changelog.txt index 4a22aa6..7c47797 100644 --- a/changelog.txt +++ b/changelog.txt @@ -2,6 +2,7 @@ Version: 0.6.1 Date: 2022-01-01 Changes: + - Remove sulfuric acid setting. Use Bypass recipes setting instead - More turret & artillery compatibility --------------------------------------------------------------------------------------------------- Version: 0.6.0 diff --git a/lead-recipe-updates.lua b/lead-recipe-updates.lua index f3ea110..cfb3742 100644 --- a/lead-recipe-updates.lua +++ b/lead-recipe-updates.lua @@ -9,10 +9,7 @@ if (not mods["pyrawores"] and not mods["bobplates"] and not mods["angelssmelting util.replace_ingredient("battery", "iron-plate", "lead-plate") - if util.me.sulfuric() then - util.replace_ingredient("sulfuric-acid", "iron-plate", "lead-plate") - end - + util.replace_ingredient("sulfuric-acid", "iron-plate", "lead-plate") util.replace_ingredient("uranium-fuel-cell", "iron-plate", "lead-plate") util.replace_some_ingredient("gun-turret", "iron-plate", 4, "lead-plate", 4) diff --git a/locale/en/lead.cfg b/locale/en/lead.cfg index 3ba4775..42dd160 100644 --- a/locale/en/lead.cfg +++ b/locale/en/lead.cfg @@ -43,9 +43,7 @@ dirty-water-filtration-lead=Filter dirty water, giving lead ore [item=lead-ore], [mod-setting-name] bzlead-recipe-bypass=Bypass recipes bzlead-more-entities=Lead entities -bzlead-sulfuric=Use lead in sulfuric acid. Default "yes". Use with care. [mod-setting-description] bzlead-recipe-bypass=Skip modifying these recipes (comma-separated list). bzlead-more-entities=Adds lead entities (currently just a lead chest). -bzlead-sulfuric=Adds compatibility for old saves. Do NOT change to "no" for new saves. Will be removed (and always "yes") in 2022. diff --git a/locale/ja/lead.cfg b/locale/ja/lead.cfg index 8fe1ca2..b29c605 100644 --- a/locale/ja/lead.cfg +++ b/locale/ja/lead.cfg @@ -43,9 +43,7 @@ dirty-water-filtration-lead=汚水をろ過し、鉛鉱石[item=lead-ore] と銅 [mod-setting-name] bzlead-recipe-bypass=改変しないレシピ bzlead-more-entities=実験的: 鉛製エンティティ -bzlead-sulfuric=硫酸のレシピに鉛を使用。デフォルト: yes。注意して使用のこと。 [mod-setting-description] bzlead-recipe-bypass=指定したレシピの改変を行わない。(コンマ区切り) bzlead-more-entities=鉛製エンティティ(現在は鉛製チェストのみ)。現時点では実験的で、長期的サポートの保証はなし。 -bzlead-sulfuric=過去のセーブデータとの互換用。新規セーブでは no にしないこと。2022年に削除予定 (常時 yes になる) diff --git a/me.lua b/me.lua index 0002113..e4d1d8c 100644 --- a/me.lua +++ b/me.lua @@ -9,9 +9,6 @@ function me.more_entities() return me.get_setting("bzlead-more-entities") == "yes" end -function me.sulfuric() - return me.get_setting("bzlead-sulfuric") == "yes" -end function me.get_setting(name) if settings.startup[name] == nil then diff --git a/settings.lua b/settings.lua index 2936f59..df11756 100644 --- a/settings.lua +++ b/settings.lua @@ -13,11 +13,4 @@ data:extend({ default_value = "no", allowed_values = {"yes", "no"}, }, - { -- TODO remove this in 2022 - type = "string-setting", - name = "bzlead-sulfuric", - setting_type = "startup", - default_value = "yes", - allowed_values = {"yes", "no"}, - }, })