diff --git a/changelog.txt b/changelog.txt index 6ffbba0..c4d17cb 100644 --- a/changelog.txt +++ b/changelog.txt @@ -1,4 +1,9 @@ --------------------------------------------------------------------------------------------------- +Version: 0.7.9 +Date: 2023-03-06 + Features: + - K2: Add setting to choose between default mineral water and water for mining fluid +--------------------------------------------------------------------------------------------------- Version: 0.7.8 Date: 2023-02-12 Changes: diff --git a/info.json b/info.json index 7a064a0..04f245e 100644 --- a/info.json +++ b/info.json @@ -1,6 +1,6 @@ { "name": "bztungsten", - "version": "0.7.8", + "version": "0.7.10", "factorio_version": "1.1", "title": "Tungsten", "author": "Brevven", diff --git a/locale/en/tungsten.cfg b/locale/en/tungsten.cfg index b067cf6..fa62c07 100644 --- a/locale/en/tungsten.cfg +++ b/locale/en/tungsten.cfg @@ -63,6 +63,7 @@ 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 +bztungsten-mining-fluid-k2=Mining fluid for Krastorio2 bztungsten-starting-patch=Starting wolframite patch bztungsten-more-intermediates=Enable more intermediates bztungsten-se-sintering=SE: Sinter powdered tungsten instead of casting @@ -75,7 +76,10 @@ bztungsten-mining-fluid-amount=Amount of fluid (water) needed to mine, default 1 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. bztungsten-starting-patch=Whether a new game should have a starting wolframite patch. Disabled by default in vanilla, AAI, etc. bztungsten-se-sintering=Due to the high melting point of tungsten, instead of creating molten tungsten and casting it, create tungsten powder and sinter it (still in a casting machine). +bztungsten-mining-fluid-k2=Fluid used to mine wolframite, [color=cyan]mineral water is recommended.[/color] [string-mod-setting] bztungsten-more-intermediates-no=No bztungsten-more-intermediates-cuw=Yes: __ITEM__cuw__ +bztungsten-mining-fluid-k2-mineral-water=Mineral water [color=blue]Recommended![/color] +bztungsten-mining-fluid-k2-water=Water diff --git a/me.lua b/me.lua index f1919ca..cbb3d48 100644 --- a/me.lua +++ b/me.lua @@ -32,6 +32,14 @@ function me.starting_patch() return mods["Krastorio2"] or me.get_setting("bztungsten-starting-patch") end + +function me.fluid() + if mods["Krastorio2"] then + return me.get_setting("bztungsten-mining-fluid-k2") + end + return "water" +end + function me.fluid_amount() if mods["Krastorio2"] then local amt = me.get_setting("bztungsten-mining-fluid-amount-k2") diff --git a/settings.lua b/settings.lua index 6f82bac..3eead17 100644 --- a/settings.lua +++ b/settings.lua @@ -32,35 +32,50 @@ data:extend({ hidden = not not (mods.Krastorio2 or mods.bzfoundry), order = "aea", }, - { - type = "bool-setting", - name = "bztungsten-starting-patch", - setting_type = "startup", - default_value = false, - allowed_values = {"yes", "no"}, - hidden = not not mods.Krastorio2, - order = "afa", - }, - mods["Krastorio2"] and - { - type = "int-setting", - name = "bztungsten-mining-fluid-amount-k2", - setting_type = "startup", - default_value = 1, - minimum_value = 1, - maximum_value = 1000, - order = "aga", - } or { - type = "int-setting", - name = "bztungsten-mining-fluid-amount", - setting_type = "startup", - default_value = 10, - minimum_value = 1, - maximum_value = 1000, - order = "aga", - }, }) +if mods.Krastorio2 then + data:extend({ + { + type = "string-setting", + name = "bztungsten-mining-fluid-k2", + setting_type = "startup", + default_value = "mineral-water", + allowed_values = {"mineral-water", "water"}, + order = "aga", + }, + { + type = "int-setting", + name = "bztungsten-mining-fluid-amount-k2", + setting_type = "startup", + default_value = 1, + minimum_value = 1, + maximum_value = 1000, + order = "agb", + }, + }) +else + data:extend({ + { + type = "bool-setting", + name = "bztungsten-starting-patch", + setting_type = "startup", + default_value = false, + hidden = not not mods.Krastorio2, + order = "afa", + }, + { + type = "int-setting", + name = "bztungsten-mining-fluid-amount", + setting_type = "startup", + default_value = 10, + minimum_value = 1, + maximum_value = 1000, + order = "aga", + }, + }) +end + if mods["space-exploration"] and string.sub(mods["space-exploration"], 1, 3) >= "0.6" then data:extend({ { diff --git a/tungsten-ore.lua b/tungsten-ore.lua index be40d51..34c2d31 100644 --- a/tungsten-ore.lua +++ b/tungsten-ore.lua @@ -29,7 +29,7 @@ data:extend({ mining_particle = "tungsten-ore-particle", mining_time = 2, fluid_amount = util.me.fluid_amount(), - required_fluid=(mods["Krastorio2"] and "mineral-water" or "water"), + required_fluid= util.me.fluid(), result = "tungsten-ore" }, collision_box = {{ -0.1, -0.1}, {0.1, 0.1}},