diff --git a/angelsindustries/changelog.txt b/angelsindustries/changelog.txt index 495749682..f5f65a508 100644 --- a/angelsindustries/changelog.txt +++ b/angelsindustries/changelog.txt @@ -3,6 +3,7 @@ Version: 0.4.22 Date: ??? Changes: - Added item description to Gravitational analyzer (984) + - Adjusted the recipes and science packs for Bob's Assembling Machines when Components or Technology Overhauls are enabled (985) --------------------------------------------------------------------------------------------------- Version: 0.4.21 Date: 21.02.2024 diff --git a/angelsindustries/prototypes/overrides/components-bobs-entity-update/components-bobs-assemblers-update.lua b/angelsindustries/prototypes/overrides/components-bobs-entity-update/components-bobs-assemblers-update.lua index e78fc2273..bc67d8437 100644 --- a/angelsindustries/prototypes/overrides/components-bobs-entity-update/components-bobs-assemblers-update.lua +++ b/angelsindustries/prototypes/overrides/components-bobs-entity-update/components-bobs-assemblers-update.lua @@ -19,36 +19,30 @@ if angelsmods.industries.components then end OV.patch_recipes({ - { - name = "assembling-machine-2", - ingredients = { - { type = "item", name = "block-construction-1", amount = "block-construction-2" }, - }, - }, { name = "assembling-machine-3", ingredients = { - { type = "item", name = "block-construction-2", amount = "block-construction-4" }, + { type = "item", name = "block-construction-3", amount = "block-construction-4" }, { type = "item", name = "block-enhancement-2", amount = "block-enhancement-4" }, - { type = "item", name = "block-mechanical-1", amount = "block-mechanical-2" }, - { type = "item", name = "block-fluidbox-1", amount = "block-fluidbox-2" }, + { type = "item", name = "block-mechanical-2", amount = "block-mechanical-2" }, + { type = "item", name = "block-fluidbox-2", amount = "block-fluidbox-2" }, }, }, { name = "assembling-machine-4", ingredients = { { "!!" }, - { type = "item", name = "block-construction-3", amount = 2 }, + { type = "item", name = "block-construction-4", amount = 2 }, { type = "item", name = "block-enhancement-3", amount = 3 }, - { type = "item", name = "block-mechanical-1", amount = 5 }, - { type = "item", name = "block-fluidbox-1", amount = 3 }, + { type = "item", name = "block-mechanical-2", amount = 5 }, + { type = "item", name = "block-fluidbox-2", amount = 3 }, }, }, { name = "assembling-machine-5", ingredients = { { "!!" }, - { type = "item", name = "block-construction-4", amount = 2 }, + { type = "item", name = "block-construction-5", amount = 2 }, { type = "item", name = "block-enhancement-4", amount = 3 }, { type = "item", name = "block-mechanical-2", amount = 5 }, { type = "item", name = "block-fluidbox-2", amount = 3 }, @@ -99,12 +93,12 @@ if angelsmods.industries.components then { type = "item", name = "block-mechanical-1", amount = 2 }, }, }, - { -- corresponds to assembling machine 2.5 + { -- corresponds to assembling machine 3.5 name = "electronics-machine-2", ingredients = { { "!!" }, - { type = "item", name = "block-construction-3", amount = 2 }, - { type = "item", name = "block-enhancement-2", amount = 3 }, + { type = "item", name = "block-construction-4", amount = 2 }, + { type = "item", name = "block-enhancement-3", amount = 3 }, { type = "item", name = "block-mechanical-2", amount = 3 }, { type = "item", name = "block-fluidbox-2", amount = 1 }, }, @@ -114,7 +108,7 @@ if angelsmods.industries.components then ingredients = { { "!!" }, { type = "item", name = "block-construction-5", amount = 2 }, - { type = "item", name = "block-enhancement-4", amount = 3 }, + { type = "item", name = "block-enhancement-5", amount = 3 }, { type = "item", name = "block-mechanical-2", amount = 5 }, { type = "item", name = "block-fluidbox-2", amount = 3 }, }, @@ -123,8 +117,7 @@ if angelsmods.industries.components then OV.add_prereq("electronics-machine-1", "angels-components-construction-2") OV.add_prereq("electronics-machine-1", "electronics") - OV.add_prereq("electronics-machine-2", "angels-components-construction-3") - OV.add_prereq("electronics-machine-2", "advanced-electronics") + OV.add_prereq("electronics-machine-2", "angels-components-construction-4") OV.add_prereq("electronics-machine-3", "angels-components-construction-5") if data.raw.technology["advanced-electronics-3"] then OV.add_prereq("electronics-machine-3", "advanced-electronics-3") diff --git a/angelsindustries/prototypes/overrides/global-tech-bobs-packs.lua b/angelsindustries/prototypes/overrides/global-tech-bobs-packs.lua index 4aff50298..4d17d61a3 100644 --- a/angelsindustries/prototypes/overrides/global-tech-bobs-packs.lua +++ b/angelsindustries/prototypes/overrides/global-tech-bobs-packs.lua @@ -48,11 +48,11 @@ if angelsmods.industries.tech then AI.pack_replace("automation", "grey", "red") end -- assemblers tier 2+ - AI.pack_replace("automation-4", "blue", "orange") - OV.remove_prereq("automation-4", "tech-blue-packs") + AI.pack_replace("automation-2", "red", "green") + AI.pack_replace("automation-3", "blue", "orange") + OV.remove_prereq("automation-4", "production-science-pack") if settings.startup["bobmods-assembly-electronicmachines"].value == true then - AI.pack_replace("electronics-machine-3", "yellow", "blue") - OV.remove_prereq("electronics-machine-3", "production-science-pack") + AI.pack_replace("electronics-machine-2", "blue", "orange") end --chemplants if settings.startup["bobmods-assembly-chemicalplants"].value == true then