wafer rebalance, other 2.0 updates

locale/en/silicon.cfg

@@ -53,6 +53,5 @@ bzsilicon-more-intermediates=More complex production chains. Optional in vanilla
 bzsilicon-bio-crushed-stone=This setting is experimental, and may be removed in a future update. It's strongly recommended to keep it enabled. Only disable if your UPS is dropping due to inserter count. Added per user request.
 
 [string-mod-setting]
-bzsilicon-more-intermediates-no=no
+bzsilicon-more-intermediates-no=No
-bzsilicon-more-intermediates-yes=Yes: wafer, solar cell
+bzsilicon-more-intermediates-yes=Yes
-bzsilicon-more-intermediates-more=More (Experimental): wafer, solar cell, MEMS gyroscope

me.lua

@@ -4,13 +4,12 @@ me.silicon_processing = mods["Krastorio2"] and "kr-silicon-processing" or "silic
 me.recipes = {"silica", "silicon", "optical-fiber", "silicon-wafer", "solar-cell", "gyro", "silicon-smelting-vulcanite"}
 
 function me.use_gyros()
-  if me.get_setting("bz-all-intermediates") then return true end
+  return me.more_intermediates()
-  return me.get_setting("bzsilicon-more-intermediates") == "more"
 end
 
 function me.more_intermediates()
   if me.get_setting("bz-all-intermediates") then return true end
-  return mods["Bio_Industries"] or me.get_setting("bzsilicon-more-intermediates") == "yes" or me.use_gyros()
+  return mods["Bio_Industries"] or me.get_setting("bzsilicon-more-intermediates") == "yes"
 end
 
 function me.use_bio_crushed_stone()

prototypes/basic-crusher.lua

@@ -171,7 +171,7 @@ data:extend({
       {type = "item", name = "iron-gear-wheel", amount = 10},
 
     },
-    energy_required = 5,
+    energy_required = 2.5,
     results = {{type="item", name="basic-crusher", amount=1}}
   },
 })

prototypes/gyro.lua

@@ -2,20 +2,20 @@ local util = require("data-util");
 
 if util.me.use_gyros() then
 gyro_ingredients = {  -- outputs 4
-  {"copper-cable", 2},
+  util.item("copper-cable", 2),
-  {"silica", 1},
+  util.item("silica", 1),
-  {"silicon", 4}}
+  util.item("silicon", 4)}
 
 gyro_prereqs = {util.me.silicon_processing}
 if mods.bzcarbon then
