diff --git a/aluminum-recipe-modules.lua b/aluminum-recipe-modules.lua index 66f4759..f0d670d 100644 --- a/aluminum-recipe-modules.lua +++ b/aluminum-recipe-modules.lua @@ -1,23 +1,6 @@ --- Enable prod modules for all aluminum plate and ore recipes +local util = require("data-util") -recipes = {"alumina", "aluminum-plate", "aluminum-cable", "acsr-cable", "spark-plug", "aluminum-2219", "aluminum-6061"} -if mods["Krastorio2"] then - table.insert(recipes, "enriched-alumina") - table.insert(recipes, "enriched-aluminum") -end -if mods["space-exploration"] then - table.insert(recipes, "molten-aluminum") - table.insert(recipes, "alumina-smelting-vulcanite") - table.insert(recipes, "aluminum-plate-smelting-vulcanite") - if mods["Krastorio2"] then - table.insert(recipes, "enriched-alumina-smelting-vulcanite") - end -end -if mods.bztitanium then - table.insert(recipes, "ti-sapphire") -end - -for i, recipe in pairs(recipes) do +for i, recipe in pairs(util.me.recipes) do if data.raw.recipe[recipe] then for j, module in pairs(data.raw.module) do if module.effect then diff --git a/changelog.txt b/changelog.txt index 6fe1a8a..f7bd273 100644 --- a/changelog.txt +++ b/changelog.txt @@ -1,4 +1,9 @@ --------------------------------------------------------------------------------------------------- +Version: 0.4.20 +Date: 2022-01-15 + Features: + - Crafting efficiency compatibility +--------------------------------------------------------------------------------------------------- Version: 0.4.19 Date: 2022-12-30 Changes: diff --git a/compatibility/crafting-efficiency.lua b/compatibility/crafting-efficiency.lua new file mode 100644 index 0000000..27b6eff --- /dev/null +++ b/compatibility/crafting-efficiency.lua @@ -0,0 +1,24 @@ +local util = require("data-util"); + +if mods["crafting-efficiency-2"] then + + local eff_data = { + } + + for i, recipe in pairs(util.me.recipes) do + -- add remaining recipes with direct items to find the icons + if data.raw.recipe[recipe] and data.raw.item[recipe] and not eff_data[recipe] and util.get_result_count(recipe) == 1 then + eff_data[recipe] = { + max = 15, + icon = data.raw.item[recipe].icon, + crafting = { efficiency = 10 }, + research = { level = 6 }, + } + end + end + for recipe, d in pairs(eff_data) do + log("Adding "..recipe.." crafting efficiency") + d.name = recipe:gsub("^%l", string.upper).." efficiency" + CE_Add_Recipe(d, recipe) + end +end diff --git a/data-updates.lua b/data-updates.lua index b09b5f0..c1b4a3c 100644 --- a/data-updates.lua +++ b/data-updates.lua @@ -11,6 +11,7 @@ require("strange-matter") require("compatibility/248k") require("compatibility/sciencecosttweakerm") require("compatibility/rsc") +require("compatibility/crafting-efficiency") local util = require("data-util") if data.raw.resource["copper-ore"] then diff --git a/info.json b/info.json index a7deced..36958f7 100644 --- a/info.json +++ b/info.json @@ -1,6 +1,6 @@ { "name": "bzaluminum", - "version": "0.4.19", + "version": "0.4.20", "factorio_version": "1.1", "title": "Aluminum", "author": "Brevven", diff --git a/me.lua b/me.lua index a8336fd..49275ee 100644 --- a/me.lua +++ b/me.lua @@ -3,6 +3,17 @@ local me = {} me.name = "bzaluminum" me.list = {} + +me.recipes = {"alumina", "aluminum-plate", "aluminum-cable", "acsr-cable", "spark-plug", "aluminum-2219", "aluminum-6061", + "enriched-alumina", + "enriched-aluminum", + "molten-aluminum", + "alumina-smelting-vulcanite", + "aluminum-plate-smelting-vulcanite", + "enriched-alumina-smelting-vulcanite", + "ti-sapphire", +} + function me.mod_setting() return me.get_setting("bzmod-setting") == "yes" end