diff --git a/README.md b/README.md index af0b012..7b0e69d 100644 --- a/README.md +++ b/README.md @@ -3,12 +3,9 @@ **Compatibility with Space Age is explicitly excluded until someone integrates it nicely.** # Salt & Chlorine - Adds salt, chlorine, and a variety of intermediates to the base game. Changes advanced circuit production. -Compatible with Krastorio 2 and Space Exploration. A standalone piece of BZ Mods. - -## Thanks to +## Credits - Brevven ([Original mod](https://mods.factorio.com/mod/bzchlorine)) - [Benjah-bmm27](https://commons.wikimedia.org/wiki/File:Vinyl-chloride-3D-vdW.png) (vinyl chloride icon) - [snouz](https://github.com/snouz) (logo inspiration) diff --git a/bzchlorine2/changelog.txt b/bzchlorine2/changelog.txt index 39b5261..018feb7 100644 --- a/bzchlorine2/changelog.txt +++ b/bzchlorine2/changelog.txt @@ -1,4 +1,14 @@ --------------------------------------------------------------------------------------------------- +Version: 2.0.2 +Date: 22.10.2025 + Bug Fixes: + - Fix epoxy recipe +--------------------------------------------------------------------------------------------------- +Version: 2.0.1 +Date: 21.10.2025 + Changes: + - Switch to bz mods forks +--------------------------------------------------------------------------------------------------- Version: 2.0.0 Date: 18.10.2025 Changes: diff --git a/bzchlorine2/data-util.lua b/bzchlorine2/data-util.lua index 4547d4f..14619f2 100644 --- a/bzchlorine2/data-util.lua +++ b/bzchlorine2/data-util.lua @@ -44,7 +44,7 @@ if get_setting("bz-recipe-bypass") then end function util.is_foundry() - return mods.bzfoundry and not me.get_setting("bzfoundry-minimal") + return mods.bzfoundry2 and not me.get_setting("bzfoundry-minimal") end function should_force(options) @@ -1191,8 +1191,8 @@ function util.replace_ingredients_prior_to(tech, old, new, multiplier) end util.remove_prior_unlocks(tech, old) for i, recipe in pairs(data.raw.recipe) do - if (recipe.enabled and recipe.enabled ~= 'false') - and (not recipe.hidden or recipe.hidden == 'true') -- probably don't want to change hidden recipes + if (recipe.enabled and recipe.enabled ~= false) + and (not recipe.hidden or recipe.hidden == true) -- probably don't want to change hidden recipes and string.sub(recipe.name, 1, 3) ~= 'se-' -- have to exlude SE in general :( then -- log("BZZZ due to 'enabled' replacing " .. old .. " with " .. new .." in " .. recipe.name) -- Handy Debug :| diff --git a/bzchlorine2/info.json b/bzchlorine2/info.json index 7f8159f..8035ac3 100644 --- a/bzchlorine2/info.json +++ b/bzchlorine2/info.json @@ -1,6 +1,6 @@ { "name": "bzchlorine2", - "version": "2.0.0", + "version": "2.0.2", "factorio_version": "2.0", "title": "Salt & Chlorine", "description": "Adds salt, chlorine and more to the base game. Reworks advanced circuit production.", @@ -8,14 +8,14 @@ "homepage": "https://discord.gg/ufvFUJtVwk", "dependencies": [ "base >= 2.0.0", - "? bzfoundry >= 2.0.0", - "? bztitanium >= 2.0.26", - "? bzlead >= 2.0.28", - "? bzzirconium >= 2.1.13", - "? bztungsten >= 0.6.0", - "? bzcarbon >= 2.0.21", - "? bztin >= 2.1.15", - "? bzgas >= 2.0.0", + "? bzfoundry2 >= 2.0.0", + "? bztitanium2 >= 2.0.27", + "? bzlead2 >= 2.0.29", + "? bzzirconium2 >= 2.1.14", + "? bztungsten2 >= 2.0.0", + "? bzcarbon2 >= 2.0.22", + "? bztin2 >= 2.1.16", + "? bzgas2 >= 2.0.0", "? space-exploration >= 0.7.34", "? aai-industry >= 0.6.13", "(?) aai-loaders >= 0.2.7", diff --git a/bzchlorine2/prototypes/chlorine.lua b/bzchlorine2/prototypes/chlorine.lua index 256e384..ae96373 100644 --- a/bzchlorine2/prototypes/chlorine.lua +++ b/bzchlorine2/prototypes/chlorine.lua @@ -185,7 +185,7 @@ else util.add_unlock("kr-fluids-chemistry", "hydrogen-chloride-salt") end -if mods.bzgas then +if mods.bzgas2 then data:extend({ { type="recipe", @@ -198,7 +198,7 @@ if mods.bzgas then {type="fluid", name=hcl_name, amount=5}, }, icons = { - {icon = "__bzgas__/graphics/icons/bakelite.png", icon_size=128}, + {icon = "__bzgas2__/graphics/icons/bakelite.png", icon_size=128}, {icon = "__bzchlorine2__/graphics/icons/hcl.png", icon_size=128, scale=0.125, shift={-8,-8}}, }, enabled = false, diff --git a/bzchlorine2/prototypes/epoxy.lua b/bzchlorine2/prototypes/epoxy.lua index b491650..b7f2fe3 100644 --- a/bzchlorine2/prototypes/epoxy.lua +++ b/bzchlorine2/prototypes/epoxy.lua @@ -1,6 +1,6 @@ local util = require("data-util"); -local cl_name = mods.Krastorio2 and "kr-chlorine" or cl_name +local cl_name = mods.Krastorio2 and "kr-chlorine" or "chlorine" data:extend({ {