diff --git a/bobpower/prototypes/burner-generator.lua b/bobpower/prototypes/burner-generator.lua index 6294a3b28..9120292e0 100644 --- a/bobpower/prototypes/burner-generator.lua +++ b/bobpower/prototypes/burner-generator.lua @@ -15,9 +15,9 @@ if settings.startup["bobmods-power-burnergenerator"].value == true then type = "recipe", name = "bob-burner-generator", ingredients = { - { "stone-furnace", 1 }, - { "iron-plate", 8 }, - { "iron-gear-wheel", 5 }, + { type = "item", name = "stone-furnace", amount = 1 }, + { type = "item", name = "iron-plate", amount = 8 }, + { type = "item", name = "iron-gear-wheel", amount = 5 }, }, results = { { type = "item", name = "bob-burner-generator", amount = 1 } }, }, diff --git a/bobpower/prototypes/burner-reactor.lua b/bobpower/prototypes/burner-reactor.lua index b3fd7b1ad..d79290a70 100644 --- a/bobpower/prototypes/burner-reactor.lua +++ b/bobpower/prototypes/burner-reactor.lua @@ -70,9 +70,9 @@ if settings.startup["bobmods-power-heatsources"].value == true then energy_required = 2, enabled = false, ingredients = { - { "steel-furnace", 1 }, - { "heat-pipe", 8 }, - { "steel-plate", 6 }, + { type = "item", name = "steel-furnace", amount = 1 }, + { type = "item", name = "heat-pipe", amount = 8 }, + { type = "item", name = "steel-plate", amount = 6 }, }, results = { { type = "item", name = "burner-reactor", amount = 1 } }, }, @@ -196,10 +196,10 @@ if settings.startup["bobmods-power-heatsources"].value == true then energy_required = 3, enabled = false, ingredients = { - { "burner-reactor", 1 }, - { "heat-pipe-2", 8 }, - { "steel-plate", 6 }, - { "concrete", 10 }, + { type = "item", name = "burner-reactor", amount = 1 }, + { type = "item", name = "heat-pipe-2", amount = 8 }, + { type = "item", name = "steel-plate", amount = 6 }, + { type = "item", name = "concrete", amount = 10 }, }, results = { { type = "item", name = "burner-reactor-2", amount = 1 } }, }, @@ -241,8 +241,8 @@ if settings.startup["bobmods-power-heatsources"].value == true then energy_required = 2, enabled = false, ingredients = { - { "burner-reactor", 1 }, - { "pipe", 5 }, + { type = "item", name = "burner-reactor", amount = 1 }, + { type = "item", name = "pipe", amount = 5 }, }, results = { { type = "item", name = "fluid-reactor", amount = 1 } }, }, @@ -274,11 +274,11 @@ if settings.startup["bobmods-power-heatsources"].value == true then energy_required = 3, enabled = false, ingredients = { - { "fluid-reactor", 1 }, - { "heat-pipe-2", 8 }, - { "steel-plate", 6 }, - { "concrete", 10 }, - { "pipe", 5 }, + { type = "item", name = "fluid-reactor", amount = 1 }, + { type = "item", name = "heat-pipe-2", amount = 8 }, + { type = "item", name = "steel-plate", amount = 6 }, + { type = "item", name = "concrete", amount = 10 }, + { type = "item", name = "pipe", amount = 5 }, }, results = { { type = "item", name = "fluid-reactor-2", amount = 1 } }, }, @@ -405,10 +405,10 @@ if settings.startup["bobmods-power-heatsources"].value == true then energy_required = 2, enabled = false, ingredients = { - { "fluid-furnace", 1 }, - { "heat-pipe", 8 }, - { "steel-plate", 6 }, - { "pipe", 3 }, + { type = "item", name = "fluid-furnace", amount = 1 }, + { type = "item", name = "heat-pipe", amount = 8 }, + { type = "item", name = "steel-plate", amount = 6 }, + { type = "item", name = "pipe", amount = 3 }, }, results = { { type = "item", name = "fluid-reactor", amount = 1 } }, }, diff --git a/bobpower/prototypes/heat-pipes.lua b/bobpower/prototypes/heat-pipes.lua index aecced6da..fbe2d61d1 100644 --- a/bobpower/prototypes/heat-pipes.lua +++ b/bobpower/prototypes/heat-pipes.lua @@ -9,7 +9,7 @@ then data.raw["heat-pipe"]["heat-pipe"].heat_buffer.max_transfer = "1GW" data.raw["heat-pipe"]["heat-pipe"].heat_buffer.max_temperature = 750 data.raw["heat-pipe"]["heat-pipe"].localised_description = { "entity-description.heat-pipe", 750 } - bobmods.lib.recipe.set_ingredients("heat-pipe", { { "steel-plate", 5 }, { "copper-plate", 10 } }) + bobmods.lib.recipe.set_ingredients("heat-pipe", { { type = "item", name = "steel-plate", amount = 5 }, { type = "item", name = "copper-plate", amount = 10 } }) data:extend({ { @@ -49,8 +49,8 @@ then energy_required = 1, enabled = false, ingredients = { - { "steel-plate", 5 }, - { "copper-plate", 10 }, + { type = "item", name = "steel-plate", amount = 5 }, + { type = "item", name = "copper-plate", amount = 10 }, }, results = { { type = "item", name = "heat-pipe-2", amount = 1 } }, }, @@ -60,8 +60,8 @@ then energy_required = 1, enabled = false, ingredients = { - { "steel-plate", 5 }, - { "copper-plate", 10 }, + { type = "item", name = "steel-plate", amount = 5 }, + { type = "item", name = "copper-plate", amount = 10 }, }, results = { { type = "item", name = "heat-pipe-3", amount = 1 } }, }, @@ -71,8 +71,8 @@ then energy_required = 1, enabled = false, ingredients = { - { "steel-plate", 5 }, - { "copper-plate", 10 }, + { type = "item", name = "steel-plate", amount = 5 }, + { type = "item", name = "copper-plate", amount = 10 }, }, results = { { type = "item", name = "heat-pipe-4", amount = 1 } }, }, diff --git a/bobpower/prototypes/recipe/accumulators-updates.lua b/bobpower/prototypes/recipe/accumulators-updates.lua index f0c6e5b72..a68f06b51 100644 --- a/bobpower/prototypes/recipe/accumulators-updates.lua +++ b/bobpower/prototypes/recipe/accumulators-updates.lua @@ -33,6 +33,6 @@ if settings.startup["bobmods-power-accumulators"].value == true then end end - bobmods.lib.recipe.add_ingredient("accumulator", { "electronic-circuit", 2 }) - bobmods.lib.recipe.set_ingredient("accumulator", { "battery", 10 }) + bobmods.lib.recipe.add_ingredient("accumulator", { type = "item", name = "electronic-circuit", amount = 2 }) + bobmods.lib.recipe.set_ingredient("accumulator", { type = "item", name = "battery", amount = 10 }) end diff --git a/bobpower/prototypes/recipe/accumulators.lua b/bobpower/prototypes/recipe/accumulators.lua index 76e873f61..f17c497a1 100644 --- a/bobpower/prototypes/recipe/accumulators.lua +++ b/bobpower/prototypes/recipe/accumulators.lua @@ -6,9 +6,9 @@ if settings.startup["bobmods-power-accumulators"].value == true then energy_required = 10, enabled = false, ingredients = { - { "iron-plate", 2 }, - { "electronic-circuit", 4 }, - { "battery", 4 }, + { type = "item", name = "iron-plate", amount = 2 }, + { type = "item", name = "electronic-circuit", amount = 4 }, + { type = "item", name = "battery", amount = 4 }, }, results = { { type = "item", name = "fast-accumulator", amount = 1 } }, }, @@ -19,9 +19,9 @@ if settings.startup["bobmods-power-accumulators"].value == true then energy_required = 10, enabled = false, ingredients = { - { "iron-plate", 2 }, - { "electronic-circuit", 4 }, - { "battery", 4 }, + { type = "item", name = "iron-plate", amount = 2 }, + { type = "item", name = "electronic-circuit", amount = 4 }, + { type = "item", name = "battery", amount = 4 }, }, results = { { type = "item", name = "slow-accumulator", amount = 1 } }, }, @@ -32,10 +32,10 @@ if settings.startup["bobmods-power-accumulators"].value == true then energy_required = 10, enabled = false, ingredients = { - { "accumulator", 1 }, - { "steel-plate", 2 }, - { "advanced-circuit", 2 }, - { "battery", 10 }, + { type = "item", name = "accumulator", amount = 1 }, + { type = "item", name = "steel-plate", amount = 2 }, + { type = "item", name = "advanced-circuit", amount = 2 }, + { type = "item", name = "battery", amount = 10 }, }, results = { { type = "item", name = "large-accumulator-2", amount = 1 } }, }, @@ -46,10 +46,10 @@ if settings.startup["bobmods-power-accumulators"].value == true then energy_required = 10, enabled = false, ingredients = { - { "fast-accumulator", 1 }, - { "steel-plate", 2 }, - { "advanced-circuit", 4 }, - { "battery", 4 }, + { type = "item", name = "fast-accumulator", amount = 1 }, + { type = "item", name = "steel-plate", amount = 2 }, + { type = "item", name = "advanced-circuit", amount = 4 }, + { type = "item", name = "battery", amount = 4 }, }, results = { { type = "item", name = "fast-accumulator-2", amount = 1 } }, }, @@ -60,10 +60,10 @@ if settings.startup["bobmods-power-accumulators"].value == true then energy_required = 10, enabled = false, ingredients = { - { "slow-accumulator", 1 }, - { "steel-plate", 2 }, - { "advanced-circuit", 4 }, - { "battery", 4 }, + { type = "item", name = "slow-accumulator", amount = 1 }, + { type = "item", name = "steel-plate", amount = 2 }, + { type = "item", name = "advanced-circuit", amount = 4 }, + { type = "item", name = "battery", amount = 4 }, }, results = { { type = "item", name = "slow-accumulator-2", amount = 1 } }, }, @@ -74,10 +74,10 @@ if settings.startup["bobmods-power-accumulators"].value == true then energy_required = 10, enabled = false, ingredients = { - { "large-accumulator-2", 1 }, - { "steel-plate", 2 }, - { "processing-unit", 2 }, - { "battery", 10 }, + { type = "item", name = "large-accumulator-2", amount = 1 }, + { type = "item", name = "steel-plate", amount = 2 }, + { type = "item", name = "processing-unit", amount = 2 }, + { type = "item", name = "battery", amount = 10 }, }, results = { { type = "item", name = "large-accumulator-3", amount = 1 } }, }, @@ -88,10 +88,10 @@ if settings.startup["bobmods-power-accumulators"].value == true then energy_required = 10, enabled = false, ingredients = { - { "fast-accumulator-2", 1 }, - { "steel-plate", 2 }, - { "processing-unit", 4 }, - { "battery", 4 }, + { type = "item", name = "fast-accumulator-2", amount = 1 }, + { type = "item", name = "steel-plate", amount = 2 }, + { type = "item", name = "processing-unit", amount = 4 }, + { type = "item", name = "battery", amount = 4 }, }, results = { { type = "item", name = "fast-accumulator-3", amount = 1 } }, }, @@ -102,10 +102,10 @@ if settings.startup["bobmods-power-accumulators"].value == true then energy_required = 10, enabled = false, ingredients = { - { "slow-accumulator-2", 1 }, - { "steel-plate", 2 }, - { "processing-unit", 4 }, - { "battery", 4 }, + { type = "item", name = "slow-accumulator-2", amount = 1 }, + { type = "item", name = "steel-plate", amount = 2 }, + { type = "item", name = "processing-unit", amount = 4 }, + { type = "item", name = "battery", amount = 4 }, }, results = { { type = "item", name = "slow-accumulator-3", amount = 1 } }, }, diff --git a/bobpower/prototypes/recipe/boilers-updates.lua b/bobpower/prototypes/recipe/boilers-updates.lua index 71eff449f..d3876b4dd 100644 --- a/bobpower/prototypes/recipe/boilers-updates.lua +++ b/bobpower/prototypes/recipe/boilers-updates.lua @@ -1,6 +1,6 @@ if settings.startup["bobmods-power-steam"].value == true then if data.raw.item["steel-pipe"] then - bobmods.lib.recipe.add_ingredient("boiler-2", { "steel-pipe", 4 }) + bobmods.lib.recipe.add_ingredient("boiler-2", { type = "item", name = "steel-pipe", amount = 4 }) end if data.raw.item["invar-alloy"] then @@ -9,7 +9,7 @@ if settings.startup["bobmods-power-steam"].value == true then end if data.raw.item["brass-pipe"] then - bobmods.lib.recipe.add_ingredient("boiler-3", { "brass-pipe", 4 }) + bobmods.lib.recipe.add_ingredient("boiler-3", { type = "item", name = "brass-pipe", amount = 4 }) bobmods.lib.tech.add_prerequisite("bob-boiler-3", "zinc-processing") end @@ -19,7 +19,7 @@ if settings.startup["bobmods-power-steam"].value == true then end if data.raw.item["ceramic-pipe"] then - bobmods.lib.recipe.add_ingredient("boiler-4", { "ceramic-pipe", 4 }) + bobmods.lib.recipe.add_ingredient("boiler-4", { type = "item", name = "ceramic-pipe", amount = 4 }) bobmods.lib.tech.add_prerequisite("bob-boiler-4", "ceramics") end @@ -29,8 +29,8 @@ if settings.startup["bobmods-power-steam"].value == true then end if data.raw.item["copper-tungsten-pipe"] then - bobmods.lib.recipe.add_ingredient("boiler-5", { "copper-tungsten-pipe", 4 }) + bobmods.lib.recipe.add_ingredient("boiler-5", { type = "item", name = "copper-tungsten-pipe", amount = 4 }) elseif data.raw.item["tungsten-pipe"] then - bobmods.lib.recipe.add_ingredient("boiler-5", { "tungsten-pipe", 4 }) + bobmods.lib.recipe.add_ingredient("boiler-5", { type = "item", name = "tungsten-pipe", amount = 4 }) end end diff --git a/bobpower/prototypes/recipe/boilers.lua b/bobpower/prototypes/recipe/boilers.lua index b8bc8ecc1..ab4967d5e 100644 --- a/bobpower/prototypes/recipe/boilers.lua +++ b/bobpower/prototypes/recipe/boilers.lua @@ -5,8 +5,8 @@ if settings.startup["bobmods-power-steam"].value == true then name = "boiler-2", enabled = false, ingredients = { - { "boiler", 1 }, - { "steel-plate", 5 }, + { type = "item", name = "boiler", amount = 1 }, + { type = "item", name = "steel-plate", amount = 5 }, }, results = { { type = "item", name = "boiler-2", amount = 1 } }, }, @@ -16,8 +16,8 @@ if settings.startup["bobmods-power-steam"].value == true then name = "boiler-3", enabled = false, ingredients = { - { "boiler-2", 1 }, - { "steel-plate", 5 }, + { type = "item", name = "boiler-2", amount = 1 }, + { type = "item", name = "steel-plate", amount = 5 }, }, results = { { type = "item", name = "boiler-3", amount = 1 } }, }, @@ -27,8 +27,8 @@ if settings.startup["bobmods-power-steam"].value == true then name = "boiler-4", enabled = false, ingredients = { - { "boiler-3", 1 }, - { "steel-plate", 5 }, + { type = "item", name = "boiler-3", amount = 1 }, + { type = "item", name = "steel-plate", amount = 5 }, }, results = { { type = "item", name = "boiler-4", amount = 1 } }, }, @@ -38,8 +38,8 @@ if settings.startup["bobmods-power-steam"].value == true then name = "boiler-5", enabled = false, ingredients = { - { "boiler-4", 1 }, - { "steel-plate", 5 }, + { type = "item", name = "boiler-4", amount = 1 }, + { type = "item", name = "steel-plate", amount = 5 }, }, results = { { type = "item", name = "boiler-5", amount = 1 } }, }, diff --git a/bobpower/prototypes/recipe/fluid-generator-updates.lua b/bobpower/prototypes/recipe/fluid-generator-updates.lua index 95026cb20..086aab52b 100644 --- a/bobpower/prototypes/recipe/fluid-generator-updates.lua +++ b/bobpower/prototypes/recipe/fluid-generator-updates.lua @@ -1,8 +1,8 @@ if settings.startup["bobmods-power-fluidgenerator"].value == true then if data.raw.item["steel-bearing"] then - bobmods.lib.recipe.add_ingredient("fluid-generator", { "steel-bearing", 10 }) + bobmods.lib.recipe.add_ingredient("fluid-generator", { type = "item", name = "steel-bearing", amount = 10 }) else - bobmods.lib.recipe.add_ingredient("fluid-generator", { "iron-gear-wheel", 10 }) + bobmods.lib.recipe.add_ingredient("fluid-generator", { type = "item", name = "iron-gear-wheel", amount = 10 }) end if data.raw.item["steel-gear-wheel"] then @@ -19,17 +19,17 @@ if settings.startup["bobmods-power-fluidgenerator"].value == true then end if data.raw.item["advanced-processing-unit"] then - bobmods.lib.recipe.add_ingredient("fluid-generator", { "electronic-circuit", 5 }) + bobmods.lib.recipe.add_ingredient("fluid-generator", { type = "item", name = "electronic-circuit", amount = 5 }) bobmods.lib.tech.add_prerequisite("fluid-generator-1", "electronics") end if data.raw.item["cobalt-steel-bearing"] then - bobmods.lib.recipe.add_ingredient("fluid-generator-2", { "cobalt-steel-bearing", 5 }) + bobmods.lib.recipe.add_ingredient("fluid-generator-2", { type = "item", name = "cobalt-steel-bearing", amount = 5 }) bobmods.lib.tech.add_prerequisite("fluid-generator-2", "cobalt-processing") elseif data.raw.item["steel-bearing"] then - bobmods.lib.recipe.add_ingredient("fluid-generator-2", { "steel-bearing", 10 }) + bobmods.lib.recipe.add_ingredient("fluid-generator-2", { type = "item", name = "steel-bearing", amount = 10 }) else - bobmods.lib.recipe.add_ingredient("fluid-generator-2", { "iron-gear-wheel", 10 }) + bobmods.lib.recipe.add_ingredient("fluid-generator-2", { type = "item", name = "iron-gear-wheel", amount = 10 }) end if data.raw.item["cobalt-steel-gear-wheel"] then @@ -53,10 +53,10 @@ if settings.startup["bobmods-power-fluidgenerator"].value == true then end if data.raw.item["brass-pipe"] then - bobmods.lib.recipe.add_ingredient("fluid-generator-2", { "brass-pipe", 5 }) + bobmods.lib.recipe.add_ingredient("fluid-generator-2", { type = "item", name = "brass-pipe", amount = 5 }) bobmods.lib.tech.add_prerequisite("fluid-generator-2", "zinc-processing") elseif data.raw.item["steel-pipe"] then - bobmods.lib.recipe.add_ingredient("fluid-generator-2", { "steel-pipe", 5 }) + bobmods.lib.recipe.add_ingredient("fluid-generator-2", { type = "item", name = "steel-pipe", amount = 5 }) end if data.raw.item["advanced-processing-unit"] then @@ -65,11 +65,11 @@ if settings.startup["bobmods-power-fluidgenerator"].value == true then end if data.raw.item["titanium-bearing"] then - bobmods.lib.recipe.add_ingredient("fluid-generator-3", { "titanium-bearing", 10 }) + bobmods.lib.recipe.add_ingredient("fluid-generator-3", { type = "item", name = "titanium-bearing", amount = 10 }) elseif data.raw.item["steel-bearing"] then - bobmods.lib.recipe.add_ingredient("fluid-generator-3", { "steel-bearing", 10 }) + bobmods.lib.recipe.add_ingredient("fluid-generator-3", { type = "item", name = "steel-bearing", amount = 10 }) else - bobmods.lib.recipe.add_ingredient("fluid-generator-3", { "iron-gear-wheel", 10 }) + bobmods.lib.recipe.add_ingredient("fluid-generator-3", { type = "item", name = "iron-gear-wheel", amount = 10 }) end if data.raw.item["titanium-gear-wheel"] then @@ -89,7 +89,7 @@ if settings.startup["bobmods-power-fluidgenerator"].value == true then end if data.raw.item["ceramic-pipe"] then - bobmods.lib.recipe.add_ingredient("fluid-generator-3", { "ceramic-pipe", 5 }) + bobmods.lib.recipe.add_ingredient("fluid-generator-3", { type = "item", name = "ceramic-pipe", amount = 5 }) bobmods.lib.tech.add_prerequisite("fluid-generator-3", "ceramics") end @@ -100,9 +100,9 @@ if settings.startup["bobmods-power-fluidgenerator"].value == true then if mods["bobrevamp"] and data.raw.fluid.hydrogen and data.raw.fluid.oxygen and data.raw.fluid.nitrogen then if data.raw.item["nitinol-bearing"] then - bobmods.lib.recipe.add_ingredient("hydrazine-generator", { "nitinol-bearing", 10 }) + bobmods.lib.recipe.add_ingredient("hydrazine-generator", { type = "item", name = "nitinol-bearing", amount = 10 }) else - bobmods.lib.recipe.add_ingredient("hydrazine-generator", { "iron-gear-wheel", 10 }) + bobmods.lib.recipe.add_ingredient("hydrazine-generator", { type = "item", name = "iron-gear-wheel", amount = 10 }) end if data.raw.item["nitinol-gear-wheel"] then @@ -120,10 +120,10 @@ if settings.startup["bobmods-power-fluidgenerator"].value == true then end if data.raw.item["copper-tungsten-pipe"] then - bobmods.lib.recipe.add_ingredient("hydrazine-generator", { "copper-tungsten-pipe", 5 }) + bobmods.lib.recipe.add_ingredient("hydrazine-generator", { type = "item", name = "copper-tungsten-pipe", amount = 5 }) bobmods.lib.tech.add_prerequisite("hydrazine-generator", "tungsten-alloy-processing") elseif data.raw.item["tungsten-pipe"] then - bobmods.lib.recipe.add_ingredient("hydrazine-generator", { "tungsten-pipe", 5 }) + bobmods.lib.recipe.add_ingredient("hydrazine-generator", { type = "item", name = "tungsten-pipe", amount = 5 }) bobmods.lib.tech.add_prerequisite("hydrazine-generator", "tungsten-processing") end diff --git a/bobpower/prototypes/recipe/fluid-generator.lua b/bobpower/prototypes/recipe/fluid-generator.lua index e1d8b7cad..2d85e32d2 100644 --- a/bobpower/prototypes/recipe/fluid-generator.lua +++ b/bobpower/prototypes/recipe/fluid-generator.lua @@ -6,10 +6,10 @@ if settings.startup["bobmods-power-fluidgenerator"].value == true then energy_required = 2, enabled = false, ingredients = { - { "iron-gear-wheel", 10 }, - { "iron-plate", 5 }, - { "steel-plate", 10 }, - { "pipe", 5 }, + { type = "item", name = "iron-gear-wheel", amount = 10 }, + { type = "item", name = "iron-plate", amount = 5 }, + { type = "item", name = "steel-plate", amount = 10 }, + { type = "item", name = "pipe", amount = 5 }, }, results = { { type = "item", name = "fluid-generator", amount = 1 } }, }, @@ -20,11 +20,11 @@ if settings.startup["bobmods-power-fluidgenerator"].value == true then energy_required = 2, enabled = false, ingredients = { - { "fluid-generator", 1 }, - { "iron-plate", 5 }, - { "steel-plate", 10 }, - { "iron-gear-wheel", 10 }, - { "electronic-circuit", 5 }, + { type = "item", name = "fluid-generator", amount = 1 }, + { type = "item", name = "iron-plate", amount = 5 }, + { type = "item", name = "steel-plate", amount = 10 }, + { type = "item", name = "iron-gear-wheel", amount = 10 }, + { type = "item", name = "electronic-circuit", amount = 5 }, }, results = { { type = "item", name = "fluid-generator-2", amount = 1 } }, }, @@ -35,11 +35,11 @@ if settings.startup["bobmods-power-fluidgenerator"].value == true then energy_required = 2, enabled = false, ingredients = { - { "fluid-generator-2", 1 }, - { "advanced-circuit", 5 }, - { "iron-plate", 5 }, - { "steel-plate", 10 }, - { "iron-gear-wheel", 10 }, + { type = "item", name = "fluid-generator-2", amount = 1 }, + { type = "item", name = "advanced-circuit", amount = 5 }, + { type = "item", name = "iron-plate", amount = 5 }, + { type = "item", name = "steel-plate", amount = 10 }, + { type = "item", name = "iron-gear-wheel", amount = 10 }, }, results = { { type = "item", name = "fluid-generator-3", amount = 1 } }, }, @@ -53,11 +53,11 @@ if settings.startup["bobmods-power-fluidgenerator"].value == true then energy_required = 2, enabled = false, ingredients = { - { "fluid-generator-3", 1 }, - { "processing-unit", 5 }, - { "iron-plate", 5 }, - { "steel-plate", 10 }, - { "iron-gear-wheel", 10 }, + { type = "item", name = "fluid-generator-3", amount = 1 }, + { type = "item", name = "processing-unit", amount = 5 }, + { type = "item", name = "iron-plate", amount = 5 }, + { type = "item", name = "steel-plate", amount = 10 }, + { type = "item", name = "iron-gear-wheel", amount = 10 }, }, results = { { type = "item", name = "hydrazine-generator", amount = 1 } }, }, diff --git a/bobpower/prototypes/recipe/heat-exchangers-updates.lua b/bobpower/prototypes/recipe/heat-exchangers-updates.lua index cd7cc202e..83ca902b3 100644 --- a/bobpower/prototypes/recipe/heat-exchangers-updates.lua +++ b/bobpower/prototypes/recipe/heat-exchangers-updates.lua @@ -10,14 +10,14 @@ if settings.startup["bobmods-power-steam"].value == true then end if data.raw.item["brass-pipe"] then - bobmods.lib.recipe.add_ingredient("heat-exchanger-2", { "brass-pipe", 4 }) + bobmods.lib.recipe.add_ingredient("heat-exchanger-2", { type = "item", name = "brass-pipe", amount = 4 }) end if data.raw.item["tungsten-plate"] then bobmods.lib.recipe.replace_ingredient("heat-exchanger-3", "steel-plate", "tungsten-plate") bobmods.lib.tech.add_prerequisite("bob-heat-exchanger-3", "tungsten-processing") end if data.raw.item["ceramic-pipe"] then - bobmods.lib.recipe.add_ingredient("heat-exchanger-3", { "ceramic-pipe", 4 }) + bobmods.lib.recipe.add_ingredient("heat-exchanger-3", { type = "item", name = "ceramic-pipe", amount = 4 }) bobmods.lib.tech.add_prerequisite("bob-heat-exchanger-3", "ceramics") end if data.raw.item["copper-tungsten-alloy"] then @@ -25,9 +25,9 @@ if settings.startup["bobmods-power-steam"].value == true then bobmods.lib.tech.add_prerequisite("bob-heat-exchanger-4", "tungsten-alloy-processing") end if data.raw.item["copper-tungsten-pipe"] then - bobmods.lib.recipe.add_ingredient("heat-exchanger-4", { "copper-tungsten-pipe", 4 }) + bobmods.lib.recipe.add_ingredient("heat-exchanger-4", { type = "item", name = "copper-tungsten-pipe", amount = 4 }) elseif data.raw.item["tungsten-pipe"] then - bobmods.lib.recipe.add_ingredient("heat-exchanger-4", { "tungsten-pipe", 4 }) + bobmods.lib.recipe.add_ingredient("heat-exchanger-4", { type = "item", name = "tungsten-pipe", amount = 4 }) end if diff --git a/bobpower/prototypes/recipe/heat-exchangers.lua b/bobpower/prototypes/recipe/heat-exchangers.lua index 43efcc7fd..f83557bf5 100644 --- a/bobpower/prototypes/recipe/heat-exchangers.lua +++ b/bobpower/prototypes/recipe/heat-exchangers.lua @@ -6,8 +6,8 @@ if settings.startup["bobmods-power-steam"].value == true then energy_required = 3, enabled = false, ingredients = { - { "boiler-2", 1 }, - { "heat-pipe", 4 }, + { type = "item", name = "boiler-2", amount = 1 }, + { type = "item", name = "heat-pipe", amount = 4 }, }, results = { { type = "item", name = "heat-exchanger", amount = 1 } }, }, @@ -17,9 +17,9 @@ if settings.startup["bobmods-power-steam"].value == true then name = "heat-exchanger-2", enabled = false, ingredients = { - { "heat-exchanger", 1 }, - { "steel-plate", 10 }, - { "heat-pipe-2", 4 }, + { type = "item", name = "heat-exchanger", amount = 1 }, + { type = "item", name = "steel-plate", amount = 10 }, + { type = "item", name = "heat-pipe-2", amount = 4 }, }, results = { { type = "item", name = "heat-exchanger-2", amount = 1 } }, }, @@ -29,9 +29,9 @@ if settings.startup["bobmods-power-steam"].value == true then name = "heat-exchanger-3", enabled = false, ingredients = { - { "heat-exchanger-2", 1 }, - { "steel-plate", 10 }, - { "heat-pipe-3", 4 }, + { type = "item", name = "heat-exchanger-2", amount = 1 }, + { type = "item", name = "steel-plate", amount = 10 }, + { type = "item", name = "heat-pipe-3", amount = 4 }, }, results = { { type = "item", name = "heat-exchanger-3", amount = 1 } }, }, @@ -40,9 +40,9 @@ if settings.startup["bobmods-power-steam"].value == true then name = "heat-exchanger-4", enabled = false, ingredients = { - { "heat-exchanger-3", 1 }, - { "steel-plate", 10 }, - { "heat-pipe-4", 4 }, + { type = "item", name = "heat-exchanger-3", amount = 1 }, + { type = "item", name = "steel-plate", amount = 10 }, + { type = "item", name = "heat-pipe-4", amount = 4 }, }, results = { { type = "item", name = "heat-exchanger-4", amount = 1 } }, }, @@ -59,8 +59,8 @@ if settings.startup["bobmods-power-steam"].value == true then subgroup = "bob-energy-heat-exchanger-convert", enabled = false, ingredients = { - { "boiler-3", 1 }, - { "heat-pipe-2", 4 }, + { type = "item", name = "boiler-3", amount = 1 }, + { type = "item", name = "heat-pipe-2", amount = 4 }, }, results = { { type = "item", name = "heat-exchanger-2", amount = 1 } }, allow_as_intermediate = false, @@ -71,8 +71,8 @@ if settings.startup["bobmods-power-steam"].value == true then subgroup = "bob-energy-heat-exchanger-convert", enabled = false, ingredients = { - { "boiler-4", 1 }, - { "heat-pipe-3", 4 }, + { type = "item", name = "boiler-4", amount = 1 }, + { type = "item", name = "heat-pipe-3", amount = 4 }, }, results = { { type = "item", name = "heat-exchanger-3", amount = 1 } }, allow_as_intermediate = false, @@ -84,8 +84,8 @@ if settings.startup["bobmods-power-steam"].value == true then subgroup = "bob-energy-heat-exchanger-convert", enabled = false, ingredients = { - { "boiler-5", 1 }, - { "heat-pipe-4", 4 }, + { type = "item", name = "boiler-5", amount = 1 }, + { type = "item", name = "heat-pipe-4", amount = 4 }, }, results = { { type = "item", name = "heat-exchanger-4", amount = 1 } }, allow_as_intermediate = false, @@ -100,11 +100,11 @@ if settings.startup["bobmods-power-steam"].value == true then energy_required = 3, enabled = false, ingredients = { - { "heat-exchanger", 1 }, + { type = "item", name = "heat-exchanger", amount = 1 }, }, results = { - { "boiler-2", 1 }, - { "heat-pipe", 4 }, + { type = "item", name = "boiler-2", amount = 1 }, + { type = "item", name = "heat-pipe", amount = 4 }, }, main_product = "boiler-2", allow_as_intermediate = false, @@ -116,11 +116,11 @@ if settings.startup["bobmods-power-steam"].value == true then subgroup = "bob-energy-boiler-convert", enabled = false, ingredients = { - { "heat-exchanger-2", 1 }, + { type = "item", name = "heat-exchanger-2", amount = 1 }, }, results = { - { "boiler-3", 1 }, - { "heat-pipe-2", 4 }, + { type = "item", name = "boiler-3", amount = 1 }, + { type = "item", name = "heat-pipe-2", amount = 4 }, }, main_product = "boiler-3", allow_as_intermediate = false, @@ -132,11 +132,11 @@ if settings.startup["bobmods-power-steam"].value == true then subgroup = "bob-energy-boiler-convert", enabled = false, ingredients = { - { "heat-exchanger-3", 1 }, + { type = "item", name = "heat-exchanger-3", amount = 1 }, }, results = { - { "boiler-4", 1 }, - { "heat-pipe-3", 4 }, + { type = "item", name = "boiler-4", amount = 1 }, + { type = "item", name = "heat-pipe-3", amount = 4 }, }, main_product = "boiler-4", allow_as_intermediate = false, @@ -148,11 +148,11 @@ if settings.startup["bobmods-power-steam"].value == true then subgroup = "bob-energy-boiler-convert", enabled = false, ingredients = { - { "heat-exchanger-4", 1 }, + { type = "item", name = "heat-exchanger-4", amount = 1 }, }, results = { - { "boiler-5", 1 }, - { "heat-pipe-4", 4 }, + { type = "item", name = "boiler-5", amount = 1 }, + { type = "item", name = "heat-pipe-4", amount = 4 }, }, main_product = "boiler-5", allow_as_intermediate = false, diff --git a/bobpower/prototypes/recipe/nuclear-updates.lua b/bobpower/prototypes/recipe/nuclear-updates.lua index 738c0cab7..91a028a4c 100644 --- a/bobpower/prototypes/recipe/nuclear-updates.lua +++ b/bobpower/prototypes/recipe/nuclear-updates.lua @@ -1,12 +1,12 @@ if settings.startup["bobmods-power-nuclear"].value == true then bobmods.lib.recipe.remove_ingredient("nuclear-reactor", "copper-plate") - bobmods.lib.recipe.add_ingredient("nuclear-reactor", { "heat-pipe-2", 25 }) - bobmods.lib.recipe.set_ingredient("nuclear-reactor", { "steel-plate", 250 }) + bobmods.lib.recipe.add_ingredient("nuclear-reactor", { type = "item", name = "heat-pipe-2", amount = 25 }) + bobmods.lib.recipe.set_ingredient("nuclear-reactor", { type = "item", name = "steel-plate", amount = 250 }) if data.raw.item["heat-pipe-3"] then bobmods.lib.recipe.remove_ingredient("nuclear-reactor-2", "copper-plate") - bobmods.lib.recipe.add_ingredient("nuclear-reactor-2", { "heat-pipe-3", 25 }) - bobmods.lib.recipe.set_ingredient("nuclear-reactor-2", { "steel-plate", 250 }) + bobmods.lib.recipe.add_ingredient("nuclear-reactor-2", { type = "item", name = "heat-pipe-3", amount = 25 }) + bobmods.lib.recipe.set_ingredient("nuclear-reactor-2", { type = "item", name = "steel-plate", amount = 250 }) elseif data.raw.item["brass-alloy"] then bobmods.lib.recipe.replace_ingredient("nuclear-reactor-2", "copper-plate", "brass-alloy") bobmods.lib.tech.add_prerequisite("bob-nuclear-power-2", "zinc-processing") @@ -23,8 +23,8 @@ if settings.startup["bobmods-power-nuclear"].value == true then if data.raw.item["heat-pipe-4"] then bobmods.lib.recipe.remove_ingredient("nuclear-reactor-3", "copper-plate") - bobmods.lib.recipe.add_ingredient("nuclear-reactor-3", { "heat-pipe-4", 25 }) - bobmods.lib.recipe.set_ingredient("nuclear-reactor-3", { "steel-plate", 250 }) + bobmods.lib.recipe.add_ingredient("nuclear-reactor-3", { type = "item", name = "heat-pipe-4", amount = 25 }) + bobmods.lib.recipe.set_ingredient("nuclear-reactor-3", { type = "item", name = "steel-plate", amount = 250 }) elseif data.raw.item["copper-tungsten-alloy"] then bobmods.lib.recipe.replace_ingredient("nuclear-reactor-3", "copper-plate", "copper-tungsten-alloy") bobmods.lib.tech.add_prerequisite("bob-nuclear-power-3", "tungsten-alloy-processing") diff --git a/bobpower/prototypes/recipe/nuclear.lua b/bobpower/prototypes/recipe/nuclear.lua index 9b5d72aa3..ef31da0cd 100644 --- a/bobpower/prototypes/recipe/nuclear.lua +++ b/bobpower/prototypes/recipe/nuclear.lua @@ -6,11 +6,11 @@ if settings.startup["bobmods-power-nuclear"].value == true then energy_required = 12, enabled = false, ingredients = { - { "nuclear-reactor", 1 }, - { "concrete", 500 }, - { "steel-plate", 500 }, - { "processing-unit", 500 }, - { "copper-plate", 500 }, + { type = "item", name = "nuclear-reactor", amount = 1 }, + { type = "item", name = "concrete", amount = 500 }, + { type = "item", name = "steel-plate", amount = 500 }, + { type = "item", name = "processing-unit", amount = 500 }, + { type = "item", name = "copper-plate", amount = 500 }, }, results = { { type = "item", name = "nuclear-reactor-2", amount = 1 } }, requester_paste_multiplier = 1, @@ -21,11 +21,11 @@ if settings.startup["bobmods-power-nuclear"].value == true then energy_required = 16, enabled = false, ingredients = { - { "nuclear-reactor-2", 1 }, - { "concrete", 500 }, - { "steel-plate", 500 }, - { "processing-unit", 500 }, - { "copper-plate", 500 }, + { type = "item", name = "nuclear-reactor-2", amount = 1 }, + { type = "item", name = "concrete", amount = 500 }, + { type = "item", name = "steel-plate", amount = 500 }, + { type = "item", name = "processing-unit", amount = 500 }, + { type = "item", name = "copper-plate", amount = 500 }, }, results = { { type = "item", name = "nuclear-reactor-3", amount = 1 } }, requester_paste_multiplier = 1, diff --git a/bobpower/prototypes/recipe/oil-boilers-updates.lua b/bobpower/prototypes/recipe/oil-boilers-updates.lua index 19fb71107..3ac48ecd0 100644 --- a/bobpower/prototypes/recipe/oil-boilers-updates.lua +++ b/bobpower/prototypes/recipe/oil-boilers-updates.lua @@ -9,7 +9,7 @@ if settings.startup["bobmods-power-steam"].value == true then end if data.raw.item["brass-pipe"] then - bobmods.lib.recipe.add_ingredient("oil-boiler-2", { "brass-pipe", 6 }) + bobmods.lib.recipe.add_ingredient("oil-boiler-2", { type = "item", name = "brass-pipe", amount = 6 }) bobmods.lib.tech.add_prerequisite("bob-oil-boiler-2", "zinc-processing") end @@ -19,7 +19,7 @@ if settings.startup["bobmods-power-steam"].value == true then end if data.raw.item["ceramic-pipe"] then - bobmods.lib.recipe.add_ingredient("oil-boiler-3", { "ceramic-pipe", 6 }) + bobmods.lib.recipe.add_ingredient("oil-boiler-3", { type = "item", name = "ceramic-pipe", amount = 6 }) bobmods.lib.tech.add_prerequisite("bob-oil-boiler-3", "ceramics") end @@ -29,9 +29,9 @@ if settings.startup["bobmods-power-steam"].value == true then end if data.raw.item["copper-tungsten-pipe"] then - bobmods.lib.recipe.add_ingredient("oil-boiler-4", { "copper-tungsten-pipe", 6 }) + bobmods.lib.recipe.add_ingredient("oil-boiler-4", { type = "item", name = "copper-tungsten-pipe", amount = 6 }) elseif data.raw.item["tungsten-pipe"] then - bobmods.lib.recipe.add_ingredient("oil-boiler-4", { "tungsten-pipe", 6 }) + bobmods.lib.recipe.add_ingredient("oil-boiler-4", { type = "item", name = "tungsten-pipe", amount = 6 }) end if diff --git a/bobpower/prototypes/recipe/oil-boilers.lua b/bobpower/prototypes/recipe/oil-boilers.lua index 2fb82f4e0..89b427128 100644 --- a/bobpower/prototypes/recipe/oil-boilers.lua +++ b/bobpower/prototypes/recipe/oil-boilers.lua @@ -5,8 +5,8 @@ if settings.startup["bobmods-power-steam"].value == true then name = "oil-boiler", enabled = false, ingredients = { - { "boiler-2", 1 }, - { "pipe", 2 }, + { type = "item", name = "boiler-2", amount = 1 }, + { type = "item", name = "pipe", amount = 2 }, }, results = { { type = "item", name = "oil-boiler", amount = 1 } }, }, @@ -16,8 +16,8 @@ if settings.startup["bobmods-power-steam"].value == true then name = "oil-boiler-2", enabled = false, ingredients = { - { "oil-boiler", 1 }, - { "steel-plate", 5 }, + { type = "item", name = "oil-boiler", amount = 1 }, + { type = "item", name = "steel-plate", amount = 5 }, }, results = { { type = "item", name = "oil-boiler-2", amount = 1 } }, }, @@ -27,8 +27,8 @@ if settings.startup["bobmods-power-steam"].value == true then name = "oil-boiler-3", enabled = false, ingredients = { - { "oil-boiler-2", 1 }, - { "steel-plate", 5 }, + { type = "item", name = "oil-boiler-2", amount = 1 }, + { type = "item", name = "steel-plate", amount = 5 }, }, results = { { type = "item", name = "oil-boiler-3", amount = 1 } }, }, @@ -38,8 +38,8 @@ if settings.startup["bobmods-power-steam"].value == true then name = "oil-boiler-4", enabled = false, ingredients = { - { "oil-boiler-3", 1 }, - { "steel-plate", 5 }, + { type = "item", name = "oil-boiler-3", amount = 1 }, + { type = "item", name = "steel-plate", amount = 5 }, }, results = { { type = "item", name = "oil-boiler-4", amount = 1 } }, }, @@ -56,8 +56,8 @@ if settings.startup["bobmods-power-steam"].value == true then subgroup = "bob-energy-oil-boiler-convert", enabled = false, ingredients = { - { "boiler-3", 1 }, - { "pipe", 2 }, + { type = "item", name = "boiler-3", amount = 1 }, + { type = "item", name = "pipe", amount = 2 }, }, results = { { type = "item", name = "oil-boiler-2", amount = 1 } }, allow_as_intermediate = false, @@ -69,8 +69,8 @@ if settings.startup["bobmods-power-steam"].value == true then subgroup = "bob-energy-oil-boiler-convert", enabled = false, ingredients = { - { "boiler-4", 1 }, - { "pipe", 2 }, + { type = "item", name = "boiler-4", amount = 1 }, + { type = "item", name = "pipe", amount = 2 }, }, results = { { type = "item", name = "oil-boiler-3", amount = 1 } }, allow_as_intermediate = false, @@ -82,8 +82,8 @@ if settings.startup["bobmods-power-steam"].value == true then subgroup = "bob-energy-oil-boiler-convert", enabled = false, ingredients = { - { "boiler-5", 1 }, - { "pipe", 2 }, + { type = "item", name = "boiler-5", amount = 1 }, + { type = "item", name = "pipe", amount = 2 }, }, results = { { type = "item", name = "oil-boiler-4", amount = 1 } }, allow_as_intermediate = false, @@ -96,11 +96,11 @@ if settings.startup["bobmods-power-steam"].value == true then subgroup = "bob-energy-boiler-convert", enabled = false, ingredients = { - { "oil-boiler", 1 }, + { type = "item", name = "oil-boiler", amount = 1 }, }, results = { - { "boiler-2", 1 }, - { "pipe", 2 }, + { type = "item", name = "boiler-2", amount = 1 }, + { type = "item", name = "pipe", amount = 2 }, }, main_product = "boiler-2", allow_as_intermediate = false, @@ -112,11 +112,11 @@ if settings.startup["bobmods-power-steam"].value == true then subgroup = "bob-energy-boiler-convert", enabled = false, ingredients = { - { "oil-boiler-2", 1 }, + { type = "item", name = "oil-boiler-2", amount = 1 }, }, results = { - { "boiler-3", 1 }, - { "pipe", 2 }, + { type = "item", name = "boiler-3", amount = 1 }, + { type = "item", name = "pipe", amount = 2 }, }, main_product = "boiler-3", allow_as_intermediate = false, @@ -128,11 +128,11 @@ if settings.startup["bobmods-power-steam"].value == true then subgroup = "bob-energy-boiler-convert", enabled = false, ingredients = { - { "oil-boiler-3", 1 }, + { type = "item", name = "oil-boiler-3", amount = 1 }, }, results = { - { "boiler-4", 1 }, - { "pipe", 2 }, + { type = "item", name = "boiler-4", amount = 1 }, + { type = "item", name = "pipe", amount = 2 }, }, main_product = "boiler-4", allow_as_intermediate = false, @@ -144,11 +144,11 @@ if settings.startup["bobmods-power-steam"].value == true then subgroup = "bob-energy-boiler-convert", enabled = false, ingredients = { - { "oil-boiler-4", 1 }, + { type = "item", name = "oil-boiler-4", amount = 1 }, }, results = { - { "boiler-5", 1 }, - { "pipe", 2 }, + { type = "item", name = "boiler-5", amount = 1 }, + { type = "item", name = "pipe", amount = 2 }, }, main_product = "boiler-5", allow_as_intermediate = false, diff --git a/bobpower/prototypes/recipe/poles.lua b/bobpower/prototypes/recipe/poles.lua index ca0483d82..f8aa96a6e 100644 --- a/bobpower/prototypes/recipe/poles.lua +++ b/bobpower/prototypes/recipe/poles.lua @@ -5,9 +5,9 @@ if settings.startup["bobmods-power-poles"].value == true then name = "medium-electric-pole-2", enabled = false, ingredients = { - { "medium-electric-pole", 1 }, - { "steel-plate", 2 }, - { "copper-plate", 2 }, + { type = "item", name = "medium-electric-pole", amount = 1 }, + { type = "item", name = "steel-plate", amount = 2 }, + { type = "item", name = "copper-plate", amount = 2 }, }, results = { { type = "item", name = "medium-electric-pole-2", amount = 1 } }, }, @@ -17,9 +17,9 @@ if settings.startup["bobmods-power-poles"].value == true then name = "medium-electric-pole-3", enabled = false, ingredients = { - { "medium-electric-pole-2", 1 }, - { "steel-plate", 2 }, - { "copper-plate", 2 }, + { type = "item", name = "medium-electric-pole-2", amount = 1 }, + { type = "item", name = "steel-plate", amount = 2 }, + { type = "item", name = "copper-plate", amount = 2 }, }, results = { { type = "item", name = "medium-electric-pole-3", amount = 1 } }, }, @@ -29,9 +29,9 @@ if settings.startup["bobmods-power-poles"].value == true then name = "medium-electric-pole-4", enabled = false, ingredients = { - { "medium-electric-pole-3", 1 }, - { "steel-plate", 2 }, - { "copper-plate", 2 }, + { type = "item", name = "medium-electric-pole-3", amount = 1 }, + { type = "item", name = "steel-plate", amount = 2 }, + { type = "item", name = "copper-plate", amount = 2 }, }, results = { { type = "item", name = "medium-electric-pole-4", amount = 1 } }, }, @@ -41,9 +41,9 @@ if settings.startup["bobmods-power-poles"].value == true then name = "big-electric-pole-2", enabled = false, ingredients = { - { "big-electric-pole", 1 }, - { "steel-plate", 5 }, - { "copper-plate", 5 }, + { type = "item", name = "big-electric-pole", amount = 1 }, + { type = "item", name = "steel-plate", amount = 5 }, + { type = "item", name = "copper-plate", amount = 5 }, }, results = { { type = "item", name = "big-electric-pole-2", amount = 1 } }, }, @@ -53,9 +53,9 @@ if settings.startup["bobmods-power-poles"].value == true then name = "big-electric-pole-3", enabled = false, ingredients = { - { "big-electric-pole-2", 1 }, - { "steel-plate", 5 }, - { "copper-plate", 5 }, + { type = "item", name = "big-electric-pole-2", amount = 1 }, + { type = "item", name = "steel-plate", amount = 5 }, + { type = "item", name = "copper-plate", amount = 5 }, }, results = { { type = "item", name = "big-electric-pole-3", amount = 1 } }, }, @@ -65,9 +65,9 @@ if settings.startup["bobmods-power-poles"].value == true then name = "big-electric-pole-4", enabled = false, ingredients = { - { "big-electric-pole-3", 1 }, - { "steel-plate", 5 }, - { "copper-plate", 5 }, + { type = "item", name = "big-electric-pole-3", amount = 1 }, + { type = "item", name = "steel-plate", amount = 5 }, + { type = "item", name = "copper-plate", amount = 5 }, }, results = { { type = "item", name = "big-electric-pole-4", amount = 1 } }, }, @@ -77,10 +77,10 @@ if settings.startup["bobmods-power-poles"].value == true then name = "substation-2", enabled = false, ingredients = { - { "substation", 1 }, - { "advanced-circuit", 5 }, - { "steel-plate", 10 }, - { "copper-plate", 5 }, + { type = "item", name = "substation", amount = 1 }, + { type = "item", name = "advanced-circuit", amount = 5 }, + { type = "item", name = "steel-plate", amount = 10 }, + { type = "item", name = "copper-plate", amount = 5 }, }, results = { { type = "item", name = "substation-2", amount = 1 } }, }, @@ -90,10 +90,10 @@ if settings.startup["bobmods-power-poles"].value == true then name = "substation-3", enabled = false, ingredients = { - { "substation-2", 1 }, - { "processing-unit", 5 }, - { "steel-plate", 10 }, - { "copper-plate", 5 }, + { type = "item", name = "substation-2", amount = 1 }, + { type = "item", name = "processing-unit", amount = 5 }, + { type = "item", name = "steel-plate", amount = 10 }, + { type = "item", name = "copper-plate", amount = 5 }, }, results = { { type = "item", name = "substation-3", amount = 1 } }, }, @@ -103,10 +103,10 @@ if settings.startup["bobmods-power-poles"].value == true then name = "substation-4", enabled = false, ingredients = { - { "substation-3", 1 }, - { "processing-unit", 5 }, - { "steel-plate", 10 }, - { "copper-plate", 5 }, + { type = "item", name = "substation-3", amount = 1 }, + { type = "item", name = "processing-unit", amount = 5 }, + { type = "item", name = "steel-plate", amount = 10 }, + { type = "item", name = "copper-plate", amount = 5 }, }, results = { { type = "item", name = "substation-4", amount = 1 } }, }, diff --git a/bobpower/prototypes/recipe/solar-panels-updates.lua b/bobpower/prototypes/recipe/solar-panels-updates.lua index 0d2f4c3d9..4e0167725 100644 --- a/bobpower/prototypes/recipe/solar-panels-updates.lua +++ b/bobpower/prototypes/recipe/solar-panels-updates.lua @@ -26,21 +26,21 @@ if settings.startup["bobmods-power-solar"].value == true then end if data.raw.item["silicon-wafer"] then - bobmods.lib.recipe.add_ingredient("solar-panel-small-3", { "silicon-wafer", 16 }) - bobmods.lib.recipe.add_ingredient("solar-panel-3", { "silicon-wafer", 36 }) - bobmods.lib.recipe.add_ingredient("solar-panel-large-3", { "silicon-wafer", 64 }) + bobmods.lib.recipe.add_ingredient("solar-panel-small-3", { type = "item", name = "silicon-wafer", amount = 16 }) + bobmods.lib.recipe.add_ingredient("solar-panel-3", { type = "item", name = "silicon-wafer", amount = 36 }) + bobmods.lib.recipe.add_ingredient("solar-panel-large-3", { type = "item", name = "silicon-wafer", amount = 64 }) bobmods.lib.tech.add_prerequisite("bob-solar-energy-3", "silicon-processing") else if data.raw.item["silicon"] then - bobmods.lib.recipe.add_ingredient("solar-panel-small-3", { "silicon", 2 }) - bobmods.lib.recipe.add_ingredient("solar-panel-3", { "silicon", 4 }) - bobmods.lib.recipe.add_ingredient("solar-panel-large-3", { "silicon", 8 }) + bobmods.lib.recipe.add_ingredient("solar-panel-small-3", { type = "item", name = "silicon", amount = 2 }) + bobmods.lib.recipe.add_ingredient("solar-panel-3", { type = "item", name = "silicon", amount = 4 }) + bobmods.lib.recipe.add_ingredient("solar-panel-large-3", { type = "item", name = "silicon", amount = 8 }) bobmods.lib.tech.add_prerequisite("bob-solar-energy-3", "silicon-processing") else if data.raw.item["silicon-plate"] then - bobmods.lib.recipe.add_ingredient("solar-panel-small-3", { "silicon-plate", 2 }) - bobmods.lib.recipe.add_ingredient("solar-panel-3", { "silicon-plate", 4 }) - bobmods.lib.recipe.add_ingredient("solar-panel-large-3", { "silicon-plate", 8 }) + bobmods.lib.recipe.add_ingredient("solar-panel-small-3", { type = "item", name = "silicon-plate", amount = 2 }) + bobmods.lib.recipe.add_ingredient("solar-panel-3", { type = "item", name = "silicon-plate", amount = 4 }) + bobmods.lib.recipe.add_ingredient("solar-panel-large-3", { type = "item", name = "silicon-plate", amount = 8 }) bobmods.lib.tech.add_prerequisite("bob-solar-energy-3", "silicon-processing") end end diff --git a/bobpower/prototypes/recipe/solar-panels.lua b/bobpower/prototypes/recipe/solar-panels.lua index 405113fee..bf32e2eb6 100644 --- a/bobpower/prototypes/recipe/solar-panels.lua +++ b/bobpower/prototypes/recipe/solar-panels.lua @@ -1,8 +1,8 @@ if settings.startup["bobmods-power-solar"].value == true then data.raw.recipe["solar-panel"].ingredients = { - { "steel-plate", 4 }, - { "electronic-circuit", 14 }, - { "copper-plate", 4 }, + { type = "item", name = "steel-plate", amount = 4 }, + { type = "item", name = "electronic-circuit", amount = 14 }, + { type = "item", name = "copper-plate", amount = 4 }, } data:extend({ @@ -12,9 +12,9 @@ if settings.startup["bobmods-power-solar"].value == true then energy_required = 4.5, enabled = false, ingredients = { - { "steel-plate", 2 }, - { "electronic-circuit", 6 }, - { "copper-plate", 2 }, + { type = "item", name = "steel-plate", amount = 2 }, + { type = "item", name = "electronic-circuit", amount = 6 }, + { type = "item", name = "copper-plate", amount = 2 }, }, results = { { type = "item", name = "solar-panel-small", amount = 1 } }, }, @@ -25,9 +25,9 @@ if settings.startup["bobmods-power-solar"].value == true then energy_required = 18, enabled = false, ingredients = { - { "steel-plate", 8 }, - { "electronic-circuit", 24 }, - { "copper-plate", 8 }, + { type = "item", name = "steel-plate", amount = 8 }, + { type = "item", name = "electronic-circuit", amount = 24 }, + { type = "item", name = "copper-plate", amount = 8 }, }, results = { { type = "item", name = "solar-panel-large", amount = 1 } }, }, @@ -38,10 +38,10 @@ if settings.startup["bobmods-power-solar"].value == true then energy_required = 4.5, enabled = false, ingredients = { - { "solar-panel-small", 1 }, - { "steel-plate", 2 }, - { "advanced-circuit", 4 }, - { "copper-plate", 2 }, + { type = "item", name = "solar-panel-small", amount = 1 }, + { type = "item", name = "steel-plate", amount = 2 }, + { type = "item", name = "advanced-circuit", amount = 4 }, + { type = "item", name = "copper-plate", amount = 2 }, }, results = { { type = "item", name = "solar-panel-small-2", amount = 1 } }, }, @@ -52,10 +52,10 @@ if settings.startup["bobmods-power-solar"].value == true then energy_required = 10, enabled = false, ingredients = { - { "solar-panel", 1 }, - { "steel-plate", 4 }, - { "advanced-circuit", 9 }, - { "copper-plate", 4 }, + { type = "item", name = "solar-panel", amount = 1 }, + { type = "item", name = "steel-plate", amount = 4 }, + { type = "item", name = "advanced-circuit", amount = 9 }, + { type = "item", name = "copper-plate", amount = 4 }, }, results = { { type = "item", name = "solar-panel-2", amount = 1 } }, }, @@ -66,10 +66,10 @@ if settings.startup["bobmods-power-solar"].value == true then energy_required = 18, enabled = false, ingredients = { - { "solar-panel-large", 1 }, - { "steel-plate", 8 }, - { "advanced-circuit", 16 }, - { "copper-plate", 8 }, + { type = "item", name = "solar-panel-large", amount = 1 }, + { type = "item", name = "steel-plate", amount = 8 }, + { type = "item", name = "advanced-circuit", amount = 16 }, + { type = "item", name = "copper-plate", amount = 8 }, }, results = { { type = "item", name = "solar-panel-large-2", amount = 1 } }, }, @@ -80,10 +80,10 @@ if settings.startup["bobmods-power-solar"].value == true then energy_required = 4.5, enabled = false, ingredients = { - { "solar-panel-small-2", 1 }, - { "steel-plate", 2 }, - { "processing-unit", 4 }, - { "copper-plate", 2 }, + { type = "item", name = "solar-panel-small-2", amount = 1 }, + { type = "item", name = "steel-plate", amount = 2 }, + { type = "item", name = "processing-unit", amount = 4 }, + { type = "item", name = "copper-plate", amount = 2 }, }, results = { { type = "item", name = "solar-panel-small-3", amount = 1 } }, }, @@ -94,10 +94,10 @@ if settings.startup["bobmods-power-solar"].value == true then energy_required = 10, enabled = false, ingredients = { - { "solar-panel-2", 1 }, - { "steel-plate", 4 }, - { "processing-unit", 9 }, - { "copper-plate", 4 }, + { type = "item", name = "solar-panel-2", amount = 1 }, + { type = "item", name = "steel-plate", amount = 4 }, + { type = "item", name = "processing-unit", amount = 9 }, + { type = "item", name = "copper-plate", amount = 4 }, }, results = { { type = "item", name = "solar-panel-3", amount = 1 } }, }, @@ -108,10 +108,10 @@ if settings.startup["bobmods-power-solar"].value == true then energy_required = 18, enabled = false, ingredients = { - { "solar-panel-large-2", 1 }, - { "steel-plate", 8 }, - { "processing-unit", 16 }, - { "copper-plate", 8 }, + { type = "item", name = "solar-panel-large-2", amount = 1 }, + { type = "item", name = "steel-plate", amount = 8 }, + { type = "item", name = "processing-unit", amount = 16 }, + { type = "item", name = "copper-plate", amount = 8 }, }, results = { { type = "item", name = "solar-panel-large-3", amount = 1 } }, }, diff --git a/bobpower/prototypes/recipe/steam-engines-updates.lua b/bobpower/prototypes/recipe/steam-engines-updates.lua index 1e9be9ffc..0f5bd60b6 100644 --- a/bobpower/prototypes/recipe/steam-engines-updates.lua +++ b/bobpower/prototypes/recipe/steam-engines-updates.lua @@ -1,12 +1,12 @@ if settings.startup["bobmods-power-steam"].value == true then if data.raw.item["steel-bearing"] then - bobmods.lib.recipe.add_ingredient("steam-engine-2", { "steel-bearing", 5 }) + bobmods.lib.recipe.add_ingredient("steam-engine-2", { type = "item", name = "steel-bearing", amount = 5 }) else - bobmods.lib.recipe.add_ingredient("steam-engine-2", { "iron-gear-wheel", 5 }) + bobmods.lib.recipe.add_ingredient("steam-engine-2", { type = "item", name = "iron-gear-wheel", amount = 5 }) end if data.raw.item["steel-gear-wheel"] then - bobmods.lib.recipe.replace_ingredient("steam-engine-2", "iron-gear-wheel", "steel-gear-wheel") + bobmods.lib.recipe.replace_ingredient("steam-engine-2", type = "item", name = "iron-gear-wheel", "steel-gear-wheel") end if data.raw.item["steel-pipe"] then @@ -14,13 +14,13 @@ if settings.startup["bobmods-power-steam"].value == true then end if data.raw.item["cobalt-steel-bearing"] then - bobmods.lib.recipe.add_ingredient("steam-engine-3", { "cobalt-steel-bearing", 5 }) + bobmods.lib.recipe.add_ingredient("steam-engine-3", { type = "item", name = "cobalt-steel-bearing", amount = 5 }) bobmods.lib.tech.add_prerequisite("bob-steam-engine-3", "cobalt-processing") else if data.raw.item["steel-bearing"] then - bobmods.lib.recipe.add_ingredient("steam-engine-3", { "steel-bearing", 5 }) + bobmods.lib.recipe.add_ingredient("steam-engine-3", { type = "item", name = "steel-bearing", amount = 5 }) else - bobmods.lib.recipe.add_ingredient("steam-engine-3", { "iron-gear-wheel", 5 }) + bobmods.lib.recipe.add_ingredient("steam-engine-3", { type = "item", name = "iron-gear-wheel", amount = 5 }) end end @@ -53,12 +53,12 @@ if settings.startup["bobmods-power-steam"].value == true then end if data.raw.item["titanium-bearing"] then - bobmods.lib.recipe.add_ingredient("steam-engine-4", { "titanium-bearing", 5 }) + bobmods.lib.recipe.add_ingredient("steam-engine-4", { type = "item", name = "titanium-bearing", amount = 5 }) else if data.raw.item["steel-bearing"] then - bobmods.lib.recipe.add_ingredient("steam-engine-4", { "steel-bearing", 5 }) + bobmods.lib.recipe.add_ingredient("steam-engine-4", { type = "item", name = "steel-bearing", amount = 5 }) else - bobmods.lib.recipe.add_ingredient("steam-engine-4", { "iron-gear-wheel", 5 }) + bobmods.lib.recipe.add_ingredient("steam-engine-4", { type = "item", name = "iron-gear-wheel", amount = 5 }) end end @@ -91,12 +91,12 @@ if settings.startup["bobmods-power-steam"].value == true then end if data.raw.item["nitinol-bearing"] then - bobmods.lib.recipe.add_ingredient("steam-engine-5", { "nitinol-bearing", 5 }) + bobmods.lib.recipe.add_ingredient("steam-engine-5", { type = "item", name = "nitinol-bearing", amount = 5 }) else if data.raw.item["titanium-bearing"] then - bobmods.lib.recipe.add_ingredient("steam-engine-5", { "titanium-bearing", 5 }) + bobmods.lib.recipe.add_ingredient("steam-engine-5", { type = "item", name = "titanium-bearing", amount = 5 }) else - bobmods.lib.recipe.add_ingredient("steam-engine-5", { "iron-gear-wheel", 5 }) + bobmods.lib.recipe.add_ingredient("steam-engine-5", { type = "item", name = "iron-gear-wheel", amount = 5 }) end end diff --git a/bobpower/prototypes/recipe/steam-engines.lua b/bobpower/prototypes/recipe/steam-engines.lua index 15ea23086..f6f03acdf 100644 --- a/bobpower/prototypes/recipe/steam-engines.lua +++ b/bobpower/prototypes/recipe/steam-engines.lua @@ -5,10 +5,10 @@ if settings.startup["bobmods-power-steam"].value == true then name = "steam-engine-2", enabled = false, ingredients = { - { "steam-engine", 1 }, - { "steel-plate", 5 }, - { "pipe", 5 }, - { "iron-gear-wheel", 5 }, + { type = "item", name = "steam-engine", amount = 1 }, + { type = "item", name = "steel-plate", amount = 5 }, + { type = "item", name = "pipe", amount = 5 }, + { type = "item", name = "iron-gear-wheel", amount = 5 }, }, results = { { type = "item", name = "steam-engine-2", amount = 1 } }, }, @@ -17,10 +17,10 @@ if settings.startup["bobmods-power-steam"].value == true then name = "steam-engine-3", enabled = false, ingredients = { - { "steam-engine-2", 1 }, - { "pipe", 5 }, - { "steel-plate", 5 }, - { "iron-gear-wheel", 5 }, + { type = "item", name = "steam-engine-2", amount = 1 }, + { type = "item", name = "pipe", amount = 5 }, + { type = "item", name = "steel-plate", amount = 5 }, + { type = "item", name = "iron-gear-wheel", amount = 5 }, }, results = { { type = "item", name = "steam-engine-3", amount = 1 } }, }, @@ -29,10 +29,10 @@ if settings.startup["bobmods-power-steam"].value == true then name = "steam-engine-4", enabled = false, ingredients = { - { "steam-engine-3", 1 }, - { "pipe", 5 }, - { "steel-plate", 5 }, - { "iron-gear-wheel", 5 }, + { type = "item", name = "steam-engine-3", amount = 1 }, + { type = "item", name = "pipe", amount = 5 }, + { type = "item", name = "steel-plate", amount = 5 }, + { type = "item", name = "iron-gear-wheel", amount = 5 }, }, results = { { type = "item", name = "steam-engine-4", amount = 1 } }, }, @@ -41,10 +41,10 @@ if settings.startup["bobmods-power-steam"].value == true then name = "steam-engine-5", enabled = false, ingredients = { - { "steam-engine-4", 1 }, - { "pipe", 5 }, - { "steel-plate", 5 }, - { "iron-gear-wheel", 5 }, + { type = "item", name = "steam-engine-4", amount = 1 }, + { type = "item", name = "pipe", amount = 5 }, + { type = "item", name = "steel-plate", amount = 5 }, + { type = "item", name = "iron-gear-wheel", amount = 5 }, }, results = { { type = "item", name = "steam-engine-5", amount = 1 } }, }, diff --git a/bobpower/prototypes/recipe/steam-turbines-updates.lua b/bobpower/prototypes/recipe/steam-turbines-updates.lua index ff3f202cc..dcf9acc22 100644 --- a/bobpower/prototypes/recipe/steam-turbines-updates.lua +++ b/bobpower/prototypes/recipe/steam-turbines-updates.lua @@ -1,10 +1,10 @@ if settings.startup["bobmods-power-steam"].value == true then if data.raw.item["cobalt-steel-bearing"] then - bobmods.lib.recipe.add_ingredient("steam-turbine", { "cobalt-steel-bearing", 10 }) + bobmods.lib.recipe.add_ingredient("steam-turbine", { type = "item", name = "cobalt-steel-bearing", amount = 10 }) bobmods.lib.tech.add_prerequisite("bob-steam-turbine-1", "cobalt-processing") else if data.raw.item["steel-bearing"] then - bobmods.lib.recipe.add_ingredient("steam-turbine", { "steel-bearing", 10 }) + bobmods.lib.recipe.add_ingredient("steam-turbine", { type = "item", name = "steel-bearing", amount = 10 }) end end @@ -38,12 +38,12 @@ if settings.startup["bobmods-power-steam"].value == true then end if data.raw.item["titanium-bearing"] then - bobmods.lib.recipe.add_ingredient("steam-turbine-2", { "titanium-bearing", 15 }) + bobmods.lib.recipe.add_ingredient("steam-turbine-2", { type = "item", name = "titanium-bearing", amount = 15 }) else if data.raw.item["steel-bearing"] then - bobmods.lib.recipe.add_ingredient("steam-turbine-2", { "steel-bearing", 15 }) + bobmods.lib.recipe.add_ingredient("steam-turbine-2", { type = "item", name = "steel-bearing", amount = 15 }) else - bobmods.lib.recipe.add_ingredient("steam-turbine-2", { "iron-gear-wheel", 25 }) + bobmods.lib.recipe.add_ingredient("steam-turbine-2", { type = "item", name = "iron-gear-wheel", amount = 25 }) end end @@ -72,7 +72,7 @@ if settings.startup["bobmods-power-steam"].value == true then end if data.raw.item["titanium-pipe"] then - bobmods.lib.recipe.add_ingredient("steam-turbine-2", { "titanium-pipe", 5 }) + bobmods.lib.recipe.add_ingredient("steam-turbine-2", { type = "item", name = "titanium-pipe", amount = 5 }) end if data.raw.item["advanced-processing-unit"] then @@ -81,12 +81,12 @@ if settings.startup["bobmods-power-steam"].value == true then end if data.raw.item["nitinol-bearing"] then - bobmods.lib.recipe.add_ingredient("steam-turbine-3", { "nitinol-bearing", 15 }) + bobmods.lib.recipe.add_ingredient("steam-turbine-3", { type = "item", name = "nitinol-bearing", amount = 15 }) else if data.raw.item["titanium-bearing"] then - bobmods.lib.recipe.add_ingredient("steam-turbine-3", { "titanium-bearing", 15 }) + bobmods.lib.recipe.add_ingredient("steam-turbine-3", { type = "item", name = "titanium-bearing", amount = 15 }) else - bobmods.lib.recipe.add_ingredient("steam-turbine-3", { "iron-gear-wheel", 25 }) + bobmods.lib.recipe.add_ingredient("steam-turbine-3", { type = "item", name = "iron-gear-wheel", amount = 25 }) end end @@ -115,9 +115,9 @@ if settings.startup["bobmods-power-steam"].value == true then end if data.raw.item["nitinol-pipe"] then - bobmods.lib.recipe.add_ingredient("steam-turbine-3", { "nitinol-pipe", 5 }) + bobmods.lib.recipe.add_ingredient("steam-turbine-3", { type = "item", name = "nitinol-pipe", amount = 5 }) elseif data.raw.item["tungsten-pipe"] then - bobmods.lib.recipe.add_ingredient("steam-turbine-3", { "tungsten-pipe", 5 }) + bobmods.lib.recipe.add_ingredient("steam-turbine-3", { type = "item", name = "tungsten-pipe", amount = 5 }) end if data.raw.item["advanced-processing-unit"] then diff --git a/bobpower/prototypes/recipe/steam-turbines.lua b/bobpower/prototypes/recipe/steam-turbines.lua index 8a92e259b..1d644adae 100644 --- a/bobpower/prototypes/recipe/steam-turbines.lua +++ b/bobpower/prototypes/recipe/steam-turbines.lua @@ -6,10 +6,10 @@ if settings.startup["bobmods-power-steam"].value == true then enabled = false, energy_required = 3, ingredients = { - { "steam-engine-3", 1 }, - { "electronic-circuit", 5 }, - { "copper-plate", 25 }, - { "iron-gear-wheel", 20 }, + { type = "item", name = "steam-engine-3", amount = 1 }, + { type = "item", name = "electronic-circuit", amount = 5 }, + { type = "item", name = "copper-plate", amount = 25 }, + { type = "item", name = "iron-gear-wheel", amount = 20 }, }, results = { { type = "item", name = "steam-turbine", amount = 1 } }, }, @@ -20,10 +20,10 @@ if settings.startup["bobmods-power-steam"].value == true then enabled = false, energy_required = 3, ingredients = { - { "steam-turbine", 1 }, - { "advanced-circuit", 5 }, - { "steel-plate", 25 }, - { "iron-gear-wheel", 25 }, + { type = "item", name = "steam-turbine", amount = 1 }, + { type = "item", name = "advanced-circuit", amount = 5 }, + { type = "item", name = "steel-plate", amount = 25 }, + { type = "item", name = "iron-gear-wheel", amount = 25 }, }, results = { { type = "item", name = "steam-turbine-2", amount = 1 } }, }, @@ -33,10 +33,10 @@ if settings.startup["bobmods-power-steam"].value == true then enabled = false, energy_required = 3, ingredients = { - { "steam-turbine-2", 1 }, - { "processing-unit", 5 }, - { "steel-plate", 25 }, - { "iron-gear-wheel", 25 }, + { type = "item", name = "steam-turbine-2", amount = 1 }, + { type = "item", name = "processing-unit", amount = 5 }, + { type = "item", name = "steel-plate", amount = 25 }, + { type = "item", name = "iron-gear-wheel", amount = 25 }, }, results = { { type = "item", name = "steam-turbine-3", amount = 1 } }, },