-  table.insert(gyro_ingredients, util.item({"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, util.item({"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, util.item({"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, util.item("rare-metals", 1))

prototypes/silicon-recipe.lua

@@ -110,7 +110,7 @@ data:extend({
       {type= "item", name="silicon", amount=20},
       {type= "fluid", name="sulfuric-acid", amount=50},
     }),
-    results = {util.item("silicon-wafer", 10)}
+    results = {util.item("silicon-wafer", 30)}
   },
   {
     type = "item",

recipe-updates.lua

@@ -1,5 +1,6 @@
 local util = require("data-util");
 
+local si = util.me.more_intermediates() and "silicon-wafer" or "silicon"
 if util.me.use_gyros() then
   util.add_ingredient("flying-robot-frame", "gyro", 1)
   util.add_prerequisite("robotics", "gyro")
@@ -51,19 +52,23 @@ if not mods["Krastorio2"] then
   util.add_prerequisite("concrete", "silica-processing")
 
   if util.me.more_intermediates() then 
-    util.replace_some_ingredient("processing-unit", "electronic-circuit", 10, "silicon-wafer", 3)
+    util.replace_some_ingredient("processing-unit", "electronic-circuit", 10, "silicon-wafer", 10)
 
-    util.multiply_recipe("effectivity-module", 2)
+    util.multiply_recipe("efficiency-module", 2)
-    util.remove_ingredient("effectivity-module", "electronic-circuit")
+    util.remove_ingredient("efficiency-module", "electronic-circuit")
-    util.add_ingredient("effectivity-module", "silicon-wafer", 3)
+    util.add_ingredient("efficiency-module", "silicon-wafer", 5)
+
+    util.multiply_recipe("quality-module", 2)
+    util.remove_ingredient("quality-module", "electronic-circuit")
+    util.add_ingredient("quality-module", "silicon-wafer", 5)
 
     util.multiply_recipe("productivity-module", 2)
     util.remove_ingredient("productivity-module", "electronic-circuit")
-    util.add_ingredient("productivity-module", "silicon-wafer", 3)
+    util.add_ingredient("productivity-module", "silicon-wafer", 5)
 
     util.multiply_recipe("speed-module", 2)
     util.remove_ingredient("speed-module", "electronic-circuit")
-    util.add_ingredient("speed-module", "silicon-wafer", 3)
+    util.add_ingredient("speed-module", "silicon-wafer", 5)
 
     if mods.IndustrialRevolution then
       util.add_ingredient("solar-panel", "solar-cell", 9)
@@ -76,7 +81,7 @@ if not mods["Krastorio2"] then
     
     if not mods.modmashsplinterelectonics then
       util.multiply_recipe("advanced-circuit", 3)
-      util.replace_some_ingredient("advanced-circuit", "electronic-circuit", 3, "silicon-wafer", 1)
+      util.replace_some_ingredient("advanced-circuit", "electronic-circuit", 3, "silicon-wafer", 3)
     end
     util.add_prerequisite("advanced-circuit", util.me.silicon_processing)
 
@@ -124,24 +129,24 @@ util.replace_ingredient("red-wire", "copper-cable", "optical-fiber")
 util.replace_ingredient("red-wire", "electronic-circuit", "silicon")
 
 if not mods["IndustrialRevolution"] then
-  util.add_ingredient("arithmetic-combinator", "silicon", 1)
+  util.add_ingredient("arithmetic-combinator", si, 1)
-  util.add_ingredient("constant-combinator", "silicon", 1)
+  util.add_ingredient("constant-combinator", si, 1)
-  util.add_ingredient("decider-combinator", "silicon", 1)
+  util.add_ingredient("decider-combinator", si, 1)
-  util.add_ingredient("programmable-speaker", "silicon", 1)
+  util.add_ingredient("programmable-speaker", si, 1)
   if mods["UsefulCombinators"] then
     for i, v in ipairs(useful_combinators) do
-      util.add_ingredient(v, "silicon", 1)
+      util.add_ingredient(v, si, 1)
     end
   end
   if mods["crafting_combinator"] then
-    util.add_ingredient("crafting_combinator:crafting-combinator", "silicon", 1)
+    util.add_ingredient("crafting_combinator:crafting-combinator", si, 1)
-    util.add_ingredient("crafting_combinator:recipe-combinator", "silicon", 1)
+    util.add_ingredient("crafting_combinator:recipe-combinator", si, 1)
   end
-  util.add_ingredient("clock-combinator", "silicon", 1)
+  util.add_ingredient("clock-combinator", si, 1)
-  util.add_ingredient("power-meter-combinator", "silicon", 1)
+  util.add_ingredient("power-meter-combinator", si, 1)
-  util.add_ingredient("ghost-scanner", "silicon", 1)
+  util.add_ingredient("ghost-scanner", si, 1)
-  util.add_ingredient("item-sensor", "silicon", 1)
+  util.add_ingredient("item-sensor", si, 1)
-  util.add_ingredient("bi-pollution-sensor", "silicon", 1)
+  util.add_ingredient("bi-pollution-sensor", si, 1)
 else
   util.add_prerequisite("circuit-network", "fiber-optics")
 end
@@ -168,11 +173,11 @@ util.add_ingredient("bi-pollution-sensor", "optical-fiber", 1)
 
 -- Transport Drones
 util.add_ingredient("road-network-reader", "optical-fiber", 5)
-util.replace_some_ingredient("road-network-reader", "electronic-circuit", 5, "silicon", 5)
+util.replace_some_ingredient("road-network-reader", "electronic-circuit", 5, si, 5)
 util.add_ingredient("transport-depot-reader", "optical-fiber", 5)
-util.replace_some_ingredient("transport-depot-reader", "electronic-circuit", 5, "silicon", 5)
+util.replace_some_ingredient("transport-depot-reader", "electronic-circuit", 5, si, 5)
 util.add_ingredient("transport-depot-writer", "optical-fiber", 5)
-util.replace_some_ingredient("transport-depot-writer", "electronic-circuit", 5, "silicon", 5)
+util.replace_some_ingredient("transport-depot-writer", "electronic-circuit", 5, si, 5)
 
 
 util.add_prerequisite("circuit-network", "fiber-optics")
@@ -222,11 +227,7 @@ if mods["space-exploration"] then
 end
 
 if mods["zombiesextended-core"] then
-  if util.me.more_intermediates() then 
+  util.add_ingredient("complex-processing-unit", si, 2)
-    util.add_ingredient("complex-processing-unit", "silicon-wafer", 1)
-  else
-    util.add_ingredient("complex-processing-unit", "silicon", 2)
-  end
 end
 
 

settings.lua

@@ -5,18 +5,21 @@ data:extend( {
 		setting_type = "startup",
 		default_value = "",
     allow_blank = true,
+    order = "a-b",
 	},
   {
 		type = "string-setting",
 		name = "bzsilicon-more-intermediates",
 		setting_type = "startup",
 		default_value = "no",
-    allowed_values = {"more", "yes", "no"},
+    allowed_values = {"yes", "no"},
+    order = "a-a",
 	},
   {
 		type = "bool-setting",
 		name = "bzsilicon-bio-crushed-stone",
 		setting_type = "startup",
 		default_value = true,
+    order = "z-a"
 	},
 })