diff --git a/changelog.txt b/changelog.txt index dab97ac..5fc12dc 100644 --- a/changelog.txt +++ b/changelog.txt @@ -1,4 +1,9 @@ --------------------------------------------------------------------------------------------------- +Version: 0.0.4 +Date: 2021-06-15 + Features: + - FE+ compatibility +--------------------------------------------------------------------------------------------------- Version: 0.0.3 Date: 2021-06-12 Features: diff --git a/data-util.lua b/data-util.lua index 6052685..66f29b7 100644 --- a/data-util.lua +++ b/data-util.lua @@ -7,6 +7,13 @@ function util.get_setting(name) return settings.startup[name].value end + +function util.fe_plus(sub) + if mods["FactorioExtended-Plus-"..sub] then + return true + end +end + function util.use_cermet() return util.get_setting("bzzirconium-enable-intermediates") == "yes" end diff --git a/info.json b/info.json index a7bdc43..354137c 100644 --- a/info.json +++ b/info.json @@ -1,6 +1,6 @@ { "name": "bzzirconium", - "version": "0.0.3", + "version": "0.0.4", "factorio_version": "1.1", "title": "Zirconium", "author": "Brevven", diff --git a/tech-updates.lua b/tech-updates.lua index 0401063..26a58e5 100644 --- a/tech-updates.lua +++ b/tech-updates.lua @@ -9,7 +9,12 @@ util.add_prerequisite("chemical-science-pack", "zirconia-processing") if util.use_cermet() then -- production science techs behind cermet util.add_prerequisite("effect-transmission", "cermet") - util.add_prerequisite("automation-3", "cermet") + if not util.fe_plus("Machines") then + util.add_prerequisite("automation-3", "cermet") + else + util.add_prerequisite("mechanical-engineer", "cermet") + util.add_prerequisite("advanced-oil-processing-3", "cermet") + end util.add_prerequisite("productivity-module-3", "cermet") util.add_prerequisite("speed-module-3", "cermet") util.add_prerequisite("effectivity-module-3", "cermet") diff --git a/zirconium-recipe-updates.lua b/zirconium-recipe-updates.lua index 6fd3764..a80516a 100644 --- a/zirconium-recipe-updates.lua +++ b/zirconium-recipe-updates.lua @@ -33,9 +33,25 @@ if util.use_cermet() then util.add_ingredient("speed-module-3", "cermet", 1) util.add_ingredient("productivity-module-3", "cermet", 1) util.add_ingredient("effectivity-module-3", "cermet", 1) - util.add_ingredient("assembling-machine-3", "cermet", 2) util.add_ingredient("beacon", "cermet", 10) util.add_ingredient("spidertron", "cermet", 8) + if not util.fe_plus("Machines") then + util.add_ingredient("assembling-machine-3", "cermet", 2) + else + util.add_ingredient("assembling-machine-4", "cermet", 2) + util.add_ingredient("assembling-machine-5", "cermet", 2) + util.add_ingredient("chemical-plant-mk3", "cermet", 2) + util.add_ingredient("oil-refinery-mk3", "cermet", 4) + end + +end + +-- More FE+ +if util.fe_plus("Machines") then + util.add_ingredient("electric-furnace-mk2", "zirconia", 10) + util.add_ingredient("electric-furnace-mk3", "zirconia", 10) + util.add_ingredient("oil-refinery-mk2", "zirconia", 10) + util.add_ingredient("pumpjack-mk2", "zirconia", 10) end -- Krastorio2 diff --git a/zirconium-recipe.lua b/zirconium-recipe.lua index c9e44d5..07b626d 100644 --- a/zirconium-recipe.lua +++ b/zirconium-recipe.lua @@ -148,7 +148,8 @@ data:extend({ if util.use_cermet() then local cermet_i = {{"zirconia", 1}, {"copper-plate", 1}} if mods.bztitanium then - table.insert(cermet_i, {"titanium-plate", 1}) + local tutil = require("__bztitanium__.data-util"); + table.insert(cermet_i, {tutil.titanium_plate, 1}) end if mods.bzsilicon then table.insert(cermet_i, {"silica", 1})