Skip to content

Commit

Permalink
Rename "advanced-electronics-3" to "advanced-processing-unit"
Browse files Browse the repository at this point in the history
  • Loading branch information
KiwiHawk committed Dec 3, 2024
1 parent d76f93f commit d4fc4f6
Show file tree
Hide file tree
Showing 23 changed files with 65 additions and 90 deletions.
18 changes: 9 additions & 9 deletions bobequipment/prototypes/recipe/updates.lua
Original file line number Diff line number Diff line change
Expand Up @@ -255,7 +255,7 @@ else
end

if data.raw.item["advanced-processing-unit"] then
bobmods.lib.tech.add_prerequisite("personal-roboport-mk4-equipment", "advanced-electronics-3")
bobmods.lib.tech.add_prerequisite("personal-roboport-mk4-equipment", "advanced-processing-unit")
end

if data.raw.item["silver-zinc-battery"] then
Expand All @@ -268,7 +268,7 @@ if data.raw.item["nitinol-alloy"] then
end

if data.raw.item["advanced-processing-unit"] then
bobmods.lib.tech.add_prerequisite("personal-roboport-mk4-equipment", "advanced-electronics-3")
bobmods.lib.tech.add_prerequisite("personal-roboport-mk4-equipment", "advanced-processing-unit")
bobmods.lib.recipe.replace_ingredient(
"personal-roboport-robot-equipment-4",
"processing-unit",
Expand Down Expand Up @@ -358,20 +358,20 @@ end

if data.raw.item["advanced-processing-unit"] then
bobmods.lib.recipe.replace_ingredient("energy-shield-mk4-equipment", "processing-unit", "advanced-processing-unit")
bobmods.lib.tech.add_prerequisite("bob-energy-shield-equipment-4", "advanced-electronics-3")
bobmods.lib.tech.add_prerequisite("bob-energy-shield-equipment-4", "advanced-processing-unit")
bobmods.lib.recipe.replace_ingredient("energy-shield-mk5-equipment", "processing-unit", "advanced-processing-unit")
bobmods.lib.recipe.replace_ingredient("energy-shield-mk6-equipment", "processing-unit", "advanced-processing-unit")
bobmods.lib.recipe.replace_ingredient("battery-mk4-equipment", "processing-unit", "advanced-processing-unit")
bobmods.lib.tech.add_prerequisite("bob-battery-equipment-4", "advanced-electronics-3")
bobmods.lib.tech.add_prerequisite("bob-battery-equipment-4", "advanced-processing-unit")
bobmods.lib.recipe.replace_ingredient("battery-mk6-equipment", "processing-unit", "advanced-processing-unit")
bobmods.lib.recipe.replace_ingredient("fission-reactor-equipment-2", "processing-unit", "advanced-processing-unit")
bobmods.lib.tech.add_prerequisite("fission-reactor-equipment-2", "advanced-electronics-3")
bobmods.lib.tech.add_prerequisite("fission-reactor-equipment-2", "advanced-processing-unit")
bobmods.lib.recipe.replace_ingredient("fission-reactor-equipment-3", "processing-unit", "advanced-processing-unit")
bobmods.lib.recipe.replace_ingredient("fission-reactor-equipment-4", "processing-unit", "advanced-processing-unit")
bobmods.lib.recipe.replace_ingredient("night-vision-equipment-3", "processing-unit", "advanced-processing-unit")
bobmods.lib.tech.add_prerequisite("night-vision-equipment-3", "advanced-electronics-3")
bobmods.lib.tech.add_prerequisite("night-vision-equipment-3", "advanced-processing-unit")
bobmods.lib.recipe.replace_ingredient("solar-panel-equipment-4", "processing-unit", "advanced-processing-unit")
bobmods.lib.tech.add_prerequisite("solar-panel-equipment-4", "advanced-electronics-3")
bobmods.lib.tech.add_prerequisite("solar-panel-equipment-4", "advanced-processing-unit")
bobmods.lib.recipe.replace_ingredient(
"personal-laser-defense-equipment-5",
"processing-unit",
Expand All @@ -382,9 +382,9 @@ if data.raw.item["advanced-processing-unit"] then
"processing-unit",
"advanced-processing-unit"
)
bobmods.lib.tech.add_prerequisite("personal-laser-defense-equipment-5", "advanced-electronics-3")
bobmods.lib.tech.add_prerequisite("personal-laser-defense-equipment-5", "advanced-processing-unit")
bobmods.lib.recipe.replace_ingredient("exoskeleton-equipment-3", "processing-unit", "advanced-processing-unit")
bobmods.lib.tech.add_prerequisite("exoskeleton-equipment-3", "advanced-electronics-3")
bobmods.lib.tech.add_prerequisite("exoskeleton-equipment-3", "advanced-processing-unit")
end

if data.raw.item["bob-titanium-plate"] then
Expand Down
2 changes: 1 addition & 1 deletion boblogistics/prototypes/aai-loaders.lua
Original file line number Diff line number Diff line change
Expand Up @@ -151,7 +151,7 @@ if mods["aai-loaders"] then
"logistics-4",
"aai-express-loader",
"utility-science-pack",
data.raw.item["advanced-processing-unit"] and "advanced-electronics-3" or nil,
data.raw.item["advanced-processing-unit"] and "advanced-processing-unit" or nil,
},
unit = {
count = 400,
Expand Down
2 changes: 1 addition & 1 deletion boblogistics/prototypes/recipe/belt-recipe-updates.lua
Original file line number Diff line number Diff line change
Expand Up @@ -202,5 +202,5 @@ end

if data.raw.item["advanced-processing-unit"] then
bobmods.lib.recipe.replace_ingredient("ultimate-splitter", "processing-unit", "advanced-processing-unit")
bobmods.lib.tech.add_prerequisite("logistics-5", "advanced-electronics-3")
bobmods.lib.tech.add_prerequisite("logistics-5", "advanced-processing-unit")
end
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ if data.raw.item["titanium-chest"] then
"requester-chest-3",
{ type = "item", name = "advanced-processing-unit", amount = 1 }
)
bobmods.lib.tech.add_prerequisite("logistic-system-3", "advanced-electronics-3")
bobmods.lib.tech.add_prerequisite("logistic-system-3", "advanced-processing-unit")
end
else
if data.raw.item["advanced-processing-unit"] then
Expand All @@ -58,6 +58,6 @@ else
bobmods.lib.recipe.replace_ingredient("storage-chest-3", "processing-unit", "advanced-processing-unit")
bobmods.lib.recipe.replace_ingredient("buffer-chest-3", "processing-unit", "advanced-processing-unit")
bobmods.lib.recipe.replace_ingredient("requester-chest-3", "processing-unit", "advanced-processing-unit")
bobmods.lib.tech.add_prerequisite("logistic-system-3", "advanced-electronics-3")
bobmods.lib.tech.add_prerequisite("logistic-system-3", "advanced-processing-unit")
end
end
2 changes: 1 addition & 1 deletion boblogistics/prototypes/recipe/roboport-recipe-updates.lua
Original file line number Diff line number Diff line change
Expand Up @@ -95,7 +95,7 @@ end
if data.raw.item["advanced-processing-unit"] then
bobmods.lib.recipe.replace_ingredient("roboport-antenna-4", "processing-unit", "advanced-processing-unit")
bobmods.lib.recipe.replace_ingredient("roboport-chargepad-4", "processing-unit", "advanced-processing-unit")
bobmods.lib.tech.add_prerequisite("bob-robo-modular-4", "advanced-electronics-3")
bobmods.lib.tech.add_prerequisite("bob-robo-modular-4", "advanced-processing-unit")
end

