Base game technology renames

modded-factorio · Oct 28, 2024 · e9b9f1e · e9b9f1e
1 parent 4e483a6
commit e9b9f1e
Show file tree

Hide file tree

Showing 56 changed files with 138 additions and 138 deletions.
diff --git a/bobassembly/prototypes/assembly-electronics.lua b/bobassembly/prototypes/assembly-electronics.lua
@@ -333,7 +333,7 @@ if settings.startup["bobmods-assembly-electronicmachines"].value == true then
       prerequisites = {
         "electronics-machine-1",
         "steel-processing",
-        "advanced-electronics",
+        "advanced-circuit",
         "chemical-science-pack",
       },
       unit = {
@@ -509,7 +509,7 @@ if settings.startup["bobmods-assembly-electronicmachines"].value == true then
       },
       prerequisites = {
         "electronics-machine-2",
-        "advanced-electronics-2",
+        "processing-unit",
         "production-science-pack",
         "utility-science-pack",
       },

diff --git a/bobassembly/prototypes/assembly-updates.lua b/bobassembly/prototypes/assembly-updates.lua
@@ -4,7 +4,7 @@ bobmods.lib.tech.add_prerequisite("automation-2", "logistic-science-pack")
 
 data.raw.technology["automation-3"].prerequisites = {
   "automation-2",
-  "advanced-electronics",
+  "advanced-circuit",
   "chemical-science-pack",
 }
 bobmods.lib.tech.set_science_pack_count("automation-3", 60)

