Skip to content

Commit

Permalink
Merge branch 'equipment' of https://github.com/modded-factorio/bobsmods
Browse files Browse the repository at this point in the history
… into equipment
  • Loading branch information
KiwiHawk committed Jun 2, 2024
2 parents c2ae56f + b711904 commit a7cb95f
Show file tree
Hide file tree
Showing 2 changed files with 12 additions and 4 deletions.
4 changes: 2 additions & 2 deletions bobequipment/prototypes/recipe/equipment.lua
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ data:extend({
})

bobmods.lib.recipe.remove_ingredient("battery-equipment", "steel-plate")
bobmods.lib.recipe.add_ingredient("battery-equipment", { "electronic-circuit", 5 } )
bobmods.lib.recipe.add_ingredient("battery-equipment", { "electronic-circuit", 5 })

data.raw.recipe["battery-mk2-equipment"].ingredients = {
{ "battery-equipment", 2 },
Expand Down Expand Up @@ -235,7 +235,7 @@ data:extend({
data.raw.recipe["personal-laser-defense-equipment"].ingredients = {
{ "steel-plate", 5 },
{ "advanced-circuit", 5 },
{ "battery", 3 }
{ "battery", 3 },
}

data:extend({
Expand Down
12 changes: 10 additions & 2 deletions bobequipment/prototypes/recipe/updates.lua
Original file line number Diff line number Diff line change
Expand Up @@ -363,8 +363,16 @@ if data.raw.item["advanced-processing-unit"] then
bobmods.lib.tech.add_prerequisite("night-vision-equipment-3", "advanced-electronics-3")
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.recipe.replace_ingredient("personal-laser-defense-equipment-5", "processing-unit", "advanced-processing-unit")
bobmods.lib.recipe.replace_ingredient("personal-laser-defense-equipment-6", "processing-unit", "advanced-processing-unit")
bobmods.lib.recipe.replace_ingredient(
"personal-laser-defense-equipment-5",
"processing-unit",
"advanced-processing-unit"
)
bobmods.lib.recipe.replace_ingredient(
"personal-laser-defense-equipment-6",
"processing-unit",
"advanced-processing-unit"
)
bobmods.lib.tech.add_prerequisite("personal-laser-defense-equipment-5", "advanced-electronics-3")
bobmods.lib.recipe.replace_ingredient("exoskeleton-equipment-3", "processing-unit", "advanced-processing-unit")
bobmods.lib.tech.add_prerequisite("exoskeleton-equipment-3", "advanced-electronics-3")
Expand Down

0 comments on commit a7cb95f

Please sign in to comment.