Tech pack revision (#294)

* Change elevated rail from prod sci to pink sci

* Fix hole in icon

* Add chem plant 2 to prod sci

* Update recipe-updates.lua

Add glass to automation sci. Switch prod sci to use chem plant 2 instead of 1. Increase electric engines in utility sci from 1 to 2. Add solar panel to utility sci.

* Increase pink sci express belts from 1 to 2

* Update chemical-plant-updates.lua

Remove glass from chem plant 2 and add to chem plant 1. Add invar to chem plant 2.

* Update belt-recipe-updates.lua

Change logistic sci back to using yellow belts. Let lab require yellow belts as well if burner tech phase is enabled.

* Touch up lab tech icons

* Reduce advanced electrolyser circuit board cost

* Update recipe-updates.lua

* Update recipe-updates.lua

* Update technology-updates.lua

* Update recipe-updates.lua

* Simplify if statement

* Update changelog

---------

Co-authored-by: KiwiHawk <59639+KiwiHawk@users.noreply.github.com>

bobassembly/prototypes/chemical-plant-updates.lua

@@ -14,7 +14,12 @@ if settings.startup["bobmods-assembly-chemicalplants"].value == true then
   end
 
   if data.raw.item["bob-glass"] then
-    bobmods.lib.recipe.replace_ingredient("chemical-plant-2", "steel-plate", "bob-glass")
+    bobmods.lib.recipe.add_ingredient("chemical-plant", { type = "item", name = "bob-glass", amount = 5 })
+  end
+
+  if data.raw.item["bob-invar-alloy"] then
+    bobmods.lib.recipe.replace_ingredient("chemical-plant-2", "steel-plate", "bob-invar-alloy")
+    bobmods.lib.tech.add_prerequisite("chemical-plant-2", "bob-invar-processing")
   end
 
   if data.raw.item["bob-steel-gear-wheel"] then

bobassembly/prototypes/electrolyser.lua

@@ -219,7 +219,7 @@ then
         { type = "item", name = "plastic-bar", amount = 10 },
         { type = "item", name = "steel-plate", amount = 10 },
         { type = "item", name = "iron-plate", amount = 10 },
-        { type = "item", name = "advanced-circuit", amount = 10 },
+        { type = "item", name = "advanced-circuit", amount = 5 },
         { type = "item", name = "pipe", amount = 5 },
       },
       results = { { type = "item", name = "bob-electrolyser-3", amount = 1 } },
@@ -235,7 +235,7 @@ then
         { type = "item", name = "plastic-bar", amount = 10 },
         { type = "item", name = "steel-plate", amount = 10 },
         { type = "item", name = "iron-plate", amount = 10 },
-        { type = "item", name = "processing-unit", amount = 10 },
+        { type = "item", name = "processing-unit", amount = 5 },
         { type = "item", name = "pipe", amount = 5 },
       },
       results = { { type = "item", name = "bob-electrolyser-4", amount = 1 } },
@@ -251,7 +251,7 @@ then
         { type = "item", name = "plastic-bar", amount = 10 },
         { type = "item", name = "steel-plate", amount = 10 },
         { type = "item", name = "iron-plate", amount = 10 },
-        { type = "item", name = "processing-unit", amount = 10 },
+        { type = "item", name = "processing-unit", amount = 5 },
         { type = "item", name = "pipe", amount = 5 },
       },
       results = { { type = "item", name = "bob-electrolyser-5", amount = 1 } },

boblogistics/prototypes/recipe/belt-recipe-updates.lua

@@ -1,6 +1,9 @@
 if settings.startup["bobmods-logistics-beltoverhaul"].value == true then
-  bobmods.lib.recipe.replace_ingredient("logistic-science-pack", "transport-belt", "basic-transport-belt")
-  bobmods.lib.recipe.replace_ingredient("lab", "transport-belt", "basic-transport-belt")
+  if mods["bobtech"] and settings.startup["bobmods-burnerphase"].value == true then
+    -- Do nothing
+  else
+    bobmods.lib.recipe.replace_ingredient("lab", "transport-belt", "basic-transport-belt")
+  end
 
   if bobmods.greenhouse then
     bobmods.lib.recipe.replace_ingredient("basic-underground-belt", "iron-stick", "wood")

bobtech/changelog.txt

@@ -2,6 +2,7 @@
 Version: 1.3.0
 Date: ???
   Changes:
+    - Updated science pack recipes #69
     - Update for Factorio 2.0 #189
     - Overhauled Burner Phase, removing Steam Science Pack #256
 ---------------------------------------------------------------------------------------------------

bobtech/prototypes/recipe/recipe-updates.lua