diff --git a/bobassembly/prototypes/assembly.lua b/bobassembly/prototypes/assembly.lua
@@ -137,7 +137,7 @@ data:extend({
     },
     prerequisites = {
       "automation-3",
-      "advanced-electronics-2",
+      "processing-unit",
       "production-science-pack",
     },
     unit = {

diff --git a/bobassembly/prototypes/centrifuge.lua b/bobassembly/prototypes/centrifuge.lua
@@ -99,7 +99,7 @@ if settings.startup["bobmods-assembly-centrifuge"].value == true then
       },
       prerequisites = {
         "production-science-pack",
-        "advanced-electronics-2",
+        "processing-unit",
         "uranium-processing",
       },
       unit = {

diff --git a/bobassembly/prototypes/chemical-mixing-furnace.lua b/bobassembly/prototypes/chemical-mixing-furnace.lua
@@ -273,7 +273,7 @@ then
       },
       order = "c-c-b-1",
       prerequisites = {
-        "advanced-electronics-2",
+        "processing-unit",
         "production-science-pack",
       },
       unit = {

diff --git a/bobassembly/prototypes/chemical-plant.lua b/bobassembly/prototypes/chemical-plant.lua
@@ -329,7 +329,7 @@ if settings.startup["bobmods-assembly-chemicalplants"].value == true then
       icon = "__bobassembly__/graphics/icons/technology/chemical-plant-2.png",
       icon_size = 128,
       prerequisites = {
-        "advanced-electronics",
+        "advanced-circuit",
         "chemical-science-pack",
       },
       effects = {
@@ -357,7 +357,7 @@ if settings.startup["bobmods-assembly-chemicalplants"].value == true then
       icon_size = 128,
       prerequisites = {
         "chemical-plant-2",
-        "advanced-electronics-2",
+        "processing-unit",
         "production-science-pack",
       },
       effects = {

diff --git a/bobassembly/prototypes/electric-furnace.lua b/bobassembly/prototypes/electric-furnace.lua
@@ -255,7 +255,7 @@ if settings.startup["bobmods-assembly-furnaces"].value == true and data.raw.furn
       order = "c-c-c",
       prerequisites = {
         "advanced-material-processing-2",
-        "advanced-electronics-2",
+        "processing-unit",
         "production-science-pack",
       },
       unit = {

diff --git a/bobassembly/prototypes/electrolyser.lua b/bobassembly/prototypes/electrolyser.lua
@@ -461,7 +461,7 @@ then
       icon_size = 128,
       prerequisites = {
         "electrolyser-3",
-        "advanced-electronics-2",
+        "processing-unit",
         "production-science-pack",
       },
       effects = {

diff --git a/bobassembly/prototypes/oil-refinery.lua b/bobassembly/prototypes/oil-refinery.lua
@@ -63,7 +63,7 @@ if settings.startup["bobmods-assembly-oilrefineries"].value == true then
       icon_size = 256,
       prerequisites = {
         "oil-processing",
-        "advanced-electronics",
+        "advanced-circuit",
         "chemical-science-pack",
       },
       order = "d-a2",
@@ -136,7 +136,7 @@ if settings.startup["bobmods-assembly-oilrefineries"].value == true then
       icon_size = 256,
       prerequisites = {
         "oil-processing-2",
-        "advanced-electronics-2",
+        "processing-unit",
         "production-science-pack",
       },
       order = "d-a3",

diff --git a/bobclasses/prototypes/bodies.lua b/bobclasses/prototypes/bodies.lua
@@ -380,7 +380,7 @@ data:extend({
     },
     prerequisites = {
       "robotics",
-      "advanced-electronics",
+      "advanced-circuit",
       "automation-2",
     },
     unit = {
@@ -540,7 +540,7 @@ data:extend({
     prerequisites = {
       "bodies",
       "production-science-pack",
-      "advanced-electronics-2",
+      "processing-unit",
     },
     unit = {
       count = 250,

diff --git a/bobelectronics/migrations/bobelectronics_0.15.0.lua b/bobelectronics/migrations/bobelectronics_0.15.0.lua
@@ -45,14 +45,14 @@ for index, force in pairs(game.forces) do
     end
   end
 
-  if force.technologies["advanced-electronics"].researched then
+  if force.technologies["advanced-circuit"].researched then
     force.recipes["electronic-components"].enabled = true
     force.recipes["phenolic-board"].enabled = true
     force.recipes["circuit-board"].enabled = true
     force.recipes["advanced-circuit"].enabled = true
   end
 
-  if force.technologies["advanced-electronics-2"].researched then
+  if force.technologies["processing-unit"].researched then
     force.recipes["intergrated-electronics"].enabled = true
     force.recipes["fibreglass-board"].enabled = true
     force.recipes["superior-circuit-board"].enabled = true

diff --git a/bobelectronics/prototypes/technology-updates.lua b/bobelectronics/prototypes/technology-updates.lua
@@ -4,7 +4,7 @@ bobmods.lib.tech.remove_prerequisite("circuit-network", "electronics")
 bobmods.lib.tech.remove_prerequisite("solar-energy", "electronics")
 bobmods.lib.tech.remove_prerequisite("electric-energy-distribution-1", "electronics")
 
-bobmods.lib.tech.add_prerequisite("advanced-electronics", "plastics")
+bobmods.lib.tech.add_prerequisite("advanced-circuit", "plastics")
 
 bobmods.lib.tech.add_recipe_unlock("oil-processing", "bob-resin-oil")
 
@@ -15,10 +15,10 @@ bobmods.lib.tech.add_recipe_unlock("plastics", "synthetic-wood")
 
 if data.raw.technology["chemical-processing-2"] then
   bobmods.lib.tech.add_recipe_unlock("chemical-processing-2", "ferric-chloride-solution")
-  bobmods.lib.tech.add_prerequisite("advanced-electronics", "chemical-processing-2")
+  bobmods.lib.tech.add_prerequisite("advanced-circuit", "chemical-processing-2")
 else
   bobmods.lib.tech.add_recipe_unlock("oil-processing", "ferric-chloride-solution")
-  bobmods.lib.tech.add_prerequisite("advanced-electronics", "oil-processing")
+  bobmods.lib.tech.add_prerequisite("advanced-circuit", "oil-processing")
 end
 
 if data.raw.recipe["silicon-wafer"] then
@@ -53,20 +53,20 @@ if data.raw.technology["chemical-processing-1"] and data.raw.technology["alloy-p
   bobmods.lib.tech.add_prerequisite("electronics", "alloy-processing")
 end
 
-bobmods.lib.tech.add_recipe_unlock("advanced-electronics", "electronic-components")
-bobmods.lib.tech.add_recipe_unlock("advanced-electronics", "phenolic-board")
-bobmods.lib.tech.add_recipe_unlock("advanced-electronics", "circuit-board")
-bobmods.lib.tech.add_recipe_unlock("advanced-electronics", "advanced-circuit") --to re-add if it was removed in previous mod
+bobmods.lib.tech.add_recipe_unlock("advanced-circuit", "electronic-components")
+bobmods.lib.tech.add_recipe_unlock("advanced-circuit", "phenolic-board")
+bobmods.lib.tech.add_recipe_unlock("advanced-circuit", "circuit-board")
+bobmods.lib.tech.add_recipe_unlock("advanced-circuit", "advanced-circuit") --to re-add if it was removed in previous mod
 if data.raw.technology["silicon-processing"] then
-  bobmods.lib.tech.add_prerequisite("advanced-electronics", "silicon-processing")
+  bobmods.lib.tech.add_prerequisite("advanced-circuit", "silicon-processing")
 end
 
-bobmods.lib.tech.add_recipe_unlock("advanced-electronics-2", "intergrated-electronics")
-bobmods.lib.tech.add_recipe_unlock("advanced-electronics-2", "fibreglass-board")
-bobmods.lib.tech.add_recipe_unlock("advanced-electronics-2", "superior-circuit-board")
-bobmods.lib.tech.add_recipe_unlock("advanced-electronics-2", "processing-unit")
+bobmods.lib.tech.add_recipe_unlock("processing-unit", "intergrated-electronics")
+bobmods.lib.tech.add_recipe_unlock("processing-unit", "fibreglass-board")
+bobmods.lib.tech.add_recipe_unlock("processing-unit", "superior-circuit-board")
+bobmods.lib.tech.add_recipe_unlock("processing-unit", "processing-unit")
 if data.raw.technology["gold-processing"] then
-  bobmods.lib.tech.add_prerequisite("advanced-electronics-2", "gold-processing")
+  bobmods.lib.tech.add_prerequisite("processing-unit", "gold-processing")
 end
 
 if data.raw.recipe["gilded-copper-cable"] then
@@ -81,14 +81,14 @@ if data.raw.technology["ceramics"] then
 end
 
 data.raw.technology["electronics"].icon = "__bobelectronics__/graphics/icons/technology/electronics.png"
-data.raw.technology["advanced-electronics"].icon =
+data.raw.technology["advanced-circuit"].icon =
   "__bobelectronics__/graphics/icons/technology/advanced-electronics.png"
-data.raw.technology["advanced-electronics-2"].icon =
+data.raw.technology["processing-unit"].icon =
   "__bobelectronics__/graphics/icons/technology/advanced-electronics-2.png"
 
 data.raw.technology["electronics"].icon_size = 128
-data.raw.technology["advanced-electronics"].icon_size = 128
-data.raw.technology["advanced-electronics-2"].icon_size = 128
+data.raw.technology["advanced-circuit"].icon_size = 128
+data.raw.technology["processing-unit"].icon_size = 128
 
 bobmods.lib.tech.remove_recipe_unlock("oil-processing", "solid-fuel-from-petroleum-gas")
 bobmods.lib.tech.remove_recipe_unlock("advanced-oil-processing", "solid-fuel-from-light-oil")

diff --git a/bobelectronics/prototypes/technology.lua b/bobelectronics/prototypes/technology.lua
@@ -5,7 +5,7 @@ data:extend({
     icon = "__bobelectronics__/graphics/icons/technology/advanced-electronics-3.png",
     icon_size = 128,
     prerequisites = {
-      "advanced-electronics-2",
+      "processing-unit",
       "production-science-pack",
     },
     effects = {

diff --git a/bobequipment/prototypes/personal-roboport.lua b/bobequipment/prototypes/personal-roboport.lua
@@ -182,7 +182,7 @@ data:extend({
     },
     prerequisites = {
       "personal-roboport-mk2-equipment",
-      "advanced-electronics-2",
+      "processing-unit",
       "utility-science-pack",
     },
     unit = {

diff --git a/bobequipment/prototypes/technology/equipment.lua b/bobequipment/prototypes/technology/equipment.lua
@@ -15,7 +15,7 @@ data:extend({
     }),
     order = "g-e-c",
     prerequisites = {
-      "advanced-electronics-2",
+      "processing-unit",
       "energy-shield-mk2-equipment",
       "productivity-module-2",
       "production-science-pack",
@@ -181,7 +181,7 @@ data:extend({
     }),
     order = "g-i-d",
     prerequisites = {
-      "advanced-electronics-2",
+      "processing-unit",
       "bob-battery-equipment-3",
       "production-science-pack",
     },
@@ -405,7 +405,7 @@ data:extend({
     }),
     order = "g-g-c",
     prerequisites = {
-      "advanced-electronics-2",
+      "processing-unit",
       "night-vision-equipment-2",
       "production-science-pack",
     },
@@ -468,7 +468,7 @@ data:extend({
     order = "g-k-c",
     prerequisites = {
       "solar-panel-equipment-2",
-      "advanced-electronics-2",
+      "processing-unit",
       "production-science-pack",
     },
     effects = {
@@ -570,7 +570,7 @@ data:extend({
     }),
     order = "g-m-c",
     prerequisites = {
-      "advanced-electronics-2",
+      "processing-unit",
       "personal-laser-defense-equipment-2",
       "production-science-pack",
     },
@@ -687,8 +687,8 @@ data:extend({
   },
 })
 
-bobmods.lib.tech.remove_prerequisite("exoskeleton-equipment", "advanced-electronics-2")
-bobmods.lib.tech.add_prerequisite("exoskeleton-equipment", "advanced-electronics")
+bobmods.lib.tech.remove_prerequisite("exoskeleton-equipment", "processing-unit")
+bobmods.lib.tech.add_prerequisite("exoskeleton-equipment", "advanced-circuit")
 
 data:extend({
   {
@@ -701,7 +701,7 @@ data:extend({
     order = "g-h-b",
     prerequisites = {
       "exoskeleton-equipment",
-      "advanced-electronics-2",
+      "processing-unit",
     },
     effects = {
       {

diff --git a/bobequipment/prototypes/technology/technology-updates.lua b/bobequipment/prototypes/technology/technology-updates.lua
@@ -2,7 +2,7 @@ if mods["boblogistics"] or mods["bobplates"] then
   -- Bob's Logistics mod and Bob's MCI mod remove blue science from Electric engine and Robotics
 
   bobmods.lib.tech.remove_science_pack("exoskeleton-equipment", "chemical-science-pack")
-  bobmods.lib.tech.remove_prerequisite("exoskeleton-equipment", "advanced-electronics-2")
+  bobmods.lib.tech.remove_prerequisite("exoskeleton-equipment", "processing-unit")
 end
 
 if mods["boblogistics"] then

diff --git a/boblogistics/prototypes/repair-pack.lua b/boblogistics/prototypes/repair-pack.lua
@@ -127,7 +127,7 @@ data:extend({
     icon_size = 32,
     prerequisites = {
       "bob-repair-pack-2",
-      "advanced-electronics",
+      "advanced-circuit",
     },
     effects = {
       {
@@ -152,7 +152,7 @@ data:extend({
     icon_size = 32,
     prerequisites = {
       "bob-repair-pack-3",
-      "advanced-electronics-2",
+      "processing-unit",
     },
     effects = {
       {

diff --git a/boblogistics/prototypes/technology-inserter.lua b/boblogistics/prototypes/technology-inserter.lua
@@ -52,7 +52,7 @@ if settings.startup["bobmods-logistics-inserteroverhaul"].value == true then
 
   bobmods.lib.tech.remove_prerequisite("fast-inserter", "electronics")
   bobmods.lib.tech.add_prerequisite("fast-inserter", "logistics-2")
-  bobmods.lib.tech.remove_prerequisite("stack-inserter", "advanced-electronics")
+  bobmods.lib.tech.remove_prerequisite("stack-inserter", "advanced-circuit")
 
   bobmods.lib.tech.add_recipe_unlock("stack-inserter-2", "stack-inserter")
   bobmods.lib.tech.add_recipe_unlock("stack-inserter-2", "stack-filter-inserter")
@@ -193,7 +193,7 @@ else
 
   bobmods.lib.tech.add_recipe_unlock("express-inserters", "express-inserter")
   bobmods.lib.tech.add_recipe_unlock("express-inserters", "express-filter-inserter")
-  bobmods.lib.tech.add_prerequisite("express-inserters", "advanced-electronics")
+  bobmods.lib.tech.add_prerequisite("express-inserters", "advanced-circuit")
 end
 
 data:extend({

diff --git a/boblogistics/prototypes/technology-updates.lua b/boblogistics/prototypes/technology-updates.lua
@@ -214,18 +214,18 @@ end
 
 if data.raw.technology["bob-robotics-3"] then
   bobmods.lib.tech.add_prerequisite("bob-robots-2", "bob-robotics-3")
-  bobmods.lib.tech.add_prerequisite("bob-robotics-3", "advanced-electronics-2")
+  bobmods.lib.tech.add_prerequisite("bob-robotics-3", "processing-unit")
   if data.raw.technology["titanium-processing"] then
     bobmods.lib.tech.add_prerequisite("bob-robotics-3", "titanium-processing")
   end
 else
-  bobmods.lib.tech.add_prerequisite("bob-robots-2", "advanced-electronics-2")
+  bobmods.lib.tech.add_prerequisite("bob-robots-2", "processing-unit")
   if data.raw.technology["titanium-processing"] then
     bobmods.lib.tech.add_prerequisite("bob-robots-2", "titanium-processing")
   end
 end
 
-bobmods.lib.tech.add_prerequisite("bob-robo-modular-3", "advanced-electronics-2")
+bobmods.lib.tech.add_prerequisite("bob-robo-modular-3", "processing-unit")
 
 if data.raw.item["lithium-ion-battery"] and data.raw.technology["battery-2"] then
   if data.raw.technology["bob-robotics-3"] then