Updating ingredients format

For bobpower
modded-factorio · Aug 5, 2024 · ffabe59 · ffabe59
1 parent 7dbd475
commit ffabe59
Show file tree

Hide file tree

Showing 22 changed files with 310 additions and 310 deletions.
diff --git a/bobpower/prototypes/burner-generator.lua b/bobpower/prototypes/burner-generator.lua
@@ -15,9 +15,9 @@ if settings.startup["bobmods-power-burnergenerator"].value == true then
       type = "recipe",
       name = "bob-burner-generator",
       ingredients = {
-        { "stone-furnace", 1 },
-        { "iron-plate", 8 },
-        { "iron-gear-wheel", 5 },
+        { type = "item", name = "stone-furnace", amount = 1 },
+        { type = "item", name = "iron-plate", amount = 8 },
+        { type = "item", name = "iron-gear-wheel", amount = 5 },
       },
       results = { { type = "item", name = "bob-burner-generator", amount = 1 } },
     },

diff --git a/bobpower/prototypes/burner-reactor.lua b/bobpower/prototypes/burner-reactor.lua
@@ -70,9 +70,9 @@ if settings.startup["bobmods-power-heatsources"].value == true then
       energy_required = 2,
       enabled = false,
       ingredients = {
-        { "steel-furnace", 1 },
-        { "heat-pipe", 8 },
-        { "steel-plate", 6 },
+        { type = "item", name = "steel-furnace", amount = 1 },
+        { type = "item", name = "heat-pipe", amount = 8 },
+        { type = "item", name = "steel-plate", amount = 6 },
       },
       results = { { type = "item", name = "burner-reactor", amount = 1 } },
     },
@@ -196,10 +196,10 @@ if settings.startup["bobmods-power-heatsources"].value == true then
       energy_required = 3,
       enabled = false,
       ingredients = {
-        { "burner-reactor", 1 },
-        { "heat-pipe-2", 8 },
-        { "steel-plate", 6 },
-        { "concrete", 10 },
+        { type = "item", name = "burner-reactor", amount = 1 },
+        { type = "item", name = "heat-pipe-2", amount = 8 },
+        { type = "item", name = "steel-plate", amount = 6 },
+        { type = "item", name = "concrete", amount = 10 },
       },
       results = { { type = "item", name = "burner-reactor-2", amount = 1 } },
     },
@@ -241,8 +241,8 @@ if settings.startup["bobmods-power-heatsources"].value == true then
       energy_required = 2,
       enabled = false,
       ingredients = {
-        { "burner-reactor", 1 },
-        { "pipe", 5 },
+        { type = "item", name = "burner-reactor", amount = 1 },
+        { type = "item", name = "pipe", amount = 5 },
       },
       results = { { type = "item", name = "fluid-reactor", amount = 1 } },
     },
@@ -274,11 +274,11 @@ if settings.startup["bobmods-power-heatsources"].value == true then
       energy_required = 3,
       enabled = false,
       ingredients = {
-        { "fluid-reactor", 1 },
-        { "heat-pipe-2", 8 },
-        { "steel-plate", 6 },
-        { "concrete", 10 },
-        { "pipe", 5 },
+        { type = "item", name = "fluid-reactor", amount = 1 },
+        { type = "item", name = "heat-pipe-2", amount = 8 },
+        { type = "item", name = "steel-plate", amount = 6 },
+        { type = "item", name = "concrete", amount = 10 },
+        { type = "item", name = "pipe", amount = 5 },
       },
       results = { { type = "item", name = "fluid-reactor-2", amount = 1 } },
     },
@@ -405,10 +405,10 @@ if settings.startup["bobmods-power-heatsources"].value == true then
         energy_required = 2,
         enabled = false,
         ingredients = {
-          { "fluid-furnace", 1 },
-          { "heat-pipe", 8 },
-          { "steel-plate", 6 },
-          { "pipe", 3 },
+          { type = "item", name = "fluid-furnace", amount = 1 },
+          { type = "item", name = "heat-pipe", amount = 8 },
+          { type = "item", name = "steel-plate", amount = 6 },
+          { type = "item", name = "pipe", amount = 3 },
         },
         results = { { type = "item", name = "fluid-reactor", amount = 1 } },
       },

