diff --git a/README.md b/README.md index 698f78f..d9ed0b1 100644 --- a/README.md +++ b/README.md @@ -12,7 +12,7 @@ Other vanilla smelting recipes are, by default, not done in foundries, but that There are also optional recipes (default off) that enable advantageous smelting ratios when using a supplemental refractory. ## Credits -- Brevven ([Original mod](https://mods.factorio.com/mod/bzfoundry)) +- Brevven ([Original mod](https://mods.factorio.com/mod/bzchlorine)) - [cackling fiend](https://mods.factorio.com/user/cackling.fiend) (Update to 2.0) - Wube (Graphics) diff --git a/bzfoundry2/changelog.txt b/bzfoundry2/changelog.txt index 4d308d3..db6a1b0 100644 --- a/bzfoundry2/changelog.txt +++ b/bzfoundry2/changelog.txt @@ -1,9 +1,4 @@ --------------------------------------------------------------------------------------------------- -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/bzfoundry2/info.json b/bzfoundry2/info.json index 7619f65..a908b86 100644 --- a/bzfoundry2/info.json +++ b/bzfoundry2/info.json @@ -1,6 +1,6 @@ { "name": "bzfoundry2", - "version": "2.0.1", + "version": "2.0.0", "factorio_version": "2.0", "title": "Foundry", "description": "Adds a foundry building for making alloys, etc.", @@ -11,9 +11,9 @@ "rusty-locale >= 1.0.17", "? space-exploration >= 0.7.34", "(?) Krastorio2 >= 2.0.8", - "? bzsilicon2 >= 2.0.19", - "? bztungsten2", - "? bzzirconium2 >= 2.1.14", + "? bzsilicon >= 2.0.18", + "? bztungsten", + "? bzzirconium >= 2.1.13", "! space-age" ] } diff --git a/bzfoundry2/me.lua b/bzfoundry2/me.lua index 0a0f081..0fb3b40 100644 --- a/bzfoundry2/me.lua +++ b/bzfoundry2/me.lua @@ -3,7 +3,7 @@ local me = {} me.name = "bzfoundry2" function me.basic_founding() - return mods["bztin2"] or mods.bzaluminum2 + return mods.bztin or mods.bzaluminum2 end function me.woodcoke() diff --git a/bzfoundry2/prototypes/foundry.lua b/bzfoundry2/prototypes/foundry.lua index 300b77b..9de4904 100644 --- a/bzfoundry2/prototypes/foundry.lua +++ b/bzfoundry2/prototypes/foundry.lua @@ -1,7 +1,7 @@ local util = require("data-util") local foundry_ingredients = {{type="item", name="stone-brick", amount=20}, {type="item", name="iron-plate", amount=10}, {type="item", name="copper-plate", amount=5}} -if mods["bzlead2"] then table.insert(foundry_ingredients, {type="item", name="lead-plate", amount=8}) end +if mods.bzlead then table.insert(foundry_ingredients, {type="item", name="lead-plate", amount=8}) end if mods.Krastorio2 then table.insert(foundry_ingredients, {type="item", name="kr-sand", amount=10}) elseif mods["aai-industry"] then @@ -118,14 +118,14 @@ if util.me.founding_plates() then name = "advanced-founding", icons = { {icon = "__bzfoundry2__/graphics/icons/technology/foundry.png", icon_size = 256}, - (mods["bzcarbon2"] and - { icon = "__bzcarbon2__/graphics/icons/graphite-2.png", + (mods.bzcarbon and + { icon = "__bzcarbon__/graphics/icons/graphite-2.png", icon_size = 128, scale=0.5, shift={32, -32}}) - or (mods["bzsilicon2"] and - { icon = "__bzsilicon2__/graphics/icons/silica.png", + or (mods.bzsilicon and + { icon = "__bzsilicon__/graphics/icons/silica.png", icon_size = 64, scale=1, icon_mipmaps = 3, shift={32, -32}}) - or (mods["bzzirconium2"] and - { icon = "__bzzirconium2__/graphics/icons/zirconia.png", + or (mods.bzzirconium and + { icon = "__bzzirconium__/graphics/icons/zirconia.png", icon_size = 128, scale=0.5, shift={32, -32}}) or (mods.bzaluminum2 and { icon = "__bzaluminum2__/graphics/icons/alumina.png", @@ -154,14 +154,14 @@ if util.me.founding_plates() then name = "advanced-founding-space", icons = { {icon = "__bzfoundry2__/graphics/icons/technology/foundry.png", icon_size = 256}, - (mods["bzcarbon2"] and - { icon = "__bzcarbon2__/graphics/icons/graphite-2.png", + (mods.bzcarbon and + { icon = "__bzcarbon__/graphics/icons/graphite-2.png", icon_size = 128, scale=0.5, shift={32, -32}}) - or (mods["bzsilicon2"] and - { icon = "__bzsilicon2__/graphics/icons/silica.png", + or (mods.bzsilicon and + { icon = "__bzsilicon__/graphics/icons/silica.png", icon_size = 64, scale=1, icon_mipmaps = 3, shift={32, -32}}) - or (mods["bzzirconium2"] and - { icon = "__bzzirconium2__/graphics/icons/zirconia.png", + or (mods.bzzirconium and + { icon = "__bzzirconium__/graphics/icons/zirconia.png", icon_size = 128, scale=0.5, shift={32, -32}}) or (mods.bzaluminum2 and { icon = "__bzaluminum2__/graphics/icons/alumina.png", diff --git a/bzfoundry2/refractory-updates.lua b/bzfoundry2/refractory-updates.lua index 72f9602..b053d8c 100644 --- a/bzfoundry2/refractory-updates.lua +++ b/bzfoundry2/refractory-updates.lua @@ -51,14 +51,14 @@ function make_recipe(recipe) icons = rusty_icons.of(data.raw.recipe[recipe.name]) table.insert( icons, - (mods["bzcarbon2"] and - { icon = "__bzcarbon2__/graphics/icons/graphite-2.png", + (mods.bzcarbon and + { icon = "__bzcarbon__/graphics/icons/graphite-2.png", icon_size = 128, scale=0.125, shift={8, -8}}) - or (mods["bzsilicon2"] and - { icon = "__bzsilicon2__/graphics/icons/silica.png", + or (mods.bzsilicon and + { icon = "__bzsilicon__/graphics/icons/silica.png", icon_size = 64, scale=0.25, icon_mipmaps = 3, shift={8, -8}}) - or (mods["bzzirconium2"] and - { icon = "__bzzirconium2__/graphics/icons/zirconia.png", + or (mods.bzzirconium and + { icon = "__bzzirconium__/graphics/icons/zirconia.png", icon_size = 128, scale=0.125, shift={8, -8}}) or (mods.bzaluminum2 and { icon = "__bzaluminum2__/graphics/icons/alumina.png", @@ -82,9 +82,9 @@ end -- TODO make this more varied and interesting based on reality function get_refractories(recipe, name) local refractories = {} - if mods["bzcarbon2"] then table.insert(refractories, "graphite") end - if mods["bzsilicon2"] then table.insert(refractories, "silica") end - if #refractories < 2 and mods["bzzirconium2"] and name ~= "zirconium-plate-refractory" then table.insert(refractories, "zirconia") end + if mods.bzcarbon then table.insert(refractories, "graphite") end + if mods.bzsilicon then table.insert(refractories, "silica") end + if #refractories < 2 and mods.bzzirconium and name ~= "zirconium-plate-refractory" then table.insert(refractories, "zirconia") end if #refractories < 2 and mods.bzaluminum2 and name ~= "aluminum-plate-refractory" then table.insert(refractories, "alumina") end if #refractories < 2 then table.insert(refractories, "stone-brick") end return refractories @@ -147,7 +147,7 @@ if util.me.founding_plates() then if (name == "steel-plate" or name == "imersium-plate" or name == "tungsten-carbide" or -- exclude base recipe but not casting recipe - (name == "glass" and mods["bztin2"]) or -- exclude glass when tin is in use, thematically + (name == "glass" and mods.bztin) or -- exclude glass when tin is in use, thematically name == "se-naquium-ingot") then goto continue end local new_recipe = make_recipe(recipe ) if new_recipe then diff --git a/sources/thumbnail.xcf b/bzfoundry2/thumbnail.xcf similarity index 100% rename from sources/thumbnail.xcf rename to bzfoundry2/thumbnail.xcf