From 16bfef0246542d7d4e6c850c6e1f830bcddf0550 Mon Sep 17 00:00:00 2001
From: KiwiHawk <59639+KiwiHawk@users.noreply.github.com>
Date: Wed, 20 Dec 2023 19:20:40 +1300
Subject: [PATCH] Bob's compatibility #911

- Make sure Enhancement Block 5 is available for Radar 5
- Fix packs for Bob's Drone techs (when Logistics mod isn't enabled)
- Hide Bob's oil processing recipe (when MCI and Electronics aren't enabled)
---
 .../components-bobs-radar-update.lua              |  2 ++
 .../overrides/global-tech-bobs-packs.lua          | 15 +++++++++++----
 .../prototypes/override/boblogistics.lua          |  2 ++
 3 files changed, 15 insertions(+), 4 deletions(-)

diff --git a/angelsindustries/prototypes/overrides/components-bobs-entity-update/components-bobs-radar-update.lua b/angelsindustries/prototypes/overrides/components-bobs-entity-update/components-bobs-radar-update.lua
index 6e976b769..f224754db 100644
--- a/angelsindustries/prototypes/overrides/components-bobs-entity-update/components-bobs-radar-update.lua
+++ b/angelsindustries/prototypes/overrides/components-bobs-entity-update/components-bobs-radar-update.lua
@@ -56,6 +56,8 @@ if angelsmods.industries.components then
       },
     })
 
+    angelsmods.industries.blocks.enhancement5 = true
+
     if angelsmods.industries.tech then
       OV.add_prereq("radars-2", "tech-specialised-labs-basic-enhance-2")
       OV.add_prereq("radars-3", "tech-specialised-labs-basic-enhance-3")
diff --git a/angelsindustries/prototypes/overrides/global-tech-bobs-packs.lua b/angelsindustries/prototypes/overrides/global-tech-bobs-packs.lua
index 9f6878042..66c62ffc6 100644
--- a/angelsindustries/prototypes/overrides/global-tech-bobs-packs.lua
+++ b/angelsindustries/prototypes/overrides/global-tech-bobs-packs.lua
@@ -301,10 +301,17 @@ if angelsmods.industries.tech then
     OV.add_prereq("bob-laser-rifle-ammo-3", "military-3")
     --Drones/CombatBots
     AI.pack_replace("bob-robot-gun-1", "green", "orange")
-    AI.pack_replace("bob-robot-gun-drones", "green", "orange")
-    AI.pack_replace("bob-robot-plasma-drones", "green", "orange")
-    AI.pack_replace("bob-robot-laser-drones", "green", "orange")
-    AI.pack_replace("bob-robot-flamethrower-drones", "green", "orange")
+    if mods["boblogistics"] then
+      AI.pack_replace("bob-robot-gun-drones", "green", "orange")
+      AI.pack_replace("bob-robot-plasma-drones", "green", "orange")
+      AI.pack_replace("bob-robot-laser-drones", "green", "orange")
+      AI.pack_replace("bob-robot-flamethrower-drones", "green", "orange")
+    else
+      AI.pack_replace("bob-robot-gun-drones", "blue", "orange")
+      AI.pack_replace("bob-robot-plasma-drones", "blue", "orange")
+      AI.pack_replace("bob-robot-laser-drones", "blue", "orange")
+      AI.pack_replace("bob-robot-flamethrower-drones", "blue", "orange")
+    end
     AI.pack_replace("bob-laser-robot", "blue", "yellow")
     --Rockets
     AI.pack_replace("rocketry", "green", "orange")
diff --git a/angelspetrochem/prototypes/override/boblogistics.lua b/angelspetrochem/prototypes/override/boblogistics.lua
index 54af654ce..756e99861 100644
--- a/angelspetrochem/prototypes/override/boblogistics.lua
+++ b/angelspetrochem/prototypes/override/boblogistics.lua
@@ -5,4 +5,6 @@ if mods["boblogistics"] then
   angelsmods.functions.move_item("angels-storage-tank-1", "angels-fluid-tanks", "c[large-tank]-c[gas]")
   angelsmods.functions.move_item("angels-storage-tank-2", "angels-fluid-tanks", "c[large-tank]-b[oil]")
   angelsmods.functions.move_item("angels-storage-tank-3", "angels-fluid-tanks", "c[large-tank]-a[inline]")
+
+  OV.hide_recipe("bob-oil-processing")
 end