diff --git a/IntermediatesForYou2/changelog.txt b/IntermediatesForYou2/changelog.txt index dab3ffa..397581c 100644 --- a/IntermediatesForYou2/changelog.txt +++ b/IntermediatesForYou2/changelog.txt @@ -1,15 +1,4 @@ --------------------------------------------------------------------------------------------------- -Version: 2.0.4 -Date: 01.11.2025 - Bug Fixes: - - Fix crash when K2 and bzgold are active ---------------------------------------------------------------------------------------------------- -Version: 2.0.3 -Date: 21.10.2025 - Changes: - - Switch to bz mods forks - - Add incompatibility with Space Age ---------------------------------------------------------------------------------------------------- Version: 2.0.2 Date: 13.10.2025 Bug Fixes: diff --git a/IntermediatesForYou2/data-util.lua b/IntermediatesForYou2/data-util.lua index a20f4b8..81def01 100644 --- a/IntermediatesForYou2/data-util.lua +++ b/IntermediatesForYou2/data-util.lua @@ -855,8 +855,8 @@ function util.replace_ingredients_prior_to(tech, old, new, multiplier) end util.remove_prior_unlocks(tech, old) for i, recipe in pairs(data.raw.recipe) do - if (recipe.enabled and recipe.enabled ~= false) - and (not recipe.hidden or recipe.hidden == true) -- probably don't want to change hidden recipes + if (recipe.enabled and recipe.enabled ~= 'false') + and (not recipe.hidden or recipe.hidden == 'true') -- probably don't want to change hidden recipes and string.sub(recipe.name, 1, 3) ~= 'se-' -- have to exlude SE in general :( then -- log("BZZZ due to 'enabled' replacing " .. old .. " with " .. new .." in " .. recipe.name) -- Handy Debug :| diff --git a/IntermediatesForYou2/info.json b/IntermediatesForYou2/info.json index fd7ca4d..f1058ab 100644 --- a/IntermediatesForYou2/info.json +++ b/IntermediatesForYou2/info.json @@ -1,9 +1,8 @@ { "name": "IntermediatesForYou2", - "version": "2.0.4", + "version": "2.0.2", "factorio_version": "2.0", "title": "IntermediatesForYou", - "description": "This mod adds some intermediates and is intented to be played with my other mods.\n\nThis mod is inspired by Brevven's BZ mods.", "author": "Timeken, cackling fiend", "homepage": "https://discord.gg/ufvFUJtVwk", "dependencies": [ @@ -15,15 +14,15 @@ "? BrassTacks-Updated", "? bobassembly", "? BrimStuff-Updated", - "? bzaluminum2", - "? bzcarbon2", - "? bzchlorine2", - "? bzfoundry2", - "? bzgas2", - "? bzgold2", - "? bzlead2", - "? bzsilicon2", - "? bztin2", + "? bzaluminum", + "? bzcarbon", + "? bzchlorine", + "? bzfoundry", + "? bzgas", + "? bzgold", + "? bzlead", + "? bzsilicon", + "? bztin", "? EndgameCombat", "? IfNickel-Updated", "? Nylon2", @@ -34,7 +33,7 @@ "? Repair_Turret", "? space-exploration", "? ShockTurret", - "? ThemTharHills-Updated", - "! space-age" - ] + "? ThemTharHills-Updated" + ], + "description": "This mod adds some intermediates and is intented to be played with my other mods.\n\nThis mod is inspired by Brevven's BZ mods." } \ No newline at end of file diff --git a/IntermediatesForYou2/prototypes/recipes.lua b/IntermediatesForYou2/prototypes/recipes.lua index f3e878f..49a5439 100644 --- a/IntermediatesForYou2/prototypes/recipes.lua +++ b/IntermediatesForYou2/prototypes/recipes.lua @@ -7,60 +7,55 @@ end if mods["Krastorio2"] then local electronic_ingredients = {{type="item", name="kr-electronic-components", amount=3}} - if mods["bzgold2"] then - electronic_ingredients = {{type="item", name="kr-electronic-components", amount=1}, {type="item", name="cpu", amount=1}} - if mods["ThemTharHills-Updated"] then - table.insert(electronic_ingredients, {type="item", name="integrated-circuit", amount=5}) - elseif mods["MDbobelectronics2"] then - table.insert(electronic_ingredients, {type="item", name="intergrated-electronics", amount=2}) - end + if mods["bzgold"] then + electronic_ingredients = {{type="item", name="kr-electronic-components", amount=1}, (mods["ThemTharHills-Updated"] and {type="item", name="integrated-circuit", amount=5}) or (mods["MDbobelectronics2"] and {type="item", name="intergrated-electronics", amount=2}), {type="item", name="cpu", amount=1}} elseif mods["MDbobelectronics2"] then electronic_ingredients = {{type="item", name="kr-electronic-components", amount=1}, {type="item", name="intergrated-electronics", amount=2}, {type="item", name="processing-electronics", amount=1}} end +data:extend({ + { + type = "item", + name = "advanced-electronic-components", + icon = "__IntermediatesForYou2__/graphics/icons/advanced-electronic-components.png", + icon_size = 64, + group = "kr-electronic-components", + subgroup = "intermediate-product", + order = "e03", + stack_size = 100, + }, + { + type = "recipe", + name = "advanced-electronic-components", + category = "crafting", + order = "e03", + enabled = false, + energy_required = 4, + ingredients = electronic_ingredients, + results = {{type="item", name="advanced-electronic-components", amount=2}}, + } +}) +if mods["248k-Redux"] then data:extend({ - { - type = "item", - name = "advanced-electronic-components", - icon = "__IntermediatesForYou2__/graphics/icons/advanced-electronic-components.png", - icon_size = 64, - group = "kr-electronic-components", - subgroup = "intermediate-product", - order = "e03", - stack_size = 100, - }, { type = "recipe", - name = "advanced-electronic-components", - category = "crafting", - order = "e03", + name = "charged-crystal-imersite-powder", + icons = + { + { icon = "__Krastorio2Assets__/icons/items/imersite-powder.png", icon_size = 64}, + { icon = "__248k-Redux-graphics__/ressources/fusion/fu_materials/fu_materials_energy_crystal_charged.png", icon_size = 64, scale=0.3, shift= {-8, -8}}, + }, + category = "kr-crushing", + order = "a-a-a-1", enabled = false, energy_required = 4, - ingredients = electronic_ingredients, - results = {{type="item", name="advanced-electronic-components", amount=2}}, + ingredients = {{type="item", name="fu_materials_energy_charged_crystal", amount=1}}, + results = {{type="item", name="kr-imersite-powder", amount=2}}, } }) - if mods["248k-Redux"] then - data:extend({ - { - type = "recipe", - name = "charged-crystal-imersite-powder", - icons = - { - { icon = "__Krastorio2Assets__/icons/items/imersite-powder.png", icon_size = 64}, - { icon = "__248k-Redux-graphics__/ressources/fusion/fu_materials/fu_materials_energy_crystal_charged.png", icon_size = 64, scale=0.3, shift= {-8, -8}}, - }, - category = "kr-crushing", - order = "a-a-a-1", - enabled = false, - energy_required = 4, - ingredients = {{type="item", name="fu_materials_energy_charged_crystal", amount=1}}, - results = {{type="item", name="kr-imersite-powder", amount=2}}, - } - }) - util.add_unlock("kr-imersium-processing", "charged-crystal-imersite-powder") - end + util.add_unlock("kr-imersium-processing", "charged-crystal-imersite-powder") +end - util.add_unlock("processing-unit", "advanced-electronic-components") +util.add_unlock("processing-unit", "advanced-electronic-components") end local turret_large_base_ingredients = {(data.raw.item["tantalum-titanium-beam"] and {type="item", name="tantalum-titanium-beam", amount=60}) or {type="item", name="steel-plate", amount=60}, {type="item", name="concrete", amount=60}} @@ -72,7 +67,7 @@ local satellite_body_ingredients = {{type="item", name="low-density-structure", if mods["bismuth"] then table.insert(satellite_body_ingredients, {type="item", name="bismuth-glass", amount=100}) end -if mods["bzcarbon2"] then +if mods["bzcarbon"] then table.insert(satellite_body_ingredients, {type="item", name="graphene", amount=100}) end if data.raw.item["gimbaled-thruster"] then @@ -195,12 +190,11 @@ util.add_unlock("logistics", "spring") util.add_unlock("rocket-silo","satellite-body") util.add_unlock("fast-inserter", "shock-absorber") -if mods["bzfoundry2"] and data.raw.item["bronze-plate"] then +if mods["bzfoundry"] and data.raw.item["bronze-plate"] then data:extend({ { type = "recipe", name = "bronze-spring", - localised_name = { "item-name.bronze-spring" }, category = "crafting", order = "s2[spring]", enabled = false, diff --git a/IntermediatesForYou2/recipe-final-fix.lua b/IntermediatesForYou2/recipe-final-fix.lua index 6380420..125f44e 100644 --- a/IntermediatesForYou2/recipe-final-fix.lua +++ b/IntermediatesForYou2/recipe-final-fix.lua @@ -4,14 +4,14 @@ if mods["MDbobelectronics2"] then util.remove_ingredient("advanced-processing-unit", "processing-electronics") end -if (mods["Krastorio2"] and mods["bzgas2"]) or false then - if mods["bzgold2"] then +if (mods["Krastorio2"] and mods["bzgas"]) or false then + if mods["bzgold"] then util.remove_ingredient("chemical-plant", "silver-plate") end - if mods["bzaluminum2"] then + if mods["bzaluminum"] then util.remove_ingredient("kr-filtration-plant", "aluminum-plate") end - if mods["bztin2"] then + if mods["bztin"] then util.remove_ingredient("kr-filtration-plant", "solder") end util.remove_ingredient("kr-filtration-plant", "pipe") diff --git a/IntermediatesForYou2/recipe-modify.lua b/IntermediatesForYou2/recipe-modify.lua index 2d52475..c12f6e1 100644 --- a/IntermediatesForYou2/recipe-modify.lua +++ b/IntermediatesForYou2/recipe-modify.lua @@ -21,9 +21,13 @@ util.add_ingredient("fast-inserter", "shock-absorber", 1) util.add_ingredient("car", "shock-absorber", 4) util.add_ingredient("artillery-turret", "shock-absorber", 10) +util.add_ingredient("stack-filter-inserter", "filter-inserter", 1) +util.remove_ingredient("stack-filter-inserter", "stack-inserter") + -- Mod changes -if mods["bztin2"] then +if mods["bztin"] then util.remove_ingredient("fast-inserter", "bronze-plate") + util.remove_ingredient("filter-inserter", "bronze-plate") if data.raw.item["motorized-articulator"] then util.remove_ingredient("motorized-articulator", "bronze-plate") util.add_ingredient("motorized-articulator", "spring", 2) @@ -34,7 +38,7 @@ if mods["bismuth"] then util.remove_ingredient("satellite", "bismuth-glass") end -if mods["bzcarbon2"] then +if mods["bzcarbon"] then util.remove_ingredient("satellite", "graphene") end @@ -47,7 +51,7 @@ else util.remove_ingredient("gun-turret", "iron-gear-wheel") end -if mods["bzlead2"] then +if mods["bzlead"] then util.remove_ingredient("flamethrower-turret", "lead-plate") util.remove_ingredient("pipe-to-ground", "lead-plate") @@ -100,7 +104,7 @@ if mods["RampantArsenal"] then util.remove_ingredient("suppression-cannon-item-rampant-arsenal", "steel-plate") util.remove_ingredient("suppression-cannon-item-rampant-arsenal", "concrete") util.add_ingredient("suppression-cannon-item-rampant-arsenal", "turret-large-base", 1) - if mods["bzlead2"] then + if mods["bzlead"] then util.remove_ingredient("rapid-cannon-item-rampant-arsenal", "lead-plate") util.remove_ingredient("suppression-cannon-item-rampant-arsenal", "lead-plate") end @@ -115,12 +119,12 @@ if mods["EndgameCombat"] then end --chemical plant -if mods["bzgas2"] then +if mods["bzgas"] then util.remove_ingredient("chemical-plant", "stone-brick") util.remove_ingredient("chemical-plant", "pipe") util.add_ingredient("chemical-plant", "basic-chemical-plant", 1) - if (mods["bzlead2"] and mods["bztin2"]) or false then + if (mods["bzlead"] and mods["bztin"]) or false then util.remove_ingredient("basic-chemical-plant", "tin-plate") util.remove_ingredient("basic-chemical-plant", "lead-plate") util.add_ingredient("basic-chemical-plant", "solder", 8) @@ -167,6 +171,8 @@ if (mods["MDbobelectronics2"] and mods["Krastorio2"]) or false then end if mods["Krastorio2"] then + util.add_ingredient("stack-filter-inserter", "kr-inserter-parts", 4) + if mods["ThemTharHills-Updated"] then util.remove_ingredient("processing-unit", "integrated-circuit") util.remove_ingredient("processing-unit", "cpu") @@ -188,7 +194,7 @@ if mods["Krastorio2"] then util.add_ingredient("kr-rocket-turret", "turret-large-base", 1) util.add_ingredient("kr-railgun-turret", "turret-large-base", 1) util.remove_ingredient("kr-railgun-turret", "steel-beam") - if mods["bzlead2"] then + if mods["bzlead"] then util.remove_ingredient("kr-laser-artillery-turret", "lead-plate") util.remove_ingredient("kr-rocket-turret", "lead-plate") util.remove_ingredient("kr-railgun-turret", "lead-plate") @@ -212,7 +218,7 @@ if mods["space-exploration"] then util.set_ingredient("speed-module-4", "se-iridium-plate", 90) util.add_ingredient("speed-module-4", "elementium-plate", 30) - if mods["bztin2"] then + if mods["bztin"] then util.remove_ingredient("se-space-biochemical-laboratory", "solder") end