From fccbdd5552c517dbfbed352d7b6bf92af45bda95 Mon Sep 17 00:00:00 2001
From: KiwiHawk <59639+KiwiHawk@users.noreply.github.com>
Date: Mon, 12 Aug 2024 19:23:44 +1200
Subject: [PATCH] Bob's robot components renamed

Construction and Logistics tool/brain have been combined
---
 .../prototypes/ordening/angels-logistics.lua  | 24 +++++++------------
 .../components-bobs-robots-update.lua         |  8 +++----
 2 files changed, 12 insertions(+), 20 deletions(-)

diff --git a/angelsindustries/prototypes/ordening/angels-logistics.lua b/angelsindustries/prototypes/ordening/angels-logistics.lua
index 05927f16c..6578885a5 100644
--- a/angelsindustries/prototypes/ordening/angels-logistics.lua
+++ b/angelsindustries/prototypes/ordening/angels-logistics.lua
@@ -166,22 +166,14 @@ if mods["boblogistics"] then
   end
   -- robot brains
   if settings.startup["bobmods-logistics-robotparts"].value == true then
-    move_item("robot-brain-construction", "angels-robot-a", "b[construction]-a[brain]")
-    move_item("robot-brain-construction-2", "angels-robot-b", "b[construction]-a[brain]")
-    move_item("robot-brain-construction-3", "angels-robot-c", "b[construction]-a[brain]")
-    move_item("robot-brain-construction-4", "angels-robot-d", "b[construction]-a[brain]")
-    move_item("robot-tool-construction", "angels-robot-a", "b[construction]-b[tool]")
-    move_item("robot-tool-construction-2", "angels-robot-b", "b[construction]-b[tool]")
-    move_item("robot-tool-construction-3", "angels-robot-c", "b[construction]-b[tool]")
-    move_item("robot-tool-construction-4", "angels-robot-d", "b[construction]-b[tool]")
-    move_item("robot-brain-logistic", "angels-robot-a", "c[logistic]-a[brain]")
-    move_item("robot-brain-logistic-2", "angels-robot-b", "c[logistic]-a[brain]")
-    move_item("robot-brain-logistic-3", "angels-robot-c", "c[logistic]-a[brain]")
-    move_item("robot-brain-logistic-4", "angels-robot-d", "c[logistic]-a[brain]")
-    move_item("robot-tool-logistic", "angels-robot-a", "c[logistic]-b[tool]")
-    move_item("robot-tool-logistic-2", "angels-robot-b", "c[logistic]-b[tool]")
-    move_item("robot-tool-logistic-3", "angels-robot-c", "c[logistic]-b[tool]")
-    move_item("robot-tool-logistic-4", "angels-robot-d", "c[logistic]-b[tool]")
+    move_item("bob-robot-brain", "angels-robot-a", "b[robot]-a[brain]")
+    move_item("bob-robot-brain-2", "angels-robot-b", "b[robot]-a[brain]")
+    move_item("rbob-obot-brain-3", "angels-robot-c", "b[robot]-a[brain]")
+    move_item("bob-robot-brain-4", "angels-robot-d", "b[robot]-a[brain]")
+    move_item("bob-robot-tool", "angels-robot-a", "b[robot]-b[tool]")
+    move_item("bob-robot-tool-2", "angels-robot-b", "b[robot]-b[tool]")
+    move_item("bob-robot-tool-3", "angels-robot-c", "b[robot]-b[tool]")
+    move_item("bob-robot-tool-4", "angels-robot-d", "b[robot]-b[tool]")
     if mods["bobwarfare"] and settings.startup["bobmods-warfare-robotupdate"].value then
       move_item("robot-brain-combat", "angels-robot-a", "d[combat]-a[brain]")
       move_item("robot-brain-combat-2", "angels-robot-b", "d[combat]-a[brain]")
diff --git a/angelsindustries/prototypes/overrides/components-bobs-entity-update/components-bobs-robots-update.lua b/angelsindustries/prototypes/overrides/components-bobs-entity-update/components-bobs-robots-update.lua
index acbd936dc..736960d7a 100644
--- a/angelsindustries/prototypes/overrides/components-bobs-entity-update/components-bobs-robots-update.lua
+++ b/angelsindustries/prototypes/overrides/components-bobs-entity-update/components-bobs-robots-update.lua
@@ -51,15 +51,15 @@ if angelsmods.industries.components then
       {
         name = "construction-robot",
         ingredients = {
-          { type = "item", name = "robot-brain-construction", amount = 1 },
-          { type = "item", name = "robot-tool-construction", amount = 1 },
+          { type = "item", name = "bob-robot-brain", amount = 1 },
+          { type = "item", name = "bob-robot-tool", amount = 1 },
         },
       },
       {
         name = "logistic-robot",
         ingredients = {
-          { type = "item", name = "robot-brain-logistic", amount = 1 },
-          { type = "item", name = "robot-tool-logistic", amount = 1 },
+          { type = "item", name = "bob-robot-brain", amount = 1 },
+          { type = "item", name = "bob-robot-tool", amount = 1 },
         },
       },
     })