if data.raw.item["silver-zinc-battery"] then
Expand Down
2 changes: 1 addition & 1 deletion boblogistics/prototypes/repair-pack-updates.lua
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ end

if data.raw.item["advanced-processing-unit"] then
bobmods.lib.recipe.replace_ingredient("repair-pack-5", "processing-unit", "advanced-processing-unit")
bobmods.lib.tech.add_prerequisite("bob-repair-pack-5", "advanced-electronics-3")
bobmods.lib.tech.add_prerequisite("bob-repair-pack-5", "advanced-processing-unit")
end

if data.raw.item["tungsten-carbide"] then
Expand Down
4 changes: 2 additions & 2 deletions boblogistics/prototypes/technology-updates.lua
Original file line number Diff line number Diff line change
Expand Up @@ -238,14 +238,14 @@ end
if data.raw.technology["bob-robotics-4"] then
bobmods.lib.tech.add_prerequisite("bob-robots-3", "bob-robotics-4")
if data.raw.item["advanced-processing-unit"] then
bobmods.lib.tech.add_prerequisite("bob-robotics-4", "advanced-electronics-3")
bobmods.lib.tech.add_prerequisite("bob-robotics-4", "advanced-processing-unit")
end
if data.raw.item["silicon-nitride"] then
bobmods.lib.tech.add_prerequisite("bob-robotics-4", "ceramics")
end
else
if data.raw.item["advanced-processing-unit"] then
bobmods.lib.tech.add_prerequisite("bob-robots-3", "advanced-electronics-3")
bobmods.lib.tech.add_prerequisite("bob-robots-3", "advanced-processing-unit")
end
if data.raw.item["silicon-nitride"] then
bobmods.lib.tech.add_prerequisite("bob-robots-3", "ceramics")
Expand Down
2 changes: 1 addition & 1 deletion bobmining/prototypes/areadrill-updates.lua
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ if settings.startup["bobmods-mining-areadrills"].value == true then

