diff --git a/MDbobelectronics2/changelog.txt b/MDbobelectronics2/changelog.txt index a1864b9..8b0d1ae 100644 --- a/MDbobelectronics2/changelog.txt +++ b/MDbobelectronics2/changelog.txt @@ -1,4 +1,31 @@ --------------------------------------------------------------------------------------------------- +Version: 4.0.7 +Date: 21.10.2025 + Bug Fixes: + - Fix crash due to result_count +--------------------------------------------------------------------------------------------------- +Version: 4.0.6 +Date: 21.10.2025 + Changes: + - Switch to bz mods forks +--------------------------------------------------------------------------------------------------- +Version: 4.0.5 +Date: 16.10.2025 + Bug Fixes: + - Increase mod compatibility +--------------------------------------------------------------------------------------------------- +Version: 4.0.4 +Date: 13.10.2025 + Bug Fixes: + - Increase mod compatibility +--------------------------------------------------------------------------------------------------- +Version: 4.0.3 +Date: 11.10.2025 + Changes: + - Mark Space Age as incompatible + Bug Fixes: + - Increase mod compatibility +--------------------------------------------------------------------------------------------------- Version: 4.0.2 Date: 07.10.2025 Changes: diff --git a/MDbobelectronics2/info.json b/MDbobelectronics2/info.json index 81e0de1..9f5c926 100644 --- a/MDbobelectronics2/info.json +++ b/MDbobelectronics2/info.json @@ -1,11 +1,11 @@ { "name": "MDbobelectronics2", - "version": "4.0.2", + "version": "4.0.7", "factorio_version": "2.0", "title": "Bob's Electronics SE KR for 2.0", + "description": "(Space Exploration and Krastorio edition) Requires Bob's functions library mod.\n\nThis mod changes the way you build electronics, making the process more realistic.\nFirst you have to assemble electronic components, then combine them into circuit boards.\nOptional setting for the following: 'unlike in the base game, each tier of circuit board does NOT require the previous tier.'\nIt also adds a 4th tier of electronics used for high end machinery.\n\nAlthough it can work by itself, it is designed to function best with krastorio and space exploration.", "author": "Bobingabout, MdRuz, cackling fiend, Kejser Kagespiser", - "contact": "", - "homepage": "https://forums.factorio.com/viewtopic.php?f=190&t=95748", + "homepage": "https://discord.gg/ufvFUJtVwk", "dependencies": [ "base >= 2.0.0", "boblibrary >= 2.0.1", @@ -13,11 +13,11 @@ "? space-exploration >= 0.7.34", "? space-exploration-postprocess >= 0.7.4", "? aai-industry >= 0.6.13", - "? bzsilicon >= 2.0.18", - "? bzlead >= 2.0.28", - "? bztitanium >= 2.0.26", + "? bzsilicon2 >= 2.0.19", + "? bzlead2 >= 2.0.29", + "? bztitanium2 >= 2.0.27", "? Krastorio2 >= 2.0.8", - "! bobelectronics" - ], - "description": "(Space Exploration and Krastorio edition) Requires Bob's functions library mod.\n\nThis mod changes the way you build electronics, making the process more realistic.\nFirst you have to assemble electronic components, then combine them into circuit boards.\nOptional setting for the following: 'unlike in the base game, each tier of circuit board does NOT require the previous tier.'\nIt also adds a 4th tier of electronics used for high end machinery.\n\nAlthough it can work by itself, it is designed to function best with krastorio and space exploration." -} + "! bobelectronics", + "! space-age" + ] +} \ No newline at end of file diff --git a/MDbobelectronics2/prototypes/MDrecipes.lua b/MDbobelectronics2/prototypes/MDrecipes.lua index 020fa30..211d69c 100644 --- a/MDbobelectronics2/prototypes/MDrecipes.lua +++ b/MDbobelectronics2/prototypes/MDrecipes.lua @@ -7,7 +7,7 @@ if mods["space-exploration"] then if mods["Krastorio2"] then bobmods.lib.recipe.remove_result("se-recycle-radar", "electronic-circuit") - bobmods.lib.recipe.add_result("se-recycle-radar", "automation-core") + bobmods.lib.recipe.add_result("se-recycle-radar", "kr-automation-core") else @@ -20,13 +20,11 @@ end --insulated-cable -if mods["bzsilicon"] then +if mods["bzsilicon2"] then bobmods.lib.recipe.add_ingredient("optical-fiber", {type="item", name="insulated-cable", amount=1}) --seems that new version of bzsilicon adds this ingredient which interfears - if data.raw.item["silicon"] then - bobmods.lib.recipe.remove_ingredient("processing-unit", "silicon") - end + bobmods.lib.recipe.remove_ingredient("processing-unit", mods["Krastorio2"] and "kr-silicon" or "silicon") end ------------------------------------------------------------------------------------------------------------------------------------------------ @@ -105,10 +103,10 @@ end if mods["Krastorio2"] then -bobmods.lib.recipe.add_ingredient("advanced-circuit", {type="item", name="electronic-components", amount=2}) -bobmods.lib.recipe.add_ingredient("advanced-processing-unit", {type="item", name="rare-metals", amount=5}) +bobmods.lib.recipe.add_ingredient("advanced-circuit", {type="item", name="kr-electronic-components", amount=2}) +bobmods.lib.recipe.add_ingredient("advanced-processing-unit", {type="item", name="kr-rare-metals", amount=5}) bobmods.lib.recipe.add_ingredient("advanced-processing-unit", {type="item", name="processing-electronics", amount=2}) -bobmods.lib.recipe.add_ingredient("advanced-processing-unit", {type="fluid", name="nitric-acid", amount=10}) +bobmods.lib.recipe.add_ingredient("advanced-processing-unit", {type="fluid", name="kr-nitric-acid", amount=10}) bobmods.lib.recipe.add_ingredient("kr-advanced-assembling-machine", {"advanced-processing-unit", amount=2}) bobmods.lib.recipe.add_ingredient("kr-advanced-furnace", {"advanced-processing-unit", amount=5}) @@ -161,10 +159,10 @@ if data.raw.item["se-processing-unit-holmium"] then data.raw.item["se-processing end --progression fix for krastorio: -if data.raw.fluid["hydrogen-chloride"] then +if data.raw.fluid["kr-hydrogen-chloride"] then -bobmods.lib.tech.add_recipe_unlock("kr-fluids-chemistry", "hydrogen-chloride") -bobmods.lib.tech.remove_recipe_unlock("kr-advanced-chemistry", "hydrogen-chloride") +bobmods.lib.tech.add_recipe_unlock("kr-fluids-chemistry", "kr-hydrogen-chloride") +bobmods.lib.tech.remove_recipe_unlock("kr-advanced-chemistry", "kr-hydrogen-chloride") end diff --git a/MDbobelectronics2/prototypes/recipe-updates.lua b/MDbobelectronics2/prototypes/recipe-updates.lua index ce3c06a..63a7db1 100644 --- a/MDbobelectronics2/prototypes/recipe-updates.lua +++ b/MDbobelectronics2/prototypes/recipe-updates.lua @@ -16,8 +16,8 @@ for i, recipe in pairs(data.raw.recipe) do end -if data.raw.fluid["hydrogen-chloride"] then - bobmods.lib.recipe.replace_ingredient("ferric-chloride-solution", "water", "hydrogen-chloride") +if data.raw.fluid["kr-hydrogen-chloride"] then + bobmods.lib.recipe.replace_ingredient("ferric-chloride-solution", "water", "kr-hydrogen-chloride") end if data.raw.item["tinned-copper-cable"] then @@ -28,10 +28,9 @@ if data.raw.item["tinned-copper-cable"] then end if data.raw.item["carbon"] then - bobmods.lib.recipe.replace_ingredient("basic-electronic-components", "coal", "carbon") -elseif data.raw.item["coke"] then - bobmods.lib.recipe.replace_ingredient("basic-electronic-components", "coal", "coke") +elseif data.raw.item[mods["Krastorio2"] and "kr-coke" or "coke"] then + bobmods.lib.recipe.replace_ingredient("basic-electronic-components", "coal", mods["Krastorio2"] and "kr-coke" or "coke") end if data.raw.item["silicon-wafer"] then @@ -39,10 +38,10 @@ if data.raw.item["silicon-wafer"] then bobmods.lib.recipe.add_ingredient("intergrated-electronics", {type="item", name="silicon-wafer", amount=4}) bobmods.lib.recipe.add_ingredient("processing-electronics", {type="item", name="silicon-wafer", amount=6}) else - if data.raw.item["silicon"] then - bobmods.lib.recipe.add_ingredient("BOBMD-electronic-components", {type="item", name="silicon", amount=1}) - bobmods.lib.recipe.add_ingredient("intergrated-electronics", {type="item", name="silicon", amount=2}) - bobmods.lib.recipe.add_ingredient("processing-electronics", {type="item", name="silicon", amount=3}) + if data.raw.item[mods["Krastorio2"] and "kr-silicon" or "silicon"] then + bobmods.lib.recipe.add_ingredient("BOBMD-electronic-components", {type="item", name=mods["Krastorio2"] and "kr-silicon" or "silicon", amount=1}) + bobmods.lib.recipe.add_ingredient("intergrated-electronics", {type="item", name=mods["Krastorio2"] and "kr-silicon" or "silicon", amount=2}) + bobmods.lib.recipe.add_ingredient("processing-electronics", {type="item", name=mods["Krastorio2"] and "kr-silicon" or "silicon", amount=3}) else bobmods.lib.recipe.add_ingredient("BOBMD-electronic-components", {type="item", name="copper-plate", amount=1}) bobmods.lib.recipe.add_ingredient("intergrated-electronics", {type="item", name="copper-plate", amount=2}) @@ -66,8 +65,8 @@ if data.raw.item["silicon-nitride"] then bobmods.lib.recipe.replace_ingredient("processing-electronics", "plastic-bar", "silicon-nitride") end -if data.raw.item["glass"] then - bobmods.lib.recipe.add_ingredient("fibreglass-board", {type="item", name="glass", amount=1}) +if data.raw.item[mods["Krastorio2"] and "kr-glass" or "glass"] then + bobmods.lib.recipe.add_ingredient("fibreglass-board", {type="item", name=mods["Krastorio2"] and "kr-glass" or "glass", amount=1}) else bobmods.lib.recipe.add_ingredient("fibreglass-board", {type="item", name="plastic-bar", amount=1}) end diff --git a/MDbobelectronics2/prototypes/resource.lua b/MDbobelectronics2/prototypes/resource.lua index 29592a5..b7ed173 100644 --- a/MDbobelectronics2/prototypes/resource.lua +++ b/MDbobelectronics2/prototypes/resource.lua @@ -1,5 +1,4 @@ -data:extend( -{ +data:extend({ { type = "item", name = "resin", @@ -9,21 +8,18 @@ data:extend( order = "f[resin]", stack_size = 100 }, - { type = "recipe", name = "bob-resin-wood", category = "crafting-machine", subgroup = "bob-resource-chemical", energy_required = 1, - ingredients = - { - { type = "item", name = "wood", amount = 1}, + ingredients = { + { type = "item", name = "wood", amount = 1 }, }, - results = {{type="item", name="resin", amount=1}}, + results = { { type = "item", name = "resin", amount = 1 } }, allow_decomposition = false }, - { type = "recipe", name = "bob-resin-oil", @@ -31,25 +27,21 @@ data:extend( subgroup = "bob-resource-chemical", energy_required = 1, enabled = false, - ingredients = - { - {type="fluid", name="heavy-oil", amount=10}, + ingredients = { + { type = "fluid", name = "heavy-oil", amount = 10 }, }, - results = {{type="item", name="resin", amount=1}}, - crafting_machine_tint = - { - primary = {r = 0.5, g = 0.04, b = 0.0, a = 0.000}, - secondary = {r = 0.85, g = 0.6, b = 0.3, a = 0.000}, - tertiary = {r = 1, g = 0.6, b = 0.0, a = 0.000}, + results = { { type = "item", name = "resin", amount = 1 } }, + crafting_machine_tint = { + primary = { r = 0.5, g = 0.04, b = 0.0, a = 0.000 }, + secondary = { r = 0.85, g = 0.6, b = 0.3, a = 0.000 }, + tertiary = { r = 1, g = 0.6, b = 0.0, a = 0.000 }, }, allow_decomposition = false }, -} -) +}) -data:extend( -{ +data:extend({ { type = "item", name = "rubber", @@ -59,28 +51,24 @@ data:extend( order = "f[rubber]", stack_size = 100 }, - { type = "recipe", name = "bob-rubber", subgroup = "bob-resource-chemical", category = "smelting", energy_required = 3.5, - ingredients = - { + ingredients = { { type = "item", name = "resin", amount = 1 }, }, - results = {{type="item", name="rubber", amount=1}}, + results = { { type = "item", name = "rubber", amount = 1 } }, allow_decomposition = false }, -} -) +}) if not data.raw.item["silicon-wafer"] then - if data.raw.item["silicon"] or data.raw.item["silicon-plate"] then - data:extend( - { + if data.raw.item["kr-silicon"] or data.raw.item["silicon"] or data.raw.item["silicon-plate"] then + data:extend({ { type = "item", name = "silicon-wafer", @@ -90,34 +78,30 @@ if not data.raw.item["silicon-wafer"] then order = "f[silicon-wafer]", stack_size = 200 }, - { type = "recipe", name = "silicon-wafer", category = "crafting-machine", enabled = false, energy_required = 5, - ingredients = - { - }, - results = {{type="item", name="silicon-wafer", amount=1}}, - result_count = 8 - }, - } - ) + ingredients = {}, + results = { { type = "item", name = "silicon-wafer", amount = 8 } }, + } + }) - if data.raw.item["silicon"] then - table.insert(data.raw.recipe["silicon-wafer"].ingredients ,{type="item", name="silicon", amount=1}) + if data.raw.item["kr-silicon"] then + table.insert(data.raw.recipe["silicon-wafer"].ingredients, { type = "item", name = "kr-silicon", amount = 1 }) + elseif data.raw.item["silicon"] then + table.insert(data.raw.recipe["silicon-wafer"].ingredients, { type = "item", name = "silicon", amount = 1 }) else - table.insert(data.raw.recipe["silicon-wafer"].ingredients ,{type="item", name="silicon-plate", amount=1}) + table.insert(data.raw.recipe["silicon-wafer"].ingredients, { type = "item", name = "silicon-plate", amount = 1 }) end end end if data.raw.item["tin-plate"] then - data:extend( - { + data:extend({ { type = "item", name = "solder-alloy", @@ -127,46 +111,39 @@ if data.raw.item["tin-plate"] then order = "c-b-h[solder]", stack_size = 200 }, - { type = "recipe", name = "solder-alloy", energy_required = 7, enabled = false, category = "crafting-machine", - ingredients = - { - {type="item", name="tin-plate", amount=9}, - {type="item", name="copper-plate", amount=1}, + ingredients = { + { type = "item", name = "tin-plate", amount = 9 }, + { type = "item", name = "copper-plate", amount = 1 }, }, - results = {{type="item", name="solder-alloy", amount=11}}, + results = { { type = "item", name = "solder-alloy", amount = 11 } }, allow_decomposition = false }, - } - ) + }) if data.raw.item["silver-plate"] then - table.insert(data.raw.recipe["solder-alloy"].ingredients,{type="item", name="silver-plate", amount=1}) + table.insert(data.raw.recipe["solder-alloy"].ingredients, { type = "item", name = "silver-plate", amount = 1 }) end if data.raw.item["lead-plate"] then - data:extend( - { + data:extend({ { type = "recipe", name = "solder-alloy-lead", energy_required = 7, enabled = false, category = "crafting-machine", - ingredients = - { - {type="item", name="tin-plate", amount=4}, - {type="item", name="lead-plate", amount=7}, + ingredients = { + { type = "item", name = "tin-plate", amount = 4 }, + { type = "item", name = "lead-plate", amount = 7 }, }, - results = {{type="item", name="solder-alloy", amount=11}}, + results = { { type = "item", name = "solder-alloy", amount = 11 } }, allow_decomposition = false }, - } - ) + }) end end -