From 699c6fb1557fde22fc1307348e179842702526f6 Mon Sep 17 00:00:00 2001
From: Brevven <brevingame@gmail.com>
Date: Sun, 24 Jul 2022 14:56:39 -0700
Subject: [PATCH] basic founding fix for other machines

---
 changelog.txt             |  5 ++++-
 foundry-updates.lua       | 13 ++++++++++---
 me.lua                    |  4 ++++
 prototypes/categories.lua | 16 +++++++++-------
 4 files changed, 27 insertions(+), 11 deletions(-)

diff --git a/changelog.txt b/changelog.txt
index c6ce50f..491dedb 100644
--- a/changelog.txt
+++ b/changelog.txt
@@ -1,8 +1,11 @@
 ---------------------------------------------------------------------------------------------------
 Version: 0.2.4
-Date: 2022-07-16
+Date: 2022-07-25
   Changes:
     - ru locale thanks to Pergamum663
+  Fixes:
+    - With tin enabled, other machines set to do founding can now do solder or aai glass.
+    - Clean up some logging
 ---------------------------------------------------------------------------------------------------
 Version: 0.2.3
 Date: 2022-07-16
diff --git a/foundry-updates.lua b/foundry-updates.lua
index 4c62015..7f67f1f 100644
--- a/foundry-updates.lua
+++ b/foundry-updates.lua
@@ -20,23 +20,30 @@ if util.me.enable() then
 else
   -- If we're not using Foundry buildings, add founding recipes to assemblers in vanilla, or furnaces in K2
   local sought = mods.Krastorio2 and "smelting" or "crafting" 
-  log ("looking for "..sought)
   for i, machine in pairs(data.raw["assembling-machine"]) do
-    log(serpent.dump(machine))
     for j, category in pairs(machine.crafting_categories) do
       if category == sought then
-        log ("found  "..category)
         util.add_crafting_category("assembling-machine", machine.name, "founding")
+        if util.me.basic_founding() then
+          util.add_crafting_category("assembling-machine", machine.name, "basic-founding")
+        end
         break
       end
     end
   end
   util.add_crafting_category("assembling-machine", "industrial-furnace", "founding")
   util.add_crafting_category("assembling-machine", "kr-advanced-furnace", "founding")
+  if util.me.basic_founding() then
+    util.add_crafting_category("assembling-machine", "industrial-furnace", "basic-founding")
+    util.add_crafting_category("assembling-machine", "kr-advanced-furnace", "basic-founding")
+  end
 end
 
 for i, machine in pairs(util.me.get_other_machines()) do
   log("Allowing "..machine.." to handle founding")
   util.add_crafting_category("assembling-machine", machine, "founding")
+  if util.me.basic_founding() then
+    util.add_crafting_category("assembling-machine", machine, "basic-founding")
+  end
 end
 
diff --git a/me.lua b/me.lua
index e861b39..b2c4c96 100644
--- a/me.lua
+++ b/me.lua
@@ -2,6 +2,10 @@ local me =  {}
 
 me.name = "bzfoundry"
 
+function me.basic_founding()
+  return mods.bztin or mods.bzaluminum
+end
+
 function me.founding_plates()
   return me.get_setting("bzfoundry-plates") == "yes"
 end
diff --git a/prototypes/categories.lua b/prototypes/categories.lua
index 108fcda..fb7c931 100644
--- a/prototypes/categories.lua
+++ b/prototypes/categories.lua
@@ -1,14 +1,16 @@
+local util = require("data-util")
+
 data:extend({
   { type = "recipe-category", name = "founding"},
   { type = "item-subgroup", name = "founding-machines", group = "production"},
   { type = "item-subgroup", name = "foundry-intermediate", group = "intermediate-products"},
 })
 
-if mods.bztin or mods.bzaluminum then
-data:extend({
-  { type = "recipe-category", name = "basic-founding"},
-})
-for i, character in pairs(data.raw.character) do
-  table.insert(character.crafting_categories, "basic-founding")
-end
+if util.me.basic_founding() then
+  data:extend({
+    { type = "recipe-category", name = "basic-founding"},
+  })
+  for i, character in pairs(data.raw.character) do
+    table.insert(character.crafting_categories, "basic-founding")
+  end
 end