if data.raw.item["advanced-processing-unit"] then
bobmods.lib.recipe.replace_ingredient("bob-area-mining-drill-4", "processing-unit", "advanced-processing-unit")
bobmods.lib.tech.add_prerequisite("bob-area-drills-4", "advanced-electronics-3")
bobmods.lib.tech.add_prerequisite("bob-area-drills-4", "advanced-processing-unit")
end

if data.raw.item["tungsten-carbide"] then
Expand Down
2 changes: 1 addition & 1 deletion bobmining/prototypes/drill-updates.lua
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ if settings.startup["bobmods-mining-miningdrills"].value == true then

if data.raw.item["advanced-processing-unit"] then
bobmods.lib.recipe.replace_ingredient("bob-mining-drill-4", "processing-unit", "advanced-processing-unit")
bobmods.lib.tech.add_prerequisite("bob-drills-4", "advanced-electronics-3")
bobmods.lib.tech.add_prerequisite("bob-drills-4", "advanced-processing-unit")
end

if data.raw.item["tungsten-carbide"] then
Expand Down
2 changes: 1 addition & 1 deletion bobmining/prototypes/pumpjack-updates.lua
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,7 @@ if settings.startup["bobmods-mining-pumpjacks"].value == true then

if data.raw.item["advanced-processing-unit"] then
bobmods.lib.recipe.replace_ingredient("bob-pumpjack-4", "processing-unit", "advanced-processing-unit")
bobmods.lib.tech.add_prerequisite("bob-pumpjacks-4", "advanced-electronics-3")
bobmods.lib.tech.add_prerequisite("bob-pumpjacks-4", "advanced-processing-unit")
end

