diff --git a/changelog.txt b/changelog.txt index ca38506..3fc08de 100644 --- a/changelog.txt +++ b/changelog.txt @@ -1,7 +1,8 @@ --------------------------------------------------------------------------------------------------- Version: 0.12.3 -Date: 2021-07-06 +Date: 2021-07-12 Features: + - Setting for fluid amount - Useful Eqipment compatibility --------------------------------------------------------------------------------------------------- Version: 0.12.2 diff --git a/data-util.lua b/data-util.lua index 5b2410e..b3716cd 100644 --- a/data-util.lua +++ b/data-util.lua @@ -39,6 +39,12 @@ function util.get_setting(name) return settings.startup[name].value end +function util.fluid_amount() + local amt = util.get_setting("bztitanium-mining-fluid-amount") + return amt and amt or 3 +end + + local bypass = {} if util.get_setting(util.name.."-recipe-bypass") then for recipe in string.gmatch(util.get_setting(util.name.."-recipe-bypass"), '[^",%s]+') do diff --git a/locale/en/titanium.cfg b/locale/en/titanium.cfg index 853f77e..65eedaf 100644 --- a/locale/en/titanium.cfg +++ b/locale/en/titanium.cfg @@ -38,11 +38,13 @@ dirty-water-filtration-titanium=Filter dirty water, giving titanium ore [item=ti [mod-setting-name] bztitanium-recipe-bypass=Bypass recipes -bztitanium-mining-fluid=Experimental: Titanium mining fluid +bztitanium-mining-fluid=Titanium mining fluid +bztitanium-mining-fluid-amount=Titanium mining fluid amount [mod-setting-description] bztitanium-recipe-bypass=Skip modifying these recipes (comma-separated list). -bztitanium-mining-fluid=Choose which fluid to use when mining Titanium.\n[color=orange]Lubricant is recommended![/color]\n[color=red]This setting is experimental and might not be compatible.[/color] +bztitanium-mining-fluid=Choose which fluid to use when mining Titanium.\n[color=orange]Lubricant is recommended![/color] +bztitanium-mining-fluid-amount=Amount of fluid used to mine. Default 3. [string-mod-setting] bztitanium-mining-fluid-lubricant=Lubricant bztitanium-mining-fluid-sulfuric-acid=Sulfuric Acid diff --git a/settings.lua b/settings.lua index b132853..efdd0b4 100644 --- a/settings.lua +++ b/settings.lua @@ -13,4 +13,12 @@ data:extend({ default_value = "lubricant", allowed_values = (mods["Krastorio2"] and {"lubricant", "sulfuric-acid", "chlorine"} or {"lubricant", "sulfuric-acid"}), }, + { + type = "int-setting", + name = "bztitanium-mining-fluid-amount", + setting_type = "startup", + default_value = 3, + minimum_value = 1, + maximum_value = 1000, + }, }) diff --git a/titanium-ore.lua b/titanium-ore.lua index 1d9c29b..e8f49e5 100644 --- a/titanium-ore.lua +++ b/titanium-ore.lua @@ -32,7 +32,7 @@ data:extend({ hardness = 1, mining_particle = "titanium-ore-particle", mining_time = 2, - fluid_amount=3, + fluid_amount = util.fluid_amount(), required_fluid=(settings.startup["bztitanium-mining-fluid"] and settings.startup["bztitanium-mining-fluid"].value or "lubricant"), result = "titanium-ore" },