From 0476a4fdeb74cd782fb44026d7ed999f63a0b3a5 Mon Sep 17 00:00:00 2001
From: KiwiHawk <59639+KiwiHawk@users.noreply.github.com>
Date: Wed, 29 May 2024 23:53:47 +1200
Subject: [PATCH] Energy shield ingredients and prerequisites

---
 bobequipment/prototypes/recipe/equipment.lua     | 3 ++-
 bobequipment/prototypes/recipe/updates.lua       | 3 +--
 bobequipment/prototypes/technology/equipment.lua | 2 ++
 3 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/bobequipment/prototypes/recipe/equipment.lua b/bobequipment/prototypes/recipe/equipment.lua
index a0e447d26..81462cf72 100644
--- a/bobequipment/prototypes/recipe/equipment.lua
+++ b/bobequipment/prototypes/recipe/equipment.lua
@@ -1,7 +1,8 @@
 bobmods.lib.recipe.replace_ingredient("energy-shield-equipment", "advanced-circuit", "electronic-circuit")
 data.raw.recipe["energy-shield-mk2-equipment"].ingredients = {
   { "energy-shield-equipment", 2 },
-  { "advanced-circuit", 5 }
+  { "advanced-circuit", 5 },
+  { "productivity-module", 1 },
 }
 
 data:extend({
diff --git a/bobequipment/prototypes/recipe/updates.lua b/bobequipment/prototypes/recipe/updates.lua
index 853824e76..0a990a58a 100644
--- a/bobequipment/prototypes/recipe/updates.lua
+++ b/bobequipment/prototypes/recipe/updates.lua
@@ -348,9 +348,8 @@ if data.raw.item["silicon-wafer"] then
 end
 
 if data.raw.item["advanced-processing-unit"] then
-  bobmods.lib.recipe.replace_ingredient("energy-shield-mk3-equipment", "processing-unit", "advanced-processing-unit")
-  bobmods.lib.tech.add_prerequisite("bob-energy-shield-equipment-3", "advanced-electronics-3")
   bobmods.lib.recipe.replace_ingredient("energy-shield-mk4-equipment", "processing-unit", "advanced-processing-unit")
+  bobmods.lib.tech.add_prerequisite("bob-energy-shield-equipment-4", "advanced-electronics-3")
   bobmods.lib.recipe.replace_ingredient("energy-shield-mk5-equipment", "processing-unit", "advanced-processing-unit")
   bobmods.lib.recipe.replace_ingredient("energy-shield-mk6-equipment", "processing-unit", "advanced-processing-unit")
   bobmods.lib.recipe.replace_ingredient("battery-mk4-equipment", "processing-unit", "advanced-processing-unit")
diff --git a/bobequipment/prototypes/technology/equipment.lua b/bobequipment/prototypes/technology/equipment.lua
index 2e50e8761..acb0ea3bf 100644
--- a/bobequipment/prototypes/technology/equipment.lua
+++ b/bobequipment/prototypes/technology/equipment.lua
@@ -3,6 +3,7 @@ data.raw["technology"]["energy-shield-mk2-equipment"].icons = bobmods.equipment.
   icon_size = 128,
 })
 bobmods.lib.tech.remove_prerequisite("energy-shield-mk2-equipment", "low-density-structure")
+bobmods.lib.tech.add_prerequisite("energy-shield-mk2-equipment", "productivity-module")
 
 data:extend({
   {
@@ -14,6 +15,7 @@ data:extend({
     }),
     order = "g-e-c",
     prerequisites = {
+      "advanced-electronics-2",
       "energy-shield-mk2-equipment",
       "productivity-module-2",
       "production-science-pack",