diff --git a/README.md b/README.md index 5caf629..0106f52 100644 --- a/README.md +++ b/README.md @@ -12,7 +12,8 @@ This mod mostly impacts the early game including electronic circuit creation. Wi - [cackling fiend](https://mods.factorio.com/user/cackling.fiend) (Update to 2.0) - [ElAdamo](https://mods.factorio.com/user/ElAdamo) (Gas-fired boiler: code, design, graphics) (code is public domain) - [Sakuro](https://github.com/sakuro) (expand options, icon tweaks) -- [Benjah-bmm27](https://commons.wikimedia.org/wiki/User:Benjah-bmm27) ([Formaldehyde icon](https://commons.wikimedia.org/wiki/File:Formaldehyde-3D-vdW.png), public domain) +- [Benjah-bmm27](https://commons.wikimedia.org/wiki/User:Benjah-bmm27) ([Formaldehyde icon](https://commons.wikimedia.org/wiki/File:Formaldehyde-3D-vdW.png), + public domain) ### Compatibility - [nihilistzsche](https://github.com/nihilistzsche) diff --git a/bzgas2/changelog.txt b/bzgas2/changelog.txt index 42c0650..db6a1b0 100644 --- a/bzgas2/changelog.txt +++ b/bzgas2/changelog.txt @@ -1,14 +1,4 @@ --------------------------------------------------------------------------------------------------- -Version: 2.0.2 -Date: 22.10.2025 - Bug Fixes: - - Fix bakelite prerequisite if foundry is present ---------------------------------------------------------------------------------------------------- -Version: 2.0.1 -Date: 21.10.2025 - Changes: - - Switch to bz mods forks ---------------------------------------------------------------------------------------------------- Version: 2.0.0 Date: 19.10.2025 Changes: diff --git a/bzgas2/data-final-fixes.lua b/bzgas2/data-final-fixes.lua index ad08a6f..aa7d6fb 100644 --- a/bzgas2/data-final-fixes.lua +++ b/bzgas2/data-final-fixes.lua @@ -17,7 +17,7 @@ end -- Vanilla burner phase tweaks -- green circuits after electronics -- Electronic circuit recipe set below in compatibility script -if not mods.Krastorio2 and not mods["aai-industry"] and not mods.bzaluminum2 and not mods["bzcarbon2"] then +if not mods.Krastorio2 and not mods["aai-industry"] and not mods.bzaluminum2 and not mods.bzcarbon then util.replace_ingredient("offshore-pump", "electronic-circuit", "copper-cable") util.replace_ingredient("lab", "electronic-circuit", "copper-cable") util.replace_ingredient("electric-mining-drill", "electronic-circuit", "copper-cable", 2, true) @@ -38,7 +38,7 @@ if not mods.Krastorio2 and not mods["aai-industry"] and not mods.bzaluminum2 and util.set_enabled("inserter", false) util.add_prerequisite("logistic-science-pack", "electronics") end -if not mods.bzaluminum2 and not mods["bzcarbon2"] then +if not mods.bzaluminum2 and not mods.bzcarbon then util.replace_ingredients_prior_to("electronics", "electronic-circuit", "copper-cable", 2) end diff --git a/bzgas2/data-util.lua b/bzgas2/data-util.lua index ff75c36..3825ac6 100644 --- a/bzgas2/data-util.lua +++ b/bzgas2/data-util.lua @@ -1188,8 +1188,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/bzgas2/info.json b/bzgas2/info.json index ebae08f..8eb6958 100644 --- a/bzgas2/info.json +++ b/bzgas2/info.json @@ -1,6 +1,6 @@ { "name": "bzgas2", - "version": "2.0.2", + "version": "2.0.0", "factorio_version": "2.0", "title": "Natural Gas", "description": "Adds a natural gas resource, along with early game plastic.", @@ -9,12 +9,12 @@ "dependencies": [ "base >= 2.0.0", "? bzfoundry2 >= 2.0.0", - "? bztitanium2 >= 2.0.26", - "? bzlead2 >= 2.0.29", - "? bzzirconium2 >= 2.1.14", - "? bztungsten2 >= 2.0.0", - "? bzcarbon2 >= 2.0.22", - "? bztin2 >= 2.1.16", + "? bztitanium >= 2.0.26", + "? bzlead >= 2.0.28", + "? bzzirconium >= 2.1.13", + "? bztungsten >= 0.6.0", + "? bzcarbon >= 2.0.21", + "? bztin >= 2.1.15", "? warptorio2_expansion", "? space-exploration >= 0.7.34", "? aai-industry >= 0.6.13", diff --git a/bzgas2/prototypes/bakelite.lua b/bzgas2/prototypes/bakelite.lua index 83a7a9d..5018dd3 100644 --- a/bzgas2/prototypes/bakelite.lua +++ b/bzgas2/prototypes/bakelite.lua @@ -1,5 +1,10 @@ local util = require("data-util"); +b_prereq = {"basic-chemistry"} +if data.raw.technology["foundry"] then + table.insert(b_prereq, "foundry") +end + data:extend({ { type = "item", @@ -30,7 +35,7 @@ data:extend({ name = "bakelite", icon = "__bzgas2__/graphics/technology/bakelite.png", icon_size = 256, - prerequisites = {"basic-chemistry"}, + prerequisites = b_prereq, effects = { {type = "unlock-recipe", recipe = "bakelite"}, }, diff --git a/bzgas2/prototypes/gas-extractor.lua b/bzgas2/prototypes/gas-extractor.lua index 156b547..02f8b15 100644 --- a/bzgas2/prototypes/gas-extractor.lua +++ b/bzgas2/prototypes/gas-extractor.lua @@ -7,7 +7,7 @@ local ge_ingredients = { {type="item", name="stone-brick", amount=4}, } local ge_prereq = {"automation"} -if mods["bzlead2"] then table.insert(ge_ingredients, {type="item", name="lead-plate", amount=4}) end +if mods.bzlead then table.insert(ge_ingredients, {type="item", name="lead-plate", amount=4}) end if mods.Krastorio2 then table.insert(ge_ingredients, {type="item", name="kr-sand", amount=10}) ge_prereq = {"kr-stone-processing"}