From 26069b4fe01175ef92320e4b04a1320291170c85 Mon Sep 17 00:00:00 2001
From: Brevven <brevingame@gmail.com>
Date: Sat, 1 Jan 2022 00:03:17 -0800
Subject: [PATCH] se, aai, k2 fixes

---
 carbon-recipe-final-se.lua |  5 ++++-
 carbon-recipe-updates.lua  | 14 ++++++++++----
 changelog.txt              |  6 ++++--
 data-final-fixes.lua       |  7 +++++++
 4 files changed, 25 insertions(+), 7 deletions(-)

diff --git a/carbon-recipe-final-se.lua b/carbon-recipe-final-se.lua
index c16dfcc..f31a0dd 100644
--- a/carbon-recipe-final-se.lua
+++ b/carbon-recipe-final-se.lua
@@ -24,6 +24,10 @@ if bzutil.me.use_fullerenes() then
       result = "se-aeroframe-scaffold",
       result_count = 2,
     },
+  })
+  bzutil.add_effect("se-aeroframe-scaffold", {type="unlock-recipe", recipe="aeroframe-scaffold-nanotubes"})
+
+  data:extend({
     {
       type = "recipe",
       name = "nanomaterial-nanotubes",
@@ -46,7 +50,6 @@ if bzutil.me.use_fullerenes() then
     }
   })
   bzutil.add_to_product("nanomaterial-nanotubes", "se-nanomaterial", 16)
-  bzutil.add_effect("nanotubes", {type="unlock-recipe", recipe="aeroframe-scaffold-nanotubes"})
   bzutil.add_effect("se-nanomaterial", {type="unlock-recipe", recipe="nanomaterial-nanotubes"})
 
   -- core mining balancing
diff --git a/carbon-recipe-updates.lua b/carbon-recipe-updates.lua
index 7ee01c5..8c12306 100644
--- a/carbon-recipe-updates.lua
+++ b/carbon-recipe-updates.lua
@@ -36,8 +36,8 @@ if util.me.use_fullerenes() then
   -- SE
   util.add_ingredient("se-vitalic-reagent", "fullerenes", 4)
   util.add_ingredient("se-medpack-2", "fullerenes", 100)
-  util.add_ingredient("se-nutrient-gel", "fullerene", 5)
-  util.add_ingredient("se-nutrient-gel-coal", "fullerene", 5)
+  util.add_ingredient("se-nutrient-gel", "fullerenes", 5)
+  util.add_ingredient("se-nutrient-gel-coal", "fullerenes", 5)
 end
 
 
@@ -63,7 +63,6 @@ if util.me.use_carbon_black() then
 end
 
 
-util.replace_some_ingredient("electronic-circuit", "copper-cable", 1, "graphite", 1)
 util.add_ingredient("battery", "graphite", 1)
 util.add_ingredient("pump", "graphite", 2)
 
@@ -83,6 +82,7 @@ else
 end
 util.add_ingredient("assembling-machine-3", "diamond", 4)
 util.add_ingredient("low-density-structure", "diamond", 1)
+util.add_ingredient("se-low-density-structure-beryllium", "diamond", 1)
 util.add_ingredient("laser-turret", "diamond", 1)
 
 if mods.Krastorio2 then
@@ -93,9 +93,15 @@ elseif mods.bzfoundry then
   util.replace_some_ingredient("tungsten-carbide", "tungsten-plate", 1, "graphite", 1)
 end
 
-util.multiply_recipe("lubricant", 2)
+if not mods.Krastorio2 then
+  util.multiply_recipe("lubricant", 2)
+end
 util.replace_some_ingredient("lubricant", "heavy-oil", 10, "graphite", 1)
 
+-- SE Lubricant
+util.multiply_recipe("se-cryonite-lubricant", 2)
+util.replace_some_ingredient("se-cryonite-lubricant", "se-cryonite-slush", 10, "graphite", 1)
+
 util.add_ingredient("nuclear-reactor", "graphite", 500)
 
 util.add_ingredient("power-armor-mk2", "graphene", 30)
diff --git a/changelog.txt b/changelog.txt
index 6bc3d32..30eee09 100644
--- a/changelog.txt
+++ b/changelog.txt
@@ -2,8 +2,10 @@
 Version: 0.0.4
 Date: 2022-01-01
   Changes:
-    - SE: More facility recipes
-      SE: Nutrient gel
+    - SE: More facility recipes, Nutrient gel, LDS diamonds, alt lube, unlocks
+    - K2 green circuit fix
+    - AAI green circuit fix
+
 ---------------------------------------------------------------------------------------------------
 Version: 0.0.3
 Date: 2021-12-31
diff --git a/data-final-fixes.lua b/data-final-fixes.lua
index 4e3c624..a453dee 100644
--- a/data-final-fixes.lua
+++ b/data-final-fixes.lua
@@ -6,6 +6,13 @@ require("carbon-recipe-modules") -- Should be last import
 
 local util = require("__bzcarbon__.data-util");
 
+
+-- Green circuits in final fixes due to K2 shenanigans 
+util.replace_some_ingredient("electronic-circuit", "copper-cable", 1, "graphite", 1)
+-- AAI alternate green circuit
+util.replace_some_ingredient("electronic-circuit-stone", "copper-cable", 1, "graphite", 1)
+
+
 -- Only electric smelters can make Diamonds
 function diamondsInElectricSmelter(entity)
   if entity.energy_source.type == "electric" then