From 7c680d111293f69deaebb44adab17cab0c9e8deb Mon Sep 17 00:00:00 2001
From: Brevven <brevingame@gmail.com>
Date: Fri, 15 Jul 2022 17:40:56 -0700
Subject: [PATCH] prod

---
 changelog.txt          | 1 +
 compatibility/248k.lua | 2 +-
 data-final-fixes.lua   | 2 +-
 tin-recipe-updates.lua | 6 +++---
 4 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/changelog.txt b/changelog.txt
index 0c15693..4a8de8f 100644
--- a/changelog.txt
+++ b/changelog.txt
@@ -4,6 +4,7 @@ Date: 2022-07-16
   Changes:
     - Machine coloring tweaks
   Fixes:
+    - K2, AAI, 248k etc: Tin in glass recipes no longer affected by productivity
     - (minor) ordering of solder item
 ---------------------------------------------------------------------------------------------------
 Version: 0.0.4
diff --git a/compatibility/248k.lua b/compatibility/248k.lua
index f11ac08..7fa3302 100644
--- a/compatibility/248k.lua
+++ b/compatibility/248k.lua
@@ -5,6 +5,6 @@ if mods["248k"] then
 
   -- glass
   util.replace_some_ingredient("fi_cast_glass_recipe", "fi_arc_glass", 5, "tin-plate", 1)
-  util.add_product("fi_cast_glass_recipe", {type="item", name="tin-plate", amount=1, probability=0.8})
+  util.add_product("fi_cast_glass_recipe", {type="item", name="tin-plate", amount=1, catalyst_amount=1, probability=0.8})
   util.set_main_product("fi_cast_glass_recipe", "fi_materials_glass")
 end
diff --git a/data-final-fixes.lua b/data-final-fixes.lua
index 916b2ee..7007253 100644
--- a/data-final-fixes.lua
+++ b/data-final-fixes.lua
@@ -5,7 +5,7 @@ require("tin-recipe-final-rrr")
 
 local util = require("data-util");
 util.replace_some_ingredient("se-glass-vulcanite", "sand", 1, "tin-plate", 1)
-util.add_product("se-glass-vulcanite", {type="item", name="tin-plate", amount=1, probability=0.8})
+util.add_product("se-glass-vulcanite", {type="item", name="tin-plate", amount=1, catalyst_amount=1, probability=0.8})
 util.set_main_product("se-glass-vulcanite", "glass")
 
 -- core mining balancing
diff --git a/tin-recipe-updates.lua b/tin-recipe-updates.lua
index ff68b68..ccd2a11 100644
--- a/tin-recipe-updates.lua
+++ b/tin-recipe-updates.lua
@@ -39,7 +39,7 @@ util.add_ingredient("se-holmium-solenoid", "solder", 2)
 -- glass
 if mods.Krastorio2 then
   util.replace_some_ingredient("glass", "sand", 1, "tin-plate", 1)
-  util.add_product("glass", {type="item", name="tin-plate", amount=1, probability=0.8})
+  util.add_product("glass", {type="item", name="tin-plate", amount=1, catalyst_amount=1, probability=0.8})
   util.set_main_product("glass", "glass")
 else 
   if mods.bzfoundry then
@@ -50,13 +50,13 @@ else
 
     -- aai
     util.replace_some_ingredient("glass-from-sand", "sand", 1, "tin-plate", 1)
-    util.add_product("glass-from-sand", {type="item", name="tin-plate", amount=1, probability=0.8})
+    util.add_product("glass-from-sand", {type="item", name="tin-plate", amount=1, catalyst_amount=1, probability=0.8})
     util.set_main_product("glass-from-sand", "glass")
     util.set_category("glass-from-sand", "basic-founding")
 
     -- sand and glass
     util.replace_some_ingredient("sng-glass-plate", "sng-sand", 1, "tin-plate", 1)
-    util.add_product("sng-glass-plate", {type="item", name="tin-plate", amount=1, probability=0.8})
+    util.add_product("sng-glass-plate", {type="item", name="tin-plate", amount=1, catalyst_amount=1, probability=0.8})
     util.set_main_product("sng-glass-plate", "sng-glass-plate")
     util.set_category("sng-glass-plate", "basic-founding")
   end