Remove result / result_count #189

Also remove short syntax of item product
modded-factorio · Jul 21, 2024 · e5604d7 · e5604d7
1 parent e214166
commit e5604d7
Show file tree

Hide file tree

Showing 107 changed files with 928 additions and 1,175 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -28,25 +28,25 @@ 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
       if data.raw.item["steel-pipe"] 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