From ed662ac65685d4aea31e00deac81a0ece67342fe Mon Sep 17 00:00:00 2001 From: Brevven Date: Wed, 21 Jul 2021 00:16:32 -0700 Subject: [PATCH] fluid amount setting --- data-util.lua | 9 +++++++++ locale/en/tungsten.cfg | 4 ++++ settings.lua | 16 ++++++++++++++++ tungsten-ore.lua | 2 +- 4 files changed, 30 insertions(+), 1 deletion(-) diff --git a/data-util.lua b/data-util.lua index 1e1eefb..ec88730 100644 --- a/data-util.lua +++ b/data-util.lua @@ -17,6 +17,15 @@ function util.fe_plus(sub) end end +function util.fluid_amount() + if mods["Krastorio2"] then + local amt = util.get_setting("bztungsten-mining-fluid-amount-k2") + return amt and amt or 1 + end + local amt = util.get_setting("bztungsten-mining-fluid-amount") + return amt and amt or 10 +end + function util.get_setting(name) if settings.startup[name] == nil then diff --git a/locale/en/tungsten.cfg b/locale/en/tungsten.cfg index 1e3cae4..da9822b 100644 --- a/locale/en/tungsten.cfg +++ b/locale/en/tungsten.cfg @@ -53,8 +53,12 @@ dirty-water-filtration-tungsten=Filter dirty water, giving wolframite [item=tung bztungsten-recipe-bypass=Bypass recipes bztungsten-avoid-military=Avoid military science pack bztungsten-advanced-carbon-furnace=Enable the advanced carbon furnace +bztungsten-mining-fluid-amount=Mining fluid amount +bztungsten-mining-fluid-amount-k2=Mining fluid amount for Krastorio2 [mod-setting-description] bztungsten-recipe-bypass=Skip modifying these recipes (comma-separated list). bztungsten-avoid-military=If 'yes', rocketry will no longer require military science. bztungsten-advanced-carbon-furnace=A furnace to smelt tungsten carbide quickly. Meant only for very large factories. +bztungsten-mining-fluid-amount=Amount of fluid (water) needed to mine, default 10. Note, this is displayed as 1/10th the value in some parts of the game. +bztungsten-mining-fluid-amount-k2=Mining fluid amount for Krastorio2, default 1. Note, this is displayed as 1/10th the value in some parts of the game. diff --git a/settings.lua b/settings.lua index 40b4fba..ee300c1 100644 --- a/settings.lua +++ b/settings.lua @@ -20,4 +20,20 @@ data:extend({ default_value = "no", allowed_values = {"yes", "no"}, }, + mods["Krastorio2"] and + { + type = "int-setting", + name = "bztungsten-mining-fluid-amount-k2", + setting_type = "startup", + default_value = 1, + minimum_value = 1, + maximum_value = 1000, + } or { + type = "int-setting", + name = "bztungsten-mining-fluid-amount", + setting_type = "startup", + default_value = 10, + minimum_value = 1, + maximum_value = 1000, + }, }) diff --git a/tungsten-ore.lua b/tungsten-ore.lua index fd71760..823f2b1 100644 --- a/tungsten-ore.lua +++ b/tungsten-ore.lua @@ -28,7 +28,7 @@ data:extend({ hardness = 1, mining_particle = "tungsten-ore-particle", mining_time = 2, - fluid_amount=(mods["Krastorio2"] and 1 or 10), + fluid_amount = util.fluid_amount(), required_fluid=(mods["Krastorio2"] and "mineral-water" or "water"), result = "tungsten-ore" },