diff --git a/bobpower/prototypes/heat-pipes.lua b/bobpower/prototypes/heat-pipes.lua
@@ -9,7 +9,7 @@ then
   data.raw["heat-pipe"]["heat-pipe"].heat_buffer.max_transfer = "1GW"
   data.raw["heat-pipe"]["heat-pipe"].heat_buffer.max_temperature = 750
   data.raw["heat-pipe"]["heat-pipe"].localised_description = { "entity-description.heat-pipe", 750 }
-  bobmods.lib.recipe.set_ingredients("heat-pipe", { { "steel-plate", 5 }, { "copper-plate", 10 } })
+  bobmods.lib.recipe.set_ingredients("heat-pipe", { { type = "item", name = "steel-plate", amount = 5 }, { type = "item", name = "copper-plate", amount = 10 } })
 
   data:extend({
     {
@@ -49,8 +49,8 @@ then
       energy_required = 1,
       enabled = false,
       ingredients = {
-        { "steel-plate", 5 },
-        { "copper-plate", 10 },
+        { type = "item", name = "steel-plate", amount = 5 },
+        { type = "item", name = "copper-plate", amount = 10 },
       },
       results = { { type = "item", name = "heat-pipe-2", amount = 1 } },
     },
@@ -60,8 +60,8 @@ then
       energy_required = 1,
       enabled = false,
       ingredients = {
-        { "steel-plate", 5 },
-        { "copper-plate", 10 },
+        { type = "item", name = "steel-plate", amount = 5 },
+        { type = "item", name = "copper-plate", amount = 10 },
       },
       results = { { type = "item", name = "heat-pipe-3", amount = 1 } },
     },
@@ -71,8 +71,8 @@ then
       energy_required = 1,
       enabled = false,
       ingredients = {
-        { "steel-plate", 5 },
-        { "copper-plate", 10 },
+        { type = "item", name = "steel-plate", amount = 5 },
+        { type = "item", name = "copper-plate", amount = 10 },
       },
       results = { { type = "item", name = "heat-pipe-4", amount = 1 } },
     },

diff --git a/bobpower/prototypes/recipe/accumulators-updates.lua b/bobpower/prototypes/recipe/accumulators-updates.lua
@@ -33,6 +33,6 @@ if settings.startup["bobmods-power-accumulators"].value == true then
     end
   end
 
-  bobmods.lib.recipe.add_ingredient("accumulator", { "electronic-circuit", 2 })
-  bobmods.lib.recipe.set_ingredient("accumulator", { "battery", 10 })
+  bobmods.lib.recipe.add_ingredient("accumulator", { type = "item", name = "electronic-circuit", amount = 2 })
+  bobmods.lib.recipe.set_ingredient("accumulator", { type = "item", name = "battery", amount = 10 })
 end
diff --git a/bobpower/prototypes/recipe/accumulators.lua b/bobpower/prototypes/recipe/accumulators.lua
@@ -6,9 +6,9 @@ if settings.startup["bobmods-power-accumulators"].value == true then
       energy_required = 10,
       enabled = false,
       ingredients = {
-        { "iron-plate", 2 },
-        { "electronic-circuit", 4 },
-        { "battery", 4 },
+        { type = "item", name = "iron-plate", amount = 2 },
+        { type = "item", name = "electronic-circuit", amount = 4 },
+        { type = "item", name = "battery", amount = 4 },
       },
       results = { { type = "item", name = "fast-accumulator", amount = 1 } },
     },
@@ -19,9 +19,9 @@ if settings.startup["bobmods-power-accumulators"].value == true then
       energy_required = 10,
       enabled = false,
       ingredients = {
-        { "iron-plate", 2 },
-        { "electronic-circuit", 4 },
-        { "battery", 4 },
+        { type = "item", name = "iron-plate", amount = 2 },
+        { type = "item", name = "electronic-circuit", amount = 4 },
+        { type = "item", name = "battery", amount = 4 },
       },
       results = { { type = "item", name = "slow-accumulator", amount = 1 } },
     },
