diff --git a/data-updates.lua b/data-updates.lua index 1adcc14..0d2e85a 100644 --- a/data-updates.lua +++ b/data-updates.lua @@ -6,10 +6,10 @@ require("compatibility/crafting-efficiency") if data.raw.resource["stone"] then if mods["space-exploration"] then - local noise = require('noise'); - -- Increase richness of stone a bit - data.raw.resource["stone"].autoplace.richness_expression = - data.raw.resource["stone"].autoplace.richness_expression * noise.to_noise_expression(4/3) + -- local noise = require('noise'); + -- -- Increase richness of stone a bit + -- data.raw.resource["stone"].autoplace.richness_expression = + -- data.raw.resource["stone"].autoplace.richness_expression noise.to_noise_expression(4/3) else log("Replacing vanilla stone autoplace") local resource_autoplace = require('resource-autoplace'); diff --git a/info.json b/info.json index 259849d..b348c63 100644 --- a/info.json +++ b/info.json @@ -1,7 +1,7 @@ { "name": "bzsilicon", - "version": "0.11.12", - "factorio_version": "1.1", + "version": "2.0.0", + "factorio_version": "2.0", "title": "Silica & Silicon", "author": "Brevven", "contact": "", diff --git a/prototypes/gyro.lua b/prototypes/gyro.lua index a5de3f7..c510f65 100644 --- a/prototypes/gyro.lua +++ b/prototypes/gyro.lua @@ -8,18 +8,17 @@ gyro_ingredients = { -- outputs 4 gyro_prereqs = {util.me.silicon_processing} if mods.bzcarbon then - table.insert(gyro_ingredients, {"diamond", 1}) + table.insert(gyro_ingredients, util.item({"diamond", 1})) table.insert(gyro_prereqs, "diamond-processing") end if mods.bztungsten then - table.insert(gyro_ingredients, {"tungsten-plate", 1}) + table.insert(gyro_ingredients, util.item({"tungsten-plate", 1})) table.insert(gyro_prereqs, "tungsten-processing") elseif mods.bztitanium then - table.insert(gyro_ingredients, {"titanium-plate", 1}) + table.insert(gyro_ingredients, util.item({"titanium-plate", 1})) table.insert(gyro_prereqs, "titanium-processing") elseif mods.Krastorio2 then - table.insert(gyro_ingredients, {"rare-metals", 1}) - -- table.insert(gyro_prereqs, "titanium-processing") + table.insert(gyro_ingredients, util.item("rare-metals", 1)) end @@ -40,9 +39,9 @@ data:extend({ subgroup = "intermediate-product", enabled = false, energy_required = 12, + allow_productivity = true, ingredients = gyro_ingredients, - result = "gyro", - result_count = 4, + results = {util.item("gyro", 4)}, }, { type = "technology", diff --git a/prototypes/optical-fiber.lua b/prototypes/optical-fiber.lua index e2a798b..b6072cc 100644 --- a/prototypes/optical-fiber.lua +++ b/prototypes/optical-fiber.lua @@ -14,20 +14,16 @@ data:extend( { type = "recipe", name = "optical-fiber", - normal = - { - enabled = false, - ingredients = {{"silica", 1}}, - result = "optical-fiber", - result_count = 1 - }, - expensive = - { - enabled = false, - ingredients = {{"silica", 2}}, - result = "optical-fiber", - result_count = 1 - }, + enabled = false, + allow_productivity = true, + ingredients = {util.item("silica", 1)}, + results = {util.item("optical-fiber", 1)}, + -- expensive = + -- { + -- enabled = false, + -- ingredients = {{"silica", 2}}, + -- results = {util.item("optical-fiber", 1)}, + -- }, }, { @@ -52,7 +48,7 @@ data:extend( }, time = 10 }, - prerequisites = {"optics", "silica-processing"}, + prerequisites = {"lamp", "silica-processing"}, order = "b-b" }, } diff --git a/prototypes/silica-recipe.lua b/prototypes/silica-recipe.lua index b4a79b0..19507e7 100644 --- a/prototypes/silica-recipe.lua +++ b/prototypes/silica-recipe.lua @@ -8,48 +8,44 @@ data:extend( category = "crushing", enabled = false, energy_required = 4, - ingredients = {{"quartz", 10}}, - result = "silica", - result_count = 30 + allow_productivity = true, + ingredients = {util.item("quartz", 10)}, + results = {util.item("silica", 30)} } or util.me.use_bio_crushed_stone() and { type = "recipe", name = "silica", category = "smelting", enabled = false, energy_required = 6, - ingredients = {{"stone-crushed", 4}}, - result = "silica", - result_count = 5, + allow_productivity = true, + ingredients = {util.item("stone-crushed", 4)}, + results = {util.item("silica", 5)}, } or mods["omnimatter"] and { type = "recipe", name = "silica", category = "smelting", enabled = false, energy_required = 6, - ingredients = {{"stone-crushed", 4}}, - result = "silica", - result_count = 5, + allow_productivity = true, + ingredients = {util.item("stone-crushed", 4)}, + results = {util.item("silica", 5)}, } or { type = "recipe", name = "silica", - category = "smelting", - normal = - { - enabled = false, - energy_required = 3.2, - ingredients = {{"stone-brick", 1}}, - result = "silica", - result_count = 5 - }, - expensive = - { - enabled = false, - energy_required = 6.4, - ingredients = {{"stone-brick", 2}}, - result = "silica", - result_count = 5 - }, + category = mods["space-age"] and "basic-crushing" or "smelting", + enabled = false, + energy_required = 3.2, + allow_productivity = true, + ingredients = mods["space-age"] and {util.item("stone", 2)} or {util.item("stone-brick", 1)}, + results = {util.item("silica", 5)} + -- expensive = + -- { + -- enabled = false, + -- energy_required = 6.4, + -- ingredients = {util.item("stone-brick", 2)}, + -- results = {util.item("silica", 5)} + -- }, }, { diff --git a/prototypes/silicon-recipe.lua b/prototypes/silicon-recipe.lua index 2a4e402..f8caee9 100644 --- a/prototypes/silicon-recipe.lua +++ b/prototypes/silicon-recipe.lua @@ -16,32 +16,29 @@ data:extend( category = "smelting", enabled = false, energy_required = 14.4, + allow_productivity = true, ingredients = { - {"silica", 18}, - {"coke", 1} + util.item("silica", 18), + util.item("coke", 1), }, - result = "silicon", - result_count = 3 + results = {util.item("silicon", 3)} } or { type = "recipe", name = "silicon", category = "smelting", - normal = - { - enabled = false, - energy_required = 3.2, - ingredients = {{"silica", 10}}, - result = "silicon", - result_count = 1 - }, - expensive = - { - enabled = false, - energy_required = 3.2, - ingredients = {{"silica", 10}}, - result = "silicon", - result_count = 1 - }, + enabled = false, + energy_required = 3.2, + allow_productivity = true, + ingredients = {util.item("silica", 10)}, + results = {util.item("silicon", 1)} + -- expensive = + -- { + -- enabled = false, + -- energy_required = 3.2, + -- ingredients = {{"silica", 10}}, + -- result = "silicon", + -- result_count = 1 + -- }, }, (not mods["Krastorio2"]) and @@ -105,6 +102,7 @@ data:extend({ subgroup = "intermediate-product", enabled = false, energy_required = 20, + allow_productivity = true, ingredients = (mods["Krastorio2"] and { {type= "item", name="silicon", amount=20}, {type= "fluid", name="hydrogen-chloride", amount=50}, @@ -112,8 +110,7 @@ data:extend({ {type= "item", name="silicon", amount=20}, {type= "fluid", name="sulfuric-acid", amount=50}, }), - result = "silicon-wafer", - result_count = 10, + results = {util.item("silicon-wafer", 10)} }, { type = "item", @@ -131,6 +128,7 @@ data:extend({ subgroup = "intermediate-product", enabled = false, energy_required = 2, + allow_productivity = true, ingredients = (mods["bzlead"] and not mods["angelssmelting"] and { {type= "item", name="silicon", amount=1}, {type= "item", name="electronic-circuit", amount=1}, @@ -139,8 +137,7 @@ data:extend({ {type= "item", name="silicon", amount=1}, {type= "item", name="electronic-circuit", amount=1}, }), - result = "solar-cell", - result_count = 2, + results = {util.item("solar-cell", 2)} }, }) diff --git a/recipe-updates.lua b/recipe-updates.lua index 838e75d..b3db107 100644 --- a/recipe-updates.lua +++ b/recipe-updates.lua @@ -37,6 +37,8 @@ if util.me.use_gyros() then util.add_ingredient("se-thruster-suit-2", "gyro", 2) end +util.replace_some_ingredient("space-platform-foundation", "copper-cable", 10, "optical-fiber", 10) + if not mods["Krastorio2"] then util.remove_ingredient("concrete", "stone-brick"); @@ -72,11 +74,11 @@ if not mods["Krastorio2"] then end util.replace_ingredient("solar-panel-equipment", "solar-panel", "solar-cell") - if not mods.modmashsplinterelectronics then + if not mods.modmashsplinterelectonics then util.multiply_recipe("advanced-circuit", 3) util.replace_some_ingredient("advanced-circuit", "electronic-circuit", 3, "silicon-wafer", 1) end - util.add_prerequisite("advanced-electronics", util.me.silicon_processing) + util.add_prerequisite("advanced-circuit", util.me.silicon_processing) else util.replace_some_ingredient("solar-panel", "electronic-circuit", 10, "silicon", 10) @@ -90,7 +92,10 @@ if not mods["Krastorio2"] then util.remove_ingredient("speed-module", "electronic-circuit") util.add_ingredient("speed-module", "silicon", 3) - util.add_prerequisite("advanced-electronics-2", util.me.silicon_processing) + if not mods.modmashsplinterelectonics then + util.replace_some_ingredient("advanced-circuit", "electronic-circuit", 1, "silicon", 1) + end + util.add_prerequisite("advanced-circuit", util.me.silicon_processing) end util.add_prerequisite("solar-energy", "silicon-processing") @@ -145,6 +150,7 @@ util.add_ingredient("arithmetic-combinator", "optical-fiber", 1) util.add_ingredient("constant-combinator", "optical-fiber", 1) util.add_ingredient("decider-combinator", "optical-fiber", 1) util.add_ingredient("programmable-speaker", "optical-fiber", 1) +util.add_ingredient("display-panel", "optical-fiber", 1) if mods["UsefulCombinators"] then for i, v in ipairs(useful_combinators) do util.add_ingredient(v, "optical-fiber", 1) @@ -231,8 +237,8 @@ if mods["extended-research-system"] and mods["Bio_Industries"] then category = "crafting", enabled = true, energy_required = 6, - ingredients = {{"iron-plate", 100}, {"iron-gear-wheel", 5}}, - result = "bi-stone-crusher", + ingredients = {util.item("iron-plate", 100), util.item("iron-gear-wheel", 5)}, + results = util.item("bi-stone-crusher"), }}) if data.raw.recipe["bi-crushed-stone-1"] then data.raw.recipe["bi-crushed-stone-1"].enabled = true