@@ -1,3 +1,7 @@
+if data.raw.item["bob-glass"] then
+  bobmods.lib.recipe.add_ingredient("automation-science-pack", { type = "item", name = "bob-glass", amount = 1 })
+end
+
 if data.raw.item["bob-sodium-hydroxide"] then
   bobmods.lib.recipe.add_ingredient(
     "chemical-science-pack",
@@ -12,7 +16,17 @@ bobmods.lib.recipe.add_ingredient(
   "production-science-pack",
   { type = "item", name = "assembling-machine-2", amount = 1 }
 )
-bobmods.lib.recipe.add_ingredient("production-science-pack", { type = "item", name = "chemical-plant", amount = 1 })
+if data.raw.item["bob-electrolyser-3"] then
+  bobmods.lib.recipe.add_ingredient("production-science-pack", { type = "item", name = "bob-electrolyser-3", amount = 1 })
+  data.raw.recipe["production-science-pack"].energy_required = 35
+  data.raw.recipe["production-science-pack"].results = {{ type = "item", name = "production-science-pack", amount = 5 }}
+elseif data.raw.item["chemical-plant-2"] then
+  bobmods.lib.recipe.add_ingredient("production-science-pack", { type = "item", name = "chemical-plant-2", amount = 1 })
+  data.raw.recipe["production-science-pack"].energy_required = 28
+  data.raw.recipe["production-science-pack"].results = {{ type = "item", name = "production-science-pack", amount = 4 }}
+else
+  bobmods.lib.recipe.add_ingredient("production-science-pack", { type = "item", name = "chemical-plant", amount = 1 })
+end
 
 if bobmods.tech.advanced_logistic_science then
   if data.raw.item["brass-chest"] then
@@ -32,28 +46,35 @@ else
   bobmods.lib.recipe.hide("advanced-logistic-science-pack")
 end
 
-bobmods.lib.recipe.replace_ingredient("utility-science-pack", "flying-robot-frame", "electric-engine-unit")
-bobmods.lib.recipe.add_ingredient("utility-science-pack", { type = "item", name = "processing-unit", amount = 4 })
+bobmods.lib.recipe.remove_ingredient("utility-science-pack", "flying-robot-frame")
+bobmods.lib.recipe.add_ingredient("utility-science-pack", { type = "item", name = "electric-engine-unit", amount = 3 })
+bobmods.lib.recipe.add_ingredient("utility-science-pack", { type = "item", name = "processing-unit", amount = 6 })
+if data.raw.item["solar-panel-small"] then
+  bobmods.lib.recipe.add_ingredient("utility-science-pack", { type = "item", name = "solar-panel-small", amount = 1 })
+else
+  bobmods.lib.recipe.add_ingredient("utility-science-pack", { type = "item", name = "solar-panel", amount = 1 })
+end
+bobmods.lib.tech.add_prerequisite("utility-science-pack", "solar-energy")
 if data.raw.item["bob-lithium-ion-battery"] then
   bobmods.lib.recipe.add_ingredient(
     "utility-science-pack",
-    { type = "item", name = "bob-lithium-ion-battery", amount = 4 }
+    { type = "item", name = "bob-lithium-ion-battery", amount = 5 }
   )
 else
-  bobmods.lib.recipe.add_ingredient("utility-science-pack", { type = "item", name = "battery", amount = 4 })
+  bobmods.lib.recipe.add_ingredient("utility-science-pack", { type = "item", name = "battery", amount = 7 })
 end
 if data.raw.item["bob-silicon-nitride"] then
-  bobmods.lib.recipe.add_ingredient("utility-science-pack", { type = "item", name = "bob-silicon-nitride", amount = 4 })
+  bobmods.lib.recipe.add_ingredient("utility-science-pack", { type = "item", name = "bob-silicon-nitride", amount = 5 })
 end
 if data.raw.item["bob-titanium-bearing"] then
   bobmods.lib.recipe.add_ingredient(
     "utility-science-pack",
-    { type = "item", name = "bob-titanium-bearing", amount = 4 }
+    { type = "item", name = "bob-titanium-bearing", amount = 5 }
   )
 end
 
-data.raw.recipe["utility-science-pack"].energy_required = 28
-bobmods.lib.recipe.set_result("utility-science-pack", { type = "item", name = "utility-science-pack", amount = 4 })
+data.raw.recipe["utility-science-pack"].energy_required = 35
+bobmods.lib.recipe.set_result("utility-science-pack", { type = "item", name = "utility-science-pack", amount = 5 })
 
 if settings.startup["bobmods-burnerphase"].value == true then
   bobmods.lib.recipe.add_new_ingredient("lab", { type = "item", name = "burner-lab", amount = 1 })

bobtech/prototypes/recipe/recipe.lua

@@ -6,7 +6,7 @@ data:extend({
     energy_required = 21,
     ingredients = {
       { type = "item", name = "fast-inserter", amount = 4 },
-      { type = "item", name = "express-transport-belt", amount = 1 },
+      { type = "item", name = "express-transport-belt", amount = 2 },
       { type = "item", name = "flying-robot-frame", amount = 1 },
       { type = "item", name = "steel-chest", amount = 2 },
     },

bobtech/prototypes/technology/technology-updates.lua

@@ -15,6 +15,11 @@ if bobmods.tech.advanced_logistic_science then
   bobmods.lib.tech.replace_science_pack("braking-force-7", "production-science-pack", "advanced-logistic-science-pack")
   bobmods.lib.tech.replace_prerequisite("braking-force-3", "production-science-pack", "advanced-logistic-science-pack")
 
+  if data.raw.technology["elevated-rail"] then
+    bobmods.lib.tech.replace_science_pack("elevated-rail", "production-science-pack", "advanced-logistic-science-pack")
+    bobmods.lib.tech.replace_prerequisite("elevated-rail", "production-science-pack", "advanced-logistic-science-pack")
+  end
+
   bobmods.lib.tech.replace_science_pack(
     "inserter-capacity-bonus-4",
     "production-science-pack",
@@ -172,6 +177,11 @@ if data.raw.item["bob-bronze-alloy"] then
 end
 bobmods.lib.tech.replace_prerequisite("production-science-pack", "productivity-module", "automation-2")
 bobmods.lib.tech.remove_prerequisite("production-science-pack", "railway")
+if data.raw.technology["bob-electrolyser-3"] then
+  bobmods.lib.tech.add_prerequisite("production-science-pack", "bob-electrolyser-3")
+elseif data.raw.technology["chemical-plant-2"] then
+  bobmods.lib.tech.add_prerequisite("production-science-pack", "chemical-plant-2")
+end
 
 bobmods.lib.tech.replace_prerequisite("utility-science-pack", "robotics", "electric-engine")
 if data.raw.item["bob-lithium-ion-battery"] then