if data.raw.item["nitinol-pipe"] then
Expand Down
2 changes: 1 addition & 1 deletion bobmining/prototypes/water-miner-updates.lua
Original file line number Diff line number Diff line change
Expand Up @@ -101,7 +101,7 @@ if settings.startup["bobmods-mining-waterminers"].value == true and data.raw["re

if data.raw.item["advanced-processing-unit"] then
bobmods.lib.recipe.replace_ingredient("water-miner-5", "processing-unit", "advanced-processing-unit")
bobmods.lib.tech.add_prerequisite("water-miner-5", "advanced-electronics-3")
bobmods.lib.tech.add_prerequisite("water-miner-5", "advanced-processing-unit")
end

if data.raw.item["nitinol-pipe"] then
Expand Down
2 changes: 1 addition & 1 deletion bobmodules/prototypes/recipe/beacon-updates.lua
Original file line number Diff line number Diff line change
Expand Up @@ -25,5 +25,5 @@ end

if data.raw.item["advanced-processing-unit"] then
bobmods.lib.recipe.replace_ingredient("beacon-3", "electronic-circuit", "advanced-processing-unit")
bobmods.lib.tech.add_prerequisite("effect-transmission-3", "advanced-electronics-3")
bobmods.lib.tech.add_prerequisite("effect-transmission-3", "advanced-processing-unit")
end
4 changes: 2 additions & 2 deletions bobmodules/prototypes/recipe/electronics-updates.lua
Original file line number Diff line number Diff line change
Expand Up @@ -169,8 +169,8 @@ bobmods.lib.tech.add_recipe_unlock("pollution-clean-module-1", "pollution-clean-
bobmods.lib.tech.add_recipe_unlock("pollution-create-module-1", "pollution-create-processor")
bobmods.lib.tech.add_recipe_unlock("processing-unit", "module-processor-board-2")

if data.raw.technology["advanced-electronics-3"] then
bobmods.lib.tech.add_recipe_unlock("advanced-electronics-3", "module-processor-board-3")
if data.raw.technology["advanced-processing-unit"] then
bobmods.lib.tech.add_recipe_unlock("advanced-processing-unit", "module-processor-board-3")
else
bobmods.lib.tech.add_recipe_unlock("processing-unit", "module-processor-board-3")
end
67 changes: 21 additions & 46 deletions bobmodules/prototypes/technology/module.lua
Original file line number Diff line number Diff line change
Expand Up @@ -787,54 +787,29 @@ data:extend({
},
})

table.insert(data.raw.technology["speed-module-3"].effects, { type = "unlock-recipe", recipe = "speed-processor-2" })
table.insert(
data.raw.technology["efficiency-module-3"].effects,
{ type = "unlock-recipe", recipe = "efficiency-processor-2" }
)
table.insert(
data.raw.technology["productivity-module-3"].effects,
{ type = "unlock-recipe", recipe = "productivity-processor-2" }
)
table.insert(
data.raw.technology["pollution-clean-module-3"].effects,
{ type = "unlock-recipe", recipe = "pollution-clean-processor-2" }
)
table.insert(
data.raw.technology["pollution-create-module-3"].effects,
{ type = "unlock-recipe", recipe = "pollution-create-processor-2" }
)
bobmods.lib.tech.add_recipe_unlock("speed-module-3", "speed-processor-2")
bobmods.lib.tech.add_recipe_unlock("efficiency-module-3", "efficiency-processor-2")
bobmods.lib.tech.add_recipe_unlock("productivity-module-3", "productivity-processor-2")
bobmods.lib.tech.add_recipe_unlock("pollution-clean-module-3", "pollution-clean-processor-2")
bobmods.lib.tech.add_recipe_unlock("pollution-create-module-3", "pollution-create-processor-2")
bobmods.lib.tech.add_recipe_unlock("speed-module-6", "speed-processor-3")
bobmods.lib.tech.add_recipe_unlock("efficiency-module-6", "efficiency-processor-3")
bobmods.lib.tech.add_recipe_unlock("productivity-module-6", "productivity-processor-3")
bobmods.lib.tech.add_recipe_unlock("pollution-clean-module-6", "pollution-clean-processor-3")
bobmods.lib.tech.add_recipe_unlock("pollution-create-module-6", "pollution-create-processor-3")

table.insert(data.raw.technology["speed-module-6"].effects, { type = "unlock-recipe", recipe = "speed-processor-3" })
table.insert(
data.raw.technology["efficiency-module-6"].effects,
{ type = "unlock-recipe", recipe = "efficiency-processor-3" }
)
table.insert(
data.raw.technology["productivity-module-6"].effects,
{ type = "unlock-recipe", recipe = "productivity-processor-3" }
)
table.insert(
data.raw.technology["pollution-clean-module-6"].effects,
{ type = "unlock-recipe", recipe = "pollution-clean-processor-3" }
)
table.insert(
data.raw.technology["pollution-create-module-6"].effects,
{ type = "unlock-recipe", recipe = "pollution-create-processor-3" }
)
bobmods.lib.tech.add_prerequisite("speed-module-3", "processing-unit")
bobmods.lib.tech.add_prerequisite("efficiency-module-3", "processing-unit")
bobmods.lib.tech.add_prerequisite("productivity-module-3", "processing-unit")
bobmods.lib.tech.add_prerequisite("pollution-clean-module-3", "processing-unit")
bobmods.lib.tech.add_prerequisite("pollution-create-module-3", "processing-unit")

table.insert(data.raw.technology["speed-module-3"].prerequisites, "processing-unit")
table.insert(data.raw.technology["efficiency-module-3"].prerequisites, "processing-unit")
table.insert(data.raw.technology["productivity-module-3"].prerequisites, "processing-unit")
table.insert(data.raw.technology["pollution-clean-module-3"].prerequisites, "processing-unit")
table.insert(data.raw.technology["pollution-create-module-3"].prerequisites, "processing-unit")

if data.raw.technology["advanced-electronics-3"] then
table.insert(data.raw.technology["speed-module-6"].prerequisites, "advanced-electronics-3")
table.insert(data.raw.technology["efficiency-module-6"].prerequisites, "advanced-electronics-3")
table.insert(data.raw.technology["productivity-module-6"].prerequisites, "advanced-electronics-3")
table.insert(data.raw.technology["pollution-clean-module-6"].prerequisites, "advanced-electronics-3")
table.insert(data.raw.technology["pollution-create-module-6"].prerequisites, "advanced-electronics-3")
if data.raw.technology["advanced-processing-unit"] then
bobmods.lib.tech.add_prerequisite("speed-module-6", "advanced-processing-unit")
bobmods.lib.tech.add_prerequisite("efficiency-module-6", "advanced-processing-unit")
bobmods.lib.tech.add_prerequisite("productivity-module-6", "advanced-processing-unit")
bobmods.lib.tech.add_prerequisite("pollution-clean-module-6", "advanced-processing-unit")
bobmods.lib.tech.add_prerequisite("pollution-create-module-6", "advanced-processing-unit")
else
bobmods.lib.tech.add_prerequisite("speed-module-6", "production-science-pack")
bobmods.lib.tech.add_prerequisite("efficiency-module-6", "production-science-pack")
Expand Down
2 changes: 1 addition & 1 deletion bobpower/prototypes/recipe/fluid-generator-updates.lua
Original file line number Diff line number Diff line change
Expand Up @@ -132,7 +132,7 @@ if settings.startup["bobmods-power-fluidgenerator"].value == true then

if data.raw.item["advanced-processing-unit"] then
bobmods.lib.recipe.replace_ingredient("hydrazine-generator", "processing-unit", "advanced-processing-unit")
bobmods.lib.tech.add_prerequisite("hydrazine-generator", "advanced-electronics-3")
bobmods.lib.tech.add_prerequisite("hydrazine-generator", "advanced-processing-unit")
else
bobmods.lib.tech.add_prerequisite("hydrazine-generator", "processing-unit")
end
Expand Down
2 changes: 1 addition & 1 deletion bobpower/prototypes/recipe/nuclear-updates.lua
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ if settings.startup["bobmods-power-nuclear"].value == true then

if data.raw.item["advanced-processing-unit"] then
bobmods.lib.recipe.replace_ingredient("nuclear-reactor-3", "processing-unit", "advanced-processing-unit")
bobmods.lib.tech.add_prerequisite("bob-nuclear-power-3", "advanced-electronics-3")
bobmods.lib.tech.add_prerequisite("bob-nuclear-power-3", "advanced-processing-unit")
end

if data.raw.item["bob-lead-plate"] then
Expand Down
6 changes: 3 additions & 3 deletions bobpower/prototypes/recipe/poles-updates.lua
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ if settings.startup["bobmods-power-poles"].value == true then

if data.raw.item["advanced-processing-unit"] then
bobmods.lib.recipe.replace_ingredient("substation-4", "processing-unit", "advanced-processing-unit")
bobmods.lib.tech.add_prerequisite("electric-substation-4", "advanced-electronics-3")
bobmods.lib.tech.add_prerequisite("electric-substation-4", "advanced-processing-unit")
end

if data.raw.item["nitinol-alloy"] then
Expand All @@ -64,8 +64,8 @@ if settings.startup["bobmods-power-poles"].value == true then
bobmods.lib.recipe.replace_ingredient("medium-electric-pole-4", "copper-plate", "gilded-copper-cable")
bobmods.lib.recipe.replace_ingredient("big-electric-pole-4", "copper-plate", "gilded-copper-cable")
bobmods.lib.recipe.replace_ingredient("substation-4", "copper-plate", "gilded-copper-cable")
bobmods.lib.tech.add_prerequisite("electric-pole-4", "advanced-electronics-3")
bobmods.lib.tech.add_prerequisite("electric-substation-4", "advanced-electronics-3")
bobmods.lib.tech.add_prerequisite("electric-pole-4", "advanced-processing-unit")
bobmods.lib.tech.add_prerequisite("electric-substation-4", "advanced-processing-unit")
elseif data.raw.item["bob-gold-plate"] then
bobmods.lib.recipe.replace_ingredient("medium-electric-pole-4", "copper-plate", "bob-gold-plate")
bobmods.lib.recipe.replace_ingredient("big-electric-pole-4", "copper-plate", "bob-gold-plate")
Expand Down
2 changes: 1 addition & 1 deletion bobpower/prototypes/recipe/steam-turbines-updates.lua
Original file line number Diff line number Diff line change
Expand Up @@ -122,7 +122,7 @@ if settings.startup["bobmods-power-steam"].value == true then

if data.raw.item["advanced-processing-unit"] then
bobmods.lib.recipe.replace_ingredient("steam-turbine-3", "processing-unit", "advanced-processing-unit")
bobmods.lib.tech.add_prerequisite("bob-steam-turbine-3", "advanced-electronics-3")
bobmods.lib.tech.add_prerequisite("bob-steam-turbine-3", "advanced-processing-unit")
else
bobmods.lib.tech.add_prerequisite("bob-steam-turbine-3", "processing-unit")
end
Expand Down
8 changes: 4 additions & 4 deletions bobrevamp/prototypes/rocket-parts-updates.lua
Original file line number Diff line number Diff line change
Expand Up @@ -25,8 +25,8 @@ end
bobmods.lib.tech.remove_prerequisite("low-density-structure", "advanced-material-processing")

bobmods.lib.tech.remove_prerequisite("rocket-silo", "productivity-module-3")
if data.raw.technology["advanced-electronics-3"] then
bobmods.lib.tech.replace_prerequisite("rocket-silo", "processing-unit", "advanced-electronics-3")
if data.raw.technology["advanced-processing-unit"] then
bobmods.lib.tech.replace_prerequisite("rocket-silo", "processing-unit", "advanced-processing-unit")
bobmods.lib.tech.remove_prerequisite("rocket-silo", "speed-module-3")
end

Expand All @@ -51,10 +51,10 @@ then
{ type = "item", name = "multi-layer-circuit-board", amount = 2 }
)
end
bobmods.lib.tech.replace_prerequisite("rocket-control-unit", "speed-module", "advanced-electronics-3")
bobmods.lib.tech.replace_prerequisite("rocket-control-unit", "speed-module", "advanced-processing-unit")
elseif data.raw.item["advanced-processing-unit"] then
bobmods.lib.recipe.replace_ingredient("rocket-control-unit", "speed-module", "advanced-processing-unit")
bobmods.lib.tech.replace_prerequisite("rocket-control-unit", "speed-module", "advanced-electronics-3")
bobmods.lib.tech.replace_prerequisite("rocket-control-unit", "speed-module", "advanced-processing-unit")
end
bobmods.lib.tech.add_science_pack("rocket-control-unit", "production-science-pack", 1)

Expand Down
Loading

0 comments on commit d4fc4f6

Please sign in to comment.