Skip to content

Commit

Permalink
Merge branch 'dev2.0' of https://github.com/modded-factorio/bobsmods
Browse files Browse the repository at this point in the history
…into dev2.0
  • Loading branch information
KiwiHawk committed Oct 28, 2024
2 parents 2eea5c5 + d0bb5be commit d6d759a
Showing 1 changed file with 12 additions and 54 deletions.
Original file line number Diff line number Diff line change
@@ -1,14 +1,6 @@
if data.raw.item["brass-chest"] then
bobmods.lib.recipe.replace_ingredient(
"passive-provider-chest-2",
"passive-provider-chest",
"brass-chest"
)
bobmods.lib.recipe.replace_ingredient(
"active-provider-chest-2",
"active-provider-chest",
"brass-chest"
)
bobmods.lib.recipe.replace_ingredient("passive-provider-chest-2", "passive-provider-chest", "brass-chest")
bobmods.lib.recipe.replace_ingredient("active-provider-chest-2", "active-provider-chest", "brass-chest")
bobmods.lib.recipe.replace_ingredient("storage-chest-2", "storage-chest", "brass-chest")
bobmods.lib.recipe.replace_ingredient("buffer-chest-2", "buffer-chest", "brass-chest")
bobmods.lib.recipe.replace_ingredient("requester-chest-2", "requester-chest", "brass-chest")
Expand All @@ -17,50 +9,24 @@ if data.raw.item["brass-chest"] then
"passive-provider-chest-2",
{ type = "item", name = "advanced-circuit", amount = 3 }
)
bobmods.lib.recipe.add_ingredient(
"active-provider-2",
{ type = "item", name = "advanced-circuit", amount = 3 }
)
bobmods.lib.recipe.add_ingredient(
"storage-chest-2",
{ type = "item", name = "advanced-circuit", amount = 3 }
)
bobmods.lib.recipe.add_ingredient("active-provider-2", { type = "item", name = "advanced-circuit", amount = 3 })
bobmods.lib.recipe.add_ingredient("storage-chest-2", { type = "item", name = "advanced-circuit", amount = 3 })
bobmods.lib.recipe.add_ingredient("buffer-chest-2", { type = "item", name = "advanced-circuit", amount = 3 })
bobmods.lib.recipe.add_ingredient(
"requester-chest-2",
{ type = "item", name = "advanced-circuit", amount = 3 }
)
bobmods.lib.recipe.add_ingredient("requester-chest-2", { type = "item", name = "advanced-circuit", amount = 3 })
end

if data.raw.item["titanium-chest"] then
bobmods.lib.recipe.replace_ingredient(
"passive-provider-chest-3",
"passive-provider-chest-2",
"titanium-chest"
)
bobmods.lib.recipe.replace_ingredient(
"active-provider-chest-3",
"active-provider-chest-2",
"titanium-chest"
)
bobmods.lib.recipe.replace_ingredient("passive-provider-chest-3", "passive-provider-chest-2", "titanium-chest")
bobmods.lib.recipe.replace_ingredient("active-provider-chest-3", "active-provider-chest-2", "titanium-chest")
bobmods.lib.recipe.replace_ingredient("storage-chest-3", "storage-chest-2", "titanium-chest")
bobmods.lib.recipe.replace_ingredient("buffer-chest-3", "buffer-chest-2", "titanium-chest")
bobmods.lib.recipe.replace_ingredient("requester-chest-3", "requester-chest-2", "titanium-chest")

bobmods.lib.recipe.add_ingredient(
"passive-provider-chest-3",
{ type = "item", name = "processing-unit", amount = 2 }
)
bobmods.lib.recipe.add_ingredient(
"active-provider-chest-3",
{ type = "item", name = "processing-unit", amount = 2 }
)
bobmods.lib.recipe.add_ingredient("passive-provider-chest-3", { type = "item", name = "processing-unit", amount = 2 })
bobmods.lib.recipe.add_ingredient("active-provider-chest-3", { type = "item", name = "processing-unit", amount = 2 })
bobmods.lib.recipe.add_ingredient("storage-chest-3", { type = "item", name = "processing-unit", amount = 2 })
bobmods.lib.recipe.add_ingredient("buffer-chest-3", { type = "item", name = "processing-unit", amount = 2 })
bobmods.lib.recipe.add_ingredient(
"requester-chest-3",
{ type = "item", name = "processing-unit", amount = 2 }
)
bobmods.lib.recipe.add_ingredient("requester-chest-3", { type = "item", name = "processing-unit", amount = 2 })

if data.raw.item["advanced-processing-unit"] then
bobmods.lib.recipe.add_ingredient(
Expand All @@ -87,16 +53,8 @@ if data.raw.item["titanium-chest"] then
end
else
if data.raw.item["advanced-processing-unit"] then
bobmods.lib.recipe.replace_ingredient(
"passive-provider-chest-3",
"processing-unit",
"advanced-processing-unit"
)
bobmods.lib.recipe.replace_ingredient(
"active-provider-chest-3",
"processing-unit",
"advanced-processing-unit"
)
bobmods.lib.recipe.replace_ingredient("passive-provider-chest-3", "processing-unit", "advanced-processing-unit")
bobmods.lib.recipe.replace_ingredient("active-provider-chest-3", "processing-unit", "advanced-processing-unit")
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")
Expand Down

0 comments on commit d6d759a

Please sign in to comment.