diff --git a/changelog.txt b/changelog.txt index 1e32716..8caba1a 100644 --- a/changelog.txt +++ b/changelog.txt @@ -1,4 +1,9 @@ --------------------------------------------------------------------------------------------------- +Version: 2.0.5 +Date: 2024-12-26 + Changes: + - Enable productivity on more recipes +--------------------------------------------------------------------------------------------------- Version: 2.0.4 Date: 2024-12-26 Fixes: diff --git a/data-final-fixes.lua b/data-final-fixes.lua index d4aaee4..dea3d42 100644 --- a/data-final-fixes.lua +++ b/data-final-fixes.lua @@ -12,10 +12,6 @@ require("titanium-recipe-final-k2") require("titanium-recipe-final-rrr") --- Module fixes, including for Krastorio 2 -require("titanium-recipe-modules") - - -- Deadlock's stacking and crating require("titanium-recipe-final-stacking") diff --git a/data-updates.lua b/data-updates.lua index e53258c..eb7fccf 100644 --- a/data-updates.lua +++ b/data-updates.lua @@ -6,4 +6,3 @@ 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 825a8d1..0e2e4bf 100644 --- a/info.json +++ b/info.json @@ -1,6 +1,6 @@ { "name": "bztitanium", - "version": "2.0.4", + "version": "2.0.5", "factorio_version": "2.0", "title": "Titanium", "author": "Brevven", diff --git a/titanium-recipe-modules.lua b/titanium-recipe-modules.lua deleted file mode 100644 index 011bce0..0000000 --- a/titanium-recipe-modules.lua +++ /dev/null @@ -1,33 +0,0 @@ --- Enable prod modules for all titanium plate and ore recipes - -local util = require("data-util"); - --- 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 --- log(serpent.block(module)) --- for effect_name, effect in pairs(module.effect) do --- if effect_name == "productivity" and module.effect.productivity > 0 then --- table.insert(module.limitation, recipe) --- end --- end --- end --- end --- end --- end --- --- --- -- FE+ allows modules for Titanium ore, we can't do that. --- if mods["FactorioExtended-Plus-Core"] then --- for j, module in pairs(data.raw.module) do --- if module.limitation and #module.limitation > 0 then --- for i=1,#module.limitation,1 do --- if module.limitation[i] == "titanium-ore" then --- table.remove(module.limitation, i) --- break --- end --- end --- end --- end --- end diff --git a/titanium-recipe.lua b/titanium-recipe.lua index 27ecb22..a9bcf2a 100644 --- a/titanium-recipe.lua +++ b/titanium-recipe.lua @@ -32,6 +32,7 @@ data:extend({ { icon = "__bztitanium__/graphics/icons/titanium-ore.png", icon_size = 64, icon_mipmaps = 3, scale=0.25, shift= {-8, -8}}, } or nil), enabled = false, + allow_productivity = true, energy_required = mods.Krastorio2 and 16 or 8, ingredients = {util.item("titanium-ore", mods.Krastorio2 and 10 or (mods["space-age"] and 10 or 5))}, results = {mods.Krastorio2 and {type="item", name= util.me.titanium_plate, amount_min=2, amount_max=3} or util.item(util.me.titanium_plate)}, @@ -109,6 +110,7 @@ data:extend({ { icon = "__base__/graphics/icons/stone.png", icon_size = 64, scale = 0.25, shift = {-8, -8}}, }, enabled = false, + allow_productivity = true, energy_required = 1, ingredients = {util.item("stone", 3), util.fluid("sulfuric-acid", 10)}, results = {util.item("titanium-ore")}, @@ -125,6 +127,7 @@ data:extend({ { icon = "__bztitanium__/graphics/icons/titanium-plate.png", icon_size = 64, scale=0.25, icon_mipmaps = 3, shift = {-8, -8}}, }, enabled = false, + allow_productivity = true, energy_required = 2, ingredients = {util.item("titanium-plate")}, results = { @@ -145,6 +148,7 @@ data:extend({ util.vacuum_icon_small, }, enabled = false, + allow_productivity = true, energy_required = 2, ingredients = { util.item("titanium-ore", 2),