Update for Factorio 2.0 #189

Partial update of ingredients format: - bobassembly - bobclasses - bobelectronics - bobenemies - bobequipment - bobgreenhouse - boblibrary - boblogistics
modded-factorio · Aug 2, 2024 · 5ab6f35 · 5ab6f35
1 parent 31858fb
commit 5ab6f35
Show file tree

Hide file tree

Showing 38 changed files with 1,133 additions and 1,134 deletions.
diff --git a/bobassembly/prototypes/assembly-burner.lua b/bobassembly/prototypes/assembly-burner.lua
@@ -16,8 +16,8 @@ if not mods["aai-industry"] and settings.startup["bobmods-assembly-burner"].valu
       name = "burner-assembling-machine",
       enabled = false,
       ingredients = {
-        { "iron-gear-wheel", 5 },
-        { "iron-plate", 9 },
+        { type = "item", name = "iron-gear-wheel", amount = 5 },
+        { type = "item", name = "iron-plate", amount = 9 },
       },
       results = { { type = "item", name = "burner-assembling-machine", amount = 1 } },
     },
@@ -154,9 +154,9 @@ if not mods["aai-industry"] and settings.startup["bobmods-assembly-burner"].valu
       name = "steam-assembling-machine",
       enabled = false,
       ingredients = {
-        { "iron-gear-wheel", 10 },
-        { "iron-plate", 10 },
-        { "pipe", 5 },
+        { type = "item", name = "iron-gear-wheel", amount = 10 },
+        { type = "item", name = "iron-plate", amount = 10 },
+        { type = "item", name = "pipe", amount = 5 },
       },
       results = { { type = "item", name = "steam-assembling-machine", amount = 1 } },
     },

diff --git a/bobassembly/prototypes/assembly-electronics.lua b/bobassembly/prototypes/assembly-electronics.lua
@@ -139,9 +139,9 @@ if settings.startup["bobmods-assembly-electronicmachines"].value == true then
       name = "electronics-machine-1",
       enabled = false,
       ingredients = {
-        { "electronic-circuit", 5 },
-        { "iron-plate", 5 },
-        { "iron-gear-wheel", 5 },
+        { type = "item", name = "electronic-circuit", amount = 5 },
+        { type = "item", name = "iron-plate", amount = 5 },
+        { type = "item", name = "iron-gear-wheel", amount = 5 },
       },
       results = { { type = "item", name = "electronics-machine-1", amount = 1 } },
     },
@@ -306,10 +306,10 @@ if settings.startup["bobmods-assembly-electronicmachines"].value == true then
       name = "electronics-machine-2",
       enabled = false,
       ingredients = {
-        { "electronics-machine-1", 1 },
-        { "advanced-circuit", 5 },
-        { "steel-plate", 5 },
-        { "iron-gear-wheel", 5 },
+        { type = "item", name = "electronics-machine-1", amount = 1 },
+        { type = "item", name = "advanced-circuit", amount = 5 },
+        { type = "item", name = "steel-plate", amount = 5 },
+        { type = "item", name = "iron-gear-wheel", amount = 5 },
       },
       results = { { type = "item", name = "electronics-machine-2", amount = 1 } },
     },
@@ -478,10 +478,10 @@ if settings.startup["bobmods-assembly-electronicmachines"].value == true then
       name = "electronics-machine-3",
       enabled = false,
       ingredients = {
-        { "electronics-machine-2", 1 },
-        { "processing-unit", 5 },
-        { "steel-plate", 5 },
-        { "iron-gear-wheel", 5 },
+        { type = "item", name = "electronics-machine-2", amount = 1 },
+        { type = "item", name = "processing-unit", amount = 5 },
+        { type = "item", name = "steel-plate", amount = 5 },
+        { type = "item", name = "iron-gear-wheel", amount = 5 },
       },
       results = { { type = "item", name = "electronics-machine-3", amount = 1 } },
     },

