diff --git a/Bio_Industries_2/prototypes/Bio_Cannon/projectiles-recipe.lua b/Bio_Industries_2/prototypes/Bio_Cannon/projectiles-recipe.lua index 6a8055b..0daa092 100644 --- a/Bio_Industries_2/prototypes/Bio_Cannon/projectiles-recipe.lua +++ b/Bio_Industries_2/prototypes/Bio_Cannon/projectiles-recipe.lua @@ -12,9 +12,8 @@ if BI.Settings.Bio_Cannon then localised_description = {"item-description.bi-bio-cannon-proto-ammo"}, enabled = false, energy_required = 2, - ingredients = {{"iron-plate", 10}, {"explosives", 10}}, - result = "bi-bio-cannon-proto-ammo", - result_count = 1, + ingredients = {{type="item", name="iron-plate", amount=10}, {type="item", name="explosives", amount=10}}, + results = {{type="item", name="bi-bio-cannon-proto-ammo", amount=1}}, subgroup = "bi-ammo", order = "z[Bio_Cannon_Ammo]-a[Proto]", allow_as_intermediate = true, -- Added for 0.18.34/1.1.4 @@ -30,9 +29,8 @@ if BI.Settings.Bio_Cannon then localised_description = {"item-description.bi-bio-cannon-basic-ammo"}, enabled = false, energy_required = 4, - ingredients = {{"bi-bio-cannon-proto-ammo", 1}, {"rocket", 10}}, - result = "bi-bio-cannon-basic-ammo", - result_count = 1, + ingredients = {{type="item", name="bi-bio-cannon-proto-ammo", amount=1}, {type="item", name="rocket", amount=10}}, + results = {{type="item", name="bi-bio-cannon-basic-ammo", amount=1}}, subgroup = "bi-ammo", order = "z[Bio_Cannon_Ammo]-b[Basic]", allow_as_intermediate = false, -- Added for 0.18.34/1.1.4 @@ -48,9 +46,8 @@ if BI.Settings.Bio_Cannon then localised_description = {"item-description.bi-bio-cannon-poison-ammo"}, enabled = false, energy_required = 8, - ingredients = {{"bi-bio-cannon-basic-ammo", 1}, {"poison-capsule", 5}, {"explosive-rocket", 5}}, - result = "bi-bio-cannon-poison-ammo", - result_count = 1, + ingredients = {{type="item", name="bi-bio-cannon-basic-ammo", amount=1}, {type="item", name="poison-capsule", amount=5}, {type="item", name="explosive-rocket", amount=5}}, + results = {{type="item", name="bi-bio-cannon-poison-ammo", amount=1}}, subgroup = "bi-ammo", order = "z[Bio_Cannon_Ammo]-c[Poison]", allow_as_intermediate = false, -- Added for 0.18.34/1.1.4 diff --git a/Bio_Industries_2/prototypes/Bio_Cannon/recipe.lua b/Bio_Industries_2/prototypes/Bio_Cannon/recipe.lua index 1a24628..dc86eab 100644 --- a/Bio_Industries_2/prototypes/Bio_Cannon/recipe.lua +++ b/Bio_Industries_2/prototypes/Bio_Cannon/recipe.lua @@ -14,13 +14,12 @@ if BI.Settings.Bio_Cannon then enabled = false, energy_required = 50, ingredients = { - {"concrete", 100}, - {"radar", 1}, - {"steel-plate", 80}, - {"electric-engine-unit", 5}, + {type="item", name="concrete", amount=100}, + {type="item", name="radar", amount=1}, + {type="item", name="steel-plate", amount=80}, + {type="item", name="electric-engine-unit", amount=5}, }, - result = "bi-bio-cannon", - result_count = 1, + results = {{type="item", name="bi-bio-cannon", amount=1}}, allow_as_intermediate = false, -- Added for 0.18.34/1.1.4 always_show_made_in = true, -- Added for 0.18.34/1.1.4 allow_decomposition = false, -- Added for 0.18.34/1.1.4 @@ -29,13 +28,12 @@ if BI.Settings.Bio_Cannon then enabled = false, energy_required = 100, ingredients = { - {"concrete", 100}, - {"radar", 1}, - {"steel-plate", 120}, - {"electric-engine-unit", 15}, + {type="item", name="concrete", amount=100}, + {type="item", name="radar", amount=1}, + {type="item", name="steel-plate", amount=120}, + {type="item", name="electric-engine-unit", amount=15}, }, - result = "bi-bio-cannon", - result_count = 1, + results = {{type="item", name="bi-bio-cannon", amount=1}}, allow_as_intermediate = false, -- Added for 0.18.34/1.1.4 always_show_made_in = true, -- Added for 0.18.34/1.1.4 allow_decomposition = false, -- Added for 0.18.34/1.1.4 diff --git a/Bio_Industries_2/prototypes/Bio_Farm/compatible_recipes.lua b/Bio_Industries_2/prototypes/Bio_Farm/compatible_recipes.lua index 003c710..20cbe40 100644 --- a/Bio_Industries_2/prototypes/Bio_Farm/compatible_recipes.lua +++ b/Bio_Industries_2/prototypes/Bio_Farm/compatible_recipes.lua @@ -20,8 +20,7 @@ data:extend({ order = "a[bi]-a-g[bi-coke-coal]-2", energy_required = 4, ingredients = {}, - result = "pellet-coke", - result_count = 1, + results = {{type="item", name="pellet-coke", amount=1}}, always_show_made_in = true, allow_decomposition = false, allow_as_intermediate = false, @@ -125,8 +124,7 @@ if not data.raw.item["resin"] then ingredients = { {type = "item", name = "wood", amount = 1} }, - result = "resin", - result_count = 1, + results = {{type="item", name="resin", amount=1}}, main_procuct = "", -- This is a custom property for use by "Krastorio 2" (it will change -- ingredients/results; used for wood/wood pulp) @@ -418,9 +416,8 @@ BioInd.writeDebug("Generating recipe for sand from crushed stone!") subgroup = "bio-bio-farm-raw", order = "a[bi]-a-z[bi-9-sand]", energy_required = 1, - ingredients = {{"stone-crushed", 2}}, - result = "sand", - result_count = 5, + ingredients = {{type="item", name="stone-crushed", amount=2}}, + results = {{type="item", name="sand", amount=5}}, main_product = "", enabled = false, --~ always_show_made_in = true, diff --git a/Bio_Industries_2/prototypes/Bio_Farm/entities.lua b/Bio_Industries_2/prototypes/Bio_Farm/entities.lua index 1756300..e54299c 100644 --- a/Bio_Industries_2/prototypes/Bio_Farm/entities.lua +++ b/Bio_Industries_2/prototypes/Bio_Farm/entities.lua @@ -53,7 +53,7 @@ data:extend({ minable = { mining_particle = "wooden-particle", mining_time = 0.25, - result = "seedling", + results = {{type="item", name="seedling", amount=1}}, count = 1 }, corpse = nil, @@ -95,7 +95,7 @@ data:extend({ minable = { mining_particle = "wooden-particle", mining_time = 0.25, - result = "seedling", + results = {{type="item", name="seedling", amount=1}}, count = 1 }, corpse = nil, @@ -136,7 +136,7 @@ data:extend({ minable = { mining_particle = "wooden-particle", mining_time = 0.25, - result = "seedling", + results = {{type="item", name="seedling", amount=1}}, count = 1 }, corpse = nil, diff --git a/Bio_Industries_2/prototypes/Bio_Farm/recipe.lua b/Bio_Industries_2/prototypes/Bio_Farm/recipe.lua index 826733d..1086834 100644 --- a/Bio_Industries_2/prototypes/Bio_Farm/recipe.lua +++ b/Bio_Industries_2/prototypes/Bio_Farm/recipe.lua @@ -433,12 +433,11 @@ data:extend({ --~ energy_required = 5, energy_required = 2.5, ingredients = { - {"iron-stick", 10}, - {"stone-brick", 10}, - {"small-lamp", 5}, + {type="item", name="iron-stick", amount=10}, + {type="item", name="stone-brick", amount=10}, + {type="item", name="small-lamp", amount=5}, }, - result = "bi-bio-greenhouse", - result_count = 1, + results = {{type="item", name="bi-bio-greenhouse", amount=1}}, main_product = "", allow_as_intermediate = true, -- Added for 0.18.34/1.1.4 always_show_made_in = false, -- Added for 0.18.34/1.1.4 @@ -449,12 +448,11 @@ data:extend({ --~ energy_required = 8, energy_required = 4, ingredients = { - {"iron-stick", 15}, - {"stone-brick", 15}, - {"small-lamp", 5}, + {type="item", name="iron-stick", amount=15}, + {type="item", name="stone-brick", amount=15}, + {type="item", name="small-lamp", amount=5}, }, - result = "bi-bio-greenhouse", - result_count = 1, + results = {{type="item", name="bi-bio-greenhouse", amount=1}}, main_product = "", allow_as_intermediate = true, -- Added for 0.18.34/1.1.4 always_show_made_in = false, -- Added for 0.18.34/1.1.4 @@ -487,12 +485,11 @@ data:extend({ --~ energy_required = 10, energy_required = 5, ingredients = { - {"bi-bio-greenhouse", 4}, - {"stone-crushed", 10}, - {"copper-cable", 10}, + {type="item", name="bi-bio-greenhouse", amount=4}, + {type="item", name="stone-crushed", amount=10}, + {type="item", name="copper-cable", amount=10}, }, - result = "bi-bio-farm", - result_count = 1, + results = {{type="item", name="bi-bio-farm", amount=1}}, main_product = "", allow_as_intermediate = false, -- Added for 0.18.34/1.1.4 always_show_made_in = false, -- Added for 0.18.34/1.1.4 @@ -503,12 +500,11 @@ data:extend({ --~ energy_required = 15, energy_required = 7.5, ingredients = { - {"bi-bio-greenhouse", 8}, - {"stone-crushed", 20}, - {"copper-cable", 20}, + {type="item", name="bi-bio-greenhouse", amount=8}, + {type="item", name="stone-crushed", amount=20}, + {type="item", name="copper-cable", amount=20}, }, - result = "bi-bio-farm", - result_count = 1, + results = {{type="item", name="bi-bio-farm", amount=1}}, main_product = "", allow_as_intermediate = false, -- Added for 0.18.34/1.1.4 always_show_made_in = false, -- Added for 0.18.34/1.1.4 @@ -541,9 +537,8 @@ data:extend({ --~ allow_decomposition = false, --~ allow_as_intermediate = false, energy_required = 2, - ingredients = {{"wood", 2}}, - result = "bi-woodpulp", - result_count = 4, + ingredients = {{type="item", name="wood", amount=2}}, + results = {{type="item", name="bi-woodpulp", amount=4}}, main_product = "", allow_as_intermediate = true, -- Added for 0.18.34/1.1.4 allow_intermediates = true, -- Added for 0.18.35/1.1.5 @@ -577,8 +572,7 @@ data:extend({ ingredients = { {type = "item", name = "bi-woodpulp", amount = 3}, }, - result = "resin", - result_count = 1, + results = {{type="item", name="resin", amount=1}}, main_product = "", allow_as_intermediate = true, -- Added for 0.18.34/1.1.4 always_show_made_in = false, -- Added for 0.18.34/1.1.4 @@ -613,8 +607,7 @@ data:extend({ {type = "item", name = "bi-woodpulp", amount = 8}, {type = "item", name = "resin", amount = 2}, }, - result = "wood", - result_count = 4, + results = {{type="item", name="wood", amount=4}}, main_product = "", --~ allow_as_intermediate = true, -- Added for 0.18.34/1.1.4 allow_as_intermediate = false, -- Added for 0.18.34/1.1.4 @@ -644,9 +637,8 @@ data:extend({ subgroup = "bio-bio-farm-raw", order = "a[bi]-a-bx[bi-4-woodbrick]", energy_required = 2, - ingredients = {{"bi-woodpulp", 24}}, - result = "wood-bricks", - result_count = 1, + ingredients = {{type="item", name="bi-woodpulp", amount=24}}, + results = {{type="item", name="wood-bricks", amount=1}}, main_product = "", enabled = false, --~ always_show_made_in = true, @@ -681,9 +673,8 @@ data:extend({ --~ allow_decomposition = false, --~ allow_as_intermediate = false, energy_required = 3, - ingredients = {{"wood", 5}}, - result = "bi-ash", - result_count = 5, + ingredients = {{type="item", name="wood", amount=5}}, + results = {{type="item", name="bi-ash", amount=5}}, main_product = "", allow_as_intermediate = true, -- Changed for 0.18.34/1.1.4 always_show_made_in = false, -- Changed for 0.18.34/1.1.4 @@ -719,9 +710,8 @@ data:extend({ allow_decomposition = true, -- Changed for 0.18.34/1.1.4 energy_required = 2.5, - ingredients = {{"bi-woodpulp", 12}}, - result = "bi-ash", - result_count = 6, + ingredients = {{type="item", name="bi-woodpulp", amount=12}}, + results = {{type="item", name="bi-ash", amount=6}}, main_product = "", -- This is a custom property for use by "Krastorio 2" (it will change -- ingredients/results; used for wood/wood pulp) @@ -745,9 +735,8 @@ data:extend({ subgroup = "bio-bio-farm-raw", order = "a[bi]-a-d[bi-6-charcoal-1]", energy_required = 15, - ingredients = {{"bi-woodpulp", 24}}, - result = "wood-charcoal", - result_count = 5, + ingredients = {{type="item", name="bi-woodpulp", amount=24}}, + results = {{type="item", name="wood-charcoal", amount=5}}, main_product = "", enabled = false, always_show_made_in = true, @@ -775,9 +764,8 @@ data:extend({ order = "a[bi]-a-d[bi-6-charcoal-2]", category = "biofarm-mod-smelting", energy_required = 20, - ingredients = {{"wood", 20}}, - result = "wood-charcoal", - result_count = 8, + ingredients = {{type="item", name="wood", amount=20}}, + results = {{type="item", name="wood-charcoal", amount=8}}, main_product = "", enabled = false, always_show_made_in = true, @@ -805,9 +793,8 @@ data:extend({ subgroup = "bio-bio-farm-raw", order = "a[bi]-a-ea[bi-6-coal-1]", energy_required = 20, - ingredients = {{"wood-charcoal", 10}}, - result = "coal", - result_count = 12, + ingredients = {{type="item", name="wood-charcoal", amount=10}}, + results = {{type="item", name="coal", amount=12}}, main_product = "", enabled = false, --~ always_show_made_in = true, @@ -836,9 +823,8 @@ data:extend({ subgroup = "bio-bio-farm-raw", order = "a[bi]-a-eb[bi-6-coal-2]", energy_required = 20, - ingredients = {{"wood-charcoal", 10}}, - result = "coal", - result_count = 16, + ingredients = {{type="item", name="wood-charcoal", amount=10}}, + results = {{type="item", name="coal", amount=16}}, main_product = "", enabled = false, --~ always_show_made_in = true, @@ -867,9 +853,8 @@ data:extend({ order = "a[bi]-a-fa[bi-7-solid_fuel]", category = "chemistry", energy_required = 2, - ingredients = {{"wood-bricks", 3}}, - result = "solid-fuel", - result_count = 2, + ingredients = {{type="item", name="wood-bricks", amount=3}}, + results = {{type="item", name="solid-fuel", amount=2}}, main_product = "", enabled = false, --~ always_show_made_in = true, @@ -900,9 +885,8 @@ data:extend({ subgroup = "bio-bio-farm-raw", order = "a[bi]-a-g[bi-8-coke-coal]-1", energy_required = 20, - ingredients = {{"coal", 12}}, - result = "pellet-coke", - result_count = 2, + ingredients = {{type="item", name="coal", amount=12}}, + results = {{type="item", name="pellet-coke", amount=2}}, main_product = "", enabled = false, --~ always_show_made_in = true, @@ -933,9 +917,8 @@ data:extend({ subgroup = "bio-bio-farm-raw", order = "a[bi]-a-g[bi-8-coke-coal]-3", energy_required = 6, - ingredients = {{"solid-fuel", 5}}, - result = "pellet-coke", - result_count = 3, + ingredients = {{type="item", name="solid-fuel", amount=5}}, + results = {{type="item", name="pellet-coke", amount=3}}, main_product = "", enabled = false, --~ always_show_made_in = true, @@ -961,9 +944,8 @@ data:extend({ subgroup = "bio-bio-farm-raw", order = "a[bi]-a-z[bi-9-stone-crushed-1]", energy_required = 1.5, - ingredients = {{"stone", 1}}, - result = "stone-crushed", - result_count = 2, + ingredients = {{type="item", name="stone", amount=1}}, + results = {{type="item", name="stone-crushed", amount=2}}, main_product = "", enabled = false, --~ always_show_made_in = true, @@ -992,9 +974,8 @@ data:extend({ subgroup = "bio-bio-farm-raw", order = "a[bi]-a-z[bi-9-stone-crushed-2]", energy_required = 2.5, -- Increased crafting time - ingredients = {{"concrete", 1}}, - result = "stone-crushed", - result_count = 2, + ingredients = {{type="item", name="concrete", amount=1}}, + results = {{type="item", name="stone-crushed", amount=2}}, main_product = "", enabled = false, --~ always_show_made_in = true, @@ -1022,9 +1003,8 @@ data:extend({ subgroup = "bio-bio-farm-raw", order = "a[bi]-a-z[bi-9-stone-crushed-3]", energy_required = 2.5, -- Increased crafting time - ingredients = {{"hazard-concrete", 1}}, - result = "stone-crushed", - result_count = 2, + ingredients = {{type="item", name="hazard-concrete", amount=1}}, + results = {{type="item", name="stone-crushed", amount=2}}, main_product = "", enabled = false, --~ always_show_made_in = true, @@ -1053,9 +1033,8 @@ data:extend({ subgroup = "bio-bio-farm-raw", order = "a[bi]-a-z[bi-9-stone-crushed-4]", energy_required = 5, -- Increased crafting time - ingredients = {{"refined-concrete", 1}}, - result = "stone-crushed", - result_count = 4, + ingredients = {{type="item", name="refined-concrete", amount=1}}, + results = {{type="item", name="stone-crushed", amount=4}}, main_product = "", enabled = false, --~ always_show_made_in = true, @@ -1083,9 +1062,8 @@ data:extend({ subgroup = "bio-bio-farm-raw", order = "a[bi]-a-z[bi-9-stone-crushed-5]", energy_required = 5, -- Increased crafting time - ingredients = {{"refined-hazard-concrete", 1}}, - result = "stone-crushed", - result_count = 4, + ingredients = {{type="item", name="refined-hazard-concrete", amount=1}}, + results = {{type="item", name="stone-crushed", amount=4}}, main_product = "", enabled = false, --~ always_show_made_in = true, @@ -1148,11 +1126,10 @@ data:extend({ enabled = false, energy_required = 8, ingredients = { - {"stone-furnace", 3}, - {"steel-plate", 10}, + {type="item", name="stone-furnace", amount=3}, + {type="item", name="steel-plate", amount=10}, }, - result = "bi-cokery", - result_count = 1, + results = {{type="item", name="bi-cokery", amount=1}}, main_product = "", allow_as_intermediate = false, -- Added for 0.18.34/1.1.4 always_show_made_in = false, -- Added for 0.18.34/1.1.4 @@ -1162,11 +1139,10 @@ data:extend({ enabled = false, energy_required = 10, ingredients = { - {"stone-furnace", 3}, - {"steel-plate", 12}, + {type="item", name="stone-furnace", amount=3}, + {type="item", name="steel-plate", amount=12}, }, - result = "bi-cokery", - result_count = 1, + results = {{type="item", name="bi-cokery", amount=1}}, main_product = "", allow_as_intermediate = false, -- Added for 0.18.34/1.1.4 always_show_made_in = false, -- Added for 0.18.34/1.1.4 @@ -1200,12 +1176,11 @@ data:extend({ enabled = false, energy_required = 3, ingredients = { - {"iron-plate", 10}, - {"steel-plate", 10}, - {"iron-gear-wheel", 5}, + {type="item", name="iron-plate", amount=10}, + {type="item", name="steel-plate", amount=10}, + {type="item", name="iron-gear-wheel", amount=5}, }, - result = "bi-stone-crusher", - result_count = 1, + results = {{type="item", name="bi-stone-crusher", amount=1}}, main_product = "", allow_as_intermediate = false, -- Added for 0.18.34/1.1.4 always_show_made_in = false, -- Added for 0.18.34/1.1.4 @@ -1215,12 +1190,11 @@ data:extend({ enabled = false, energy_required = 5, ingredients = { - {"iron-plate", 12}, - {"steel-plate", 12}, - {"iron-gear-wheel", 8}, + {type="item", name="iron-plate", amount=12}, + {type="item", name="steel-plate", amount=12}, + {type="item", name="iron-gear-wheel", amount=8}, }, - result = "bi-stone-crusher", - result_count = 1, + results = {{type="item", name="bi-stone-crusher", amount=1}}, main_product = "", allow_as_intermediate = false, -- Added for 0.18.34/1.1.4 always_show_made_in = false, -- Added for 0.18.34/1.1.4 @@ -1420,10 +1394,10 @@ data:extend({ enabled = false, energy_required = 8, ingredients = { - {"bi-seed", 400}, - {"rocket", 1}, + {type="item", name="bi-seed", amount=400}, + {type="item", name="rocket", amount=1}, }, - result = "bi-seed-bomb-basic", + results = {{type="item", name="bi-seed-bomb-basic", amount=1}}, main_product = "", allow_as_intermediate = false, -- Added for 0.18.34/1.1.4 always_show_made_in = false, -- Added for 0.18.34/1.1.4 @@ -1433,10 +1407,10 @@ data:extend({ enabled = false, energy_required = 8, ingredients = { - {"bi-seed", 400}, - {"rocket", 2}, + {type="item", name="bi-seed", amount=400}, + {type="item", name="rocket", amount=2}, }, - result = "bi-seed-bomb-basic", + results = {{type="item", name="bi-seed-bomb-basic", amount=1}}, main_product = "", allow_as_intermediate = false, -- Added for 0.18.34/1.1.4 always_show_made_in = false, -- Added for 0.18.34/1.1.4 @@ -1470,11 +1444,11 @@ data:extend({ enabled = false, energy_required = 8, ingredients = { - {"bi-seed", 400}, - {"fertilizer", 200}, - {"rocket", 1}, + {type="item", name="bi-seed", amount=400}, + {type="item", name="fertilizer", amount=200}, + {type="item", name="rocket", amount=1}, }, - result = "bi-seed-bomb-standard", + results = {{type="item", name="bi-seed-bomb-standard", amount=1}}, main_product = "", allow_as_intermediate = false, -- Added for 0.18.34/1.1.4 always_show_made_in = false, -- Added for 0.18.34/1.1.4 @@ -1484,11 +1458,11 @@ data:extend({ enabled = false, energy_required = 8, ingredients = { - {"bi-seed", 400}, - {"fertilizer", 200}, - {"rocket", 2}, + {type="item", name="bi-seed", amount=400}, + {type="item", name="fertilizer", amount=200}, + {type="item", name="rocket", amount=2}, }, - result = "bi-seed-bomb-standard", + results = {{type="item", name="bi-seed-bomb-standard", amount=1}}, main_product = "", allow_as_intermediate = false, -- Added for 0.18.34/1.1.4 always_show_made_in = false, -- Added for 0.18.34/1.1.4 @@ -1522,11 +1496,11 @@ data:extend({ enabled = false, energy_required = 8, ingredients = { - {"bi-seed", 400}, - {"bi-adv-fertilizer", 200}, - {"rocket", 1}, + {type="item", name="bi-seed", amount=400}, + {type="item", name="bi-adv-fertilizer", amount=200}, + {type="item", name="rocket", amount=1}, }, - result = "bi-seed-bomb-advanced", + results = {{type="item", name="bi-seed-bomb-advanced", amount=1}}, main_product = "", allow_as_intermediate = false, -- Added for 0.18.34/1.1.4 always_show_made_in = false, -- Added for 0.18.34/1.1.4 @@ -1536,11 +1510,11 @@ data:extend({ enabled = false, energy_required = 8, ingredients = { - {"bi-seed", 400}, - {"bi-adv-fertilizer", 200}, - {"rocket", 2}, + {type="item", name="bi-seed", amount=400}, + {type="item", name="bi-adv-fertilizer", amount=200}, + {type="item", name="rocket", amount=2}, }, - result = "bi-seed-bomb-advanced", + results = {{type="item", name="bi-seed-bomb-advanced", amount=1}}, main_product = "", allow_as_intermediate = false, -- Added for 0.18.34/1.1.4 always_show_made_in = false, -- Added for 0.18.34/1.1.4 @@ -1574,12 +1548,11 @@ data:extend({ enabled = false, energy_required = 10, ingredients = { - {"bi-bio-greenhouse", 4}, - {"assembling-machine-2", 2}, - {"stone-brick", 10}, + {type="item", name="bi-bio-greenhouse", amount=4}, + {type="item", name="assembling-machine-2", amount=2}, + {type="item", name="stone-brick", amount=10}, }, - result = "bi-arboretum-area", - result_count = 1, + results = {{type="item", name="bi-arboretum-area", amount=1}}, main_product = "", allow_as_intermediate = false, -- Added for 0.18.34/1.1.4 always_show_made_in = false, -- Added for 0.18.34/1.1.4 @@ -1589,12 +1562,11 @@ data:extend({ enabled = false, energy_required = 15, ingredients = { - {"bi-bio-greenhouse", 4}, - {"assembling-machine-2", 4}, - {"stone-brick", 20}, + {type="item", name="bi-bio-greenhouse", amount=4}, + {type="item", name="assembling-machine-2", amount=4}, + {type="item", name="stone-brick", amount=20}, }, - result = "bi-arboretum-area", - result_count = 1, + results = {{type="item", name="bi-arboretum-area", amount=1}}, main_product = "", allow_as_intermediate = false, -- Added for 0.18.34/1.1.4 always_show_made_in = false, -- Added for 0.18.34/1.1.4 diff --git a/Bio_Industries_2/prototypes/Bio_Farm/tree_entities.lua b/Bio_Industries_2/prototypes/Bio_Farm/tree_entities.lua index 8040851..dde51ea 100644 --- a/Bio_Industries_2/prototypes/Bio_Farm/tree_entities.lua +++ b/Bio_Industries_2/prototypes/Bio_Farm/tree_entities.lua @@ -105,6 +105,7 @@ for id, prototype in pairs(data.raw.tree) do --~ end tree.minable.results = { { + type = "item", name = (i < TREE_LEVELS) and "seedling" or "wood", probability = i/TREE_LEVELS, amount = 1, diff --git a/Bio_Industries_2/prototypes/Bio_Fuel/recipe.lua b/Bio_Industries_2/prototypes/Bio_Fuel/recipe.lua index 4aca9c3..97c801a 100644 --- a/Bio_Industries_2/prototypes/Bio_Fuel/recipe.lua +++ b/Bio_Industries_2/prototypes/Bio_Fuel/recipe.lua @@ -25,12 +25,11 @@ data:extend({ enabled = false, energy_required = 20, ingredients = { - {"assembling-machine-1", 1}, - {"steel-plate", 5}, - {"electronic-circuit", 5}, + {type="item", name="assembling-machine-1", amount=1}, + {type="item", name="steel-plate", amount=5}, + {type="item", name="electronic-circuit", amount=5}, }, - result = "bi-bio-reactor", - result_count = 1, + results = {{type="item", name="bi-bio-reactor", amount=1}}, main_product = "", allow_as_intermediate = false, -- Added for 0.18.34/1.1.4 always_show_made_in = false, -- Added for 0.18.34/1.1.4 @@ -40,12 +39,11 @@ data:extend({ enabled = false, energy_required = 30, ingredients = { - {"assembling-machine-1", 2}, - {"steel-plate", 5}, - {"electronic-circuit", 5}, + {type="item", name="assembling-machine-1", amount=2}, + {type="item", name="steel-plate", amount=5}, + {type="item", name="electronic-circuit", amount=5}, }, - result = "bi-bio-reactor", - result_count = 1, + results = {{type="item", name="bi-bio-reactor", amount=1}}, main_product = "", allow_as_intermediate = false, -- Added for 0.18.34/1.1.4 always_show_made_in = false, -- Added for 0.18.34/1.1.4 @@ -146,12 +144,11 @@ if BI.Settings.BI_Bio_Fuel then enabled = false, energy_required = 10, ingredients = { - {"boiler", 1}, - {"steel-plate", 5}, - {"concrete", 5}, + {type="item", name="boiler", amount=1}, + {type="item", name="steel-plate", amount=5}, + {type="item", name="concrete", amount=5}, }, - result = "bi-bio-boiler", - result_count = 1, + results = {{type="item", name="bi-bio-boiler", amount=1}}, main_product = "", allow_as_intermediate = false, -- Added for 0.18.34/1.1.4 always_show_made_in = false, -- Added for 0.18.34/1.1.4 @@ -161,12 +158,11 @@ if BI.Settings.BI_Bio_Fuel then enabled = false, energy_required = 15, ingredients = { - {"boiler", 2}, - {"steel-plate", 5}, - {"concrete", 5}, + {type="item", name="boiler", amount=2}, + {type="item", name="steel-plate", amount=5}, + {type="item", name="concrete", amount=5}, }, - result = "bi-bio-boiler", - result_count = 1, + results = {{type="item", name="bi-bio-boiler", amount=1}}, main_product = "", allow_as_intermediate = false, -- Added for 0.18.34/1.1.4 always_show_made_in = false, -- Added for 0.18.34/1.1.4 diff --git a/Bio_Industries_2/prototypes/Bio_Garden/recipe.lua b/Bio_Industries_2/prototypes/Bio_Garden/recipe.lua index 4cda3a4..822ecfa 100644 --- a/Bio_Industries_2/prototypes/Bio_Garden/recipe.lua +++ b/Bio_Industries_2/prototypes/Bio_Garden/recipe.lua @@ -22,11 +22,11 @@ data:extend({ enabled = false, energy_required = 10, ingredients = { - {"stone-wall", 12}, - {"stone-crushed", 50}, - {"seedling", 50} + {type="item", name="stone-wall", amount=12}, + {type="item", name="stone-crushed", amount=50}, + {type="item", name="seedling", amount=50} }, - result = "bi-bio-garden", + results = {{type="item", name="bi-bio-garden", amount=1}}, main_product = "", subgroup = "bio-bio-gardens-fluid", order = "a[bi]", diff --git a/Bio_Industries_2/prototypes/Bio_Solar_Farm/recipe.lua b/Bio_Industries_2/prototypes/Bio_Solar_Farm/recipe.lua index ba73178..2092f8c 100644 --- a/Bio_Industries_2/prototypes/Bio_Solar_Farm/recipe.lua +++ b/Bio_Industries_2/prototypes/Bio_Solar_Farm/recipe.lua @@ -23,11 +23,11 @@ if BI.Settings.BI_Solar_Additions then enabled = false, energy_required = 60, ingredients = { - {"solar-panel", 50}, - {"medium-electric-pole", 25}, - {"concrete", 400}, + {type="item", name="solar-panel", amount=50}, + {type="item", name="medium-electric-pole", amount=25}, + {type="item", name="concrete", amount=400}, }, - result = "bi-bio-solar-farm", + results = {{type="item", name="bi-bio-solar-farm", amount=1}}, main_product = "", --~ subgroup = "bio-bio-solar-entity", --~ order = "a[bi]", @@ -58,11 +58,11 @@ if BI.Settings.BI_Solar_Additions then enabled = false, energy_required = 15, ingredients = { - {"solar-panel", 30}, - {"storage-tank", 4}, - {"boiler", 1}, + {type="item", name="solar-panel", amount=30}, + {type="item", name="storage-tank", amount=4}, + {type="item", name="boiler", amount=1}, }, - result = "bi-solar-boiler", + results = {{type="item", name="bi-solar-boiler", amount=1}}, main_product = "", subgroup = "energy", order = "b[steam-power]-c[steam-engine]", @@ -90,11 +90,11 @@ if BI.Settings.BI_Solar_Additions then enabled = false, energy_required = 5, ingredients = { - {"steel-plate", 1}, - {"advanced-circuit", 3}, - {"copper-cable", 4} + {type="item", name="steel-plate", amount=1}, + {type="item", name="advanced-circuit", amount=3}, + {type="item", name="copper-cable", amount=4} }, - result = "bi-solar-mat", + results = {{type="item", name="bi-solar-mat", amount=1}}, main_product = "", --~ subgroup = "bio-bio-solar-entity", --~ order = "c[bi]", @@ -124,11 +124,11 @@ if BI.Settings.BI_Solar_Additions then energy_required = 60, enabled = false, ingredients = { - {"accumulator", 50}, - {"copper-cable", 50}, - {"concrete", 200}, + {type="item", name="accumulator", amount=50}, + {type="item", name="copper-cable", amount=50}, + {type="item", name="concrete", amount=200}, }, - result = "bi-bio-accumulator", + results = {{type="item", name="bi-bio-accumulator", amount=1}}, main_product = "", --~ subgroup = "bio-bio-solar-entity", --~ order = "d[bi]", @@ -158,11 +158,11 @@ if BI.Settings.BI_Solar_Additions then }, enabled = false, ingredients = { - {"steel-plate", 10}, - {"concrete", 200}, - {"substation", 4} + {type="item", name="steel-plate", amount=10}, + {type="item", name="concrete", amount=200}, + {type="item", name="substation", amount=4} }, - result = "bi-large-substation", + results = {{type="item", name="bi-large-substation", amount=1}}, main_product = "", --~ subgroup = "bio-bio-solar-entity", --~ order = "e[bi]", diff --git a/Bio_Industries_2/prototypes/Bio_Turret/recipe.lua b/Bio_Industries_2/prototypes/Bio_Turret/recipe.lua index a353b97..4c95a2a 100644 --- a/Bio_Industries_2/prototypes/Bio_Turret/recipe.lua +++ b/Bio_Industries_2/prototypes/Bio_Turret/recipe.lua @@ -21,10 +21,9 @@ data:extend({ enabled = true, energy_required = 4, ingredients = { - {"wood", 10}, + {type="item", name="wood", amount=10}, }, - result = "bi-dart-magazine-basic", - result_count = 10, + results = {{type="item", name="bi-dart-magazine-basic", amount=10}}, main_product = "", allow_as_intermediate = false, -- Added for 0.18.34/1.1.4 always_show_made_in = false, -- Added for 0.18.34/1.1.4 @@ -34,10 +33,9 @@ data:extend({ enabled = true, energy_required = 6, ingredients = { - {"wood", 10}, + {type="item", name="wood", amount=10}, }, - result = "bi-dart-magazine-basic", - result_count = 8, + results = {{type="item", name="bi-dart-magazine-basic", amount=8}}, main_product = "", allow_as_intermediate = false, -- Added for 0.18.34/1.1.4 always_show_made_in = false, -- Added for 0.18.34/1.1.4 @@ -73,11 +71,10 @@ data:extend({ enabled = false, energy_required = 5, ingredients = { - {"bi-dart-magazine-basic", 10}, - {"copper-plate", 5}, + {type="item", name="bi-dart-magazine-basic", amount=10}, + {type="item", name="copper-plate", amount=5}, }, - result = "bi-dart-magazine-standard", - result_count = 10, + results = {{type="item", name="bi-dart-magazine-standard", amount=10}}, main_product = "", allow_as_intermediate = false, -- Added for 0.18.34/1.1.4 always_show_made_in = false, -- Added for 0.18.34/1.1.4 @@ -87,11 +84,10 @@ data:extend({ enabled = false, energy_required = 8, ingredients = { - {"bi-dart-magazine-basic", 8}, - {"copper-plate", 5}, + {type="item", name="bi-dart-magazine-basic", amount=8}, + {type="item", name="copper-plate", amount=5}, }, - result = "bi-dart-magazine-standard", - result_count = 8, + results = {{type="item", name="bi-dart-magazine-standard", amount=8}}, main_product = "", allow_as_intermediate = false, -- Added for 0.18.34/1.1.4 always_show_made_in = false, -- Added for 0.18.34/1.1.4 @@ -124,11 +120,10 @@ data:extend({ enabled = false, energy_required = 6, ingredients = { - {"bi-dart-magazine-standard", 10}, - {"plastic-bar", 5}, + {type="item", name="bi-dart-magazine-standard", amount=10}, + {type="item", name="plastic-bar", amount=5}, }, - result = "bi-dart-magazine-enhanced", - result_count = 10, + results = {{type="item", name="bi-dart-magazine-enhanced", amount=10}}, main_product = "", allow_as_intermediate = false, -- Added for 0.18.34/1.1.4 always_show_made_in = false, -- Added for 0.18.34/1.1.4 @@ -138,11 +133,10 @@ data:extend({ enabled = false, energy_required = 9, ingredients = { - {"bi-dart-magazine-standard", 8}, - {"plastic-bar", 5}, + {type="item", name="bi-dart-magazine-standard", amount=8}, + {type="item", name="plastic-bar", amount=5}, }, - result = "bi-dart-magazine-enhanced", - result_count = 8, + results = {{type="item", name="bi-dart-magazine-enhanced", amount=8}}, main_product = "", allow_as_intermediate = false, -- Added for 0.18.34/1.1.4 always_show_made_in = false, -- Added for 0.18.34/1.1.4 @@ -175,11 +169,10 @@ data:extend({ enabled = false, energy_required = 8, ingredients = { - {"bi-dart-magazine-enhanced", 10}, - {"poison-capsule", 5}, + {type="item", name="bi-dart-magazine-enhanced", amount=10}, + {type="item", name="poison-capsule", amount=5}, }, - result = "bi-dart-magazine-poison", - result_count = 10, + results = {{type="item", name="bi-dart-magazine-poison", amount=10}}, main_product = "", allow_as_intermediate = false, -- Added for 0.18.34/1.1.4 always_show_made_in = false, -- Added for 0.18.34/1.1.4 @@ -189,11 +182,10 @@ data:extend({ enabled = false, energy_required = 12, ingredients = { - {"bi-dart-magazine-enhanced", 8}, - {"poison-capsule", 5}, + {type="item", name="bi-dart-magazine-enhanced", amount=8}, + {type="item", name="poison-capsule", amount=5}, }, - result = "bi-dart-magazine-poison", - result_count = 8, + results = {{type="item", name="bi-dart-magazine-poison", amount=8}}, main_product = "", allow_as_intermediate = false, -- Added for 0.18.34/1.1.4 always_show_made_in = false, -- Added for 0.18.34/1.1.4 @@ -226,11 +218,10 @@ data:extend({ enabled = true, energy_required = 8, ingredients = { - {"iron-gear-wheel", 5}, - {"wood", 20}, + {type="item", name="iron-gear-wheel", amount=5}, + {type="item", name="wood", amount=20}, }, - result = "bi-dart-turret", - result_count = 1, + results = {{type="item", name="bi-dart-turret", amount=1}}, main_product = "", allow_as_intermediate = false, -- Added for 0.18.34/1.1.4 always_show_made_in = false, -- Added for 0.18.34/1.1.4 @@ -240,11 +231,10 @@ data:extend({ enabled = true, energy_required = 16, ingredients = { - {"iron-gear-wheel", 10}, - {"wood", 25}, + {type="item", name="iron-gear-wheel", amount=10}, + {type="item", name="wood", amount=25}, }, - result = "bi-dart-turret", - result_count = 1, + results = {{type="item", name="bi-dart-turret", amount=1}}, main_product = "", allow_as_intermediate = false, -- Added for 0.18.34/1.1.4 always_show_made_in = false, -- Added for 0.18.34/1.1.4 @@ -280,11 +270,10 @@ data:extend({ enabled = true, energy_required = 8, ingredients = { - {"copper-plate", 5}, - {"wood", 15}, + {type="item", name="copper-plate", amount=5}, + {type="item", name="wood", amount=15}, }, - result = "bi-dart-rifle", - result_count = 1, + results = {{type="item", name="bi-dart-rifle", amount=1}}, main_product = "", allow_as_intermediate = false, -- Added for 0.18.34/1.1.4 always_show_made_in = false, -- Added for 0.18.34/1.1.4 @@ -294,11 +283,10 @@ data:extend({ enabled = true, energy_required = 16, ingredients = { - {"copper-plate", 10}, - {"wood", 25}, + {type="item", name="copper-plate", amount=10}, + {type="item", name="wood", amount=25}, }, - result = "bi-dart-rifle", - result_count = 1, + results = {{type="item", name="bi-dart-rifle", amount=1}}, main_product = "", allow_as_intermediate = false, -- Added for 0.18.34/1.1.4 always_show_made_in = false, -- Added for 0.18.34/1.1.4 diff --git a/Bio_Industries_2/prototypes/Bio_Tweaks/recipe.lua b/Bio_Industries_2/prototypes/Bio_Tweaks/recipe.lua index 662f7e2..c875a8e 100644 --- a/Bio_Industries_2/prototypes/Bio_Tweaks/recipe.lua +++ b/Bio_Industries_2/prototypes/Bio_Tweaks/recipe.lua @@ -41,8 +41,8 @@ log("Enabling disassemble recipes!") {type = "item", name = "burner-mining-drill", amount = 1}, }, results = { - {"stone", 4}, - {"iron-plate", 4} + {type="item", name="stone", amount=4}, + {type="item", name="iron-plate", amount=4} }, main_product = "", }, @@ -71,7 +71,7 @@ log("Enabling disassemble recipes!") {type = "item", name = "burner-inserter", amount = 1}, }, results = { - {"iron-plate", 2}, + {type="item", name="iron-plate", amount=2}, }, main_product = "", }, @@ -100,9 +100,9 @@ log("Enabling disassemble recipes!") {type = "item", name = "long-handed-inserter", amount = 1}, }, results = { - {"iron-gear-wheel", 1}, - {"iron-plate", 1}, - {"electronic-circuit", 1}, + {type="item", name="iron-gear-wheel", amount=1}, + {type="item", name="iron-plate", amount=1}, + {type="item", name="electronic-circuit", amount=1}, }, main_product = "", }, @@ -131,7 +131,7 @@ log("Enabling disassemble recipes!") {type = "item", name = "stone-furnace", amount = 1}, }, results = { - {"stone", 3}, + {type="item", name="stone", amount=3}, }, main_product = "", }, @@ -160,8 +160,8 @@ log("Enabling disassemble recipes!") {type = "item", name = "steel-furnace", amount = 1}, }, results = { - {"steel-plate", 4}, - {"stone-brick", 4} + {type="item", name="steel-plate", amount=4}, + {type="item", name="stone-brick", amount=4} }, main_product = "", }, @@ -182,9 +182,9 @@ if SET and not KRAS then enabled = false, energy_required = 21, ingredients = { - {"electric-furnace", 1}, - {"productivity-module", 1}, - {"bi-rail-wood", 40} + {type="item", name="electric-furnace", amount=1}, + {type="item", name="productivity-module", amount=1}, + {type="item", name="bi-rail-wood", amount=40} }, result_count = 3, result = "production-science-pack" diff --git a/Bio_Industries_2/prototypes/Wood_Products/containers-recipe.lua b/Bio_Industries_2/prototypes/Wood_Products/containers-recipe.lua index 701feb1..07e18ee 100644 --- a/Bio_Industries_2/prototypes/Wood_Products/containers-recipe.lua +++ b/Bio_Industries_2/prototypes/Wood_Products/containers-recipe.lua @@ -26,12 +26,11 @@ data:extend({ energy_required = 2, enabled = false, ingredients = { - {"copper-plate", 16}, - {"resin", 24}, - {"wooden-chest", 8} + {type="item", name="copper-plate", amount=16}, + {type="item", name="resin", amount=24}, + {type="item", name="wooden-chest", amount=8} }, - result = "bi-wooden-chest-large", - result_count = 1, + results = {{type="item", name="bi-wooden-chest-large", amount=1}}, main_product = "", requester_paste_multiplier = 4, allow_as_intermediate = false, -- Added for 0.18.34/1.1.4 @@ -42,12 +41,11 @@ data:extend({ energy_required = 4, enabled = false, ingredients = { - {"copper-plate", 24}, - {"resin", 32}, - {"wooden-chest", 8} + {type="item", name="copper-plate", amount=24}, + {type="item", name="resin", amount=32}, + {type="item", name="wooden-chest", amount=8} }, - result = "bi-wooden-chest-large", - result_count = 1, + results = {{type="item", name="bi-wooden-chest-large", amount=1}}, main_product = "", requester_paste_multiplier = 4, allow_as_intermediate = false, -- Added for 0.18.34/1.1.4 @@ -81,12 +79,11 @@ data:extend({ energy_required = 2, enabled = false, ingredients = { - {"iron-stick", 32}, - {"stone-brick", 32}, - {"bi-wooden-chest-large", 16} + {type="item", name="iron-stick", amount=32}, + {type="item", name="stone-brick", amount=32}, + {type="item", name="bi-wooden-chest-large", amount=16} }, - result = "bi-wooden-chest-huge", - result_count = 1, + results = {{type="item", name="bi-wooden-chest-huge", amount=1}}, main_product = "", requester_paste_multiplier = 4, allow_as_intermediate = false, -- Added for 0.18.34/1.1.4 @@ -97,12 +94,11 @@ data:extend({ energy_required = 4, enabled = false, ingredients = { - {"iron-stick", 48}, - {"stone-brick", 48}, - {"bi-wooden-chest-large", 16} + {type="item", name="iron-stick", amount=48}, + {type="item", name="stone-brick", amount=48}, + {type="item", name="bi-wooden-chest-large", amount=16} }, - result = "bi-wooden-chest-huge", - result_count = 1, + results = {{type="item", name="bi-wooden-chest-huge", amount=1}}, main_product = "", requester_paste_multiplier = 4, allow_as_intermediate = false, -- Added for 0.18.34/1.1.4 @@ -136,12 +132,11 @@ data:extend({ energy_required = 4, enabled = false, ingredients = { - {"steel-plate", 32}, - {"concrete", 32}, - {"bi-wooden-chest-huge", 16} + {type="item", name="steel-plate", amount=32}, + {type="item", name="concrete", amount=32}, + {type="item", name="bi-wooden-chest-huge", amount=16} }, - result = "bi-wooden-chest-giga", - result_count = 1, + results = {{type="item", name="bi-wooden-chest-giga", amount=1}}, main_product = "", requester_paste_multiplier = 4, allow_as_intermediate = false, -- Added for 0.18.34/1.1.4 @@ -152,13 +147,12 @@ data:extend({ energy_required = 6, enabled = false, ingredients = { - {"steel-plate", 48}, - {"concrete", 48}, - {"bi-wooden-chest-huge", 16} + {type="item", name="steel-plate", amount=48}, + {type="item", name="concrete", amount=48}, + {type="item", name="bi-wooden-chest-huge", amount=16} }, main_product = "", - result = "bi-wooden-chest-giga", - result_count = 1, + results = {{type="item", name="bi-wooden-chest-giga", amount=1}}, main_product = "", requester_paste_multiplier = 4, allow_as_intermediate = false, -- Added for 0.18.34/1.1.4 diff --git a/Bio_Industries_2/prototypes/Wood_Products/recipe.lua b/Bio_Industries_2/prototypes/Wood_Products/recipe.lua index cac70de..bbb0607 100644 --- a/Bio_Industries_2/prototypes/Wood_Products/recipe.lua +++ b/Bio_Industries_2/prototypes/Wood_Products/recipe.lua @@ -21,10 +21,10 @@ data:extend({ normal = { enabled = false, ingredients = { - {"wood", 5}, - {"small-electric-pole", 2}, + {type="item", name="wood", amount=5}, + {type="item", name="small-electric-pole", amount=2}, }, - result = "bi-wooden-pole-big", + results = {{type="item", name="bi-wooden-pole-big", amount=1}}, main_product = "", allow_as_intermediate = false, -- Added for 0.18.34/1.1.4 always_show_made_in = false, -- Added for 0.18.34/1.1.4 @@ -33,10 +33,10 @@ data:extend({ expensive = { enabled = false, ingredients = { - {"wood", 10}, - {"small-electric-pole", 4}, + {type="item", name="wood", amount=10}, + {type="item", name="small-electric-pole", amount=4}, }, - result = "bi-wooden-pole-big", + results = {{type="item", name="bi-wooden-pole-big", amount=1}}, main_product = "", allow_as_intermediate = false, -- Added for 0.18.34/1.1.4 always_show_made_in = false, -- Added for 0.18.34/1.1.4 @@ -71,11 +71,11 @@ data:extend({ normal = { enabled = false, ingredients = { - {"wood", 5}, - {"concrete", 100}, - {"bi-wooden-pole-big", 6}, + {type="item", name="wood", amount=5}, + {type="item", name="concrete", amount=100}, + {type="item", name="bi-wooden-pole-big", amount=6}, }, - result = "bi-wooden-pole-huge", + results = {{type="item", name="bi-wooden-pole-huge", amount=1}}, main_product = "", allow_as_intermediate = false, -- Added for 0.18.34/1.1.4 always_show_made_in = false, -- Added for 0.18.34/1.1.4 @@ -84,11 +84,11 @@ data:extend({ expensive = { enabled = false, ingredients = { - {"wood", 10}, - {"concrete", 150}, - {"bi-wooden-pole-big", 10}, + {type="item", name="wood", amount=10}, + {type="item", name="concrete", amount=150}, + {type="item", name="bi-wooden-pole-big", amount=10}, }, - result = "bi-wooden-pole-huge", + results = {{type="item", name="bi-wooden-pole-huge", amount=1}}, main_product = "", allow_as_intermediate = false, -- Added for 0.18.34/1.1.4 always_show_made_in = false, -- Added for 0.18.34/1.1.4 @@ -123,9 +123,9 @@ data:extend({ normal = { enabled = true, ingredients = { - {"wood", 2}, + {type="item", name="wood", amount=2}, }, - result = "bi-wooden-fence", + results = {{type="item", name="bi-wooden-fence", amount=1}}, main_product = "", allow_as_intermediate = false, -- Added for 0.18.34/1.1.4 always_show_made_in = false, -- Added for 0.18.34/1.1.4 @@ -134,9 +134,9 @@ data:extend({ expensive = { enabled = true, ingredients = { - {"wood", 4}, + {type="item", name="wood", amount=4}, }, - result = "bi-wooden-fence", + results = {{type="item", name="bi-wooden-fence", amount=1}}, main_product = "", allow_as_intermediate = false, -- Added for 0.18.34/1.1.4 always_show_made_in = false, -- Added for 0.18.34/1.1.4 @@ -170,13 +170,12 @@ data:extend({ normal = { enabled = false, ingredients = { - {"wood", 6}, - {"stone", 1}, - {"steel-plate", 1}, - {"iron-stick", 1}, + {type="item", name="wood", amount=6}, + {type="item", name="stone", amount=1}, + {type="item", name="steel-plate", amount=1}, + {type="item", name="iron-stick", amount=1}, }, - result = "bi-rail-wood", - result_count = 2, + results = {{type="item", name="bi-rail-wood", amount=2}}, main_product = "", requester_paste_multiplier = 4, allow_as_intermediate = false, -- Added for 0.18.34/1.1.4 @@ -186,13 +185,12 @@ data:extend({ expensive = { enabled = false, ingredients = { - {"wood", 6}, - {"stone", 1}, - {"steel-plate", 1}, - {"iron-stick", 1}, + {type="item", name="wood", amount=6}, + {type="item", name="stone", amount=1}, + {type="item", name="steel-plate", amount=1}, + {type="item", name="iron-stick", amount=1}, }, - result = "bi-rail-wood", - result_count = 1, + results = {{type="item", name="bi-rail-wood", amount=1}}, main_product = "", requester_paste_multiplier = 4, allow_as_intermediate = false, -- Added for 0.18.34/1.1.4 @@ -226,11 +224,10 @@ data:extend({ normal = { enabled = false, ingredients = { - {"bi-rail-wood", 3}, - {"stone-brick", 10}, + {type="item", name="bi-rail-wood", amount=3}, + {type="item", name="stone-brick", amount=10}, }, - result = "rail", - result_count = 2, + results = {{type="item", name="rail", amount=2}}, main_product = "", requester_paste_multiplier = 4, allow_as_intermediate = false, -- Added for 0.18.34/1.1.4 @@ -240,11 +237,10 @@ data:extend({ expensive = { enabled = false, ingredients = { - {"bi-rail-wood", 2}, - {"stone-brick", 10}, + {type="item", name="bi-rail-wood", amount=2}, + {type="item", name="stone-brick", amount=10}, }, - result = "rail", - result_count = 1, + results = {{type="item", name="rail", amount=1}}, main_product = "", requester_paste_multiplier = 4, allow_as_intermediate = false, -- Added for 0.18.34/1.1.4 @@ -278,12 +274,11 @@ data:extend({ normal = { enabled = false, ingredients = { - {"bi-rail-wood", 1}, - {"steel-plate", 1}, - {"wood", 32} + {type="item", name="bi-rail-wood", amount=1}, + {type="item", name="steel-plate", amount=1}, + {type="item", name="wood", amount=32} }, - result = "bi-rail-wood-bridge", - result_count = 2, + results = {{type="item", name="bi-rail-wood-bridge", amount=2}}, main_product = "", requester_paste_multiplier = 4, allow_as_intermediate = false, -- Added for 0.18.34/1.1.4 @@ -293,12 +288,11 @@ data:extend({ expensive = { enabled = false, ingredients = { - {"bi-rail-wood", 1}, - {"steel-plate", 1}, - {"wood", 32} + {type="item", name="bi-rail-wood", amount=1}, + {type="item", name="steel-plate", amount=1}, + {type="item", name="wood", amount=32} }, - result = "bi-rail-wood-bridge", - result_count = 1, + results = {{type="item", name="bi-rail-wood-bridge", amount=1}}, main_product = "", requester_paste_multiplier = 4, allow_as_intermediate = false, -- Added for 0.18.34/1.1.4 @@ -334,11 +328,10 @@ data:extend({ normal = { enabled = false, ingredients = { - {"rail", 2}, - {"copper-cable", 4}, + {type="item", name="rail", amount=2}, + {type="item", name="copper-cable", amount=4}, }, - result = "bi-rail-power", - result_count = 2, + results = {{type="item", name="bi-rail-power", amount=2}}, main_product = "", requester_paste_multiplier = 4, allow_as_intermediate = false, -- Added for 0.18.34/1.1.4 @@ -348,11 +341,10 @@ data:extend({ expensive = { enabled = false, ingredients = { - {"rail", 1}, - {"copper-cable", 4}, + {type="item", name="rail", amount=1}, + {type="item", name="copper-cable", amount=4}, }, - result = "bi-rail-power", - result_count = 1, + results = {{type="item", name="bi-rail-power", amount=1}}, main_product = "", requester_paste_multiplier = 4, allow_as_intermediate = false, -- Added for 0.18.34/1.1.4 @@ -386,11 +378,10 @@ data:extend({ energy_required = 1, enabled = true, ingredients = { - {"copper-plate", 1}, - {"wood", 8} + {type="item", name="copper-plate", amount=1}, + {type="item", name="wood", amount=8} }, - result = "bi-wood-pipe", - result_count = 4, + results = {{type="item", name="bi-wood-pipe", amount=4}}, main_product = "", requester_paste_multiplier = 15, allow_as_intermediate = false, -- Added for 0.18.34/1.1.4 @@ -401,11 +392,10 @@ data:extend({ energy_required = 2, enabled = true, ingredients = { - {"copper-plate", 1}, - {"wood", 12} + {type="item", name="copper-plate", amount=1}, + {type="item", name="wood", amount=12} }, - result = "bi-wood-pipe", - result_count = 4, + results = {{type="item", name="bi-wood-pipe", amount=4}}, main_product = "", requester_paste_multiplier = 15, allow_as_intermediate = false, -- Added for 0.18.34/1.1.4 @@ -442,11 +432,10 @@ data:extend({ energy_required = 2, enabled = true, ingredients = { - {"copper-plate", 4}, - {"bi-wood-pipe", 5} + {type="item", name="copper-plate", amount=4}, + {type="item", name="bi-wood-pipe", amount=5} }, - result = "bi-wood-pipe-to-ground", - result_count = 2, + results = {{type="item", name="bi-wood-pipe-to-ground", amount=2}}, main_product = "", allow_as_intermediate = false, -- Added for 0.18.34/1.1.4 always_show_made_in = false, -- Added for 0.18.34/1.1.4 @@ -456,11 +445,10 @@ data:extend({ energy_required = 4, enabled = true, ingredients = { - {"copper-plate", 5}, - {"bi-wood-pipe", 6} + {type="item", name="copper-plate", amount=5}, + {type="item", name="bi-wood-pipe", amount=6} }, - result = "bi-wood-pipe-to-ground", - result_count = 2, + results = {{type="item", name="bi-wood-pipe-to-ground", amount=2}}, main_product = "", allow_as_intermediate = false, -- Added for 0.18.34/1.1.4 always_show_made_in = false, -- Added for 0.18.34/1.1.4 @@ -493,10 +481,10 @@ data:extend({ normal = { enabled = false, ingredients = { - {"copper-cable", 2}, - {"medium-electric-pole", 1}, + {type="item", name="copper-cable", amount=2}, + {type="item", name="medium-electric-pole", amount=1}, }, - result = "bi-power-to-rail-pole", + results = {{type="item", name="bi-power-to-rail-pole", amount=1}}, main_product = "", allow_as_intermediate = false, -- Added for 0.18.34/1.1.4 always_show_made_in = false, -- Added for 0.18.34/1.1.4 @@ -505,10 +493,10 @@ data:extend({ expensive = { enabled = false, ingredients = { - {"copper-cable", 4}, - {"medium-electric-pole", 1}, + {type="item", name="copper-cable", amount=4}, + {type="item", name="medium-electric-pole", amount=1}, }, - result = "bi-power-to-rail-pole", + results = {{type="item", name="bi-power-to-rail-pole", amount=1}}, main_product = "", allow_as_intermediate = false, -- Added for 0.18.34/1.1.4 always_show_made_in = false, -- Added for 0.18.34/1.1.4 @@ -541,9 +529,9 @@ data:extend({ --~ energy_required = 2, --~ enabled = false, --~ ingredients = { - --~ {"copper-plate", 16}, - --~ {"resin", 24}, - --~ {"wooden-chest", 8} + --~ {type="item", name="copper-plate", amount=16}, + --~ {type="item", name="resin", amount=24}, + --~ {type="item", name="wooden-chest", amount=8} --~ }, --~ result = "bi-wooden-chest-large", --~ result_count = 1, @@ -557,9 +545,9 @@ data:extend({ --~ energy_required = 4, --~ enabled = false, --~ ingredients = { - --~ {"copper-plate", 24}, - --~ {"resin", 32}, - --~ {"wooden-chest", 8} + --~ {type="item", name="copper-plate", amount=24}, + --~ {type="item", name="resin", amount=32}, + --~ {type="item", name="wooden-chest", amount=8} --~ }, --~ result = "bi-wooden-chest-large", --~ result_count = 1, @@ -596,9 +584,9 @@ data:extend({ --~ energy_required = 2, --~ enabled = false, --~ ingredients = { - --~ {"iron-stick", 32}, - --~ {"stone-brick", 32}, - --~ {"bi-wooden-chest-large", 16} + --~ {type="item", name="iron-stick", amount=32}, + --~ {type="item", name="stone-brick", amount=32}, + --~ {type="item", name="bi-wooden-chest-large", amount=16} --~ }, --~ result = "bi-wooden-chest-huge", --~ result_count = 1, @@ -612,9 +600,9 @@ data:extend({ --~ energy_required = 4, --~ enabled = false, --~ ingredients = { - --~ {"iron-stick", 48}, - --~ {"stone-brick", 48}, - --~ {"bi-wooden-chest-large", 16} + --~ {type="item", name="iron-stick", amount=48}, + --~ {type="item", name="stone-brick", amount=48}, + --~ {type="item", name="bi-wooden-chest-large", amount=16} --~ }, --~ result = "bi-wooden-chest-huge", --~ result_count = 1, @@ -651,9 +639,9 @@ data:extend({ --~ energy_required = 4, --~ enabled = false, --~ ingredients = { - --~ {"steel-plate", 32}, - --~ {"concrete", 32}, - --~ {"bi-wooden-chest-huge", 16} + --~ {type="item", name="steel-plate", amount=32}, + --~ {type="item", name="concrete", amount=32}, + --~ {type="item", name="bi-wooden-chest-huge", amount=16} --~ }, --~ result = "bi-wooden-chest-giga", --~ result_count = 1, @@ -667,9 +655,9 @@ data:extend({ --~ energy_required = 6, --~ enabled = false, --~ ingredients = { - --~ {"steel-plate", 48}, - --~ {"concrete", 48}, - --~ {"bi-wooden-chest-huge", 16} + --~ {type="item", name="steel-plate", amount=48}, + --~ {type="item", name="concrete", amount=48}, + --~ {type="item", name="bi-wooden-chest-huge", amount=16} --~ }, --~ main_product = "", --~ result = "bi-wooden-chest-giga",