From e14b77b3133d058381b815c39ddd24163f603ba0 Mon Sep 17 00:00:00 2001 From: Duchesko Date: Tue, 20 Dec 2022 15:13:50 +0100 Subject: [PATCH 1/3] add silo/warehouse logistic 2 tech, lower requirement for s/w logistic 1 tech, only unlock provider and storage s/w with s/w logistic 1 #275 --- SeaBlock/data-final-fixes/logistics.lua | 19 +++++- SeaBlock/prototypes/technology.lua | 81 +++++++++++++++++++++++++ 2 files changed, 97 insertions(+), 3 deletions(-) diff --git a/SeaBlock/data-final-fixes/logistics.lua b/SeaBlock/data-final-fixes/logistics.lua index c8b5b5e..e00dc94 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 ef55448..baa050a 100644 --- a/SeaBlock/prototypes/technology.lua +++ b/SeaBlock/prototypes/technology.lua @@ -180,3 +180,84 @@ 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 From 6ce62da8c15ba42ca71dfdf130b7ea4a3846d9d8 Mon Sep 17 00:00:00 2001 From: StyLuaFormatter Date: Tue, 20 Dec 2022 14:15:06 +0000 Subject: [PATCH 2/3] Format Code --- SeaBlock/data-final-fixes/logistics.lua | 2 +- SeaBlock/prototypes/technology.lua | 2 -- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/SeaBlock/data-final-fixes/logistics.lua b/SeaBlock/data-final-fixes/logistics.lua index e00dc94..a9c30ed 100644 --- a/SeaBlock/data-final-fixes/logistics.lua +++ b/SeaBlock/data-final-fixes/logistics.lua @@ -82,7 +82,7 @@ if mods["angelsaddons-storage"] then 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") diff --git a/SeaBlock/prototypes/technology.lua b/SeaBlock/prototypes/technology.lua index baa050a..66da513 100644 --- a/SeaBlock/prototypes/technology.lua +++ b/SeaBlock/prototypes/technology.lua @@ -182,7 +182,6 @@ if mods["bobwarfare"] then end if mods["angelsaddons-storage"] then - data:extend({ { type = "technology", @@ -258,6 +257,5 @@ if mods["angelsaddons-storage"] then }, order = "e", }, - }) end From 287757cafd8071f111ffc88f7d2faf52cc698b74 Mon Sep 17 00:00:00 2001 From: Duchesko Date: Tue, 20 Dec 2022 15:19:07 +0100 Subject: [PATCH 3/3] update changelog --- SeaBlock/changelog.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/SeaBlock/changelog.txt b/SeaBlock/changelog.txt index 86e65c3..d7fadae 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