From da707e3b2d5be5c94b717792db12730eb2839f04 Mon Sep 17 00:00:00 2001
From: Brevven <brevingame@gmail.com>
Date: Sat, 2 Jul 2022 00:32:53 -0700
Subject: [PATCH] setting byproduct

---
 changelog.txt           | 2 ++
 locale/en/zirconium.cfg | 2 ++
 me.lua                  | 4 ++++
 settings.lua            | 6 ++++++
 zirconium-enriched.lua  | 6 +++---
 zirconium-recipe-se.lua | 2 +-
 zirconium-recipe.lua    | 6 +++---
 7 files changed, 21 insertions(+), 7 deletions(-)

diff --git a/changelog.txt b/changelog.txt
index 3c9eef8..1591148 100644
--- a/changelog.txt
+++ b/changelog.txt
@@ -3,6 +3,8 @@ Version: 0.6.2
 Date: 2021-07-02
   Changes:
     - SE K2 subgroup cleanup
+  Features:
+    - Setting to turn off byproduct when used with Titanium mod
 ---------------------------------------------------------------------------------------------------
 Version: 0.6.1
 Date: 2021-07-02
diff --git a/locale/en/zirconium.cfg b/locale/en/zirconium.cfg
index 55f0302..c3ac63c 100644
--- a/locale/en/zirconium.cfg
+++ b/locale/en/zirconium.cfg
@@ -57,10 +57,12 @@ dirty-water-filtration-zircon=Filter dirty water, giving zircon [item=zircon] an
 # Settings
 [mod-setting-name]
 bzzirconium-recipe-bypass=Bypass recipes
+bzzirconium-byproduct=Output byproducts
 bzzirconium-enable-intermediates=Enable cermet
 bzzirconium-enable-sorting=Enable stone sorting
 [mod-setting-description]
 bzzirconium-recipe-bypass=Skip modifying these recipes (comma-separated list).
+bzlead-byproduct=If enabled and using Titanium mod, zirconia production will output titanium as a byproduct.
 bzzirconium-enable-intermediates=Enable cermet, an advanced intermediate made from ceramics and metals.
 bzzirconium-enable-sorting=Enable "sorting" recipes to convert between zircon and stone. This is no longer as useful for burner phase as it used to be, but left as an option for certain map layouts or existing factories.
 [string-mod-setting]
diff --git a/me.lua b/me.lua
index 2b4a0e9..d330a07 100644
--- a/me.lua
+++ b/me.lua
@@ -2,6 +2,10 @@ local me = {}
 
 me.name = "bzzirconium"
 
+function me.byproduct()
+  return me.get_setting("bzzirconium-byproduct")
+end
+
 function me.use_cermet()
   return me.get_setting("bzzirconium-enable-intermediates") == "yes" or me.cermet_lds()
 end
diff --git a/settings.lua b/settings.lua
index 322264c..49a671a 100644
--- a/settings.lua
+++ b/settings.lua
@@ -6,6 +6,12 @@ data:extend({
 		default_value = "",
     allow_blank = true,
 	},
+  {
+		type = "bool-setting",
+		name = "bzzirconium-byproduct",
+		setting_type = "startup",
+    default_value = true,
+	},
   {
 		type = "string-setting",
 		name = "bzzirconium-enable-intermediates",
diff --git a/zirconium-enriched.lua b/zirconium-enriched.lua
index 841da4c..d779d1b 100644
--- a/zirconium-enriched.lua
+++ b/zirconium-enriched.lua
@@ -39,8 +39,8 @@ data:extend({
     results =
     { 
       {type = "item",  name = "enriched-zircon", amount = 6},
-      mods.bztitanium and {type = "item",  name = "titanium-ore", amount = 1} or nil,
-      {type = "fluid", name = "dirty-water", amount = 25, catalyst_amount = 25}
+      {type = "fluid", name = "dirty-water", amount = 25, catalyst_amount = 25},
+      (mods.bztitanium and util.me.byproduct()) and {type = "item",  name = "titanium-ore", amount = 1} or nil,
     },
     crafting_machine_tint =
     {
@@ -105,7 +105,7 @@ data:extend({
 			{type = "fluid", name = "water", amount = 90, catalyst_amount = 90},
 			{type = "item",  name = "stone", probability = 0.20, amount = 1},
 			{type = "item",  name = "zircon", probability = 0.20, amount = 1},
-      mods.bztitanium and
+      (mods.bztitanium and util.me.byproduct()) and
       {type = "item",  name = "titanium-ore", probability = 0.20, amount = 1} or nil,
 		},
 		crafting_machine_tint =
diff --git a/zirconium-recipe-se.lua b/zirconium-recipe-se.lua
index e259b46..7c8b36e 100644
--- a/zirconium-recipe-se.lua
+++ b/zirconium-recipe-se.lua
@@ -119,7 +119,7 @@ if string.sub(mods["space-exploration"], 1, 3) == "0.6" then
     util.set_item_subgroup("enriched-zirconium", "zirconium")
     se_delivery_cannon_recipes["enriched-zirconium"] = {name= "enriched-zirconium"}
   else
-    util.add_product("molten-zirconium", {"titanium-ore", 6})
+    if util.me.byproduct() then util.add_product("molten-zirconium", {"titanium-ore", 6}) end
   end
 
 else
diff --git a/zirconium-recipe.lua b/zirconium-recipe.lua
index 3b56989..301a428 100644
--- a/zirconium-recipe.lua
+++ b/zirconium-recipe.lua
@@ -35,7 +35,7 @@ data:extend({
           enabled = false,
           energy_required = 8,
           ingredients = {{"zircon", 5}},
-          results = mods.bztitanium and  {
+          results = mods.bztitanium and util.me.byproduct() and {
             {name="zirconia", amount_min=4, amount_max=5},
             {name="titanium-ore", amount=1, probability=.5}
           } or {{"zirconia", 5}}
@@ -44,7 +44,7 @@ data:extend({
           enabled = false,
           energy_required = 3.2,
           ingredients = {{"zircon", 1}},
-          results = mods.bztitanium and  {
+          results = mods.bztitanium and util.me.byproduct() and {
             {name="zirconia", amount=2, probability=.95},
             {name="titanium-ore", amount=1, probability=.1}
           } or {{"zirconia", 2}}
@@ -54,7 +54,7 @@ data:extend({
       enabled = false,
       energy_required = 3.2,
       ingredients = {{"zircon", 1}},
-      results = mods.bztitanium and  {
+      results = mods.bztitanium and util.me.byproduct() and {
         {"zirconia", 1}, {name="titanium-ore", amount=1, probability=.05}
         } or {{"zirconia", 2}}
     }