diff --git a/bobassembly/prototypes/assembly-updates.lua b/bobassembly/prototypes/assembly-updates.lua
@@ -24,15 +24,15 @@ data.raw["assembling-machine"]["assembling-machine-2"].energy_usage = "135kW"
 data.raw["assembling-machine"]["assembling-machine-3"].energy_usage = "210kW"
 
 data.raw.recipe["assembling-machine-3"].ingredients = {
-  { "assembling-machine-2", 1 },
-  { "steel-plate", 9 },
-  { "advanced-circuit", 3 },
+  { type = "item", name = "assembling-machine-2", amount = 1 },
+  { type = "item", name = "steel-plate", amount = 9 },
+  { type = "item", name = "advanced-circuit", amount = 3 },
 }
 
 if data.raw.item["steel-gear-wheel"] then
-  bobmods.lib.recipe.add_ingredient("assembling-machine-3", { "steel-gear-wheel", 5 })
+  bobmods.lib.recipe.add_ingredient("assembling-machine-3", { type = "item", name = "steel-gear-wheel", amount = 5 })
 else
-  bobmods.lib.recipe.add_ingredient("assembling-machine-3", { "iron-gear-wheel", 5 })
+  bobmods.lib.recipe.add_ingredient("assembling-machine-3", { type = "item", name = "iron-gear-wheel", amount = 5 })
 end
 
 data.raw["assembling-machine"]["assembling-machine-3"].module_specification.module_slots = 3
@@ -47,9 +47,9 @@ elseif data.raw.item["brass-alloy"] then
 end
 
 if data.raw.item["steel-bearing"] then
-  bobmods.lib.recipe.add_ingredient("assembling-machine-4", { "steel-bearing", 5 })
+  bobmods.lib.recipe.add_ingredient("assembling-machine-4", { type = "item", name = "steel-bearing", amount = 5 })
 else
-  bobmods.lib.recipe.add_ingredient("assembling-machine-4", { "iron-gear-wheel", 3 })
+  bobmods.lib.recipe.add_ingredient("assembling-machine-4", { type = "item", name = "iron-gear-wheel", amount = 3 })
 end
 
 if data.raw.item["brass-gear-wheel"] then
@@ -68,9 +68,9 @@ elseif data.raw.item["tungsten-plate"] then
 end
 
 if data.raw.item["titanium-bearing"] then
-  bobmods.lib.recipe.add_ingredient("assembling-machine-5", { "titanium-bearing", 5 })
+  bobmods.lib.recipe.add_ingredient("assembling-machine-5", { type = "item", name = "titanium-bearing", amount = 5 })
 else
-  bobmods.lib.recipe.add_ingredient("assembling-machine-5", { "iron-gear-wheel", 3 })
+  bobmods.lib.recipe.add_ingredient("assembling-machine-5", { type = "item", name = "iron-gear-wheel", amount = 3 })
 end
 
 if data.raw.item["titanium-gear-wheel"] then
@@ -98,11 +98,11 @@ elseif data.raw.item["tungsten-plate"] then
 end
 
 if data.raw.item["nitinol-bearing"] then
-  bobmods.lib.recipe.add_ingredient("assembling-machine-6", { "nitinol-bearing", 5 })
+  bobmods.lib.recipe.add_ingredient("assembling-machine-6", { type = "item", name = "nitinol-bearing", amount = 5 })
 elseif data.raw.item["titanium-bearing"] then
-  bobmods.lib.recipe.add_ingredient("assembling-machine-6", { "titanium-bearing", 5 })
+  bobmods.lib.recipe.add_ingredient("assembling-machine-6", { type = "item", name = "titanium-bearing", amount = 5 })
 else
-  bobmods.lib.recipe.add_ingredient("assembling-machine-6", { "iron-gear-wheel", 3 })
+  bobmods.lib.recipe.add_ingredient("assembling-machine-6", { type = "item", name = "iron-gear-wheel", amount = 3 })
 end
 
 if data.raw.item["nitinol-gear-wheel"] then

