Update ingredients, results, and x-util

tburrows13 · Feb 7, 2025 · b12211e · b12211e
1 parent c167d20
commit b12211e
Show file tree

Hide file tree

Showing 16 changed files with 102 additions and 132 deletions.
diff --git a/compatibility/advanced-centrifuge/data.lua b/compatibility/advanced-centrifuge/data.lua
@@ -24,7 +24,7 @@ data:extend({
     energy_required = 60, --was 12
     enabled = false,
     category = "advanced-centrifuging",
-    ingredients = {{"uranium-ore", 46}}, -- was 10
+    ingredients = {{type="item", name="uranium-ore", amount=46}}, -- was 10
     icons = {
       {
         icon = "__base__/graphics/icons/uranium-processing.png",

diff --git a/compatibility/planetfall/data-updates.lua b/compatibility/planetfall/data-updates.lua
@@ -75,7 +75,8 @@ if mods["BrimStuff"] and data.raw.resource["sulfur-ore"] then
 end
 
 -- Stack size tweaks
-local restack = x_util.set_stack_sizerestack("brass-precursor", 30)
+local restack = x_util.set_stack_size
+restack("brass-precursor", 30)
 restack("nickel-ore", 30)
 restack("invar-precursor", 30)
 restack("motor", 50)

diff --git a/compatibility/underwater-pipes/data-updates.lua b/compatibility/underwater-pipes/data-updates.lua
@@ -8,7 +8,7 @@ data.raw.item["underwater-pipe"].hidden = true
 data.raw.recipe["underwater-pipe"].hidden = true
 
 data.raw.recipe["underwater-pipe-to-ground"].ingredients = {
-  {"ff-underwater-pipe", 20},
+  {type="item", name="ff-underwater-pipe", amount=20},
 }
 
 table.remove(data.raw.technology["underwater-pipes"].effects, 1)  -- Remove underwater pipe

diff --git a/prototypes/battery-transport.lua b/prototypes/battery-transport.lua
@@ -261,16 +261,24 @@ data:extend{ -- Battery charging interface
     name = "ff-charging-station",
     energy_required = 10,
     enabled = false,
-    ingredients = {{"steel-plate", 15}, {"advanced-circuit", 5}, {"copper-cable", 20}},
-    result = "ff-charging-station",
+    ingredients = {
+      {type="item", name="steel-plate", amount=15},
+      {type="item", name="advanced-circuit", amount=5},
+      {type="item", name="copper-cable", amount=20}
+    },
+    results = {{type="item", name="ff-charging-station", amount=1}},
   },
   {
     type = "recipe",
     name = "ff-discharging-station",
     energy_required = 10,
     enabled = false,
-    ingredients = {{"steel-plate", 15}, {"advanced-circuit", 5}, {"copper-cable", 20}},
-    result = "ff-discharging-station",
+    ingredients = {
+      {type="item", name="steel-plate", amount=15},
+      {type="item", name="advanced-circuit", amount=5},
+      {type="item", name="copper-cable", amount=20}
+    },
+    results = {{type="item", name="ff-discharging-station", amount=1}},
   },
   {
     type = "item",
@@ -308,7 +316,7 @@ data:extend{ -- Battery charging interface
     --icon_size = 128,
     subgroup = "raw-material",
     allow_as_intermediate = false,
-    ingredients = {{"battery", 1}},
+    ingredients = {{type="item", name="battery", amount=1}},
     results = {{
       name = "ff-charged-battery",
       probability = 0.98,
@@ -326,11 +334,11 @@ data:extend{ -- Battery charging interface
     enabled = false,
     ingredients =
     {
-      {"battery", 3},
-      {"advanced-circuit", 1},
-      {"ff-cobalt-ingot", 1},
+      {type="item", name="battery", amount=3},
+      {type="item", name="advanced-circuit", amount=1},
+      {type="item", name="ff-cobalt-ingot", amount=1},
     },
-    result = "ff-battery-pack",
+    results = {{type="item", name="ff-battery-pack", amount=1}},
     crafting_machine_tint =
     {
       primary = {r = 0.965, g = 0.482, b = 0.338, a = 1.000}, -- #f67a56ff
@@ -386,7 +394,7 @@ data:extend{ -- Battery charging interface
     --icon_size = 128,
     subgroup = "raw-material",
     allow_as_intermediate = false,
-    ingredients = {{"ff-battery-pack", 1}},
+    ingredients = {{type="item", name="ff-battery-pack", amount=1}},
     results = {{
       name = "ff-charged-battery-pack",
       probability = 0.995,

diff --git a/prototypes/cobalt.lua b/prototypes/cobalt.lua
@@ -93,7 +93,7 @@ data:extend{
     category = "smelting",
     enabled = false,
     energy_required = 16,
-    ingredients = {{"ff-cobalt-blast-blend", 5}},
+    ingredients = {{type="item", name="ff-cobalt-blast-blend", amount=5}},
     result = "ff-cobalt-ingot"
   },
   {
@@ -181,10 +181,10 @@ data:extend{
     unit = {
       count = 150,
       ingredients = {
-          {"automation-science-pack", 1},
-          {"logistic-science-pack", 1},
-          {"chemical-science-pack", 1},
-          {"utility-science-pack", 1},
+          {type="item", name="automation-science-pack", amount=1},
+          {type="item", name="logistic-science-pack", amount=1},
+          {type="item", name="chemical-science-pack", amount=1},
+          {type="item", name="utility-science-pack", amount=1},
       },
       time = 30
     },

diff --git a/prototypes/crating-machine.lua b/prototypes/crating-machine.lua
@@ -5,9 +5,9 @@ data.raw.item["green-wire"].ic_create_container = false
 
 local recipe1 = data.raw.recipe[IC_PREFIX.."machine-1"]
 recipe1.ingredients = {
-  {"engine-unit", 2},
-  {"fast-inserter", 4},
-  {"steel-plate", 5},
+  {type="item", name="engine-unit", amount=2},
+  {type="item", name="fast-inserter", amount=4},
+  {type="item", name="steel-plate", amount=5},
 }
 
 local technology1 = data.raw.technology[IC_PREFIX.."1"]
@@ -17,10 +17,10 @@ technology1.unit.count = 100
 
 local recipe2 = data.raw.recipe[IC_PREFIX.."machine-2"]
 recipe2.ingredients = {
-  {IC_PREFIX.."machine-1", 1},
-  {"electric-engine-unit", 2},
-  {"stack-inserter", 2},
-  {"steel-plate", 20},
+  {type="item", name=IC_PREFIX.."machine-1", amount=1},
+  {type="item", name="electric-engine-unit", amount=2},
+  {type="item", name="stack-inserter", amount=2},
+  {type="item", name="steel-plate", amount=20},
 }
 
 local technology2 = data.raw.technology[IC_PREFIX.."2"]
@@ -31,9 +31,9 @@ technology2.unit.count = 200
 local recipe3 = data.raw.recipe[IC_PREFIX.."machine-3"]
 recipe3.ingredients = {
   {IC_PREFIX.."machine-2", 1},
-  {"electric-engine-unit", 8},
-  {"advanced-circuit", 8},
-  {"steel-plate", 30},
+  {type="item", name="electric-engine-unit", amount=8},
+  {type="item", name="advanced-circuit", amount=8},
+  {type="item", name="steel-plate", amount=30},
 }
 
 local technology3 = data.raw.technology[IC_PREFIX.."3"]

diff --git a/prototypes/dredger.lua b/prototypes/dredger.lua
@@ -60,12 +60,12 @@ data:extend{
     energy_required = 5,
     ingredients =
     {
-      {"pumpjack", 1},
-      {"landfill", 100},
-      {"refined-concrete", 200},
-      {"lead-plate", 100},
+      {type="item", name="pumpjack", amount=1},
+      {type="item", name="landfill", amount=100},
+      {type="item", name="refined-concrete", amount=200},
+      {type="item", name="lead-plate", amount=100},
     },
-    result = "ff-dredging-platform",
+    results = {{type="item", name="ff-dredging-platform", amount=1}},
     enabled = false
   },
   {

diff --git a/prototypes/endgame.lua b/prototypes/endgame.lua
@@ -56,7 +56,7 @@ data:extend{
     subgroup = "space-related",
     order = "n[interstellar-communicator]",
     stack_size = 1,
-    rocket_launch_product = {"space-science-pack", 1000}
+    rocket_launch_products = {{type="item", name="space-science-pack", amount=1000}}
   },
   {
     type = "recipe",
@@ -66,12 +66,12 @@ data:extend{
     category = "crafting",
     ingredients =
     {
-      {"satellite", 1},
-      {"low-density-structure", 50},
-      --{"rocket-control-unit", 50},
-      {"nuclear-fuel", 10}
+      {type="item", name="satellite", amount=1},
+      {type="item", name="low-density-structure", amount=50},
+      --{type="item", name="rocket-control-unit", amount=50},
+      {type="item", name="nuclear-fuel", amount=10}
     },
-    result = "ff-interstellar-communicator",
+    results = {{type="item", name="ff-interstellar-communicator", amount=1}},
     requester_paste_multiplier = 1
   },
 }
@@ -85,7 +85,7 @@ data:extend{
   {"rocket-fuel", 50}
 ]]
 local satellite_item = data.raw.item["satellite"]
-satellite_item.rocket_launch_product = {"space-science-pack", 200}
+satellite_item.rocket_launch_products = {{type="item", name="space-science-pack", amount=200}}
 
 -- Reduce satellite cost
 x_util.set_ingredient("satellite", "low-density-structure", 50)

diff --git a/prototypes/offshore-tank.lua b/prototypes/offshore-tank.lua
@@ -58,12 +58,11 @@ data:extend{
     energy_required = 2,
     ingredients =
     {
-      {"iron-plate", 25},
-      {"steel-plate", 40},
-      {"storage-tank", 2},
+      {type="item", name="iron-plate", amount=25},
+      {type="item", name="steel-plate", amount=40},
+      {type="item", name="storage-tank", amount=2},
     },
-    result = "ff-offshore-storage-tank",
-    --result_count = 1,
+    results = {{type="item", name="ff-offshore-storage-tank", amount=1}},
     enabled = false,
     --always_show_made_in = true,
     --main_product = "ff-offshore-storage-tank",

diff --git a/prototypes/seismic-scanner.lua b/prototypes/seismic-scanner.lua
@@ -32,10 +32,10 @@ data:extend{
     enabled = false,
     ingredients =
     {
-      {"advanced-circuit", 5},
-      {"electric-engine-unit", 10},
-      {"lead-plate", 20},
-      {"explosives", 10}
+      {type="item", name="advanced-circuit", amount=5},
+      {type="item", name="electric-engine-unit", amount=10},
+      {type="item", name="lead-plate", amount=20},
+      {type="item", name="explosives", amount=10}
     },
     result = "ff-seismic-scanner"
   },

diff --git a/prototypes/sonar-buoy.lua b/prototypes/sonar-buoy.lua
@@ -42,7 +42,7 @@ data:extend({
       { "barrel",    10 },
       { "radar",           1 },
     },
-    result = "ff-sonar-buoy",
+    results = {{type="item", name="ff-sonar-buoy", amount=1}},
   } --[[@as data.RecipePrototype]],
   {
     type = "item",

diff --git a/prototypes/titansteel.lua b/prototypes/titansteel.lua
@@ -198,8 +198,8 @@ data:extend{
     enabled = false,
     ingredients =
     {
-      {"low-density-structure", 1},
-      {"ff-titansteel-plate", 1},
+      {type="item", name="low-density-structure", amount=1},
+      {type="item", name="ff-titansteel-plate", amount=1},
       {type = "fluid", name = "lubricant", amount = 200},
     },
     results = {

diff --git a/prototypes/trains.lua b/prototypes/trains.lua
@@ -87,28 +87,28 @@ data:extend{
 
 --[[ Was
   {
-    {"engine-unit", 20},
-    {"electronic-circuit", 10},
-    {"steel-plate", 30}
+    {type="item", name="engine-unit", amount=20},
+    {type="item", name="electronic-circuit", amount=10},
+    {type="item", name="steel-plate", amount=30}
   },
 ]]
 data.raw.recipe["locomotive"].ingredients = {
-  {"electric-engine-unit", 20},
-  {"advanced-circuit", 10},
-  {"steel-plate", 50}
+  {type="item", name="electric-engine-unit", amount=20},
+  {type="item", name="advanced-circuit", amount=10},
+  {type="item", name="steel-plate", amount=50}
 }
 
 data.raw.recipe["cargo-wagon"].ingredients = {
-  {"iron-gear-wheel", 20},
-  {"iron-plate", 40},
-  {"steel-plate", 40}
+  {type="item", name="iron-gear-wheel", amount=20},
+  {type="item", name="iron-plate", amount=40},
+  {type="item", name="steel-plate", amount=40}
 }
 
 data.raw.recipe["fluid-wagon"].ingredients = {
-  {"iron-gear-wheel", 20},
-  {"steel-plate", 32},
-  {"pipe", 16},
-  {"storage-tank", 1}
+  {type="item", name="iron-gear-wheel", amount=20},
+  {type="item", name="steel-plate", amount=32},
+  {type="item", name="pipe", amount=16},
+  {type="item", name="storage-tank", amount=1}
 }
 
 data.raw["cargo-wagon"]["cargo-wagon"].inventory_size = 50  -- was 40, will become 5 later on
diff --git a/prototypes/transport-science.lua b/prototypes/transport-science.lua
@@ -19,8 +19,8 @@ data:extend{
     energy_required = 14,
     ingredients =
     {
-      {"rail", 1},
-      {"big-electric-pole", 1}
+      {type="item", name="rail", amount=1},
+      {type="item", name="big-electric-pole", amount=1}
     },
     result_count = 2,
     result = "ff-transport-science-pack"

diff --git a/prototypes/underwater-pipe.lua b/prototypes/underwater-pipe.lua
@@ -67,11 +67,11 @@ data:extend{
     name = "ff-underwater-pipe",
     energy_required = 0.5,
     ingredients = {
-        {"pipe", 2},
-        {"steel-plate", 5},
-        {"concrete", 20},
+        {type="item", name="pipe", amount=2},
+        {type="item", name="steel-plate", amount=5},
+        {type="item", name="concrete", amount=20},
     },
-    result = "ff-underwater-pipe",
+    results = {{type="item", name="ff-underwater-pipe", amount=1}},
     enabled = false,
   },
 }