@@ -32,10 +32,10 @@ if settings.startup["bobmods-power-accumulators"].value == true then
       energy_required = 10,
       enabled = false,
       ingredients = {
-        { "accumulator", 1 },
-        { "steel-plate", 2 },
-        { "advanced-circuit", 2 },
-        { "battery", 10 },
+        { type = "item", name = "accumulator", amount = 1 },
+        { type = "item", name = "steel-plate", amount = 2 },
+        { type = "item", name = "advanced-circuit", amount = 2 },
+        { type = "item", name = "battery", amount = 10 },
       },
       results = { { type = "item", name = "large-accumulator-2", amount = 1 } },
     },
@@ -46,10 +46,10 @@ if settings.startup["bobmods-power-accumulators"].value == true then
       energy_required = 10,
       enabled = false,
       ingredients = {
-        { "fast-accumulator", 1 },
-        { "steel-plate", 2 },
-        { "advanced-circuit", 4 },
-        { "battery", 4 },
+        { type = "item", name = "fast-accumulator", amount = 1 },
+        { type = "item", name = "steel-plate", amount = 2 },
+        { type = "item", name = "advanced-circuit", amount = 4 },
+        { type = "item", name = "battery", amount = 4 },
       },
       results = { { type = "item", name = "fast-accumulator-2", amount = 1 } },
     },
@@ -60,10 +60,10 @@ if settings.startup["bobmods-power-accumulators"].value == true then
       energy_required = 10,
       enabled = false,
       ingredients = {
-        { "slow-accumulator", 1 },
-        { "steel-plate", 2 },
-        { "advanced-circuit", 4 },
-        { "battery", 4 },
+        { type = "item", name = "slow-accumulator", amount = 1 },
+        { type = "item", name = "steel-plate", amount = 2 },
+        { type = "item", name = "advanced-circuit", amount = 4 },
+        { type = "item", name = "battery", amount = 4 },
       },
       results = { { type = "item", name = "slow-accumulator-2", amount = 1 } },
     },
@@ -74,10 +74,10 @@ if settings.startup["bobmods-power-accumulators"].value == true then
       energy_required = 10,
       enabled = false,
       ingredients = {
-        { "large-accumulator-2", 1 },
-        { "steel-plate", 2 },
-        { "processing-unit", 2 },
-        { "battery", 10 },
+        { type = "item", name = "large-accumulator-2", amount = 1 },
+        { type = "item", name = "steel-plate", amount = 2 },
+        { type = "item", name = "processing-unit", amount = 2 },
+        { type = "item", name = "battery", amount = 10 },
       },
       results = { { type = "item", name = "large-accumulator-3", amount = 1 } },
     },
@@ -88,10 +88,10 @@ if settings.startup["bobmods-power-accumulators"].value == true then
       energy_required = 10,
       enabled = false,
       ingredients = {
-        { "fast-accumulator-2", 1 },
-        { "steel-plate", 2 },
-        { "processing-unit", 4 },
-        { "battery", 4 },
+        { type = "item", name = "fast-accumulator-2", amount = 1 },
+        { type = "item", name = "steel-plate", amount = 2 },
+        { type = "item", name = "processing-unit", amount = 4 },
+        { type = "item", name = "battery", amount = 4 },
       },
       results = { { type = "item", name = "fast-accumulator-3", amount = 1 } },
     },
@@ -102,10 +102,10 @@ if settings.startup["bobmods-power-accumulators"].value == true then
       energy_required = 10,
       enabled = false,
       ingredients = {
-        { "slow-accumulator-2", 1 },
-        { "steel-plate", 2 },
-        { "processing-unit", 4 },
-        { "battery", 4 },
+        { type = "item", name = "slow-accumulator-2", amount = 1 },
+        { type = "item", name = "steel-plate", amount = 2 },
+        { type = "item", name = "processing-unit", amount = 4 },
+        { type = "item", name = "battery", amount = 4 },
       },
       results = { { type = "item", name = "slow-accumulator-3", amount = 1 } },
     },