diff --git a/bobassembly/prototypes/assembly.lua b/bobassembly/prototypes/assembly.lua
@@ -111,10 +111,10 @@ data:extend({
     name = "assembling-machine-4",
     enabled = false,
     ingredients = {
-      { "assembling-machine-3", 1 },
-      { "processing-unit", 3 },
-      { "steel-plate", 9 },
-      { "iron-gear-wheel", 5 },
+      { type = "item", name = "assembling-machine-3", amount = 1 },
+      { type = "item", name = "processing-unit", amount = 3 },
+      { type = "item", name = "steel-plate", amount = 9 },
+      { type = "item", name = "iron-gear-wheel", amount = 5 },
     },
     results = { { type = "item", name = "assembling-machine-4", amount = 1 } },
   },
@@ -291,10 +291,10 @@ data:extend({
     name = "assembling-machine-5",
     enabled = false,
     ingredients = {
-      { "assembling-machine-4", 1 },
-      { "processing-unit", 3 },
-      { "steel-plate", 9 },
-      { "iron-gear-wheel", 5 },
+      { type = "item", name = "assembling-machine-4", amount = 1 },
+      { type = "item", name = "processing-unit", amount = 3 },
+      { type = "item", name = "steel-plate", amount = 9 },
+      { type = "item", name = "iron-gear-wheel", amount = 5 },
     },
     results = { { type = "item", name = "assembling-machine-5", amount = 1 } },
   },
@@ -470,11 +470,11 @@ data:extend({
     name = "assembling-machine-6",
     enabled = false,
     ingredients = {
-      { "assembling-machine-5", 1 },
-      { "rocket-control-unit", 3 },
-      { "steel-plate", 5 },
-      { "iron-plate", 5 },
-      { "iron-gear-wheel", 5 },
+      { type = "item", name = "assembling-machine-5", amount = 1 },
+      { type = "item", name = "rocket-control-unit", amount = 3 },
+      { type = "item", name = "steel-plate", amount = 5 },
+      { type = "item", name = "iron-plate", amount = 5 },
+      { type = "item", name = "iron-gear-wheel", amount = 5 },
     },
     results = { { type = "item", name = "assembling-machine-6", amount = 1 } },
   },

diff --git a/bobassembly/prototypes/centrifuge.lua b/bobassembly/prototypes/centrifuge.lua
@@ -32,11 +32,11 @@ if settings.startup["bobmods-assembly-centrifuge"].value == true then
       energy_required = 4,
       enabled = false,
       ingredients = {
-        { "centrifuge", 1 },
-        { "refined-concrete", 100 },
-        { "steel-plate", 50 },
-        { "processing-unit", 100 },
-        { "iron-gear-wheel", 100 },
+        { type = "item", name = "centrifuge", amount = 1 },
+        { type = "item", name = "refined-concrete", amount = 100 },
+        { type = "item", name = "steel-plate", amount = 50 },
+        { type = "item", name = "processing-unit", amount = 100 },
+        { type = "item", name = "iron-gear-wheel", amount = 100 },
       },
       results = { { type = "item", name = "centrifuge-2", amount = 1 } },
       requester_paste_multiplier = 10,
@@ -47,11 +47,11 @@ if settings.startup["bobmods-assembly-centrifuge"].value == true then
       energy_required = 4,
       enabled = false,
       ingredients = {
-        { "centrifuge-2", 1 },
-        { "refined-concrete", 100 },
-        { "steel-plate", 50 },
-        { "processing-unit", 100 },
-        { "iron-gear-wheel", 100 },
+        { type = "item", name = "centrifuge-2", amount = 1 },
+        { type = "item", name = "refined-concrete", amount = 100 },
+        { type = "item", name = "steel-plate", amount = 50 },
+        { type = "item", name = "processing-unit", amount = 100 },
+        { type = "item", name = "iron-gear-wheel", amount = 100 },
       },
       results = { { type = "item", name = "centrifuge-3", amount = 1 } },
       requester_paste_multiplier = 10,

diff --git a/bobassembly/prototypes/chemical-mixing-furnace.lua b/bobassembly/prototypes/chemical-mixing-furnace.lua
@@ -82,11 +82,11 @@ then
       energy_required = 5,
       enabled = false,
       ingredients = {
-        { "electric-chemical-furnace", 1 },
-        { "steel-plate", 10 },
-        { "stone-brick", 10 },
-        { "processing-unit", 5 },
-        { "pipe", 5 },
+        { type = "item", name = "electric-chemical-furnace", amount = 1 },
+        { type = "item", name = "steel-plate", amount = 10 },
+        { type = "item", name = "stone-brick", amount = 10 },
+        { type = "item", name = "processing-unit", amount = 5 },
+        { type = "item", name = "pipe", amount = 5 },
       },
       results = { { type = "item", name = "electric-chemical-mixing-furnace", amount = 1 } },
     },
@@ -97,11 +97,11 @@ then
       energy_required = 5,
       enabled = false,
       ingredients = {
-        { "electric-chemical-mixing-furnace", 1 },
-        { "steel-plate", 10 },
-        { "stone-brick", 10 },
-        { "processing-unit", 5 },
-        { "pipe", 5 },
+        { type = "item", name = "electric-chemical-mixing-furnace", amount = 1 },
+        { type = "item", name = "steel-plate", amount = 10 },
+        { type = "item", name = "stone-brick", amount = 10 },
+        { type = "item", name = "processing-unit", amount = 5 },
+        { type = "item", name = "pipe", amount = 5 },
       },
       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
@@ -353,11 +353,11 @@ if settings.startup["bobmods-assembly-chemicalplants"].value == true then
       energy_required = 5,
       enabled = false,
       ingredients = {
-        { "chemical-plant", 1 },
-        { "steel-plate", 10 },
-        { "iron-gear-wheel", 5 },
-        { "advanced-circuit", 5 },
-        { "pipe", 5 },
+        { type = "item", name = "chemical-plant", amount = 1 },
+        { type = "item", name = "steel-plate", amount = 10 },
+        { type = "item", name = "iron-gear-wheel", amount = 5 },
+        { type = "item", name = "advanced-circuit", amount = 5 },
+        { type = "item", name = "pipe", amount = 5 },
       },
       results = { { type = "item", name = "chemical-plant-2", amount = 1 } },
     },
@@ -368,11 +368,11 @@ if settings.startup["bobmods-assembly-chemicalplants"].value == true then
       energy_required = 5,
       enabled = false,
       ingredients = {
-        { "chemical-plant-2", 1 },
-        { "steel-plate", 10 },
-        { "iron-gear-wheel", 5 },
-        { "processing-unit", 10 },
-        { "pipe", 5 },
+        { type = "item", name = "chemical-plant-2", amount = 1 },
+        { type = "item", name = "steel-plate", amount = 10 },
+        { type = "item", name = "iron-gear-wheel", amount = 5 },
+        { type = "item", name = "processing-unit", amount = 10 },
+        { type = "item", name = "pipe", amount = 5 },
       },
       results = { { type = "item", name = "chemical-plant-3", amount = 1 } },
     },
