diff --git a/MDbobelectronics2/changelog.txt b/MDbobelectronics2/changelog.txt index e4b63b7..8b0d1ae 100644 --- a/MDbobelectronics2/changelog.txt +++ b/MDbobelectronics2/changelog.txt @@ -1,48 +1,44 @@ --------------------------------------------------------------------------------------------------- +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: + - Fix file paths after renaming mod +--------------------------------------------------------------------------------------------------- Version: 4.0.0 Date: 05.10.2025 Changes: - Update to Factorio 2.0 ---------------------------------------------------------------------------------------------------- -Version: 3.6.0 -Date: 07.07.2022 - Changes: - - Updated to space-exploration 0.6.65 - - Updated to space-exploration-postprocess 0.6.13 - - Updated to Krastorio2 1.3.2 - - Technology prerequisites of advanced-electronics-3 changed to fit in the new progression - - silicon-wafer stacksize from 500 to 200, matching new SE requirement - - moved back circuit recipes in the GUI where they should be, in their own tab - - se-processing-unit-holmium recipe ingredients from electronic-circuit 20 into 10 (same as vanilla SE) ---------------------------------------------------------------------------------------------------- -Version: 3.1.0 -Date: 20.11.2021 - Changes: - - small fix ---------------------------------------------------------------------------------------------------- -Version: 3.0.0 -Date: 12.11.2021 - Changes: - - code restructuring - - recipe ingredient/result amount now alligned to installed mods (Krastorio/Space Exploration) - - recipes have same ingredients, no need to rebuild ---------------------------------------------------------------------------------------------------- -Version: 2.5.0 -Date: 17.06.2021 - Changes: - - more compatibility - - Deadlocks stacking initial support - - full stacking support and stacked recipes with (soon) to be released mod ---------------------------------------------------------------------------------------------------- -Version: 2.1.1 -Date: 02.02.2021 - Changes: - - mod now works with Space exploration and or krastorio - - additional support for titanium, silicon, lead mods - - every recipe added by mod in 1 sorted tab - - optional setting (default ON) making circuit's recipe use previous tier ---------------------------------------------------------------------------------------------------- -Version: 1.1.3 -Date: 26.01.2021 - Bugfixes: - - Minor changes to data-updates to avoid a crash. + - Update to Factorio 2.0 diff --git a/MDbobelectronics2/data-updates.lua b/MDbobelectronics2/data-updates.lua index 04ab1b7..309567c 100644 --- a/MDbobelectronics2/data-updates.lua +++ b/MDbobelectronics2/data-updates.lua @@ -3,7 +3,9 @@ require("prototypes.technology-updates") require("prototypes.productivity-limitations") data.raw.recipe["copper-cable"].category = "electronics" -data.raw.recipe["rocket-control-unit"].category = "electronics" +if data.raw.technology["rocket-control-unit"] then + data.raw.recipe["rocket-control-unit"].category = "electronics" +end if data.raw["recipe-category"]["chemical-furnace"] then if data.raw.recipe["carbon"] then diff --git a/MDbobelectronics2/info.json b/MDbobelectronics2/info.json index 763840d..9f5c926 100644 --- a/MDbobelectronics2/info.json +++ b/MDbobelectronics2/info.json @@ -1,11 +1,11 @@ { "name": "MDbobelectronics2", - "version": "4.0.0", + "version": "4.0.7", "factorio_version": "2.0", "title": "Bob's Electronics SE KR for 2.0", - "author": "Bobingabout, MdRuz, cackling fiend", - "contact": "", - "homepage": "https://forums.factorio.com/viewtopic.php?f=190&t=95748", + "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", "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/category.lua b/MDbobelectronics2/prototypes/category.lua index f6559f6..55f99ac 100644 --- a/MDbobelectronics2/prototypes/category.lua +++ b/MDbobelectronics2/prototypes/category.lua @@ -17,7 +17,7 @@ data:extend( name = "bob-intermediate-products", order = "c-i", inventory_order = "a-c", - icon = "__MDbobelectronics__/graphics/icons/technology/intermediates.png", + icon = "__MDbobelectronics2__/graphics/icons/technology/intermediates.png", icon_size = 64, }, diff --git a/MDbobelectronics2/prototypes/chemicals.lua b/MDbobelectronics2/prototypes/chemicals.lua index 89aa677..141385b 100644 --- a/MDbobelectronics2/prototypes/chemicals.lua +++ b/MDbobelectronics2/prototypes/chemicals.lua @@ -3,7 +3,7 @@ data:extend( { type = "fluid", name = "ferric-chloride-solution", - icon = "__MDbobelectronics__/graphics/icons/ferric-chloride-solution.png", + icon = "__MDbobelectronics2__/graphics/icons/ferric-chloride-solution.png", icon_size = 32, default_temperature = 25, heat_capacity = "1kJ", @@ -18,7 +18,7 @@ data:extend( { type = "recipe", name = "ferric-chloride-solution", - icon = "__MDbobelectronics__/graphics/icons/ferric-chloride-solution.png", + icon = "__MDbobelectronics2__/graphics/icons/ferric-chloride-solution.png", icon_size = 32, subgroup = "bob-resource-chemical", order = "x[fluid-chemistry]-a[ferric-chloride-solution]", diff --git a/MDbobelectronics2/prototypes/electronics.lua b/MDbobelectronics2/prototypes/electronics.lua index e469dba..4cc6323 100644 --- a/MDbobelectronics2/prototypes/electronics.lua +++ b/MDbobelectronics2/prototypes/electronics.lua @@ -4,7 +4,7 @@ if data.raw.item["tin-plate"] then { type = "item", name = "tinned-copper-cable", - icon = "__MDbobelectronics__/graphics/icons/tinned-copper-cable.png", + icon = "__MDbobelectronics2__/graphics/icons/tinned-copper-cable.png", icon_size = 32, subgroup = "bob-electronic-components", order = "0-a1[tinned-copper-cable]", @@ -34,7 +34,7 @@ data:extend( { type = "item", name = "insulated-cable", - icon = "__MDbobelectronics__/graphics/icons/insulated-cable.png", + icon = "__MDbobelectronics2__/graphics/icons/insulated-cable.png", icon_size = 32, subgroup = "bob-electronic-components", order = "0-a2[insulated-cable]", @@ -64,7 +64,7 @@ if data.raw.item["gold-plate"] then { type = "item", name = "gilded-copper-cable", - icon = "__MDbobelectronics__/graphics/icons/gilded-copper-cable.png", + icon = "__MDbobelectronics2__/graphics/icons/gilded-copper-cable.png", icon_size = 32, subgroup = "bob-electronic-components", order = "0-a3[gilded-copper-cable]", @@ -95,7 +95,7 @@ if data.raw.item["solder-alloy"] then { type = "item", name = "solder", - icon = "__MDbobelectronics__/graphics/icons/solder.png", + icon = "__MDbobelectronics2__/graphics/icons/solder.png", icon_size = 32, subgroup = "bob-electronic-components", order = "0-a4[solder]", @@ -127,7 +127,7 @@ data:extend( { type = "item", name = "basic-electronic-components", - icon = "__MDbobelectronics__/graphics/icons/basic-electronic-components.png", + icon = "__MDbobelectronics2__/graphics/icons/basic-electronic-components.png", icon_size = 128, subgroup = "bob-electronic-components", order = "0-b1[basic-electronic-components]", @@ -157,7 +157,7 @@ data:extend( { type = "item", name = "BOBMD-electronic-components", - icon = "__MDbobelectronics__/graphics/icons/electronic-components.png", + icon = "__MDbobelectronics2__/graphics/icons/electronic-components.png", icon_size = 128, subgroup = "bob-electronic-components", order = "0-b2[electronic-components]", @@ -187,7 +187,7 @@ data:extend( { type = "item", name = "intergrated-electronics", - icon = "__MDbobelectronics__/graphics/icons/integrated-electronics.png", + icon = "__MDbobelectronics2__/graphics/icons/integrated-electronics.png", icon_size = 128, subgroup = "bob-electronic-components", order = "0-b3[integrated-electronics]", @@ -218,7 +218,7 @@ data:extend( { type = "item", name = "processing-electronics", - icon = "__MDbobelectronics__/graphics/icons/cpu.png", + icon = "__MDbobelectronics2__/graphics/icons/cpu.png", icon_size = 128, subgroup = "bob-electronic-components", order = "0-b4[cpu]", @@ -248,7 +248,7 @@ data:extend( { type = "item", name = "phenolic-board", - icon = "__MDbobelectronics__/graphics/icons/phenolic-board.png", + icon = "__MDbobelectronics2__/graphics/icons/phenolic-board.png", icon_size = 128, subgroup = "bob-boards", order = "c-a2[phenolic-board]", @@ -276,7 +276,7 @@ data:extend( { type = "item", name = "fibreglass-board", - icon = "__MDbobelectronics__/graphics/icons/fibreglass-board.png", + icon = "__MDbobelectronics2__/graphics/icons/fibreglass-board.png", icon_size = 128, subgroup = "bob-boards", order = "c-a3[fibreglass-board]", @@ -304,7 +304,7 @@ data:extend( { type = "item", name = "basic-circuit-board", - icon = "__MDbobelectronics__/graphics/icons/basic-circuit-board.png", + icon = "__MDbobelectronics2__/graphics/icons/basic-circuit-board.png", icon_size = 128, subgroup = "bob-boards", order = "c-b1[basic-circuit-board]", @@ -333,7 +333,7 @@ data:extend( { type = "item", name = "circuit-board", - icon = "__MDbobelectronics__/graphics/icons/circuit-board.png", + icon = "__MDbobelectronics2__/graphics/icons/circuit-board.png", icon_size = 128, subgroup = "bob-boards", order = "c-b2[circuit-board]", @@ -364,7 +364,7 @@ data:extend( { type = "item", name = "superior-circuit-board", - icon = "__MDbobelectronics__/graphics/icons/superior-circuit-board.png", + icon = "__MDbobelectronics2__/graphics/icons/superior-circuit-board.png", icon_size = 128, subgroup = "bob-boards", order = "c-b2[superior-circuit-board]", @@ -395,7 +395,7 @@ data:extend( { type = "item", name = "multi-layer-circuit-board", - icon = "__MDbobelectronics__/graphics/icons/multi-layer-circuit-board.png", + icon = "__MDbobelectronics2__/graphics/icons/multi-layer-circuit-board.png", icon_size = 128, subgroup = "bob-boards", order = "c-b3[multi-layer-circuit-board]", @@ -427,7 +427,7 @@ data:extend( { type = "item", name = "electronic-circuit", - icon = "__MDbobelectronics__/graphics/icons/basic-electronic-circuit-board.png", + icon = "__MDbobelectronics2__/graphics/icons/basic-electronic-circuit-board.png", icon_size = 128, subgroup = "bob-electronic-boards", order = "c-c1[basic-electronic-circuit-board]", @@ -457,7 +457,7 @@ data:extend( { type = "item", name = "advanced-circuit", - icon = "__MDbobelectronics__/graphics/icons/electronic-circuit-board.png", + icon = "__MDbobelectronics2__/graphics/icons/electronic-circuit-board.png", icon_size = 128, subgroup = "bob-electronic-boards", order = "c-c2[electronic-circuit-board]", @@ -488,7 +488,7 @@ data:extend( { type = "item", name = "processing-unit", - icon = "__MDbobelectronics__/graphics/icons/electronic-logic-board.png", + icon = "__MDbobelectronics2__/graphics/icons/electronic-logic-board.png", icon_size = 128, subgroup = "bob-electronic-boards", order = "c-c3[electronic-logic-board]", @@ -520,7 +520,7 @@ data:extend( { type = "item", name = "advanced-processing-unit", - icon = "__MDbobelectronics__/graphics/icons/electronic-processing-board.png", + icon = "__MDbobelectronics2__/graphics/icons/electronic-processing-board.png", icon_size = 128, subgroup = "bob-electronic-boards", order = "c-c4[electronic-processing-board]", 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 a9d375d..b7ed173 100644 --- a/MDbobelectronics2/prototypes/resource.lua +++ b/MDbobelectronics2/prototypes/resource.lua @@ -1,29 +1,25 @@ -data:extend( -{ +data:extend({ { type = "item", name = "resin", - icon = "__MDbobelectronics__/graphics/icons/resin.png", + icon = "__MDbobelectronics2__/graphics/icons/resin.png", icon_size = 32, subgroup = "bob-resource-chemical", order = "f[resin]", stack_size = 100 }, - { type = "recipe", name = "bob-resin-wood", category = "crafting-machine", subgroup = "bob-resource-chemical", energy_required = 1, - ingredients = - { - { "wood", 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,142 +27,123 @@ 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", - icon = "__MDbobelectronics__/graphics/icons/rubber.png", + icon = "__MDbobelectronics2__/graphics/icons/rubber.png", icon_size = 32, subgroup = "bob-resource-chemical", order = "f[rubber]", stack_size = 100 }, - { type = "recipe", name = "bob-rubber", subgroup = "bob-resource-chemical", category = "smelting", energy_required = 3.5, - ingredients = - { - { "resin", 1}, + 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", - icon = "__MDbobelectronics__/graphics/icons/silicon-wafer.png", + icon = "__MDbobelectronics2__/graphics/icons/silicon-wafer.png", icon_size = 32, subgroup = "bob-resource-chemical", 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", - icon = "__MDbobelectronics__/graphics/icons/solder-plate.png", + icon = "__MDbobelectronics2__/graphics/icons/solder-plate.png", icon_size = 32, 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 - diff --git a/MDbobelectronics2/prototypes/technology-updates.lua b/MDbobelectronics2/prototypes/technology-updates.lua index 7229347..f68e0a7 100644 --- a/MDbobelectronics2/prototypes/technology-updates.lua +++ b/MDbobelectronics2/prototypes/technology-updates.lua @@ -94,9 +94,9 @@ if data.raw.technology["ceramics"] then end -data.raw.technology["electronics"].icon = "__MDbobelectronics__/graphics/icons/technology/electronics.png" -data.raw.technology["advanced-circuit"].icon = "__MDbobelectronics__/graphics/icons/technology/advanced-electronics.png" -data.raw.technology["processing-unit"].icon = "__MDbobelectronics__/graphics/icons/technology/advanced-electronics-2.png" +data.raw.technology["electronics"].icon = "__MDbobelectronics2__/graphics/icons/technology/electronics.png" +data.raw.technology["advanced-circuit"].icon = "__MDbobelectronics2__/graphics/icons/technology/advanced-electronics.png" +data.raw.technology["processing-unit"].icon = "__MDbobelectronics2__/graphics/icons/technology/advanced-electronics-2.png" data.raw.technology["electronics"].icon_size = 128 data.raw.technology["advanced-circuit"].icon_size = 128 diff --git a/MDbobelectronics2/prototypes/technology.lua b/MDbobelectronics2/prototypes/technology.lua index e75f796..6bbb68a 100644 --- a/MDbobelectronics2/prototypes/technology.lua +++ b/MDbobelectronics2/prototypes/technology.lua @@ -3,7 +3,7 @@ data:extend( { type = "technology", name = "advanced-electronics-3", - icon = "__MDbobelectronics__/graphics/icons/technology/advanced-electronics-3.png", + icon = "__MDbobelectronics2__/graphics/icons/technology/advanced-electronics-3.png", icon_size = 128, prerequisites = {