From 44f8f27e677ca51c851dfec19e9f9526d4bd91ba Mon Sep 17 00:00:00 2001
From: KiwiHawk <59639+KiwiHawk@users.noreply.github.com>
Date: Mon, 27 May 2024 18:38:07 +1200
Subject: [PATCH] Earlier bots (#182)

* Robot tiers #180

* Robot tiers #180

* Robot tiers #180

- Remove red circuits from recipes for red and yellow chests
- Leave blue chests at blue science

* Robot tiers #180

Remove roboport recipe update setting

* Robot tiers #180

Use red circuits for T1 roboports

* Adding missing prerequisites

* Robot tiers #180

* Missing prerequisites

* Robot tiers #180

* Robot tiers #180

* Format Code

---------

Co-authored-by: StyLuaFormatter <KiwiHawk@users.noreply.github.com>
---
 bobclasses/changelog.txt                      |  5 ++
 bobclasses/info.json                          |  2 +-
 bobclasses/prototypes/bodies.lua              |  3 +-
 bobclasses/prototypes/parts.lua               |  2 +-
 bobclasses/prototypes/recipe-updates.lua      | 14 ++---
 bobequipment/changelog.txt                    |  5 ++
 bobequipment/info.json                        |  2 +-
 bobequipment/prototypes/personal-roboport.lua |  2 +-
 bobequipment/prototypes/recipe/updates.lua    |  4 +-
 .../prototypes/technology/equipment.lua       |  3 ++
 boblogistics/changelog.txt                    |  5 ++
 boblogistics/info.json                        |  2 +-
 boblogistics/locale/en/boblogistics.cfg       |  2 -
 boblogistics/locale/ru/boblogistics.cfg       |  2 -
 .../recipe/roboport-parts-recipe.lua          |  5 +-
 .../recipe/roboport-recipe-updates.lua        | 17 +++----
 .../prototypes/recipe/roboport-recipe.lua     |  2 +-
 .../recipe/robots-recipe-updates.lua          | 51 ++++++++-----------
 .../prototypes/technology-updates.lua         | 10 +---
 boblogistics/prototypes/technology.lua        |  1 -
 boblogistics/settings.lua                     |  7 ---
 bobvehicleequipment/changelog.txt             |  5 ++
 bobvehicleequipment/info.json                 |  2 +-
 .../prototypes/recipe-updates.lua             |  4 +-
 bobvehicleequipment/prototypes/roboport.lua   |  2 +-
 bobwarfare/changelog.txt                      |  5 ++
 bobwarfare/info.json                          |  2 +-
 .../prototypes/recipe/recipe-updates.lua      | 10 ++++
 bobwarfare/prototypes/technology/armor.lua    | 17 +++++--
 .../technology/technology-updates.lua         | 15 ++++++
 30 files changed, 116 insertions(+), 92 deletions(-)

diff --git a/bobclasses/changelog.txt b/bobclasses/changelog.txt
index 0928aaa2d..25d28073b 100644
--- a/bobclasses/changelog.txt
+++ b/bobclasses/changelog.txt
@@ -1,4 +1,9 @@
 ---------------------------------------------------------------------------------------------------
+Version: 1.3.0
+Date: ???
+  Changes:
+    - Reduced the tier of electronics required for player brains #180
+---------------------------------------------------------------------------------------------------
 Version: 1.2.1
 Date: 21. 02. 2024
   Changes:
diff --git a/bobclasses/info.json b/bobclasses/info.json
index 8ad657933..41ab050c0 100644
--- a/bobclasses/info.json
+++ b/bobclasses/info.json
@@ -1,6 +1,6 @@
 {
   "name": "bobclasses",
-  "version": "1.2.1",
+  "version": "1.3.0",
   "factorio_version": "1.1",
   "title": "Bob's Classes and Multiple characters mod",
   "author": "Bobingabout",
diff --git a/bobclasses/prototypes/bodies.lua b/bobclasses/prototypes/bodies.lua
index 90dfe7858..5e20770d6 100644
--- a/bobclasses/prototypes/bodies.lua
+++ b/bobclasses/prototypes/bodies.lua
@@ -395,7 +395,7 @@ data:extend({
     },
     prerequisites = {
       "robotics",
-      "advanced-electronics-2",
+      "advanced-electronics",
       "automation-2",
     },
     unit = {
@@ -559,6 +559,7 @@ data:extend({
     prerequisites = {
       "bodies",
       "production-science-pack",
+      "advanced-electronics-2",
     },
     unit = {
       count = 250,
diff --git a/bobclasses/prototypes/parts.lua b/bobclasses/prototypes/parts.lua
index 09e6b11e4..7b028d8ff 100644
--- a/bobclasses/prototypes/parts.lua
+++ b/bobclasses/prototypes/parts.lua
@@ -104,7 +104,7 @@ data:extend({
     enabled = false,
     ingredients = {
       { "battery", 15 },
-      { "processing-unit", 50 },
+      { "advanced-circuit", 50 },
     },
     result = "player-power-core",
   },
diff --git a/bobclasses/prototypes/recipe-updates.lua b/bobclasses/prototypes/recipe-updates.lua
index edf3d6b76..8cfd60b2c 100644
--- a/bobclasses/prototypes/recipe-updates.lua
+++ b/bobclasses/prototypes/recipe-updates.lua
@@ -37,33 +37,25 @@ if data.raw["recipe-category"]["electronics"] then
 end
 
 if
-  data.raw.item["superior-circuit-board"]
+  data.raw.item["circuit-board"]
   and data.raw.item["basic-electronic-components"]
   and data.raw.item["electronic-components"]
   and data.raw.item["intergrated-electronics"]
-  and data.raw.item["processing-electronics"]
 then
-  bobmods.lib.recipe.add_ingredient("player-brain", { "superior-circuit-board", 5 })
+  bobmods.lib.recipe.add_ingredient("player-brain", { "circuit-board", 5 })
   bobmods.lib.recipe.add_ingredient("player-brain", { "basic-electronic-components", 10 })
   bobmods.lib.recipe.add_ingredient("player-brain", { "electronic-components", 25 })
-  bobmods.lib.recipe.add_ingredient("player-brain", { "intergrated-electronics", 10 })
 
   bobmods.lib.recipe.add_ingredient("player-brain-2", { "superior-circuit-board", 8 })
   bobmods.lib.recipe.add_ingredient("player-brain-2", { "basic-electronic-components", 8 })
   bobmods.lib.recipe.add_ingredient("player-brain-2", { "electronic-components", 30 })
   bobmods.lib.recipe.add_ingredient("player-brain-2", { "intergrated-electronics", 20 })
-  bobmods.lib.recipe.add_ingredient("player-brain-2", { "processing-electronics", 2 })
-  if data.raw.technology["advanced-electronics-3"] then
-    bobmods.lib.tech.add_prerequisite("bodies-2", "advanced-electronics-3")
-  end
   if data.raw.item["solder"] then
     bobmods.lib.recipe.add_ingredient("player-brain", { "solder", 5 })
-
     bobmods.lib.recipe.add_ingredient("player-brain-2", { "solder", 10 })
   end
 else
-  bobmods.lib.recipe.add_ingredient("player-brain", { "advanced-circuit", 10 })
-  bobmods.lib.recipe.add_ingredient("player-brain", { "processing-unit", 5 })
+  bobmods.lib.recipe.add_ingredient("player-brain", { "advanced-circuit", 20 })
 
   bobmods.lib.recipe.add_ingredient("player-brain-2", { "advanced-circuit", 10 })
   bobmods.lib.recipe.add_ingredient("player-brain-2", { "processing-unit", 10 })
diff --git a/bobequipment/changelog.txt b/bobequipment/changelog.txt
index df2393017..c85c25da7 100644
--- a/bobequipment/changelog.txt
+++ b/bobequipment/changelog.txt
@@ -1,4 +1,9 @@
 ---------------------------------------------------------------------------------------------------
+Version: 1.3.0
+Date: ???
+  Changes:
+    - Reduced the tier of electronics required for Personal roboport robot control #180
+---------------------------------------------------------------------------------------------------
 Version: 1.2.1
 Date: 21. 02. 2024
   Changes:
diff --git a/bobequipment/info.json b/bobequipment/info.json
index 6f8725737..7ad429f71 100644
--- a/bobequipment/info.json
+++ b/bobequipment/info.json
@@ -1,6 +1,6 @@
 {
   "name": "bobequipment",
-  "version": "1.2.1",
+  "version": "1.3.0",
   "factorio_version": "1.1",
   "title": "Bob's Personal Equipment mod",
   "author": "Bobingabout",
diff --git a/bobequipment/prototypes/personal-roboport.lua b/bobequipment/prototypes/personal-roboport.lua
index 7965cb341..5ebc7eb1b 100644
--- a/bobequipment/prototypes/personal-roboport.lua
+++ b/bobequipment/prototypes/personal-roboport.lua
@@ -1084,7 +1084,7 @@ data:extend({
     enabled = false,
     energy_required = 2,
     ingredients = {
-      { "advanced-circuit", 5 },
+      { "electronic-circuit", 10 },
     },
     result = "personal-roboport-robot-equipment",
   },
diff --git a/bobequipment/prototypes/recipe/updates.lua b/bobequipment/prototypes/recipe/updates.lua
index dfa7dccda..d3fbb1ef6 100644
--- a/bobequipment/prototypes/recipe/updates.lua
+++ b/bobequipment/prototypes/recipe/updates.lua
@@ -250,14 +250,14 @@ if
   and data.raw.item["electronic-components"]
   and data.raw.item["intergrated-electronics"]
   and data.raw.item["processing-electronics"]
+  and data.raw.item["basic-circuit-board"]
   and data.raw.item["circuit-board"]
   and data.raw.item["superior-circuit-board"]
   and data.raw.item["multi-layer-circuit-board"]
 then
   data.raw.recipe["personal-roboport-robot-equipment"].ingredients = {
-    { "circuit-board", 1 },
+    { "basic-circuit-board", 1 },
     { "basic-electronic-components", 30 },
-    { "electronic-components", 15 },
   }
 
   data.raw.recipe["personal-roboport-robot-equipment-2"].ingredients = {
diff --git a/bobequipment/prototypes/technology/equipment.lua b/bobequipment/prototypes/technology/equipment.lua
index c7ba4d1b1..f59fed84d 100644
--- a/bobequipment/prototypes/technology/equipment.lua
+++ b/bobequipment/prototypes/technology/equipment.lua
@@ -406,6 +406,7 @@ data:extend({
     order = "g-g-c",
     prerequisites = {
       "night-vision-equipment-2",
+      "production-science-pack",
     },
     effects = {
       {
@@ -496,6 +497,7 @@ data:extend({
     order = "g-k-d",
     prerequisites = {
       "solar-panel-equipment-3",
+      "production-science-pack",
     },
     effects = {
       {
@@ -719,6 +721,7 @@ data:extend({
     order = "g-h-c",
     prerequisites = {
       "exoskeleton-equipment-2",
+      "production-science-pack",
     },
     effects = {
       {
diff --git a/boblogistics/changelog.txt b/boblogistics/changelog.txt
index 70b1e84a9..a6cdc5f2f 100644
--- a/boblogistics/changelog.txt
+++ b/boblogistics/changelog.txt
@@ -1,4 +1,9 @@
 ---------------------------------------------------------------------------------------------------
+Version: 1.3.0
+Date: ???
+  Changes:
+    - Reduced the tier of electronics required for T1 robots #180
+---------------------------------------------------------------------------------------------------
 Version: 1.2.2
 Date: 21. 02. 2024
   Changes:
diff --git a/boblogistics/info.json b/boblogistics/info.json
index ff4efb54b..3bbb8be0c 100644
--- a/boblogistics/info.json
+++ b/boblogistics/info.json
@@ -1,6 +1,6 @@
 {
   "name": "boblogistics",
-  "version": "1.2.2",
+  "version": "1.3.0",
   "factorio_version": "1.1",
   "title": "Bob's Logistics mod",
   "author": "Bobingabout",
diff --git a/boblogistics/locale/en/boblogistics.cfg b/boblogistics/locale/en/boblogistics.cfg
index fb454b6fd..3b0034249 100644
--- a/boblogistics/locale/en/boblogistics.cfg
+++ b/boblogistics/locale/en/boblogistics.cfg
@@ -423,7 +423,6 @@ bob-inserter-long=Change inserter long range (pickup and drop)
 bobmods-logistics-flyingrobotframes=Flying robot frames
 bobmods-logistics-robotparts=Robot parts
 bobmods-logistics-robotrequireprevious=Robot require previous tier
-bobmods-logistics-roboportrecipeupdate=Roboport recipe update
 bobmods-logistics-drainlessinserters=Drainless inserters
 bobmods-logistics-disableroboports=Disable Roboports
 bobmods-logistics-beltrequireprevious=Belt require previous tier
@@ -446,7 +445,6 @@ bobmods-logistics-highpipes=Bigger pipes
 bobmods-logistics-flyingrobotframes=If set to true, the Flying robot frame intermediates will exist for use in recipes.
 bobmods-logistics-robotparts=If set to true, the Logistic/Construction robot tool/brain intermediates will exist for use in recipes.
 bobmods-logistics-robotrequireprevious=If set to true, Logistic/Construction robots require the previous tier to craft.
-bobmods-logistics-roboportrecipeupdate=If set to true, the recipe for the base game Roboport 1 is updated to the modular recipe.
 bobmods-logistics-drainlessinserters=If set to true, the idle power drain will be removed from all Inserters.
 bobmods-logistics-disableroboports=If set to true, standard roboports are disabled, causing you to be reliant on the modular roboports
 bobmods-logistics-beltrequireprevious=If set to true, Transport belts and related entities require the previous tier to craft.
diff --git a/boblogistics/locale/ru/boblogistics.cfg b/boblogistics/locale/ru/boblogistics.cfg
index 48410c241..1089825ee 100644
--- a/boblogistics/locale/ru/boblogistics.cfg
+++ b/boblogistics/locale/ru/boblogistics.cfg
@@ -423,7 +423,6 @@ bob-inserter-long=Изменить радиус действия (подбор 
 bobmods-logistics-flyingrobotframes=Каркасы дронов
 bobmods-logistics-robotparts=Компоненты дронов
 bobmods-logistics-robotrequireprevious=Улучшенные дроны создаются с использованием старых
-bobmods-logistics-roboportrecipeupdate=Изменить базовый рецепт дронстанций
 bobmods-logistics-drainlessinserters=Простаивающие манипуляторы не требуют энергии
 bobmods-logistics-disableroboports=Отключить дронстанции
 bobmods-logistics-beltrequireprevious=Улучшенные конвейеры создаются с использованием старых
@@ -446,7 +445,6 @@ bobmods-logistics-highpipes=Трубы большего размера
 bobmods-logistics-flyingrobotframes=Включает использование компонента "Каркас дрона" в рецептах дронов.
 bobmods-logistics-robotparts=Включает использование компонентов мозг/инструмент в рецептах дронов.
 bobmods-logistics-robotrequireprevious=Если включено, то улучшенные дроны будут требовать для создания дрона предыдущего уровня.
-bobmods-logistics-roboportrecipeupdate=Изменяет рецепт дронстанции из базовой игры чтобы соответствовать новым модульным рецептам.
 bobmods-logistics-drainlessinserters=Манипуляторы во время простоя не потребляют энергию.
 bobmods-logistics-disableroboports=Отключает стандартные дронстанции, в результате чего придётся пользоваться модульными дронстанциями
 bobmods-logistics-beltrequireprevious=Если включено, то улучшенные конвейеры будут требовать для создания конвейер предыдущего уровня.
diff --git a/boblogistics/prototypes/recipe/roboport-parts-recipe.lua b/boblogistics/prototypes/recipe/roboport-parts-recipe.lua
index 22bcbb7e1..31b133e83 100644
--- a/boblogistics/prototypes/recipe/roboport-parts-recipe.lua
+++ b/boblogistics/prototypes/recipe/roboport-parts-recipe.lua
@@ -6,7 +6,7 @@ data:extend({
     ingredients = {
       { "steel-plate", 1 },
       { "copper-cable", 2 },
-      { "advanced-circuit", 5 },
+      { "electronic-circuit", 5 },
     },
     result = "roboport-antenna-1",
     energy_required = 0.2,
@@ -57,7 +57,8 @@ data:extend({
     enabled = false,
     ingredients = {
       { "steel-plate", 2 },
-      { "advanced-circuit", 5 },
+      { "electronic-circuit", 5 },
+      { "battery", 2 },
     },
     result = "roboport-chargepad-1",
     energy_required = 1,
diff --git a/boblogistics/prototypes/recipe/roboport-recipe-updates.lua b/boblogistics/prototypes/recipe/roboport-recipe-updates.lua
index 7a88d4f52..165890c72 100644
--- a/boblogistics/prototypes/recipe/roboport-recipe-updates.lua
+++ b/boblogistics/prototypes/recipe/roboport-recipe-updates.lua
@@ -1,14 +1,9 @@
-if settings.startup["bobmods-logistics-roboportrecipeupdate"].value == true then
-  if bobmods.lib.recipe.set_ingredients then
-    bobmods.lib.recipe.set_ingredients(
-      "roboport",
-      { { "steel-plate", 15 }, { "roboport-antenna-1", 5 }, { "roboport-chargepad-1", 4 }, { "roboport-door-1", 1 } }
-    )
-  else
-    data.raw.recipe["roboport"].ingredients =
-      { { "steel-plate", 15 }, { "roboport-antenna-1", 5 }, { "roboport-chargepad-1", 4 }, { "roboport-door-1", 1 } }
-  end
-end
+bobmods.lib.recipe.set_ingredients("roboport", {
+  { "steel-plate", 15 },
+  { "roboport-antenna-1", 5 },
+  { "roboport-chargepad-1", 4 },
+  { "roboport-door-1", 1 },
+})
 
 if data.raw.item["aluminium-plate"] then
   bobmods.lib.recipe.replace_ingredient("roboport-antenna-2", "steel-plate", "aluminium-plate")
diff --git a/boblogistics/prototypes/recipe/roboport-recipe.lua b/boblogistics/prototypes/recipe/roboport-recipe.lua
index d8bca84ae..c789e8ed5 100644
--- a/boblogistics/prototypes/recipe/roboport-recipe.lua
+++ b/boblogistics/prototypes/recipe/roboport-recipe.lua
@@ -272,7 +272,7 @@ data:extend({
     ingredients = {
       { "steel-plate", 5 },
       { "roboport-antenna-1", 1 },
-      { "advanced-circuit", 2 },
+      { "electronic-circuit", 2 },
     },
     result = "bob-logistic-zone-interface",
     energy_required = 2,
diff --git a/boblogistics/prototypes/recipe/robots-recipe-updates.lua b/boblogistics/prototypes/recipe/robots-recipe-updates.lua
index f28419bba..c5abdeefd 100644
--- a/boblogistics/prototypes/recipe/robots-recipe-updates.lua
+++ b/boblogistics/prototypes/recipe/robots-recipe-updates.lua
@@ -1,3 +1,6 @@
+bobmods.lib.recipe.remove_ingredient("logistic-chest-passive-provider", "advanced-circuit")
+bobmods.lib.recipe.remove_ingredient("logistic-chest-storage", "advanced-circuit")
+
 if settings.startup["bobmods-logistics-robotrequireprevious"].value == true then
   bobmods.lib.recipe.add_ingredient("bob-logistic-robot-2", { "logistic-robot", 1 })
   bobmods.lib.recipe.add_ingredient("bob-construction-robot-2", { "construction-robot", 1 })
@@ -11,20 +14,14 @@ if data.raw.recipe["robot-brain-logistic"] then
   if data.raw["recipe-category"]["electronics"] then
     data.raw.recipe["robot-brain-logistic"].category = "electronics"
   end
-  if
-    data.raw.item["circuit-board"]
-    and data.raw.item["basic-electronic-components"]
-    and data.raw.item["electronic-components"]
-  then
-    bobmods.lib.recipe.add_ingredient("robot-brain-logistic", { "circuit-board", 1 })
-    bobmods.lib.recipe.add_ingredient("robot-brain-logistic", { "basic-electronic-components", 6 })
-    bobmods.lib.recipe.add_ingredient("robot-brain-logistic", { "electronic-components", 4 })
+  if data.raw.item["basic-circuit-board"] and data.raw.item["basic-electronic-components"] then
+    bobmods.lib.recipe.add_ingredient("robot-brain-logistic", { "basic-circuit-board", 1 })
+    bobmods.lib.recipe.add_ingredient("robot-brain-logistic", { "basic-electronic-components", 8 })
     if data.raw.item["solder"] then
       bobmods.lib.recipe.add_ingredient("robot-brain-logistic", { "solder", 5 })
     end
   else
-    bobmods.lib.recipe.add_ingredient("robot-brain-logistic", { "electronic-circuit", 2 })
-    bobmods.lib.recipe.add_ingredient("robot-brain-logistic", { "advanced-circuit", 2 })
+    bobmods.lib.recipe.add_ingredient("robot-brain-logistic", { "electronic-circuit", 4 })
   end
 end
 
@@ -32,20 +29,14 @@ if data.raw.recipe["robot-brain-construction"] then
   if data.raw["recipe-category"]["electronics"] then
     data.raw.recipe["robot-brain-construction"].category = "electronics"
   end
-  if
-    data.raw.item["circuit-board"]
-    and data.raw.item["basic-electronic-components"]
-    and data.raw.item["electronic-components"]
-  then
-    bobmods.lib.recipe.add_ingredient("robot-brain-construction", { "circuit-board", 1 })
+  if data.raw.item["basic-circuit-board"] and data.raw.item["basic-electronic-components"] then
+    bobmods.lib.recipe.add_ingredient("robot-brain-construction", { "basic-circuit-board", 1 })
     bobmods.lib.recipe.add_ingredient("robot-brain-construction", { "basic-electronic-components", 8 })
-    bobmods.lib.recipe.add_ingredient("robot-brain-construction", { "electronic-components", 3 })
     if data.raw.item["solder"] then
       bobmods.lib.recipe.add_ingredient("robot-brain-construction", { "solder", 5 })
     end
   else
-    bobmods.lib.recipe.add_ingredient("robot-brain-construction", { "electronic-circuit", 3 })
-    bobmods.lib.recipe.add_ingredient("robot-brain-construction", { "advanced-circuit", 1 })
+    bobmods.lib.recipe.add_ingredient("robot-brain-construction", { "electronic-circuit", 4 })
   end
 end
 
@@ -79,8 +70,8 @@ if data.raw.recipe["robot-brain-construction-2"] then
     and data.raw.item["electronic-components"]
   then
     bobmods.lib.recipe.add_ingredient("robot-brain-construction-2", { "circuit-board", 1 })
-    bobmods.lib.recipe.add_ingredient("robot-brain-construction-2", { "basic-electronic-components", 12 })
-    bobmods.lib.recipe.add_ingredient("robot-brain-construction-2", { "electronic-components", 4 })
+    bobmods.lib.recipe.add_ingredient("robot-brain-construction-2", { "basic-electronic-components", 10 })
+    bobmods.lib.recipe.add_ingredient("robot-brain-construction-2", { "electronic-components", 6 })
     if data.raw.item["solder"] then
       bobmods.lib.recipe.add_ingredient("robot-brain-construction-2", { "solder", 5 })
     end
@@ -101,9 +92,9 @@ if data.raw.recipe["robot-brain-logistic-3"] then
     and data.raw.item["intergrated-electronics"]
   then
     bobmods.lib.recipe.add_ingredient("robot-brain-logistic-3", { "superior-circuit-board", 1 })
-    bobmods.lib.recipe.add_ingredient("robot-brain-logistic-3", { "basic-electronic-components", 4 })
+    bobmods.lib.recipe.add_ingredient("robot-brain-logistic-3", { "basic-electronic-components", 8 })
     bobmods.lib.recipe.add_ingredient("robot-brain-logistic-3", { "electronic-components", 6 })
-    bobmods.lib.recipe.add_ingredient("robot-brain-logistic-3", { "intergrated-electronics", 6 })
+    bobmods.lib.recipe.add_ingredient("robot-brain-logistic-3", { "intergrated-electronics", 4 })
     if data.raw.item["solder"] then
       bobmods.lib.recipe.add_ingredient("robot-brain-logistic-3", { "solder", 5 })
     end
@@ -124,8 +115,8 @@ if data.raw.recipe["robot-brain-construction-3"] then
     and data.raw.item["intergrated-electronics"]
   then
     bobmods.lib.recipe.add_ingredient("robot-brain-construction-3", { "superior-circuit-board", 1 })
-    bobmods.lib.recipe.add_ingredient("robot-brain-construction-3", { "basic-electronic-components", 4 })
-    bobmods.lib.recipe.add_ingredient("robot-brain-construction-3", { "electronic-components", 8 })
+    bobmods.lib.recipe.add_ingredient("robot-brain-construction-3", { "basic-electronic-components", 8 })
+    bobmods.lib.recipe.add_ingredient("robot-brain-construction-3", { "electronic-components", 6 })
     bobmods.lib.recipe.add_ingredient("robot-brain-construction-3", { "intergrated-electronics", 4 })
     if data.raw.item["solder"] then
       bobmods.lib.recipe.add_ingredient("robot-brain-construction-3", { "solder", 5 })
@@ -148,9 +139,9 @@ if data.raw.recipe["robot-brain-logistic-4"] then
     and data.raw.item["processing-electronics"]
   then
     bobmods.lib.recipe.add_ingredient("robot-brain-logistic-4", { "multi-layer-circuit-board", 1 })
-    bobmods.lib.recipe.add_ingredient("robot-brain-logistic-4", { "basic-electronic-components", 2 })
-    bobmods.lib.recipe.add_ingredient("robot-brain-logistic-4", { "electronic-components", 4 })
-    bobmods.lib.recipe.add_ingredient("robot-brain-logistic-4", { "intergrated-electronics", 8 })
+    bobmods.lib.recipe.add_ingredient("robot-brain-logistic-4", { "basic-electronic-components", 12 })
+    bobmods.lib.recipe.add_ingredient("robot-brain-logistic-4", { "electronic-components", 8 })
+    bobmods.lib.recipe.add_ingredient("robot-brain-logistic-4", { "intergrated-electronics", 6 })
     bobmods.lib.recipe.add_ingredient("robot-brain-logistic-4", { "processing-electronics", 4 })
     if data.raw.item["solder"] then
       bobmods.lib.recipe.add_ingredient("robot-brain-logistic-4", { "solder", 5 })
@@ -177,8 +168,8 @@ if data.raw.recipe["robot-brain-construction-4"] then
     and data.raw.item["processing-electronics"]
   then
     bobmods.lib.recipe.add_ingredient("robot-brain-construction-4", { "multi-layer-circuit-board", 1 })
-    bobmods.lib.recipe.add_ingredient("robot-brain-construction-4", { "basic-electronic-components", 2 })
-    bobmods.lib.recipe.add_ingredient("robot-brain-construction-4", { "electronic-components", 6 })
+    bobmods.lib.recipe.add_ingredient("robot-brain-construction-4", { "basic-electronic-components", 12 })
+    bobmods.lib.recipe.add_ingredient("robot-brain-construction-4", { "electronic-components", 8 })
     bobmods.lib.recipe.add_ingredient("robot-brain-construction-4", { "intergrated-electronics", 6 })
     bobmods.lib.recipe.add_ingredient("robot-brain-construction-4", { "processing-electronics", 4 })
     if data.raw.item["solder"] then
diff --git a/boblogistics/prototypes/technology-updates.lua b/boblogistics/prototypes/technology-updates.lua
index af3b63613..a7bc68093 100644
--- a/boblogistics/prototypes/technology-updates.lua
+++ b/boblogistics/prototypes/technology-updates.lua
@@ -15,8 +15,6 @@ bobmods.lib.tech.add_prerequisite("worker-robots-storage-1", "bob-robots-1")
 if not mods["bobequipment"] then
   bobmods.lib.tech.add_prerequisite("personal-roboport-equipment", "chemical-science-pack")
 end
-bobmods.lib.tech.add_prerequisite("construction-robotics", "advanced-electronics")
-bobmods.lib.tech.add_prerequisite("logistic-robotics", "advanced-electronics")
 
 bobmods.lib.tech.replace_prerequisite("lubricant", "advanced-oil-processing", "oil-processing")
 bobmods.lib.tech.remove_science_pack("lubricant", "chemical-science-pack")
@@ -262,10 +260,8 @@ if data.raw.item["silver-zinc-battery"] and data.raw.technology["battery-3"] the
   end
 end
 
-if settings.startup["bobmods-logistics-roboportrecipeupdate"].value == true then
-  bobmods.lib.tech.remove_recipe_unlock("construction-robotics", "roboport")
-  bobmods.lib.tech.remove_recipe_unlock("logistic-robotics", "roboport")
-end
+bobmods.lib.tech.remove_recipe_unlock("construction-robotics", "roboport")
+bobmods.lib.tech.remove_recipe_unlock("logistic-robotics", "roboport")
 
 if settings.startup["bobmods-logistics-robotparts"].value == true then
   bobmods.lib.tech.add_recipe_unlock("logistic-robotics", "robot-brain-logistic")
@@ -376,9 +372,7 @@ end
 
 -- Chest ballancing.
 bobmods.lib.tech.remove_recipe_unlock("construction-robotics", "logistic-chest-passive-provider")
-bobmods.lib.tech.add_recipe_unlock("logistic-robotics", "logistic-chest-requester")
 bobmods.lib.tech.remove_recipe_unlock("logistic-robotics", "logistic-chest-storage")
-bobmods.lib.tech.remove_recipe_unlock("logistic-system", "logistic-chest-requester")
 bobmods.lib.tech.add_prerequisite("logistic-system", "construction-robotics")
 
 -- Old DyTech compatibillity bullshit
diff --git a/boblogistics/prototypes/technology.lua b/boblogistics/prototypes/technology.lua
index 51fe1a388..717ba8396 100644
--- a/boblogistics/prototypes/technology.lua
+++ b/boblogistics/prototypes/technology.lua
@@ -534,7 +534,6 @@ data:extend({
     },
     prerequisites = {
       "robotics",
-      "advanced-electronics",
     },
     unit = {
       count = 50,
diff --git a/boblogistics/settings.lua b/boblogistics/settings.lua
index 32a9543cc..bce43149c 100644
--- a/boblogistics/settings.lua
+++ b/boblogistics/settings.lua
@@ -1,11 +1,4 @@
 data:extend({
-  {
-    type = "bool-setting",
-    name = "bobmods-logistics-roboportrecipeupdate",
-    setting_type = "startup",
-    default_value = true,
-  },
-
   {
     type = "bool-setting",
     name = "bobmods-logistics-flyingrobotframes",
diff --git a/bobvehicleequipment/changelog.txt b/bobvehicleequipment/changelog.txt
index 0b652d364..3e57224f2 100644
--- a/bobvehicleequipment/changelog.txt
+++ b/bobvehicleequipment/changelog.txt
@@ -1,4 +1,9 @@
 ---------------------------------------------------------------------------------------------------
+Version: 1.3.0
+Date: ???
+  Changes:
+    - Reduced the tier of electronics required for Vehicle roboport robot control #180
+---------------------------------------------------------------------------------------------------
 Version: 1.2.0
 Date: 22. 12. 2023
   Changes:
diff --git a/bobvehicleequipment/info.json b/bobvehicleequipment/info.json
index 1e30944da..7e477163b 100644
--- a/bobvehicleequipment/info.json
+++ b/bobvehicleequipment/info.json
@@ -1,6 +1,6 @@
 {
   "name": "bobvehicleequipment",
-  "version": "1.2.0",
+  "version": "1.3.0",
   "factorio_version": "1.1",
   "title": "Bob's Vehicle Equipment mod",
   "author": "Bobingabout",
diff --git a/bobvehicleequipment/prototypes/recipe-updates.lua b/bobvehicleequipment/prototypes/recipe-updates.lua
index e5e3edad0..96d99e8a2 100644
--- a/bobvehicleequipment/prototypes/recipe-updates.lua
+++ b/bobvehicleequipment/prototypes/recipe-updates.lua
@@ -242,14 +242,14 @@ if
   and data.raw.item["electronic-components"]
   and data.raw.item["intergrated-electronics"]
   and data.raw.item["processing-electronics"]
+  and data.raw.item["basic-circuit-board"]
   and data.raw.item["circuit-board"]
   and data.raw.item["superior-circuit-board"]
   and data.raw.item["multi-layer-circuit-board"]
 then
   data.raw.recipe["vehicle-roboport-robot-equipment"].ingredients = {
-    { "circuit-board", 1 },
+    { "basic-circuit-board", 1 },
     { "basic-electronic-components", 30 },
-    { "electronic-components", 15 },
   }
 
   data.raw.recipe["vehicle-roboport-robot-equipment-2"].ingredients = {
diff --git a/bobvehicleequipment/prototypes/roboport.lua b/bobvehicleequipment/prototypes/roboport.lua
index 2ea5ca607..84ae8cfaf 100644
--- a/bobvehicleequipment/prototypes/roboport.lua
+++ b/bobvehicleequipment/prototypes/roboport.lua
@@ -1247,7 +1247,7 @@ data:extend({
     enabled = false,
     energy_required = 2,
     ingredients = {
-      { "advanced-circuit", 5 },
+      { "electronic-circuit", 10 },
     },
     result = "vehicle-roboport-robot-equipment",
   },
diff --git a/bobwarfare/changelog.txt b/bobwarfare/changelog.txt
index a8c5a33b9..231b1720a 100644
--- a/bobwarfare/changelog.txt
+++ b/bobwarfare/changelog.txt
@@ -1,4 +1,9 @@
 ---------------------------------------------------------------------------------------------------
+Version: 1.3.0
+Date: ???
+  Changes:
+    - Spread out the armor techs more evenly between tech tiers #180
+---------------------------------------------------------------------------------------------------
 Version: 1.2.1
 Date: 21. 02. 2024
   Bugfixes:
diff --git a/bobwarfare/info.json b/bobwarfare/info.json
index 85c359bca..5bedf6350 100644
--- a/bobwarfare/info.json
+++ b/bobwarfare/info.json
@@ -1,6 +1,6 @@
 {
   "name": "bobwarfare",
-  "version": "1.2.1",
+  "version": "1.3.0",
   "factorio_version": "1.1",
   "title": "Bob's Warfare mod",
   "author": "Bobingabout",
diff --git a/bobwarfare/prototypes/recipe/recipe-updates.lua b/bobwarfare/prototypes/recipe/recipe-updates.lua
index 0c992d204..82aa6c480 100644
--- a/bobwarfare/prototypes/recipe/recipe-updates.lua
+++ b/bobwarfare/prototypes/recipe/recipe-updates.lua
@@ -178,6 +178,7 @@ end
 
 if data.raw.item["silicon-nitride"] then
   bobmods.lib.recipe.replace_ingredient("heavy-armor-3", "plastic-bar", "silicon-nitride")
+  bobmods.lib.tech.remove_prerequisite("bob-armor-making-4", "plastics")
   bobmods.lib.tech.add_prerequisite("bob-armor-making-4", "ceramics")
   bobmods.lib.recipe.replace_ingredient("bob-power-armor-mk4", "plastic-bar", "silicon-nitride")
   bobmods.lib.tech.add_prerequisite("bob-power-armor-4", "ceramics")
@@ -527,3 +528,12 @@ if data.raw.fluid.deuterium then
 end
 
 bobmods.lib.recipe.enabled("radar", false)
+
+-- Armor
+bobmods.lib.recipe.replace_ingredient("modular-armor", "advanced-circuit", "electronic-circuit")
+
+bobmods.lib.recipe.replace_ingredient("power-armor", "processing-unit", "advanced-circuit")
+bobmods.lib.recipe.add_ingredient("power-armor", { "modular-armor", 1 })
+
+bobmods.lib.recipe.replace_ingredient("power-armor-mk2", "processing-unit", "advanced-circuit")
+bobmods.lib.recipe.add_ingredient("power-armor-mk2", { "power-armor", 1 })
diff --git a/bobwarfare/prototypes/technology/armor.lua b/bobwarfare/prototypes/technology/armor.lua
index ab318c1fc..e0f1d22a5 100644
--- a/bobwarfare/prototypes/technology/armor.lua
+++ b/bobwarfare/prototypes/technology/armor.lua
@@ -7,6 +7,7 @@ data:extend({
     icon_mipmaps = 4,
     prerequisites = {
       "heavy-armor",
+      "logistic-science-pack",
     },
     effects = {
       {
@@ -33,6 +34,8 @@ data:extend({
     icon_mipmaps = 4,
     prerequisites = {
       "bob-armor-making-3",
+      "chemical-science-pack",
+      "plastics",
     },
     effects = {
       {
@@ -61,6 +64,7 @@ data:extend({
       "effectivity-module-3",
       "power-armor-mk2",
       "speed-module-3",
+      "production-science-pack",
     },
     effects = {
       {
@@ -73,9 +77,9 @@ data:extend({
       ingredients = {
         { "automation-science-pack", 1 },
         { "logistic-science-pack", 1 },
-        { "chemical-science-pack", 1 },
         { "military-science-pack", 1 },
-        { "utility-science-pack", 1 },
+        { "chemical-science-pack", 1 },
+        { "production-science-pack", 1 },
       },
       time = 30,
     },
@@ -89,6 +93,7 @@ data:extend({
     icon_size = 64,
     prerequisites = {
       "bob-power-armor-3",
+      "utility-science-pack",
     },
     effects = {
       {
@@ -101,8 +106,9 @@ data:extend({
       ingredients = {
         { "automation-science-pack", 1 },
         { "logistic-science-pack", 1 },
-        { "chemical-science-pack", 1 },
         { "military-science-pack", 1 },
+        { "chemical-science-pack", 1 },
+        { "production-science-pack", 1 },
         { "utility-science-pack", 1 },
       },
       time = 30,
@@ -116,6 +122,7 @@ data:extend({
     icon_size = 64,
     prerequisites = {
       "bob-power-armor-4",
+      "space-science-pack",
     },
     effects = {
       {
@@ -128,9 +135,11 @@ data:extend({
       ingredients = {
         { "automation-science-pack", 1 },
         { "logistic-science-pack", 1 },
-        { "chemical-science-pack", 1 },
         { "military-science-pack", 1 },
+        { "chemical-science-pack", 1 },
+        { "production-science-pack", 1 },
         { "utility-science-pack", 1 },
+        { "space-science-pack", 1 },
       },
       time = 30,
     },
diff --git a/bobwarfare/prototypes/technology/technology-updates.lua b/bobwarfare/prototypes/technology/technology-updates.lua
index b98ca7efb..7c6b228af 100644
--- a/bobwarfare/prototypes/technology/technology-updates.lua
+++ b/bobwarfare/prototypes/technology/technology-updates.lua
@@ -565,3 +565,18 @@ else
   bobmods.lib.tech.add_prerequisite("artillery", "radars-1")
   bobmods.lib.tech.add_prerequisite("spidertron", "radars-1")
 end
+
+-- Armor
+
+bobmods.lib.tech.remove_prerequisite("modular-armor", "advanced-electronics")
+bobmods.lib.tech.add_prerequisite("modular-armor", "logistic-science-pack")
+
+bobmods.lib.tech.remove_science_pack("power-armor", "chemical-science-pack")
+bobmods.lib.tech.add_science_pack("power-armor", "military-science-pack", 1)
+bobmods.lib.tech.remove_prerequisite("power-armor", "advanced-electronics-2")
+bobmods.lib.tech.add_prerequisite("power-armor", "military-science-pack")
+bobmods.lib.tech.add_prerequisite("power-armor", "advanced-electronics")
+
+bobmods.lib.tech.remove_science_pack("power-armor-mk2", "utility-science-pack")
+bobmods.lib.tech.remove_prerequisite("power-armor-mk2", "military-4")
+bobmods.lib.tech.add_prerequisite("power-armor-mk2", "military-3")