diff --git a/MDbobelectronics2/changelog.txt b/MDbobelectronics2/changelog.txt index 7d032d7..52ce0d6 100644 --- a/MDbobelectronics2/changelog.txt +++ b/MDbobelectronics2/changelog.txt @@ -1,44 +1,4 @@ --------------------------------------------------------------------------------------------------- -Version: 4.0.8 -Date: 08.11.2025 - Bug Fixes: - - Fix recipe names - - Fix recipes for K2 and SE ---------------------------------------------------------------------------------------------------- -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: - - Changed Rocket Control Unit to be conditional (by Kejser Kagespiser) - Bug Fixes: - - Fix ingredient of bob-resin-wood ---------------------------------------------------------------------------------------------------- Version: 4.0.1 Date: 05.10.2025 Bug Fixes: diff --git a/MDbobelectronics2/info.json b/MDbobelectronics2/info.json index 8376711..4134797 100644 --- a/MDbobelectronics2/info.json +++ b/MDbobelectronics2/info.json @@ -1,11 +1,11 @@ { "name": "MDbobelectronics2", - "version": "4.0.8", + "version": "4.0.1", "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", - "homepage": "https://discord.gg/ufvFUJtVwk", + "contact": "", + "homepage": "https://forums.factorio.com/viewtopic.php?f=190&t=95748", "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", - "? bzsilicon2 >= 2.0.19", - "? bzlead2 >= 2.0.29", - "? bztitanium2 >= 2.0.27", + "? bzsilicon >= 2.0.18", + "? bzlead >= 2.0.28", + "? bztitanium >= 2.0.26", "? Krastorio2 >= 2.0.8", - "! bobelectronics", - "! space-age" - ] -} \ No newline at end of file + "! 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." +} diff --git a/MDbobelectronics2/prototypes/MDrecipes.lua b/MDbobelectronics2/prototypes/MDrecipes.lua index 827cf1d..020fa30 100644 --- a/MDbobelectronics2/prototypes/MDrecipes.lua +++ b/MDbobelectronics2/prototypes/MDrecipes.lua @@ -1,161 +1,179 @@ + + + + --recycling doesnt detect recipe change, doing it manually 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", "kr-automation-core") - else - bobmods.lib.recipe.remove_result("se-recycle-radar", "electronic-circuit") - bobmods.lib.recipe.add_result("se-recycle-radar", { type = "item", name = "basic-circuit-board", amount = 6 }) - end - --fix for krastorio/spaceex radar recipe glitch + + if mods["Krastorio2"] then + bobmods.lib.recipe.remove_result("se-recycle-radar", "electronic-circuit") + bobmods.lib.recipe.add_result("se-recycle-radar", "automation-core") + + else + + bobmods.lib.recipe.remove_result("se-recycle-radar", "electronic-circuit") + bobmods.lib.recipe.add_result("se-recycle-radar", {type="item", name="basic-circuit-board", amount=6}) + end +--fix for krastorio/spaceex radar recipe glitch end + + --insulated-cable -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 - bobmods.lib.recipe.remove_ingredient("processing-unit", mods["Krastorio2"] and "kr-silicon" or "silicon") +if mods["bzsilicon"] 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 end ------------------------------------------------------------------------------------------------------------------------------------------------ + + if settings.startup["bobmods-recursive-circuitred"].value == true then - if mods["space-exploration"] and not mods["Krastorio2"] then - bobmods.lib.recipe.set_ingredient("advanced-circuit", { type = "item", name = "electronic-circuit", amount = 2 }) +if mods["space-exploration"] and not mods["Krastorio2"] then - bobmods.lib.recipe.set_ingredient("processing-unit", { type = "item", name = "advanced-circuit", amount = 2 }) - bobmods.lib.recipe.set_ingredient("processing-unit", { type = "item", name = "electronic-circuit", amount = 20 }) +bobmods.lib.recipe.set_ingredient("advanced-circuit", {type="item", name="electronic-circuit", amount=2}) - bobmods.lib.recipe.set_ingredient("se-processing-unit-holmium", { type = "item", name = "advanced-circuit", amount = 1 }) - bobmods.lib.recipe.set_ingredient("se-processing-unit-holmium", { type = "item", name = "electronic-circuit", amount = 10 }) +bobmods.lib.recipe.set_ingredient("processing-unit", {type="item", name="advanced-circuit", amount=2}) +bobmods.lib.recipe.set_ingredient("processing-unit", {type="item", name="electronic-circuit", amount=20}) - bobmods.lib.recipe.set_ingredient("advanced-processing-unit", { type = "item", name = "processing-unit", amount = 1 }) - end +bobmods.lib.recipe.set_ingredient("se-processing-unit-holmium", {type="item", name="advanced-circuit", amount=1}) +bobmods.lib.recipe.set_ingredient("se-processing-unit-holmium", {type="item", name="electronic-circuit", amount=10}) + +bobmods.lib.recipe.set_ingredient("advanced-processing-unit", {type="item", name="processing-unit", amount=1}) +end + +if mods["Krastorio2"] and not mods["space-exploration"] then + +bobmods.lib.recipe.set_ingredient("advanced-circuit", {type="item", name="electronic-circuit", amount=4}) +bobmods.lib.recipe.set_ingredient("processing-unit", {type="item", name="advanced-circuit", amount=6}) +bobmods.lib.recipe.set_ingredient("advanced-processing-unit", {type="item", name="processing-unit", amount=1}) +end + +if mods["Krastorio2"] and mods["space-exploration"] then + +bobmods.lib.recipe.set_ingredient("advanced-circuit", {type="item", name="electronic-circuit", amount=4}) + +bobmods.lib.recipe.set_ingredient("processing-unit", {type="item", name="advanced-circuit", amount=6}) +bobmods.lib.recipe.set_ingredient("se-processing-unit-holmium", {type="item", name="advanced-circuit", amount=3}) + +bobmods.lib.recipe.set_ingredient("advanced-processing-unit", {type="item", name="processing-unit", amount=1}) +end + +if not mods["Krastorio2"] and not mods["space-exploration"] then +bobmods.lib.recipe.set_ingredient("advanced-circuit", {type="item", name="electronic-circuit", amount=2}) + +bobmods.lib.recipe.set_ingredient("processing-unit", {type="item", name="advanced-circuit", amount=2}) +bobmods.lib.recipe.set_ingredient("processing-unit", {type="item", name="electronic-circuit", amount=20}) + +bobmods.lib.recipe.set_ingredient("advanced-processing-unit", {type="item", name="processing-unit", amount=1}) +end + + +--change results +if mods["Krastorio2"] then +--bobmods.lib.recipe.set_result("electronic-circuit", {type="item", name="electronic-circuit", amount=1}) +bobmods.lib.recipe.set_result("advanced-circuit", {type="item", name="advanced-circuit", amount=2}) +bobmods.lib.recipe.set_result("processing-unit", {type="item", name="processing-unit", amount=2}) +bobmods.lib.recipe.set_result("se-processing-unit-holmium", {type="item", name="processing-unit", amount=2}) +end + + +--if not then make sure to remove +else + +bobmods.lib.recipe.remove_ingredient("advanced-circuit", "electronic-circuit") + +bobmods.lib.recipe.remove_ingredient("processing-unit", "advanced-circuit") +bobmods.lib.recipe.remove_ingredient("processing-unit", "electronic-circuit") + +bobmods.lib.recipe.remove_ingredient("se-processing-unit-holmium", "advanced-circuit") +bobmods.lib.recipe.remove_ingredient("se-processing-unit-holmium", "electronic-circuit") + +--just in case go back to 1 result +bobmods.lib.recipe.set_result("advanced-circuit", {type="item", name="advanced-circuit", amount=1}) +bobmods.lib.recipe.set_result("processing-unit", {type="item", name="processing-unit", amount=1}) + +if mods["space-exploration"] and not mods["Krastorio2"] then bobmods.lib.recipe.set_result("se-processing-unit-holmium", {type="item", name="processing-unit", amount=2}) end - if mods["Krastorio2"] and not mods["space-exploration"] then - bobmods.lib.recipe.set_ingredient("advanced-circuit", { type = "item", name = "electronic-circuit", amount = 4 }) - bobmods.lib.recipe.set_ingredient("processing-unit", { type = "item", name = "advanced-circuit", amount = 6 }) - bobmods.lib.recipe.set_ingredient("advanced-processing-unit", { type = "item", name = "processing-unit", amount = 1 }) - end - - if mods["Krastorio2"] and mods["space-exploration"] then - bobmods.lib.recipe.set_ingredient("advanced-circuit", { type = "item", name = "electronic-circuit", amount = 4 }) - - bobmods.lib.recipe.set_ingredient("processing-unit", { type = "item", name = "advanced-circuit", amount = 6 }) - bobmods.lib.recipe.set_ingredient("se-processing-unit-holmium", { type = "item", name = "advanced-circuit", amount = 3 }) - - bobmods.lib.recipe.set_ingredient("advanced-processing-unit", { type = "item", name = "processing-unit", amount = 1 }) - end - - if not mods["Krastorio2"] and not mods["space-exploration"] then - bobmods.lib.recipe.set_ingredient("advanced-circuit", { type = "item", name = "electronic-circuit", amount = 2 }) - - bobmods.lib.recipe.set_ingredient("processing-unit", { type = "item", name = "advanced-circuit", amount = 2 }) - bobmods.lib.recipe.set_ingredient("processing-unit", { type = "item", name = "electronic-circuit", amount = 20 }) - - bobmods.lib.recipe.set_ingredient("advanced-processing-unit", { type = "item", name = "processing-unit", amount = 1 }) - end - - --change results - if mods["Krastorio2"] then - bobmods.lib.recipe.set_result("electronic-circuit", { type = "item", name = "electronic-circuit", amount = 1 }) - bobmods.lib.recipe.set_result("advanced-circuit", { type = "item", name = "advanced-circuit", amount = 2 }) - bobmods.lib.recipe.set_result("processing-unit", { type = "item", name = "processing-unit", amount = 2 }) - bobmods.lib.recipe.set_result("se-processing-unit-holmium", { type = "item", name = "processing-unit", amount = 2 }) - end - - - --if not then make sure to remove -else - bobmods.lib.recipe.remove_ingredient("advanced-circuit", "electronic-circuit") - - bobmods.lib.recipe.remove_ingredient("processing-unit", "advanced-circuit") - bobmods.lib.recipe.remove_ingredient("processing-unit", "electronic-circuit") - - bobmods.lib.recipe.remove_ingredient("se-processing-unit-holmium", "advanced-circuit") - bobmods.lib.recipe.remove_ingredient("se-processing-unit-holmium", "electronic-circuit") - - --just in case go back to 1 result - bobmods.lib.recipe.set_result("advanced-circuit", { type = "item", name = "advanced-circuit", amount = 1 }) - bobmods.lib.recipe.set_result("processing-unit", { type = "item", name = "processing-unit", amount = 1 }) - - if mods["space-exploration"] and not mods["Krastorio2"] then - bobmods.lib.recipe.set_result("se-processing-unit-holmium", { type = "item", name = "processing-unit", amount = 2 }) - end end -data.raw.recipe["electronic-circuit"].ingredients = { - { type = "item", name = "basic-circuit-board", amount = 1 }, - { type = "item", name = "basic-electronic-components", amount = 5 } -} if mods["Krastorio2"] then - bobmods.lib.recipe.remove_ingredient("advanced-circuit", "copper-cable") - bobmods.lib.recipe.set_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 = "kr-nitric-acid", amount = 10 }) +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-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("kr-advanced-assembling-machine", { "advanced-processing-unit", amount = 2 }) - bobmods.lib.recipe.add_ingredient("kr-advanced-furnace", { "advanced-processing-unit", amount = 5 }) +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}) end + + + + + + + + + ------------------------------------------------------------------------------------------------------------------------------------------------ +--add circuits to recipes if mods["space-exploration"] then - data.raw.recipe["electronic-circuit-wood"].hidden = true - bobmods.lib.recipe.add_ingredient("electronic-circuit", { type = "item", name = "stone-tablet", amount = 1 }) - --add circuits to recipes - bobmods.lib.recipe.add_ingredient("se-processing-unit-holmium", { type = "item", name = "basic-electronic-components", amount = 1 }) - bobmods.lib.recipe.add_ingredient("se-processing-unit-holmium", { type = "item", name = "BOBMD-electronic-components", amount = 2 }) - bobmods.lib.recipe.add_ingredient("se-processing-unit-holmium", { type = "item", name = "intergrated-electronics", amount = 1 }) - bobmods.lib.recipe.add_ingredient("se-processing-unit-holmium", { type = "item", name = "superior-circuit-board", amount = 1 }) - bobmods.lib.recipe.add_ingredient("processing-unit", { type = "fluid", name = "sulfuric-acid", amount = 4 }) +bobmods.lib.recipe.add_ingredient("se-processing-unit-holmium", {type="item", name="basic-electronic-components", amount=1}) +bobmods.lib.recipe.add_ingredient("se-processing-unit-holmium", {type="item", name="BOBMD-electronic-components", amount=2}) +bobmods.lib.recipe.add_ingredient("se-processing-unit-holmium", {type="item", name="intergrated-electronics", amount=1}) +bobmods.lib.recipe.add_ingredient("se-processing-unit-holmium", {type="item", name="superior-circuit-board", amount=1}) +bobmods.lib.recipe.add_ingredient("processing-unit", {type="fluid", name="sulfuric-acid", amount=4}) - bobmods.lib.recipe.add_ingredient("se-space-assembling-machine", { "advanced-processing-unit", amount = 2 }) - bobmods.lib.recipe.replace_ingredient("se-spaceship-console", "processing-unit", "advanced-processing-unit") - bobmods.lib.recipe.add_ingredient("se-space-supercomputer-2", { "advanced-processing-unit", amount = 150 }) - bobmods.lib.recipe.replace_ingredient("se-space-supercomputer-3", "processing-unit", "advanced-processing-unit") - --Force circuits back to my own tab - if data.raw.item["electronic-circuit"] then - data.raw.item["electronic-circuit"].subgroup = "bob-electronic-boards" - end - if data.raw.item["advanced-circuit"] then - data.raw.item["advanced-circuit"].subgroup = "bob-electronic-boards" - end - if data.raw.item["processing-unit"] then - data.raw.item["processing-unit"].subgroup = "bob-electronic-boards" - end - if data.raw.item["se-processing-unit-holmium"] then - data.raw.item["se-processing-unit-holmium"].subgroup = "bob-electronic-boards" - end +bobmods.lib.recipe.add_ingredient("se-space-assembling-machine", {"advanced-processing-unit", amount=2}) +bobmods.lib.recipe.replace_ingredient("se-spaceship-console", "processing-unit", "advanced-processing-unit") +bobmods.lib.recipe.add_ingredient("se-space-supercomputer-2", {"advanced-processing-unit", amount=150}) +bobmods.lib.recipe.replace_ingredient("se-space-supercomputer-3", "processing-unit", "advanced-processing-unit") + + +--SE 0.6 it no longer makes sense +--[[ +bobmods.lib.recipe.replace_ingredient("speed-module-6", "processing-unit", "advanced-processing-unit") +bobmods.lib.recipe.replace_ingredient("speed-module-7", "processing-unit", "advanced-processing-unit") +bobmods.lib.recipe.replace_ingredient("productivity-module-6", "processing-unit", "advanced-processing-unit") +bobmods.lib.recipe.replace_ingredient("productivity-module-7", "processing-unit", "advanced-processing-unit") +bobmods.lib.recipe.replace_ingredient("effectivity-module-6", "processing-unit", "advanced-processing-unit") +bobmods.lib.recipe.replace_ingredient("effectivity-module-7", "processing-unit", "advanced-processing-unit") +]] + + +--SE 0.6 force circuits back to my own tab + +if data.raw.item["electronic-circuit"] then data.raw.item["electronic-circuit"].subgroup = "bob-electronic-boards" end +if data.raw.item["advanced-circuit"] then data.raw.item["advanced-circuit"].subgroup = "bob-electronic-boards" end +if data.raw.item["processing-unit"] then data.raw.item["processing-unit"].subgroup = "bob-electronic-boards" end +if data.raw.item["se-processing-unit-holmium"] then data.raw.item["se-processing-unit-holmium"].subgroup = "bob-electronic-boards" end + end --progression fix for krastorio: -if data.raw.fluid["kr-hydrogen-chloride"] then - 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 +if data.raw.fluid["hydrogen-chloride"] then -if data.raw.item["solder"] then - local electronic_circuit = data.raw.recipe["electronic-circuit"] - for _, ingredient in pairs(electronic_circuit.ingredients) do - ingredient.amount = ingredient.amount * 2 - end - for _, result in pairs(electronic_circuit.results) do - result.amount = result.amount * 2 - result.amount_min = result.amount_min and result.amount_min * 2 or nil - result.amount_max = result.amount_max and result.amount_max * 2 or nil - end - electronic_circuit.energy_required = electronic_circuit.energy_required and electronic_circuit.energy_required * 2 or 1 - bobmods.lib.recipe.add_ingredient("electronic-circuit", {type="item", name="solder", amount=1}) - bobmods.lib.recipe.add_ingredient("advanced-circuit", {type="item", name="solder", amount=1}) - bobmods.lib.recipe.add_ingredient("processing-unit", {type="item", name="solder", amount=2}) - bobmods.lib.recipe.add_ingredient("advanced-processing-unit", {type="item", name="solder", amount=4}) +bobmods.lib.tech.add_recipe_unlock("kr-fluids-chemistry", "hydrogen-chloride") +bobmods.lib.tech.remove_recipe_unlock("kr-advanced-chemistry", "hydrogen-chloride") end +if data.raw.item["electronic-circuit"] then +bobmods.lib.recipe.set_ingredients("electronic-circuit", {{type="item", name="basic-circuit-board", 1}, {"basic-electronic-components", amount=5}}) +end + + + + + diff --git a/MDbobelectronics2/prototypes/recipe-updates.lua b/MDbobelectronics2/prototypes/recipe-updates.lua index 2a36fc3..ce3c06a 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["kr-hydrogen-chloride"] then - bobmods.lib.recipe.replace_ingredient("ferric-chloride-solution", "water", "kr-hydrogen-chloride") +if data.raw.fluid["hydrogen-chloride"] then + bobmods.lib.recipe.replace_ingredient("ferric-chloride-solution", "water", "hydrogen-chloride") end if data.raw.item["tinned-copper-cable"] then @@ -28,9 +28,10 @@ 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[mods["Krastorio2"] and "kr-coke" or "coke"] then - bobmods.lib.recipe.replace_ingredient("basic-electronic-components", "coal", mods["Krastorio2"] and "kr-coke" or "coke") +elseif data.raw.item["coke"] then + bobmods.lib.recipe.replace_ingredient("basic-electronic-components", "coal", "coke") end if data.raw.item["silicon-wafer"] then @@ -38,10 +39,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[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}) + 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}) 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}) @@ -65,8 +66,8 @@ if data.raw.item["silicon-nitride"] then bobmods.lib.recipe.replace_ingredient("processing-electronics", "plastic-bar", "silicon-nitride") end -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}) +if data.raw.item["glass"] then + bobmods.lib.recipe.add_ingredient("fibreglass-board", {type="item", name="glass", amount=1}) else bobmods.lib.recipe.add_ingredient("fibreglass-board", {type="item", name="plastic-bar", amount=1}) end @@ -95,17 +96,22 @@ else end end +if data.raw.item["solder"] then + bobmods.lib.recipe.add_ingredient("electronic-circuit", {type="item", name="solder", amount=1}) + bobmods.lib.recipe.add_ingredient("advanced-circuit", {type="item", name="solder", amount=1}) + bobmods.lib.recipe.add_ingredient("processing-unit", {type="item", name="solder", amount=2}) + bobmods.lib.recipe.add_ingredient("advanced-processing-unit", {type="item", name="solder", amount=4}) +end + if mods["aai-industry"] then local greenrecipe2 = table.deepcopy(data.raw["recipe"]["basic-circuit-board"]) greenrecipe2.name = "basic-circuit-board-stone" -greenrecipe2.localised_name = { "item-name.basic-circuit-board" } data:extend({greenrecipe2}) bobmods.lib.recipe.replace_ingredient("basic-circuit-board-stone", "wood", "stone-tablet") --- local greyrecipe2 = table.deepcopy(data.raw["recipe"]["phenolic-board"]) greyrecipe2.name = "phenolic-board-stone" -greyrecipe2.localised_name = { "item-name.phenolic-board" } data:extend({greyrecipe2}) bobmods.lib.recipe.replace_ingredient("phenolic-board-stone", "wood", "stone-tablet") diff --git a/MDbobelectronics2/prototypes/resource.lua b/MDbobelectronics2/prototypes/resource.lua index ee16d07..5666982 100644 --- a/MDbobelectronics2/prototypes/resource.lua +++ b/MDbobelectronics2/prototypes/resource.lua @@ -1,4 +1,5 @@ -data:extend({ +data:extend( +{ { type = "item", name = "resin", @@ -8,18 +9,21 @@ 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 = + { + { "wood", 1}, }, - results = { { type = "item", name = "resin", amount = 1 } }, + results = {{type="item", name="resin", amount=1}}, allow_decomposition = false }, + { type = "recipe", name = "bob-resin-oil", @@ -27,21 +31,25 @@ 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", @@ -51,24 +59,28 @@ data:extend({ order = "f[rubber]", stack_size = 100 }, + { type = "recipe", name = "bob-rubber", subgroup = "bob-resource-chemical", category = "smelting", energy_required = 3.5, - ingredients = { - { type = "item", name = "resin", amount = 1 }, + ingredients = + { + { "resin", 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["kr-silicon"] or data.raw.item["silicon"] or data.raw.item["silicon-plate"] then - data:extend({ + if data.raw.item["silicon"] or data.raw.item["silicon-plate"] then + data:extend( + { { type = "item", name = "silicon-wafer", @@ -78,72 +90,83 @@ 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 = 8 } }, - } - }) + ingredients = + { + }, + results = {{type="item", name="silicon-wafer", amount=1}}, + result_count = 8 + }, + } + ) - 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 }) + if 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", icon = "__MDbobelectronics2__/graphics/icons/solder-plate.png", icon_size = 32, - subgroup = "raw-resource", + subgroup = "bob-alloy", 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 +