diff --git a/bobpower/prototypes/recipe/boilers-updates.lua b/bobpower/prototypes/recipe/boilers-updates.lua
@@ -1,6 +1,6 @@
 if settings.startup["bobmods-power-steam"].value == true then
   if data.raw.item["steel-pipe"] then
-    bobmods.lib.recipe.add_ingredient("boiler-2", { "steel-pipe", 4 })
+    bobmods.lib.recipe.add_ingredient("boiler-2", { type = "item", name = "steel-pipe", amount = 4 })
   end
 
   if data.raw.item["invar-alloy"] then
@@ -9,7 +9,7 @@ if settings.startup["bobmods-power-steam"].value == true then
   end
 
   if data.raw.item["brass-pipe"] then
-    bobmods.lib.recipe.add_ingredient("boiler-3", { "brass-pipe", 4 })
+    bobmods.lib.recipe.add_ingredient("boiler-3", { type = "item", name = "brass-pipe", amount = 4 })
     bobmods.lib.tech.add_prerequisite("bob-boiler-3", "zinc-processing")
   end
 
@@ -19,7 +19,7 @@ if settings.startup["bobmods-power-steam"].value == true then
   end
 
   if data.raw.item["ceramic-pipe"] then
-    bobmods.lib.recipe.add_ingredient("boiler-4", { "ceramic-pipe", 4 })
+    bobmods.lib.recipe.add_ingredient("boiler-4", { type = "item", name = "ceramic-pipe", amount = 4 })
     bobmods.lib.tech.add_prerequisite("bob-boiler-4", "ceramics")
   end
 
@@ -29,8 +29,8 @@ if settings.startup["bobmods-power-steam"].value == true then
   end
 
   if data.raw.item["copper-tungsten-pipe"] then
-    bobmods.lib.recipe.add_ingredient("boiler-5", { "copper-tungsten-pipe", 4 })
+    bobmods.lib.recipe.add_ingredient("boiler-5", { type = "item", name = "copper-tungsten-pipe", amount = 4 })
   elseif data.raw.item["tungsten-pipe"] then
-    bobmods.lib.recipe.add_ingredient("boiler-5", { "tungsten-pipe", 4 })
+    bobmods.lib.recipe.add_ingredient("boiler-5", { type = "item", name = "tungsten-pipe", amount = 4 })
   end
 end
diff --git a/bobpower/prototypes/recipe/boilers.lua b/bobpower/prototypes/recipe/boilers.lua
@@ -5,8 +5,8 @@ if settings.startup["bobmods-power-steam"].value == true then
       name = "boiler-2",
       enabled = false,
       ingredients = {
-        { "boiler", 1 },
-        { "steel-plate", 5 },
+        { type = "item", name = "boiler", amount = 1 },
+        { type = "item", name = "steel-plate", amount = 5 },
       },
       results = { { type = "item", name = "boiler-2", amount = 1 } },
     },
@@ -16,8 +16,8 @@ if settings.startup["bobmods-power-steam"].value == true then
       name = "boiler-3",
       enabled = false,
       ingredients = {
-        { "boiler-2", 1 },
-        { "steel-plate", 5 },
+        { type = "item", name = "boiler-2", amount = 1 },
+        { type = "item", name = "steel-plate", amount = 5 },
       },
       results = { { type = "item", name = "boiler-3", amount = 1 } },
     },
@@ -27,8 +27,8 @@ if settings.startup["bobmods-power-steam"].value == true then
       name = "boiler-4",
       enabled = false,
       ingredients = {
-        { "boiler-3", 1 },
-        { "steel-plate", 5 },
+        { type = "item", name = "boiler-3", amount = 1 },
+        { type = "item", name = "steel-plate", amount = 5 },
       },
       results = { { type = "item", name = "boiler-4", amount = 1 } },
     },
@@ -38,8 +38,8 @@ if settings.startup["bobmods-power-steam"].value == true then
       name = "boiler-5",
       enabled = false,
       ingredients = {
-        { "boiler-4", 1 },
-        { "steel-plate", 5 },
+        { type = "item", name = "boiler-4", amount = 1 },
+        { type = "item", name = "steel-plate", amount = 5 },
       },
       results = { { type = "item", name = "boiler-5", amount = 1 } },
     },