diff --git a/SeaBlock/changelog.txt b/SeaBlock/changelog.txt index 86e65c33..d7fadaed 100644 --- a/SeaBlock/changelog.txt +++ b/SeaBlock/changelog.txt @@ -9,6 +9,7 @@ Date: ??? - Adjusted science packs required for Power Armor research #287 - Adjusted science packs for FTL techs (SpaceX) #288 - Added Thermal Water Bore to ingredients for Thermal Water Extractor #290 + - Unlocks Logistic Silo/Warehouse (Provider & Storage) earlier #275 Bugfixes: - Fixed tech unlocks after adding Science Cost Tweaker mod mid game #260 - Fixed duplicate starting items in rock-chest as well as player inventory #268 diff --git a/SeaBlock/data-final-fixes/logistics.lua b/SeaBlock/data-final-fixes/logistics.lua index c8b5b5ed..a9c30ed6 100644 --- a/SeaBlock/data-final-fixes/logistics.lua +++ b/SeaBlock/data-final-fixes/logistics.lua @@ -57,8 +57,8 @@ bobmods.lib.tech.add_prerequisite("logistic-system", "bob-robots-2") local logisticstechs = { "logistic-system-2", "logistic-system-3", - "angels-logistic-warehouses", - "logistic-silos", + "angels-logistic-warehouses-2", + "logistic-silos-2", } for _, v in pairs(logisticstechs) do @@ -73,8 +73,21 @@ for _, v in pairs(logisticstechs) do end if mods["angelsaddons-storage"] then - bobmods.lib.tech.replace_prerequisite("logistic-silos", "logistic-system", "logistic-system-3") + bobmods.lib.tech.remove_recipe_unlock("logistic-silos", "silo-active-provider") + bobmods.lib.tech.remove_recipe_unlock("logistic-silos", "silo-requester") + bobmods.lib.tech.remove_recipe_unlock("logistic-silos", "silo-buffer") + bobmods.lib.tech.remove_prerequisite("logistic-silos", "logistic-system") + bobmods.lib.tech.remove_prerequisite("logistic-silos", "logistic-system-3") + bobmods.lib.tech.add_prerequisite("logistic-silos", "construction-robotics") + bobmods.lib.tech.add_prerequisite("logistic-silos", "logistic-robotics") + bobmods.lib.tech.add_prerequisite("logistic-silos", "chemical-science-pack") + bobmods.lib.tech.remove_science_pack("logistic-silos", "advanced-logistic-science-pack") + bobmods.lib.tech.replace_prerequisite("angels-logistic-warehouses", "logistic-system", "logistic-silos") + bobmods.lib.tech.remove_recipe_unlock("angels-logistic-warehouses", "angels-warehouse-active-provider") + bobmods.lib.tech.remove_recipe_unlock("angels-logistic-warehouses", "angels-warehouse-requester") + bobmods.lib.tech.remove_recipe_unlock("angels-logistic-warehouses", "angels-warehouse-buffer") + bobmods.lib.tech.remove_science_pack("angels-logistic-warehouses", "advanced-logistic-science-pack") end bobmods.lib.tech.add_prerequisite("logistic-system-2", "utility-science-pack") diff --git a/SeaBlock/prototypes/technology.lua b/SeaBlock/prototypes/technology.lua index ef554489..66da5134 100644 --- a/SeaBlock/prototypes/technology.lua +++ b/SeaBlock/prototypes/technology.lua @@ -180,3 +180,82 @@ if mods["bobwarfare"] then }, }) end + +if mods["angelsaddons-storage"] then + data:extend({ + { + type = "technology", + name = "logistic-silos-2", + icon = "__angelsaddons-storage__/graphics/technology/logistic-silo-tech.png", + icon_size = 128, + prerequisites = { + "logistic-system-3", + "logistic-silos", + }, + effects = { + { + type = "unlock-recipe", + recipe = "silo-active-provider", + }, + { + type = "unlock-recipe", + recipe = "silo-requester", + }, + { + type = "unlock-recipe", + recipe = "silo-buffer", + }, + }, + unit = { + count = 75, + ingredients = { + { type = "item", name = "automation-science-pack", amount = 1 }, + { type = "item", name = "logistic-science-pack", amount = 1 }, + { type = "item", name = "chemical-science-pack", amount = 1 }, + { type = "item", name = "production-science-pack", amount = 1 }, + { type = "item", name = "utility-science-pack", amount = 1 }, + { type = "item", name = "advanced-logistic-science-pack", amount = 1 }, + }, + time = 15, + }, + order = "c-k-d-c", + }, + { + type = "technology", + name = "angels-logistic-warehouses-2", + icon = "__angelsaddons-storage__/graphics/technology/warehouses-logistics.png", + icon_size = 128, + prerequisites = { + "angels-logistic-warehouses", + "logistic-silos-2", + }, + effects = { + { + type = "unlock-recipe", + recipe = "angels-warehouse-active-provider", + }, + { + type = "unlock-recipe", + recipe = "angels-warehouse-requester", + }, + { + type = "unlock-recipe", + recipe = "angels-warehouse-buffer", + }, + }, + unit = { + count = 75, + ingredients = { + { type = "item", name = "automation-science-pack", amount = 1 }, + { type = "item", name = "logistic-science-pack", amount = 1 }, + { type = "item", name = "chemical-science-pack", amount = 1 }, + { type = "item", name = "production-science-pack", amount = 1 }, + { type = "item", name = "utility-science-pack", amount = 1 }, + { type = "item", name = "advanced-logistic-science-pack", amount = 1 }, + }, + time = 15, + }, + order = "e", + }, + }) +end