@@ -383,11 +383,11 @@ if settings.startup["bobmods-assembly-chemicalplants"].value == true then
       energy_required = 5,
       enabled = false,
       ingredients = {
-        { "chemical-plant-3", 1 },
-        { "steel-plate", 10 },
-        { "iron-gear-wheel", 5 },
-        { "processing-unit", 10 },
-        { "pipe", 5 },
+        { type = "item", name = "chemical-plant-3", amount = 1 },
+        { type = "item", name = "steel-plate", amount = 10 },
+        { type = "item", name = "iron-gear-wheel", amount = 5 },
+        { type = "item", name = "processing-unit", amount = 10 },
+        { type = "item", name = "pipe", amount = 5 },
       },
       results = { { type = "item", name = "chemical-plant-4", amount = 1 } },
     },

diff --git a/bobassembly/prototypes/distillery.lua b/bobassembly/prototypes/distillery.lua
@@ -60,10 +60,10 @@ then
       energy_required = 3,
       enabled = false,
       ingredients = {
-        { "bob-distillery", 1 },
-        { "steel-plate", 3 },
-        { "copper-plate", 3 },
-        { "pipe", 2 },
+        { type = "item", name = "bob-distillery", amount = 1 },
+        { type = "item", name = "steel-plate", amount = 3 },
+        { type = "item", name = "copper-plate", amount = 3 },
+        { type = "item", name = "pipe", amount = 2 },
       },
       results = { { type = "item", name = "bob-distillery-2", amount = 1 } },
     },
