From c0daeb0a6e57a4055e2f0972b460d41d9a6b838c Mon Sep 17 00:00:00 2001
From: Brevven <brevingame@gmail.com>
Date: Sun, 16 Apr 2023 03:23:41 -0700
Subject: [PATCH] proc unit fixes

---
 changelog.txt                          |  4 ++++
 prototypes/mainboard.lua               | 24 +++++++-----------------
 prototypes/processing-unit-updates.lua |  4 ++--
 3 files changed, 13 insertions(+), 19 deletions(-)

diff --git a/changelog.txt b/changelog.txt
index 356dfd1..a4f131b 100644
--- a/changelog.txt
+++ b/changelog.txt
@@ -1,7 +1,11 @@
 ---------------------------------------------------------------------------------------------------
 Version: 0.0.14
 Date: 2023-04-16
+  Fixes:
+    - SE: Fix holmium cable mainboard recipe to use correct ingredients
   Changes:
+    - Processing unit recipe time has been further halved
+    - K2: Rare metals are now used in mainbord recipes, not processing units
     - SE: Lifesupport canisters no longer require processing units
 ---------------------------------------------------------------------------------------------------
 Version: 0.0.13
diff --git a/prototypes/mainboard.lua b/prototypes/mainboard.lua
index 115ba3c..f17b249 100644
--- a/prototypes/mainboard.lua
+++ b/prototypes/mainboard.lua
@@ -26,22 +26,6 @@ if not mods.bobelectronics then
   })
    
   if mods["space-exploration"] then
-    if mods.Krastorio2 then
-      mbi = {{"se-holmium-cable", 4}, {"advanced-circuit", 10}, {"gold-ingot", 1}}
-      mbo = {{"mainboard", 20}}
-    else
-      mbi = {{"se-holmium-cable", 2}, {"advanced-circuit", 10}, {"gold-ingot", 1}}
-      mbo = {{"mainboard", 20}}
-    end
-  end
-
-  if mods["space-exploration"] then
-    local mbo = {}
-    if mods.Krastorio2 then
-      mbo = {{"se-holmium-cable", 2}, {"advanced-circuit", 20}, {"gold-ingot", 1}}
-    else
-      mbo = {{"se-holmium-cable", 1}, {"advanced-circuit", 20}, {"gold-ingot", 1}}
-    end
     data:extend({
       {
         type = "recipe",
@@ -54,7 +38,7 @@ if not mods.bobelectronics then
         order = "d[mainboard]",
         enabled = false,
         energy_required = 5,
-        ingredients = mbo,
+        ingredients = {{"se-holmium-cable", 2}, {"advanced-circuit", 20}, {"gold-ingot", 1}},
         results = {{"mainboard", 20}},
       },
     })
@@ -63,9 +47,15 @@ if not mods.bobelectronics then
 
   if util.me.platinum() then
     util.add_ingredient("mainboard", "temperature-sensor", 10, {"force", true})
+    util.add_ingredient("mainboard-holmium", "temperature-sensor", 10, {"force", true})
   end
   if util.me.palladium() then
     util.add_ingredient("mainboard", "mlcc", 10, {"force", true})
+    util.add_ingredient("mainboard-holmium", "mlcc", 10, {"force", true})
+  end
+  if mods.Krastorio2 then
+    util.add_ingredient("mainboard", "rare-metals", 20, {"force", true})
+    util.add_ingredient("mainboard-holmium", "rare-metals", 20, {"force", true})
   end
 
 else
diff --git a/prototypes/processing-unit-updates.lua b/prototypes/processing-unit-updates.lua
index f0b3bdb..b693c4c 100644
--- a/prototypes/processing-unit-updates.lua
+++ b/prototypes/processing-unit-updates.lua
@@ -5,11 +5,11 @@ util.remove_ingredient("processing-unit", "silicon-wafer")
 util.remove_ingredient("processing-unit", "sulfuric-acid")
 util.remove_ingredient("processing-unit", "electronic-circuit")
 util.remove_ingredient("processing-unit", "advanced-circuit")
+util.remove_ingredient("processing-unit", "rare-metals") -- k2
 util.add_ingredient("processing-unit", "cpu", 1)
-util.set_recipe_time("processing-unit", 4)
+util.set_recipe_time("processing-unit", 2)
 util.add_ingredient("processing-unit", "mainboard", 1)
 
-
 util.add_unlock("se-processing-unit-holmium", "cpu-holmium")
 util.add_unlock("se-processing-unit-holmium", "mainboard-holmium")
 util.remove_recipe_effect("se-processing-unit-holmium", "se-processing-unit-holmium")