From e5604d764e83ba5d9b41e51fc3f0bc40b453f3a9 Mon Sep 17 00:00:00 2001 From: KiwiHawk <59639+KiwiHawk@users.noreply.github.com> Date: Sun, 21 Jul 2024 22:43:32 +1200 Subject: [PATCH] Remove result / result_count #189 Also remove short syntax of item product --- bobassembly/prototypes/assembly-burner.lua | 4 +- .../prototypes/assembly-electronics.lua | 6 +- bobassembly/prototypes/assembly.lua | 6 +- bobassembly/prototypes/centrifuge.lua | 4 +- .../chemical-mixing-furnace-updates.lua | 33 +---- .../prototypes/chemical-mixing-furnace.lua | 4 +- bobassembly/prototypes/chemical-plant.lua | 6 +- bobassembly/prototypes/distillery.lua | 8 +- bobassembly/prototypes/electric-furnace.lua | 4 +- bobassembly/prototypes/electrolyser.lua | 8 +- .../prototypes/fluid-furnace-updates.lua | 8 +- bobassembly/prototypes/fluid-furnace.lua | 117 ++++++------------ bobassembly/prototypes/oil-refinery.lua | 6 +- bobclasses/prototypes/bodies.lua | 20 +-- bobclasses/prototypes/parts.lua | 22 ++-- bobelectronics/prototypes/electronics.lua | 49 +++----- bobelectronics/prototypes/resource.lua | 18 ++- bobenemies/prototypes/alien-artifact.lua | 32 ++--- bobequipment/prototypes/personal-roboport.lua | 28 ++--- bobequipment/prototypes/recipe/equipment.lua | 46 +++---- bobgreenhouse/prototypes/recipes.lua | 6 +- boblibrary/auto-bottle.lua | 4 +- boblibrary/functions.lua | 24 +--- boblibrary/recipe-functions.lua | 9 +- boblogistics/prototypes/chests.lua | 4 +- boblogistics/prototypes/entity/pipes.lua | 5 +- .../prototypes/recipe/belt-recipe.lua | 82 +++++------- .../prototypes/recipe/inserter-recipe.lua | 72 +++++------ .../recipe/logistic-container-recipe.lua | 20 +-- .../prototypes/recipe/pipes-recipe.lua | 55 ++++---- .../prototypes/recipe/pump-recipe.lua | 6 +- .../recipe/roboport-parts-recipe.lua | 24 ++-- .../prototypes/recipe/roboport-recipe.lua | 40 +++--- .../prototypes/recipe/robots-recipe.lua | 16 +-- .../prototypes/recipe/storage-tank-recipe.lua | 14 +-- .../prototypes/recipe/train-recipe.lua | 24 ++-- boblogistics/prototypes/repair-pack.lua | 8 +- boblogistics/prototypes/robot-parts.lua | 22 ++-- boblogistics/prototypes/valves.lua | 6 +- bobmining/prototypes/areadrills.lua | 8 +- bobmining/prototypes/drills.lua | 8 +- bobmining/prototypes/pumpjacks.lua | 8 +- bobmining/prototypes/steam-drills.lua | 2 +- bobmining/prototypes/water-miner.lua | 10 +- bobmodules/prototypes/beacon.lua | 4 +- bobmodules/prototypes/lab.lua | 2 +- bobmodules/prototypes/recipe/electronics.lua | 46 ++++--- .../prototypes/recipe/module-merged.lua | 106 ++++++++-------- bobmodules/prototypes/recipe/module.lua | 62 +++++----- bobores/data-updates.lua | 40 +++--- bobplates/data-updates.lua | 5 +- bobplates/prototypes/distillery.lua | 2 +- bobplates/prototypes/recipe/alien-recipe.lua | 6 +- bobplates/prototypes/recipe/alloy-recipe.lua | 3 +- .../prototypes/recipe/chemistry-recipe.lua | 28 ++--- .../prototypes/recipe/electronics-recipe.lua | 2 +- .../recipe/entity-recipe-updates.lua | 4 +- bobplates/prototypes/recipe/entity-recipe.lua | 54 ++++---- bobplates/prototypes/recipe/gems-recipe.lua | 42 +++---- .../prototypes/recipe/nuclear-recipe.lua | 27 ++-- bobplates/prototypes/recipe/parts-recipe.lua | 52 +++----- bobplates/prototypes/recipe/plates-recipe.lua | 29 ++--- .../prototypes/recipe/resource-recipe.lua | 38 +++--- bobpower/prototypes/burner-generator.lua | 2 +- bobpower/prototypes/burner-reactor.lua | 10 +- bobpower/prototypes/heat-pipes.lua | 6 +- bobpower/prototypes/recipe/accumulators.lua | 16 +-- bobpower/prototypes/recipe/boilers.lua | 8 +- .../prototypes/recipe/fluid-generator.lua | 8 +- .../prototypes/recipe/heat-exchangers.lua | 14 +-- bobpower/prototypes/recipe/nuclear.lua | 4 +- .../prototypes/recipe/oil-boilers-updates.lua | 10 +- bobpower/prototypes/recipe/oil-boilers.lua | 14 +-- bobpower/prototypes/recipe/poles.lua | 18 +-- bobpower/prototypes/recipe/solar-panels.lua | 16 +-- bobpower/prototypes/recipe/steam-engines.lua | 8 +- bobpower/prototypes/recipe/steam-turbines.lua | 6 +- bobrevamp/prototypes/rocket-fuel.lua | 2 +- bobrevamp/prototypes/rocket-parts.lua | 2 +- bobrevamp/prototypes/rtg.lua | 2 +- bobtech/prototypes/recipe/recipe-alien.lua | 25 ++-- bobtech/prototypes/recipe/recipe-updates.lua | 2 +- bobtech/prototypes/recipe/recipe.lua | 10 +- bobvehicleequipment/prototypes/battery.lua | 12 +- .../prototypes/belt-immunity.lua | 2 +- .../prototypes/fusion-cell.lua | 12 +- bobvehicleequipment/prototypes/generator.lua | 12 +- .../prototypes/laser-defense.lua | 12 +- .../prototypes/plasma-defense.lua | 12 +- bobvehicleequipment/prototypes/roboport.lua | 32 ++--- bobvehicleequipment/prototypes/shield.lua | 12 +- .../prototypes/solar-panel.lua | 12 +- bobvehicleequipment/prototypes/speed.lua | 4 +- bobwarfare/prototypes/recipe/ammo-recipe.lua | 96 ++++++-------- bobwarfare/prototypes/recipe/armor-recipe.lua | 10 +- bobwarfare/prototypes/recipe/drone.lua | 12 +- bobwarfare/prototypes/recipe/gun-recipe.lua | 6 +- bobwarfare/prototypes/recipe/mine-recipe.lua | 9 +- bobwarfare/prototypes/recipe/parts-recipe.lua | 99 ++++++--------- bobwarfare/prototypes/recipe/radar-recipe.lua | 8 +- bobwarfare/prototypes/recipe/tank.lua | 4 +- bobwarfare/prototypes/recipe/turrets.lua | 36 +++--- bobwarfare/prototypes/recipe/wall.lua | 4 +- bobwarfare/prototypes/robot-parts.lua | 16 +-- bobwarfare/prototypes/robots.lua | 10 +- bobwarfare/prototypes/spidertron.lua | 26 ++-- bobwarfare/prototypes/train.lua | 4 +- 107 files changed, 928 insertions(+), 1175 deletions(-) diff --git a/bobassembly/prototypes/assembly-burner.lua b/bobassembly/prototypes/assembly-burner.lua index 7f85be17c..513b7bc95 100644 --- a/bobassembly/prototypes/assembly-burner.lua +++ b/bobassembly/prototypes/assembly-burner.lua @@ -19,7 +19,7 @@ if not mods["aai-industry"] and settings.startup["bobmods-assembly-burner"].valu { "iron-gear-wheel", 5 }, { "iron-plate", 9 }, }, - result = "burner-assembling-machine", + results = {{ type = "item", name = "burner-assembling-machine", amount = 1 }}, }, { @@ -158,7 +158,7 @@ if not mods["aai-industry"] and settings.startup["bobmods-assembly-burner"].valu { "iron-plate", 10 }, { "pipe", 5 }, }, - result = "steam-assembling-machine", + results = {{ type = "item", name = "steam-assembling-machine", amount = 1 }}, }, { diff --git a/bobassembly/prototypes/assembly-electronics.lua b/bobassembly/prototypes/assembly-electronics.lua index 1e9bc57a9..fc071d174 100644 --- a/bobassembly/prototypes/assembly-electronics.lua +++ b/bobassembly/prototypes/assembly-electronics.lua @@ -143,7 +143,7 @@ if settings.startup["bobmods-assembly-electronicmachines"].value == true then { "iron-plate", 5 }, { "iron-gear-wheel", 5 }, }, - result = "electronics-machine-1", + results = {{ type = "item", name = "electronics-machine-1", amount = 1 }}, }, { @@ -311,7 +311,7 @@ if settings.startup["bobmods-assembly-electronicmachines"].value == true then { "steel-plate", 5 }, { "iron-gear-wheel", 5 }, }, - result = "electronics-machine-2", + results = {{ type = "item", name = "electronics-machine-2", amount = 1 }}, }, { @@ -483,7 +483,7 @@ if settings.startup["bobmods-assembly-electronicmachines"].value == true then { "steel-plate", 5 }, { "iron-gear-wheel", 5 }, }, - result = "electronics-machine-3", + results = {{ type = "item", name = "electronics-machine-3", amount = 1 }}, }, { diff --git a/bobassembly/prototypes/assembly.lua b/bobassembly/prototypes/assembly.lua index 4ff354fa0..647d0434d 100644 --- a/bobassembly/prototypes/assembly.lua +++ b/bobassembly/prototypes/assembly.lua @@ -116,7 +116,7 @@ data:extend({ { "steel-plate", 9 }, { "iron-gear-wheel", 5 }, }, - result = "assembling-machine-4", + results = {{ type = "item", name = "assembling-machine-4", amount = 1 }}, }, { @@ -296,7 +296,7 @@ data:extend({ { "steel-plate", 9 }, { "iron-gear-wheel", 5 }, }, - result = "assembling-machine-5", + results = {{ type = "item", name = "assembling-machine-5", amount = 1 }}, }, { @@ -476,7 +476,7 @@ data:extend({ { "iron-plate", 5 }, { "iron-gear-wheel", 5 }, }, - result = "assembling-machine-6", + results = {{ type = "item", name = "assembling-machine-6", amount = 1 }}, }, { diff --git a/bobassembly/prototypes/centrifuge.lua b/bobassembly/prototypes/centrifuge.lua index ce3ee2859..cb3d15e95 100644 --- a/bobassembly/prototypes/centrifuge.lua +++ b/bobassembly/prototypes/centrifuge.lua @@ -38,7 +38,7 @@ if settings.startup["bobmods-assembly-centrifuge"].value == true then { "processing-unit", 100 }, { "iron-gear-wheel", 100 }, }, - result = "centrifuge-2", + results = {{ type = "item", name = "centrifuge-2", amount = 1 }}, requester_paste_multiplier = 10, }, { @@ -53,7 +53,7 @@ if settings.startup["bobmods-assembly-centrifuge"].value == true then { "processing-unit", 100 }, { "iron-gear-wheel", 100 }, }, - result = "centrifuge-3", + results = {{ type = "item", name = "centrifuge-3", amount = 1 }}, requester_paste_multiplier = 10, }, diff --git a/bobassembly/prototypes/chemical-mixing-furnace-updates.lua b/bobassembly/prototypes/chemical-mixing-furnace-updates.lua index ef35817a8..6d7b197fd 100644 --- a/bobassembly/prototypes/chemical-mixing-furnace-updates.lua +++ b/bobassembly/prototypes/chemical-mixing-furnace-updates.lua @@ -6,18 +6,7 @@ if and (data.raw.technology["alloy-processing-2"] or data.raw.technology["electric-mixing-furnace"]) and data.raw.technology["electric-chemical-furnace"] then - --older plates mod - if not data.raw.item["electric-chemical-furnace"] and data.raw.item["chemical-furnace"] then - bobmods.lib.recipe.replace_ingredient( - "electric-chemical-mixing-furnace", - "electric-chemical-furnace", - "chemical-furnace" - ) - end - - if data.raw["assembling-machine"]["chemical-furnace"] then - data.raw["assembling-machine"]["chemical-furnace"].next_upgrade = "electric-chemical-mixing-furnace" - elseif data.raw["assembling-machine"]["electric-chemical-furnace"] then + if data.raw["assembling-machine"]["electric-chemical-furnace"] then data.raw["assembling-machine"]["electric-chemical-furnace"].next_upgrade = "electric-chemical-mixing-furnace" end @@ -66,30 +55,20 @@ then data.raw["assembling-machine"]["electric-chemical-mixing-furnace"].ingredient_count = 6 data.raw["assembling-machine"]["electric-chemical-mixing-furnace-2"].ingredient_count = 8 - if data.raw["assembling-machine"]["chemical-boiler"] then - data.raw["assembling-machine"]["chemical-boiler"].ingredient_count = 2 - elseif data.raw["assembling-machine"]["stone-chemical-furnace"] then + if data.raw["assembling-machine"]["stone-chemical-furnace"] then data.raw["assembling-machine"]["stone-chemical-furnace"].ingredient_count = 2 end - if data.raw["assembling-machine"]["chemical-steel-furnace"] then - data.raw["assembling-machine"]["chemical-steel-furnace"].ingredient_count = 4 - elseif data.raw["assembling-machine"]["steel-chemical-furnace"] then + if data.raw["assembling-machine"]["steel-chemical-furnace"] then data.raw["assembling-machine"]["steel-chemical-furnace"].ingredient_count = 4 end - if data.raw["assembling-machine"]["chemical-furnace"] then - data.raw["assembling-machine"]["chemical-furnace"].ingredient_count = 4 - elseif data.raw["assembling-machine"]["electric-chemical-furnace"] then + if data.raw["assembling-machine"]["electric-chemical-furnace"] then data.raw["assembling-machine"]["electric-chemical-furnace"].ingredient_count = 4 end - if data.raw["assembling-machine"]["mixing-furnace"] then - data.raw["assembling-machine"]["mixing-furnace"].ingredient_count = 2 - elseif data.raw["assembling-machine"]["stone-mixing-furnace"] then + if data.raw["assembling-machine"]["stone-mixing-furnace"] then data.raw["assembling-machine"]["stone-mixing-furnace"].ingredient_count = 2 end - if data.raw["assembling-machine"]["mixing-steel-furnace"] then - data.raw["assembling-machine"]["mixing-steel-furnace"].ingredient_count = 4 - elseif data.raw["assembling-machine"]["steel-mixing-furnace"] then + if data.raw["assembling-machine"]["steel-mixing-furnace"] then data.raw["assembling-machine"]["steel-mixing-furnace"].ingredient_count = 2 end if data.raw["assembling-machine"]["electric-mixing-furnace"] then diff --git a/bobassembly/prototypes/chemical-mixing-furnace.lua b/bobassembly/prototypes/chemical-mixing-furnace.lua index 4a883beef..182111291 100644 --- a/bobassembly/prototypes/chemical-mixing-furnace.lua +++ b/bobassembly/prototypes/chemical-mixing-furnace.lua @@ -88,7 +88,7 @@ then { "processing-unit", 5 }, { "pipe", 5 }, }, - result = "electric-chemical-mixing-furnace", + results = {{ type = "item", name = "electric-chemical-mixing-furnace", amount = 1 }}, }, { @@ -103,7 +103,7 @@ then { "processing-unit", 5 }, { "pipe", 5 }, }, - result = "electric-chemical-mixing-furnace-2", + results = {{ type = "item", name = "electric-chemical-mixing-furnace-2", amount = 1 }}, }, { diff --git a/bobassembly/prototypes/chemical-plant.lua b/bobassembly/prototypes/chemical-plant.lua index abdbe6c8e..4328da1e9 100644 --- a/bobassembly/prototypes/chemical-plant.lua +++ b/bobassembly/prototypes/chemical-plant.lua @@ -359,7 +359,7 @@ if settings.startup["bobmods-assembly-chemicalplants"].value == true then { "advanced-circuit", 5 }, { "pipe", 5 }, }, - result = "chemical-plant-2", + results = {{ type = "item", name = "chemical-plant-2", amount = 1 }}, }, { @@ -374,7 +374,7 @@ if settings.startup["bobmods-assembly-chemicalplants"].value == true then { "processing-unit", 10 }, { "pipe", 5 }, }, - result = "chemical-plant-3", + results = {{ type = "item", name = "chemical-plant-3", amount = 1 }}, }, { @@ -389,7 +389,7 @@ if settings.startup["bobmods-assembly-chemicalplants"].value == true then { "processing-unit", 10 }, { "pipe", 5 }, }, - result = "chemical-plant-4", + results = {{ type = "item", name = "chemical-plant-4", amount = 1 }}, }, { diff --git a/bobassembly/prototypes/distillery.lua b/bobassembly/prototypes/distillery.lua index c61826159..98afe6055 100644 --- a/bobassembly/prototypes/distillery.lua +++ b/bobassembly/prototypes/distillery.lua @@ -65,7 +65,7 @@ then { "copper-plate", 3 }, { "pipe", 2 }, }, - result = "bob-distillery-2", + results = {{ type = "item", name = "bob-distillery-2", amount = 1 }}, }, { type = "recipe", @@ -78,7 +78,7 @@ then { "copper-plate", 3 }, { "pipe", 2 }, }, - result = "bob-distillery-3", + results = {{ type = "item", name = "bob-distillery-3", amount = 1 }}, }, { @@ -92,7 +92,7 @@ then { "copper-plate", 3 }, { "pipe", 2 }, }, - result = "bob-distillery-4", + results = {{ type = "item", name = "bob-distillery-4", amount = 1 }}, }, { @@ -106,7 +106,7 @@ then { "copper-plate", 3 }, { "pipe", 2 }, }, - result = "bob-distillery-5", + results = {{ type = "item", name = "bob-distillery-5", amount = 1 }}, }, util.merge({ diff --git a/bobassembly/prototypes/electric-furnace.lua b/bobassembly/prototypes/electric-furnace.lua index 0e74f24c3..fbb1d67b5 100644 --- a/bobassembly/prototypes/electric-furnace.lua +++ b/bobassembly/prototypes/electric-furnace.lua @@ -203,7 +203,7 @@ if settings.startup["bobmods-assembly-furnaces"].value == true and data.raw.furn { "stone-brick", 10 }, { "processing-unit", 5 }, }, - result = "electric-furnace-2", + results = {{ type = "item", name = "electric-furnace-2", amount = 1 }}, energy_required = 5, enabled = false, }, @@ -217,7 +217,7 @@ if settings.startup["bobmods-assembly-furnaces"].value == true and data.raw.furn { "stone-brick", 10 }, { "processing-unit", 5 }, }, - result = "electric-furnace-3", + results = {{ type = "item", name = "electric-furnace-3", amount = 1 }}, energy_required = 5, enabled = false, }, diff --git a/bobassembly/prototypes/electrolyser.lua b/bobassembly/prototypes/electrolyser.lua index 6fb41ed3d..99c76f230 100644 --- a/bobassembly/prototypes/electrolyser.lua +++ b/bobassembly/prototypes/electrolyser.lua @@ -213,7 +213,7 @@ then { "electronic-circuit", 5 }, { "pipe", 5 }, }, - result = "electrolyser-2", + results = {{ type = "item", name = "electrolyser-2", amount = 1 }}, }, { @@ -229,7 +229,7 @@ then { "advanced-circuit", 10 }, { "pipe", 5 }, }, - result = "electrolyser-3", + results = {{ type = "item", name = "electrolyser-3", amount = 1 }}, }, { @@ -245,7 +245,7 @@ then { "processing-unit", 10 }, { "pipe", 5 }, }, - result = "electrolyser-4", + results = {{ type = "item", name = "electrolyser-4", amount = 1 }}, }, { @@ -261,7 +261,7 @@ then { "processing-unit", 10 }, { "pipe", 5 }, }, - result = "electrolyser-5", + results = {{ type = "item", name = "electrolyser-5", amount = 1 }}, }, { diff --git a/bobassembly/prototypes/fluid-furnace-updates.lua b/bobassembly/prototypes/fluid-furnace-updates.lua index 65cdeed3a..36de30e4d 100644 --- a/bobassembly/prototypes/fluid-furnace-updates.lua +++ b/bobassembly/prototypes/fluid-furnace-updates.lua @@ -28,14 +28,14 @@ if settings.startup["bobmods-assembly-oilfurnaces"].value == true then then if data.raw.item["steel-pipe"] then bobmods.lib.recipe.remove_result("steel-furnace-from-fluid-furnace", "pipe") - bobmods.lib.recipe.add_result("steel-furnace-from-fluid-furnace", { "steel-pipe", 2 }) + bobmods.lib.recipe.add_result("steel-furnace-from-fluid-furnace", { type = "item", name = "steel-pipe", amount = 2 }) end if data.raw.recipe["fluid-mixing-furnace"] then if data.raw.item["steel-pipe"] then bobmods.lib.recipe.replace_ingredient("fluid-mixing-furnace-from-fluid-furnace", "pipe", "steel-pipe") bobmods.lib.recipe.remove_result("steel-mixing-furnace-from-fluid-mixing-furnace", "pipe") - bobmods.lib.recipe.add_result("steel-mixing-furnace-from-fluid-mixing-furnace", { "steel-pipe", 2 }) + bobmods.lib.recipe.add_result("steel-mixing-furnace-from-fluid-mixing-furnace", { type = "item", name = "steel-pipe", amount = 2 }) end end if data.raw.recipe["fluid-chemical-furnace"] then @@ -43,10 +43,10 @@ if settings.startup["bobmods-assembly-oilfurnaces"].value == true then bobmods.lib.recipe.replace_ingredient("fluid-chemical-furnace-from-fluid-furnace", "pipe", "steel-pipe") bobmods.lib.recipe.remove_result("steel-chemical-furnace-from-fluid-chemical-furnace", "pipe") - bobmods.lib.recipe.add_result("steel-chemical-furnace-from-fluid-chemical-furnace", { "steel-pipe", 2 }) + bobmods.lib.recipe.add_result("steel-chemical-furnace-from-fluid-chemical-furnace", { type = "item", name = "steel-pipe", amount = 2 }) bobmods.lib.recipe.remove_result("fluid-furnace-from-fluid-chemical-furnace", "pipe") - bobmods.lib.recipe.add_result("fluid-furnace-from-fluid-chemical-furnace", { "steel-pipe", 5 }) + bobmods.lib.recipe.add_result("fluid-furnace-from-fluid-chemical-furnace", { type = "item", name = "steel-pipe", amount = 5 }) end end end diff --git a/bobassembly/prototypes/fluid-furnace.lua b/bobassembly/prototypes/fluid-furnace.lua index c33b9b922..f3e6162a0 100644 --- a/bobassembly/prototypes/fluid-furnace.lua +++ b/bobassembly/prototypes/fluid-furnace.lua @@ -60,7 +60,7 @@ if settings.startup["bobmods-assembly-oilfurnaces"].value == true then { "steel-furnace", 1 }, { "pipe", 2 }, }, - result = "fluid-furnace", + results = {{ type = "item", name = "fluid-furnace", amount = 1 }}, }, { type = "technology", @@ -105,8 +105,8 @@ if settings.startup["bobmods-assembly-oilfurnaces"].value == true then { "fluid-furnace", 1 }, }, results = { - { "steel-furnace", 1 }, - { "pipe", 2 }, + { type = "item", name = "steel-furnace", amount = 1 }, + { type = "item", name = "pipe", amount = 2 }, }, main_product = "steel-furnace", allow_as_intermediate = false, @@ -119,9 +119,7 @@ if settings.startup["bobmods-assembly-oilfurnaces"].value == true then end end - if - data.raw["assembling-machine"]["mixing-steel-furnace"] or data.raw["assembling-machine"]["steel-mixing-furnace"] - then + if data.raw["assembling-machine"]["steel-mixing-furnace"] then data:extend({ { type = "item", @@ -141,8 +139,9 @@ if settings.startup["bobmods-assembly-oilfurnaces"].value == true then enabled = false, ingredients = { { "pipe", 2 }, + { "steel-mixing-furnace", 1 }, }, - result = "fluid-mixing-furnace", + results = {{ type = "item", name = "fluid-mixing-furnace", amount = 1 }}, }, { type = "technology", @@ -162,6 +161,7 @@ if settings.startup["bobmods-assembly-oilfurnaces"].value == true then }, prerequisites = { "oil-processing", + "steel-mixing-furnace", }, effects = { { @@ -181,31 +181,15 @@ if settings.startup["bobmods-assembly-oilfurnaces"].value == true then }, }) - if data.raw["assembling-machine"]["steel-mixing-furnace"] then - bobmods.lib.recipe.add_ingredient("fluid-mixing-furnace", { "steel-mixing-furnace", 1 }) - bobmods.lib.tech.add_prerequisite("fluid-mixing-furnace", "steel-mixing-furnace") - data:extend({ - util.merge({ - data.raw["assembling-machine"]["steel-mixing-furnace"], - { - name = "fluid-mixing-furnace", - minable = { result = "fluid-mixing-furnace" }, - }, - }), - }) - else - bobmods.lib.recipe.add_ingredient("fluid-mixing-furnace", { "mixing-steel-furnace", 1 }) - bobmods.lib.tech.add_prerequisite("fluid-mixing-furnace", "mixing-steel-furnace") - data:extend({ - util.merge({ - data.raw["assembling-machine"]["mixing-steel-furnace"], - { - name = "fluid-mixing-furnace", - minable = { result = "fluid-mixing-furnace" }, - }, - }), - }) - end + data:extend({ + util.merge({ + data.raw["assembling-machine"]["steel-mixing-furnace"], + { + name = "fluid-mixing-furnace", + minable = { result = "fluid-mixing-furnace" }, + }, + }), + }) data.raw["assembling-machine"]["fluid-mixing-furnace"].energy_source = fluid_energy_source() @@ -224,7 +208,7 @@ if settings.startup["bobmods-assembly-oilfurnaces"].value == true then { "fluid-mixing-furnace", 1 }, }, results = { - { "pipe", 2 }, + { type = "item", name = "pipe", amount = 2 }, }, main_product = "steel-mixing-furnace", allow_as_intermediate = false, @@ -239,7 +223,7 @@ if settings.startup["bobmods-assembly-oilfurnaces"].value == true then ingredients = { { "fluid-furnace", 1 }, }, - result = "fluid-mixing-furnace", + results = {{ type = "item", name = "fluid-mixing-furnace", amount = 1 }}, allow_as_intermediate = false, }, { @@ -251,16 +235,13 @@ if settings.startup["bobmods-assembly-oilfurnaces"].value == true then ingredients = { { "fluid-mixing-furnace", 1 }, }, - result = "fluid-furnace", + results = {{ type = "item", name = "fluid-furnace", amount = 1 }}, allow_as_intermediate = false, }, }) if data.raw["assembling-machine"]["steel-mixing-furnace"] then - bobmods.lib.recipe.add_result("steel-mixing-furnace-from-fluid-mixing-furnace", { "steel-mixing-furnace", 1 }) - else - bobmods.lib.recipe.add_result("steel-mixing-furnace-from-fluid-mixing-furnace", { "mixing-steel-furnace", 1 }) - data.raw.recipe["steel-mixing-furnace-from-fluid-mixing-furnace"].main_product = "mixing-steel-furnace" + bobmods.lib.recipe.add_result("steel-mixing-furnace-from-fluid-mixing-furnace", { type = "item", name = "steel-mixing-furnace", amount = 1 }) end bobmods.lib.tech.add_recipe_unlock("fluid-mixing-furnace", "steel-mixing-furnace-from-fluid-mixing-furnace") @@ -269,10 +250,7 @@ if settings.startup["bobmods-assembly-oilfurnaces"].value == true then end end - if - data.raw["assembling-machine"]["chemical-steel-furnace"] - or data.raw["assembling-machine"]["steel-chemical-furnace"] - then + if data.raw["assembling-machine"]["steel-chemical-furnace"] then data:extend({ { type = "item", @@ -292,8 +270,9 @@ if settings.startup["bobmods-assembly-oilfurnaces"].value == true then enabled = false, ingredients = { { "pipe", 2 }, + { "steel-chemical-furnace", 1 }, }, - result = "fluid-chemical-furnace", + results = {{ type = "item", name = "fluid-chemical-furnace", amount = 1 }}, }, { type = "technology", @@ -333,34 +312,18 @@ if settings.startup["bobmods-assembly-oilfurnaces"].value == true then }, }) - if data.raw["assembling-machine"]["steel-chemical-furnace"] then - bobmods.lib.recipe.add_ingredient("fluid-chemical-furnace", { "steel-chemical-furnace", 1 }) - data:extend({ - util.merge({ - data.raw["assembling-machine"]["steel-chemical-furnace"], - { - name = "fluid-chemical-furnace", - minable = { result = "fluid-chemical-furnace" }, - }, - }), - }) - else - bobmods.lib.recipe.add_ingredient("fluid-chemical-furnace", { "chemical-steel-furnace", 1 }) - data:extend({ - util.merge({ - data.raw["assembling-machine"]["chemical-steel-furnace"], - { - name = "fluid-chemical-furnace", - minable = { result = "fluid-chemical-furnace" }, - }, - }), - }) - end + data:extend({ + util.merge({ + data.raw["assembling-machine"]["steel-chemical-furnace"], + { + name = "fluid-chemical-furnace", + minable = { result = "fluid-chemical-furnace" }, + }, + }), + }) if data.raw.technology["steel-chemical-furnace"] then bobmods.lib.tech.add_prerequisite("fluid-chemical-furnace", "steel-chemical-furnace") - elseif data.raw.technology["chemical-steel-furnace"] then - bobmods.lib.tech.add_prerequisite("fluid-chemical-furnace", "chemical-steel-furnace") else bobmods.lib.tech.add_prerequisite("fluid-chemical-furnace", "chemical-processing-2") end @@ -382,7 +345,7 @@ if settings.startup["bobmods-assembly-oilfurnaces"].value == true then { "fluid-chemical-furnace", 1 }, }, results = { - { "pipe", 2 }, + { type = "item", name = "pipe", amount = 2 }, }, main_product = "steel-chemical-furnace", allow_as_intermediate = false, @@ -398,7 +361,7 @@ if settings.startup["bobmods-assembly-oilfurnaces"].value == true then { "fluid-furnace", 1 }, { "pipe", 5 }, }, - result = "fluid-chemical-furnace", + results = {{ type = "item", name = "fluid-chemical-furnace", amount = 1 }}, allow_as_intermediate = false, }, { @@ -411,8 +374,8 @@ if settings.startup["bobmods-assembly-oilfurnaces"].value == true then { "fluid-chemical-furnace", 1 }, }, results = { - { "fluid-furnace", 1 }, - { "pipe", 5 }, + { type = "item", name = "fluid-furnace", amount = 1 }, + { type = "item", name = "pipe", amount = 5 }, }, main_product = "fluid-furnace", allow_as_intermediate = false, @@ -422,14 +385,8 @@ if settings.startup["bobmods-assembly-oilfurnaces"].value == true then if data.raw["assembling-machine"]["steel-chemical-furnace"] then bobmods.lib.recipe.add_result( "steel-chemical-furnace-from-fluid-chemical-furnace", - { "steel-chemical-furnace", 1 } - ) - else - bobmods.lib.recipe.add_result( - "steel-chemical-furnace-from-fluid-chemical-furnace", - { "chemical-steel-furnace", 1 } + { type = "item", name = "steel-chemical-furnace", amount = 1 } ) - data.raw.recipe["steel-chemical-furnace-from-fluid-chemical-furnace"].main_product = "chemical-steel-furnace" end bobmods.lib.tech.add_recipe_unlock("fluid-chemical-furnace", "steel-chemical-furnace-from-fluid-chemical-furnace") diff --git a/bobassembly/prototypes/oil-refinery.lua b/bobassembly/prototypes/oil-refinery.lua index aca6bed79..05b3185ed 100644 --- a/bobassembly/prototypes/oil-refinery.lua +++ b/bobassembly/prototypes/oil-refinery.lua @@ -37,7 +37,7 @@ if settings.startup["bobmods-assembly-oilrefineries"].value == true then { "advanced-circuit", 10 }, { "pipe", 10 }, }, - result = "oil-refinery-2", + results = {{ type = "item", name = "oil-refinery-2", amount = 1 }}, enabled = false, }, @@ -113,7 +113,7 @@ if settings.startup["bobmods-assembly-oilrefineries"].value == true then { "processing-unit", 10 }, { "pipe", 10 }, }, - result = "oil-refinery-3", + results = {{ type = "item", name = "oil-refinery-3", amount = 1 }}, enabled = false, }, @@ -190,7 +190,7 @@ if settings.startup["bobmods-assembly-oilrefineries"].value == true then { "processing-unit", 10 }, { "pipe", 10 }, }, - result = "oil-refinery-4", + results = {{ type = "item", name = "oil-refinery-4", amount = 1 }}, enabled = false, }, diff --git a/bobclasses/prototypes/bodies.lua b/bobclasses/prototypes/bodies.lua index 5e20770d6..8b5dc513f 100644 --- a/bobclasses/prototypes/bodies.lua +++ b/bobclasses/prototypes/bodies.lua @@ -244,7 +244,7 @@ data:extend({ { "player-frame", 1 }, { "assembling-machine-2", 1 }, }, - result = "character", + results = {{ type = "item", name = "character", amount = 1 }}, }, { type = "recipe", @@ -256,7 +256,7 @@ data:extend({ { "assembling-machine-2", 1 }, { "electric-furnace", 1 }, }, - result = "bob-character-miner", + results = {{ type = "item", name = "bob-character-miner", amount = 1 }}, }, { type = "recipe", @@ -268,7 +268,7 @@ data:extend({ { "assembling-machine-2", 1 }, { "exoskeleton-equipment", 1 }, }, - result = "bob-character-fighter", + results = {{ type = "item", name = "bob-character-fighter", amount = 1 }}, }, { type = "recipe", @@ -279,7 +279,7 @@ data:extend({ { "player-frame", 1 }, { "assembling-machine-3", 1 }, }, - result = "bob-character-builder", + results = {{ type = "item", name = "bob-character-builder", amount = 1 }}, }, { @@ -291,7 +291,7 @@ data:extend({ { "player-frame-2", 1 }, { "assembling-machine-2", 1 }, }, - result = "bob-character-balanced-2", + results = {{ type = "item", name = "bob-character-balanced-2", amount = 1 }}, }, { type = "recipe", @@ -303,7 +303,7 @@ data:extend({ { "assembling-machine-2", 1 }, { "electric-furnace", 1 }, }, - result = "bob-character-miner-2", + results = {{ type = "item", name = "bob-character-miner-2", amount = 1 }}, }, { type = "recipe", @@ -315,7 +315,7 @@ data:extend({ { "assembling-machine-2", 1 }, { "exoskeleton-equipment", 1 }, }, - result = "bob-character-fighter-2", + results = {{ type = "item", name = "bob-character-fighter-2", amount = 1 }}, }, { type = "recipe", @@ -326,7 +326,7 @@ data:extend({ { "player-frame-2", 1 }, { "assembling-machine-3", 1 }, }, - result = "bob-character-builder-2", + results = {{ type = "item", name = "bob-character-builder-2", amount = 1 }}, }, { @@ -339,7 +339,7 @@ data:extend({ { "assembling-machine-3", 1 }, { "electric-furnace", 1 }, }, - result = "bob-character-engineer", + results = {{ type = "item", name = "bob-character-engineer", amount = 1 }}, }, { type = "recipe", @@ -352,7 +352,7 @@ data:extend({ { "electric-furnace", 1 }, { "exoskeleton-equipment", 1 }, }, - result = "bob-character-prospector", + results = {{ type = "item", name = "bob-character-prospector", amount = 1 }}, }, }) diff --git a/bobclasses/prototypes/parts.lua b/bobclasses/prototypes/parts.lua index 5ddb5b553..b56bf9775 100644 --- a/bobclasses/prototypes/parts.lua +++ b/bobclasses/prototypes/parts.lua @@ -63,7 +63,7 @@ data:extend({ { "iron-plate", 5 }, { "advanced-circuit", 20 }, }, - result = "player-brain", + results = {{ type = "item", name = "player-brain", amount = 1 }}, }, { type = "recipe", @@ -74,7 +74,7 @@ data:extend({ { "steel-plate", 5 }, { "player-brain", 1 }, }, - result = "player-head", + results = {{ type = "item", name = "player-head", amount = 1 }}, }, { type = "recipe", @@ -85,7 +85,7 @@ data:extend({ { "steel-plate", 5 }, { "plastic-bar", 15 }, }, - result = "player-boots", + results = {{ type = "item", name = "player-boots", amount = 1 }}, }, { type = "recipe", @@ -96,7 +96,7 @@ data:extend({ { "steel-plate", 5 }, { "iron-gear-wheel", 15 }, }, - result = "player-gloves", + results = {{ type = "item", name = "player-gloves", amount = 1 }}, }, { type = "recipe", @@ -107,7 +107,7 @@ data:extend({ { "battery", 15 }, { "advanced-circuit", 50 }, }, - result = "player-power-core", + results = {{ type = "item", name = "player-power-core", amount = 1 }}, }, { type = "recipe", @@ -124,7 +124,7 @@ data:extend({ { "steel-plate", 5 }, { "advanced-circuit", 15 }, }, - result = "player-frame", + results = {{ type = "item", name = "player-frame", amount = 1 }}, }, }) @@ -185,7 +185,7 @@ data:extend({ { "advanced-circuit", 10 }, { "processing-unit", 10 }, }, - result = "player-brain-2", + results = {{ type = "item", name = "player-brain-2", amount = 1 }}, }, { type = "recipe", @@ -196,7 +196,7 @@ data:extend({ { "steel-plate", 5 }, { "player-brain-2", 1 }, }, - result = "player-head-2", + results = {{ type = "item", name = "player-head-2", amount = 1 }}, }, { type = "recipe", @@ -207,7 +207,7 @@ data:extend({ { "steel-plate", 5 }, { "plastic-bar", 15 }, }, - result = "player-boots-2", + results = {{ type = "item", name = "player-boots-2", amount = 1 }}, }, { type = "recipe", @@ -218,7 +218,7 @@ data:extend({ { "steel-plate", 5 }, { "iron-gear-wheel", 15 }, }, - result = "player-gloves-2", + results = {{ type = "item", name = "player-gloves-2", amount = 1 }}, }, { type = "recipe", @@ -235,6 +235,6 @@ data:extend({ { "steel-chest", 1 }, { "processing-unit", 15 }, }, - result = "player-frame-2", + results = {{ type = "item", name = "player-frame-2", amount = 1 }}, }, }) diff --git a/bobelectronics/prototypes/electronics.lua b/bobelectronics/prototypes/electronics.lua index 077b50350..eaadbb01f 100644 --- a/bobelectronics/prototypes/electronics.lua +++ b/bobelectronics/prototypes/electronics.lua @@ -19,8 +19,7 @@ if data.raw.item["tin-plate"] then { "copper-cable", 3 }, { "tin-plate", 1 }, }, - result = "tinned-copper-cable", - result_count = 3, + results = {{ type = "item", name = "tinned-copper-cable", amount = 3 }}, allow_decomposition = false, }, }) @@ -46,8 +45,7 @@ data:extend({ { "copper-cable", 2 }, { "rubber", 1 }, }, - result = "insulated-cable", - result_count = 2, + results = {{ type = "item", name = "insulated-cable", amount = 2 }}, allow_decomposition = false, }, }) @@ -73,8 +71,7 @@ if data.raw.item["gold-plate"] then { "copper-cable", 3 }, { "gold-plate", 1 }, }, - result = "gilded-copper-cable", - result_count = 3, + results = {{ type = "item", name = "gilded-copper-cable", amount = 3 }}, allow_decomposition = false, }, }) @@ -102,8 +99,7 @@ if data.raw.item["solder-alloy"] then { "solder-alloy", 4 }, { "resin", 1 }, }, - result = "solder", - result_count = 8, + results = {{ type = "item", name = "solder", amount = 8 }}, allow_decomposition = false, }, }) @@ -130,8 +126,7 @@ data:extend({ { "copper-cable", 1 }, { "coal", 1 }, }, - result = "basic-electronic-components", - result_count = 5, + results = {{ type = "item", name = "basic-electronic-components", amount = 5 }}, allow_decomposition = false, }, }) @@ -157,8 +152,7 @@ data:extend({ { "copper-cable", 1 }, { "plastic-bar", 1 }, }, - result = "electronic-components", - result_count = 5, + results = {{ type = "item", name = "electronic-components", amount = 5 }}, allow_decomposition = false, }, }) @@ -185,8 +179,7 @@ data:extend({ { "plastic-bar", 1 }, { type = "fluid", name = "sulfuric-acid", amount = 5 }, }, - result = "intergrated-electronics", - result_count = 5, + results = {{ type = "item", name = "intergrated-electronics", amount = 5 }}, allow_decomposition = false, }, }) @@ -213,8 +206,7 @@ data:extend({ { "plastic-bar", 1 }, { type = "fluid", name = "sulfuric-acid", amount = 5 }, }, - result = "processing-electronics", - result_count = 5, + results = {{ type = "item", name = "processing-electronics", amount = 5 }}, allow_decomposition = false, }, }) @@ -237,8 +229,7 @@ data:extend({ ingredients = { { "wood", 1 }, }, - result = "wooden-board", - result_count = 2, + results = {{ type = "item", name = "wooden-board", amount = 2 }}, }, }) @@ -262,8 +253,7 @@ data:extend({ { "wood", 1 }, { "resin", 1 }, }, - result = "phenolic-board", - result_count = 2, + results = {{ type = "item", name = "phenolic-board", amount = 2 }}, }, }) @@ -286,8 +276,7 @@ data:extend({ ingredients = { { "plastic-bar", 1 }, }, - result = "fibreglass-board", - result_count = 2, + results = {{ type = "item", name = "fibreglass-board", amount = 2 }}, }, }) @@ -311,7 +300,7 @@ data:extend({ { "wooden-board", 1 }, { "copper-cable", 3 }, }, - result = "basic-circuit-board", + results = {{ type = "item", name = "basic-circuit-board", amount = 1 }}, allow_decomposition = false, }, }) @@ -338,7 +327,7 @@ data:extend({ { "copper-plate", 1 }, { type = "fluid", name = "ferric-chloride-solution", amount = 5 }, }, - result = "circuit-board", + results = {{ type = "item", name = "circuit-board", amount = 1 }}, allow_decomposition = false, }, }) @@ -365,7 +354,7 @@ data:extend({ { "copper-plate", 1 }, { type = "fluid", name = "ferric-chloride-solution", amount = 5 }, }, - result = "superior-circuit-board", + results = {{ type = "item", name = "superior-circuit-board", amount = 1 }}, allow_decomposition = false, }, }) @@ -392,7 +381,7 @@ data:extend({ { "copper-plate", 2 }, { type = "fluid", name = "ferric-chloride-solution", amount = 10 }, }, - result = "multi-layer-circuit-board", + results = {{ type = "item", name = "multi-layer-circuit-board", amount = 1 }}, allow_decomposition = false, }, }) @@ -418,7 +407,7 @@ data:extend({ { "basic-circuit-board", 1 }, { "basic-electronic-components", 5 }, }, - result = "electronic-circuit", + results = {{ type = "item", name = "electronic-circuit", amount = 1 }}, allow_decomposition = false, }, }) @@ -445,7 +434,7 @@ data:extend({ { "basic-electronic-components", 4 }, { "electronic-components", 4 }, }, - result = "advanced-circuit", + results = {{ type = "item", name = "advanced-circuit", amount = 1 }}, allow_decomposition = false, }, }) @@ -473,7 +462,7 @@ data:extend({ { "electronic-components", 4 }, { "intergrated-electronics", 2 }, }, - result = "processing-unit", + results = {{ type = "item", name = "processing-unit", amount = 1 }}, allow_decomposition = false, }, }) @@ -502,7 +491,7 @@ data:extend({ { "intergrated-electronics", 4 }, { "processing-electronics", 1 }, }, - result = "advanced-processing-unit", + results = {{ type = "item", name = "advanced-processing-unit", amount = 1 }}, allow_decomposition = false, }, }) diff --git a/bobelectronics/prototypes/resource.lua b/bobelectronics/prototypes/resource.lua index e39fd16ab..c16e091e0 100644 --- a/bobelectronics/prototypes/resource.lua +++ b/bobelectronics/prototypes/resource.lua @@ -19,7 +19,7 @@ data:extend({ ingredients = { { "wood", 1 }, }, - result = "resin", + results = {{ type = "item", name = "resin", amount = 1 }}, allow_decomposition = false, }, @@ -33,7 +33,7 @@ data:extend({ ingredients = { { type = "fluid", name = "heavy-oil", amount = 10 }, }, - result = "resin", + results = {{ type = "item", name = "resin", amount = 1 }}, crafting_machine_tint = { primary = { r = 0.5, g = 0.04, b = 0.0, a = 0.000 }, secondary = { r = 0.85, g = 0.6, b = 0.3, a = 0.000 }, @@ -64,7 +64,7 @@ data:extend({ ingredients = { { "resin", 1 }, }, - result = "rubber", + results = {{ type = "item", name = "rubber", amount = 1 }}, allow_decomposition = false, }, }) @@ -83,8 +83,7 @@ data:extend({ ingredients = { { type = "fluid", name = "heavy-oil", amount = 10 }, }, - result = "wood", - result_count = 2, + results = {{ type = "item", name = "wood", amount = 2 }}, crafting_machine_tint = { primary = { r = 0.5, g = 0.04, b = 0.0, a = 0.000 }, secondary = { r = 0.85, g = 0.6, b = 0.3, a = 0.000 }, @@ -114,8 +113,7 @@ if not data.raw.item["silicon-wafer"] then enabled = false, energy_required = 5, ingredients = {}, - result = "silicon-wafer", - result_count = 8, + results = {{ type = "item", name = "silicon-wafer", amount = 8 }}, }, }) @@ -149,8 +147,7 @@ if data.raw.item["tin-plate"] then { "tin-plate", 9 }, { "copper-plate", 1 }, }, - result = "solder-alloy", - result_count = 11, + results = {{ type = "item", name = "solder-alloy", amount = 11 }}, allow_decomposition = false, }, }) @@ -170,8 +167,7 @@ if data.raw.item["tin-plate"] then { "tin-plate", 4 }, { "lead-plate", 7 }, }, - result = "solder-alloy", - result_count = 11, + results = {{ type = "item", name = "solder-alloy", amount = 11 }}, allow_decomposition = false, }, }) diff --git a/bobenemies/prototypes/alien-artifact.lua b/bobenemies/prototypes/alien-artifact.lua index f1a0db427..1a968b043 100644 --- a/bobenemies/prototypes/alien-artifact.lua +++ b/bobenemies/prototypes/alien-artifact.lua @@ -29,7 +29,7 @@ if settings.startup["bobmods-enemies-enableartifacts"].value == true then { type = "recipe", name = "alien-artifact-from-small", - result = "alien-artifact", + results = {{ type = "item", name = "alien-artifact", amount = 1 }}, ingredients = { { "small-alien-artifact", 25 }, }, @@ -55,8 +55,7 @@ if settings.startup["bobmods-enemies-enableartifacts"].value == true then { type = "recipe", name = "alien-artifact-red-from-basic", - result = "alien-artifact-red", - result_count = 5, + results = {{ type = "item", name = "alien-artifact-red", amount = 5 }}, ingredients = { { "alien-artifact-red", 1 }, { "alien-artifact", 5 }, @@ -79,8 +78,7 @@ if settings.startup["bobmods-enemies-enableartifacts"].value == true then { type = "recipe", name = "alien-artifact-orange-from-basic", - result = "alien-artifact-orange", - result_count = 5, + results = {{ type = "item", name = "alien-artifact-orange", amount = 5 }}, ingredients = { { "alien-artifact-orange", 1 }, { "alien-artifact", 5 }, @@ -103,8 +101,7 @@ if settings.startup["bobmods-enemies-enableartifacts"].value == true then { type = "recipe", name = "alien-artifact-yellow-from-basic", - result = "alien-artifact-yellow", - result_count = 5, + results = {{ type = "item", name = "alien-artifact-yellow", amount = 5 }}, ingredients = { { "alien-artifact-yellow", 1 }, { "alien-artifact", 5 }, @@ -127,8 +124,7 @@ if settings.startup["bobmods-enemies-enableartifacts"].value == true then { type = "recipe", name = "alien-artifact-green-from-basic", - result = "alien-artifact-green", - result_count = 5, + results = {{ type = "item", name = "alien-artifact-green", amount = 5 }}, ingredients = { { "alien-artifact-green", 1 }, { "alien-artifact", 5 }, @@ -151,8 +147,7 @@ if settings.startup["bobmods-enemies-enableartifacts"].value == true then { type = "recipe", name = "alien-artifact-blue-from-basic", - result = "alien-artifact-blue", - result_count = 5, + results = {{ type = "item", name = "alien-artifact-blue", amount = 5 }}, ingredients = { { "alien-artifact-blue", 1 }, { "alien-artifact", 5 }, @@ -175,8 +170,7 @@ if settings.startup["bobmods-enemies-enableartifacts"].value == true then { type = "recipe", name = "alien-artifact-purple-from-basic", - result = "alien-artifact-purple", - result_count = 5, + results = {{ type = "item", name = "alien-artifact-purple", amount = 5 }}, ingredients = { { "alien-artifact-purple", 1 }, { "alien-artifact", 5 }, @@ -202,7 +196,7 @@ if settings.startup["bobmods-enemies-enableartifacts"].value == true then { type = "recipe", name = "alien-artifact-red-from-small", - result = "alien-artifact-red", + results = {{ type = "item", name = "alien-artifact-red", amount = 1 }}, ingredients = { { "small-alien-artifact-red", 25 }, }, @@ -226,7 +220,7 @@ if settings.startup["bobmods-enemies-enableartifacts"].value == true then { type = "recipe", name = "alien-artifact-orange-from-small", - result = "alien-artifact-orange", + results = {{ type = "item", name = "alien-artifact-orange", amount = 1 }}, ingredients = { { "small-alien-artifact-orange", 25 }, }, @@ -250,7 +244,7 @@ if settings.startup["bobmods-enemies-enableartifacts"].value == true then { type = "recipe", name = "alien-artifact-yellow-from-small", - result = "alien-artifact-yellow", + results = {{ type = "item", name = "alien-artifact-yellow", amount = 1 }}, ingredients = { { "small-alien-artifact-yellow", 25 }, }, @@ -274,7 +268,7 @@ if settings.startup["bobmods-enemies-enableartifacts"].value == true then { type = "recipe", name = "alien-artifact-green-from-small", - result = "alien-artifact-green", + results = {{ type = "item", name = "alien-artifact-green", amount = 1 }}, ingredients = { { "small-alien-artifact-green", 25 }, }, @@ -298,7 +292,7 @@ if settings.startup["bobmods-enemies-enableartifacts"].value == true then { type = "recipe", name = "alien-artifact-blue-from-small", - result = "alien-artifact-blue", + results = {{ type = "item", name = "alien-artifact-blue", amount = 1 }}, ingredients = { { "small-alien-artifact-blue", 25 }, }, @@ -322,7 +316,7 @@ if settings.startup["bobmods-enemies-enableartifacts"].value == true then { type = "recipe", name = "alien-artifact-purple-from-small", - result = "alien-artifact-purple", + results = {{ type = "item", name = "alien-artifact-purple", amount = 1 }}, ingredients = { { "small-alien-artifact-purple", 25 }, }, diff --git a/bobequipment/prototypes/personal-roboport.lua b/bobequipment/prototypes/personal-roboport.lua index 5ebc7eb1b..8517565cd 100644 --- a/bobequipment/prototypes/personal-roboport.lua +++ b/bobequipment/prototypes/personal-roboport.lua @@ -65,7 +65,7 @@ data:extend({ { "steel-plate", 20 }, { "battery", 20 }, }, - result = "personal-roboport-mk3-equipment", + results = {{ type = "item", name = "personal-roboport-mk3-equipment", amount = 1 }}, }, { type = "recipe", @@ -79,7 +79,7 @@ data:extend({ { "steel-plate", 20 }, { "battery", 20 }, }, - result = "personal-roboport-mk4-equipment", + results = {{ type = "item", name = "personal-roboport-mk4-equipment", amount = 1 }}, }, { @@ -984,7 +984,7 @@ data:extend({ { "iron-gear-wheel", 20 }, { "steel-plate", 10 }, }, - result = "personal-roboport-antenna-equipment", + results = {{ type = "item", name = "personal-roboport-antenna-equipment", amount = 1 }}, }, { type = "recipe", @@ -997,7 +997,7 @@ data:extend({ { "iron-gear-wheel", 20 }, { "steel-plate", 10 }, }, - result = "personal-roboport-antenna-equipment-2", + results = {{ type = "item", name = "personal-roboport-antenna-equipment-2", amount = 1 }}, }, { type = "recipe", @@ -1010,7 +1010,7 @@ data:extend({ { "iron-gear-wheel", 20 }, { "steel-plate", 10 }, }, - result = "personal-roboport-antenna-equipment-3", + results = {{ type = "item", name = "personal-roboport-antenna-equipment-3", amount = 1 }}, }, { type = "recipe", @@ -1023,7 +1023,7 @@ data:extend({ { "iron-gear-wheel", 20 }, { "steel-plate", 10 }, }, - result = "personal-roboport-antenna-equipment-4", + results = {{ type = "item", name = "personal-roboport-antenna-equipment-4", amount = 1 }}, }, { @@ -1036,7 +1036,7 @@ data:extend({ { "steel-plate", 5 }, { "battery", 20 }, }, - result = "personal-roboport-chargepad-equipment", + results = {{ type = "item", name = "personal-roboport-chargepad-equipment", amount = 1 }}, }, { type = "recipe", @@ -1049,7 +1049,7 @@ data:extend({ { "steel-plate", 5 }, { "battery", 20 }, }, - result = "personal-roboport-chargepad-equipment-2", + results = {{ type = "item", name = "personal-roboport-chargepad-equipment-2", amount = 1 }}, }, { type = "recipe", @@ -1062,7 +1062,7 @@ data:extend({ { "steel-plate", 5 }, { "battery", 20 }, }, - result = "personal-roboport-chargepad-equipment-3", + results = {{ type = "item", name = "personal-roboport-chargepad-equipment-3", amount = 1 }}, }, { type = "recipe", @@ -1075,7 +1075,7 @@ data:extend({ { "steel-plate", 5 }, { "battery", 20 }, }, - result = "personal-roboport-chargepad-equipment-4", + results = {{ type = "item", name = "personal-roboport-chargepad-equipment-4", amount = 1 }}, }, { @@ -1086,7 +1086,7 @@ data:extend({ ingredients = { { "electronic-circuit", 10 }, }, - result = "personal-roboport-robot-equipment", + results = {{ type = "item", name = "personal-roboport-robot-equipment", amount = 1 }}, }, { type = "recipe", @@ -1097,7 +1097,7 @@ data:extend({ { "personal-roboport-robot-equipment", 1 }, { "advanced-circuit", 10 }, }, - result = "personal-roboport-robot-equipment-2", + results = {{ type = "item", name = "personal-roboport-robot-equipment-2", amount = 1 }}, }, { type = "recipe", @@ -1108,7 +1108,7 @@ data:extend({ { "personal-roboport-robot-equipment-2", 1 }, { "processing-unit", 10 }, }, - result = "personal-roboport-robot-equipment-3", + results = {{ type = "item", name = "personal-roboport-robot-equipment-3", amount = 1 }}, }, { type = "recipe", @@ -1119,7 +1119,7 @@ data:extend({ { "personal-roboport-robot-equipment-3", 1 }, { "processing-unit", 10 }, }, - result = "personal-roboport-robot-equipment-4", + results = {{ type = "item", name = "personal-roboport-robot-equipment-4", amount = 1 }}, }, { diff --git a/bobequipment/prototypes/recipe/equipment.lua b/bobequipment/prototypes/recipe/equipment.lua index 4b452039e..f739d9cbf 100644 --- a/bobequipment/prototypes/recipe/equipment.lua +++ b/bobequipment/prototypes/recipe/equipment.lua @@ -16,7 +16,7 @@ data:extend({ { "processing-unit", 5 }, { "productivity-module-2", 1 }, }, - result = "energy-shield-mk3-equipment", + results = {{ type = "item", name = "energy-shield-mk3-equipment", amount = 1 }}, }, { type = "recipe", @@ -29,7 +29,7 @@ data:extend({ { "effectivity-module-3", 1 }, { "productivity-module-3", 1 }, }, - result = "energy-shield-mk4-equipment", + results = {{ type = "item", name = "energy-shield-mk4-equipment", amount = 1 }}, }, { type = "recipe", @@ -42,7 +42,7 @@ data:extend({ { "effectivity-module-3", 1 }, { "productivity-module-3", 1 }, }, - result = "energy-shield-mk5-equipment", + results = {{ type = "item", name = "energy-shield-mk5-equipment", amount = 1 }}, }, { type = "recipe", @@ -55,7 +55,7 @@ data:extend({ { "effectivity-module-3", 1 }, { "productivity-module-3", 1 }, }, - result = "energy-shield-mk6-equipment", + results = {{ type = "item", name = "energy-shield-mk6-equipment", amount = 1 }}, }, }) @@ -77,7 +77,7 @@ data:extend({ { "battery-mk2-equipment", 2 }, { "battery", 5 }, }, - result = "battery-mk3-equipment", + results = {{ type = "item", name = "battery-mk3-equipment", amount = 1 }}, }, { type = "recipe", @@ -88,7 +88,7 @@ data:extend({ { "battery-mk3-equipment", 2 }, { "processing-unit", 5 }, }, - result = "battery-mk4-equipment", + results = {{ type = "item", name = "battery-mk4-equipment", amount = 1 }}, }, { type = "recipe", @@ -99,7 +99,7 @@ data:extend({ { "battery-mk4-equipment", 2 }, { "battery", 5 }, }, - result = "battery-mk5-equipment", + results = {{ type = "item", name = "battery-mk5-equipment", amount = 1 }}, }, { type = "recipe", @@ -110,7 +110,7 @@ data:extend({ { "battery-mk5-equipment", 2 }, { "processing-unit", 5 }, }, - result = "battery-mk6-equipment", + results = {{ type = "item", name = "battery-mk6-equipment", amount = 1 }}, }, }) @@ -127,7 +127,7 @@ data:extend({ { "speed-module-3", 2 }, { "productivity-module-3", 2 }, }, - result = "fusion-reactor-equipment-2", + results = {{ type = "item", name = "fusion-reactor-equipment-2", amount = 1 }}, }, { type = "recipe", @@ -141,7 +141,7 @@ data:extend({ { "speed-module-3", 2 }, { "productivity-module-3", 2 }, }, - result = "fusion-reactor-equipment-3", + results = {{ type = "item", name = "fusion-reactor-equipment-3", amount = 1 }}, }, { type = "recipe", @@ -155,7 +155,7 @@ data:extend({ { "speed-module-3", 2 }, { "productivity-module-3", 2 }, }, - result = "fusion-reactor-equipment-4", + results = {{ type = "item", name = "fusion-reactor-equipment-4", amount = 1 }}, }, }) @@ -171,7 +171,7 @@ data:extend({ { "advanced-circuit", 5 }, { "plastic-bar", 2 }, }, - result = "night-vision-equipment-2", + results = {{ type = "item", name = "night-vision-equipment-2", amount = 1 }}, }, { type = "recipe", @@ -183,7 +183,7 @@ data:extend({ { "processing-unit", 5 }, { "plastic-bar", 2 }, }, - result = "night-vision-equipment-3", + results = {{ type = "item", name = "night-vision-equipment-3", amount = 1 }}, }, }) @@ -202,7 +202,7 @@ data:extend({ { "advanced-circuit", 5 }, { "copper-plate", 2 }, }, - result = "solar-panel-equipment-2", + results = {{ type = "item", name = "solar-panel-equipment-2", amount = 1 }}, }, { type = "recipe", @@ -215,7 +215,7 @@ data:extend({ { "processing-unit", 5 }, { "copper-plate", 2 }, }, - result = "solar-panel-equipment-3", + results = {{ type = "item", name = "solar-panel-equipment-3", amount = 1 }}, }, { type = "recipe", @@ -228,7 +228,7 @@ data:extend({ { "processing-unit", 5 }, { "copper-cable", 5 }, }, - result = "solar-panel-equipment-4", + results = {{ type = "item", name = "solar-panel-equipment-4", amount = 1 }}, }, }) @@ -250,7 +250,7 @@ data:extend({ { "advanced-circuit", 5 }, { "battery", 3 }, }, - result = "personal-laser-defense-equipment-2", + results = {{ type = "item", name = "personal-laser-defense-equipment-2", amount = 1 }}, }, { type = "recipe", @@ -263,7 +263,7 @@ data:extend({ { "processing-unit", 5 }, { "battery", 3 }, }, - result = "personal-laser-defense-equipment-3", + results = {{ type = "item", name = "personal-laser-defense-equipment-3", amount = 1 }}, }, { type = "recipe", @@ -276,7 +276,7 @@ data:extend({ { "processing-unit", 5 }, { "battery", 3 }, }, - result = "personal-laser-defense-equipment-4", + results = {{ type = "item", name = "personal-laser-defense-equipment-4", amount = 1 }}, }, { type = "recipe", @@ -289,7 +289,7 @@ data:extend({ { "processing-unit", 5 }, { "battery", 3 }, }, - result = "personal-laser-defense-equipment-5", + results = {{ type = "item", name = "personal-laser-defense-equipment-5", amount = 1 }}, }, { type = "recipe", @@ -302,7 +302,7 @@ data:extend({ { "processing-unit", 5 }, { "battery", 3 }, }, - result = "personal-laser-defense-equipment-6", + results = {{ type = "item", name = "personal-laser-defense-equipment-6", amount = 1 }}, }, }) @@ -319,7 +319,7 @@ data:extend({ { "iron-gear-wheel", 30 }, { "steel-plate", 20 }, }, - result = "exoskeleton-equipment-2", + results = {{ type = "item", name = "exoskeleton-equipment-2", amount = 1 }}, }, { type = "recipe", @@ -332,7 +332,7 @@ data:extend({ { "iron-gear-wheel", 30 }, { "steel-plate", 20 }, }, - result = "exoskeleton-equipment-3", + results = {{ type = "item", name = "exoskeleton-equipment-3", amount = 1 }}, }, }) diff --git a/bobgreenhouse/prototypes/recipes.lua b/bobgreenhouse/prototypes/recipes.lua index 9a166974d..928e7a079 100644 --- a/bobgreenhouse/prototypes/recipes.lua +++ b/bobgreenhouse/prototypes/recipes.lua @@ -10,7 +10,7 @@ data:extend({ { type = "item", name = "sulfur", amount = 1 }, { type = "item", name = "stone", amount = 1 }, }, - result = "fertiliser", + results = {{ type = "item", name = "fertiliser", amount = 1 }}, }, { @@ -37,7 +37,7 @@ data:extend({ { type = "item", name = "copper-plate", amount = 4 }, { type = "item", name = "stone", amount = 2 }, }, - result = "bob-greenhouse", + results = {{ type = "item", name = "bob-greenhouse", amount = 1 }}, }, { @@ -85,6 +85,6 @@ data:extend({ ingredients = { { "wood", 5 }, }, - result = "wood-pellets", + results = {{ type = "item", name = "wood-pellets", amount = 1 }}, }, }) diff --git a/boblibrary/auto-bottle.lua b/boblibrary/auto-bottle.lua index f7c2d2b4a..b20570036 100644 --- a/boblibrary/auto-bottle.lua +++ b/boblibrary/auto-bottle.lua @@ -261,7 +261,7 @@ function bobmods.lib.create_gas_bottle(fluid) empty_recipe.icons = generate_empty_gas_bottle_icons(fluid) bobmods.lib.recipe.remove_result(empty_recipe.name, "empty-barrel") - bobmods.lib.recipe.set_result(empty_recipe.name, "gas-canister") + bobmods.lib.recipe.set_result(empty_recipe.name, { type = "item", name = "gas-canister", amount = 1 }) bobmods.lib.tech.remove_recipe_unlock("fluid-handling", empty_recipe.name) bobmods.lib.tech.remove_recipe_unlock("fluid-barrel-processing", empty_recipe.name) else @@ -315,7 +315,7 @@ function bobmods.lib.create_fluid_canister(fluid) empty_recipe.icons = generate_empty_fluid_canister_icons(fluid) bobmods.lib.recipe.remove_result(empty_recipe.name, "empty-barrel") - bobmods.lib.recipe.add_result(empty_recipe.name, "empty-canister") + bobmods.lib.recipe.add_result(empty_recipe.name, { type = "item", name = "empty-canister", amount = 1 }) bobmods.lib.tech.remove_recipe_unlock("fluid-handling", empty_recipe.name) bobmods.lib.tech.remove_recipe_unlock("fluid-barrel-processing", empty_recipe.name) else diff --git a/boblibrary/functions.lua b/boblibrary/functions.lua index cea298b15..c7e422b41 100644 --- a/boblibrary/functions.lua +++ b/boblibrary/functions.lua @@ -21,30 +21,12 @@ function bobmods.lib.result_check(object) if object.result then local item = bobmods.lib.item.basic_item({ name = object.result }) - if object.result_count then - item.amount = object.result_count - object.result_count = nil + if object.count then + item.amount = object.count + object.count = nil end bobmods.lib.item.add_new(object.results, item) - if object.ingredients then -- It's a recipe - if not object.main_product then - if object.icon or object.subgroup or object.order or item.type ~= "item" then -- if we already have one, add the rest - if not object.icon and data.raw[item.type][object.result].icon then - object.icon = data.raw[item.type][object.result].icon - object.icon_size = data.raw[item.type][object.result].icon_size - end - if not object.subgroup and data.raw[item.type][object.result].subgroup then - object.subgroup = data.raw[item.type][object.result].subgroup - end - if not object.order and data.raw[item.type][object.result].order then - object.order = data.raw[item.type][object.result].order - end - else -- otherwise just use main_product as a cheap way to set them all. - object.main_product = object.result - end - end - end object.result = nil end else diff --git a/boblibrary/recipe-functions.lua b/boblibrary/recipe-functions.lua index efa331a7e..0aba11cd3 100644 --- a/boblibrary/recipe-functions.lua +++ b/boblibrary/recipe-functions.lua @@ -189,8 +189,7 @@ function bobmods.lib.recipe.add_result(recipe, item_in) and type(item) == "table" and bobmods.lib.item.get_type(item.name) then - if data.raw.recipe[recipe].result or data.raw.recipe[recipe].results then - bobmods.lib.result_check(data.raw.recipe[recipe]) + if data.raw.recipe[recipe].results then bobmods.lib.item.add(data.raw.recipe[recipe].results, item) end else @@ -210,8 +209,7 @@ function bobmods.lib.recipe.set_result(recipe, item_in) and type(item) == "table" and bobmods.lib.item.get_type(item.name) then - if data.raw.recipe[recipe].result or data.raw.recipe[recipe].results then - bobmods.lib.result_check(data.raw.recipe[recipe]) + if data.raw.recipe[recipe].results then bobmods.lib.item.set(data.raw.recipe[recipe].results, item) end else @@ -224,8 +222,7 @@ end function bobmods.lib.recipe.remove_result(recipe, item) if type(recipe) == "string" and type(item) == "string" and data.raw.recipe[recipe] then - if data.raw.recipe[recipe].result or data.raw.recipe[recipe].results then - bobmods.lib.result_check(data.raw.recipe[recipe]) + if data.raw.recipe[recipe].results then bobmods.lib.item.remove(data.raw.recipe[recipe].results, item) end else diff --git a/boblogistics/prototypes/chests.lua b/boblogistics/prototypes/chests.lua index 406621c9b..f0f82e2a8 100644 --- a/boblogistics/prototypes/chests.lua +++ b/boblogistics/prototypes/chests.lua @@ -9,7 +9,7 @@ if data.raw.item["brass-alloy"] then name = "brass-chest", enabled = false, ingredients = { { "brass-alloy", 8 } }, - result = "brass-chest", + results = {{ type = "item", name = "brass-chest", amount = 1 }}, }, { type = "item", @@ -69,7 +69,7 @@ if data.raw.item["titanium-plate"] then name = "titanium-chest", enabled = false, ingredients = { { "titanium-plate", 8 } }, - result = "titanium-chest", + results = {{ type = "item", name = "titanium-chest", amount = 1 }}, }, { type = "item", diff --git a/boblogistics/prototypes/entity/pipes.lua b/boblogistics/prototypes/entity/pipes.lua index 1590fd2d4..27a165b04 100644 --- a/boblogistics/prototypes/entity/pipes.lua +++ b/boblogistics/prototypes/entity/pipes.lua @@ -1510,7 +1510,7 @@ if data.raw.item["se-iridium-plate"] and mods["b-se-k2-integration"] then ingredients = { { "se-iridium-plate", 1 }, }, - result = "iridium-pipe", + results = {{ type = "item", name = "iridium-pipe", amount = 1 }}, }, { @@ -1521,8 +1521,7 @@ if data.raw.item["se-iridium-plate"] and mods["b-se-k2-integration"] then { "iridium-pipe", 16 }, { "se-iridium-plate", 5 }, }, - result_count = 2, - result = "iridium-pipe-to-ground", + results = {{ type = "item", name = "iridium-pipe-to-ground", amount = 2 }}, }, }) end diff --git a/boblogistics/prototypes/recipe/belt-recipe.lua b/boblogistics/prototypes/recipe/belt-recipe.lua index dc52c989a..2d5b3b946 100644 --- a/boblogistics/prototypes/recipe/belt-recipe.lua +++ b/boblogistics/prototypes/recipe/belt-recipe.lua @@ -7,8 +7,7 @@ if settings.startup["bobmods-logistics-beltoverhaul"].value == true then { "iron-plate", 1 }, { "iron-gear-wheel", 1 }, }, - result = "basic-transport-belt", - result_count = 2, + results = {{ type = "item", name = "basic-transport-belt", amount = 2 }}, }, { type = "recipe", @@ -18,7 +17,7 @@ if settings.startup["bobmods-logistics-beltoverhaul"].value == true then { "iron-plate", 2 }, { "iron-gear-wheel", 2 }, }, - result = "transport-belt", + results = {{ type = "item", name = "transport-belt", amount = 1 }}, }, { type = "recipe", @@ -28,7 +27,7 @@ if settings.startup["bobmods-logistics-beltoverhaul"].value == true then { "steel-plate", 2 }, { "iron-gear-wheel", 4 }, }, - result = "fast-transport-belt", + results = {{ type = "item", name = "fast-transport-belt", amount = 1 }}, }, { type = "recipe", @@ -38,7 +37,7 @@ if settings.startup["bobmods-logistics-beltoverhaul"].value == true then { "steel-plate", 2 }, { "iron-gear-wheel", 4 }, }, - result = "express-transport-belt", + results = {{ type = "item", name = "express-transport-belt", amount = 1 }}, }, { type = "recipe", @@ -48,7 +47,7 @@ if settings.startup["bobmods-logistics-beltoverhaul"].value == true then { "steel-plate", 2 }, { "iron-gear-wheel", 4 }, }, - result = "turbo-transport-belt", + results = {{ type = "item", name = "turbo-transport-belt", amount = 1 }}, }, { type = "recipe", @@ -58,7 +57,7 @@ if settings.startup["bobmods-logistics-beltoverhaul"].value == true then { "steel-plate", 2 }, { "iron-gear-wheel", 4 }, }, - result = "ultimate-transport-belt", + results = {{ type = "item", name = "ultimate-transport-belt", amount = 1 }}, }, }) @@ -73,8 +72,7 @@ if settings.startup["bobmods-logistics-beltoverhaul"].value == true then { "stone", 2 }, { "wood", 2 }, }, - result_count = 2, - result = "basic-underground-belt", + results = {{ type = "item", name = "basic-underground-belt", amount = 2 }}, }, { type = "recipe", @@ -87,7 +85,7 @@ if settings.startup["bobmods-logistics-beltoverhaul"].value == true then { "iron-gear-wheel", 2 }, { "copper-cable", 4 }, }, - result = "basic-splitter", + results = {{ type = "item", name = "basic-splitter", amount = 1 }}, }, }) @@ -109,8 +107,7 @@ if settings.startup["bobmods-logistics-beltoverhaul"].value == true then { "iron-plate", 14 }, { "iron-gear-wheel", 20 }, }, - result_count = 2, - result = "underground-belt", + results = {{ type = "item", name = "underground-belt", amount = 2 }}, }, { type = "recipe", @@ -122,8 +119,7 @@ if settings.startup["bobmods-logistics-beltoverhaul"].value == true then { "steel-plate", 14 }, { "iron-gear-wheel", 20 }, }, - result_count = 2, - result = "fast-underground-belt", + results = {{ type = "item", name = "fast-underground-belt", amount = 2 }}, }, { type = "recipe", @@ -135,8 +131,7 @@ if settings.startup["bobmods-logistics-beltoverhaul"].value == true then { "steel-plate", 14 }, { "iron-gear-wheel", 20 }, }, - result_count = 2, - result = "express-underground-belt", + results = {{ type = "item", name = "express-underground-belt", amount = 2 }}, }, { type = "recipe", @@ -147,8 +142,7 @@ if settings.startup["bobmods-logistics-beltoverhaul"].value == true then { "steel-plate", 14 }, { "iron-gear-wheel", 20 }, }, - result_count = 2, - result = "turbo-underground-belt", + results = {{ type = "item", name = "turbo-underground-belt", amount = 2 }}, }, { type = "recipe", @@ -159,8 +153,7 @@ if settings.startup["bobmods-logistics-beltoverhaul"].value == true then { "steel-plate", 14 }, { "iron-gear-wheel", 20 }, }, - result_count = 2, - result = "ultimate-underground-belt", + results = {{ type = "item", name = "ultimate-underground-belt", amount = 2 }}, }, { @@ -174,7 +167,7 @@ if settings.startup["bobmods-logistics-beltoverhaul"].value == true then { "iron-gear-wheel", 14 }, { "electronic-circuit", 5 }, }, - result = "splitter", + results = {{ type = "item", name = "splitter", amount = 1 }}, }, { type = "recipe", @@ -187,7 +180,7 @@ if settings.startup["bobmods-logistics-beltoverhaul"].value == true then { "iron-gear-wheel", 14 }, { "electronic-circuit", 5 }, }, - result = "fast-splitter", + results = {{ type = "item", name = "fast-splitter", amount = 1 }}, }, { type = "recipe", @@ -200,7 +193,7 @@ if settings.startup["bobmods-logistics-beltoverhaul"].value == true then { "iron-gear-wheel", 14 }, { "advanced-circuit", 5 }, }, - result = "express-splitter", + results = {{ type = "item", name = "express-splitter", amount = 1 }}, }, { type = "recipe", @@ -213,7 +206,7 @@ if settings.startup["bobmods-logistics-beltoverhaul"].value == true then { "iron-gear-wheel", 14 }, { "processing-unit", 5 }, }, - result = "turbo-splitter", + results = {{ type = "item", name = "turbo-splitter", amount = 1 }}, }, { type = "recipe", @@ -226,7 +219,7 @@ if settings.startup["bobmods-logistics-beltoverhaul"].value == true then { "iron-gear-wheel", 14 }, { "processing-unit", 5 }, }, - result = "ultimate-splitter", + results = {{ type = "item", name = "ultimate-splitter", amount = 1 }}, }, }) else @@ -240,8 +233,7 @@ if settings.startup["bobmods-logistics-beltoverhaul"].value == true then { "transport-belt", 5 }, { "iron-plate", 4 }, }, - result_count = 2, - result = "underground-belt", + results = {{ type = "item", name = "underground-belt", amount = 2 }}, }, { type = "recipe", @@ -252,8 +244,7 @@ if settings.startup["bobmods-logistics-beltoverhaul"].value == true then { "fast-transport-belt", 5 }, { "steel-plate", 4 }, }, - result_count = 2, - result = "fast-underground-belt", + results = {{ type = "item", name = "fast-underground-belt", amount = 2 }}, }, { type = "recipe", @@ -264,8 +255,7 @@ if settings.startup["bobmods-logistics-beltoverhaul"].value == true then { "express-transport-belt", 5 }, { "steel-plate", 4 }, }, - result_count = 2, - result = "express-underground-belt", + results = {{ type = "item", name = "express-underground-belt", amount = 2 }}, }, { type = "recipe", @@ -275,8 +265,7 @@ if settings.startup["bobmods-logistics-beltoverhaul"].value == true then { "turbo-transport-belt", 5 }, { "steel-plate", 4 }, }, - result_count = 2, - result = "turbo-underground-belt", + results = {{ type = "item", name = "turbo-underground-belt", amount = 2 }}, }, { type = "recipe", @@ -286,8 +275,7 @@ if settings.startup["bobmods-logistics-beltoverhaul"].value == true then { "ultimate-transport-belt", 5 }, { "steel-plate", 4 }, }, - result_count = 2, - result = "ultimate-underground-belt", + results = {{ type = "item", name = "ultimate-underground-belt", amount = 2 }}, }, { @@ -301,7 +289,7 @@ if settings.startup["bobmods-logistics-beltoverhaul"].value == true then { "iron-gear-wheel", 4 }, { "electronic-circuit", 5 }, }, - result = "splitter", + results = {{ type = "item", name = "splitter", amount = 1 }}, }, { type = "recipe", @@ -314,7 +302,7 @@ if settings.startup["bobmods-logistics-beltoverhaul"].value == true then { "iron-gear-wheel", 4 }, { "electronic-circuit", 5 }, }, - result = "fast-splitter", + results = {{ type = "item", name = "fast-splitter", amount = 1 }}, }, { type = "recipe", @@ -327,7 +315,7 @@ if settings.startup["bobmods-logistics-beltoverhaul"].value == true then { "iron-gear-wheel", 4 }, { "advanced-circuit", 5 }, }, - result = "express-splitter", + results = {{ type = "item", name = "express-splitter", amount = 1 }}, }, { type = "recipe", @@ -340,7 +328,7 @@ if settings.startup["bobmods-logistics-beltoverhaul"].value == true then { "iron-gear-wheel", 4 }, { "processing-unit", 5 }, }, - result = "turbo-splitter", + results = {{ type = "item", name = "turbo-splitter", amount = 1 }}, }, { type = "recipe", @@ -353,7 +341,7 @@ if settings.startup["bobmods-logistics-beltoverhaul"].value == true then { "iron-gear-wheel", 4 }, { "processing-unit", 5 }, }, - result = "ultimate-splitter", + results = {{ type = "item", name = "ultimate-splitter", amount = 1 }}, }, }) end @@ -367,7 +355,7 @@ else { "express-transport-belt", 1 }, { "iron-gear-wheel", 20 }, }, - result = "turbo-transport-belt", + results = {{ type = "item", name = "turbo-transport-belt", amount = 1 }}, }, { type = "recipe", @@ -377,8 +365,7 @@ else { "express-underground-belt", 2 }, { "iron-gear-wheel", 100 }, }, - result_count = 2, - result = "turbo-underground-belt", + results = {{ type = "item", name = "turbo-underground-belt", amount = 2 }}, }, { type = "recipe", @@ -390,7 +377,7 @@ else { "processing-unit", 10 }, { "iron-gear-wheel", 10 }, }, - result = "turbo-splitter", + results = {{ type = "item", name = "turbo-splitter", amount = 2 }}, }, { @@ -401,7 +388,7 @@ else { "turbo-transport-belt", 1 }, { "iron-gear-wheel", 20 }, }, - result = "ultimate-transport-belt", + results = {{ type = "item", name = "ultimate-transport-belt", amount = 2 }}, }, { type = "recipe", @@ -411,8 +398,7 @@ else { "turbo-underground-belt", 2 }, { "iron-gear-wheel", 120 }, }, - result_count = 2, - result = "ultimate-underground-belt", + results = {{ type = "item", name = "ultimate-underground-belt", amount = 2 }}, }, { type = "recipe", @@ -424,7 +410,7 @@ else { "processing-unit", 10 }, { "iron-gear-wheel", 10 }, }, - result = "ultimate-splitter", + results = {{ type = "item", name = "ultimate-splitter", amount = 1 }}, }, }) end diff --git a/boblogistics/prototypes/recipe/inserter-recipe.lua b/boblogistics/prototypes/recipe/inserter-recipe.lua index b365ce382..a1ad063ad 100644 --- a/boblogistics/prototypes/recipe/inserter-recipe.lua +++ b/boblogistics/prototypes/recipe/inserter-recipe.lua @@ -6,7 +6,7 @@ data:extend({ { "burner-inserter", 1 }, { "pipe", 1 }, }, - result = "steam-inserter", + results = {{ type = "item", name = "steam-inserter", amount = 1 }}, requester_paste_multiplier = 4, }, { @@ -18,7 +18,7 @@ data:extend({ { "iron-gear-wheel", 2 }, { "advanced-circuit", 2 }, }, - result = "express-inserter", + results = {{ type = "item", name = "express-inserter", amount = 1 }}, requester_paste_multiplier = 4, }, { @@ -30,7 +30,7 @@ data:extend({ { "iron-gear-wheel", 2 }, { "advanced-circuit", 4 }, }, - result = "express-filter-inserter", + results = {{ type = "item", name = "express-filter-inserter", amount = 1 }}, requester_paste_multiplier = 4, }, { @@ -42,7 +42,7 @@ data:extend({ { "iron-gear-wheel", 15 }, { "advanced-circuit", 5 }, }, - result = "express-stack-inserter", + results = {{ type = "item", name = "express-stack-inserter", amount = 1 }}, requester_paste_multiplier = 4, }, { @@ -54,7 +54,7 @@ data:extend({ { "iron-gear-wheel", 15 }, { "advanced-circuit", 5 }, }, - result = "express-stack-filter-inserter", + results = {{ type = "item", name = "express-stack-filter-inserter", amount = 1 }}, requester_paste_multiplier = 4, }, }) @@ -69,7 +69,7 @@ if settings.startup["bobmods-logistics-inserteroverhaul"].value == true then { "inserter", 1 }, { "electronic-circuit", 4 }, }, - result = "yellow-filter-inserter", + results = {{ type = "item", name = "yellow-filter-inserter", amount = 1 }}, }, { type = "recipe", @@ -80,7 +80,7 @@ if settings.startup["bobmods-logistics-inserteroverhaul"].value == true then { "steel-plate", 3 }, { "iron-gear-wheel", 5 }, -- replace brass -- add in steel bearings if they and brass exist }, - result = "red-stack-inserter", + results = {{ type = "item", name = "red-stack-inserter", amount = 1 }}, }, { type = "recipe", @@ -90,7 +90,7 @@ if settings.startup["bobmods-logistics-inserteroverhaul"].value == true then { "red-stack-inserter", 1 }, { "electronic-circuit", 5 }, }, - result = "red-stack-filter-inserter", + results = {{ type = "item", name = "red-stack-filter-inserter", amount = 1 }}, }, }) @@ -106,7 +106,7 @@ if settings.startup["bobmods-logistics-inserteroverhaul"].value == true then { "iron-gear-wheel", 1 }, -- replace steel gear wheel -- add in steel bearings if they and brass exist { "electronic-circuit", 1 }, }, - result = "long-handed-inserter", + results = {{ type = "item", name = "long-handed-inserter", amount = 1 }}, }, { type = "recipe", @@ -118,7 +118,7 @@ if settings.startup["bobmods-logistics-inserteroverhaul"].value == true then { "iron-gear-wheel", 1 }, -- replace steel gear wheel -- add in steel bearings if they and brass exist { "electronic-circuit", 1 }, }, - result = "red-filter-inserter", + results = {{ type = "item", name = "red-filter-inserter", amount = 1 }}, }, { @@ -131,7 +131,7 @@ if settings.startup["bobmods-logistics-inserteroverhaul"].value == true then { "iron-gear-wheel", 1 }, -- replace brass -- add steel bearings, or brass if it exists. { "advanced-circuit", 1 }, }, - result = "fast-inserter", + results = {{ type = "item", name = "fast-inserter", amount = 1 }}, }, { type = "recipe", @@ -143,7 +143,7 @@ if settings.startup["bobmods-logistics-inserteroverhaul"].value == true then { "iron-gear-wheel", 1 }, -- replace brass -- add steel bearings, or brass if it exists. { "advanced-circuit", 5 }, }, - result = "filter-inserter", + results = {{ type = "item", name = "filter-inserter", amount = 1 }}, }, { type = "recipe", @@ -155,7 +155,7 @@ if settings.startup["bobmods-logistics-inserteroverhaul"].value == true then { "iron-gear-wheel", 6 }, -- replace brass -- add steel bearings, or brass if it exists. { "advanced-circuit", 1 }, }, - result = "stack-inserter", + results = {{ type = "item", name = "stack-inserter", amount = 1 }}, }, { type = "recipe", @@ -167,7 +167,7 @@ if settings.startup["bobmods-logistics-inserteroverhaul"].value == true then { "iron-gear-wheel", 6 }, -- replace brass -- add steel bearings, or brass if it exists. { "advanced-circuit", 6 }, }, - result = "stack-filter-inserter", + results = {{ type = "item", name = "stack-filter-inserter", amount = 1 }}, }, { @@ -180,7 +180,7 @@ if settings.startup["bobmods-logistics-inserteroverhaul"].value == true then { "iron-gear-wheel", 1 }, --replace titanium -- add titanium bearing { "processing-unit", 1 }, }, - result = "turbo-inserter", + results = {{ type = "item", name = "turbo-inserter", amount = 1 }}, requester_paste_multiplier = 4, }, { @@ -193,7 +193,7 @@ if settings.startup["bobmods-logistics-inserteroverhaul"].value == true then { "iron-gear-wheel", 1 }, -- replace titanium -- add titanium bearing { "processing-unit", 5 }, }, - result = "turbo-filter-inserter", + results = {{ type = "item", name = "turbo-filter-inserter", amount = 1 }}, requester_paste_multiplier = 4, }, @@ -207,7 +207,7 @@ if settings.startup["bobmods-logistics-inserteroverhaul"].value == true then { "iron-gear-wheel", 6 }, -- replace titanium--add titanium bearing { "processing-unit", 1 }, }, - result = "turbo-stack-inserter", + results = {{ type = "item", name = "turbo-stack-inserter", amount = 1 }}, requester_paste_multiplier = 4, }, { @@ -220,7 +220,7 @@ if settings.startup["bobmods-logistics-inserteroverhaul"].value == true then { "iron-gear-wheel", 6 }, -- replace titanium--add titanium bearing { "processing-unit", 6 }, }, - result = "turbo-stack-filter-inserter", + results = {{ type = "item", name = "turbo-stack-filter-inserter", amount = 1 }}, requester_paste_multiplier = 4, }, @@ -234,7 +234,7 @@ if settings.startup["bobmods-logistics-inserteroverhaul"].value == true then { "iron-gear-wheel", 1 }, --replace nitinol -- add nitinol bearing { "processing-unit", 1 }, --replace advanced processing unit }, - result = "express-inserter", + results = {{ type = "item", name = "express-inserter", amount = 1 }}, requester_paste_multiplier = 4, }, { @@ -247,7 +247,7 @@ if settings.startup["bobmods-logistics-inserteroverhaul"].value == true then { "iron-gear-wheel", 1 }, -- replace nitinol -- add nitinol bearing { "processing-unit", 5 }, --replace advanced processing unit }, - result = "express-filter-inserter", + results = {{ type = "item", name = "express-filter-inserter", amount = 1 }}, requester_paste_multiplier = 4, }, @@ -261,7 +261,7 @@ if settings.startup["bobmods-logistics-inserteroverhaul"].value == true then { "iron-gear-wheel", 6 }, -- replace nitinol -- add nitinol bearing { "processing-unit", 1 }, --replace advanced processing unit }, - result = "express-stack-inserter", + results = {{ type = "item", name = "express-stack-inserter", amount = 1 }}, requester_paste_multiplier = 4, }, { @@ -274,7 +274,7 @@ if settings.startup["bobmods-logistics-inserteroverhaul"].value == true then { "iron-gear-wheel", 6 }, -- replace nitinol -- add nitinol bearing { "processing-unit", 6 }, --replace advanced processing unit }, - result = "express-stack-filter-inserter", + results = {{ type = "item", name = "express-stack-filter-inserter", amount = 1 }}, requester_paste_multiplier = 4, }, }) @@ -289,7 +289,7 @@ if settings.startup["bobmods-logistics-inserteroverhaul"].value == true then { "iron-gear-wheel", 1 }, -- replace steel gear wheel -- add in steel bearings if they and brass exist { "electronic-circuit", 1 }, }, - result = "long-handed-inserter", + results = {{ type = "item", name = "long-handed-inserter", amount = 1 }}, }, { type = "recipe", @@ -299,7 +299,7 @@ if settings.startup["bobmods-logistics-inserteroverhaul"].value == true then { "long-handed-inserter", 1 }, { "electronic-circuit", 4 }, }, - result = "red-filter-inserter", + results = {{ type = "item", name = "red-filter-inserter", amount = 1 }}, }, { @@ -311,7 +311,7 @@ if settings.startup["bobmods-logistics-inserteroverhaul"].value == true then { "iron-gear-wheel", 1 }, -- replace brass -- add steel bearings, or brass if it exists. { "advanced-circuit", 1 }, }, - result = "fast-inserter", + results = {{ type = "item", name = "fast-inserter", amount = 1 }}, }, { type = "recipe", @@ -321,7 +321,7 @@ if settings.startup["bobmods-logistics-inserteroverhaul"].value == true then { "fast-inserter", 1 }, { "advanced-circuit", 4 }, }, - result = "filter-inserter", + results = {{ type = "item", name = "filter-inserter", amount = 1 }}, }, { type = "recipe", @@ -332,7 +332,7 @@ if settings.startup["bobmods-logistics-inserteroverhaul"].value == true then { "steel-plate", 3 }, -- replace aluminium { "iron-gear-wheel", 5 }, -- replace brass -- add steel bearings, or brass if it exists. }, - result = "stack-inserter", + results = {{ type = "item", name = "stack-inserter", amount = 1 }}, }, { type = "recipe", @@ -342,7 +342,7 @@ if settings.startup["bobmods-logistics-inserteroverhaul"].value == true then { "stack-inserter", 1 }, { "advanced-circuit", 5 }, }, - result = "stack-filter-inserter", + results = {{ type = "item", name = "stack-filter-inserter", amount = 1 }}, }, { @@ -354,7 +354,7 @@ if settings.startup["bobmods-logistics-inserteroverhaul"].value == true then { "iron-gear-wheel", 1 }, --replace titanium -- add titanium bearing { "processing-unit", 1 }, }, - result = "turbo-inserter", + results = {{ type = "item", name = "turbo-inserter", amount = 1 }}, requester_paste_multiplier = 4, }, { @@ -365,7 +365,7 @@ if settings.startup["bobmods-logistics-inserteroverhaul"].value == true then { "turbo-inserter", 1 }, { "processing-unit", 4 }, }, - result = "turbo-filter-inserter", + results = {{ type = "item", name = "turbo-filter-inserter", amount = 1 }}, requester_paste_multiplier = 4, }, @@ -378,7 +378,7 @@ if settings.startup["bobmods-logistics-inserteroverhaul"].value == true then { "steel-plate", 3 }, -- replace titanium { "iron-gear-wheel", 5 }, -- replace titanium--add titanium bearing }, - result = "turbo-stack-inserter", + results = {{ type = "item", name = "turbo-stack-inserter", amount = 1 }}, requester_paste_multiplier = 4, }, { @@ -389,7 +389,7 @@ if settings.startup["bobmods-logistics-inserteroverhaul"].value == true then { "turbo-stack-inserter", 1 }, { "processing-unit", 5 }, }, - result = "turbo-stack-filter-inserter", + results = {{ type = "item", name = "turbo-stack-filter-inserter", amount = 1 }}, requester_paste_multiplier = 4, }, @@ -402,7 +402,7 @@ if settings.startup["bobmods-logistics-inserteroverhaul"].value == true then { "iron-gear-wheel", 1 }, --replace nitinol -- add nitinol bearing { "processing-unit", 1 }, --replace advanced processing unit }, - result = "express-inserter", + results = {{ type = "item", name = "express-inserter", amount = 1 }}, requester_paste_multiplier = 4, }, { @@ -413,7 +413,7 @@ if settings.startup["bobmods-logistics-inserteroverhaul"].value == true then { "express-inserter", 1 }, { "processing-unit", 4 }, --replace advanced processing unit }, - result = "express-filter-inserter", + results = {{ type = "item", name = "express-filter-inserter", amount = 1 }}, requester_paste_multiplier = 4, }, @@ -426,7 +426,7 @@ if settings.startup["bobmods-logistics-inserteroverhaul"].value == true then { "steel-plate", 3 }, -- replace nitinol { "iron-gear-wheel", 5 }, -- replace nitinol -- add nitinol bearing }, - result = "express-stack-inserter", + results = {{ type = "item", name = "express-stack-inserter", amount = 1 }}, requester_paste_multiplier = 4, }, { @@ -437,7 +437,7 @@ if settings.startup["bobmods-logistics-inserteroverhaul"].value == true then { "express-stack-inserter", 1 }, { "processing-unit", 5 }, --replace advanced processing unit }, - result = "express-stack-filter-inserter", + results = {{ type = "item", name = "express-stack-filter-inserter", amount = 1 }}, requester_paste_multiplier = 4, }, }) diff --git a/boblogistics/prototypes/recipe/logistic-container-recipe.lua b/boblogistics/prototypes/recipe/logistic-container-recipe.lua index 3298efd6c..231a2d668 100644 --- a/boblogistics/prototypes/recipe/logistic-container-recipe.lua +++ b/boblogistics/prototypes/recipe/logistic-container-recipe.lua @@ -7,7 +7,7 @@ data:extend({ { "logistic-chest-passive-provider", 1 }, { "processing-unit", 1 }, }, - result = "logistic-chest-passive-provider-2", + results = {{ type = "item", name = "logistic-chest-passive-provider-2", amount = 1 }}, }, { type = "recipe", @@ -17,7 +17,7 @@ data:extend({ { "logistic-chest-active-provider", 1 }, { "processing-unit", 1 }, }, - result = "logistic-chest-active-provider-2", + results = {{ type = "item", name = "logistic-chest-active-provider-2", amount = 1 }}, }, { type = "recipe", @@ -27,7 +27,7 @@ data:extend({ { "logistic-chest-storage", 1 }, { "processing-unit", 1 }, }, - result = "logistic-chest-storage-2", + results = {{ type = "item", name = "logistic-chest-storage-2", amount = 1 }}, }, { type = "recipe", @@ -37,7 +37,7 @@ data:extend({ { "logistic-chest-buffer", 1 }, { "processing-unit", 1 }, }, - result = "logistic-chest-buffer-2", + results = {{ type = "item", name = "logistic-chest-buffer-2", amount = 1 }}, }, { type = "recipe", @@ -47,7 +47,7 @@ data:extend({ { "logistic-chest-requester", 1 }, { "processing-unit", 1 }, }, - result = "logistic-chest-requester-2", + results = {{ type = "item", name = "logistic-chest-requester-2", amount = 1 }}, }, { @@ -58,7 +58,7 @@ data:extend({ { "logistic-chest-passive-provider-2", 1 }, { "processing-unit", 1 }, }, - result = "logistic-chest-passive-provider-3", + results = {{ type = "item", name = "logistic-chest-passive-provider-3", amount = 1 }}, }, { type = "recipe", @@ -68,7 +68,7 @@ data:extend({ { "logistic-chest-active-provider-2", 1 }, { "processing-unit", 1 }, }, - result = "logistic-chest-active-provider-3", + results = {{ type = "item", name = "logistic-chest-active-provider-3", amount = 1 }}, }, { type = "recipe", @@ -78,7 +78,7 @@ data:extend({ { "logistic-chest-storage-2", 1 }, { "processing-unit", 1 }, }, - result = "logistic-chest-storage-3", + results = {{ type = "item", name = "logistic-chest-storage-3", amount = 1 }}, }, { type = "recipe", @@ -88,7 +88,7 @@ data:extend({ { "logistic-chest-buffer-2", 1 }, { "processing-unit", 1 }, }, - result = "logistic-chest-buffer-3", + results = {{ type = "item", name = "logistic-chest-buffer-3", amount = 1 }}, }, { type = "recipe", @@ -98,6 +98,6 @@ data:extend({ { "logistic-chest-requester-2", 1 }, { "processing-unit", 1 }, }, - result = "logistic-chest-requester-3", + results = {{ type = "item", name = "logistic-chest-requester-3", amount = 1 }}, }, }) diff --git a/boblogistics/prototypes/recipe/pipes-recipe.lua b/boblogistics/prototypes/recipe/pipes-recipe.lua index 5ae01b036..f120aacb1 100644 --- a/boblogistics/prototypes/recipe/pipes-recipe.lua +++ b/boblogistics/prototypes/recipe/pipes-recipe.lua @@ -5,7 +5,7 @@ data:extend({ ingredients = { { "stone-brick", 1 }, }, - result = "stone-pipe", + results = {{ type = "item", name = "stone-pipe", amount = 1 }}, }, { @@ -15,8 +15,7 @@ data:extend({ { "stone-pipe", 10 }, { "stone-brick", 5 }, }, - result_count = 2, - result = "stone-pipe-to-ground", + results = {{ type = "item", name = "stone-pipe-to-ground", amount = 2 }}, }, { @@ -25,7 +24,7 @@ data:extend({ ingredients = { { "copper-plate", 1 }, }, - result = "copper-pipe", + results = {{ type = "item", name = "copper-pipe", amount = 1 }}, }, { @@ -35,8 +34,7 @@ data:extend({ { "copper-pipe", 10 }, { "copper-plate", 5 }, }, - result_count = 2, - result = "copper-pipe-to-ground", + results = {{ type = "item", name = "copper-pipe-to-ground", amount = 2 }}, }, { @@ -46,7 +44,7 @@ data:extend({ ingredients = { { "steel-plate", 1 }, }, - result = "steel-pipe", + results = {{ type = "item", name = "steel-pipe", amount = 1 }}, }, { @@ -57,8 +55,7 @@ data:extend({ { "steel-pipe", 12 }, { "steel-plate", 5 }, }, - result_count = 2, - result = "steel-pipe-to-ground", + results = {{ type = "item", name = "steel-pipe-to-ground", amount = 2 }}, }, { @@ -68,7 +65,7 @@ data:extend({ ingredients = { { "plastic-bar", 1 }, }, - result = "plastic-pipe", + results = {{ type = "item", name = "plastic-pipe", amount = 1 }}, }, { @@ -79,8 +76,7 @@ data:extend({ { "plastic-pipe", 14 }, { "plastic-bar", 5 }, }, - result_count = 2, - result = "plastic-pipe-to-ground", + results = {{ type = "item", name = "plastic-pipe-to-ground", amount = 2 }}, }, }) @@ -93,7 +89,7 @@ if data.raw.item["bronze-alloy"] then ingredients = { { "bronze-alloy", 1 }, }, - result = "bronze-pipe", + results = {{ type = "item", name = "bronze-pipe", amount = 1 }}, }, { @@ -104,8 +100,7 @@ if data.raw.item["bronze-alloy"] then { "bronze-pipe", 12 }, { "bronze-alloy", 5 }, }, - result_count = 2, - result = "bronze-pipe-to-ground", + results = {{ type = "item", name = "bronze-pipe-to-ground", amount = 2 }}, }, }) end @@ -119,7 +114,7 @@ if data.raw.item["brass-alloy"] then ingredients = { { "brass-alloy", 1 }, }, - result = "brass-pipe", + results = {{ type = "item", name = "brass-pipe", amount = 1 }}, }, { @@ -130,8 +125,7 @@ if data.raw.item["brass-alloy"] then { "brass-pipe", 14 }, { "brass-alloy", 5 }, }, - result_count = 2, - result = "brass-pipe-to-ground", + results = {{ type = "item", name = "brass-pipe-to-ground", amount = 2 }}, }, }) end @@ -145,7 +139,7 @@ if data.raw.item["silicon-nitride"] then ingredients = { { "silicon-nitride", 1 }, }, - result = "ceramic-pipe", + results = {{ type = "item", name = "ceramic-pipe", amount = 1 }}, }, { @@ -156,8 +150,7 @@ if data.raw.item["silicon-nitride"] then { "ceramic-pipe", 16 }, { "silicon-nitride", 5 }, }, - result_count = 2, - result = "ceramic-pipe-to-ground", + results = {{ type = "item", name = "ceramic-pipe-to-ground", amount = 2 }}, }, }) end @@ -171,7 +164,7 @@ if data.raw.item["titanium-plate"] then ingredients = { { "titanium-plate", 1 }, }, - result = "titanium-pipe", + results = {{ type = "item", name = "titanium-pipe", amount = 1 }}, }, { @@ -182,8 +175,7 @@ if data.raw.item["titanium-plate"] then { "titanium-pipe", 16 }, { "titanium-plate", 5 }, }, - result_count = 2, - result = "titanium-pipe-to-ground", + results = {{ type = "item", name = "titanium-pipe-to-ground", amount = 2 }}, }, }) end @@ -197,7 +189,7 @@ if data.raw.item["tungsten-plate"] then ingredients = { { "tungsten-plate", 1 }, }, - result = "tungsten-pipe", + results = {{ type = "item", name = "tungsten-pipe", amount = 1 }}, }, { @@ -208,8 +200,7 @@ if data.raw.item["tungsten-plate"] then { "tungsten-pipe", 16 }, { "tungsten-plate", 5 }, }, - result_count = 2, - result = "tungsten-pipe-to-ground", + results = {{ type = "item", name = "tungsten-pipe-to-ground", amount = 2 }}, }, }) end @@ -223,7 +214,7 @@ if data.raw.item["nitinol-alloy"] then ingredients = { { "nitinol-alloy", 1 }, }, - result = "nitinol-pipe", + results = {{ type = "item", name = "nitinol-pipe", amount = 1 }}, }, { @@ -234,8 +225,7 @@ if data.raw.item["nitinol-alloy"] then { "nitinol-pipe", 18 }, { "nitinol-alloy", 5 }, }, - result_count = 2, - result = "nitinol-pipe-to-ground", + results = {{ type = "item", name = "nitinol-pipe-to-ground", amount = 2 }}, }, }) end @@ -249,7 +239,7 @@ if data.raw.item["copper-tungsten-alloy"] then ingredients = { { "copper-tungsten-alloy", 1 }, }, - result = "copper-tungsten-pipe", + results = {{ type = "item", name = "copper-tungsten-pipe", amount = 1 }}, }, { @@ -260,8 +250,7 @@ if data.raw.item["copper-tungsten-alloy"] then { "copper-tungsten-pipe", 18 }, { "copper-tungsten-alloy", 5 }, }, - result_count = 2, - result = "copper-tungsten-pipe-to-ground", + results = {{ type = "item", name = "copper-tungsten-pipe-to-ground", amount = 2 }}, }, }) end diff --git a/boblogistics/prototypes/recipe/pump-recipe.lua b/boblogistics/prototypes/recipe/pump-recipe.lua index 3bdc8fae4..6f7889732 100644 --- a/boblogistics/prototypes/recipe/pump-recipe.lua +++ b/boblogistics/prototypes/recipe/pump-recipe.lua @@ -9,7 +9,7 @@ data:extend({ { "steel-plate", 1 }, { "copper-pipe", 1 }, }, - result = "bob-pump-2", + results = {{ type = "item", name = "bob-pump-2", amount = 1 }}, }, { type = "recipe", @@ -21,7 +21,7 @@ data:extend({ { "steel-plate", 1 }, { "copper-pipe", 1 }, }, - result = "bob-pump-3", + results = {{ type = "item", name = "bob-pump-3", amount = 1 }}, }, { type = "recipe", @@ -33,6 +33,6 @@ data:extend({ { "steel-plate", 1 }, { "copper-pipe", 1 }, }, - result = "bob-pump-4", + results = {{ type = "item", name = "bob-pump-4", amount = 1 }}, }, }) diff --git a/boblogistics/prototypes/recipe/roboport-parts-recipe.lua b/boblogistics/prototypes/recipe/roboport-parts-recipe.lua index 31b133e83..e9cd7daef 100644 --- a/boblogistics/prototypes/recipe/roboport-parts-recipe.lua +++ b/boblogistics/prototypes/recipe/roboport-parts-recipe.lua @@ -8,7 +8,7 @@ data:extend({ { "copper-cable", 2 }, { "electronic-circuit", 5 }, }, - result = "roboport-antenna-1", + results = {{ type = "item", name = "roboport-antenna-1", amount = 1 }}, energy_required = 0.2, }, { @@ -20,7 +20,7 @@ data:extend({ { "copper-cable", 2 }, { "advanced-circuit", 5 }, }, - result = "roboport-antenna-2", + results = {{ type = "item", name = "roboport-antenna-2", amount = 1 }}, energy_required = 0.2, }, { @@ -32,7 +32,7 @@ data:extend({ { "copper-cable", 2 }, { "processing-unit", 5 }, }, - result = "roboport-antenna-3", + results = {{ type = "item", name = "roboport-antenna-3", amount = 1 }}, energy_required = 0.2, }, { @@ -45,7 +45,7 @@ data:extend({ { "copper-cable", 2 }, { "processing-unit", 5 }, }, - result = "roboport-antenna-4", + results = {{ type = "item", name = "roboport-antenna-4", amount = 1 }}, energy_required = 0.2, }, }) @@ -60,7 +60,7 @@ data:extend({ { "electronic-circuit", 5 }, { "battery", 2 }, }, - result = "roboport-chargepad-1", + results = {{ type = "item", name = "roboport-chargepad-1", amount = 1 }}, energy_required = 1, }, { @@ -72,7 +72,7 @@ data:extend({ { "advanced-circuit", 5 }, { "battery", 2 }, }, - result = "roboport-chargepad-2", + results = {{ type = "item", name = "roboport-chargepad-2", amount = 1 }}, energy_required = 1, }, { @@ -84,7 +84,7 @@ data:extend({ { "processing-unit", 5 }, { "battery", 2 }, }, - result = "roboport-chargepad-3", + results = {{ type = "item", name = "roboport-chargepad-3", amount = 1 }}, energy_required = 1, }, { @@ -96,7 +96,7 @@ data:extend({ { "processing-unit", 5 }, { "battery", 2 }, }, - result = "roboport-chargepad-4", + results = {{ type = "item", name = "roboport-chargepad-4", amount = 1 }}, energy_required = 1, }, }) @@ -110,7 +110,7 @@ data:extend({ { "steel-plate", 15 }, { "iron-gear-wheel", 20 }, }, - result = "roboport-door-1", + results = {{ type = "item", name = "roboport-door-1", amount = 1 }}, energy_required = 1, }, { @@ -121,7 +121,7 @@ data:extend({ { "steel-plate", 15 }, { "iron-gear-wheel", 20 }, }, - result = "roboport-door-2", + results = {{ type = "item", name = "roboport-door-2", amount = 1 }}, energy_required = 1, }, { @@ -132,7 +132,7 @@ data:extend({ { "steel-plate", 15 }, { "iron-gear-wheel", 20 }, }, - result = "roboport-door-3", + results = {{ type = "item", name = "roboport-door-3", amount = 1 }}, energy_required = 1, }, { @@ -143,7 +143,7 @@ data:extend({ { "steel-plate", 15 }, { "iron-gear-wheel", 20 }, }, - result = "roboport-door-4", + results = {{ type = "item", name = "roboport-door-4", amount = 1 }}, energy_required = 1, }, }) diff --git a/boblogistics/prototypes/recipe/roboport-recipe.lua b/boblogistics/prototypes/recipe/roboport-recipe.lua index c789e8ed5..67ebdf0d0 100644 --- a/boblogistics/prototypes/recipe/roboport-recipe.lua +++ b/boblogistics/prototypes/recipe/roboport-recipe.lua @@ -11,7 +11,7 @@ if settings.startup["bobmods-logistics-disableroboports"].value == false then { "roboport-chargepad-2", 4 }, { "roboport-door-2", 1 }, }, - result = "bob-roboport-2", + results = {{ type = "item", name = "bob-roboport-2", amount = 1 }}, energy_required = 10, }, @@ -26,7 +26,7 @@ if settings.startup["bobmods-logistics-disableroboports"].value == false then { "roboport-chargepad-3", 4 }, { "roboport-door-3", 1 }, }, - result = "bob-roboport-3", + results = {{ type = "item", name = "bob-roboport-3", amount = 1 }}, energy_required = 10, }, @@ -41,7 +41,7 @@ if settings.startup["bobmods-logistics-disableroboports"].value == false then { "roboport-chargepad-4", 4 }, { "roboport-door-4", 1 }, }, - result = "bob-roboport-4", + results = {{ type = "item", name = "bob-roboport-4", amount = 1 }}, energy_required = 10, }, }) @@ -58,7 +58,7 @@ data:extend({ { "roboport-chargepad-1", 1 }, { "roboport-door-1", 1 }, }, - result = "bob-robochest", + results = {{ type = "item", name = "bob-robochest", amount = 1 }}, energy_required = 5, }, @@ -72,7 +72,7 @@ data:extend({ { "roboport-chargepad-2", 1 }, { "roboport-door-2", 1 }, }, - result = "bob-robochest-2", + results = {{ type = "item", name = "bob-robochest-2", amount = 1 }}, energy_required = 5, }, @@ -86,7 +86,7 @@ data:extend({ { "roboport-chargepad-3", 1 }, { "roboport-door-3", 1 }, }, - result = "bob-robochest-3", + results = {{ type = "item", name = "bob-robochest-3", amount = 1 }}, energy_required = 5, }, @@ -100,7 +100,7 @@ data:extend({ { "roboport-chargepad-4", 1 }, { "roboport-door-4", 1 }, }, - result = "bob-robochest-4", + results = {{ type = "item", name = "bob-robochest-4", amount = 1 }}, energy_required = 5, }, }) @@ -114,7 +114,7 @@ data:extend({ { "steel-plate", 5 }, { "roboport-antenna-1", 3 }, }, - result = "bob-logistic-zone-expander", + results = {{ type = "item", name = "bob-logistic-zone-expander", amount = 1 }}, energy_required = 5, }, @@ -127,7 +127,7 @@ data:extend({ { "steel-plate", 5 }, { "roboport-antenna-2", 3 }, }, - result = "bob-logistic-zone-expander-2", + results = {{ type = "item", name = "bob-logistic-zone-expander-2", amount = 1 }}, energy_required = 5, }, @@ -140,7 +140,7 @@ data:extend({ { "steel-plate", 5 }, { "roboport-antenna-3", 3 }, }, - result = "bob-logistic-zone-expander-3", + results = {{ type = "item", name = "bob-logistic-zone-expander-3", amount = 1 }}, energy_required = 5, }, @@ -153,7 +153,7 @@ data:extend({ { "steel-plate", 5 }, { "roboport-antenna-4", 3 }, }, - result = "bob-logistic-zone-expander-4", + results = {{ type = "item", name = "bob-logistic-zone-expander-4", amount = 1 }}, energy_required = 5, }, }) @@ -168,7 +168,7 @@ data:extend({ { "roboport-antenna-1", 1 }, { "roboport-chargepad-1", 4 }, }, - result = "bob-robo-charge-port", + results = {{ type = "item", name = "bob-robo-charge-port", amount = 1 }}, energy_required = 5, }, @@ -181,7 +181,7 @@ data:extend({ { "steel-plate", 10 }, { "roboport-chargepad-2", 4 }, }, - result = "bob-robo-charge-port-2", + results = {{ type = "item", name = "bob-robo-charge-port-2", amount = 1 }}, energy_required = 5, }, @@ -194,7 +194,7 @@ data:extend({ { "steel-plate", 10 }, { "roboport-chargepad-3", 4 }, }, - result = "bob-robo-charge-port-3", + results = {{ type = "item", name = "bob-robo-charge-port-3", amount = 1 }}, energy_required = 5, }, @@ -207,7 +207,7 @@ data:extend({ { "steel-plate", 10 }, { "roboport-chargepad-4", 4 }, }, - result = "bob-robo-charge-port-4", + results = {{ type = "item", name = "bob-robo-charge-port-4", amount = 1 }}, energy_required = 5, }, @@ -220,7 +220,7 @@ data:extend({ { "roboport-antenna-1", 1 }, { "roboport-chargepad-1", 9 }, }, - result = "bob-robo-charge-port-large", + results = {{ type = "item", name = "bob-robo-charge-port-large", amount = 1 }}, energy_required = 5, }, @@ -233,7 +233,7 @@ data:extend({ { "steel-plate", 15 }, { "roboport-chargepad-2", 9 }, }, - result = "bob-robo-charge-port-large-2", + results = {{ type = "item", name = "bob-robo-charge-port-large-2", amount = 1 }}, energy_required = 5, }, @@ -246,7 +246,7 @@ data:extend({ { "steel-plate", 15 }, { "roboport-chargepad-3", 9 }, }, - result = "bob-robo-charge-port-large-3", + results = {{ type = "item", name = "bob-robo-charge-port-large-3", amount = 1 }}, energy_required = 5, }, @@ -259,7 +259,7 @@ data:extend({ { "steel-plate", 15 }, { "roboport-chargepad-4", 9 }, }, - result = "bob-robo-charge-port-large-4", + results = {{ type = "item", name = "bob-robo-charge-port-large-4", amount = 1 }}, energy_required = 5, }, }) @@ -274,7 +274,7 @@ data:extend({ { "roboport-antenna-1", 1 }, { "electronic-circuit", 2 }, }, - result = "bob-logistic-zone-interface", + results = {{ type = "item", name = "bob-logistic-zone-interface", amount = 1 }}, energy_required = 2, }, }) diff --git a/boblogistics/prototypes/recipe/robots-recipe.lua b/boblogistics/prototypes/recipe/robots-recipe.lua index dcfb2b119..be4aed70a 100644 --- a/boblogistics/prototypes/recipe/robots-recipe.lua +++ b/boblogistics/prototypes/recipe/robots-recipe.lua @@ -4,7 +4,7 @@ data:extend({ name = "bob-logistic-robot-2", enabled = false, ingredients = {}, - result = "bob-logistic-robot-2", + results = {{ type = "item", name = "bob-logistic-robot-2", amount = 1 }}, }, { @@ -12,7 +12,7 @@ data:extend({ name = "bob-logistic-robot-3", enabled = false, ingredients = {}, - result = "bob-logistic-robot-3", + results = {{ type = "item", name = "bob-logistic-robot-3", amount = 1 }}, }, { @@ -20,7 +20,7 @@ data:extend({ name = "bob-logistic-robot-4", enabled = false, ingredients = {}, - result = "bob-logistic-robot-4", + results = {{ type = "item", name = "bob-logistic-robot-4", amount = 1 }}, }, { @@ -28,7 +28,7 @@ data:extend({ name = "bob-logistic-robot-5", enabled = false, ingredients = {}, - result = "bob-logistic-robot-5", + results = {{ type = "item", name = "bob-logistic-robot-5", amount = 1 }}, }, { @@ -36,7 +36,7 @@ data:extend({ name = "bob-construction-robot-2", enabled = false, ingredients = {}, - result = "bob-construction-robot-2", + results = {{ type = "item", name = "bob-construction-robot-2", amount = 1 }}, }, { @@ -44,7 +44,7 @@ data:extend({ name = "bob-construction-robot-3", enabled = false, ingredients = {}, - result = "bob-construction-robot-3", + results = {{ type = "item", name = "bob-construction-robot-3", amount = 1 }}, }, { @@ -52,7 +52,7 @@ data:extend({ name = "bob-construction-robot-4", enabled = false, ingredients = {}, - result = "bob-construction-robot-4", + results = {{ type = "item", name = "bob-construction-robot-4", amount = 1 }}, }, { @@ -60,6 +60,6 @@ data:extend({ name = "bob-construction-robot-5", enabled = false, ingredients = {}, - result = "bob-construction-robot-5", + results = {{ type = "item", name = "bob-construction-robot-5", amount = 1 }}, }, }) diff --git a/boblogistics/prototypes/recipe/storage-tank-recipe.lua b/boblogistics/prototypes/recipe/storage-tank-recipe.lua index a18e541ae..5a0837065 100644 --- a/boblogistics/prototypes/recipe/storage-tank-recipe.lua +++ b/boblogistics/prototypes/recipe/storage-tank-recipe.lua @@ -8,7 +8,7 @@ data:extend({ { "storage-tank", 1 }, { "steel-plate", 20 }, }, - result = "storage-tank-2", + results = {{ type = "item", name = "storage-tank-2", amount = 1 }}, }, { @@ -20,7 +20,7 @@ data:extend({ { "storage-tank-2", 1 }, { "steel-plate", 20 }, }, - result = "storage-tank-3", + results = {{ type = "item", name = "storage-tank-3", amount = 1 }}, }, { @@ -32,7 +32,7 @@ data:extend({ { "storage-tank-3", 1 }, { "steel-plate", 20 }, }, - result = "storage-tank-4", + results = {{ type = "item", name = "storage-tank-4", amount = 1 }}, }, }) @@ -47,7 +47,7 @@ data:extend({ { "steel-plate", 5 }, { "pipe", 4 }, }, - result = "bob-storage-tank-all-corners", + results = {{ type = "item", name = "bob-storage-tank-all-corners", amount = 1 }}, }, { type = "recipe", @@ -59,7 +59,7 @@ data:extend({ { "steel-plate", 20 }, { "pipe", 4 }, }, - result = "bob-storage-tank-all-corners-2", + results = {{ type = "item", name = "bob-storage-tank-all-corners-2", amount = 1 }}, }, { type = "recipe", @@ -71,7 +71,7 @@ data:extend({ { "steel-plate", 20 }, { "pipe", 4 }, }, - result = "bob-storage-tank-all-corners-3", + results = {{ type = "item", name = "bob-storage-tank-all-corners-3", amount = 1 }}, }, { type = "recipe", @@ -83,6 +83,6 @@ data:extend({ { "steel-plate", 20 }, { "pipe", 4 }, }, - result = "bob-storage-tank-all-corners-4", + results = {{ type = "item", name = "bob-storage-tank-all-corners-4", amount = 1 }}, }, }) diff --git a/boblogistics/prototypes/recipe/train-recipe.lua b/boblogistics/prototypes/recipe/train-recipe.lua index 84fe99b9a..ea8c4371c 100644 --- a/boblogistics/prototypes/recipe/train-recipe.lua +++ b/boblogistics/prototypes/recipe/train-recipe.lua @@ -10,7 +10,7 @@ if settings.startup["bobmods-logistics-trains"].value == true then { "steel-plate", 10 }, { "iron-gear-wheel", 20 }, }, - result = "bob-locomotive-2", + results = {{ type = "item", name = "bob-locomotive-2", amount = 1 }}, }, { @@ -23,7 +23,7 @@ if settings.startup["bobmods-logistics-trains"].value == true then { "steel-plate", 10 }, { "iron-gear-wheel", 20 }, }, - result = "bob-locomotive-3", + results = {{ type = "item", name = "bob-locomotive-3", amount = 1 }}, }, { @@ -34,7 +34,7 @@ if settings.startup["bobmods-logistics-trains"].value == true then { "locomotive", 1 }, { "steel-plate", 25 }, }, - result = "bob-armoured-locomotive", + results = {{ type = "item", name = "bob-armoured-locomotive", amount = 1 }}, }, { @@ -47,7 +47,7 @@ if settings.startup["bobmods-logistics-trains"].value == true then { "processing-unit", 5 }, { "iron-gear-wheel", 20 }, }, - result = "bob-armoured-locomotive-2", + results = {{ type = "item", name = "bob-armoured-locomotive-2", amount = 1 }}, }, { @@ -59,7 +59,7 @@ if settings.startup["bobmods-logistics-trains"].value == true then { "steel-plate", 20 }, { "iron-gear-wheel", 12 }, }, - result = "bob-cargo-wagon-2", + results = {{ type = "item", name = "bob-cargo-wagon-2", amount = 1 }}, }, { @@ -71,7 +71,7 @@ if settings.startup["bobmods-logistics-trains"].value == true then { "steel-plate", 20 }, { "iron-gear-wheel", 12 }, }, - result = "bob-cargo-wagon-3", + results = {{ type = "item", name = "bob-cargo-wagon-3", amount = 1 }}, }, { @@ -82,7 +82,7 @@ if settings.startup["bobmods-logistics-trains"].value == true then { "cargo-wagon", 1 }, { "steel-plate", 25 }, }, - result = "bob-armoured-cargo-wagon", + results = {{ type = "item", name = "bob-armoured-cargo-wagon", amount = 1 }}, }, { @@ -94,7 +94,7 @@ if settings.startup["bobmods-logistics-trains"].value == true then { "steel-plate", 25 }, { "iron-gear-wheel", 12 }, }, - result = "bob-armoured-cargo-wagon-2", + results = {{ type = "item", name = "bob-armoured-cargo-wagon-2", amount = 1 }}, }, { @@ -108,7 +108,7 @@ if settings.startup["bobmods-logistics-trains"].value == true then { "steel-plate", 16 }, { "storage-tank-2", 1 }, }, - result = "bob-fluid-wagon-2", + results = {{ type = "item", name = "bob-fluid-wagon-2", amount = 1 }}, }, { @@ -122,7 +122,7 @@ if settings.startup["bobmods-logistics-trains"].value == true then { "steel-plate", 16 }, { "storage-tank-3", 1 }, }, - result = "bob-fluid-wagon-3", + results = {{ type = "item", name = "bob-fluid-wagon-3", amount = 1 }}, }, { @@ -134,7 +134,7 @@ if settings.startup["bobmods-logistics-trains"].value == true then { "fluid-wagon", 1 }, { "steel-plate", 25 }, }, - result = "bob-armoured-fluid-wagon", + results = {{ type = "item", name = "bob-armoured-fluid-wagon", amount = 1 }}, }, { @@ -148,7 +148,7 @@ if settings.startup["bobmods-logistics-trains"].value == true then { "steel-plate", 25 }, { "storage-tank-3", 1 }, }, - result = "bob-armoured-fluid-wagon-2", + results = {{ type = "item", name = "bob-armoured-fluid-wagon-2", amount = 1 }}, }, }) end diff --git a/boblogistics/prototypes/repair-pack.lua b/boblogistics/prototypes/repair-pack.lua index 06be81bda..c26366b2b 100644 --- a/boblogistics/prototypes/repair-pack.lua +++ b/boblogistics/prototypes/repair-pack.lua @@ -59,7 +59,7 @@ data:extend({ { "electronic-circuit", 2 }, { "iron-gear-wheel", 2 }, }, - result = "repair-pack-2", + results = {{ type = "item", name = "repair-pack-2", amount = 1 }}, }, { type = "recipe", @@ -70,7 +70,7 @@ data:extend({ { "iron-gear-wheel", 2 }, { "steel-plate", 2 }, }, - result = "repair-pack-3", + results = {{ type = "item", name = "repair-pack-3", amount = 1 }}, }, { type = "recipe", @@ -81,7 +81,7 @@ data:extend({ { "iron-gear-wheel", 2 }, { "steel-plate", 2 }, }, - result = "repair-pack-4", + results = {{ type = "item", name = "repair-pack-4", amount = 1 }}, }, { type = "recipe", @@ -92,7 +92,7 @@ data:extend({ { "iron-gear-wheel", 2 }, { "steel-plate", 2 }, }, - result = "repair-pack-5", + results = {{ type = "item", name = "repair-pack-5", amount = 1 }}, }, }) diff --git a/boblogistics/prototypes/robot-parts.lua b/boblogistics/prototypes/robot-parts.lua index bb1b92aa3..e2931d710 100644 --- a/boblogistics/prototypes/robot-parts.lua +++ b/boblogistics/prototypes/robot-parts.lua @@ -42,7 +42,7 @@ if settings.startup["bobmods-logistics-flyingrobotframes"].value == true then { "battery", 2 }, { "steel-plate", 1 }, }, - result = "flying-robot-frame-2", + results = {{ type = "item", name = "flying-robot-frame-2", amount = 1 }}, }, { type = "recipe", @@ -54,7 +54,7 @@ if settings.startup["bobmods-logistics-flyingrobotframes"].value == true then { "battery", 2 }, { "steel-plate", 1 }, }, - result = "flying-robot-frame-3", + results = {{ type = "item", name = "flying-robot-frame-3", amount = 1 }}, }, { type = "recipe", @@ -66,7 +66,7 @@ if settings.startup["bobmods-logistics-flyingrobotframes"].value == true then { "battery", 2 }, { "steel-plate", 1 }, }, - result = "flying-robot-frame-4", + results = {{ type = "item", name = "flying-robot-frame-4", amount = 1 }}, }, }) @@ -253,7 +253,7 @@ if settings.startup["bobmods-logistics-robotparts"].value == true then { "basic-circuit-board", 2 }, { "electronic-circuit", 2 }, }, - result = "bob-robot-brain", + results = {{ type = "item", name = "bob-robot-brain", amount = 1 }}, }, { @@ -265,7 +265,7 @@ if settings.startup["bobmods-logistics-robotparts"].value == true then { "electronic-circuit", 2 }, { "advanced-circuit", 2 }, }, - result = "bob-robot-brain-2", + results = {{ type = "item", name = "bob-robot-brain-2", amount = 1 }}, }, { @@ -277,7 +277,7 @@ if settings.startup["bobmods-logistics-robotparts"].value == true then { "advanced-circuit", 2 }, { "processing-unit", 2 }, }, - result = "bob-robot-brain-3", + results = {{ type = "item", name = "bob-robot-brain-3", amount = 1 }}, }, { @@ -288,7 +288,7 @@ if settings.startup["bobmods-logistics-robotparts"].value == true then ingredients = { { "processing-unit", 4 }, }, - result = "bob-robot-brain-4", + results = {{ type = "item", name = "bob-robot-brain-4", amount = 1 }}, }, { @@ -297,7 +297,7 @@ if settings.startup["bobmods-logistics-robotparts"].value == true then energy_required = 1, enabled = false, ingredients = {}, - result = "bob-robot-tool", + results = {{ type = "item", name = "bob-robot-tool", amount = 1 }}, }, { @@ -306,7 +306,7 @@ if settings.startup["bobmods-logistics-robotparts"].value == true then energy_required = 2, enabled = false, ingredients = {}, - result = "bob-robot-tool-2", + results = {{ type = "item", name = "bob-robot-tool-2", amount = 1 }}, }, { @@ -315,7 +315,7 @@ if settings.startup["bobmods-logistics-robotparts"].value == true then energy_required = 3, enabled = false, ingredients = {}, - result = "bob-robot-tool-3", + results = {{ type = "item", name = "bob-robot-tool-3", amount = 1 }}, }, { @@ -324,7 +324,7 @@ if settings.startup["bobmods-logistics-robotparts"].value == true then energy_required = 4, enabled = false, ingredients = {}, - result = "bob-robot-tool-4", + results = {{ type = "item", name = "bob-robot-tool-4", amount = 1 }}, }, }) end diff --git a/boblogistics/prototypes/valves.lua b/boblogistics/prototypes/valves.lua index a38ac3448..85564fbbe 100644 --- a/boblogistics/prototypes/valves.lua +++ b/boblogistics/prototypes/valves.lua @@ -24,7 +24,7 @@ data:extend({ { "iron-plate", 1 }, { "pipe", 1 }, }, - result = "bob-valve", + results = {{ type = "item", name = "bob-valve", amount = 1 }}, }, { type = "storage-tank", @@ -209,7 +209,7 @@ data:extend({ { "iron-plate", 1 }, { "pipe", 1 }, }, - result = "bob-overflow-valve", + results = {{ type = "item", name = "bob-overflow-valve", amount = 1 }}, }, { type = "storage-tank", @@ -396,7 +396,7 @@ data:extend({ { "iron-plate", 1 }, { "pipe", 1 }, }, - result = "bob-topup-valve", + results = {{ type = "item", name = "bob-topup-valve", amount = 1 }}, }, { type = "storage-tank", diff --git a/bobmining/prototypes/areadrills.lua b/bobmining/prototypes/areadrills.lua index e8d348fcb..288fc9a76 100644 --- a/bobmining/prototypes/areadrills.lua +++ b/bobmining/prototypes/areadrills.lua @@ -58,7 +58,7 @@ if settings.startup["bobmods-mining-areadrills"].value == true then { "steel-plate", 10 }, { "iron-gear-wheel", 5 }, }, - result = "bob-area-mining-drill-1", + results = {{ type = "item", name = "bob-area-mining-drill-1", amount = 1 }}, }, { type = "recipe", @@ -71,7 +71,7 @@ if settings.startup["bobmods-mining-areadrills"].value == true then { "steel-plate", 10 }, { "iron-gear-wheel", 5 }, }, - result = "bob-area-mining-drill-2", + results = {{ type = "item", name = "bob-area-mining-drill-2", amount = 1 }}, }, { type = "recipe", @@ -84,7 +84,7 @@ if settings.startup["bobmods-mining-areadrills"].value == true then { "steel-plate", 10 }, { "iron-gear-wheel", 5 }, }, - result = "bob-area-mining-drill-3", + results = {{ type = "item", name = "bob-area-mining-drill-3", amount = 1 }}, }, { type = "recipe", @@ -97,7 +97,7 @@ if settings.startup["bobmods-mining-areadrills"].value == true then { "steel-plate", 10 }, { "iron-gear-wheel", 5 }, }, - result = "bob-area-mining-drill-4", + results = {{ type = "item", name = "bob-area-mining-drill-4", amount = 1 }}, }, }) diff --git a/bobmining/prototypes/drills.lua b/bobmining/prototypes/drills.lua index 5dd0f63c9..c4b915337 100644 --- a/bobmining/prototypes/drills.lua +++ b/bobmining/prototypes/drills.lua @@ -58,7 +58,7 @@ if settings.startup["bobmods-mining-miningdrills"].value == true then { "steel-plate", 10 }, { "iron-gear-wheel", 5 }, }, - result = "bob-mining-drill-1", + results = {{ type = "item", name = "bob-mining-drill-1", amount = 1 }}, }, { type = "recipe", @@ -71,7 +71,7 @@ if settings.startup["bobmods-mining-miningdrills"].value == true then { "steel-plate", 10 }, { "iron-gear-wheel", 5 }, }, - result = "bob-mining-drill-2", + results = {{ type = "item", name = "bob-mining-drill-2", amount = 1 }}, }, { type = "recipe", @@ -84,7 +84,7 @@ if settings.startup["bobmods-mining-miningdrills"].value == true then { "steel-plate", 10 }, { "iron-gear-wheel", 5 }, }, - result = "bob-mining-drill-3", + results = {{ type = "item", name = "bob-mining-drill-3", amount = 1 }}, }, { type = "recipe", @@ -97,7 +97,7 @@ if settings.startup["bobmods-mining-miningdrills"].value == true then { "steel-plate", 10 }, { "iron-gear-wheel", 5 }, }, - result = "bob-mining-drill-4", + results = {{ type = "item", name = "bob-mining-drill-4", amount = 1 }}, }, }) diff --git a/bobmining/prototypes/pumpjacks.lua b/bobmining/prototypes/pumpjacks.lua index e595f0eb7..fa551c818 100644 --- a/bobmining/prototypes/pumpjacks.lua +++ b/bobmining/prototypes/pumpjacks.lua @@ -61,7 +61,7 @@ if settings.startup["bobmods-mining-pumpjacks"].value == true then { "electronic-circuit", 5 }, { "pipe", 10 }, }, - result = "bob-pumpjack-1", + results = {{ type = "item", name = "bob-pumpjack-1", amount = 1 }}, enabled = false, }, { @@ -75,7 +75,7 @@ if settings.startup["bobmods-mining-pumpjacks"].value == true then { "advanced-circuit", 5 }, { "pipe", 10 }, }, - result = "bob-pumpjack-2", + results = {{ type = "item", name = "bob-pumpjack-2", amount = 1 }}, enabled = false, }, { @@ -89,7 +89,7 @@ if settings.startup["bobmods-mining-pumpjacks"].value == true then { "processing-unit", 5 }, { "pipe", 10 }, }, - result = "bob-pumpjack-3", + results = {{ type = "item", name = "bob-pumpjack-3", amount = 1 }}, enabled = false, }, { @@ -103,7 +103,7 @@ if settings.startup["bobmods-mining-pumpjacks"].value == true then { "processing-unit", 5 }, { "pipe", 10 }, }, - result = "bob-pumpjack-4", + results = {{ type = "item", name = "bob-pumpjack-4", amount = 1 }}, enabled = false, }, }) diff --git a/bobmining/prototypes/steam-drills.lua b/bobmining/prototypes/steam-drills.lua index a841b488f..f833c579e 100644 --- a/bobmining/prototypes/steam-drills.lua +++ b/bobmining/prototypes/steam-drills.lua @@ -20,7 +20,7 @@ if settings.startup["bobmods-mining-steamminingdrills"].value == true then { "burner-mining-drill", 1 }, { "pipe", 2 }, }, - result = "steam-mining-drill", + results = {{ type = "item", name = "steam-mining-drill", amount = 1 }}, }, util.merge({ diff --git a/bobmining/prototypes/water-miner.lua b/bobmining/prototypes/water-miner.lua index 0a6e8d24e..2a383bc47 100644 --- a/bobmining/prototypes/water-miner.lua +++ b/bobmining/prototypes/water-miner.lua @@ -63,7 +63,7 @@ if settings.startup["bobmods-mining-waterminers"].value == true and data.raw["re { "electronic-circuit", 5 }, { "pipe", 10 }, }, - result = "water-miner-1", + results = {{ type = "item", name = "water-miner-1", amount = 1 }}, enabled = false, }, { @@ -77,7 +77,7 @@ if settings.startup["bobmods-mining-waterminers"].value == true and data.raw["re { "electronic-circuit", 5 }, { "pipe", 10 }, }, - result = "water-miner-2", + results = {{ type = "item", name = "water-miner-2", amount = 1 }}, enabled = false, }, { @@ -91,7 +91,7 @@ if settings.startup["bobmods-mining-waterminers"].value == true and data.raw["re { "advanced-circuit", 5 }, { "pipe", 10 }, }, - result = "water-miner-3", + results = {{ type = "item", name = "water-miner-3", amount = 1 }}, enabled = false, }, { @@ -105,7 +105,7 @@ if settings.startup["bobmods-mining-waterminers"].value == true and data.raw["re { "processing-unit", 5 }, { "pipe", 10 }, }, - result = "water-miner-4", + results = {{ type = "item", name = "water-miner-4", amount = 1 }}, enabled = false, }, { @@ -119,7 +119,7 @@ if settings.startup["bobmods-mining-waterminers"].value == true and data.raw["re { "processing-unit", 5 }, { "pipe", 10 }, }, - result = "water-miner-5", + results = {{ type = "item", name = "water-miner-5", amount = 1 }}, enabled = false, }, }) diff --git a/bobmodules/prototypes/beacon.lua b/bobmodules/prototypes/beacon.lua index 93428927c..84cdbcad1 100644 --- a/bobmodules/prototypes/beacon.lua +++ b/bobmodules/prototypes/beacon.lua @@ -65,7 +65,7 @@ data:extend({ { "steel-plate", 10 }, { "copper-cable", 10 }, }, - result = "beacon-2", + results = {{ type = "item", name = "beacon-2", amount = 1 }}, }, { @@ -82,7 +82,7 @@ data:extend({ { "copper-plate", 10 }, { "copper-cable", 10 }, }, - result = "beacon-3", + results = {{ type = "item", name = "beacon-3", amount = 1 }}, }, { diff --git a/bobmodules/prototypes/lab.lua b/bobmodules/prototypes/lab.lua index 7e34d65e6..35e2671ec 100644 --- a/bobmodules/prototypes/lab.lua +++ b/bobmodules/prototypes/lab.lua @@ -186,7 +186,7 @@ if bobmods.modules.ModulesLab then { "effectivity-processor", 5 }, { "productivity-processor", 5 }, }, - result = "lab-module", + results = {{ type = "item", name = "lab-module", amount = 1 }}, }, }) diff --git a/bobmodules/prototypes/recipe/electronics.lua b/bobmodules/prototypes/recipe/electronics.lua index 1556b3ad5..7e54a0e4e 100644 --- a/bobmodules/prototypes/recipe/electronics.lua +++ b/bobmodules/prototypes/recipe/electronics.lua @@ -8,7 +8,7 @@ data:extend({ { "plastic-bar", 2 }, { "steel-plate", 1 }, }, - result = "module-case", + results = {{ type = "item", name = "module-case", amount = 1 }}, }, { @@ -19,8 +19,7 @@ data:extend({ ingredients = { { "copper-plate", 1 }, }, - result = "module-contact", - result_count = 5, + results = {{ type = "item", name = "module-contact", amount = 5 }}, }, { @@ -33,7 +32,7 @@ data:extend({ { "copper-plate", 1 }, { "plastic-bar", 1 }, }, - result = "module-circuit-board", + results = {{ type = "item", name = "module-circuit-board", amount = 1 }}, }, }) @@ -48,8 +47,7 @@ data:extend({ { "copper-plate", 1 }, { "plastic-bar", 1 }, }, - result = "module-processor-board", - result_count = 4, + results = {{ type = "item", name = "module-processor-board", amount = 4 }} }, { @@ -62,8 +60,7 @@ data:extend({ { "copper-plate", 1 }, { "plastic-bar", 1 }, }, - result = "module-processor-board-2", - result_count = 4, + results = {{ type = "item", name = "module-processor-board-2", amount = 4 }}, }, { @@ -76,8 +73,7 @@ data:extend({ { "copper-plate", 2 }, { "plastic-bar", 1 }, }, - result = "module-processor-board-3", - result_count = 4, + results = {{ type = "item", name = "module-processor-board-3", amount = 4 }}, }, }) @@ -92,7 +88,7 @@ data:extend({ { "electronic-circuit", 2 }, { "advanced-circuit", 2 }, }, - result = "speed-processor", + results = {{ type = "item", name = "speed-processor", amount = 1 }}, }, { @@ -105,7 +101,7 @@ data:extend({ { "advanced-circuit", 2 }, { "processing-unit", 2 }, }, - result = "speed-processor-2", + results = {{ type = "item", name = "speed-processor-2", amount = 1 }}, }, { @@ -117,7 +113,7 @@ data:extend({ { "module-processor-board-3", 1 }, { "processing-unit", 2 }, }, - result = "speed-processor-3", + results = {{ type = "item", name = "speed-processor-3", amount = 1 }}, }, }) @@ -132,7 +128,7 @@ data:extend({ { "electronic-circuit", 2 }, { "advanced-circuit", 2 }, }, - result = "effectivity-processor", + results = {{ type = "item", name = "effectivity-processor", amount = 1 }}, }, { @@ -145,7 +141,7 @@ data:extend({ { "advanced-circuit", 2 }, { "processing-unit", 2 }, }, - result = "effectivity-processor-2", + results = {{ type = "item", name = "effectivity-processor-2", amount = 1 }}, }, { @@ -157,7 +153,7 @@ data:extend({ { "module-processor-board-3", 1 }, { "processing-unit", 2 }, }, - result = "effectivity-processor-3", + results = {{ type = "item", name = "effectivity-processor-3", amount = 1 }}, }, }) @@ -172,7 +168,7 @@ data:extend({ { "electronic-circuit", 2 }, { "advanced-circuit", 2 }, }, - result = "productivity-processor", + results = {{ type = "item", name = "productivity-processor", amount = 1 }}, }, { @@ -185,7 +181,7 @@ data:extend({ { "advanced-circuit", 2 }, { "processing-unit", 2 }, }, - result = "productivity-processor-2", + results = {{ type = "item", name = "productivity-processor-2", amount = 1 }}, }, { @@ -197,7 +193,7 @@ data:extend({ { "module-processor-board-3", 1 }, { "processing-unit", 2 }, }, - result = "productivity-processor-3", + results = {{ type = "item", name = "productivity-processor-3", amount = 1 }}, }, }) @@ -212,7 +208,7 @@ data:extend({ { "electronic-circuit", 2 }, { "advanced-circuit", 2 }, }, - result = "pollution-clean-processor", + results = {{ type = "item", name = "pollution-clean-processor", amount = 1 }}, }, { @@ -225,7 +221,7 @@ data:extend({ { "advanced-circuit", 2 }, { "processing-unit", 2 }, }, - result = "pollution-clean-processor-2", + results = {{ type = "item", name = "pollution-clean-processor-2", amount = 1 }}, }, { @@ -237,7 +233,7 @@ data:extend({ { "module-processor-board-3", 1 }, { "processing-unit", 2 }, }, - result = "pollution-clean-processor-3", + results = {{ type = "item", name = "pollution-clean-processor-3", amount = 1 }}, }, }) @@ -252,7 +248,7 @@ data:extend({ { "electronic-circuit", 2 }, { "advanced-circuit", 2 }, }, - result = "pollution-create-processor", + results = {{ type = "item", name = "pollution-create-processor", amount = 1 }}, }, { @@ -265,7 +261,7 @@ data:extend({ { "advanced-circuit", 2 }, { "processing-unit", 2 }, }, - result = "pollution-create-processor-2", + results = {{ type = "item", name = "pollution-create-processor-2", amount = 1 }}, }, { @@ -277,6 +273,6 @@ data:extend({ { "module-processor-board-3", 1 }, { "processing-unit", 2 }, }, - result = "pollution-create-processor-3", + results = {{ type = "item", name = "pollution-create-processor-3", amount = 1 }}, }, }) diff --git a/bobmodules/prototypes/recipe/module-merged.lua b/bobmodules/prototypes/recipe/module-merged.lua index 678441642..b62021958 100644 --- a/bobmodules/prototypes/recipe/module-merged.lua +++ b/bobmodules/prototypes/recipe/module-merged.lua @@ -14,7 +14,7 @@ if settings.startup["bobmods-modules-enablerawspeedmodules"].value == true then { "module-contact", 4 }, }, energy_required = 15, - result = "raw-speed-module-1", + results = {{ type = "item", name = "raw-speed-module-1", amount = 1 }}, }, { @@ -28,7 +28,7 @@ if settings.startup["bobmods-modules-enablerawspeedmodules"].value == true then { "module-contact", 5 }, }, energy_required = 30, - result = "raw-speed-module-2", + results = {{ type = "item", name = "raw-speed-module-2", amount = 1 }}, }, { @@ -42,7 +42,7 @@ if settings.startup["bobmods-modules-enablerawspeedmodules"].value == true then { "advanced-circuit", 7 }, }, energy_required = 45, - result = "raw-speed-module-3", + results = {{ type = "item", name = "raw-speed-module-3", amount = 1 }}, }, { @@ -57,7 +57,7 @@ if settings.startup["bobmods-modules-enablerawspeedmodules"].value == true then { "processing-unit", 7 }, }, energy_required = 60, - result = "raw-speed-module-4", + results = {{ type = "item", name = "raw-speed-module-4", amount = 1 }}, }, { @@ -72,7 +72,7 @@ if settings.startup["bobmods-modules-enablerawspeedmodules"].value == true then { "processing-unit", 7 }, }, energy_required = 75, - result = "raw-speed-module-5", + results = {{ type = "item", name = "raw-speed-module-5", amount = 1 }}, }, { @@ -87,7 +87,7 @@ if settings.startup["bobmods-modules-enablerawspeedmodules"].value == true then { "processing-unit", 7 }, }, energy_required = 90, - result = "raw-speed-module-6", + results = {{ type = "item", name = "raw-speed-module-6", amount = 1 }}, }, { @@ -102,7 +102,7 @@ if settings.startup["bobmods-modules-enablerawspeedmodules"].value == true then { "processing-unit", 8 }, }, energy_required = 105, - result = "raw-speed-module-7", + results = {{ type = "item", name = "raw-speed-module-7", amount = 1 }}, }, { @@ -118,7 +118,7 @@ if settings.startup["bobmods-modules-enablerawspeedmodules"].value == true then { "processing-unit", 8 }, }, energy_required = 120, - result = "raw-speed-module-8", + results = {{ type = "item", name = "raw-speed-module-8", amount = 1 }}, }, }) @@ -136,7 +136,7 @@ if settings.startup["bobmods-modules-enablerawspeedmodules"].value == true then }, energy_required = 15, allow_as_intermediate = false, - result = "raw-speed-module-1", + results = {{ type = "item", name = "raw-speed-module-1", amount = 1 }}, }, { @@ -150,7 +150,7 @@ if settings.startup["bobmods-modules-enablerawspeedmodules"].value == true then }, energy_required = 30, allow_as_intermediate = false, - result = "raw-speed-module-2", + results = {{ type = "item", name = "raw-speed-module-2", amount = 1 }}, }, { @@ -164,7 +164,7 @@ if settings.startup["bobmods-modules-enablerawspeedmodules"].value == true then }, energy_required = 45, allow_as_intermediate = false, - result = "raw-speed-module-3", + results = {{ type = "item", name = "raw-speed-module-3", amount = 1 }}, }, { @@ -178,7 +178,7 @@ if settings.startup["bobmods-modules-enablerawspeedmodules"].value == true then }, energy_required = 60, allow_as_intermediate = false, - result = "raw-speed-module-4", + results = {{ type = "item", name = "raw-speed-module-4", amount = 1 }}, }, { @@ -192,7 +192,7 @@ if settings.startup["bobmods-modules-enablerawspeedmodules"].value == true then }, energy_required = 75, allow_as_intermediate = false, - result = "raw-speed-module-5", + results = {{ type = "item", name = "raw-speed-module-5", amount = 1 }}, }, { @@ -206,7 +206,7 @@ if settings.startup["bobmods-modules-enablerawspeedmodules"].value == true then }, energy_required = 90, allow_as_intermediate = false, - result = "raw-speed-module-6", + results = {{ type = "item", name = "raw-speed-module-6", amount = 1 }}, }, { @@ -220,7 +220,7 @@ if settings.startup["bobmods-modules-enablerawspeedmodules"].value == true then }, energy_required = 105, allow_as_intermediate = false, - result = "raw-speed-module-7", + results = {{ type = "item", name = "raw-speed-module-7", amount = 1 }}, }, { @@ -234,7 +234,7 @@ if settings.startup["bobmods-modules-enablerawspeedmodules"].value == true then }, energy_required = 120, allow_as_intermediate = false, - result = "raw-speed-module-8", + results = {{ type = "item", name = "raw-speed-module-8", amount = 1 }}, }, }) end @@ -255,7 +255,7 @@ if settings.startup["bobmods-modules-enablegreenmodules"].value == true then { "module-contact", 4 }, }, energy_required = 15, - result = "green-module-1", + results = {{ type = "item", name = "green-module-1", amount = 1 }}, }, { @@ -269,7 +269,7 @@ if settings.startup["bobmods-modules-enablegreenmodules"].value == true then { "module-contact", 5 }, }, energy_required = 30, - result = "green-module-2", + results = {{ type = "item", name = "green-module-2", amount = 1 }}, }, { @@ -283,7 +283,7 @@ if settings.startup["bobmods-modules-enablegreenmodules"].value == true then { "advanced-circuit", 7 }, }, energy_required = 45, - result = "green-module-3", + results = {{ type = "item", name = "green-module-3", amount = 1 }}, }, { @@ -298,7 +298,7 @@ if settings.startup["bobmods-modules-enablegreenmodules"].value == true then { "processing-unit", 7 }, }, energy_required = 60, - result = "green-module-4", + results = {{ type = "item", name = "green-module-4", amount = 1 }}, }, { @@ -313,7 +313,7 @@ if settings.startup["bobmods-modules-enablegreenmodules"].value == true then { "processing-unit", 7 }, }, energy_required = 75, - result = "green-module-5", + results = {{ type = "item", name = "green-module-5", amount = 1 }}, }, { @@ -328,7 +328,7 @@ if settings.startup["bobmods-modules-enablegreenmodules"].value == true then { "processing-unit", 7 }, }, energy_required = 90, - result = "green-module-6", + results = {{ type = "item", name = "green-module-6", amount = 1 }}, }, { @@ -343,7 +343,7 @@ if settings.startup["bobmods-modules-enablegreenmodules"].value == true then { "processing-unit", 8 }, }, energy_required = 105, - result = "green-module-7", + results = {{ type = "item", name = "green-module-7", amount = 1 }}, }, { @@ -359,7 +359,7 @@ if settings.startup["bobmods-modules-enablegreenmodules"].value == true then { "processing-unit", 8 }, }, energy_required = 120, - result = "green-module-8", + results = {{ type = "item", name = "green-module-8", amount = 1 }}, }, }) @@ -377,7 +377,7 @@ if settings.startup["bobmods-modules-enablegreenmodules"].value == true then }, energy_required = 15, allow_as_intermediate = false, - result = "green-module-1", + results = {{ type = "item", name = "green-module-1", amount = 1 }}, }, { @@ -391,7 +391,7 @@ if settings.startup["bobmods-modules-enablegreenmodules"].value == true then }, energy_required = 30, allow_as_intermediate = false, - result = "green-module-2", + results = {{ type = "item", name = "green-module-2", amount = 1 }}, }, { @@ -405,7 +405,7 @@ if settings.startup["bobmods-modules-enablegreenmodules"].value == true then }, energy_required = 45, allow_as_intermediate = false, - result = "green-module-3", + results = {{ type = "item", name = "green-module-3", amount = 1 }}, }, { @@ -419,7 +419,7 @@ if settings.startup["bobmods-modules-enablegreenmodules"].value == true then }, energy_required = 60, allow_as_intermediate = false, - result = "green-module-4", + results = {{ type = "item", name = "green-module-4", amount = 1 }}, }, { @@ -433,7 +433,7 @@ if settings.startup["bobmods-modules-enablegreenmodules"].value == true then }, energy_required = 75, allow_as_intermediate = false, - result = "green-module-5", + results = {{ type = "item", name = "green-module-5", amount = 1 }}, }, { @@ -447,7 +447,7 @@ if settings.startup["bobmods-modules-enablegreenmodules"].value == true then }, energy_required = 90, allow_as_intermediate = false, - result = "green-module-6", + results = {{ type = "item", name = "green-module-6", amount = 1 }}, }, { @@ -461,7 +461,7 @@ if settings.startup["bobmods-modules-enablegreenmodules"].value == true then }, energy_required = 105, allow_as_intermediate = false, - result = "green-module-7", + results = {{ type = "item", name = "green-module-7", amount = 1 }}, }, { @@ -475,7 +475,7 @@ if settings.startup["bobmods-modules-enablegreenmodules"].value == true then }, energy_required = 120, allow_as_intermediate = false, - result = "green-module-8", + results = {{ type = "item", name = "green-module-8", amount = 1 }}, }, }) end @@ -497,7 +497,7 @@ if settings.startup["bobmods-modules-enablerawproductivitymodules"].value == tru { "module-contact", 4 }, }, energy_required = 15, - result = "raw-productivity-module-1", + results = {{ type = "item", name = "raw-productivity-module-1", amount = 1 }}, }, { @@ -512,7 +512,7 @@ if settings.startup["bobmods-modules-enablerawproductivitymodules"].value == tru { "module-contact", 5 }, }, energy_required = 30, - result = "raw-productivity-module-2", + results = {{ type = "item", name = "raw-productivity-module-2", amount = 1 }}, }, { @@ -527,7 +527,7 @@ if settings.startup["bobmods-modules-enablerawproductivitymodules"].value == tru { "advanced-circuit", 7 }, }, energy_required = 45, - result = "raw-productivity-module-3", + results = {{ type = "item", name = "raw-productivity-module-3", amount = 1 }}, }, { @@ -543,7 +543,7 @@ if settings.startup["bobmods-modules-enablerawproductivitymodules"].value == tru { "processing-unit", 7 }, }, energy_required = 60, - result = "raw-productivity-module-4", + results = {{ type = "item", name = "raw-productivity-module-4", amount = 1 }}, }, { @@ -559,7 +559,7 @@ if settings.startup["bobmods-modules-enablerawproductivitymodules"].value == tru { "processing-unit", 7 }, }, energy_required = 75, - result = "raw-productivity-module-5", + results = {{ type = "item", name = "raw-productivity-module-5", amount = 1 }}, }, { @@ -575,7 +575,7 @@ if settings.startup["bobmods-modules-enablerawproductivitymodules"].value == tru { "processing-unit", 7 }, }, energy_required = 90, - result = "raw-productivity-module-6", + results = {{ type = "item", name = "raw-productivity-module-6", amount = 1 }}, }, { @@ -591,7 +591,7 @@ if settings.startup["bobmods-modules-enablerawproductivitymodules"].value == tru { "processing-unit", 8 }, }, energy_required = 105, - result = "raw-productivity-module-7", + results = {{ type = "item", name = "raw-productivity-module-7", amount = 1 }}, }, { @@ -608,7 +608,7 @@ if settings.startup["bobmods-modules-enablerawproductivitymodules"].value == tru { "processing-unit", 8 }, }, energy_required = 120, - result = "raw-productivity-module-8", + results = {{ type = "item", name = "raw-productivity-module-8", amount = 1 }}, }, }) @@ -627,7 +627,7 @@ if settings.startup["bobmods-modules-enablerawproductivitymodules"].value == tru }, energy_required = 15, allow_as_intermediate = false, - result = "raw-productivity-module-1", + results = {{ type = "item", name = "raw-productivity-module-1", amount = 1 }}, }, { @@ -642,7 +642,7 @@ if settings.startup["bobmods-modules-enablerawproductivitymodules"].value == tru }, energy_required = 30, allow_as_intermediate = false, - result = "raw-productivity-module-2", + results = {{ type = "item", name = "raw-productivity-module-2", amount = 1 }}, }, { @@ -657,7 +657,7 @@ if settings.startup["bobmods-modules-enablerawproductivitymodules"].value == tru }, energy_required = 45, allow_as_intermediate = false, - result = "raw-productivity-module-3", + results = {{ type = "item", name = "raw-productivity-module-3", amount = 1 }}, }, { @@ -672,7 +672,7 @@ if settings.startup["bobmods-modules-enablerawproductivitymodules"].value == tru }, energy_required = 60, allow_as_intermediate = false, - result = "raw-productivity-module-4", + results = {{ type = "item", name = "raw-productivity-module-4", amount = 1 }}, }, { @@ -687,7 +687,7 @@ if settings.startup["bobmods-modules-enablerawproductivitymodules"].value == tru }, energy_required = 75, allow_as_intermediate = false, - result = "raw-productivity-module-5", + results = {{ type = "item", name = "raw-productivity-module-5", amount = 1 }}, }, { @@ -702,7 +702,7 @@ if settings.startup["bobmods-modules-enablerawproductivitymodules"].value == tru }, energy_required = 90, allow_as_intermediate = false, - result = "raw-productivity-module-6", + results = {{ type = "item", name = "raw-productivity-module-6", amount = 1 }}, }, { @@ -717,7 +717,7 @@ if settings.startup["bobmods-modules-enablerawproductivitymodules"].value == tru }, energy_required = 105, allow_as_intermediate = false, - result = "raw-productivity-module-7", + results = {{ type = "item", name = "raw-productivity-module-7", amount = 1 }}, }, { @@ -732,7 +732,7 @@ if settings.startup["bobmods-modules-enablerawproductivitymodules"].value == tru }, energy_required = 120, allow_as_intermediate = false, - result = "raw-productivity-module-8", + results = {{ type = "item", name = "raw-productivity-module-8", amount = 1 }}, }, }) end @@ -753,7 +753,7 @@ if settings.startup["bobmods-modules-enablegodmodules"].value == true then { "module-contact", 5 }, }, energy_required = 30, - result = "god-module-1", + results = {{ type = "item", name = "god-module-1", amount = 1 }}, }, { @@ -771,7 +771,7 @@ if settings.startup["bobmods-modules-enablegodmodules"].value == true then { "processing-unit", 7 }, }, energy_required = 60, - result = "god-module-2", + results = {{ type = "item", name = "god-module-2", amount = 1 }}, }, { @@ -788,7 +788,7 @@ if settings.startup["bobmods-modules-enablegodmodules"].value == true then { "processing-unit", 7 }, }, energy_required = 90, - result = "god-module-3", + results = {{ type = "item", name = "god-module-3", amount = 1 }}, }, { @@ -806,7 +806,7 @@ if settings.startup["bobmods-modules-enablegodmodules"].value == true then { "processing-unit", 8 }, }, energy_required = 120, - result = "god-module-4", + results = {{ type = "item", name = "god-module-4", amount = 1 }}, }, { @@ -824,7 +824,7 @@ if settings.startup["bobmods-modules-enablegodmodules"].value == true then { "processing-unit", 10 }, }, energy_required = 150, - result = "god-module-5", + results = {{ type = "item", name = "god-module-5", amount = 1 }}, }, }) end diff --git a/bobmodules/prototypes/recipe/module.lua b/bobmodules/prototypes/recipe/module.lua index d07af397b..fd2d4d306 100644 --- a/bobmodules/prototypes/recipe/module.lua +++ b/bobmodules/prototypes/recipe/module.lua @@ -24,7 +24,7 @@ data:extend({ { "processing-unit", 5 }, }, energy_required = 40, - result = "speed-module-4", + results = {{ type = "item", name = "speed-module-4", amount = 1 }}, }, { @@ -38,7 +38,7 @@ data:extend({ { "processing-unit", 5 }, }, energy_required = 50, - result = "speed-module-5", + results = {{ type = "item", name = "speed-module-5", amount = 1 }}, }, { @@ -52,7 +52,7 @@ data:extend({ { "processing-unit", 5 }, }, energy_required = 60, - result = "speed-module-6", + results = {{ type = "item", name = "speed-module-6", amount = 1 }}, }, { @@ -66,7 +66,7 @@ data:extend({ { "processing-unit", 5 }, }, energy_required = 70, - result = "speed-module-7", + results = {{ type = "item", name = "speed-module-7", amount = 1 }}, }, { @@ -81,7 +81,7 @@ data:extend({ { "processing-unit", 5 }, }, energy_required = 80, - result = "speed-module-8", + results = {{ type = "item", name = "speed-module-8", amount = 1 }}, }, }) @@ -111,7 +111,7 @@ data:extend({ { "processing-unit", 5 }, }, energy_required = 40, - result = "effectivity-module-4", + results = {{ type = "item", name = "effectivity-module-4", amount = 1 }}, }, { @@ -125,7 +125,7 @@ data:extend({ { "processing-unit", 5 }, }, energy_required = 50, - result = "effectivity-module-5", + results = {{ type = "item", name = "effectivity-module-5", amount = 1 }}, }, { @@ -139,7 +139,7 @@ data:extend({ { "processing-unit", 5 }, }, energy_required = 60, - result = "effectivity-module-6", + results = {{ type = "item", name = "effectivity-module-6", amount = 1 }}, }, { @@ -153,7 +153,7 @@ data:extend({ { "processing-unit", 5 }, }, energy_required = 70, - result = "effectivity-module-7", + results = {{ type = "item", name = "effectivity-module-7", amount = 1 }}, }, { @@ -168,7 +168,7 @@ data:extend({ { "processing-unit", 5 }, }, energy_required = 80, - result = "effectivity-module-8", + results = {{ type = "item", name = "effectivity-module-8", amount = 1 }}, }, }) @@ -198,7 +198,7 @@ data:extend({ { "processing-unit", 5 }, }, energy_required = 40, - result = "productivity-module-4", + results = {{ type = "item", name = "productivity-module-4", amount = 1 }}, }, { @@ -212,7 +212,7 @@ data:extend({ { "processing-unit", 5 }, }, energy_required = 50, - result = "productivity-module-5", + results = {{ type = "item", name = "productivity-module-5", amount = 1 }}, }, { @@ -226,7 +226,7 @@ data:extend({ { "processing-unit", 5 }, }, energy_required = 60, - result = "productivity-module-6", + results = {{ type = "item", name = "productivity-module-6", amount = 1 }}, }, { @@ -240,7 +240,7 @@ data:extend({ { "processing-unit", 5 }, }, energy_required = 70, - result = "productivity-module-7", + results = {{ type = "item", name = "productivity-module-7", amount = 1 }}, }, { @@ -255,7 +255,7 @@ data:extend({ { "processing-unit", 5 }, }, energy_required = 80, - result = "productivity-module-8", + results = {{ type = "item", name = "productivity-module-8", amount = 1 }}, }, }) @@ -272,7 +272,7 @@ data:extend({ { "module-contact", 4 }, }, energy_required = 10, - result = "pollution-clean-module-1", + results = {{ type = "item", name = "pollution-clean-module-1", amount = 1 }}, }, { @@ -285,7 +285,7 @@ data:extend({ { "module-contact", 5 }, }, energy_required = 20, - result = "pollution-clean-module-2", + results = {{ type = "item", name = "pollution-clean-module-2", amount = 1 }}, }, { @@ -298,7 +298,7 @@ data:extend({ { "advanced-circuit", 5 }, }, energy_required = 30, - result = "pollution-clean-module-3", + results = {{ type = "item", name = "pollution-clean-module-3", amount = 1 }}, }, { @@ -312,7 +312,7 @@ data:extend({ { "processing-unit", 5 }, }, energy_required = 40, - result = "pollution-clean-module-4", + results = {{ type = "item", name = "pollution-clean-module-4", amount = 1 }}, }, { @@ -326,7 +326,7 @@ data:extend({ { "processing-unit", 5 }, }, energy_required = 50, - result = "pollution-clean-module-5", + results = {{ type = "item", name = "pollution-clean-module-5", amount = 1 }}, }, { @@ -340,7 +340,7 @@ data:extend({ { "processing-unit", 5 }, }, energy_required = 60, - result = "pollution-clean-module-6", + results = {{ type = "item", name = "pollution-clean-module-6", amount = 1 }}, }, { @@ -354,7 +354,7 @@ data:extend({ { "processing-unit", 5 }, }, energy_required = 70, - result = "pollution-clean-module-7", + results = {{ type = "item", name = "pollution-clean-module-7", amount = 1 }}, }, { @@ -369,7 +369,7 @@ data:extend({ { "processing-unit", 5 }, }, energy_required = 80, - result = "pollution-clean-module-8", + results = {{ type = "item", name = "pollution-clean-module-8", amount = 1 }}, }, }) @@ -387,7 +387,7 @@ data:extend({ { "module-contact", 4 }, }, energy_required = 10, - result = "pollution-create-module-1", + results = {{ type = "item", name = "pollution-create-module-1", amount = 1 }}, }, { @@ -400,7 +400,7 @@ data:extend({ { "module-contact", 5 }, }, energy_required = 20, - result = "pollution-create-module-2", + results = {{ type = "item", name = "pollution-create-module-2", amount = 1 }}, }, { @@ -413,7 +413,7 @@ data:extend({ { "advanced-circuit", 5 }, }, energy_required = 30, - result = "pollution-create-module-3", + results = {{ type = "item", name = "pollution-create-module-3", amount = 1 }}, }, { @@ -427,7 +427,7 @@ data:extend({ { "processing-unit", 5 }, }, energy_required = 40, - result = "pollution-create-module-4", + results = {{ type = "item", name = "pollution-create-module-4", amount = 1 }}, }, { @@ -441,7 +441,7 @@ data:extend({ { "processing-unit", 5 }, }, energy_required = 50, - result = "pollution-create-module-5", + results = {{ type = "item", name = "pollution-create-module-5", amount = 1 }}, }, { @@ -455,7 +455,7 @@ data:extend({ { "processing-unit", 5 }, }, energy_required = 60, - result = "pollution-create-module-6", + results = {{ type = "item", name = "pollution-create-module-6", amount = 1 }}, }, { @@ -469,7 +469,7 @@ data:extend({ { "processing-unit", 5 }, }, energy_required = 70, - result = "pollution-create-module-7", + results = {{ type = "item", name = "pollution-create-module-7", amount = 1 }}, }, { @@ -484,6 +484,6 @@ data:extend({ { "processing-unit", 5 }, }, energy_required = 80, - result = "pollution-create-module-8", + results = {{ type = "item", name = "pollution-create-module-8", amount = 1 }}, }, }) diff --git a/bobores/data-updates.lua b/bobores/data-updates.lua index 2b7d5dd6d..6725f063a 100644 --- a/bobores/data-updates.lua +++ b/bobores/data-updates.lua @@ -7,49 +7,49 @@ end if not bobmods.ores.gems.enabled then -- Do nothing elseif bobmods.ores.settings.UnsortedGemOre == true then - bobmods.lib.resource.add_result("gem-ore", { name = "gem-ore" }) + bobmods.lib.resource.add_result("gem-ore", { type = "item", name = "gem-ore", amount = 1 }) else - bobmods.lib.resource.add_result("gem-ore", { name = "diamond-ore", probability = bobmods.gems.DiamondRatio }) - bobmods.lib.resource.add_result("gem-ore", { name = "emerald-ore", probability = bobmods.gems.EmeraldRatio }) - bobmods.lib.resource.add_result("gem-ore", { name = "amethyst-ore", probability = bobmods.gems.AmethystRatio }) - bobmods.lib.resource.add_result("gem-ore", { name = "ruby-ore", probability = bobmods.gems.RubyRatio }) - bobmods.lib.resource.add_result("gem-ore", { name = "sapphire-ore", probability = bobmods.gems.SapphireRatio }) - bobmods.lib.resource.add_result("gem-ore", { name = "topaz-ore", probability = bobmods.gems.TopazRatio }) + bobmods.lib.resource.add_result("gem-ore", { type = "item", name = "diamond-ore", amount = 1, probability = bobmods.gems.DiamondRatio }) + bobmods.lib.resource.add_result("gem-ore", { type = "item", name = "emerald-ore", amount = 1, probability = bobmods.gems.EmeraldRatio }) + bobmods.lib.resource.add_result("gem-ore", { type = "item", name = "amethyst-ore", amount = 1, probability = bobmods.gems.AmethystRatio }) + bobmods.lib.resource.add_result("gem-ore", { type = "item", name = "ruby-ore", amount = 1, probability = bobmods.gems.RubyRatio }) + bobmods.lib.resource.add_result("gem-ore", { type = "item", name = "sapphire-ore", amount = 1, probability = bobmods.gems.SapphireRatio }) + bobmods.lib.resource.add_result("gem-ore", { type = "item", name = "topaz-ore", amount = 1, probability = bobmods.gems.TopazRatio }) end if bobmods.ores.settings.GemsFromOtherOres == true then bobmods.lib.resource.add_result( "coal", - { name = "diamond-ore", probability = bobmods.ores.settings.GemProbability * bobmods.gems.DiamondRatio } + { type = "item", name = "diamond-ore", amount = 1, probability = bobmods.ores.settings.GemProbability * bobmods.gems.DiamondRatio } ) bobmods.lib.resource.add_result( "quartz", - { name = "emerald-ore", probability = bobmods.ores.settings.GemProbability * bobmods.gems.EmeraldRatio } + { type = "item", name = "emerald-ore", amount = 1, probability = bobmods.ores.settings.GemProbability * bobmods.gems.EmeraldRatio } ) bobmods.lib.resource.add_result( "quartz", - { name = "amethyst-ore", probability = bobmods.ores.settings.GemProbability * bobmods.gems.AmethystRatio } + { type = "item", name = "amethyst-ore", amount = 1, probability = bobmods.ores.settings.GemProbability * bobmods.gems.AmethystRatio } ) bobmods.lib.resource.add_result( "bauxite-ore", - { name = "ruby-ore", probability = bobmods.ores.settings.GemProbability * bobmods.gems.RubyRatio } + { type = "item", name = "ruby-ore", amount = 1, probability = bobmods.ores.settings.GemProbability * bobmods.gems.RubyRatio } ) bobmods.lib.resource.add_result( "bauxite-ore", - { name = "sapphire-ore", probability = bobmods.ores.settings.GemProbability * bobmods.gems.SapphireRatio } + { type = "item", name = "sapphire-ore", amount = 1, probability = bobmods.ores.settings.GemProbability * bobmods.gems.SapphireRatio } ) bobmods.lib.resource.add_result( "bauxite-ore", - { name = "topaz-ore", probability = bobmods.ores.settings.GemProbability * bobmods.gems.TopazRatio } + { type = "item", name = "topaz-ore", amount = 1, probability = bobmods.ores.settings.GemProbability * bobmods.gems.TopazRatio } ) end if bobmods.ores.settings.LeadGivesNickel == true then bobmods.lib.resource.add_result( "lead-ore", - { name = "nickel-ore", probability = bobmods.ores.settings.LeadNickelRatio } + { type = "item", name = "nickel-ore", amount = 1, probability = bobmods.ores.settings.LeadNickelRatio } ) end @@ -57,12 +57,12 @@ if bobmods.ores.settings.NickelGivesCobalt == true then if bobmods.ores.nickel.enabled then bobmods.lib.resource.add_result( "nickel-ore", - { name = "cobalt-ore", probability = bobmods.ores.settings.NickelCobaltRatio } + { type = "item", name = "cobalt-ore", amount = 1, probability = bobmods.ores.settings.NickelCobaltRatio } ) else if bobmods.ores.settings.LeadGivesNickel == true then bobmods.lib.resource.add_result("lead-ore", { - name = "cobalt-ore", + type = "item", name = "cobalt-ore", amount = 1, probability = bobmods.ores.settings.LeadNickelRatio * bobmods.ores.settings.NickelCobaltRatio, }) end @@ -70,14 +70,6 @@ if bobmods.ores.settings.NickelGivesCobalt == true then bobmods.ores.cobalt.enabled = true end -if data.raw.item["obsidian"] then - bobmods.lib.resource.add_result( - "cobalt-ore", - { name = "obsidian", amount_min = 1, amount_max = 12, probability = 0.25 } - ) - bobmods.ores.cobalt.enabled = true -end - if not bobmods.ores.cobalt.enabled then bobmods.lib.item.hide("cobalt-ore") end diff --git a/bobplates/data-updates.lua b/bobplates/data-updates.lua index 46e895278..5eb31d7c6 100644 --- a/bobplates/data-updates.lua +++ b/bobplates/data-updates.lua @@ -62,7 +62,7 @@ if settings.startup["bobmods-plates-cheapersteel"].value == true then { "iron-plate", 2 }, { type = "fluid", name = "oxygen", amount = 10 }, }, - result = "steel-plate", + results = {{ type = "item", name = "steel-plate", amount = 1 }}, allow_decomposition = false, }, }) @@ -88,8 +88,7 @@ else { "iron-plate", 5 }, { type = "fluid", name = "oxygen", amount = 50 }, }, - result = "steel-plate", - result_count = 2, + results = {{ type = "item", name = "steel-plate", amount = 2 }}, allow_decomposition = false, }, }) diff --git a/bobplates/prototypes/distillery.lua b/bobplates/prototypes/distillery.lua index fd70502e6..148a6ecaf 100644 --- a/bobplates/prototypes/distillery.lua +++ b/bobplates/prototypes/distillery.lua @@ -205,7 +205,7 @@ if settings.startup["bobmods-plates-purewater"].value == true then { "copper-plate", 3 }, { "pipe", 2 }, }, - result = "bob-distillery", + results = {{ type = "item", name = "bob-distillery", amount = 1 }}, }, { diff --git a/bobplates/prototypes/recipe/alien-recipe.lua b/bobplates/prototypes/recipe/alien-recipe.lua index 39127f412..15ee05ba7 100644 --- a/bobplates/prototypes/recipe/alien-recipe.lua +++ b/bobplates/prototypes/recipe/alien-recipe.lua @@ -17,8 +17,7 @@ then { type = "item", name = "alien-artifact-blue", amount = 1 }, { type = "item", name = "tungsten-plate", amount = 10 }, }, - result = "alien-blue-alloy", - result_count = 10, + results = {{ type = "item", name = "alien-blue-alloy", amount = 10 }}, crafting_machine_tint = { primary = { r = 0.0, g = 0.8, b = 0.0, a = 0.000 }, secondary = { r = 0.5, g = 1.0, b = 0.5, a = 0.000 }, @@ -36,8 +35,7 @@ then { type = "item", name = "alien-artifact-orange", amount = 1 }, { type = "item", name = "steel-plate", amount = 10 }, }, - result = "alien-orange-alloy", - result_count = 10, + results = {{ type = "item", name = "alien-orange-alloy", amount = 10 }}, crafting_machine_tint = { primary = { r = 0.8, g = 0.4, b = 0.0, a = 0.000 }, secondary = { r = 1.0, g = 0.6, b = 0.5, a = 0.000 }, diff --git a/bobplates/prototypes/recipe/alloy-recipe.lua b/bobplates/prototypes/recipe/alloy-recipe.lua index ae1c530c1..cd99588cc 100644 --- a/bobplates/prototypes/recipe/alloy-recipe.lua +++ b/bobplates/prototypes/recipe/alloy-recipe.lua @@ -132,8 +132,7 @@ data:extend({ { type = "item", name = "iron-plate", amount = 14 }, { type = "item", name = "cobalt-plate", amount = 1 }, }, - result = "cobalt-steel-alloy", - result_count = 10, + results = {{ type = "item", name = "cobalt-steel-alloy", amount = 10 }}, allow_decomposition = false, }, }) diff --git a/bobplates/prototypes/recipe/chemistry-recipe.lua b/bobplates/prototypes/recipe/chemistry-recipe.lua index 0336cc972..b2ee01b60 100644 --- a/bobplates/prototypes/recipe/chemistry-recipe.lua +++ b/bobplates/prototypes/recipe/chemistry-recipe.lua @@ -492,7 +492,7 @@ data:extend({ ingredients = { { type = "fluid", name = "water", amount = 25 }, }, - result = "salt", + results = {{ type = "item", name = "salt", amount = 1 }}, allow_decomposition = false, }, @@ -506,7 +506,7 @@ data:extend({ ingredients = { { type = "fluid", name = "lithia-water", amount = 25 }, }, - result = "lithium-chloride", + results = {{ type = "item", name = "lithium-chloride", amount = 1 }}, allow_decomposition = false, }, @@ -522,8 +522,7 @@ data:extend({ { type = "fluid", name = "sulfur-dioxide", amount = 50 }, { type = "fluid", name = "hydrogen", amount = 80 }, }, - result = "sulfur", - result_count = 5, + results = {{ type = "item", name = "sulfur", amount = 5 }}, crafting_machine_tint = { primary = { r = 1.000, g = 0.659, b = 0.000, a = 0.000 }, -- #ffa70000 secondary = { r = 0.812, g = 1.000, b = 0.000, a = 0.000 }, -- #cfff0000 @@ -544,7 +543,7 @@ data:extend({ { type = "item", name = "stone", amount = 1 }, { type = "fluid", name = "hydrogen-chloride", amount = 10 }, }, - result = "calcium-chloride", + results = {{ type = "item", name = "calcium-chloride", amount = 1 }}, crafting_machine_tint = { primary = { r = 0.5, g = 0.5, b = 0.4, a = 0.000 }, secondary = { r = 0.7, g = 0.5, b = 0.0, a = 0.000 }, @@ -563,7 +562,7 @@ data:extend({ { type = "item", name = "sodium-hydroxide", amount = 1 }, { type = "item", name = "bauxite-ore", amount = 1 }, }, - result = "alumina", + results = {{ type = "item", name = "alumina", amount = 1 }}, order = "f[alumina]", }, @@ -605,7 +604,7 @@ data:extend({ { "silver-plate", 1 }, { type = "fluid", name = "nitrogen-dioxide", amount = 10 }, }, - result = "silver-nitrate", + results = {{ type = "item", name = "silver-nitrate", amount = 1 }}, crafting_machine_tint = { primary = { r = 0.0, g = 0.0, b = 1.0, a = 0.000 }, secondary = { r = 0.7, g = 0.7, b = 0.7, a = 0.000 }, @@ -625,7 +624,7 @@ data:extend({ { "silver-nitrate", 1 }, { "sodium-hydroxide", 1 }, }, - result = "silver-oxide", + results = {{ type = "item", name = "silver-oxide", amount = 1 }}, crafting_machine_tint = { primary = { r = 0.3, g = 0.3, b = 0.3, a = 0.000 }, secondary = { r = 0.7, g = 0.7, b = 0.7, a = 0.000 }, @@ -643,7 +642,7 @@ data:extend({ ingredients = { { type = "fluid", name = "tungstic-acid", amount = 10 }, }, - result = "tungsten-oxide", + results = {{ type = "item", name = "tungsten-oxide", amount = 1 }}, }, { @@ -657,7 +656,7 @@ data:extend({ { type = "item", name = "tungsten-oxide", amount = 1 }, { type = "fluid", name = "hydrogen", amount = 15 }, }, - result = "powdered-tungsten", + results = {{ type = "item", name = "powdered-tungsten", amount = 1 }}, }, { @@ -671,8 +670,7 @@ data:extend({ { type = "item", name = "cobalt-ore", amount = 2 }, { type = "item", name = "stone", amount = 1 }, }, - result = "cobalt-oxide", - result_count = 2, + results = {{ type = "item", name = "cobalt-oxide", amount = 2 }}, }, { @@ -732,8 +730,7 @@ data:extend({ { type = "item", name = "silicon-powder", amount = 1 }, { type = "item", name = "carbon", amount = 1 }, }, - result = "silicon-carbide", - result_count = 2, + results = {{ type = "item", name = "silicon-carbide", amount = 2 }}, }, }) @@ -801,8 +798,7 @@ data:extend({ { type = "fluid", name = "hydrogen-sulfide", amount = 50 }, { type = "fluid", name = "oxygen", amount = 25 }, }, - result = "sulfur", - result_count = 5, + results = {{ type = "item", name = "sulfur", amount = 5 }}, crafting_machine_tint = { primary = { r = 1.000, g = 0.659, b = 0.000 }, secondary = { r = 1.0, g = 0.000, b = 0.000 }, diff --git a/bobplates/prototypes/recipe/electronics-recipe.lua b/bobplates/prototypes/recipe/electronics-recipe.lua index 7e26051d0..afeedbe6f 100644 --- a/bobplates/prototypes/recipe/electronics-recipe.lua +++ b/bobplates/prototypes/recipe/electronics-recipe.lua @@ -10,6 +10,6 @@ data:extend({ { "processing-unit", 2 }, { type = "fluid", name = "sulfuric-acid", amount = 20 }, }, - result = "advanced-processing-unit", + results = {{ type = "item", name = "advanced-processing-unit", amount = 1 }}, }, }) diff --git a/bobplates/prototypes/recipe/entity-recipe-updates.lua b/bobplates/prototypes/recipe/entity-recipe-updates.lua index 94db42f2b..ff7b70caf 100644 --- a/bobplates/prototypes/recipe/entity-recipe-updates.lua +++ b/bobplates/prototypes/recipe/entity-recipe-updates.lua @@ -36,10 +36,10 @@ if settings.startup["bobmods-plates-convert-recipes"].value == true then bobmods.lib.recipe.replace_ingredient("electric-chemical-furnace-from-electric-furnace", "pipe", "steel-pipe") bobmods.lib.recipe.remove_result("steel-furnace-from-steel-chemical-furnace", "pipe") - bobmods.lib.recipe.add_result("steel-furnace-from-steel-chemical-furnace", { "steel-pipe", 5 }) + bobmods.lib.recipe.add_result("steel-furnace-from-steel-chemical-furnace", { type = "item", name = "steel-pipe", amount = 5 }) bobmods.lib.recipe.remove_result("electric-furnace-from-electric-chemical-furnace", "pipe") - bobmods.lib.recipe.add_result("electric-furnace-from-electric-chemical-furnace", { "steel-pipe", 5 }) + bobmods.lib.recipe.add_result("electric-furnace-from-electric-chemical-furnace", { type = "item", name = "steel-pipe", amount = 5 }) end bobmods.lib.tech.add_recipe_unlock("chemical-processing-1", "stone-chemical-furnace-from-stone-furnace") diff --git a/bobplates/prototypes/recipe/entity-recipe.lua b/bobplates/prototypes/recipe/entity-recipe.lua index 3c6c7a0a7..69f6c9f91 100644 --- a/bobplates/prototypes/recipe/entity-recipe.lua +++ b/bobplates/prototypes/recipe/entity-recipe.lua @@ -10,7 +10,7 @@ data:extend({ { "electronic-circuit", 5 }, { "pipe", 2 }, }, - result = "electrolyser", + results = {{ type = "item", name = "electrolyser", amount = 1 }}, }, { @@ -21,7 +21,7 @@ data:extend({ ingredients = { { "stone", 5 }, }, - result = "stone-mixing-furnace", + results = {{ type = "item", name = "stone-mixing-furnace", amount = 1 }}, }, { @@ -33,7 +33,7 @@ data:extend({ { "stone", 5 }, { "pipe", 2 }, }, - result = "stone-chemical-furnace", + results = {{ type = "item", name = "stone-chemical-furnace", amount = 1 }}, }, { @@ -45,7 +45,7 @@ data:extend({ { "steel-plate", 6 }, { "stone-brick", 10 }, }, - result = "steel-mixing-furnace", + results = {{ type = "item", name = "steel-mixing-furnace", amount = 1 }}, }, { @@ -58,7 +58,7 @@ data:extend({ { "stone-brick", 10 }, { "pipe", 5 }, }, - result = "steel-chemical-furnace", + results = {{ type = "item", name = "steel-chemical-furnace", amount = 1 }}, }, { @@ -71,7 +71,7 @@ data:extend({ { "stone-brick", 10 }, { "advanced-circuit", 5 }, }, - result = "electric-mixing-furnace", + results = {{ type = "item", name = "electric-mixing-furnace", amount = 1 }}, }, { @@ -85,7 +85,7 @@ data:extend({ { "advanced-circuit", 5 }, { "pipe", 5 }, }, - result = "electric-chemical-furnace", + results = {{ type = "item", name = "electric-chemical-furnace", amount = 1 }}, }, { @@ -99,7 +99,7 @@ data:extend({ { "electronic-circuit", 2 }, { "pipe", 2 }, }, - result = "air-pump", + results = {{ type = "item", name = "air-pump", amount = 1 }}, }, { @@ -114,7 +114,7 @@ data:extend({ { "advanced-circuit", 3 }, { "pipe", 2 }, }, - result = "air-pump-2", + results = {{ type = "item", name = "air-pump-2", amount = 1 }}, }, { @@ -130,7 +130,7 @@ data:extend({ { "processing-unit", 3 }, { "pipe", 2 }, }, - result = "air-pump-3", + results = {{ type = "item", name = "air-pump-3", amount = 1 }}, }, { @@ -146,7 +146,7 @@ data:extend({ { "electric-engine-unit", 1 }, { "advanced-processing-unit", 3 }, }, - result = "air-pump-4", + results = {{ type = "item", name = "air-pump-4", amount = 1 }}, }, { @@ -160,7 +160,7 @@ data:extend({ { "electronic-circuit", 2 }, { "pipe", 2 }, }, - result = "water-pump", + results = {{ type = "item", name = "water-pump", amount = 1 }}, }, { @@ -175,7 +175,7 @@ data:extend({ { "advanced-circuit", 3 }, { "pipe", 2 }, }, - result = "water-pump-2", + results = {{ type = "item", name = "water-pump-2", amount = 1 }}, }, { @@ -191,7 +191,7 @@ data:extend({ { "processing-unit", 3 }, { "pipe", 2 }, }, - result = "water-pump-3", + results = {{ type = "item", name = "water-pump-3", amount = 1 }}, }, { @@ -207,7 +207,7 @@ data:extend({ { "electric-engine-unit", 1 }, { "advanced-processing-unit", 3 }, }, - result = "water-pump-4", + results = {{ type = "item", name = "water-pump-4", amount = 1 }}, }, { @@ -219,7 +219,7 @@ data:extend({ { "iron-plate", 3 }, { "pipe", 1 }, }, - result = "bob-small-inline-storage-tank", + results = {{ type = "item", name = "bob-small-inline-storage-tank", amount = 1 }}, }, { @@ -231,7 +231,7 @@ data:extend({ { "iron-plate", 3 }, { "pipe", 2 }, }, - result = "bob-small-storage-tank", + results = {{ type = "item", name = "bob-small-storage-tank", amount = 1 }}, }, { @@ -245,7 +245,7 @@ data:extend({ { "electronic-circuit", 2 }, { "pipe", 2 }, }, - result = "void-pump", + results = {{ type = "item", name = "void-pump", amount = 1 }}, }, }) @@ -261,7 +261,7 @@ if settings.startup["bobmods-plates-convert-recipes"].value == true then { "stone-furnace", 1 }, }, allow_as_intermediate = false, - result = "stone-mixing-furnace", + results = {{ type = "item", name = "stone-mixing-furnace", amount = 1 }}, }, { @@ -275,7 +275,7 @@ if settings.startup["bobmods-plates-convert-recipes"].value == true then { "pipe", 2 }, }, allow_as_intermediate = false, - result = "stone-chemical-furnace", + results = {{ type = "item", name = "stone-chemical-furnace", amount = 1 }}, }, { @@ -288,7 +288,7 @@ if settings.startup["bobmods-plates-convert-recipes"].value == true then { "steel-furnace", 1 }, }, allow_as_intermediate = false, - result = "steel-mixing-furnace", + results = {{ type = "item", name = "steel-mixing-furnace", amount = 1 }}, }, { @@ -302,7 +302,7 @@ if settings.startup["bobmods-plates-convert-recipes"].value == true then { "pipe", 5 }, }, allow_as_intermediate = false, - result = "steel-chemical-furnace", + results = {{ type = "item", name = "steel-chemical-furnace", amount = 1 }}, }, { @@ -315,7 +315,7 @@ if settings.startup["bobmods-plates-convert-recipes"].value == true then { "electric-furnace", 1 }, }, allow_as_intermediate = false, - result = "electric-mixing-furnace", + results = {{ type = "item", name = "electric-mixing-furnace", amount = 1 }}, }, { @@ -329,7 +329,7 @@ if settings.startup["bobmods-plates-convert-recipes"].value == true then { "pipe", 5 }, }, allow_as_intermediate = false, - result = "electric-chemical-furnace", + results = {{ type = "item", name = "electric-chemical-furnace", amount = 1 }}, }, { @@ -342,7 +342,7 @@ if settings.startup["bobmods-plates-convert-recipes"].value == true then { "stone-mixing-furnace", 1 }, }, allow_as_intermediate = false, - result = "stone-furnace", + results = {{ type = "item", name = "stone-furnace", amount = 1 }}, }, { @@ -372,7 +372,7 @@ if settings.startup["bobmods-plates-convert-recipes"].value == true then { "steel-mixing-furnace", 1 }, }, allow_as_intermediate = false, - result = "steel-furnace", + results = {{ type = "item", name = "steel-furnace", amount = 1 }}, }, { @@ -402,7 +402,7 @@ if settings.startup["bobmods-plates-convert-recipes"].value == true then { "electric-mixing-furnace", 1 }, }, allow_as_intermediate = false, - result = "electric-furnace", + results = {{ type = "item", name = "electric-furnace", amount = 1 }}, }, { diff --git a/bobplates/prototypes/recipe/gems-recipe.lua b/bobplates/prototypes/recipe/gems-recipe.lua index 13cbb1955..049a598cb 100644 --- a/bobplates/prototypes/recipe/gems-recipe.lua +++ b/bobplates/prototypes/recipe/gems-recipe.lua @@ -8,8 +8,7 @@ data:extend({ ingredients = { { "ruby-ore", 1 }, }, - result = "ruby-3", - result_count = 4, + results = {{ type = "item", name = "ruby-3", amount = 4 }}, }, { type = "recipe", @@ -20,8 +19,7 @@ data:extend({ ingredients = { { "sapphire-ore", 1 }, }, - result = "sapphire-3", - result_count = 4, + results = {{ type = "item", name = "sapphire-3", amount = 4 }}, }, { type = "recipe", @@ -32,8 +30,7 @@ data:extend({ ingredients = { { "emerald-ore", 1 }, }, - result = "emerald-3", - result_count = 4, + results = {{ type = "item", name = "emerald-3", amount = 4 }}, }, { type = "recipe", @@ -44,8 +41,7 @@ data:extend({ ingredients = { { "amethyst-ore", 1 }, }, - result = "amethyst-3", - result_count = 4, + results = {{ type = "item", name = "amethyst-3", amount = 4 }}, }, { type = "recipe", @@ -56,8 +52,7 @@ data:extend({ ingredients = { { "topaz-ore", 1 }, }, - result = "topaz-3", - result_count = 4, + results = {{ type = "item", name = "topaz-3", amount = 4 }}, }, { type = "recipe", @@ -68,8 +63,7 @@ data:extend({ ingredients = { { "diamond-ore", 1 }, }, - result = "diamond-3", - result_count = 4, + results = {{ type = "item", name = "diamond-3", amount = 4 }}, }, { @@ -83,7 +77,7 @@ data:extend({ { "grinding-wheel", 1 }, { type = "fluid", name = "water", amount = 10 }, }, - result = "ruby-4", + results = {{ type = "item", name = "ruby-4", amount = 1 }}, }, { type = "recipe", @@ -96,7 +90,7 @@ data:extend({ { "grinding-wheel", 1 }, { type = "fluid", name = "water", amount = 10 }, }, - result = "sapphire-4", + results = {{ type = "item", name = "sapphire-4", amount = 1 }}, }, { type = "recipe", @@ -109,7 +103,7 @@ data:extend({ { "grinding-wheel", 1 }, { type = "fluid", name = "water", amount = 10 }, }, - result = "emerald-4", + results = {{ type = "item", name = "emerald-4", amount = 1 }}, }, { type = "recipe", @@ -122,7 +116,7 @@ data:extend({ { "grinding-wheel", 1 }, { type = "fluid", name = "water", amount = 10 }, }, - result = "amethyst-4", + results = {{ type = "item", name = "amethyst-4", amount = 1 }}, }, { type = "recipe", @@ -135,7 +129,7 @@ data:extend({ { "grinding-wheel", 1 }, { type = "fluid", name = "water", amount = 10 }, }, - result = "topaz-4", + results = {{ type = "item", name = "topaz-4", amount = 1 }}, }, { type = "recipe", @@ -148,7 +142,7 @@ data:extend({ { "grinding-wheel", 1 }, { type = "fluid", name = "water", amount = 10 }, }, - result = "diamond-4", + results = {{ type = "item", name = "diamond-4", amount = 1 }}, }, { @@ -162,7 +156,7 @@ data:extend({ { "polishing-wheel", 1 }, { "polishing-compound", 1 }, }, - result = "ruby-5", + results = {{ type = "item", name = "ruby-5", amount = 1 }}, }, { type = "recipe", @@ -175,7 +169,7 @@ data:extend({ { "polishing-wheel", 1 }, { "polishing-compound", 1 }, }, - result = "sapphire-5", + results = {{ type = "item", name = "sapphire-5", amount = 1 }}, }, { type = "recipe", @@ -188,7 +182,7 @@ data:extend({ { "polishing-wheel", 1 }, { "polishing-compound", 1 }, }, - result = "emerald-5", + results = {{ type = "item", name = "emerald-5", amount = 1 }}, }, { type = "recipe", @@ -201,7 +195,7 @@ data:extend({ { "polishing-wheel", 1 }, { "polishing-compound", 1 }, }, - result = "amethyst-5", + results = {{ type = "item", name = "amethyst-5", amount = 1 }}, }, { type = "recipe", @@ -214,7 +208,7 @@ data:extend({ { "polishing-wheel", 1 }, { "polishing-compound", 1 }, }, - result = "topaz-5", + results = {{ type = "item", name = "topaz-5", amount = 1 }}, }, { type = "recipe", @@ -227,6 +221,6 @@ data:extend({ { "polishing-wheel", 1 }, { "polishing-compound", 1 }, }, - result = "diamond-5", + results = {{ type = "item", name = "diamond-5", amount = 1 }}, }, }) diff --git a/bobplates/prototypes/recipe/nuclear-recipe.lua b/bobplates/prototypes/recipe/nuclear-recipe.lua index 08a6d36b5..43b08ab77 100644 --- a/bobplates/prototypes/recipe/nuclear-recipe.lua +++ b/bobplates/prototypes/recipe/nuclear-recipe.lua @@ -62,7 +62,7 @@ if data.raw.item["thorium-ore"] then ingredients = { { "thorium-ore", 10 }, }, - result = "thorium-232", + results = {{ type = "item", name = "thorium-232", amount = 1 }}, crafting_machine_tint = { primary = { r = 1, g = 1, b = 0 }, secondary = { r = 1, g = 1, b = 0 }, @@ -79,8 +79,7 @@ if data.raw.item["thorium-ore"] then { "uranium-235", 1 }, { "thorium-232", 19 }, }, - result = "thorium-fuel-cell", - result_count = 10, + results = {{ type = "item", name = "thorium-fuel-cell", amount = 10 }}, }, }) @@ -97,8 +96,7 @@ if data.raw.item["thorium-ore"] then { type = "item", name = "plutonium-239", amount = 1 }, { type = "item", name = "thorium-232", amount = 19 }, }, - result = "thorium-plutonium-fuel-cell", - result_count = 10, + results = {{ type = "item", name = "thorium-plutonium-fuel-cell", amount = 10 }}, }, { type = "recipe", @@ -139,8 +137,7 @@ if data.raw.item["thorium-ore"] then { type = "item", name = "plutonium-239", amount = 2 }, { type = "item", name = "thorium-232", amount = 2 }, }, - result = "thorium-plutonium-fuel-cell", - result_count = 2, + results = {{ type = "item", name = "thorium-plutonium-fuel-cell", amount = 2 }}, }, { type = "recipe", @@ -159,7 +156,6 @@ if data.raw.item["thorium-ore"] then { type = "item", name = "thorium-232", amount = 3, catalyst_amount = 2 }, { type = "item", name = "plutonium-239", amount = 1, catalyst_amount = 1 }, { type = "item", name = "lead-plate", amount = 5, catalyst_amount = 5 }, - { type = "item", name = "plutonium-239", amount = 1, probability = 0.1 }, }, crafting_machine_tint = { @@ -184,8 +180,7 @@ if settings.startup["bobmods-plates-nuclearupdate"].value == true then { type = "item", name = "steel-plate", amount = 2 }, { type = "item", name = "lead-plate", amount = 5 }, }, - result = "empty-nuclear-fuel-cell", - result_count = 10, + results = {{ type = "item", name = "empty-nuclear-fuel-cell", amount = 10 }}, }, { @@ -198,8 +193,7 @@ if settings.startup["bobmods-plates-nuclearupdate"].value == true then { type = "item", name = "plutonium-239", amount = 1 }, { type = "item", name = "uranium-238", amount = 19 }, }, - result = "plutonium-fuel-cell", - result_count = 10, + results = {{ type = "item", name = "plutonium-fuel-cell", amount = 10 }}, }, { type = "recipe", @@ -241,8 +235,7 @@ if settings.startup["bobmods-plates-nuclearupdate"].value == true then { type = "item", name = "fusion-catalyst", amount = 1 }, { type = "fluid", name = "deuterium", amount = 190 }, }, - result = "deuterium-fuel-cell", - result_count = 10, + results = {{ type = "item", name = "deuterium-fuel-cell", amount = 10 }}, }, { type = "recipe", @@ -255,8 +248,7 @@ if settings.startup["bobmods-plates-nuclearupdate"].value == true then { type = "item", name = "fusion-catalyst", amount = 5 }, { type = "fluid", name = "deuterium", amount = 250 }, }, - result = "deuterium-fuel-cell-2", - result_count = 10, + results = {{ type = "item", name = "deuterium-fuel-cell-2", amount = 10 }}, }, { type = "recipe", @@ -296,8 +288,7 @@ else { "lead-plate", 10 }, { type = "fluid", name = "deuterium", amount = 200 }, }, - result = "deuterium-fuel-cell", - result_count = 10, + results = {{ type = "item", name = "deuterium-fuel-cell", amount = 10 }}, }, { type = "recipe", diff --git a/bobplates/prototypes/recipe/parts-recipe.lua b/bobplates/prototypes/recipe/parts-recipe.lua index 340651590..cce80b505 100644 --- a/bobplates/prototypes/recipe/parts-recipe.lua +++ b/bobplates/prototypes/recipe/parts-recipe.lua @@ -6,7 +6,7 @@ data:extend({ ingredients = { { "steel-plate", 1 }, }, - result = "steel-gear-wheel", + results = {{ type = "item", name = "steel-gear-wheel", amount = 1 }}, }, { @@ -16,8 +16,7 @@ data:extend({ ingredients = { { "steel-plate", 1 }, }, - result = "steel-bearing-ball", - result_count = 12, + results = {{ type = "item", name = "steel-bearing-ball", amount = 12 }}, }, { @@ -28,8 +27,7 @@ data:extend({ { "steel-plate", 1 }, { "steel-bearing-ball", 16 }, }, - result = "steel-bearing", - result_count = 2, + results = {{ type = "item", name = "steel-bearing", amount = 2 }}, }, { @@ -39,7 +37,7 @@ data:extend({ ingredients = { { "brass-alloy", 1 }, }, - result = "brass-gear-wheel", + results = {{ type = "item", name = "brass-gear-wheel", amount = 1 }}, }, { @@ -49,7 +47,7 @@ data:extend({ ingredients = { { "cobalt-steel-alloy", 1 }, }, - result = "cobalt-steel-gear-wheel", + results = {{ type = "item", name = "cobalt-steel-gear-wheel", amount = 1 }}, }, { @@ -59,8 +57,7 @@ data:extend({ ingredients = { { "cobalt-steel-alloy", 1 }, }, - result = "cobalt-steel-bearing-ball", - result_count = 12, + results = {{ type = "item", name = "cobalt-steel-bearing-ball", amount = 12 }}, }, { @@ -71,8 +68,7 @@ data:extend({ { "cobalt-steel-alloy", 1 }, { "cobalt-steel-bearing-ball", 16 }, }, - result = "cobalt-steel-bearing", - result_count = 2, + results = {{ type = "item", name = "cobalt-steel-bearing", amount = 2 }}, }, { @@ -82,7 +78,7 @@ data:extend({ ingredients = { { "titanium-plate", 1 }, }, - result = "titanium-gear-wheel", + results = {{ type = "item", name = "titanium-gear-wheel", amount = 1 }}, }, { @@ -92,8 +88,7 @@ data:extend({ ingredients = { { "titanium-plate", 1 }, }, - result = "titanium-bearing-ball", - result_count = 12, + results = {{ type = "item", name = "titanium-bearing-ball", amount = 12 }}, }, { @@ -106,8 +101,7 @@ data:extend({ { "titanium-bearing-ball", 16 }, { type = "fluid", name = "lubricant", amount = 10 }, }, - result = "titanium-bearing", - result_count = 2, + results = {{ type = "item", name = "titanium-bearing", amount = 2 }}, }, { @@ -117,7 +111,7 @@ data:extend({ ingredients = { { "tungsten-plate", 1 }, }, - result = "tungsten-gear-wheel", + results = {{ type = "item", name = "tungsten-gear-wheel", amount = 1 }}, }, { @@ -127,7 +121,7 @@ data:extend({ ingredients = { { "nitinol-alloy", 1 }, }, - result = "nitinol-gear-wheel", + results = {{ type = "item", name = "nitinol-gear-wheel", amount = 1 }}, }, { @@ -137,8 +131,7 @@ data:extend({ ingredients = { { "nitinol-alloy", 1 }, }, - result = "nitinol-bearing-ball", - result_count = 12, + results = {{ type = "item", name = "nitinol-bearing-ball", amount = 12 }}, }, { @@ -151,8 +144,7 @@ data:extend({ { "nitinol-bearing-ball", 16 }, { type = "fluid", name = "lubricant", amount = 10 }, }, - result = "nitinol-bearing", - result_count = 2, + results = {{ type = "item", name = "nitinol-bearing", amount = 2 }}, }, { @@ -162,8 +154,7 @@ data:extend({ ingredients = { { "silicon-nitride", 1 }, }, - result = "ceramic-bearing-ball", - result_count = 12, + results = {{ type = "item", name = "ceramic-bearing-ball", amount = 12 }}, }, { @@ -176,8 +167,7 @@ data:extend({ { "ceramic-bearing-ball", 16 }, { type = "fluid", name = "lubricant", amount = 10 }, }, - result = "ceramic-bearing", - result_count = 2, + results = {{ type = "item", name = "ceramic-bearing", amount = 2 }}, }, { @@ -192,7 +182,7 @@ data:extend({ { "carbon", 1 }, { "plastic-bar", 1 }, }, - result = "lithium-ion-battery", + results = {{ type = "item", name = "lithium-ion-battery", amount = 1 }}, crafting_machine_tint = { primary = { r = 0.1, g = 1.0, b = 0.8, a = 1.000 }, secondary = { r = 0.2, g = 0.6, b = 0.9, a = 1.000 }, @@ -213,7 +203,7 @@ data:extend({ { "zinc-plate", 1 }, { "plastic-bar", 1 }, }, - result = "silver-zinc-battery", + results = {{ type = "item", name = "silver-zinc-battery", amount = 1 }}, crafting_machine_tint = { primary = { r = 0.1, g = 1.0, b = 0.1, a = 1.000 }, secondary = { r = 0.8, g = 0.8, b = 0.8, a = 1.000 }, @@ -232,8 +222,7 @@ data:extend({ { "steel-plate", 1 }, { "silicon-carbide", 5 }, }, - result = "grinding-wheel", - result_count = 2, + results = {{ type = "item", name = "grinding-wheel", amount = 2 }}, }, { @@ -246,7 +235,6 @@ data:extend({ { "steel-plate", 1 }, { "wood", 5 }, }, - result = "polishing-wheel", - result_count = 2, + results = {{ type = "item", name = "polishing-wheel", amount = 2 }}, }, }) diff --git a/bobplates/prototypes/recipe/plates-recipe.lua b/bobplates/prototypes/recipe/plates-recipe.lua index e108f5c05..77550d255 100644 --- a/bobplates/prototypes/recipe/plates-recipe.lua +++ b/bobplates/prototypes/recipe/plates-recipe.lua @@ -6,7 +6,7 @@ data:extend({ subgroup = "bob-material-smelting", energy_required = 3.2, ingredients = { { "lead-ore", 1 } }, - result = "lead-plate", + results = {{ type = "item", name = "lead-plate", amount = 1 }}, allow_decomposition = false, }, @@ -17,7 +17,7 @@ data:extend({ subgroup = "bob-material-smelting", energy_required = 3.2, ingredients = { { "silver-ore", 1 } }, - result = "silver-plate", + results = {{ type = "item", name = "silver-plate", amount = 1 }}, allow_decomposition = false, }, @@ -28,7 +28,7 @@ data:extend({ subgroup = "bob-material-smelting", energy_required = 3.2, ingredients = { { "tin-ore", 1 } }, - result = "tin-plate", + results = {{ type = "item", name = "tin-plate", amount = 1 }}, allow_decomposition = false, }, @@ -43,8 +43,7 @@ data:extend({ { "lead-oxide", 2 }, { "carbon", 1 }, }, - result = "lead-plate", - result_count = 2, + results = {{ type = "item", name = "lead-plate", amount = 2 }}, allow_decomposition = false, }, @@ -59,7 +58,7 @@ data:extend({ { type = "item", name = "gold-ore", amount = 1 }, { type = "fluid", name = "chlorine", amount = 3 }, }, - result = "gold-plate", + results = {{ type = "item", name = "gold-plate", amount = 1 }}, allow_decomposition = false, }, @@ -74,7 +73,7 @@ data:extend({ { type = "item", name = "cobalt-oxide", amount = 1 }, { type = "fluid", name = "sulfuric-acid", amount = 10 }, }, - result = "cobalt-plate", + results = {{ type = "item", name = "cobalt-plate", amount = 1 }}, allow_decomposition = false, }, @@ -89,8 +88,7 @@ data:extend({ { type = "item", name = "nickel-plate", amount = 1 }, { type = "item", name = "powdered-tungsten", amount = 4 }, }, - result = "tungsten-plate", - result_count = 5, + results = {{ type = "item", name = "tungsten-plate", amount = 5 }}, allow_decomposition = false, }, @@ -105,7 +103,7 @@ data:extend({ { type = "item", name = "zinc-ore", amount = 1 }, { type = "fluid", name = "sulfuric-acid", amount = 10 }, }, - result = "zinc-plate", + results = {{ type = "item", name = "zinc-plate", amount = 1 }}, allow_decomposition = false, }, @@ -142,8 +140,7 @@ data:extend({ { "alumina", 2 }, { "carbon", 1 }, }, - result = "aluminium-plate", - result_count = 2, + results = {{ type = "item", name = "aluminium-plate", amount = 2 }}, allow_decomposition = false, }, @@ -159,8 +156,7 @@ data:extend({ { type = "item", name = "carbon", amount = 1 }, { type = "item", name = "rutile-ore", amount = 2 }, }, - result = "titanium-plate", - result_count = 2, + results = {{ type = "item", name = "titanium-plate", amount = 2 }}, allow_decomposition = false, }, @@ -176,8 +172,7 @@ data:extend({ { type = "item", name = "carbon", amount = 1 }, { type = "item", name = "quartz", amount = 2 }, }, - result = "silicon", - result_count = 2, + results = {{ type = "item", name = "silicon", amount = 2 }}, allow_decomposition = false, }, @@ -191,7 +186,7 @@ data:extend({ ingredients = { { "lithium-chloride", 1 }, }, - result = "lithium", + results = {{ type = "item", name = "lithium", amount = 1 }}, allow_decomposition = false, }, }) diff --git a/bobplates/prototypes/recipe/resource-recipe.lua b/bobplates/prototypes/recipe/resource-recipe.lua index b21605b55..58ea5b3a8 100644 --- a/bobplates/prototypes/recipe/resource-recipe.lua +++ b/bobplates/prototypes/recipe/resource-recipe.lua @@ -10,8 +10,7 @@ data:extend({ { type = "fluid", name = "water", amount = 5 }, { type = "item", name = "coal", amount = 1 }, }, - result = "carbon", - result_count = 2, + results = {{ type = "item", name = "carbon", amount = 2 }}, allow_decomposition = false, }, @@ -24,7 +23,7 @@ data:extend({ ingredients = { { "wood", 1 }, }, - result = "resin", + results = {{ type = "item", name = "resin", amount = 1 }}, allow_decomposition = false, }, @@ -38,8 +37,7 @@ data:extend({ ingredients = { { type = "fluid", name = "heavy-oil", amount = 10 }, }, - result = "resin", - result_count = 2, + results = {{ type = "item", name = "resin", amount = 2 }}, crafting_machine_tint = { primary = { r = 0.5, g = 0.04, b = 0.0, a = 0.000 }, secondary = { r = 0.85, g = 0.6, b = 0.3, a = 0.000 }, @@ -58,7 +56,7 @@ data:extend({ ingredients = { { "resin", 1 }, }, - result = "rubber", + results = {{ type = "item", name = "rubber", amount = 1 }}, allow_decomposition = false, }, @@ -71,7 +69,7 @@ data:extend({ ingredients = { { "quartz", 1 }, }, - result = "glass", + results = {{ type = "item", name = "glass", amount = 1 }}, allow_decomposition = false, }, @@ -84,8 +82,7 @@ data:extend({ ingredients = { { "silicon", 1 }, }, - result = "silicon-wafer", - result_count = 8, + results = {{ type = "item", name = "silicon-wafer", amount = 8 }}, }, { @@ -98,7 +95,7 @@ data:extend({ ingredients = { { "silicon", 1 }, }, - result = "silicon-powder", + results = {{ type = "item", name = "silicon-powder", amount = 1 }}, }, { @@ -112,7 +109,7 @@ data:extend({ { "silicon-powder", 1 }, { type = "fluid", name = "nitrogen", amount = 12.5 }, }, - result = "silicon-nitride", + results = {{ type = "item", name = "silicon-nitride", amount = 1 }}, allow_decomposition = false, }, @@ -127,8 +124,7 @@ data:extend({ { "lithium", 1 }, { "cobalt-oxide", 1 }, }, - result = "lithium-cobalt-oxide", - result_count = 2, + results = {{ type = "item", name = "lithium-cobalt-oxide", amount = 2 }}, }, { @@ -144,8 +140,7 @@ data:extend({ ingredients = { { type = "fluid", name = "heavy-oil", amount = 10 }, }, - result = "wood", - result_count = 2, + results = {{ type = "item", name = "wood", amount = 2 }}, crafting_machine_tint = { primary = { r = 0.5, g = 0.04, b = 0.0, a = 0.000 }, secondary = { r = 0.85, g = 0.6, b = 0.3, a = 0.000 }, @@ -164,8 +159,7 @@ data:extend({ ingredients = { { "steel-plate", 1 }, }, - result = "gas-canister", - result_count = 5, + results = {{ type = "item", name = "gas-canister", amount = 5 }}, }, { @@ -179,8 +173,7 @@ data:extend({ { "iron-plate", 1 }, { "plastic-bar", 1 }, }, - result = "empty-canister", - result_count = 5, + results = {{ type = "item", name = "empty-canister", amount = 5 }}, }, { @@ -194,8 +187,7 @@ data:extend({ { type = "item", name = "alumina", amount = 1 }, { type = "fluid", name = "light-oil", amount = 15 }, }, - result = "polishing-compound", - result_count = 2, + results = {{ type = "item", name = "polishing-compound", amount = 2 }}, crafting_machine_tint = { primary = { r = 0.57, g = 0.33, b = 0.0, a = 0.000 }, secondary = { r = 1, g = 0.73, b = 0.07, a = 0.000 }, @@ -211,7 +203,7 @@ data:extend({ ingredients = { { "wood", 2 }, }, - result = "coal", + results = {{ type = "item", name = "coal", amount = 1 }}, allow_decomposition = false, }, @@ -250,7 +242,7 @@ data:extend({ ingredients = { { type = "fluid", name = "liquid-fuel", amount = 20 }, }, - result = "enriched-fuel", + results = {{ type = "item", name = "enriched-fuel", amount = 1 }}, subgroup = "bob-resource-chemical", order = "d[enriched-fuel]", crafting_machine_tint = { diff --git a/bobpower/prototypes/burner-generator.lua b/bobpower/prototypes/burner-generator.lua index 16e524900..7cef1077a 100644 --- a/bobpower/prototypes/burner-generator.lua +++ b/bobpower/prototypes/burner-generator.lua @@ -19,7 +19,7 @@ if settings.startup["bobmods-power-burnergenerator"].value == true then { "iron-plate", 8 }, { "iron-gear-wheel", 5 }, }, - result = "bob-burner-generator", + results = {{ type = "item", name = "bob-burner-generator", amount = 1 }}, }, { diff --git a/bobpower/prototypes/burner-reactor.lua b/bobpower/prototypes/burner-reactor.lua index 7a65abe20..0f867c8ab 100644 --- a/bobpower/prototypes/burner-reactor.lua +++ b/bobpower/prototypes/burner-reactor.lua @@ -74,7 +74,7 @@ if settings.startup["bobmods-power-heatsources"].value == true then { "heat-pipe", 8 }, { "steel-plate", 6 }, }, - result = "burner-reactor", + results = {{ type = "item", name = "burner-reactor", amount = 1 }}, }, { type = "reactor", @@ -201,7 +201,7 @@ if settings.startup["bobmods-power-heatsources"].value == true then { "steel-plate", 6 }, { "concrete", 10 }, }, - result = "burner-reactor-2", + results = {{ type = "item", name = "burner-reactor-2", amount = 1 }}, }, util.merge({ data.raw.reactor["burner-reactor"], @@ -244,7 +244,7 @@ if settings.startup["bobmods-power-heatsources"].value == true then { "burner-reactor", 1 }, { "pipe", 5 }, }, - result = "fluid-reactor", + results = {{ type = "item", name = "fluid-reactor", amount = 1 }}, }, util.merge({ data.raw.reactor["burner-reactor"], @@ -280,7 +280,7 @@ if settings.startup["bobmods-power-heatsources"].value == true then { "concrete", 10 }, { "pipe", 5 }, }, - result = "fluid-reactor-2", + results = {{ type = "item", name = "fluid-reactor-2", amount = 1 }}, }, util.merge({ data.raw.reactor["burner-reactor-2"], @@ -410,7 +410,7 @@ if settings.startup["bobmods-power-heatsources"].value == true then { "steel-plate", 6 }, { "pipe", 3 }, }, - result = "fluid-reactor", + results = {{ type = "item", name = "fluid-reactor", amount = 1 }}, }, }) diff --git a/bobpower/prototypes/heat-pipes.lua b/bobpower/prototypes/heat-pipes.lua index 4bc463e9b..7cfac5d31 100644 --- a/bobpower/prototypes/heat-pipes.lua +++ b/bobpower/prototypes/heat-pipes.lua @@ -52,7 +52,7 @@ then { "steel-plate", 5 }, { "copper-plate", 10 }, }, - result = "heat-pipe-2", + results = {{ type = "item", name = "heat-pipe-2", amount = 1 }}, }, { type = "recipe", @@ -63,7 +63,7 @@ then { "steel-plate", 5 }, { "copper-plate", 10 }, }, - result = "heat-pipe-3", + results = {{ type = "item", name = "heat-pipe-3", amount = 1 }}, }, { type = "recipe", @@ -74,7 +74,7 @@ then { "steel-plate", 5 }, { "copper-plate", 10 }, }, - result = "heat-pipe-4", + results = {{ type = "item", name = "heat-pipe-4", amount = 1 }}, }, util.merge({ diff --git a/bobpower/prototypes/recipe/accumulators.lua b/bobpower/prototypes/recipe/accumulators.lua index 2277439c4..40d90ddc1 100644 --- a/bobpower/prototypes/recipe/accumulators.lua +++ b/bobpower/prototypes/recipe/accumulators.lua @@ -10,7 +10,7 @@ if settings.startup["bobmods-power-accumulators"].value == true then { "electronic-circuit", 4 }, { "battery", 4 }, }, - result = "fast-accumulator", + results = {{ type = "item", name = "fast-accumulator", amount = 1 }}, }, { @@ -23,7 +23,7 @@ if settings.startup["bobmods-power-accumulators"].value == true then { "electronic-circuit", 4 }, { "battery", 4 }, }, - result = "slow-accumulator", + results = {{ type = "item", name = "slow-accumulator", amount = 1 }}, }, { @@ -37,7 +37,7 @@ if settings.startup["bobmods-power-accumulators"].value == true then { "advanced-circuit", 2 }, { "battery", 10 }, }, - result = "large-accumulator-2", + results = {{ type = "item", name = "large-accumulator-2", amount = 1 }}, }, { @@ -51,7 +51,7 @@ if settings.startup["bobmods-power-accumulators"].value == true then { "advanced-circuit", 4 }, { "battery", 4 }, }, - result = "fast-accumulator-2", + results = {{ type = "item", name = "fast-accumulator-2", amount = 1 }}, }, { @@ -65,7 +65,7 @@ if settings.startup["bobmods-power-accumulators"].value == true then { "advanced-circuit", 4 }, { "battery", 4 }, }, - result = "slow-accumulator-2", + results = {{ type = "item", name = "slow-accumulator-2", amount = 1 }}, }, { @@ -79,7 +79,7 @@ if settings.startup["bobmods-power-accumulators"].value == true then { "processing-unit", 2 }, { "battery", 10 }, }, - result = "large-accumulator-3", + results = {{ type = "item", name = "large-accumulator-3", amount = 1 }}, }, { @@ -93,7 +93,7 @@ if settings.startup["bobmods-power-accumulators"].value == true then { "processing-unit", 4 }, { "battery", 4 }, }, - result = "fast-accumulator-3", + results = {{ type = "item", name = "fast-accumulator-3", amount = 1 }}, }, { @@ -107,7 +107,7 @@ if settings.startup["bobmods-power-accumulators"].value == true then { "processing-unit", 4 }, { "battery", 4 }, }, - result = "slow-accumulator-3", + results = {{ type = "item", name = "slow-accumulator-3", amount = 1 }}, }, }) end diff --git a/bobpower/prototypes/recipe/boilers.lua b/bobpower/prototypes/recipe/boilers.lua index 8ef2b6d15..a22c41b9c 100644 --- a/bobpower/prototypes/recipe/boilers.lua +++ b/bobpower/prototypes/recipe/boilers.lua @@ -8,7 +8,7 @@ if settings.startup["bobmods-power-steam"].value == true then { "boiler", 1 }, { "steel-plate", 5 }, }, - result = "boiler-2", + results = {{ type = "item", name = "boiler-2", amount = 1 }}, }, { @@ -19,7 +19,7 @@ if settings.startup["bobmods-power-steam"].value == true then { "boiler-2", 1 }, { "steel-plate", 5 }, }, - result = "boiler-3", + results = {{ type = "item", name = "boiler-3", amount = 1 }}, }, { @@ -30,7 +30,7 @@ if settings.startup["bobmods-power-steam"].value == true then { "boiler-3", 1 }, { "steel-plate", 5 }, }, - result = "boiler-4", + results = {{ type = "item", name = "boiler-4", amount = 1 }}, }, { @@ -41,7 +41,7 @@ if settings.startup["bobmods-power-steam"].value == true then { "boiler-4", 1 }, { "steel-plate", 5 }, }, - result = "boiler-5", + results = {{ type = "item", name = "boiler-5", amount = 1 }}, }, }) end diff --git a/bobpower/prototypes/recipe/fluid-generator.lua b/bobpower/prototypes/recipe/fluid-generator.lua index 01b75bdee..3a459df4c 100644 --- a/bobpower/prototypes/recipe/fluid-generator.lua +++ b/bobpower/prototypes/recipe/fluid-generator.lua @@ -11,7 +11,7 @@ if settings.startup["bobmods-power-fluidgenerator"].value == true then { "steel-plate", 10 }, { "pipe", 5 }, }, - result = "fluid-generator", + results = {{ type = "item", name = "fluid-generator", amount = 1 }}, }, { @@ -26,7 +26,7 @@ if settings.startup["bobmods-power-fluidgenerator"].value == true then { "iron-gear-wheel", 10 }, { "electronic-circuit", 5 }, }, - result = "fluid-generator-2", + results = {{ type = "item", name = "fluid-generator-2", amount = 1 }}, }, { @@ -41,7 +41,7 @@ if settings.startup["bobmods-power-fluidgenerator"].value == true then { "steel-plate", 10 }, { "iron-gear-wheel", 10 }, }, - result = "fluid-generator-3", + results = {{ type = "item", name = "fluid-generator-3", amount = 1 }}, }, }) @@ -59,7 +59,7 @@ if settings.startup["bobmods-power-fluidgenerator"].value == true then { "steel-plate", 10 }, { "iron-gear-wheel", 10 }, }, - result = "hydrazine-generator", + results = {{ type = "item", name = "hydrazine-generator", amount = 1 }}, }, }) end diff --git a/bobpower/prototypes/recipe/heat-exchangers.lua b/bobpower/prototypes/recipe/heat-exchangers.lua index 467fa9d04..6cc1970b6 100644 --- a/bobpower/prototypes/recipe/heat-exchangers.lua +++ b/bobpower/prototypes/recipe/heat-exchangers.lua @@ -9,7 +9,7 @@ if settings.startup["bobmods-power-steam"].value == true then { "boiler-2", 1 }, { "heat-pipe", 4 }, }, - result = "heat-exchanger", + results = {{ type = "item", name = "heat-exchanger", amount = 1 }}, }, { @@ -21,7 +21,7 @@ if settings.startup["bobmods-power-steam"].value == true then { "steel-plate", 10 }, { "heat-pipe-2", 4 }, }, - result = "heat-exchanger-2", + results = {{ type = "item", name = "heat-exchanger-2", amount = 1 }}, }, { @@ -33,7 +33,7 @@ if settings.startup["bobmods-power-steam"].value == true then { "steel-plate", 10 }, { "heat-pipe-3", 4 }, }, - result = "heat-exchanger-3", + results = {{ type = "item", name = "heat-exchanger-3", amount = 1 }}, }, { type = "recipe", @@ -44,7 +44,7 @@ if settings.startup["bobmods-power-steam"].value == true then { "steel-plate", 10 }, { "heat-pipe-4", 4 }, }, - result = "heat-exchanger-4", + results = {{ type = "item", name = "heat-exchanger-4", amount = 1 }}, }, }) @@ -62,7 +62,7 @@ if settings.startup["bobmods-power-steam"].value == true then { "boiler-3", 1 }, { "heat-pipe-2", 4 }, }, - result = "heat-exchanger-2", + results = {{ type = "item", name = "heat-exchanger-2", amount = 1 }}, allow_as_intermediate = false, }, { @@ -74,7 +74,7 @@ if settings.startup["bobmods-power-steam"].value == true then { "boiler-4", 1 }, { "heat-pipe-3", 4 }, }, - result = "heat-exchanger-3", + results = {{ type = "item", name = "heat-exchanger-3", amount = 1 }}, allow_as_intermediate = false, }, @@ -87,7 +87,7 @@ if settings.startup["bobmods-power-steam"].value == true then { "boiler-5", 1 }, { "heat-pipe-4", 4 }, }, - result = "heat-exchanger-4", + results = {{ type = "item", name = "heat-exchanger-4", amount = 1 }}, allow_as_intermediate = false, }, }) diff --git a/bobpower/prototypes/recipe/nuclear.lua b/bobpower/prototypes/recipe/nuclear.lua index b0a9c093b..c269d7010 100644 --- a/bobpower/prototypes/recipe/nuclear.lua +++ b/bobpower/prototypes/recipe/nuclear.lua @@ -12,7 +12,7 @@ if settings.startup["bobmods-power-nuclear"].value == true then { "processing-unit", 500 }, { "copper-plate", 500 }, }, - result = "nuclear-reactor-2", + results = {{ type = "item", name = "nuclear-reactor-2", amount = 1 }}, requester_paste_multiplier = 1, }, { @@ -27,7 +27,7 @@ if settings.startup["bobmods-power-nuclear"].value == true then { "processing-unit", 500 }, { "copper-plate", 500 }, }, - result = "nuclear-reactor-3", + 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 746cdb9a8..b564fec94 100644 --- a/bobpower/prototypes/recipe/oil-boilers-updates.lua +++ b/bobpower/prototypes/recipe/oil-boilers-updates.lua @@ -40,33 +40,33 @@ if settings.startup["bobmods-power-steam"].value == true then then if data.raw.item["steel-pipe"] then bobmods.lib.recipe.remove_result("boiler-2-from-oil-boiler", "pipe") - bobmods.lib.recipe.add_result("boiler-2-from-oil-boiler", { "steel-pipe", 2 }) + bobmods.lib.recipe.add_result("boiler-2-from-oil-boiler", { type = "item", name = "steel-pipe", amount = 2 }) end if data.raw.item["brass-pipe"] then bobmods.lib.recipe.replace_ingredient("oil-boiler-2-from-boiler-3", "pipe", "brass-pipe") bobmods.lib.recipe.remove_result("boiler-3-from-oil-boiler-2", "pipe") - bobmods.lib.recipe.add_result("boiler-3-from-oil-boiler-2", { "brass-pipe", 2 }) + bobmods.lib.recipe.add_result("boiler-3-from-oil-boiler-2", { type = "item", name = "brass-pipe", amount = 2 }) end if data.raw.item["ceramic-pipe"] then bobmods.lib.recipe.replace_ingredient("oil-boiler-3-from-boiler-4", "pipe", "ceramic-pipe") bobmods.lib.recipe.remove_result("boiler-4-from-oil-boiler-3", "pipe") - bobmods.lib.recipe.add_result("boiler-4-from-oil-boiler-3", { "ceramic-pipe", 2 }) + bobmods.lib.recipe.add_result("boiler-4-from-oil-boiler-3", { type = "item", name = "ceramic-pipe", amount = 2 }) end if data.raw.item["copper-tungsten-pipe"] then bobmods.lib.recipe.replace_ingredient("oil-boiler-4-from-boiler-5", "pipe", "copper-tungsten-pipe") bobmods.lib.recipe.remove_result("boiler-5-from-oil-boiler-4", "pipe") - bobmods.lib.recipe.add_result("boiler-5-from-oil-boiler-4", { "copper-tungsten-pipe", 2 }) + bobmods.lib.recipe.add_result("boiler-5-from-oil-boiler-4", { type = "item", name = "copper-tungsten-pipe", amount = 2 }) elseif data.raw.item["tungsten-pipe"] then bobmods.lib.recipe.replace_ingredient("oil-boiler-4-from-boiler-5", "pipe", "tungsten-pipe") bobmods.lib.recipe.remove_result("boiler-5-from-oil-boiler-4", "pipe") - bobmods.lib.recipe.add_result("boiler-5-from-oil-boiler-4", { "tungsten-pipe", 2 }) + bobmods.lib.recipe.add_result("boiler-5-from-oil-boiler-4", { type = "item", name = "tungsten-pipe", amount = 2 }) end bobmods.lib.tech.add_recipe_unlock("bob-oil-boiler-2", "oil-boiler-2-from-boiler-3") bobmods.lib.tech.add_recipe_unlock("bob-oil-boiler-3", "oil-boiler-3-from-boiler-4") diff --git a/bobpower/prototypes/recipe/oil-boilers.lua b/bobpower/prototypes/recipe/oil-boilers.lua index 4a8375364..6beea3cd1 100644 --- a/bobpower/prototypes/recipe/oil-boilers.lua +++ b/bobpower/prototypes/recipe/oil-boilers.lua @@ -8,7 +8,7 @@ if settings.startup["bobmods-power-steam"].value == true then { "boiler-2", 1 }, { "pipe", 2 }, }, - result = "oil-boiler", + results = {{ type = "item", name = "oil-boiler", amount = 1 }}, }, { @@ -19,7 +19,7 @@ if settings.startup["bobmods-power-steam"].value == true then { "oil-boiler", 1 }, { "steel-plate", 5 }, }, - result = "oil-boiler-2", + results = {{ type = "item", name = "oil-boiler-2", amount = 1 }}, }, { @@ -30,7 +30,7 @@ if settings.startup["bobmods-power-steam"].value == true then { "oil-boiler-2", 1 }, { "steel-plate", 5 }, }, - result = "oil-boiler-3", + results = {{ type = "item", name = "oil-boiler-3", amount = 1 }}, }, { @@ -41,7 +41,7 @@ if settings.startup["bobmods-power-steam"].value == true then { "oil-boiler-3", 1 }, { "steel-plate", 5 }, }, - result = "oil-boiler-4", + results = {{ type = "item", name = "oil-boiler-4", amount = 1 }}, }, }) @@ -59,7 +59,7 @@ if settings.startup["bobmods-power-steam"].value == true then { "boiler-3", 1 }, { "pipe", 2 }, }, - result = "oil-boiler-2", + results = {{ type = "item", name = "oil-boiler-2", amount = 1 }}, allow_as_intermediate = false, }, @@ -72,7 +72,7 @@ if settings.startup["bobmods-power-steam"].value == true then { "boiler-4", 1 }, { "pipe", 2 }, }, - result = "oil-boiler-3", + results = {{ type = "item", name = "oil-boiler-3", amount = 1 }}, allow_as_intermediate = false, }, @@ -85,7 +85,7 @@ if settings.startup["bobmods-power-steam"].value == true then { "boiler-5", 1 }, { "pipe", 2 }, }, - result = "oil-boiler-4", + results = {{ type = "item", name = "oil-boiler-4", amount = 1 }}, allow_as_intermediate = false, }, }) diff --git a/bobpower/prototypes/recipe/poles.lua b/bobpower/prototypes/recipe/poles.lua index 0ac7f6a95..28bd0c686 100644 --- a/bobpower/prototypes/recipe/poles.lua +++ b/bobpower/prototypes/recipe/poles.lua @@ -9,7 +9,7 @@ if settings.startup["bobmods-power-poles"].value == true then { "steel-plate", 2 }, { "copper-plate", 2 }, }, - result = "medium-electric-pole-2", + results = {{ type = "item", name = "medium-electric-pole-2", amount = 1 }}, }, { @@ -21,7 +21,7 @@ if settings.startup["bobmods-power-poles"].value == true then { "steel-plate", 2 }, { "copper-plate", 2 }, }, - result = "medium-electric-pole-3", + results = {{ type = "item", name = "medium-electric-pole-3", amount = 1 }}, }, { @@ -33,7 +33,7 @@ if settings.startup["bobmods-power-poles"].value == true then { "steel-plate", 2 }, { "copper-plate", 2 }, }, - result = "medium-electric-pole-4", + results = {{ type = "item", name = "medium-electric-pole-4", amount = 1 }}, }, { @@ -45,7 +45,7 @@ if settings.startup["bobmods-power-poles"].value == true then { "steel-plate", 5 }, { "copper-plate", 5 }, }, - result = "big-electric-pole-2", + results = {{ type = "item", name = "big-electric-pole-2", amount = 1 }}, }, { @@ -57,7 +57,7 @@ if settings.startup["bobmods-power-poles"].value == true then { "steel-plate", 5 }, { "copper-plate", 5 }, }, - result = "big-electric-pole-3", + results = {{ type = "item", name = "big-electric-pole-3", amount = 1 }}, }, { @@ -69,7 +69,7 @@ if settings.startup["bobmods-power-poles"].value == true then { "steel-plate", 5 }, { "copper-plate", 5 }, }, - result = "big-electric-pole-4", + results = {{ type = "item", name = "big-electric-pole-4", amount = 1 }}, }, { @@ -82,7 +82,7 @@ if settings.startup["bobmods-power-poles"].value == true then { "steel-plate", 10 }, { "copper-plate", 5 }, }, - result = "substation-2", + results = {{ type = "item", name = "substation-2", amount = 1 }}, }, { @@ -95,7 +95,7 @@ if settings.startup["bobmods-power-poles"].value == true then { "steel-plate", 10 }, { "copper-plate", 5 }, }, - result = "substation-3", + results = {{ type = "item", name = "substation-3", amount = 1 }}, }, { @@ -108,7 +108,7 @@ if settings.startup["bobmods-power-poles"].value == true then { "steel-plate", 10 }, { "copper-plate", 5 }, }, - result = "substation-4", + results = {{ type = "item", name = "substation-4", amount = 1 }}, }, }) end diff --git a/bobpower/prototypes/recipe/solar-panels.lua b/bobpower/prototypes/recipe/solar-panels.lua index a7f0184cb..dceeb88d9 100644 --- a/bobpower/prototypes/recipe/solar-panels.lua +++ b/bobpower/prototypes/recipe/solar-panels.lua @@ -16,7 +16,7 @@ if settings.startup["bobmods-power-solar"].value == true then { "electronic-circuit", 6 }, { "copper-plate", 2 }, }, - result = "solar-panel-small", + results = {{ type = "item", name = "solar-panel-small", amount = 1 }}, }, { @@ -29,7 +29,7 @@ if settings.startup["bobmods-power-solar"].value == true then { "electronic-circuit", 24 }, { "copper-plate", 8 }, }, - result = "solar-panel-large", + results = {{ type = "item", name = "solar-panel-large", amount = 1 }}, }, { @@ -43,7 +43,7 @@ if settings.startup["bobmods-power-solar"].value == true then { "advanced-circuit", 4 }, { "copper-plate", 2 }, }, - result = "solar-panel-small-2", + results = {{ type = "item", name = "solar-panel-small-2", amount = 1 }}, }, { @@ -57,7 +57,7 @@ if settings.startup["bobmods-power-solar"].value == true then { "advanced-circuit", 9 }, { "copper-plate", 4 }, }, - result = "solar-panel-2", + results = {{ type = "item", name = "solar-panel-2", amount = 1 }}, }, { @@ -71,7 +71,7 @@ if settings.startup["bobmods-power-solar"].value == true then { "advanced-circuit", 16 }, { "copper-plate", 8 }, }, - result = "solar-panel-large-2", + results = {{ type = "item", name = "solar-panel-large-2", amount = 1 }}, }, { @@ -85,7 +85,7 @@ if settings.startup["bobmods-power-solar"].value == true then { "processing-unit", 4 }, { "copper-plate", 2 }, }, - result = "solar-panel-small-3", + results = {{ type = "item", name = "solar-panel-small-3", amount = 1 }}, }, { @@ -99,7 +99,7 @@ if settings.startup["bobmods-power-solar"].value == true then { "processing-unit", 9 }, { "copper-plate", 4 }, }, - result = "solar-panel-3", + results = {{ type = "item", name = "solar-panel-3", amount = 1 }}, }, { @@ -113,7 +113,7 @@ if settings.startup["bobmods-power-solar"].value == true then { "processing-unit", 16 }, { "copper-plate", 8 }, }, - result = "solar-panel-large-3", + results = {{ type = "item", name = "solar-panel-large-3", amount = 1 }}, }, }) end diff --git a/bobpower/prototypes/recipe/steam-engines.lua b/bobpower/prototypes/recipe/steam-engines.lua index c40e3f72d..cadc86cdb 100644 --- a/bobpower/prototypes/recipe/steam-engines.lua +++ b/bobpower/prototypes/recipe/steam-engines.lua @@ -10,7 +10,7 @@ if settings.startup["bobmods-power-steam"].value == true then { "pipe", 5 }, { "iron-gear-wheel", 5 }, }, - result = "steam-engine-2", + results = {{ type = "item", name = "steam-engine-2", amount = 1 }}, }, { type = "recipe", @@ -22,7 +22,7 @@ if settings.startup["bobmods-power-steam"].value == true then { "steel-plate", 5 }, { "iron-gear-wheel", 5 }, }, - result = "steam-engine-3", + results = {{ type = "item", name = "steam-engine-3", amount = 1 }}, }, { type = "recipe", @@ -34,7 +34,7 @@ if settings.startup["bobmods-power-steam"].value == true then { "steel-plate", 5 }, { "iron-gear-wheel", 5 }, }, - result = "steam-engine-4", + results = {{ type = "item", name = "steam-engine-4", amount = 1 }}, }, { type = "recipe", @@ -46,7 +46,7 @@ if settings.startup["bobmods-power-steam"].value == true then { "steel-plate", 5 }, { "iron-gear-wheel", 5 }, }, - result = "steam-engine-5", + results = {{ type = "item", name = "steam-engine-5", amount = 1 }}, }, }) end diff --git a/bobpower/prototypes/recipe/steam-turbines.lua b/bobpower/prototypes/recipe/steam-turbines.lua index 83e0e5d28..3ddcf06c3 100644 --- a/bobpower/prototypes/recipe/steam-turbines.lua +++ b/bobpower/prototypes/recipe/steam-turbines.lua @@ -11,7 +11,7 @@ if settings.startup["bobmods-power-steam"].value == true then { "copper-plate", 25 }, { "iron-gear-wheel", 20 }, }, - result = "steam-turbine", + results = {{ type = "item", name = "steam-turbine", amount = 1 }}, }, { @@ -25,7 +25,7 @@ if settings.startup["bobmods-power-steam"].value == true then { "steel-plate", 25 }, { "iron-gear-wheel", 25 }, }, - result = "steam-turbine-2", + results = {{ type = "item", name = "steam-turbine-2", amount = 1 }}, }, { type = "recipe", @@ -38,7 +38,7 @@ if settings.startup["bobmods-power-steam"].value == true then { "steel-plate", 25 }, { "iron-gear-wheel", 25 }, }, - result = "steam-turbine-3", + results = {{ type = "item", name = "steam-turbine-3", amount = 1 }}, }, }) end diff --git a/bobrevamp/prototypes/rocket-fuel.lua b/bobrevamp/prototypes/rocket-fuel.lua index 3b9b7217f..b38087fad 100644 --- a/bobrevamp/prototypes/rocket-fuel.lua +++ b/bobrevamp/prototypes/rocket-fuel.lua @@ -289,7 +289,7 @@ if data.raw.fluid.hydrogen and data.raw.fluid.oxygen and data.raw.fluid.nitrogen { type = "fluid", name = "hydrazine", amount = 100 }, { "solid-fuel", 1 }, }, - result = "enriched-fuel", + results = {{ type = "item", name = "enriched-fuel", amount = 1 }}, subgroup = "bob-resource-chemical", order = "d[enriched-fuel]", crafting_machine_tint = { diff --git a/bobrevamp/prototypes/rocket-parts.lua b/bobrevamp/prototypes/rocket-parts.lua index 258e0e13a..0baf53608 100644 --- a/bobrevamp/prototypes/rocket-parts.lua +++ b/bobrevamp/prototypes/rocket-parts.lua @@ -18,7 +18,7 @@ data:extend({ { "steel-plate", 10 }, { "plastic-bar", 5 }, }, - result = "heat-shield-tile", + results = {{ type = "item", name = "heat-shield-tile", amount = 1 }}, }, { type = "technology", diff --git a/bobrevamp/prototypes/rtg.lua b/bobrevamp/prototypes/rtg.lua index ac594202a..67d4bc2e9 100644 --- a/bobrevamp/prototypes/rtg.lua +++ b/bobrevamp/prototypes/rtg.lua @@ -296,7 +296,7 @@ if bobmods.plates and settings.startup["bobmods-revamp-rtg"].value == true then { type = "item", name = "aluminium-plate", amount = 5 }, { type = "item", name = "sodium-cobaltate", amount = 2 }, }, - result = "rtg", + results = {{ type = "item", name = "rtg", amount = 1 }}, }, }) diff --git a/bobtech/prototypes/recipe/recipe-alien.lua b/bobtech/prototypes/recipe/recipe-alien.lua index 1c1ca2aa3..4931e3e49 100644 --- a/bobtech/prototypes/recipe/recipe-alien.lua +++ b/bobtech/prototypes/recipe/recipe-alien.lua @@ -19,7 +19,7 @@ then { "chemical-science-pack", 1 }, { "military-science-pack", 1 }, }, - result = "science-pack-gold", + results = {{ type = "item", name = "science-pack-gold", amount = 1 }}, }, { type = "recipe", @@ -29,8 +29,7 @@ then ingredients = { { "alien-artifact", 1 }, }, - result = "alien-science-pack", - result_count = 10, + results = {{ type = "item", name = "alien-science-pack", amount = 10 }}, }, { type = "recipe", @@ -40,8 +39,7 @@ then ingredients = { { "alien-artifact-blue", 1 }, }, - result = "alien-science-pack-blue", - result_count = 10, + results = {{ type = "item", name = "alien-science-pack-blue", amount = 10 }}, }, { type = "recipe", @@ -51,8 +49,7 @@ then ingredients = { { "alien-artifact-orange", 1 }, }, - result = "alien-science-pack-orange", - result_count = 10, + results = {{ type = "item", name = "alien-science-pack-orange", amount = 10 }}, }, { type = "recipe", @@ -62,8 +59,7 @@ then ingredients = { { "alien-artifact-purple", 1 }, }, - result = "alien-science-pack-purple", - result_count = 10, + results = {{ type = "item", name = "alien-science-pack-purple", amount = 10 }}, }, { type = "recipe", @@ -73,8 +69,7 @@ then ingredients = { { "alien-artifact-yellow", 1 }, }, - result = "alien-science-pack-yellow", - result_count = 10, + results = {{ type = "item", name = "alien-science-pack-yellow", amount = 10 }}, }, { type = "recipe", @@ -84,8 +79,7 @@ then ingredients = { { "alien-artifact-green", 1 }, }, - result = "alien-science-pack-green", - result_count = 10, + results = {{ type = "item", name = "alien-science-pack-green", amount = 10 }}, }, { type = "recipe", @@ -95,8 +89,7 @@ then ingredients = { { "alien-artifact-red", 1 }, }, - result = "alien-science-pack-red", - result_count = 10, + results = {{ type = "item", name = "alien-science-pack-red", amount = 10 }}, }, { @@ -110,7 +103,7 @@ then { "alien-artifact-blue", 5 }, { "alien-artifact-orange", 5 }, }, - result = "lab-alien", + results = {{ type = "item", name = "lab-alien", amount = 1 }}, }, }) end diff --git a/bobtech/prototypes/recipe/recipe-updates.lua b/bobtech/prototypes/recipe/recipe-updates.lua index 84193280f..470768e07 100644 --- a/bobtech/prototypes/recipe/recipe-updates.lua +++ b/bobtech/prototypes/recipe/recipe-updates.lua @@ -32,7 +32,7 @@ if data.raw.item["titanium-bearing"] then end data.raw.recipe["utility-science-pack"].energy_required = 28 -data.raw.recipe["utility-science-pack"].result_count = 4 +bobmods.lib.recipe.set_result("utility-science-pack", { type = "item", name = "utility-science-pack", amount = 4 }) if settings.startup["bobmods-burnerphase"].value == true then bobmods.lib.recipe.add_new_ingredient("lab", { "burner-lab", 1 }) diff --git a/bobtech/prototypes/recipe/recipe.lua b/bobtech/prototypes/recipe/recipe.lua index b73123326..120b6d192 100644 --- a/bobtech/prototypes/recipe/recipe.lua +++ b/bobtech/prototypes/recipe/recipe.lua @@ -10,8 +10,7 @@ data:extend({ { "flying-robot-frame", 1 }, { "steel-chest", 2 }, }, - result_count = 3, - result = "advanced-logistic-science-pack", + results = {{ type = "item", name = "advanced-logistic-science-pack", amount = 3 }}, }, { @@ -25,7 +24,7 @@ data:extend({ { "filter-inserter", 4 }, { "express-transport-belt", 4 }, }, - result = "lab-2", + results = {{ type = "item", name = "lab-2", amount = 1 }}, }, }) @@ -39,8 +38,7 @@ if settings.startup["bobmods-burnerphase"].value == true then { "coal", 1 }, { "stone", 1 }, }, - result_count = 1, - result = "steam-science-pack", + results = {{ type = "item", name = "steam-science-pack", amount = 1 }}, }, { @@ -52,7 +50,7 @@ if settings.startup["bobmods-burnerphase"].value == true then { "iron-plate", 2 }, { "stone", 4 }, }, - result = "burner-lab", + results = {{ type = "item", name = "burner-lab", amount = 1 }}, }, }) end diff --git a/bobvehicleequipment/prototypes/battery.lua b/bobvehicleequipment/prototypes/battery.lua index a9f322d72..fa0e4614e 100644 --- a/bobvehicleequipment/prototypes/battery.lua +++ b/bobvehicleequipment/prototypes/battery.lua @@ -20,7 +20,7 @@ data:extend({ { "battery", 5 }, { "steel-plate", 10 }, }, - result = "vehicle-battery-1", + results = {{ type = "item", name = "vehicle-battery-1", amount = 1 }}, }, { @@ -99,7 +99,7 @@ data:extend({ { "vehicle-battery-1", 2 }, { "processing-unit", 5 }, }, - result = "vehicle-battery-2", + results = {{ type = "item", name = "vehicle-battery-2", amount = 1 }}, }, { @@ -179,7 +179,7 @@ data:extend({ { "vehicle-battery-2", 2 }, { "battery", 5 }, }, - result = "vehicle-battery-3", + results = {{ type = "item", name = "vehicle-battery-3", amount = 1 }}, }, { @@ -258,7 +258,7 @@ data:extend({ { "vehicle-battery-3", 2 }, { "processing-unit", 5 }, }, - result = "vehicle-battery-4", + results = {{ type = "item", name = "vehicle-battery-4", amount = 1 }}, }, { @@ -339,7 +339,7 @@ data:extend({ { "vehicle-battery-4", 2 }, { "battery", 5 }, }, - result = "vehicle-battery-5", + results = {{ type = "item", name = "vehicle-battery-5", amount = 1 }}, }, { @@ -419,7 +419,7 @@ data:extend({ { "vehicle-battery-5", 2 }, { "processing-unit", 5 }, }, - result = "vehicle-battery-6", + results = {{ type = "item", name = "vehicle-battery-6", amount = 1 }}, }, { diff --git a/bobvehicleequipment/prototypes/belt-immunity.lua b/bobvehicleequipment/prototypes/belt-immunity.lua index db42e68af..867bb07bc 100644 --- a/bobvehicleequipment/prototypes/belt-immunity.lua +++ b/bobvehicleequipment/prototypes/belt-immunity.lua @@ -28,7 +28,7 @@ data:extend({ { "advanced-circuit", 5 }, { "steel-plate", 10 }, }, - result = "vehicle-belt-immunity-equipment", + results = {{ type = "item", name = "vehicle-belt-immunity-equipment", amount = 1 }}, }, { type = "belt-immunity-equipment", diff --git a/bobvehicleequipment/prototypes/fusion-cell.lua b/bobvehicleequipment/prototypes/fusion-cell.lua index 0753f71d8..38ad13382 100644 --- a/bobvehicleequipment/prototypes/fusion-cell.lua +++ b/bobvehicleequipment/prototypes/fusion-cell.lua @@ -19,7 +19,7 @@ data:extend({ ingredients = { { "processing-unit", 125 }, }, - result = "vehicle-fusion-cell-1", + results = {{ type = "item", name = "vehicle-fusion-cell-1", amount = 1 }}, }, { @@ -99,7 +99,7 @@ data:extend({ { "speed-module-2", 1 }, { "productivity-module-2", 1 }, }, - result = "vehicle-fusion-cell-2", + results = {{ type = "item", name = "vehicle-fusion-cell-2", amount = 1 }}, }, { @@ -180,7 +180,7 @@ data:extend({ { "speed-module-3", 1 }, { "productivity-module-3", 1 }, }, - result = "vehicle-fusion-cell-3", + results = {{ type = "item", name = "vehicle-fusion-cell-3", amount = 1 }}, }, { @@ -262,7 +262,7 @@ data:extend({ { "speed-module-3", 1 }, { "productivity-module-3", 1 }, }, - result = "vehicle-fusion-cell-4", + results = {{ type = "item", name = "vehicle-fusion-cell-4", amount = 1 }}, }, { @@ -343,7 +343,7 @@ data:extend({ { "speed-module-3", 1 }, { "productivity-module-3", 1 }, }, - result = "vehicle-fusion-cell-5", + results = {{ type = "item", name = "vehicle-fusion-cell-5", amount = 1 }}, }, { @@ -424,7 +424,7 @@ data:extend({ { "speed-module-3", 1 }, { "productivity-module-3", 1 }, }, - result = "vehicle-fusion-cell-6", + results = {{ type = "item", name = "vehicle-fusion-cell-6", amount = 1 }}, }, { diff --git a/bobvehicleequipment/prototypes/generator.lua b/bobvehicleequipment/prototypes/generator.lua index 3e34d0364..ba67d1c9b 100644 --- a/bobvehicleequipment/prototypes/generator.lua +++ b/bobvehicleequipment/prototypes/generator.lua @@ -19,7 +19,7 @@ data:extend({ ingredients = { { "processing-unit", 250 }, }, - result = "vehicle-fusion-reactor-1", + results = {{ type = "item", name = "vehicle-fusion-reactor-1", amount = 1 }}, }, { @@ -100,7 +100,7 @@ data:extend({ { "speed-module-2", 2 }, { "productivity-module-2", 2 }, }, - result = "vehicle-fusion-reactor-2", + results = {{ type = "item", name = "vehicle-fusion-reactor-2", amount = 1 }}, }, { @@ -182,7 +182,7 @@ data:extend({ { "speed-module-3", 2 }, { "productivity-module-3", 2 }, }, - result = "vehicle-fusion-reactor-3", + results = {{ type = "item", name = "vehicle-fusion-reactor-3", amount = 1 }}, }, { @@ -265,7 +265,7 @@ data:extend({ { "speed-module-3", 2 }, { "productivity-module-3", 2 }, }, - result = "vehicle-fusion-reactor-4", + results = {{ type = "item", name = "vehicle-fusion-reactor-4", amount = 1 }}, }, { @@ -347,7 +347,7 @@ data:extend({ { "speed-module-3", 2 }, { "productivity-module-3", 2 }, }, - result = "vehicle-fusion-reactor-5", + results = {{ type = "item", name = "vehicle-fusion-reactor-5", amount = 1 }}, }, { @@ -429,7 +429,7 @@ data:extend({ { "speed-module-3", 2 }, { "productivity-module-3", 2 }, }, - result = "vehicle-fusion-reactor-6", + results = {{ type = "item", name = "vehicle-fusion-reactor-6", amount = 1 }}, }, { diff --git a/bobvehicleequipment/prototypes/laser-defense.lua b/bobvehicleequipment/prototypes/laser-defense.lua index d1f93e27b..2e4c5b855 100644 --- a/bobvehicleequipment/prototypes/laser-defense.lua +++ b/bobvehicleequipment/prototypes/laser-defense.lua @@ -68,7 +68,7 @@ data:extend({ { "electronic-circuit", 5 }, { "battery", 3 }, }, - result = "vehicle-laser-defense-1", + results = {{ type = "item", name = "vehicle-laser-defense-1", amount = 1 }}, }, bob_active_beam_weapon_equipment({ @@ -142,7 +142,7 @@ data:extend({ { "advanced-circuit", 5 }, { "battery", 3 }, }, - result = "vehicle-laser-defense-2", + results = {{ type = "item", name = "vehicle-laser-defense-2", amount = 1 }}, }, bob_active_beam_weapon_equipment({ @@ -215,7 +215,7 @@ data:extend({ { "advanced-circuit", 5 }, { "battery", 3 }, }, - result = "vehicle-laser-defense-3", + results = {{ type = "item", name = "vehicle-laser-defense-3", amount = 1 }}, }, bob_active_beam_weapon_equipment({ @@ -289,7 +289,7 @@ data:extend({ { "processing-unit", 5 }, { "battery", 3 }, }, - result = "vehicle-laser-defense-4", + results = {{ type = "item", name = "vehicle-laser-defense-4", amount = 1 }}, }, bob_active_beam_weapon_equipment({ @@ -363,7 +363,7 @@ data:extend({ { "processing-unit", 5 }, { "battery", 3 }, }, - result = "vehicle-laser-defense-5", + results = {{ type = "item", name = "vehicle-laser-defense-5", amount = 1 }}, }, bob_active_beam_weapon_equipment({ @@ -438,7 +438,7 @@ data:extend({ { "processing-unit", 5 }, { "battery", 3 }, }, - result = "vehicle-laser-defense-6", + results = {{ type = "item", name = "vehicle-laser-defense-6", amount = 1 }}, }, bob_active_beam_weapon_equipment({ diff --git a/bobvehicleequipment/prototypes/plasma-defense.lua b/bobvehicleequipment/prototypes/plasma-defense.lua index f0ad58f9a..5ab3752e1 100644 --- a/bobvehicleequipment/prototypes/plasma-defense.lua +++ b/bobvehicleequipment/prototypes/plasma-defense.lua @@ -88,7 +88,7 @@ data:extend({ { "electronic-circuit", 20 }, { "battery", 12 }, }, - result = "vehicle-big-turret-1", + results = {{ type = "item", name = "vehicle-big-turret-1", amount = 1 }}, }, bob_active_weapon_equipment({ @@ -170,7 +170,7 @@ data:extend({ { "advanced-circuit", 20 }, { "battery", 12 }, }, - result = "vehicle-big-turret-2", + results = {{ type = "item", name = "vehicle-big-turret-2", amount = 1 }}, }, bob_active_weapon_equipment({ @@ -250,7 +250,7 @@ data:extend({ { "advanced-circuit", 20 }, { "battery", 12 }, }, - result = "vehicle-big-turret-3", + results = {{ type = "item", name = "vehicle-big-turret-3", amount = 1 }}, }, bob_active_weapon_equipment({ @@ -332,7 +332,7 @@ data:extend({ { "processing-unit", 20 }, { "battery", 12 }, }, - result = "vehicle-big-turret-4", + results = {{ type = "item", name = "vehicle-big-turret-4", amount = 1 }}, }, bob_active_weapon_equipment({ @@ -413,7 +413,7 @@ data:extend({ { "processing-unit", 20 }, { "battery", 12 }, }, - result = "vehicle-big-turret-5", + results = {{ type = "item", name = "vehicle-big-turret-5", amount = 1 }}, }, bob_active_weapon_equipment({ @@ -494,7 +494,7 @@ data:extend({ { "processing-unit", 20 }, { "battery", 12 }, }, - result = "vehicle-big-turret-6", + results = {{ type = "item", name = "vehicle-big-turret-6", amount = 1 }}, }, bob_active_weapon_equipment({ diff --git a/bobvehicleequipment/prototypes/roboport.lua b/bobvehicleequipment/prototypes/roboport.lua index 84ae8cfaf..53fe36bb2 100644 --- a/bobvehicleequipment/prototypes/roboport.lua +++ b/bobvehicleequipment/prototypes/roboport.lua @@ -58,7 +58,7 @@ data:extend({ { "steel-plate", 20 }, { "battery", 20 }, }, - result = "vehicle-roboport", + results = {{ type = "item", name = "vehicle-roboport", amount = 1 }}, }, { @@ -73,7 +73,7 @@ data:extend({ { "steel-plate", 20 }, { "battery", 20 }, }, - result = "vehicle-roboport-2", + results = {{ type = "item", name = "vehicle-roboport-2", amount = 1 }}, }, { @@ -88,7 +88,7 @@ data:extend({ { "steel-plate", 20 }, { "battery", 20 }, }, - result = "vehicle-roboport-3", + results = {{ type = "item", name = "vehicle-roboport-3", amount = 1 }}, }, { @@ -103,7 +103,7 @@ data:extend({ { "steel-plate", 20 }, { "battery", 20 }, }, - result = "vehicle-roboport-4", + results = {{ type = "item", name = "vehicle-roboport-4", amount = 1 }}, }, { @@ -1147,7 +1147,7 @@ data:extend({ { "iron-gear-wheel", 20 }, { "steel-plate", 10 }, }, - result = "vehicle-roboport-antenna-equipment", + results = {{ type = "item", name = "vehicle-roboport-antenna-equipment", amount = 1 }}, }, { type = "recipe", @@ -1160,7 +1160,7 @@ data:extend({ { "iron-gear-wheel", 20 }, { "steel-plate", 10 }, }, - result = "vehicle-roboport-antenna-equipment-2", + results = {{ type = "item", name = "vehicle-roboport-antenna-equipment-2", amount = 1 }}, }, { type = "recipe", @@ -1173,7 +1173,7 @@ data:extend({ { "iron-gear-wheel", 20 }, { "steel-plate", 10 }, }, - result = "vehicle-roboport-antenna-equipment-3", + results = {{ type = "item", name = "vehicle-roboport-antenna-equipment-3", amount = 1 }}, }, { type = "recipe", @@ -1186,7 +1186,7 @@ data:extend({ { "iron-gear-wheel", 20 }, { "steel-plate", 10 }, }, - result = "vehicle-roboport-antenna-equipment-4", + results = {{ type = "item", name = "vehicle-roboport-antenna-equipment-4", amount = 1 }}, }, { @@ -1199,7 +1199,7 @@ data:extend({ { "steel-plate", 5 }, { "battery", 20 }, }, - result = "vehicle-roboport-chargepad-equipment", + results = {{ type = "item", name = "vehicle-roboport-chargepad-equipment", amount = 1 }}, }, { type = "recipe", @@ -1212,7 +1212,7 @@ data:extend({ { "steel-plate", 5 }, { "battery", 20 }, }, - result = "vehicle-roboport-chargepad-equipment-2", + results = {{ type = "item", name = "vehicle-roboport-chargepad-equipment-2", amount = 1 }}, }, { type = "recipe", @@ -1225,7 +1225,7 @@ data:extend({ { "steel-plate", 5 }, { "battery", 20 }, }, - result = "vehicle-roboport-chargepad-equipment-3", + results = {{ type = "item", name = "vehicle-roboport-chargepad-equipment-3", amount = 1 }}, }, { type = "recipe", @@ -1238,7 +1238,7 @@ data:extend({ { "steel-plate", 5 }, { "battery", 20 }, }, - result = "vehicle-roboport-chargepad-equipment-4", + results = {{ type = "item", name = "vehicle-roboport-chargepad-equipment-4", amount = 1 }}, }, { @@ -1249,7 +1249,7 @@ data:extend({ ingredients = { { "electronic-circuit", 10 }, }, - result = "vehicle-roboport-robot-equipment", + results = {{ type = "item", name = "vehicle-roboport-robot-equipment", amount = 1 }}, }, { type = "recipe", @@ -1260,7 +1260,7 @@ data:extend({ { "vehicle-roboport-robot-equipment", 1 }, { "advanced-circuit", 10 }, }, - result = "vehicle-roboport-robot-equipment-2", + results = {{ type = "item", name = "vehicle-roboport-robot-equipment-2", amount = 1 }}, }, { type = "recipe", @@ -1271,7 +1271,7 @@ data:extend({ { "vehicle-roboport-robot-equipment-2", 1 }, { "processing-unit", 10 }, }, - result = "vehicle-roboport-robot-equipment-3", + results = {{ type = "item", name = "vehicle-roboport-robot-equipment-3", amount = 1 }}, }, { type = "recipe", @@ -1282,7 +1282,7 @@ data:extend({ { "vehicle-roboport-robot-equipment-3", 1 }, { "processing-unit", 10 }, }, - result = "vehicle-roboport-robot-equipment-4", + results = {{ type = "item", name = "vehicle-roboport-robot-equipment-4", amount = 1 }}, }, { diff --git a/bobvehicleequipment/prototypes/shield.lua b/bobvehicleequipment/prototypes/shield.lua index 0698d1c34..367162ab4 100644 --- a/bobvehicleequipment/prototypes/shield.lua +++ b/bobvehicleequipment/prototypes/shield.lua @@ -20,7 +20,7 @@ data:extend({ { "advanced-circuit", 5 }, { "steel-plate", 10 }, }, - result = "vehicle-shield-1", + results = {{ type = "item", name = "vehicle-shield-1", amount = 1 }}, }, { @@ -101,7 +101,7 @@ data:extend({ { "vehicle-shield-1", 2 }, { "processing-unit", 5 }, }, - result = "vehicle-shield-2", + results = {{ type = "item", name = "vehicle-shield-2", amount = 1 }}, }, { @@ -184,7 +184,7 @@ data:extend({ { "processing-unit", 5 }, { "productivity-module-2", 1 }, }, - result = "vehicle-shield-3", + results = {{ type = "item", name = "vehicle-shield-3", amount = 1 }}, }, { @@ -269,7 +269,7 @@ data:extend({ { "effectivity-module-3", 1 }, { "productivity-module-3", 1 }, }, - result = "vehicle-shield-4", + results = {{ type = "item", name = "vehicle-shield-4", amount = 1 }}, }, { @@ -352,7 +352,7 @@ data:extend({ { "effectivity-module-3", 1 }, { "productivity-module-3", 1 }, }, - result = "vehicle-shield-5", + results = {{ type = "item", name = "vehicle-shield-5", amount = 1 }}, }, { @@ -437,7 +437,7 @@ data:extend({ { "effectivity-module-3", 1 }, { "productivity-module-3", 1 }, }, - result = "vehicle-shield-6", + results = {{ type = "item", name = "vehicle-shield-6", amount = 1 }}, }, { diff --git a/bobvehicleequipment/prototypes/solar-panel.lua b/bobvehicleequipment/prototypes/solar-panel.lua index fceba3e92..fd742ed2c 100644 --- a/bobvehicleequipment/prototypes/solar-panel.lua +++ b/bobvehicleequipment/prototypes/solar-panel.lua @@ -21,7 +21,7 @@ data:extend({ { "electronic-circuit", 5 }, { "copper-cable", 4 }, }, - result = "vehicle-solar-panel-1", + results = {{ type = "item", name = "vehicle-solar-panel-1", amount = 1 }}, }, { @@ -102,7 +102,7 @@ data:extend({ { "advanced-circuit", 5 }, { "copper-plate", 2 }, }, - result = "vehicle-solar-panel-2", + results = {{ type = "item", name = "vehicle-solar-panel-2", amount = 1 }}, }, { @@ -181,7 +181,7 @@ data:extend({ { "processing-unit", 5 }, { "copper-plate", 2 }, }, - result = "vehicle-solar-panel-3", + results = {{ type = "item", name = "vehicle-solar-panel-3", amount = 1 }}, }, { @@ -261,7 +261,7 @@ data:extend({ { "processing-unit", 5 }, { "copper-cable", 5 }, }, - result = "vehicle-solar-panel-4", + results = {{ type = "item", name = "vehicle-solar-panel-4", amount = 1 }}, }, { @@ -341,7 +341,7 @@ data:extend({ { "processing-unit", 5 }, { "copper-cable", 5 }, }, - result = "vehicle-solar-panel-5", + results = {{ type = "item", name = "vehicle-solar-panel-5", amount = 1 }}, }, { @@ -423,7 +423,7 @@ data:extend({ { "processing-unit", 5 }, { "copper-cable", 5 }, }, - result = "vehicle-solar-panel-6", + results = {{ type = "item", name = "vehicle-solar-panel-6", amount = 1 }}, }, { diff --git a/bobvehicleequipment/prototypes/speed.lua b/bobvehicleequipment/prototypes/speed.lua index 9fba84658..776a6b222 100644 --- a/bobvehicleequipment/prototypes/speed.lua +++ b/bobvehicleequipment/prototypes/speed.lua @@ -21,7 +21,7 @@ data:extend({ { "electric-engine-unit", 30 }, { "steel-plate", 20 }, }, - result = "vehicle-motor", + results = {{ type = "item", name = "vehicle-motor", amount = 1 }}, }, { @@ -106,7 +106,7 @@ data:extend({ { "iron-gear-wheel", 30 }, { "steel-plate", 20 }, }, - result = "vehicle-engine", + results = {{ type = "item", name = "vehicle-engine", amount = 1 }}, }, { diff --git a/bobwarfare/prototypes/recipe/ammo-recipe.lua b/bobwarfare/prototypes/recipe/ammo-recipe.lua index d87eaa70b..c3a1751c6 100644 --- a/bobwarfare/prototypes/recipe/ammo-recipe.lua +++ b/bobwarfare/prototypes/recipe/ammo-recipe.lua @@ -9,7 +9,7 @@ data:extend({ { "bullet", 5 }, { "magazine", 1 }, }, - result = "bullet-magazine", + results = {{ type = "item", name = "bullet-magazine", amount = 1 }}, }, { @@ -22,7 +22,7 @@ data:extend({ { "ap-bullet", 5 }, { "magazine", 1 }, }, - result = "ap-bullet-magazine", + results = {{ type = "item", name = "ap-bullet-magazine", amount = 1 }}, }, { @@ -35,7 +35,7 @@ data:extend({ { "he-bullet", 5 }, { "magazine", 1 }, }, - result = "he-bullet-magazine", + results = {{ type = "item", name = "he-bullet-magazine", amount = 1 }}, }, { @@ -48,7 +48,7 @@ data:extend({ { "flame-bullet", 5 }, { "magazine", 1 }, }, - result = "flame-bullet-magazine", + results = {{ type = "item", name = "flame-bullet-magazine", amount = 1 }}, }, { @@ -61,7 +61,7 @@ data:extend({ { "acid-bullet", 5 }, { "magazine", 1 }, }, - result = "acid-bullet-magazine", + results = {{ type = "item", name = "acid-bullet-magazine", amount = 1 }}, }, { @@ -74,7 +74,7 @@ data:extend({ { "poison-bullet", 5 }, { "magazine", 1 }, }, - result = "poison-bullet-magazine", + results = {{ type = "item", name = "poison-bullet-magazine", amount = 1 }}, }, { @@ -87,7 +87,7 @@ data:extend({ { "electric-bullet", 5 }, { "magazine", 1 }, }, - result = "electric-bullet-magazine", + results = {{ type = "item", name = "electric-bullet-magazine", amount = 1 }}, }, { @@ -99,7 +99,7 @@ data:extend({ { "uranium-bullet", 5 }, { "magazine", 1 }, }, - result = "uranium-rounds-magazine", + results = {{ type = "item", name = "uranium-rounds-magazine", amount = 1 }}, }, { @@ -113,8 +113,7 @@ data:extend({ { "shot", 1 }, { "cordite", 1 }, }, - result = "better-shotgun-shell", - result_count = 1, + results = {{ type = "item", name = "better-shotgun-shell", amount = 1 }}, }, { @@ -128,8 +127,7 @@ data:extend({ { "steel-plate", 1 }, { "cordite", 1 }, }, - result = "shotgun-ap-shell", - result_count = 1, + results = {{ type = "item", name = "shotgun-ap-shell", amount = 1 }}, }, { @@ -143,8 +141,7 @@ data:extend({ { "copper-plate", 1 }, { "cordite", 1 }, }, - result = "shotgun-electric-shell", - result_count = 1, + results = {{ type = "item", name = "shotgun-electric-shell", amount = 1 }}, }, { @@ -158,8 +155,7 @@ data:extend({ { "explosives", 1 }, { "cordite", 1 }, }, - result = "shotgun-explosive-shell", - result_count = 1, + results = {{ type = "item", name = "shotgun-explosive-shell", amount = 1 }}, }, { @@ -175,8 +171,7 @@ data:extend({ { type = "fluid", name = "heavy-oil", amount = 5 }, { "cordite", 1 }, }, - result = "shotgun-flame-shell", - result_count = 1, + results = {{ type = "item", name = "shotgun-flame-shell", amount = 1 }}, }, { @@ -191,8 +186,7 @@ data:extend({ { type = "fluid", name = "sulfuric-acid", amount = 10 }, { "cordite", 1 }, }, - result = "shotgun-acid-shell", - result_count = 1, + results = {{ type = "item", name = "shotgun-acid-shell", amount = 1 }}, }, { @@ -206,8 +200,7 @@ data:extend({ { "coal", 1 }, { "cordite", 1 }, }, - result = "shotgun-poison-shell", - result_count = 1, + results = {{ type = "item", name = "shotgun-poison-shell", amount = 1 }}, }, { @@ -221,8 +214,7 @@ data:extend({ { "uranium-238", 1 }, { "cordite", 1 }, }, - result = "shotgun-uranium-shell", - result_count = 1, + results = {{ type = "item", name = "shotgun-uranium-shell", amount = 1 }}, }, { @@ -235,8 +227,7 @@ data:extend({ { "laser-rifle-battery-case", 1 }, { "battery", 4 }, }, - result = "laser-rifle-battery", - result_count = 1, + results = {{ type = "item", name = "laser-rifle-battery", amount = 1 }}, }, { @@ -249,8 +240,7 @@ data:extend({ { "laser-rifle-battery", 1 }, { "battery", 4 }, }, - result = "laser-rifle-battery-ruby", - result_count = 1, + results = {{ type = "item", name = "laser-rifle-battery-ruby", amount = 1 }}, }, { @@ -263,8 +253,7 @@ data:extend({ { "laser-rifle-battery-ruby", 1 }, { "battery", 4 }, }, - result = "laser-rifle-battery-sapphire", - result_count = 1, + results = {{ type = "item", name = "laser-rifle-battery-sapphire", amount = 1 }}, }, { @@ -277,8 +266,7 @@ data:extend({ { "laser-rifle-battery-sapphire", 1 }, { "battery", 4 }, }, - result = "laser-rifle-battery-emerald", - result_count = 1, + results = {{ type = "item", name = "laser-rifle-battery-emerald", amount = 1 }}, }, { @@ -291,8 +279,7 @@ data:extend({ { "laser-rifle-battery-emerald", 1 }, { "battery", 4 }, }, - result = "laser-rifle-battery-amethyst", - result_count = 1, + results = {{ type = "item", name = "laser-rifle-battery-amethyst", amount = 1 }}, }, { @@ -305,8 +292,7 @@ data:extend({ { "laser-rifle-battery-amethyst", 1 }, { "battery", 4 }, }, - result = "laser-rifle-battery-topaz", - result_count = 1, + results = {{ type = "item", name = "laser-rifle-battery-topaz", amount = 1 }}, }, { @@ -319,8 +305,7 @@ data:extend({ { "laser-rifle-battery-topaz", 1 }, { "battery", 4 }, }, - result = "laser-rifle-battery-diamond", - result_count = 1, + results = {{ type = "item", name = "laser-rifle-battery-diamond", amount = 1 }}, }, { @@ -332,7 +317,7 @@ data:extend({ { "rocket-body", 1 }, { "rocket-warhead", 1 }, }, - result = "bob-rocket", + results = {{ type = "item", name = "bob-rocket", amount = 1 }}, }, { @@ -344,7 +329,7 @@ data:extend({ { "rocket-body", 1 }, { "piercing-rocket-warhead", 1 }, }, - result = "bob-piercing-rocket", + results = {{ type = "item", name = "bob-piercing-rocket", amount = 1 }}, }, { @@ -356,7 +341,7 @@ data:extend({ { "rocket-body", 1 }, { "electric-rocket-warhead", 1 }, }, - result = "bob-electric-rocket", + results = {{ type = "item", name = "bob-electric-rocket", amount = 1 }}, }, { @@ -368,7 +353,7 @@ data:extend({ { "rocket-body", 1 }, { "explosive-rocket-warhead", 1 }, }, - result = "bob-explosive-rocket", + results = {{ type = "item", name = "bob-explosive-rocket", amount = 1 }}, }, { @@ -380,7 +365,7 @@ data:extend({ { "rocket-body", 1 }, { "acid-rocket-warhead", 1 }, }, - result = "bob-acid-rocket", + results = {{ type = "item", name = "bob-acid-rocket", amount = 1 }}, }, { @@ -392,7 +377,7 @@ data:extend({ { "rocket-body", 1 }, { "flame-rocket-warhead", 1 }, }, - result = "bob-flame-rocket", + results = {{ type = "item", name = "bob-flame-rocket", amount = 1 }}, }, { @@ -404,7 +389,7 @@ data:extend({ { "rocket-body", 1 }, { "poison-rocket-warhead", 1 }, }, - result = "bob-poison-rocket", + results = {{ type = "item", name = "bob-poison-rocket", amount = 1 }}, }, }) @@ -420,7 +405,7 @@ data:extend({ { "explosives", 1 }, { "shot", 5 }, }, - result = "scatter-cannon-shell", + results = {{ type = "item", name = "scatter-cannon-shell", amount = 1 }}, }, }) @@ -436,7 +421,7 @@ data:extend({ { "electronic-circuit", 3 }, { type = "fluid", name = "light-oil", amount = 100 }, }, - result = "fire-capsule", + results = {{ type = "item", name = "fire-capsule", amount = 1 }}, }, }) @@ -452,7 +437,7 @@ data:extend({ { "coal", 15 }, { "explosives", 3 }, }, - result = "poison-artillery-shell", + results = {{ type = "item", name = "poison-artillery-shell", amount = 1 }}, }, { @@ -467,7 +452,7 @@ data:extend({ { "explosives", 3 }, { type = "fluid", name = "light-oil", amount = 150 }, }, - result = "fire-artillery-shell", + results = {{ type = "item", name = "fire-artillery-shell", amount = 1 }}, }, { @@ -480,7 +465,7 @@ data:extend({ { "plastic-bar", 6 }, { "explosives", 18 }, }, - result = "explosive-artillery-shell", + results = {{ type = "item", name = "explosive-artillery-shell", amount = 1 }}, }, { @@ -494,7 +479,7 @@ data:extend({ { "explosives", 3 }, { "distractor-capsule", 5 }, }, - result = "distractor-artillery-shell", + results = {{ type = "item", name = "distractor-artillery-shell", amount = 1 }}, }, { @@ -508,7 +493,7 @@ data:extend({ { "explosives", 15 }, { "uranium-235", 30 }, }, - result = "atomic-artillery-shell", + results = {{ type = "item", name = "atomic-artillery-shell", amount = 1 }}, }, }) @@ -523,7 +508,7 @@ data:extend({ { "plasma-bullet", 5 }, { "magazine", 1 }, }, - result = "plasma-bullet-magazine", + results = {{ type = "item", name = "plasma-bullet-magazine", amount = 1 }}, }, { type = "recipe", @@ -532,8 +517,7 @@ data:extend({ energy_required = 0.6, enabled = false, ingredients = {}, - result = "shotgun-plasma-shell", - result_count = 6, + results = {{ type = "item", name = "shotgun-plasma-shell", amount = 6 }}, }, { @@ -545,6 +529,6 @@ data:extend({ { "rocket-body", 1 }, { "plasma-rocket-warhead", 1 }, }, - result = "bob-plasma-rocket", + results = {{ type = "item", name = "bob-plasma-rocket", amount = 1 }}, }, }) diff --git a/bobwarfare/prototypes/recipe/armor-recipe.lua b/bobwarfare/prototypes/recipe/armor-recipe.lua index 3f9bcf527..fdf9a4938 100644 --- a/bobwarfare/prototypes/recipe/armor-recipe.lua +++ b/bobwarfare/prototypes/recipe/armor-recipe.lua @@ -8,7 +8,7 @@ data:extend({ { "iron-plate", 100 }, { "steel-plate", 50 }, }, - result = "heavy-armor-2", + results = {{ type = "item", name = "heavy-armor-2", amount = 1 }}, }, { @@ -20,7 +20,7 @@ data:extend({ { "steel-plate", 100 }, { "plastic-bar", 50 }, }, - result = "heavy-armor-3", + results = {{ type = "item", name = "heavy-armor-3", amount = 1 }}, }, { @@ -36,7 +36,7 @@ data:extend({ { "effectivity-module-2", 5 }, { "speed-module-2", 5 }, }, - result = "bob-power-armor-mk3", + results = {{ type = "item", name = "bob-power-armor-mk3", amount = 1 }}, }, { type = "recipe", @@ -52,7 +52,7 @@ data:extend({ { "effectivity-module-3", 5 }, { "speed-module-3", 5 }, }, - result = "bob-power-armor-mk4", + results = {{ type = "item", name = "bob-power-armor-mk4", amount = 1 }}, }, { type = "recipe", @@ -68,6 +68,6 @@ data:extend({ { "effectivity-module-3", 5 }, { "speed-module-3", 5 }, }, - result = "bob-power-armor-mk5", + results = {{ type = "item", name = "bob-power-armor-mk5", amount = 1 }}, }, }) diff --git a/bobwarfare/prototypes/recipe/drone.lua b/bobwarfare/prototypes/recipe/drone.lua index e27cd7ce3..ca6577dde 100644 --- a/bobwarfare/prototypes/recipe/drone.lua +++ b/bobwarfare/prototypes/recipe/drone.lua @@ -11,7 +11,7 @@ data:extend({ { "battery", 6 }, { "electronic-circuit", 10 }, }, - result = "robot-drone-frame", + results = {{ type = "item", name = "robot-drone-frame", amount = 1 }}, }, { type = "recipe", @@ -25,7 +25,7 @@ data:extend({ { "battery", 12 }, { "electronic-circuit", 10 }, }, - result = "robot-drone-frame-large", + results = {{ type = "item", name = "robot-drone-frame-large", amount = 1 }}, }, }) @@ -38,7 +38,7 @@ data:extend({ { "robot-drone-frame", 1 }, { "gun-turret", 1 }, }, - result = "bob-robot-gun-drone", + results = {{ type = "item", name = "bob-robot-gun-drone", amount = 1 }}, }, }) @@ -51,7 +51,7 @@ data:extend({ { "robot-drone-frame", 1 }, { "laser-turret", 1 }, }, - result = "bob-robot-laser-drone", + results = {{ type = "item", name = "bob-robot-laser-drone", amount = 1 }}, }, }) @@ -64,7 +64,7 @@ data:extend({ { "robot-drone-frame", 1 }, { "flamethrower-turret", 1 }, }, - result = "bob-robot-flamethrower-drone", + results = {{ type = "item", name = "bob-robot-flamethrower-drone", amount = 1 }}, }, }) @@ -77,6 +77,6 @@ data:extend({ { "robot-drone-frame-large", 1 }, { "bob-plasma-turret-1", 1 }, }, - result = "bob-robot-plasma-drone", + results = {{ type = "item", name = "bob-robot-plasma-drone", amount = 1 }}, }, }) diff --git a/bobwarfare/prototypes/recipe/gun-recipe.lua b/bobwarfare/prototypes/recipe/gun-recipe.lua index 54c44e3ea..7c0074d26 100644 --- a/bobwarfare/prototypes/recipe/gun-recipe.lua +++ b/bobwarfare/prototypes/recipe/gun-recipe.lua @@ -9,7 +9,7 @@ data:extend({ { "copper-plate", 5 }, { "iron-gear-wheel", 10 }, }, - result = "rifle", + results = {{ type = "item", name = "rifle", amount = 1 }}, }, { @@ -22,7 +22,7 @@ data:extend({ { "wood", 10 }, { "iron-gear-wheel", 10 }, }, - result = "sniper-rifle", + results = {{ type = "item", name = "sniper-rifle", amount = 1 }}, }, { @@ -36,6 +36,6 @@ data:extend({ { "iron-gear-wheel", 5 }, { "plastic-bar", 3 }, }, - result = "laser-rifle", + results = {{ type = "item", name = "laser-rifle", amount = 1 }}, }, }) diff --git a/bobwarfare/prototypes/recipe/mine-recipe.lua b/bobwarfare/prototypes/recipe/mine-recipe.lua index b67b0a277..4d1c6fdf5 100644 --- a/bobwarfare/prototypes/recipe/mine-recipe.lua +++ b/bobwarfare/prototypes/recipe/mine-recipe.lua @@ -8,8 +8,7 @@ data:extend({ { "steel-plate", 1 }, { "poison-capsule", 4 }, }, - result = "poison-mine", - result_count = 4, + results = {{ type = "item", name = "poison-mine", amount = 4 }}, }, { @@ -21,8 +20,7 @@ data:extend({ { "steel-plate", 1 }, { "slowdown-capsule", 4 }, }, - result = "slowdown-mine", - result_count = 4, + results = {{ type = "item", name = "slowdown-mine", amount = 4 }}, }, { @@ -34,7 +32,6 @@ data:extend({ { "steel-plate", 1 }, { "distractor-capsule", 1 }, }, - result = "distractor-mine", - result_count = 3, + results = {{ type = "item", name = "distractor-mine", amount = 3 }}, }, }) diff --git a/bobwarfare/prototypes/recipe/parts-recipe.lua b/bobwarfare/prototypes/recipe/parts-recipe.lua index f27228e53..bbcae8c89 100644 --- a/bobwarfare/prototypes/recipe/parts-recipe.lua +++ b/bobwarfare/prototypes/recipe/parts-recipe.lua @@ -9,8 +9,7 @@ data:extend({ ingredients = { { type = "fluid", name = "heavy-oil", amount = 10 }, }, - result = "petroleum-jelly", - result_count = 1, + results = {{ type = "item", name = "petroleum-jelly", amount = 1 }}, }, { @@ -24,8 +23,7 @@ data:extend({ { type = "fluid", name = "sulfuric-acid", amount = 10 }, { "wood", 1 }, }, - result = "gun-cotton", - result_count = 1, + results = {{ type = "item", name = "gun-cotton", amount = 1 }}, }, { @@ -40,8 +38,7 @@ data:extend({ { "gun-cotton", 13 }, { "petroleum-jelly", 1 }, }, - result = "cordite", - result_count = 5, + results = {{ type = "item", name = "cordite", amount = 5 }}, }, { @@ -53,8 +50,7 @@ data:extend({ ingredients = { { "copper-plate", 1 }, }, - result = "bullet-casing", - result_count = 1, + results = {{ type = "item", name = "bullet-casing", amount = 1 }}, }, { @@ -66,8 +62,7 @@ data:extend({ ingredients = { { "steel-plate", 1 }, }, - result = "magazine", - result_count = 2, + results = {{ type = "item", name = "magazine", amount = 2 }}, }, { @@ -80,8 +75,7 @@ data:extend({ { "copper-plate", 1 }, { "iron-plate", 1 }, }, - result = "bullet-projectile", - result_count = 2, + results = {{ type = "item", name = "bullet-projectile", amount = 2 }}, }, { @@ -95,8 +89,7 @@ data:extend({ { "bullet-projectile", 1 }, { "cordite", 1 }, }, - result = "bullet", - result_count = 1, + results = {{ type = "item", name = "bullet", amount = 1 }}, }, { @@ -109,8 +102,7 @@ data:extend({ { "copper-plate", 1 }, { "steel-plate", 1 }, }, - result = "ap-bullet-projectile", - result_count = 2, + results = {{ type = "item", name = "ap-bullet-projectile", amount = 2 }}, }, { @@ -124,8 +116,7 @@ data:extend({ { "ap-bullet-projectile", 1 }, { "cordite", 1 }, }, - result = "ap-bullet", - result_count = 1, + results = {{ type = "item", name = "ap-bullet", amount = 1 }}, }, { @@ -138,8 +129,7 @@ data:extend({ { "copper-plate", 1 }, { "explosives", 1 }, }, - result = "he-bullet-projectile", - result_count = 2, + results = {{ type = "item", name = "he-bullet-projectile", amount = 2 }}, }, { @@ -153,8 +143,7 @@ data:extend({ { "he-bullet-projectile", 1 }, { "cordite", 1 }, }, - result = "he-bullet", - result_count = 1, + results = {{ type = "item", name = "he-bullet", amount = 1 }}, }, { @@ -169,8 +158,7 @@ data:extend({ { type = "fluid", name = "light-oil", amount = 5 }, { type = "fluid", name = "heavy-oil", amount = 5 }, }, - result = "flame-bullet-projectile", - result_count = 2, + results = {{ type = "item", name = "flame-bullet-projectile", amount = 2 }}, }, { @@ -184,8 +172,7 @@ data:extend({ { "flame-bullet-projectile", 1 }, { "cordite", 1 }, }, - result = "flame-bullet", - result_count = 1, + results = {{ type = "item", name = "flame-bullet", amount = 1 }}, }, { @@ -199,8 +186,7 @@ data:extend({ { "copper-plate", 1 }, { type = "fluid", name = "sulfuric-acid", amount = 10 }, }, - result = "acid-bullet-projectile", - result_count = 2, + results = {{ type = "item", name = "acid-bullet-projectile", amount = 2 }}, }, { @@ -214,8 +200,7 @@ data:extend({ { "acid-bullet-projectile", 1 }, { "cordite", 1 }, }, - result = "acid-bullet", - result_count = 1, + results = {{ type = "item", name = "acid-bullet", amount = 1 }}, }, { @@ -228,8 +213,7 @@ data:extend({ { "copper-plate", 1 }, { "coal", 1 }, }, - result = "poison-bullet-projectile", - result_count = 2, + results = {{ type = "item", name = "poison-bullet-projectile", amount = 2 }}, }, { @@ -243,8 +227,7 @@ data:extend({ { "poison-bullet-projectile", 1 }, { "cordite", 1 }, }, - result = "poison-bullet", - result_count = 1, + results = {{ type = "item", name = "poison-bullet", amount = 1 }}, }, { @@ -257,8 +240,7 @@ data:extend({ { "copper-plate", 1 }, { "steel-plate", 1 }, }, - result = "electric-bullet-projectile", - result_count = 2, + results = {{ type = "item", name = "electric-bullet-projectile", amount = 2 }}, }, { @@ -272,8 +254,7 @@ data:extend({ { "electric-bullet-projectile", 1 }, { "cordite", 1 }, }, - result = "electric-bullet", - result_count = 1, + results = {{ type = "item", name = "electric-bullet", amount = 1 }}, }, { @@ -286,8 +267,7 @@ data:extend({ { "copper-plate", 1 }, { "uranium-238", 1 }, }, - result = "uranium-bullet-projectile", - result_count = 2, + results = {{ type = "item", name = "uranium-bullet-projectile", amount = 2 }}, }, { @@ -301,8 +281,7 @@ data:extend({ { "uranium-bullet-projectile", 1 }, { "cordite", 1 }, }, - result = "uranium-bullet", - result_count = 1, + results = {{ type = "item", name = "uranium-bullet", amount = 1 }}, }, { @@ -314,8 +293,7 @@ data:extend({ ingredients = { { "copper-plate", 1 }, }, - result = "shotgun-shell-casing", - result_count = 1, + results = {{ type = "item", name = "shotgun-shell-casing", amount = 1 }}, }, { @@ -327,8 +305,7 @@ data:extend({ ingredients = { { "iron-plate", 1 }, }, - result = "shot", - result_count = 1, + results = {{ type = "item", name = "shot", amount = 1 }}, }, { @@ -340,8 +317,7 @@ data:extend({ ingredients = { { "plastic-bar", 1 }, }, - result = "laser-rifle-battery-case", - result_count = 2, + results = {{ type = "item", name = "laser-rifle-battery-case", amount = 2 }}, }, { @@ -352,7 +328,7 @@ data:extend({ ingredients = { { "steel-plate", 1 }, }, - result = "rocket-engine", + results = {{ type = "item", name = "rocket-engine", amount = 1 }}, }, { @@ -366,7 +342,7 @@ data:extend({ { "processing-unit", 1 }, { "steel-plate", 1 }, }, - result = "rocket-body", + results = {{ type = "item", name = "rocket-body", amount = 1 }}, }, { @@ -378,7 +354,7 @@ data:extend({ { "steel-plate", 1 }, { "explosives", 1 }, }, - result = "rocket-warhead", + results = {{ type = "item", name = "rocket-warhead", amount = 1 }}, }, { @@ -390,7 +366,7 @@ data:extend({ { "steel-plate", 1 }, { "iron-plate", 2 }, }, - result = "piercing-rocket-warhead", + results = {{ type = "item", name = "piercing-rocket-warhead", amount = 1 }}, }, { @@ -402,7 +378,7 @@ data:extend({ { "steel-plate", 1 }, { "copper-plate", 2 }, }, - result = "electric-rocket-warhead", + results = {{ type = "item", name = "electric-rocket-warhead", amount = 1 }}, }, { @@ -414,7 +390,7 @@ data:extend({ { "steel-plate", 1 }, { "explosives", 2 }, }, - result = "explosive-rocket-warhead", + results = {{ type = "item", name = "explosive-rocket-warhead", amount = 1 }}, }, { @@ -427,7 +403,7 @@ data:extend({ { "steel-plate", 1 }, { type = "fluid", name = "sulfuric-acid", amount = 20 }, }, - result = "acid-rocket-warhead", + results = {{ type = "item", name = "acid-rocket-warhead", amount = 1 }}, }, { @@ -441,7 +417,7 @@ data:extend({ { type = "fluid", name = "light-oil", amount = 10 }, { type = "fluid", name = "heavy-oil", amount = 10 }, }, - result = "flame-rocket-warhead", + results = {{ type = "item", name = "flame-rocket-warhead", amount = 1 }}, }, { @@ -454,7 +430,7 @@ data:extend({ { "steel-plate", 1 }, { "coal", 2 }, }, - result = "poison-rocket-warhead", + results = {{ type = "item", name = "poison-rocket-warhead", amount = 1 }}, }, }) @@ -470,8 +446,7 @@ data:extend({ energy_required = 6, enabled = false, ingredients = {}, - result = "plasma-bullet-projectile", - result_count = 12, + results = {{ type = "item", name = "plasma-bullet-projectile", amount = 12 }}, }, { @@ -485,8 +460,7 @@ data:extend({ { "plasma-bullet-projectile", 1 }, { "cordite", 1 }, }, - result = "plasma-bullet", - result_count = 1, + results = {{ type = "item", name = "plasma-bullet", amount = 1 }}, }, { @@ -495,7 +469,6 @@ data:extend({ energy_required = 6, enabled = false, ingredients = {}, - result = "plasma-rocket-warhead", - result_count = 6, + results = {{ type = "item", name = "plasma-rocket-warhead", amount = 6 }}, }, }) diff --git a/bobwarfare/prototypes/recipe/radar-recipe.lua b/bobwarfare/prototypes/recipe/radar-recipe.lua index b0efba84e..9e7aee5ba 100644 --- a/bobwarfare/prototypes/recipe/radar-recipe.lua +++ b/bobwarfare/prototypes/recipe/radar-recipe.lua @@ -9,7 +9,7 @@ data:extend({ { "iron-gear-wheel", 5 }, { "steel-plate", 10 }, }, - result = "radar-2", + results = {{ type = "item", name = "radar-2", amount = 1 }}, }, { @@ -22,7 +22,7 @@ data:extend({ { "iron-gear-wheel", 5 }, { "steel-plate", 10 }, }, - result = "radar-3", + results = {{ type = "item", name = "radar-3", amount = 1 }}, }, { @@ -35,7 +35,7 @@ data:extend({ { "iron-gear-wheel", 5 }, { "steel-plate", 10 }, }, - result = "radar-4", + results = {{ type = "item", name = "radar-4", amount = 1 }}, }, { @@ -48,6 +48,6 @@ data:extend({ { "iron-gear-wheel", 5 }, { "steel-plate", 10 }, }, - result = "radar-5", + results = {{ type = "item", name = "radar-5", amount = 1 }}, }, }) diff --git a/bobwarfare/prototypes/recipe/tank.lua b/bobwarfare/prototypes/recipe/tank.lua index 795117a55..84f587dcd 100644 --- a/bobwarfare/prototypes/recipe/tank.lua +++ b/bobwarfare/prototypes/recipe/tank.lua @@ -10,7 +10,7 @@ data:extend({ { "iron-gear-wheel", 15 }, { "processing-unit", 5 }, }, - result = "bob-tank-2", + results = {{ type = "item", name = "bob-tank-2", amount = 1 }}, }, { @@ -25,6 +25,6 @@ data:extend({ { "iron-gear-wheel", 15 }, { "processing-unit", 5 }, }, - result = "bob-tank-3", + results = {{ type = "item", name = "bob-tank-3", amount = 1 }}, }, }) diff --git a/bobwarfare/prototypes/recipe/turrets.lua b/bobwarfare/prototypes/recipe/turrets.lua index dfaca82fb..27f09a786 100644 --- a/bobwarfare/prototypes/recipe/turrets.lua +++ b/bobwarfare/prototypes/recipe/turrets.lua @@ -9,7 +9,7 @@ data:extend({ { "iron-gear-wheel", 10 }, { "steel-plate", 20 }, }, - result = "bob-gun-turret-2", + results = {{ type = "item", name = "bob-gun-turret-2", amount = 1 }}, }, { type = "recipe", @@ -21,7 +21,7 @@ data:extend({ { "iron-gear-wheel", 10 }, { "steel-plate", 20 }, }, - result = "bob-gun-turret-3", + results = {{ type = "item", name = "bob-gun-turret-3", amount = 1 }}, }, { type = "recipe", @@ -33,7 +33,7 @@ data:extend({ { "iron-gear-wheel", 10 }, { "steel-plate", 20 }, }, - result = "bob-gun-turret-4", + results = {{ type = "item", name = "bob-gun-turret-4", amount = 1 }}, }, { type = "recipe", @@ -45,7 +45,7 @@ data:extend({ { "iron-gear-wheel", 10 }, { "steel-plate", 20 }, }, - result = "bob-gun-turret-5", + results = {{ type = "item", name = "bob-gun-turret-5", amount = 1 }}, }, { @@ -58,7 +58,7 @@ data:extend({ { "copper-plate", 20 }, { "iron-plate", 20 }, }, - result = "bob-sniper-turret-1", + results = {{ type = "item", name = "bob-sniper-turret-1", amount = 1 }}, }, { type = "recipe", @@ -71,7 +71,7 @@ data:extend({ { "steel-plate", 20 }, { "iron-plate", 20 }, }, - result = "bob-sniper-turret-2", + results = {{ type = "item", name = "bob-sniper-turret-2", amount = 1 }}, }, { type = "recipe", @@ -84,7 +84,7 @@ data:extend({ { "steel-plate", 20 }, { "plastic-bar", 20 }, }, - result = "bob-sniper-turret-3", + results = {{ type = "item", name = "bob-sniper-turret-3", amount = 1 }}, }, { @@ -97,7 +97,7 @@ data:extend({ { "steel-plate", 20 }, { "advanced-circuit", 20 }, }, - result = "bob-laser-turret-2", + results = {{ type = "item", name = "bob-laser-turret-2", amount = 1 }}, }, { type = "recipe", @@ -109,7 +109,7 @@ data:extend({ { "steel-plate", 20 }, { "battery", 12 }, }, - result = "bob-laser-turret-3", + results = {{ type = "item", name = "bob-laser-turret-3", amount = 1 }}, }, { type = "recipe", @@ -122,7 +122,7 @@ data:extend({ { "processing-unit", 20 }, { "battery", 12 }, }, - result = "bob-laser-turret-4", + results = {{ type = "item", name = "bob-laser-turret-4", amount = 1 }}, }, { type = "recipe", @@ -135,7 +135,7 @@ data:extend({ { "processing-unit", 20 }, { "battery", 12 }, }, - result = "bob-laser-turret-5", + results = {{ type = "item", name = "bob-laser-turret-5", amount = 1 }}, }, { @@ -148,7 +148,7 @@ data:extend({ { "electronic-circuit", 80 }, { "battery", 48 }, }, - result = "bob-plasma-turret-1", + results = {{ type = "item", name = "bob-plasma-turret-1", amount = 1 }}, }, { type = "recipe", @@ -161,7 +161,7 @@ data:extend({ { "advanced-circuit", 80 }, { "battery", 48 }, }, - result = "bob-plasma-turret-2", + results = {{ type = "item", name = "bob-plasma-turret-2", amount = 1 }}, }, { type = "recipe", @@ -174,7 +174,7 @@ data:extend({ { "advanced-circuit", 80 }, { "battery", 48 }, }, - result = "bob-plasma-turret-3", + results = {{ type = "item", name = "bob-plasma-turret-3", amount = 1 }}, }, { type = "recipe", @@ -187,7 +187,7 @@ data:extend({ { "processing-unit", 80 }, { "battery", 48 }, }, - result = "bob-plasma-turret-4", + results = {{ type = "item", name = "bob-plasma-turret-4", amount = 1 }}, }, { type = "recipe", @@ -200,7 +200,7 @@ data:extend({ { "processing-unit", 80 }, { "battery", 48 }, }, - result = "bob-plasma-turret-5", + results = {{ type = "item", name = "bob-plasma-turret-5", amount = 1 }}, }, { @@ -215,7 +215,7 @@ data:extend({ { "iron-gear-wheel", 40 }, --titanium gear wheel { "processing-unit", 20 }, }, - result = "bob-artillery-turret-2", + results = {{ type = "item", name = "bob-artillery-turret-2", amount = 1 }}, }, { type = "recipe", @@ -229,6 +229,6 @@ data:extend({ { "iron-gear-wheel", 40 }, --nitinol gear wheel { "processing-unit", 20 }, --advanced processing unit }, - result = "bob-artillery-turret-3", + results = {{ type = "item", name = "bob-artillery-turret-3", amount = 1 }}, }, }) diff --git a/bobwarfare/prototypes/recipe/wall.lua b/bobwarfare/prototypes/recipe/wall.lua index 8bde1a552..10ef788c2 100644 --- a/bobwarfare/prototypes/recipe/wall.lua +++ b/bobwarfare/prototypes/recipe/wall.lua @@ -7,7 +7,7 @@ data:extend({ { "stone-brick", 3 }, { "steel-plate", 3 }, }, - result = "reinforced-wall", + results = {{ type = "item", name = "reinforced-wall", amount = 1 }}, }, { type = "recipe", @@ -18,6 +18,6 @@ data:extend({ { "steel-plate", 2 }, { "electronic-circuit", 2 }, }, - result = "reinforced-gate", + results = {{ type = "item", name = "reinforced-gate", amount = 1 }}, }, }) diff --git a/bobwarfare/prototypes/robot-parts.lua b/bobwarfare/prototypes/robot-parts.lua index cec5458f4..d672a912a 100644 --- a/bobwarfare/prototypes/robot-parts.lua +++ b/bobwarfare/prototypes/robot-parts.lua @@ -90,7 +90,7 @@ if settings.startup["bobmods-warfare-robotupdate"].value == true and bobmods.war ingredients = { { "electronic-circuit", 2 }, }, - result = "robot-brain-combat", + results = {{ type = "item", name = "robot-brain-combat", amount = 1 }}, }, { @@ -102,7 +102,7 @@ if settings.startup["bobmods-warfare-robotupdate"].value == true and bobmods.war { "electronic-circuit", 1 }, { "advanced-circuit", 1 }, }, - result = "robot-brain-combat-2", + results = {{ type = "item", name = "robot-brain-combat-2", amount = 1 }}, }, { @@ -114,7 +114,7 @@ if settings.startup["bobmods-warfare-robotupdate"].value == true and bobmods.war { "advanced-circuit", 1 }, { "processing-unit", 1 }, }, - result = "robot-brain-combat-3", + results = {{ type = "item", name = "robot-brain-combat-3", amount = 1 }}, }, { @@ -125,7 +125,7 @@ if settings.startup["bobmods-warfare-robotupdate"].value == true and bobmods.war ingredients = { { "processing-unit", 2 }, }, - result = "robot-brain-combat-4", + results = {{ type = "item", name = "robot-brain-combat-4", amount = 1 }}, }, { @@ -134,7 +134,7 @@ if settings.startup["bobmods-warfare-robotupdate"].value == true and bobmods.war energy_required = 1, enabled = false, ingredients = {}, - result = "robot-tool-combat", + results = {{ type = "item", name = "robot-tool-combat", amount = 1 }}, }, { @@ -143,7 +143,7 @@ if settings.startup["bobmods-warfare-robotupdate"].value == true and bobmods.war energy_required = 2, enabled = false, ingredients = {}, - result = "robot-tool-combat-2", + results = {{ type = "item", name = "robot-tool-combat-2", amount = 1 }}, }, { @@ -152,7 +152,7 @@ if settings.startup["bobmods-warfare-robotupdate"].value == true and bobmods.war energy_required = 3, enabled = false, ingredients = {}, - result = "robot-tool-combat-3", + results = {{ type = "item", name = "robot-tool-combat-3", amount = 1 }}, }, { @@ -161,7 +161,7 @@ if settings.startup["bobmods-warfare-robotupdate"].value == true and bobmods.war energy_required = 4, enabled = false, ingredients = {}, - result = "robot-tool-combat-4", + results = {{ type = "item", name = "robot-tool-combat-4", amount = 1 }}, }, }) end diff --git a/bobwarfare/prototypes/robots.lua b/bobwarfare/prototypes/robots.lua index 3be9ea528..11d5ac1ae 100644 --- a/bobwarfare/prototypes/robots.lua +++ b/bobwarfare/prototypes/robots.lua @@ -39,7 +39,7 @@ if settings.startup["bobmods-warfare-robotupdate"].value == true then enabled = false, energy_required = 3, ingredients = {}, - result = "defender-robot", + results = {{ type = "item", name = "defender-robot", amount = 1 }}, }, { @@ -57,7 +57,7 @@ if settings.startup["bobmods-warfare-robotupdate"].value == true then enabled = false, energy_required = 3, ingredients = {}, - result = "distractor-robot", + results = {{ type = "item", name = "distractor-robot", amount = 1 }}, }, { @@ -75,7 +75,7 @@ if settings.startup["bobmods-warfare-robotupdate"].value == true then enabled = false, energy_required = 3, ingredients = {}, - result = "destroyer-robot", + results = {{ type = "item", name = "destroyer-robot", amount = 1 }}, }, }) @@ -134,7 +134,7 @@ if settings.startup["bobmods-warfare-robotupdate"].value == true then enabled = false, energy_required = 3, ingredients = {}, - result = "bob-laser-robot", + results = {{ type = "item", name = "bob-laser-robot", amount = 1 }}, }, { @@ -145,7 +145,7 @@ if settings.startup["bobmods-warfare-robotupdate"].value == true then ingredients = { { "bob-laser-robot", 5 }, }, - result = "bob-laser-robot-capsule", + results = {{ type = "item", name = "bob-laser-robot-capsule", amount = 1 }}, }, { diff --git a/bobwarfare/prototypes/spidertron.lua b/bobwarfare/prototypes/spidertron.lua index f76ceba33..5e0029beb 100644 --- a/bobwarfare/prototypes/spidertron.lua +++ b/bobwarfare/prototypes/spidertron.lua @@ -84,7 +84,7 @@ if settings.startup["bobmods-warfare-spidertron-overhaul"].value == true then { "pipe", 3 }, { "steel-plate", 2 }, }, - result = "mech-leg-segment", + results = {{ type = "item", name = "mech-leg-segment", amount = 1 }}, }, { type = "recipe", @@ -94,7 +94,7 @@ if settings.startup["bobmods-warfare-spidertron-overhaul"].value == true then ingredients = { { "low-density-structure", 1 }, }, - result = "mech-foot", + results = {{ type = "item", name = "mech-foot", amount = 1 }}, }, { type = "recipe", @@ -106,7 +106,7 @@ if settings.startup["bobmods-warfare-spidertron-overhaul"].value == true then { "electric-engine-unit", 5 }, { "iron-gear-wheel", 4 }, }, - result = "mech-hip", + results = {{ type = "item", name = "mech-hip", amount = 1 }}, }, { type = "recipe", @@ -118,7 +118,7 @@ if settings.startup["bobmods-warfare-spidertron-overhaul"].value == true then { "electric-engine-unit", 10 }, { "iron-gear-wheel", 8 }, }, - result = "mech-knee", + results = {{ type = "item", name = "mech-knee", amount = 1 }}, }, { type = "recipe", @@ -132,7 +132,7 @@ if settings.startup["bobmods-warfare-spidertron-overhaul"].value == true then { "mech-knee", 1 }, { "copper-cable", 4 }, }, - result = "mech-leg", + results = {{ type = "item", name = "mech-leg", amount = 1 }}, }, { @@ -141,7 +141,7 @@ if settings.startup["bobmods-warfare-spidertron-overhaul"].value == true then enabled = false, energy_required = 2, ingredients = {}, - result = "mech-brain", + results = {{ type = "item", name = "mech-brain", amount = 1 }}, }, { type = "recipe", @@ -152,7 +152,7 @@ if settings.startup["bobmods-warfare-spidertron-overhaul"].value == true then { "low-density-structure", 50 }, { "mech-brain", 1 }, }, - result = "mech-frame", + results = {{ type = "item", name = "mech-frame", amount = 1 }}, }, { type = "recipe", @@ -163,7 +163,7 @@ if settings.startup["bobmods-warfare-spidertron-overhaul"].value == true then { "low-density-structure", 5 }, { "steel-plate", 2 }, }, - result = "mech-armor-plate", + results = {{ type = "item", name = "mech-armor-plate", amount = 1 }}, }, }) end @@ -490,7 +490,7 @@ data:extend({ { "steel-plate", 15 }, { "iron-gear-wheel", 5 }, }, - result = "spidertron-cannon", + results = {{ type = "item", name = "spidertron-cannon", amount = 1 }}, }, { type = "recipe", @@ -500,7 +500,7 @@ data:extend({ ingredients = { { "gun-turret", 2 }, }, - result = "antron", + results = {{ type = "item", name = "antron", amount = 1 }}, }, { type = "recipe", @@ -510,7 +510,7 @@ data:extend({ ingredients = { { "spidertron-cannon", 2 }, }, - result = "tankotron", + results = {{ type = "item", name = "tankotron", amount = 1 }}, }, { type = "recipe", @@ -521,7 +521,7 @@ data:extend({ { "gun-turret", 2 }, { "steel-chest", 1 }, }, - result = "logistic-spidertron", + results = {{ type = "item", name = "logistic-spidertron", amount = 1 }}, }, { type = "recipe", @@ -531,7 +531,7 @@ data:extend({ ingredients = { { "rocket-launcher", 8 }, }, - result = "heavy-spidertron", + results = {{ type = "item", name = "heavy-spidertron", amount = 1 }}, }, }) diff --git a/bobwarfare/prototypes/train.lua b/bobwarfare/prototypes/train.lua index 7b8bd1566..7f735a3a0 100644 --- a/bobwarfare/prototypes/train.lua +++ b/bobwarfare/prototypes/train.lua @@ -119,7 +119,7 @@ data:extend({ { "pipe", 16 }, { "processing-unit", 20 }, }, - result = "bob-artillery-wagon-2", + results = {{ type = "item", name = "bob-artillery-wagon-2", amount = 1 }}, }, { type = "recipe", @@ -133,7 +133,7 @@ data:extend({ { "pipe", 16 }, { "processing-unit", 20 }, }, - result = "bob-artillery-wagon-3", + results = {{ type = "item", name = "bob-artillery-wagon-3", amount = 1 }}, }, })