update to 2.0

prototypes/gyro.lua

@@ -8,18 +8,17 @@ gyro_ingredients = {  -- outputs 4
 
 gyro_prereqs = {util.me.silicon_processing}
 if mods.bzcarbon then
-  table.insert(gyro_ingredients, {"diamond", 1})
+  table.insert(gyro_ingredients, util.item({"diamond", 1}))
   table.insert(gyro_prereqs, "diamond-processing")
 end
 if mods.bztungsten then
-  table.insert(gyro_ingredients, {"tungsten-plate", 1})
+  table.insert(gyro_ingredients, util.item({"tungsten-plate", 1}))
   table.insert(gyro_prereqs, "tungsten-processing")
 elseif mods.bztitanium then
-  table.insert(gyro_ingredients, {"titanium-plate", 1})
+  table.insert(gyro_ingredients, util.item({"titanium-plate", 1}))
   table.insert(gyro_prereqs, "titanium-processing")
 elseif mods.Krastorio2 then
-  table.insert(gyro_ingredients, {"rare-metals", 1})
-  -- table.insert(gyro_prereqs, "titanium-processing")
+  table.insert(gyro_ingredients, util.item("rare-metals", 1))
 end
 
 
@@ -40,9 +39,9 @@ data:extend({
     subgroup = "intermediate-product",
     enabled = false,
     energy_required = 12,
+    allow_productivity = true,
     ingredients = gyro_ingredients,
-    result = "gyro",
-    result_count = 4,
+    results = {util.item("gyro", 4)},
   },
   {
     type = "technology",

prototypes/optical-fiber.lua

@@ -14,20 +14,16 @@ data:extend(
   {
     type = "recipe",
     name = "optical-fiber",
-    normal = 
-    {
-      enabled = false,
-      ingredients = {{"silica", 1}},
-      result = "optical-fiber",
-      result_count = 1
-    },
-    expensive =
-    {
-      enabled = false,
-      ingredients = {{"silica", 2}},
-      result = "optical-fiber",
-      result_count = 1
-    },
+    enabled = false,
+    allow_productivity = true,
+    ingredients = {util.item("silica", 1)},
+    results = {util.item("optical-fiber",  1)},
+    -- expensive =
+    -- {
+    --   enabled = false,
+    --   ingredients = {{"silica", 2}},
+    --   results = {util.item("optical-fiber",  1)},
+    -- },
   },
 
   {
@@ -52,7 +48,7 @@ data:extend(
       },
       time = 10
     },
-    prerequisites = {"optics", "silica-processing"},
+    prerequisites = {"lamp", "silica-processing"},
     order = "b-b"
   },
 }

prototypes/silica-recipe.lua

@@ -8,48 +8,44 @@ data:extend(
     category = "crushing",
     enabled = false,
     energy_required = 4,
-    ingredients = {{"quartz", 10}},
-    result = "silica",
-    result_count = 30
+    allow_productivity = true,
+    ingredients = {util.item("quartz", 10)},
+    results = {util.item("silica", 30)}
   } or util.me.use_bio_crushed_stone() and {
     type = "recipe",
     name = "silica",
     category = "smelting",
     enabled = false,
     energy_required = 6,
-    ingredients = {{"stone-crushed", 4}},
-    result = "silica",
-    result_count = 5,
+    allow_productivity = true,
+    ingredients = {util.item("stone-crushed", 4)},
+    results = {util.item("silica", 5)},
   } or mods["omnimatter"] and {
     type = "recipe",
     name = "silica",
     category = "smelting",
     enabled = false,
     energy_required = 6,
-    ingredients = {{"stone-crushed", 4}},
-    result = "silica",
-    result_count = 5,
+    allow_productivity = true,
+    ingredients = {util.item("stone-crushed", 4)},
+    results = {util.item("silica", 5)},
   } or
   {
     type = "recipe",
     name = "silica",
-    category = "smelting",
-    normal = 
-    {
-      enabled = false,
-      energy_required = 3.2,
-      ingredients = {{"stone-brick", 1}},
-      result = "silica",
-      result_count = 5
-    },
-    expensive =
-    {
-      enabled = false,
-      energy_required = 6.4,
-      ingredients = {{"stone-brick", 2}},
-      result = "silica",
-      result_count = 5
-    },
+    category = mods["space-age"] and "basic-crushing" or "smelting",
+    enabled = false,
+    energy_required = 3.2,
+    allow_productivity = true,
+    ingredients = mods["space-age"] and {util.item("stone", 2)} or {util.item("stone-brick", 1)},
+    results = {util.item("silica", 5)}
+    -- expensive =
+    -- {
+    --   enabled = false,
+    --   energy_required = 6.4,
+    --   ingredients = {util.item("stone-brick", 2)},
+    --   results = {util.item("silica", 5)}
+    -- },
     
   },
   {

prototypes/silicon-recipe.lua

@@ -16,32 +16,29 @@ data:extend(
     category = "smelting",
     enabled = false,
     energy_required = 14.4,
+    allow_productivity = true,
     ingredients = {
-      {"silica", 18},
-      {"coke", 1}
+      util.item("silica", 18),
+      util.item("coke", 1),
     },
-    result = "silicon",
-    result_count = 3
+    results = {util.item("silicon", 3)}
   } or {
     type = "recipe",
     name = "silicon",
     category = "smelting",
-    normal = 
-    {
-      enabled = false,
-      energy_required = 3.2,
-      ingredients = {{"silica", 10}},
-      result = "silicon",
-      result_count = 1
-    },
-    expensive =
-    {
-      enabled = false,
-      energy_required = 3.2,
-      ingredients = {{"silica", 10}},
-      result = "silicon",
-      result_count = 1
-    },
+    enabled = false,
+    energy_required = 3.2,
+    allow_productivity = true,
+    ingredients = {util.item("silica", 10)},
+    results = {util.item("silicon", 1)}
+    -- expensive =
+    -- {
+    --   enabled = false,
+    --   energy_required = 3.2,
+    --   ingredients = {{"silica", 10}},
+    --   result = "silicon",
+    --   result_count = 1
+    -- },
     
   },
   (not mods["Krastorio2"]) and 
@@ -105,6 +102,7 @@ data:extend({
     subgroup = "intermediate-product",
     enabled = false,
     energy_required = 20,
+    allow_productivity = true,
     ingredients = (mods["Krastorio2"] and {
       {type= "item", name="silicon", amount=20},
       {type= "fluid", name="hydrogen-chloride", amount=50},
@@ -112,8 +110,7 @@ data:extend({
       {type= "item", name="silicon", amount=20},
       {type= "fluid", name="sulfuric-acid", amount=50},
     }),
-    result = "silicon-wafer",
-    result_count = 10,
+    results = {util.item("silicon-wafer", 10)}
   },
   {
     type = "item",
@@ -131,6 +128,7 @@ data:extend({
     subgroup = "intermediate-product",
     enabled = false,
     energy_required = 2,
+    allow_productivity = true,
     ingredients = (mods["bzlead"] and not mods["angelssmelting"] and {
       {type= "item", name="silicon", amount=1},
       {type= "item", name="electronic-circuit", amount=1},
@@ -139,8 +137,7 @@ data:extend({
       {type= "item", name="silicon", amount=1},
       {type= "item", name="electronic-circuit", amount=1},
     }),
-    result = "solar-cell",
-    result_count = 2,
+    results = {util.item("solar-cell", 2)}
   },
 })