diff --git a/changelog.txt b/changelog.txt index 5608790..ea9686d 100644 --- a/changelog.txt +++ b/changelog.txt @@ -1,4 +1,9 @@ --------------------------------------------------------------------------------------------------- +Version: 1.2.11 +Date: 2022-01-15 + Features: + - Crafting efficiency compatibility +--------------------------------------------------------------------------------------------------- Version: 1.2.10 Date: 2022-12-27 Fixes: 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 19f61ed..e53258c 100644 --- a/data-updates.lua +++ b/data-updates.lua @@ -5,4 +5,5 @@ require("omni") require("map-gen-preset-updates") require("strange-matter") require("compatibility/248k") +require("compatibility/crafting-efficiency") require("titanium-recipe-modules") diff --git a/info.json b/info.json index 83bc912..6d7ac2c 100644 --- a/info.json +++ b/info.json @@ -1,6 +1,6 @@ { "name": "bztitanium", - "version": "1.2.10", + "version": "1.2.11", "factorio_version": "1.1", "title": "Titanium", "author": "Brevven", diff --git a/me.lua b/me.lua index c2dac18..a201eef 100644 --- a/me.lua +++ b/me.lua @@ -10,6 +10,13 @@ else me.titanium_plate = "titanium-plate" end +me.recipes = {me.titanium_plate, + "enriched-titanium-plate", + "enriched-titanium", + "titanium-smelting-vulcanite", + "molten-titanium", + "enriched-titanium-smelting-vulcanite"} + if mods["pyrawores"] then me.titanium_processing = "titanium-mk01" else diff --git a/titanium-recipe-modules.lua b/titanium-recipe-modules.lua index ed32051..4cfb793 100644 --- a/titanium-recipe-modules.lua +++ b/titanium-recipe-modules.lua @@ -1,22 +1,8 @@ -- Enable prod modules for all titanium plate and ore recipes -local util = require("__bztitanium__.data-util"); +local util = require("data-util"); -local recipes = {util.me.titanium_plate} - -if mods["Krastorio2"] then - table.insert(recipes, "enriched-titanium-plate") - table.insert(recipes, "enriched-titanium") -end -if mods["space-exploration"] then - table.insert(recipes, "titanium-smelting-vulcanite") - table.insert(recipes, "molten-titanium") - if mods["Krastorio2"] then - table.insert(recipes, "enriched-titanium-smelting-vulcanite") - end -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