@@ -73,10 +73,10 @@ then
       energy_required = 3,
       enabled = false,
       ingredients = {
-        { "bob-distillery-2", 1 },
-        { "steel-plate", 3 },
-        { "copper-plate", 3 },
-        { "pipe", 2 },
+        { type = "item", name = "bob-distillery-2", amount = 1 },
+        { type = "item", name = "steel-plate", amount = 3 },
+        { type = "item", name = "copper-plate", amount = 3 },
+        { type = "item", name = "pipe", amount = 2 },
       },
       results = { { type = "item", name = "bob-distillery-3", amount = 1 } },
     },
@@ -87,10 +87,10 @@ then
       energy_required = 3,
       enabled = false,
       ingredients = {
-        { "bob-distillery-3", 1 },
-        { "steel-plate", 3 },
-        { "copper-plate", 3 },
-        { "pipe", 2 },
+        { type = "item", name = "bob-distillery-3", amount = 1 },
+        { type = "item", name = "steel-plate", amount = 3 },
+        { type = "item", name = "copper-plate", amount = 3 },
+        { type = "item", name = "pipe", amount = 2 },
       },
       results = { { type = "item", name = "bob-distillery-4", amount = 1 } },
     },
@@ -101,10 +101,10 @@ then
       energy_required = 3,
       enabled = false,
       ingredients = {
-        { "bob-distillery-4", 1 },
-        { "steel-plate", 3 },
-        { "copper-plate", 3 },
-        { "pipe", 2 },
+        { type = "item", name = "bob-distillery-4", amount = 1 },
+        { type = "item", name = "steel-plate", amount = 3 },
+        { type = "item", name = "copper-plate", amount = 3 },
+        { type = "item", name = "pipe", amount = 2 },
       },
       results = { { type = "item", name = "bob-distillery-5", amount = 1 } },
     },

diff --git a/bobassembly/prototypes/electric-furnace.lua b/bobassembly/prototypes/electric-furnace.lua
@@ -198,10 +198,10 @@ if settings.startup["bobmods-assembly-furnaces"].value == true and data.raw.furn
       type = "recipe",
       name = "electric-furnace-2",
       ingredients = {
-        { "electric-furnace", 1 },
-        { "steel-plate", 10 },
-        { "stone-brick", 10 },
-        { "processing-unit", 5 },
+        { type = "item", name = "electric-furnace", amount = 1 },
+        { type = "item", name = "steel-plate", amount = 10 },
+        { type = "item", name = "stone-brick", amount = 10 },
+        { type = "item", name = "processing-unit", amount = 5 },
       },
       results = { { type = "item", name = "electric-furnace-2", amount = 1 } },
       energy_required = 5,
@@ -212,10 +212,10 @@ if settings.startup["bobmods-assembly-furnaces"].value == true and data.raw.furn
       type = "recipe",
       name = "electric-furnace-3",
       ingredients = {
-        { "electric-furnace-2", 1 },
-        { "steel-plate", 10 },
-        { "stone-brick", 10 },
-        { "processing-unit", 5 },
+        { type = "item", name = "electric-furnace-2", amount = 1 },
+        { type = "item", name = "steel-plate", amount = 10 },
+        { type = "item", name = "stone-brick", amount = 10 },
+        { type = "item", name = "processing-unit", amount = 5 },
       },
       results = { { type = "item", name = "electric-furnace-3", amount = 1 } },
       energy_required = 5,