From 2638c8cc81b6a29a969ac9854239489846835855 Mon Sep 17 00:00:00 2001 From: lovely_santa Date: Sat, 25 Dec 2021 10:39:17 +0100 Subject: [PATCH 01/42] Fixed crash when playing with bob enemies and bob equipment without bob artifacts enabled --- .../python/unit_test_configuration.py | 48 +++++++++++++++++++ angelsrefining/changelog.txt | 5 ++ angelsrefining/info.json | 2 +- .../refining-override-bobequipment.lua | 15 ++++-- .../override/refining-override-bobwarfare.lua | 5 +- 5 files changed, 70 insertions(+), 5 deletions(-) diff --git a/angelsdev-unit-test/python/unit_test_configuration.py b/angelsdev-unit-test/python/unit_test_configuration.py index 998805bc7..9b158a999 100644 --- a/angelsdev-unit-test/python/unit_test_configuration.py +++ b/angelsdev-unit-test/python/unit_test_configuration.py @@ -66,6 +66,9 @@ def addConfiguration(cls:UnitTestConfiguration, configName:str, modList:list[str UnitTestConfiguration.addDefaultSetting("startup", "bobmods-logistics-inserteroverhaul", True) UnitTestConfiguration.addDefaultSetting("startup", "bobmods-logistics-beltoverhaul", True) +# BobEnemies +UnitTestConfiguration.addDefaultSetting("startup", "bobmods-enemies-enableartifacts", True) + # BobRevamp UnitTestConfiguration.addDefaultSetting("startup", "bobmods-revamp-rtg", True) UnitTestConfiguration.addDefaultSetting("startup", "bobmods-revamp-nuclear", True) @@ -416,6 +419,51 @@ def addConfiguration(cls:UnitTestConfiguration, configName:str, modList:list[str ) # none-default BA to test certain settings +UnitTestConfiguration.addConfiguration("BA (BobEnemies non-default)", + [ + "angelsrefining", + "angelspetrochem", + "angelssmelting", + "angelsbioprocessing", + "angelsindustries", + #"angelsexploration", + + "angelsaddons-storage", + #"Bio-Industries", + #"Bio_Industries_NE_graphics", + #"eradicators-library", + + "boblibrary", + "bobassembly", + "bobclasses", + "bobelectronics", + "bobenemies", + "bobequipment", + "bobgreenhouse", + "bobinserters", + "boblogistics", + "bobmining", + "bobmodules", + "bobores", + "bobplates", + "bobpower", + "bobrevamp", + "bobtech", + "bobvehicleequipment", + "bobwarfare", + ], + { + "startup": + { + "angels-enable-industries": False, # Angels overhaul + "angels-enable-components": False, # Angels component mode + "angels-enable-tech" : False, # Angels technology mode + + "bobmods-enemies-enableartifacts": False #defaults true + } + } +) + UnitTestConfiguration.addConfiguration("BA (BobPower non-default + overhaul)", [ "angelsrefining", diff --git a/angelsrefining/changelog.txt b/angelsrefining/changelog.txt index fec816753..4c25392e5 100644 --- a/angelsrefining/changelog.txt +++ b/angelsrefining/changelog.txt @@ -1,4 +1,9 @@ --------------------------------------------------------------------------------------------------- +Version: 0.12.2 +Date: xx.xx.2021 + Bugfixes: + - Fixed crash when playing with bob enemies and bob equipment without bob artifacts enabled +--------------------------------------------------------------------------------------------------- Version: 0.12.1 Date: 19.12.2021 Changes: diff --git a/angelsrefining/info.json b/angelsrefining/info.json index 513b10186..e848a3687 100644 --- a/angelsrefining/info.json +++ b/angelsrefining/info.json @@ -1,6 +1,6 @@ { "name": "angelsrefining", - "version": "0.12.1", + "version": "0.12.2", "factorio_version": "1.1", "title": "Angel's Refining", "author": "Arch666Angel", diff --git a/angelsrefining/prototypes/override/refining-override-bobequipment.lua b/angelsrefining/prototypes/override/refining-override-bobequipment.lua index 7ccd2ad75..ad70822b7 100644 --- a/angelsrefining/prototypes/override/refining-override-bobequipment.lua +++ b/angelsrefining/prototypes/override/refining-override-bobequipment.lua @@ -12,7 +12,10 @@ if mods["bobequipment"] then }, "production-science-pack") end - if mods["bobenemies"] and mods["bobtech"] then + if mods["bobenemies"] and mods["bobtech"] and + settings.startup["bobmods-enemies-enableartifacts"].value and + settings.startup["bobmods-enemies-enablenewartifacts"].value + then OV.add_prereq("bob-energy-shield-equipment-4", "alien-research") else -- not alien technology OV.set_science_pack({ @@ -25,14 +28,20 @@ if mods["bobequipment"] then ----------------------------------------------------------------------------- -- BATTERY EQUIPMENT -------------------------------------------------------- ----------------------------------------------------------------------------- - if mods["bobenemies"] and mods["bobtech"] then + if mods["bobenemies"] and mods["bobtech"] and + settings.startup["bobmods-enemies-enableartifacts"].value and + settings.startup["bobmods-enemies-enablenewartifacts"].value + then OV.add_prereq("bob-battery-equipment-4", "alien-research") end ----------------------------------------------------------------------------- -- FUSION REACTOR EQUIPMENT ------------------------------------------------- ----------------------------------------------------------------------------- - if mods["bobenemies"] and mods["bobtech"] then + if mods["bobenemies"] and mods["bobtech"] and + settings.startup["bobmods-enemies-enableartifacts"].value and + settings.startup["bobmods-enemies-enablenewartifacts"].value + then OV.remove_science_pack("fusion-reactor-equipment", "utility-science-pack") OV.set_science_pack("fusion-reactor-equipment", "production-science-pack") OV.remove_prereq("fusion-reactor-equipment", "utility-science-pack") diff --git a/angelsrefining/prototypes/override/refining-override-bobwarfare.lua b/angelsrefining/prototypes/override/refining-override-bobwarfare.lua index 7bf33d07a..63142ca14 100644 --- a/angelsrefining/prototypes/override/refining-override-bobwarfare.lua +++ b/angelsrefining/prototypes/override/refining-override-bobwarfare.lua @@ -79,7 +79,10 @@ if mods["bobwarfare"] then OV.add_prereq("bob-armor-making-4","chemical-science-pack") end - if mods["bobenemies"] and mods["bobtech"] then + if mods["bobenemies"] and mods["bobtech"] and + settings.startup["bobmods-enemies-enableartifacts"].value and + settings.startup["bobmods-enemies-enablenewartifacts"].value + then OV.remove_science_pack("bob-power-armor-2", "utility-science-pack") OV.set_science_pack("bob-power-armor-2", "production-science-pack") OV.remove_prereq("bob-power-armor-2", "utility-science-pack") From f40bdce7e9450ac92ea2955a0c68382d3ece07f7 Mon Sep 17 00:00:00 2001 From: lovely_santa Date: Sat, 25 Dec 2021 17:32:23 +0100 Subject: [PATCH 02/42] Added small description to the gathering turret --- angelsexploration/changelog.txt | 5 +++++ angelsexploration/info.json | 2 +- angelsexploration/locale/en/exploration.cfg | 1 + 3 files changed, 7 insertions(+), 1 deletion(-) diff --git a/angelsexploration/changelog.txt b/angelsexploration/changelog.txt index 4a7201db3..db5238f75 100644 --- a/angelsexploration/changelog.txt +++ b/angelsexploration/changelog.txt @@ -1,4 +1,9 @@ --------------------------------------------------------------------------------------------------- +Version: 0.3.14 +Date: xx.xx.2021 + Changes: + - Added small description to the gathering turret +--------------------------------------------------------------------------------------------------- Version: 0.3.13 Date: 23.12.2021 Bugfixes: diff --git a/angelsexploration/info.json b/angelsexploration/info.json index a7ebdc937..12d4fd3c1 100644 --- a/angelsexploration/info.json +++ b/angelsexploration/info.json @@ -1,6 +1,6 @@ { "name": "angelsexploration", - "version": "0.3.13", + "version": "0.3.14", "factorio_version": "1.1", "title": "Angel's Exploration (BETA)", "author": "Arch666Angel", diff --git a/angelsexploration/locale/en/exploration.cfg b/angelsexploration/locale/en/exploration.cfg index 50098ece9..b114c5c3d 100644 --- a/angelsexploration/locale/en/exploration.cfg +++ b/angelsexploration/locale/en/exploration.cfg @@ -93,6 +93,7 @@ plasma=Plasma gathering=tiles/s gathering [entity-description] +angels-gathering-turret=Collects certain loot dropped by enemies. angels-bio-turret=Fires a stream of slimy liquid at enemies. [item-description] From 91211f3cee31ca22a1d16bcc860116b7ace488ee Mon Sep 17 00:00:00 2001 From: lovely_santa Date: Mon, 27 Dec 2021 19:27:48 +0100 Subject: [PATCH 03/42] Fixed science tiers of inserter stack size bonusses (#740) --- angelsindustries/changelog.txt | 6 ++++++ angelsindustries/info.json | 2 +- .../prototypes/overrides/global-tech-base-packs.lua | 4 ++-- .../prototypes/overrides/global-tech-bobs-packs.lua | 1 + 4 files changed, 10 insertions(+), 3 deletions(-) diff --git a/angelsindustries/changelog.txt b/angelsindustries/changelog.txt index f69dc6878..fc5f765a9 100644 --- a/angelsindustries/changelog.txt +++ b/angelsindustries/changelog.txt @@ -1,5 +1,11 @@ --------------------------------------------------------------------------------------------------- Version: 0.4.15 +Date: 19.12.2021 + Bugfixes: + - Science mode: + - Fixed science tiers of inserter stack size bonusses (740) +--------------------------------------------------------------------------------------------------- +Version: 0.4.15 Date: 19.12.2021 Bugfixes: - Regular mode: diff --git a/angelsindustries/info.json b/angelsindustries/info.json index 20bba5bae..d383d8e94 100644 --- a/angelsindustries/info.json +++ b/angelsindustries/info.json @@ -1,6 +1,6 @@ { "name": "angelsindustries", - "version": "0.4.15", + "version": "0.4.16", "factorio_version": "1.1", "title": "Angel's Industries", "author": "Arch666Angel", diff --git a/angelsindustries/prototypes/overrides/global-tech-base-packs.lua b/angelsindustries/prototypes/overrides/global-tech-base-packs.lua index be294d02a..88bd7862b 100644 --- a/angelsindustries/prototypes/overrides/global-tech-base-packs.lua +++ b/angelsindustries/prototypes/overrides/global-tech-base-packs.lua @@ -84,8 +84,8 @@ if angelsmods.industries.tech then ------------------------------------------------------------------------------- -- BASE GAME AI.pack_replace("stack-inserter", "green", "orange") - AI.pack_replace("inserter-capacity-bonus-1", "green", "orange") - AI.pack_replace("inserter-capacity-bonus-2", "green", "orange") + AI.pack_replace("inserter-capacity-bonus-3", "blue", "orange") + AI.pack_replace("inserter-capacity-bonus-4", "blue", "orange") --AI.pack_replace("battery","green","orange") AI.pack_replace("oil-processing", "green", "orange") --AI.pack_replace("circuit-network","green","orange") diff --git a/angelsindustries/prototypes/overrides/global-tech-bobs-packs.lua b/angelsindustries/prototypes/overrides/global-tech-bobs-packs.lua index fca62301c..153d8b693 100644 --- a/angelsindustries/prototypes/overrides/global-tech-bobs-packs.lua +++ b/angelsindustries/prototypes/overrides/global-tech-bobs-packs.lua @@ -151,6 +151,7 @@ if angelsmods.industries.tech then OV.remove_prereq("bob-robotics-3", "production-science-pack") end -- inserter techs + AI.pack_replace("inserter-stack-size-bonus-2", "blue", "orange") if settings.startup["bobmods-logistics-inserteroverhaul"].value == true then OV.remove_prereq("stack-inserter", "tech-orange-circuit") AI.pack_replace("stack-inserter", "orange", "green") From 275b19f062fa1ff2fc78904378094cdf8d56a2fb Mon Sep 17 00:00:00 2001 From: lovely_santa Date: Mon, 27 Dec 2021 19:28:39 +0100 Subject: [PATCH 04/42] fixed changelog entry from #740 --- angelsindustries/changelog.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/angelsindustries/changelog.txt b/angelsindustries/changelog.txt index fc5f765a9..d82ca4c85 100644 --- a/angelsindustries/changelog.txt +++ b/angelsindustries/changelog.txt @@ -1,6 +1,6 @@ --------------------------------------------------------------------------------------------------- -Version: 0.4.15 -Date: 19.12.2021 +Version: 0.4.16 +Date: xx.xx.202x Bugfixes: - Science mode: - Fixed science tiers of inserter stack size bonusses (740) From 21d55faf8b32371f17e70e563955680a9ee5c8e2 Mon Sep 17 00:00:00 2001 From: KiwiHawk <59639+KiwiHawk@users.noreply.github.com> Date: Thu, 30 Dec 2021 20:21:53 +1300 Subject: [PATCH 05/42] Update unit test 005: Recipe unlocks Test should fail if recipe is only unlocked by a hidden tech --- angelsdev-unit-test/unit-tests/unit-test-005.lua | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/angelsdev-unit-test/unit-tests/unit-test-005.lua b/angelsdev-unit-test/unit-tests/unit-test-005.lua index 475b93cba..6ce1bfa16 100644 --- a/angelsdev-unit-test/unit-tests/unit-test-005.lua +++ b/angelsdev-unit-test/unit-tests/unit-test-005.lua @@ -13,7 +13,11 @@ local tech_unlocked_by_script = local function can_be_researched(recipe_name) if recipes_to_ignore[recipe_name] then return true end - local tech_prototypes = game.technology_prototypes + + local tech_filters = {} + table.insert(tech_filters, {filter = "hidden", invert = true, mode = "and"}) + local tech_prototypes = game.get_filtered_technology_prototypes(tech_filters) + for tech_name, tech_prototype in pairs(tech_prototypes) do for _, tech_effect in pairs(tech_prototype.effects) do if tech_effect.type == "unlock-recipe" and tech_effect.recipe == recipe_name then From e78cfb85ffb9f0839e0ec1f2a4aac403b699c7a2 Mon Sep 17 00:00:00 2001 From: Pezzawinkle <54166225+Pezzawinkle@users.noreply.github.com> Date: Thu, 30 Dec 2021 22:14:12 +1100 Subject: [PATCH 06/42] fixed icon scaling on void recipes --- angelspetrochem/prototypes/items/petrochem-basics.lua | 5 +++-- angelsrefining/prototypes/items/water-treatment-items.lua | 3 ++- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/angelspetrochem/prototypes/items/petrochem-basics.lua b/angelspetrochem/prototypes/items/petrochem-basics.lua index b473029f8..70847af4e 100644 --- a/angelspetrochem/prototypes/items/petrochem-basics.lua +++ b/angelspetrochem/prototypes/items/petrochem-basics.lua @@ -258,8 +258,9 @@ data:extend( }, { icon = "__angelspetrochem__/graphics/icons/flare-stack.png", - scale = 0.4, - shift = {9.6, 9.6} + icon_size = 64, + scale = 0.4*0.75, + shift = {12.5, 8.7} } }, icon_size = 32, diff --git a/angelsrefining/prototypes/items/water-treatment-items.lua b/angelsrefining/prototypes/items/water-treatment-items.lua index f931b3df7..3e1c6ff10 100644 --- a/angelsrefining/prototypes/items/water-treatment-items.lua +++ b/angelsrefining/prototypes/items/water-treatment-items.lua @@ -241,7 +241,8 @@ data:extend( }, { icon = "__angelsrefining__/graphics/icons/clarifier.png", - scale = 0.4, + icon_size = 64, + scale = 0.4*0.5, shift = {9.6, 9.6} } }, From 05501bdc8a572f1da0404e6bc3efbe655f058e96 Mon Sep 17 00:00:00 2001 From: Pezzawinkle <54166225+Pezzawinkle@users.noreply.github.com> Date: Thu, 30 Dec 2021 22:41:04 +1100 Subject: [PATCH 07/42] swapped void and machine layer on void icons --- .../prototypes/items/petrochem-basics.lua | 15 ++++++++------- .../prototypes/items/water-treatment-items.lua | 13 ++++++++++--- 2 files changed, 18 insertions(+), 10 deletions(-) diff --git a/angelspetrochem/prototypes/items/petrochem-basics.lua b/angelspetrochem/prototypes/items/petrochem-basics.lua index 70847af4e..40964297d 100644 --- a/angelspetrochem/prototypes/items/petrochem-basics.lua +++ b/angelspetrochem/prototypes/items/petrochem-basics.lua @@ -253,17 +253,18 @@ data:extend( type = "item", name = "chemical-void", icons = { - { - icon = "__angelsrefining__/graphics/icons/void.png", - }, { icon = "__angelspetrochem__/graphics/icons/flare-stack.png", icon_size = 64, - scale = 0.4*0.75, - shift = {12.5, 8.7} - } + icon_mipmaps = 4 + }, + { + icon = "__angelsrefining__/graphics/icons/void.png", + icon_size = 32, + scale = 0.4, + shift = {9.6, 9.6} + }, }, - icon_size = 32, flags = {"hidden"}, subgroup = "angels-void", order = "zzz[chemical-void]", diff --git a/angelsrefining/prototypes/items/water-treatment-items.lua b/angelsrefining/prototypes/items/water-treatment-items.lua index 3e1c6ff10..de6c63163 100644 --- a/angelsrefining/prototypes/items/water-treatment-items.lua +++ b/angelsrefining/prototypes/items/water-treatment-items.lua @@ -237,16 +237,23 @@ data:extend( name = "water-void", icons = { { - icon = "__angelsrefining__/graphics/icons/void.png", + icon = "__angelsrefining__/graphics/icons/angels-gas/gas-recipe-mid.png", + icon_size = 750, + scale = 32/750 }, { icon = "__angelsrefining__/graphics/icons/clarifier.png", icon_size = 64, - scale = 0.4*0.5, + icon_mipmaps = 4, + scale = 0.7*0.5, + }, + { + icon = "__angelsrefining__/graphics/icons/void.png", + icon_size = 32, + scale = 0.4, shift = {9.6, 9.6} } }, - icon_size = 32, flags = {"hidden"}, subgroup = "angels-void", order = "zzz[water-void]", From 75f5504313c58a607c2dea6596b04c64ad628eda Mon Sep 17 00:00:00 2001 From: lovely_santa Date: Tue, 4 Jan 2022 18:52:42 +0100 Subject: [PATCH 08/42] Removed excessive logging entries from the log file (#743) Also ignores recipes which are hidden --- angelspetrochem/changelog.txt | 5 +++ angelspetrochem/info.json | 2 +- .../prototypes/petrochem-global-override.lua | 40 +++++++++++-------- 3 files changed, 30 insertions(+), 17 deletions(-) diff --git a/angelspetrochem/changelog.txt b/angelspetrochem/changelog.txt index d840ad216..720f275ad 100644 --- a/angelspetrochem/changelog.txt +++ b/angelspetrochem/changelog.txt @@ -1,4 +1,9 @@ --------------------------------------------------------------------------------------------------- +Version: 0.9.22 +Date: ??? + Changes: + - Removed excessive logging entries from the log file (743) +--------------------------------------------------------------------------------------------------- Version: 0.9.21 Date: 19.12.2021 Changes: diff --git a/angelspetrochem/info.json b/angelspetrochem/info.json index 9e026d5e8..8727212e3 100644 --- a/angelspetrochem/info.json +++ b/angelspetrochem/info.json @@ -1,6 +1,6 @@ { "name": "angelspetrochem", - "version": "0.9.21", + "version": "0.9.22", "factorio_version": "1.1", "title": "Angel's Petrochemical Processing", "author": "Arch666Angel", diff --git a/angelspetrochem/prototypes/petrochem-global-override.lua b/angelspetrochem/prototypes/petrochem-global-override.lua index 3b415cbce..d29b41121 100644 --- a/angelspetrochem/prototypes/petrochem-global-override.lua +++ b/angelspetrochem/prototypes/petrochem-global-override.lua @@ -1,24 +1,9 @@ local OV = angelsmods.functions.OV +local unit_test_functions = mods["angelsdev-unit-test"] and require("__angelsdev-unit-test__/unit-test-functions") or nil --OVERRIDE FOR BASE require("prototypes.global-override.base-game") ---RECIPE TINTS -for _, recipe in pairs(data.raw.recipe) do - if (not recipe.crafting_machine_tint) and - (recipe.category == "liquifying" or - recipe.category == "chemistry" or - recipe.category == "advanced-chemistry") - then - log(string.format("Recipe '%s' does not have a crafting_machine_tint set!", recipe.name)) - recipe.crafting_machine_tint = { - primary = {r = 167 / 255, g = 75 / 255, b = 5 / 255, a = 0 / 255}, - secondary = {r = 167 / 255, g = 75 / 255, b = 5 / 255, a = 0 / 255}, - tertiary = {r = 167 / 255, g = 75 / 255, b = 5 / 255, a = 0 / 255} - } - end -end - --CONFIG OPTIONS OVERRIDE FOR REFINING require("prototypes.global-override.angelsrefining") @@ -35,3 +20,26 @@ require("prototypes.global-override.boblogistics") if data.raw["item"]["fluorite"] then OV.global_replace_item("fluorite", "fluorite-ore") end + +--RECIPE TINTS +local recipe_categories = -- a list of all crafting categories for which (petrochem) machines supporting recipe tints +{ + ["liquifying"] = true, + ["chemistry"] = true, + ["advanced-chemistry"] = true, +} +for _, recipe in pairs(data.raw.recipe) do + if (not recipe.crafting_machine_tint) and -- only recipes which do not have a crafting machine tint set + recipe_categories[recipe.category] and -- only recipes that can be crafting in machines that support recipe tints + recipe.hidden ~= true -- only recipes which are not hidden (explicitly set to false, or default=nil) + then + if unit_test_functions then -- only log when unit testing is in progress + unit_test_functions.print_msg(string.format("Recipe '%s' does not have a crafting_machine_tint set!", recipe.name)) + end + recipe.crafting_machine_tint = { + primary = {r = 167 / 255, g = 75 / 255, b = 5 / 255, a = 0 / 255}, + secondary = {r = 167 / 255, g = 75 / 255, b = 5 / 255, a = 0 / 255}, + tertiary = {r = 167 / 255, g = 75 / 255, b = 5 / 255, a = 0 / 255} + } + end +end From 282e0341a31aff4c1be95a37e7d9140cc5634b03 Mon Sep 17 00:00:00 2001 From: lovely_santa Date: Tue, 4 Jan 2022 19:09:11 +0100 Subject: [PATCH 09/42] another iteration on bob inserter capacity bonus tiers (#740) --- .../prototypes/overrides/global-tech-base-packs.lua | 5 +++-- .../prototypes/overrides/global-tech-bobs-packs.lua | 2 ++ 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/angelsindustries/prototypes/overrides/global-tech-base-packs.lua b/angelsindustries/prototypes/overrides/global-tech-base-packs.lua index 88bd7862b..9284855c9 100644 --- a/angelsindustries/prototypes/overrides/global-tech-base-packs.lua +++ b/angelsindustries/prototypes/overrides/global-tech-base-packs.lua @@ -84,8 +84,8 @@ if angelsmods.industries.tech then ------------------------------------------------------------------------------- -- BASE GAME AI.pack_replace("stack-inserter", "green", "orange") - AI.pack_replace("inserter-capacity-bonus-3", "blue", "orange") - AI.pack_replace("inserter-capacity-bonus-4", "blue", "orange") + AI.pack_replace("inserter-capacity-bonus-1", "green", "orange") + AI.pack_replace("inserter-capacity-bonus-2", "green", "orange") --AI.pack_replace("battery","green","orange") AI.pack_replace("oil-processing", "green", "orange") --AI.pack_replace("circuit-network","green","orange") @@ -207,6 +207,7 @@ if angelsmods.industries.tech then AI.pack_replace("productivity-module-3", "blue", "yellow") AI.pack_replace("effectivity-module-3", "blue", "yellow") AI.pack_replace("effect-transmission", "blue", "yellow") + AI.pack_replace("inserter-capacity-bonus-6", "blue", "yellow") OV.set_science_pack("rocket-silo", "angels-science-pack-grey") OV.set_science_pack("rocket-silo", "angels-science-pack-red") OV.set_science_pack("rocket-silo", "angels-science-pack-green") diff --git a/angelsindustries/prototypes/overrides/global-tech-bobs-packs.lua b/angelsindustries/prototypes/overrides/global-tech-bobs-packs.lua index 153d8b693..e3f0c1f75 100644 --- a/angelsindustries/prototypes/overrides/global-tech-bobs-packs.lua +++ b/angelsindustries/prototypes/overrides/global-tech-bobs-packs.lua @@ -151,6 +151,8 @@ if angelsmods.industries.tech then OV.remove_prereq("bob-robotics-3", "production-science-pack") end -- inserter techs + AI.pack_replace("inserter-capacity-bonus-1", "orange", "green") + AI.pack_replace("inserter-capacity-bonus-3", "blue", "orange") AI.pack_replace("inserter-stack-size-bonus-2", "blue", "orange") if settings.startup["bobmods-logistics-inserteroverhaul"].value == true then OV.remove_prereq("stack-inserter", "tech-orange-circuit") From 8dbd62ca67a9cdac829f2895564c1e55e0df7dec Mon Sep 17 00:00:00 2001 From: KiwiHawk <59639+KiwiHawk@users.noreply.github.com> Date: Thu, 6 Jan 2022 01:42:55 +1300 Subject: [PATCH 10/42] Polluted fish water had wrong use of catalyst (#750,#751) --- angelsbioprocessing/changelog.txt | 5 +++++ .../prototypes/recipes/bio-refugium-fish.lua | 8 ++++---- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/angelsbioprocessing/changelog.txt b/angelsbioprocessing/changelog.txt index 114ede77a..9677d0227 100644 --- a/angelsbioprocessing/changelog.txt +++ b/angelsbioprocessing/changelog.txt @@ -1,4 +1,9 @@ --------------------------------------------------------------------------------------------------- +Version: 0.7.22 +Date: ??? + Bugfixes: + - Polluted fish water from fish breeding was not being included in fluid production graphs #750 +--------------------------------------------------------------------------------------------------- Version: 0.7.21 Date: 19.12.2021 Changes: diff --git a/angelsbioprocessing/prototypes/recipes/bio-refugium-fish.lua b/angelsbioprocessing/prototypes/recipes/bio-refugium-fish.lua index 8ef5dbfaa..0dc403c1f 100644 --- a/angelsbioprocessing/prototypes/recipes/bio-refugium-fish.lua +++ b/angelsbioprocessing/prototypes/recipes/bio-refugium-fish.lua @@ -167,7 +167,7 @@ data:extend( }, results = { {type = "item", name = "raw-fish", amount_min = 2, amount_max = 4, catalyst_amount = 2}, - {type = "fluid", name = "liquid-polluted-fish-atmosphere", amount = 100, catalyst_amount = 100} + {type = "fluid", name = "liquid-polluted-fish-atmosphere", amount = 100} --{type="fluid", name="water-yellow-waste", amount=20}, }, icons = { @@ -198,7 +198,7 @@ data:extend( }, results = { {type = "item", name = "alien-fish-1-raw", amount_min = 5, amount_max = 10, catalyst_amount = 2}, - {type = "fluid", name = "liquid-polluted-fish-atmosphere", amount = 100, catalyst_amount = 100} + {type = "fluid", name = "liquid-polluted-fish-atmosphere", amount = 100} }, icons = { { @@ -226,7 +226,7 @@ data:extend( }, results = { {type = "item", name = "alien-fish-2-raw", amount_min = 5, amount_max = 10, catalyst_amount = 2}, - {type = "fluid", name = "liquid-polluted-fish-atmosphere", amount = 100, catalyst_amount = 100} + {type = "fluid", name = "liquid-polluted-fish-atmosphere", amount = 100} }, icons = { { @@ -254,7 +254,7 @@ data:extend( }, results = { {type = "item", name = "alien-fish-3-raw", amount_min = 5, amount_max = 10, catalyst_amount = 2}, - {type = "fluid", name = "liquid-polluted-fish-atmosphere", amount = 100, catalyst_amount = 100} + {type = "fluid", name = "liquid-polluted-fish-atmosphere", amount = 100} }, icons = { { From d268c519e13299e6ab75a41bcad6d98af454ce10 Mon Sep 17 00:00:00 2001 From: lovely_santa Date: Wed, 5 Jan 2022 19:10:18 +0100 Subject: [PATCH 11/42] unit-test-004 now detects if a tech can be researched (#745) --- .../unit-tests/unit-test-004.lua | 46 ++++++++++++++++++- 1 file changed, 45 insertions(+), 1 deletion(-) diff --git a/angelsdev-unit-test/unit-tests/unit-test-004.lua b/angelsdev-unit-test/unit-tests/unit-test-004.lua index ef1c6d3ba..90533d334 100644 --- a/angelsdev-unit-test/unit-tests/unit-test-004.lua +++ b/angelsdev-unit-test/unit-tests/unit-test-004.lua @@ -11,21 +11,65 @@ local tech_hidden = function(tech_prototype) return tech_prototype.hidden or (not (tech_prototype.enabled or tech_prototype.visible_when_disabled)) end +local suitable_research_lab = function(tech_prototype) + if not tech_prototype then return true end -- edge case behaviour + + local has_suitable_lab_inputs = function(entity_prototype) + if not entity_prototype then return end -- edge case behaviour + if not entity_prototype.lab_inputs then return #tech_prototype.research_unit_ingredients == 0 end + + for _,lab_input_item_data in pairs(tech_prototype.research_unit_ingredients) do + local entity_has_ingredient = false + for _,research_item_name in pairs(entity_prototype.lab_inputs) do + entity_has_ingredient = entity_has_ingredient or (lab_input_item_data.name == research_item_name) + end + if not entity_has_ingredient then return false end + end + + return true + end + + local entity_filters = {} + table.insert(entity_filters, {filter = "hidden", invert = true, mode = "and"}) + table.insert(entity_filters, {filter = "type", type = "lab", mode = "and"}) + local entity_prototypes = game.get_filtered_entity_prototypes(entity_filters) + + for _,entity_prototype in pairs(entity_prototypes) do + if has_suitable_lab_inputs(entity_prototype) then + return true + end + end + return false +end + local unit_test_004 = function() local unit_test_result = unit_test_functions.test_successful local tech_prototypes = game.technology_prototypes for tech_name, tech_prototype in pairs(tech_prototypes) do if (not tech_hidden(tech_prototype)) and (not tech_unlocked_by_script[tech_name]) then - -- tech visible and might depends on prerequisites + -- tech visible and must be researched + + -- STEP 1: verify all prerequisites can be researched for prereq_name, prereq_prototype in pairs(tech_prototype.prerequisites) do if tech_hidden(prereq_prototype) and (not tech_unlocked_by_script[prereq_name]) then -- tech cannot be researched unit_test_functions.print_msg(string.format("Technology %q depends on %q, which is hidden.", tech_name, prereq_name)) unit_test_result = unit_test_functions.test_failed -- soft failure end end + + -- STEP 2: verify there is a lab available that can research this technology + if not suitable_research_lab(tech_prototype) then + local tech_ingredient_list = "" + for _,lab_input_item_data in pairs(tech_prototype.research_unit_ingredients) do + tech_ingredient_list = string.format("%s%s%q", tech_ingredient_list, tech_ingredient_list == "" and "" or ", ", lab_input_item_data.name) + end + unit_test_functions.print_msg(string.format("Technology %q cannot be researched, no lab accepts the required inputs (%s).", tech_name, tech_ingredient_list)) + unit_test_result = unit_test_functions.test_failed -- soft failure + end end end + return unit_test_result end From 623362fc9ca123882ced6804efc106221ec4018e Mon Sep 17 00:00:00 2001 From: lovely_santa Date: Wed, 5 Jan 2022 19:40:32 +0100 Subject: [PATCH 12/42] Fixed exploration tech lab 2 did not accept bio tokens (#745) --- angelsbioprocessing/info.json | 2 +- angelsindustries/changelog.txt | 1 + .../prototypes/buildings/angels-labs-exploration.lua | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/angelsbioprocessing/info.json b/angelsbioprocessing/info.json index c22de2728..c95427033 100644 --- a/angelsbioprocessing/info.json +++ b/angelsbioprocessing/info.json @@ -1,6 +1,6 @@ { "name": "angelsbioprocessing", - "version": "0.7.21", + "version": "0.7.22", "factorio_version": "1.1", "title": "Angel's Bioprocessing", "author": "Arch666Angel", diff --git a/angelsindustries/changelog.txt b/angelsindustries/changelog.txt index d82ca4c85..eb91e3afc 100644 --- a/angelsindustries/changelog.txt +++ b/angelsindustries/changelog.txt @@ -4,6 +4,7 @@ Date: xx.xx.202x Bugfixes: - Science mode: - Fixed science tiers of inserter stack size bonusses (740) + - Fixed exploration tech lab 2 did not accept bio tokens (745) --------------------------------------------------------------------------------------------------- Version: 0.4.15 Date: 19.12.2021 diff --git a/angelsindustries/prototypes/buildings/angels-labs-exploration.lua b/angelsindustries/prototypes/buildings/angels-labs-exploration.lua index cef9ebc4c..6b28f29d7 100644 --- a/angelsindustries/prototypes/buildings/angels-labs-exploration.lua +++ b/angelsindustries/prototypes/buildings/angels-labs-exploration.lua @@ -269,6 +269,6 @@ if angelsmods.industries.tech then ) -- angelsmods.triggers.lab_ignore_token["angels-exploration-lab-1"] = true - angelsmods.triggers.lab_ignore_token["angels-exploration-lab-2"] = true + -- angelsmods.triggers.lab_ignore_token["angels-exploration-lab-2"] = true angelsmods.triggers.lab_ignore_token["angels-exploration-lab-3"] = true end From 9906fb7a4003048b8e53a48bcbfa50a0fc079a1a Mon Sep 17 00:00:00 2001 From: lovely_santa Date: Thu, 6 Jan 2022 22:24:44 +0100 Subject: [PATCH 13/42] Added some basic compatibility for Nanobots (#741) --- angelsindustries/changelog.txt | 1 + .../overrides/global-tech-popular-addons.lua | 39 +++++++++++++++++++ 2 files changed, 40 insertions(+) diff --git a/angelsindustries/changelog.txt b/angelsindustries/changelog.txt index eb91e3afc..ecc4ed0eb 100644 --- a/angelsindustries/changelog.txt +++ b/angelsindustries/changelog.txt @@ -5,6 +5,7 @@ Date: xx.xx.202x - Science mode: - Fixed science tiers of inserter stack size bonusses (740) - Fixed exploration tech lab 2 did not accept bio tokens (745) + - Added some basic compatibility for Nanobots (741) --------------------------------------------------------------------------------------------------- Version: 0.4.15 Date: 19.12.2021 diff --git a/angelsindustries/prototypes/overrides/global-tech-popular-addons.lua b/angelsindustries/prototypes/overrides/global-tech-popular-addons.lua index 27d22d721..2a0bddd51 100644 --- a/angelsindustries/prototypes/overrides/global-tech-popular-addons.lua +++ b/angelsindustries/prototypes/overrides/global-tech-popular-addons.lua @@ -21,6 +21,45 @@ if angelsmods.industries.tech then AI.core_replace("basic-automation","logistic","basic") OV.add_prereq("basic-automation","angels-components-mechanical-1") end]] + + ------------------------------------------------------------------------------- + -- NANOBOTS ------------------------------------------------------------------- + ------------------------------------------------------------------------------- + if mods["Nanobots"] then + AI.pack_replace("nanobots", "red", "grey") + OV.add_prereq("nanobots", "tech-red-circuit") + if mods["boblogistics"] then + OV.remove_prereq("nanobots", "logistics") + OV.add_prereq("nanobots", "logistics-0") + end + AI.core_replace("nanobots-cliff", "basic", "exploration") + AI.pack_replace("roboport-interface", "blue", "orange") + AI.core_replace("roboport-interface", "basic", "logistic") + + AI.core_replace("nano-speed-1", "basic", "enhance") + OV.add_prereq("nano-speed-1", "angels-components-mechanical-2") + AI.core_replace("nano-speed-2", "basic", "enhance") + OV.remove_prereq("nano-speed-2", "angels-components-mechanical-2") + OV.add_prereq("nano-speed-2", "angels-components-mechanical-3") + AI.pack_replace("nano-speed-3", "green", "orange") + AI.core_replace("nano-speed-3", "basic", "enhance") + AI.pack_replace("nano-speed-4", "green", "blue") + AI.core_replace("nano-speed-4", "basic", "enhance") + OV.remove_prereq("nano-speed-4", "robotics") + OV.add_prereq("nano-speed-4", "angels-components-mechanical-5") + + AI.core_replace("nano-range-1", "basic", "enhance") + OV.add_prereq("nano-range-1", "angels-components-mechanical-2") + AI.core_replace("nano-range-2", "basic", "enhance") + OV.remove_prereq("nano-range-2", "angels-components-mechanical-2") + OV.add_prereq("nano-range-2", "angels-components-mechanical-3") + AI.pack_replace("nano-range-3", "green", "orange") + AI.core_replace("nano-range-3", "basic", "enhance") + AI.pack_replace("nano-range-4", "green", "blue") + AI.core_replace("nano-range-4", "basic", "enhance") + OV.remove_prereq("nano-range-4", "robotics") + OV.add_prereq("nano-range-4", "angels-components-mechanical-5") + end OV.execute() end \ No newline at end of file From 645140252f15b40a1a51f5bbb7d6cfbd88f25aee Mon Sep 17 00:00:00 2001 From: Pezzawinkle <54166225+Pezzawinkle@users.noreply.github.com> Date: Wed, 12 Jan 2022 13:29:25 +1100 Subject: [PATCH 14/42] crude fuel value change --- angelspetrochem/changelog.txt | 1 + angelspetrochem/prototypes/override/bobplates.lua | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/angelspetrochem/changelog.txt b/angelspetrochem/changelog.txt index 720f275ad..41b014e98 100644 --- a/angelspetrochem/changelog.txt +++ b/angelspetrochem/changelog.txt @@ -3,6 +3,7 @@ Version: 0.9.22 Date: ??? Changes: - Removed excessive logging entries from the log file (743) + - lowered the fuel value of crude to 35% to be more inline with the other fuels --------------------------------------------------------------------------------------------------- Version: 0.9.21 Date: 19.12.2021 diff --git a/angelspetrochem/prototypes/override/bobplates.lua b/angelspetrochem/prototypes/override/bobplates.lua index cc196ca49..c107f5f1a 100644 --- a/angelspetrochem/prototypes/override/bobplates.lua +++ b/angelspetrochem/prototypes/override/bobplates.lua @@ -74,7 +74,7 @@ local Energy_table = { ["gas-propene"] = { fv = 521.5, em = 5}, --gas propene (), - (propylene 81.4 MJ/L)(45.8 MJ/kg) ["gas-methanol"] = { fv = 101.2}, --gas methanol (), - (methanol(L) 15.8 MJ/L)(19.9 MJ/kg) ["gas-ethylene"] = { fv = 365.2}, --gas ethylene (), - (ethylene 57.0 MJ/L)(47.7 MJ/kg) - ["crude-oil"] = { fv = 1000, turr = false}, --liquid crude (crude oil) + ["crude-oil"] = { fv = 350, turr = false}, --liquid crude (crude oil) ["gas-hydrogen"] = { fv = 33, em = 0.2--[[>>(may need to go much lower) meant to be 66kJ, but dropped to 33 for reasons.]]}, --gas hydrogen (), bobs value is 45kJ (hydrogen 10.3 MJ/L)(120.1 MJ/kg) ["gas-hydrazine"] = { fv = 126.9, em = 0.1}, --gas hydrazine (), bobs value is 340kJ (hydrazine 19.8 MJ/L)(19.4 MJ/kg) ["liquid-fuel"] = { fv = 300, em = 1.5, turr = false}, --down from 2.3MJ From cbe3e0c5feb54289802c1febe70f1f9c153f42bd Mon Sep 17 00:00:00 2001 From: lovely_santa Date: Mon, 31 Jan 2022 18:26:04 +0100 Subject: [PATCH 15/42] removed ingredient_count in cases they are obsolete (#763) --- angelsrefining/changelog.txt | 4 +++- angelsrefining/prototypes/buildings/crystallizer.lua | 4 ++-- angelsrefining/prototypes/buildings/filtration-unit.lua | 4 ++-- angelssmelting/changelog.txt | 5 +++++ angelssmelting/prototypes/buildings/blast-furnace.lua | 8 ++++---- angelssmelting/prototypes/buildings/casting-machine.lua | 8 ++++---- angelssmelting/prototypes/buildings/chemical-furnace.lua | 8 ++++---- angelssmelting/prototypes/buildings/cooling-tower.lua | 2 +- angelssmelting/prototypes/buildings/induction-furnace.lua | 8 ++++---- .../prototypes/buildings/ore-processing-machine.lua | 8 ++++---- angelssmelting/prototypes/buildings/pellet-press.lua | 8 ++++---- angelssmelting/prototypes/buildings/sintering-oven.lua | 8 ++++---- .../prototypes/buildings/strand-casting-machine.lua | 8 ++++---- 13 files changed, 45 insertions(+), 38 deletions(-) diff --git a/angelsrefining/changelog.txt b/angelsrefining/changelog.txt index 4c25392e5..7223e4fd5 100644 --- a/angelsrefining/changelog.txt +++ b/angelsrefining/changelog.txt @@ -1,6 +1,8 @@ --------------------------------------------------------------------------------------------------- Version: 0.12.2 -Date: xx.xx.2021 +Date: ?? + Changes: + - Removed the obsolete ingredient_count limitation on some refining buildings (763) Bugfixes: - Fixed crash when playing with bob enemies and bob equipment without bob artifacts enabled --------------------------------------------------------------------------------------------------- diff --git a/angelsrefining/prototypes/buildings/crystallizer.lua b/angelsrefining/prototypes/buildings/crystallizer.lua index ece69534c..e890cd6eb 100644 --- a/angelsrefining/prototypes/buildings/crystallizer.lua +++ b/angelsrefining/prototypes/buildings/crystallizer.lua @@ -48,7 +48,7 @@ data:extend( emissions_per_minute = 0.03 * 60 }, energy_usage = "150kW", - ingredient_count = 4, + --ingredient_count = 4, animation = { layers = { -- Base @@ -220,7 +220,7 @@ data:extend( emissions_per_minute = 0.04 * 60 }, energy_usage = "250kW", - ingredient_count = 4, + --ingredient_count = 4, animation = { layers = { -- Base diff --git a/angelsrefining/prototypes/buildings/filtration-unit.lua b/angelsrefining/prototypes/buildings/filtration-unit.lua index 09b516522..2cdfa3c2b 100644 --- a/angelsrefining/prototypes/buildings/filtration-unit.lua +++ b/angelsrefining/prototypes/buildings/filtration-unit.lua @@ -48,7 +48,7 @@ data:extend( emissions_per_minute = 0.03 * 60 }, energy_usage = "100kW", - ingredient_count = 4, + --ingredient_count = 4, animation = { layers = { { @@ -154,7 +154,7 @@ data:extend( emissions_per_minute = 0.04 * 60 }, energy_usage = "150kW", - ingredient_count = 4, + --ingredient_count = 4, animation = { layers = { { diff --git a/angelssmelting/changelog.txt b/angelssmelting/changelog.txt index 781c04206..5f4bb5ee5 100644 --- a/angelssmelting/changelog.txt +++ b/angelssmelting/changelog.txt @@ -1,4 +1,9 @@ --------------------------------------------------------------------------------------------------- +Version: 0.6.19 +Date: 19.12.2021 + Changes: + - Removed the obsolete ingredient_count limitation on all smelting buildings (763) +--------------------------------------------------------------------------------------------------- Version: 0.6.18 Date: 19.12.2021 Changes: diff --git a/angelssmelting/prototypes/buildings/blast-furnace.lua b/angelssmelting/prototypes/buildings/blast-furnace.lua index 393548f29..e329b7801 100644 --- a/angelssmelting/prototypes/buildings/blast-furnace.lua +++ b/angelssmelting/prototypes/buildings/blast-furnace.lua @@ -67,7 +67,7 @@ data:extend( } }, energy_usage = "150kW", - ingredient_count = 4, + --ingredient_count = 4, animation = { layers = { { @@ -272,7 +272,7 @@ data:extend( } }, energy_usage = "200kW", - ingredient_count = 4, + --ingredient_count = 4, animation = { layers = { { @@ -477,7 +477,7 @@ data:extend( } }, energy_usage = "250kW", - ingredient_count = 4, + --ingredient_count = 4, animation = { layers = { { @@ -681,7 +681,7 @@ data:extend( } }, energy_usage = "300kW", - ingredient_count = 4, + --ingredient_count = 4, animation = { layers = { { diff --git a/angelssmelting/prototypes/buildings/casting-machine.lua b/angelssmelting/prototypes/buildings/casting-machine.lua index db12ffba4..5b01de709 100644 --- a/angelssmelting/prototypes/buildings/casting-machine.lua +++ b/angelssmelting/prototypes/buildings/casting-machine.lua @@ -51,7 +51,7 @@ data:extend( emissions_per_minute = 0.03 * 60 }, energy_usage = "150kW", - ingredient_count = 2, + --ingredient_count = 2, animation = { layers = { { @@ -211,7 +211,7 @@ data:extend( emissions_per_minute = 0.04 * 60 }, energy_usage = "200kW", - ingredient_count = 4, + --ingredient_count = 4, animation = { layers = { { @@ -371,7 +371,7 @@ data:extend( emissions_per_minute = 0.05 * 60 }, energy_usage = "250kW", - ingredient_count = 6, + --ingredient_count = 6, animation = { layers = { { @@ -530,7 +530,7 @@ data:extend( emissions_per_minute = 0.06 * 60 }, energy_usage = "250kW", - ingredient_count = 6, + --ingredient_count = 6, animation = { layers = { { diff --git a/angelssmelting/prototypes/buildings/chemical-furnace.lua b/angelssmelting/prototypes/buildings/chemical-furnace.lua index a486702ef..5cbc11e88 100644 --- a/angelssmelting/prototypes/buildings/chemical-furnace.lua +++ b/angelssmelting/prototypes/buildings/chemical-furnace.lua @@ -51,7 +51,7 @@ data:extend( emissions_per_minute = 0.03 * 60 }, energy_usage = "150kW", - ingredient_count = 4, + --ingredient_count = 4, animation = { layers = { { @@ -246,7 +246,7 @@ data:extend( emissions_per_minute = 0.04 * 60 }, energy_usage = "200kW", - ingredient_count = 4, + --ingredient_count = 4, animation = { layers = { { @@ -441,7 +441,7 @@ data:extend( emissions_per_minute = 0.05 * 60 }, energy_usage = "250kW", - ingredient_count = 4, + --ingredient_count = 4, animation = { layers = { { @@ -635,7 +635,7 @@ data:extend( emissions_per_minute = 0.06 * 60 }, energy_usage = "300kW", - ingredient_count = 4, + --ingredient_count = 4, animation = { layers = { { diff --git a/angelssmelting/prototypes/buildings/cooling-tower.lua b/angelssmelting/prototypes/buildings/cooling-tower.lua index d9138af0d..a5ec1f87f 100644 --- a/angelssmelting/prototypes/buildings/cooling-tower.lua +++ b/angelssmelting/prototypes/buildings/cooling-tower.lua @@ -32,7 +32,7 @@ data:extend( }, allowed_effects = {"consumption", "speed", "pollution"}, crafting_speed = 2, - ingredient_count = 4, + --ingredient_count = 4, resistances = { { diff --git a/angelssmelting/prototypes/buildings/induction-furnace.lua b/angelssmelting/prototypes/buildings/induction-furnace.lua index 6ce9d8fb3..e78a62c3b 100644 --- a/angelssmelting/prototypes/buildings/induction-furnace.lua +++ b/angelssmelting/prototypes/buildings/induction-furnace.lua @@ -53,7 +53,7 @@ data:extend( emissions_per_minute = 0.03 * 60 }, energy_usage = "150kW", - ingredient_count = 2, + --ingredient_count = 2, animation = { layers = { { @@ -297,7 +297,7 @@ data:extend( emissions_per_minute = 0.04 * 60 }, energy_usage = "200kW", - ingredient_count = 4, + --ingredient_count = 4, animation = { layers = { { @@ -533,7 +533,7 @@ data:extend( emissions_per_minute = 0.05 * 60 }, energy_usage = "250kW", - ingredient_count = 6, + --ingredient_count = 6, animation = { layers = { { @@ -768,7 +768,7 @@ data:extend( emissions_per_minute = 0.06 * 60 }, energy_usage = "250kW", - ingredient_count = 6, + --ingredient_count = 6, animation = { layers = { { diff --git a/angelssmelting/prototypes/buildings/ore-processing-machine.lua b/angelssmelting/prototypes/buildings/ore-processing-machine.lua index 3d8b0d4c2..45e71c6a3 100644 --- a/angelssmelting/prototypes/buildings/ore-processing-machine.lua +++ b/angelssmelting/prototypes/buildings/ore-processing-machine.lua @@ -51,7 +51,7 @@ data:extend( emissions_per_minute = 0.03 * 60 }, energy_usage = "150kW", - ingredient_count = 2, + --ingredient_count = 2, animation = { layers = { { @@ -228,7 +228,7 @@ data:extend( emissions_per_minute = 0.04 * 60 }, energy_usage = "200kW", - ingredient_count = 4, + --ingredient_count = 4, animation = { layers = { { @@ -405,7 +405,7 @@ data:extend( emissions_per_minute = 0.05 * 60 }, energy_usage = "250kW", - ingredient_count = 6, + --ingredient_count = 6, animation = { layers = { { @@ -581,7 +581,7 @@ data:extend( emissions_per_minute = 0.06 * 60 }, energy_usage = "300kW", - ingredient_count = 6, + --ingredient_count = 6, animation = { layers = { { diff --git a/angelssmelting/prototypes/buildings/pellet-press.lua b/angelssmelting/prototypes/buildings/pellet-press.lua index 8d58232d6..53fecceff 100644 --- a/angelssmelting/prototypes/buildings/pellet-press.lua +++ b/angelssmelting/prototypes/buildings/pellet-press.lua @@ -50,7 +50,7 @@ data:extend( emissions_per_minute = 0.03 * 60 }, energy_usage = "200kW", - ingredient_count = 2, + --ingredient_count = 2, animation = { layers = { { @@ -157,7 +157,7 @@ data:extend( emissions_per_minute = 0.04 * 60 }, energy_usage = "250kW", - ingredient_count = 4, + --ingredient_count = 4, animation = { layers = { { @@ -264,7 +264,7 @@ data:extend( emissions_per_minute = 0.05 * 60 }, energy_usage = "300kW", - ingredient_count = 6, + --ingredient_count = 6, animation = { layers = { { @@ -370,7 +370,7 @@ data:extend( emissions_per_minute = 0.06 * 60 }, energy_usage = "350kW", - ingredient_count = 6, + --ingredient_count = 6, animation = { layers = { { diff --git a/angelssmelting/prototypes/buildings/sintering-oven.lua b/angelssmelting/prototypes/buildings/sintering-oven.lua index 632b54418..abd8f1c0e 100644 --- a/angelssmelting/prototypes/buildings/sintering-oven.lua +++ b/angelssmelting/prototypes/buildings/sintering-oven.lua @@ -50,7 +50,7 @@ data:extend( emissions_per_minute = 0.03 * 60 }, energy_usage = "150kW", - ingredient_count = 2, + --ingredient_count = 2, animation = { layers = { { @@ -191,7 +191,7 @@ data:extend( emissions_per_minute = 0.04 * 60 }, energy_usage = "200kW", - ingredient_count = 4, + --ingredient_count = 4, animation = { layers = { { @@ -332,7 +332,7 @@ data:extend( emissions_per_minute = 0.05 * 60 }, energy_usage = "250kW", - ingredient_count = 6, + --ingredient_count = 6, animation = { layers = { { @@ -472,7 +472,7 @@ data:extend( emissions_per_minute = 0.06 * 60 }, energy_usage = "250kW", - ingredient_count = 6, + --ingredient_count = 6, animation = { layers = { { diff --git a/angelssmelting/prototypes/buildings/strand-casting-machine.lua b/angelssmelting/prototypes/buildings/strand-casting-machine.lua index 0a09b8942..7200e6009 100644 --- a/angelssmelting/prototypes/buildings/strand-casting-machine.lua +++ b/angelssmelting/prototypes/buildings/strand-casting-machine.lua @@ -50,7 +50,7 @@ data:extend( emissions_per_minute = 0.03 * 60 }, energy_usage = "150kW", - ingredient_count = 2, + --ingredient_count = 2, fluid_boxes = { { production_type = "input", @@ -252,7 +252,7 @@ data:extend( emissions_per_minute = 0.04 * 60 }, energy_usage = "200kW", - ingredient_count = 4, + --ingredient_count = 4, fluid_boxes = { { production_type = "input", @@ -454,7 +454,7 @@ data:extend( emissions_per_minute = 0.05 * 60 }, energy_usage = "250kW", - ingredient_count = 6, + --ingredient_count = 6, fluid_boxes = { { production_type = "input", @@ -655,7 +655,7 @@ data:extend( emissions_per_minute = 0.06 * 60 }, energy_usage = "250kW", - ingredient_count = 6, + --ingredient_count = 6, fluid_boxes = { { production_type = "input", From 09017e4bcfe24fef6b298fcd7a4556a242099519 Mon Sep 17 00:00:00 2001 From: kingarthur91 Date: Sun, 13 Mar 2022 05:37:39 -0400 Subject: [PATCH 16/42] Update README.md --- README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 78d8ac2e3..b7680ebc8 100644 --- a/README.md +++ b/README.md @@ -6,7 +6,7 @@ - IV. [Angel's Metallurgy Smelting](https://forums.factorio.com/viewtopic.php?f=185&t=33566) - V. [Angel's Bio Processing](https://forums.factorio.com/viewtopic.php?f=185&t=25469) - VI. [Angel's Industries](https://forums.factorio.com/viewtopic.php?f=185&t=58585) -- VII. Angel's Exploration (Beta) +- VII. Angel's Exploration (Alpha) - VIII. [Angel's Add-ons](https://forums.factorio.com/viewtopic.php?f=185&t=30962) - VIII.I. Storage Options - [Warehouses](https://forums.factorio.com/viewtopic.php?p=396867#p396867) @@ -65,7 +65,7 @@ This mod has some new overhaul settings: - Component Overhaul (Beta): All the complex machinery does not come out of the blue, add complex chains to create advanced intermediate products for your buildings. There is also an optional setting that will give you the building ingredients back instead of the building itself (without losses), because all these complex machinery is not so trivial to remove efficiently. - Technology Overhaul (Alpha): Instead of science packs, use different science analyzers and datacores to research new innovative way to grow your factory. -### VII. Angel's Exploration (Beta) +### VII. Angel's Exploration (Alpha) The alien life forms do not like you as much as you may like them. Add different tiers of biters and new weapons to counter these creatures. ### VIII. [Angel's Add-ons](https://forums.factorio.com/viewtopic.php?f=185&t=30962) From 5a02a3587aa073754f32861e261af9a88f283697 Mon Sep 17 00:00:00 2001 From: lovely_santa Date: Sun, 13 Mar 2022 10:45:09 +0100 Subject: [PATCH 17/42] updated biter builder to support loot definitions (#748) --- .../prototypes/entities/biter-builder.lua | 36 +++++++++++++++++++ .../prototypes/entities/biter-definitions.lua | 3 ++ .../prototypes/overrides/biter-updates.lua | 1 + 3 files changed, 40 insertions(+) diff --git a/angelsexploration/prototypes/entities/biter-builder.lua b/angelsexploration/prototypes/entities/biter-builder.lua index dd61be551..318ed4b1c 100644 --- a/angelsexploration/prototypes/entities/biter-builder.lua +++ b/angelsexploration/prototypes/entities/biter-builder.lua @@ -830,6 +830,38 @@ local function make_attack_parameter(data_app, data_dmg) } end +local function make_loot(loot_data) + if type(loot_data) ~= 'table' then return nil end + if next(loot_data) == nil then return nil end + + loot_proto = {} + for _,loot_item in pairs(loot_data) do + local item_found = false + for _,item_type in pairs({"item","tool","item-with-entity-data"}) do + if data.raw[item_type][loot_item.item] then + item_found = true + end + end + if item_found then + local min = (loot_item.avg_amount or 1) - (loot_item.variation or 0)/2 + local max = (loot_item.avg_amount or 1) + (loot_item.variation or 0)/2 + if max < min then min, max = max, min end + if max > 0 then + local prob = max < 1 and max or 1 + if prob < 1 then min, max = min/max, 1 end + table.insert(loot_proto, { + item=loot_data.item, + probability=prob < 1 and prob or nil, + count_min=min, + count_max=max + }) + end + end + end + return loot_proto +end + + function angelsmods.functions.make_alien(def_data) --log(serpent.block(def_data)) if def_data ~= nil then @@ -901,6 +933,7 @@ function angelsmods.functions.make_alien(def_data) min_pursue_time = 10 * 60, max_pursue_distance = 50, corpse = c_name, + loot = make_loot(def_data.loot), dying_explosion = "blood-explosion-big", dying_sound = make_die_sound(def_data.appearance.type, 0.4), working_sound = make_call_sounds(0.3), @@ -951,6 +984,7 @@ function angelsmods.functions.make_alien_spawner(spawn_data) pollution_absorption_proportional = 0.01, loot = {}, corpse = "biter-spawner-corpse", + loot = make_loot(spawn_data.loot), dying_explosion = "blood-explosion-huge", max_count_of_owned_units = 7, max_friends_around_to_spawn = 5, @@ -1003,6 +1037,7 @@ function angelsmods.functions.update_alien(ua_data) unit.max_health = ua_data.appearance.health unit.movement_speed = ua_data.appearance.speed unit.attack_parameters = make_attack_parameter(ua_data.appearance, ua_data.attack) + unit.loot = ua_data.loot and make_loot(ua_data.loot) or unit.loot end end @@ -1041,6 +1076,7 @@ function angelsmods.functions.update_spawner(us_data) table.insert(spawner.result_units, new_result_unit_data) end end + spawner.loot = us_data.loot and make_loot(us_data.loot) or spawner.loot end end diff --git a/angelsexploration/prototypes/entities/biter-definitions.lua b/angelsexploration/prototypes/entities/biter-definitions.lua index bc406c6b3..ff76a245d 100644 --- a/angelsexploration/prototypes/entities/biter-definitions.lua +++ b/angelsexploration/prototypes/entities/biter-definitions.lua @@ -54,6 +54,9 @@ small_biter = {type = "laser", decrease = 5, percent = 20}, {type = "plasma", decrease = 0, percent = 0} } + --loot = { + -- angelsmods.triggers.artifacts["base"] and {item = "small-alien-artifact", avg_amount = 0.25, variation = 0.1} or nil, + --} } medium_biter = diff --git a/angelsexploration/prototypes/overrides/biter-updates.lua b/angelsexploration/prototypes/overrides/biter-updates.lua index 2d5ac973e..67a89e706 100644 --- a/angelsexploration/prototypes/overrides/biter-updates.lua +++ b/angelsexploration/prototypes/overrides/biter-updates.lua @@ -52,6 +52,7 @@ end --end --ADD RESISTANCES +require("prototypes.entities.biter-definitions") -- does not hurt to re-include it to make sure the variables are up to date angelsmods.functions.update_alien(small_biter) angelsmods.functions.update_alien(medium_biter) angelsmods.functions.update_alien(big_biter) From 2e4f960cd54821b88b6afc541f3b3b5ee7943afe Mon Sep 17 00:00:00 2001 From: KiwiHawk <59639+KiwiHawk@users.noreply.github.com> Date: Wed, 30 Mar 2022 16:03:23 +1300 Subject: [PATCH 18/42] Fixing storage localisation (#773) Added missing setting description Fixed swapped warehouse description --- angelsaddons-storage/changelog.txt | 10 ++++++++-- angelsaddons-storage/locale/en/storage.cfg | 5 +++-- 2 files changed, 11 insertions(+), 4 deletions(-) diff --git a/angelsaddons-storage/changelog.txt b/angelsaddons-storage/changelog.txt index 850d07ec8..9e7cc9430 100644 --- a/angelsaddons-storage/changelog.txt +++ b/angelsaddons-storage/changelog.txt @@ -1,9 +1,15 @@ --------------------------------------------------------------------------------------------------- +Version: 0.0.9 +Date: xx.xx.202x + Bugfixes: + - Added missing setting localisation + - Fixed active / passive provider warehouse descriptions +--------------------------------------------------------------------------------------------------- Version: 0.0.8 Date: 19.12.2021 Bugfixes: - - Fixed technology cost of logistics silos when not playing with bobslogisitcs - - Fixed technology cost of logistics warehouses when not playing with bobslogisitcs + - Fixed technology cost of logistics silos when not playing with bobslogistics + - Fixed technology cost of logistics warehouses when not playing with bobslogistics --------------------------------------------------------------------------------------------------- Version: 0.0.7 Date: 10.08.2021 diff --git a/angelsaddons-storage/locale/en/storage.cfg b/angelsaddons-storage/locale/en/storage.cfg index e8390251d..a4b14a8bb 100644 --- a/angelsaddons-storage/locale/en/storage.cfg +++ b/angelsaddons-storage/locale/en/storage.cfg @@ -65,6 +65,7 @@ angels-enable-silos=Enable Angel's silos angels-enable-oresilos=Enable Angel's ore themed silos angels-enable-warehouses=Enable Angel's warehouses angels-enable-pressure-tank=Enable pressure fluid tanks +angels-enable-inline-tank=Enable small inline tanks [mod-setting-description] angels-enable-storage-icon-scaling=Icons on silos and warehouses scale to size of the silos and warehouses, instead of being small. @@ -93,8 +94,8 @@ silo-requester=Requests specified items from the logistic network. silo-storage=Long-term storage for the logistic network. silo-buffer=Requests specified items to be available for personal logistics and automated construction. -angels-warehouse-passive-provider=Sends its content to the logistic network. -angels-warehouse-active-provider=Makes its content available to the logistic network. +angels-warehouse-active-provider=Sends its content to the logistic network. +angels-warehouse-passive-provider=Makes its content available to the logistic network. angels-warehouse-storage=Long-term storage for the logistic network. angels-warehouse-requester=Requests specified items from the logistic network. angels-warehouse-buffer=Requests specified items to be available for personal logistics and automated construction. From 6d1adda4a264d7489941c5da69ebeaf96dca5c63 Mon Sep 17 00:00:00 2001 From: KiwiHawk <59639+KiwiHawk@users.noreply.github.com> Date: Wed, 30 Mar 2022 16:13:01 +1300 Subject: [PATCH 19/42] Angel's void item group icon #770 (#775) --- angelsrefining/changelog.txt | 1 + .../graphics/item-group/void-group.png | Bin 0 -> 46556 bytes angelsrefining/prototypes/refining-category.lua | 5 +++-- 3 files changed, 4 insertions(+), 2 deletions(-) create mode 100644 angelsrefining/graphics/item-group/void-group.png diff --git a/angelsrefining/changelog.txt b/angelsrefining/changelog.txt index 7223e4fd5..6f1de95a8 100644 --- a/angelsrefining/changelog.txt +++ b/angelsrefining/changelog.txt @@ -5,6 +5,7 @@ Date: ?? - Removed the obsolete ingredient_count limitation on some refining buildings (763) Bugfixes: - Fixed crash when playing with bob enemies and bob equipment without bob artifacts enabled + - Fixed the void item group icon --------------------------------------------------------------------------------------------------- Version: 0.12.1 Date: 19.12.2021 diff --git a/angelsrefining/graphics/item-group/void-group.png b/angelsrefining/graphics/item-group/void-group.png new file mode 100644 index 0000000000000000000000000000000000000000..68c77923e70a5f52472ffac41e58ea2860ce9e0e GIT binary patch literal 46556 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 O0000 Date: Mon, 4 Apr 2022 17:22:00 +0200 Subject: [PATCH 20/42] updated mod version (#773) --- angelsaddons-storage/info.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/angelsaddons-storage/info.json b/angelsaddons-storage/info.json index 8c4982511..922b9b697 100644 --- a/angelsaddons-storage/info.json +++ b/angelsaddons-storage/info.json @@ -1,6 +1,6 @@ { "name": "angelsaddons-storage", - "version": "0.0.8", + "version": "0.0.9", "factorio_version": "1.1", "title": "Angel's Addons - Storage Options", "author": "Arch666Angel", From 7d0ef7b49c6c68f86720e96fa6144a8c045ab327 Mon Sep 17 00:00:00 2001 From: lovely_santa Date: Mon, 4 Apr 2022 17:24:24 +0200 Subject: [PATCH 21/42] Updated mod version (#776) --- angelssmelting/info.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/angelssmelting/info.json b/angelssmelting/info.json index 9e08f8c69..e2fdc3029 100644 --- a/angelssmelting/info.json +++ b/angelssmelting/info.json @@ -1,6 +1,6 @@ { "name": "angelssmelting", - "version": "0.6.18", + "version": "0.6.19", "factorio_version": "1.1", "title": "Angel's Smelting", "author": "Arch666Angel", From 575ca81d8cb43773d0eecadca483f15aa1741576 Mon Sep 17 00:00:00 2001 From: KiwiHawk <59639+KiwiHawk@users.noreply.github.com> Date: Tue, 5 Apr 2022 03:25:32 +1200 Subject: [PATCH 22/42] Missing sounds from Concrete brick tiles (#776, #777) --- angelssmelting/changelog.txt | 3 ++- angelssmelting/prototypes/buildings/concrete-bricks.lua | 7 ++++--- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/angelssmelting/changelog.txt b/angelssmelting/changelog.txt index 5f4bb5ee5..eac677af1 100644 --- a/angelssmelting/changelog.txt +++ b/angelssmelting/changelog.txt @@ -1,8 +1,9 @@ --------------------------------------------------------------------------------------------------- Version: 0.6.19 -Date: 19.12.2021 +Date: ??? Changes: - Removed the obsolete ingredient_count limitation on all smelting buildings (763) + - Added build and mining sounds to concrete brick tiles (776) --------------------------------------------------------------------------------------------------- Version: 0.6.18 Date: 19.12.2021 diff --git a/angelssmelting/prototypes/buildings/concrete-bricks.lua b/angelssmelting/prototypes/buildings/concrete-bricks.lua index 4e7b3d5f5..3f4381af5 100644 --- a/angelssmelting/prototypes/buildings/concrete-bricks.lua +++ b/angelssmelting/prototypes/buildings/concrete-bricks.lua @@ -7,6 +7,10 @@ local function copyGrid(name, tile_data) grid.localised_name = {"tile-name."..name} grid.needs_correction = false grid.minable = {mining_time = 0.1, result = name} + + local concrete = data.raw.tile["concrete"] + grid.build_sound = table.deepcopy(concrete.build_sound) + grid.mined_sound = table.deepcopy(concrete.mined_sound) for k, v in pairs(tile_data or {}) do grid[k] = v @@ -15,9 +19,6 @@ local function copyGrid(name, tile_data) return grid end -local concrete_brick_tile_data = - - data:extend( { copyGrid("concrete-brick", { From 979764b5967ca9944799bf532adf62e7990da06d Mon Sep 17 00:00:00 2001 From: lovely_santa Date: Fri, 29 Apr 2022 20:28:28 +0200 Subject: [PATCH 23/42] Fixed crash when adding a newer version of this mod to an existing save while other mods are (wrongfully) placing entities while the configuration changes are being executed... --- angelsexploration/changelog.txt | 3 +++ angelsexploration/src/gathering-turret.lua | 12 ++++++++++-- 2 files changed, 13 insertions(+), 2 deletions(-) diff --git a/angelsexploration/changelog.txt b/angelsexploration/changelog.txt index db5238f75..2adc0f0cb 100644 --- a/angelsexploration/changelog.txt +++ b/angelsexploration/changelog.txt @@ -1,6 +1,9 @@ --------------------------------------------------------------------------------------------------- Version: 0.3.14 Date: xx.xx.2021 + Bugfixes: + - Fixed crash when adding a newer version of this mod to an existing save while other mods are + (wrongfully) placing entities while the configuration changes are being executed... Changes: - Added small description to the gathering turret --------------------------------------------------------------------------------------------------- diff --git a/angelsexploration/src/gathering-turret.lua b/angelsexploration/src/gathering-turret.lua index 4d71241f9..8cfa03d03 100644 --- a/angelsexploration/src/gathering-turret.lua +++ b/angelsexploration/src/gathering-turret.lua @@ -447,11 +447,19 @@ end -- Getter functions to extract data from the data structure ------------------------------------------------------------------------------- function gathering_turret:get_turret_name() - return global.GT_data.prototype_data.gathering_turret_name + if global.GT_data then + return global.GT_data.prototype_data.gathering_turret_name + else + return "angels-void" + end end function gathering_turret:get_turret_chest_name() - return global.GT_data.prototype_data.gathering_turret_chest + if global.GT_data then + return global.GT_data.prototype_data.gathering_turret_chest + else + return "angels-void" + end end function gathering_turret:get_turret_chest_data_index() From 547b33db4bbb84dd94547cbe9ec64ed676776fe7 Mon Sep 17 00:00:00 2001 From: Pezzawinkle <54166225+Pezzawinkle@users.noreply.github.com> Date: Wed, 4 May 2022 20:04:27 +1000 Subject: [PATCH 24/42] rounding on fluid properties --- angelspetrochem/prototypes/override/bobplates.lua | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/angelspetrochem/prototypes/override/bobplates.lua b/angelspetrochem/prototypes/override/bobplates.lua index c107f5f1a..e9f89c279 100644 --- a/angelspetrochem/prototypes/override/bobplates.lua +++ b/angelspetrochem/prototypes/override/bobplates.lua @@ -85,10 +85,10 @@ local turret_params = data.raw["fluid-turret"]["flamethrower-turret"].attack_par if mods["bobplates"] then for fluid, vals in pairs(Energy_table) do if vals.fv then - data.raw.fluid[fluid].fuel_value = vals.fv .."kJ" + data.raw.fluid[fluid].fuel_value = (math.floor(vals.fv/5+0.5))*5 .."kJ" data.raw.fluid[fluid].emissions_multiplier = vals.em or data.raw.fluid[fluid].emissions_multiplier or 1 if vals.turr ~= false then - table.insert(turret_params, {type = fluid, damage_modifier = vals.fv/Energy_table["gas-methane"].fv}) + table.insert(turret_params, {type = fluid, damage_modifier = math.floor(vals.fv/Energy_table["gas-methane"].fv*10+0.5)/10}) end end end From 06dcd18da4938e2921b50db5792f9981ca390cbf Mon Sep 17 00:00:00 2001 From: Pezzawinkle <54166225+Pezzawinkle@users.noreply.github.com> Date: Mon, 16 May 2022 01:29:55 +1000 Subject: [PATCH 25/42] typos in tips --- angelsrefining/locale/en/tips-and-tricks.cfg | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/angelsrefining/locale/en/tips-and-tricks.cfg b/angelsrefining/locale/en/tips-and-tricks.cfg index 3ea1d1798..9546a30cc 100644 --- a/angelsrefining/locale/en/tips-and-tricks.cfg +++ b/angelsrefining/locale/en/tips-and-tricks.cfg @@ -28,9 +28,9 @@ angels-ore-refining=The mined compound ores have to be refined before you are ab angels-crushing=The first step after mining, the ore must be crushed into something that can be handled. Crushing takes ore dug out of the ground and breaks away the hard stone from the useful materials.\n\nThe general recipe takes compound ore in and outputs crushed ore [img=item/stone-crushed] crushed stone.\nThe [img=item/stone-crushed] crushed stone can be processed into other materials in the mid game, but early on it can be turned into [img=item/stone] stone toward [img=item/stone-brick] stone bricks and [img=item/stone-wall] walls. The crushed ore can be directly smelted in some cases, further processed or sorted. angels-crushing-notes=\n\n[font=default-bold]NOTES[/font]: Real world examples of ore crushing exist in ball, jaw, pneumatic and impact crushers. This is used to break the ore into smaller pieces so chemical processing can get to more of the useful parts, particularly in the next step (flotation). -angels-floatation=Floatation is a secondary refining step that further washes the crushed ore to remove more impurities in the crushed ore, this is the first of the chemical refining steps, this one using purified water. It is advised to have a water purification system nearby, and a wastewater purification system for the byproduct. A side effect is geodes which are crystalline materials found commonly in soils and stones.\n\nThe general recipe converts crushed ore with some [img=fluid/water-purified] purified water into ore chunks, a chance of a geode and some wastewater.\nGeodes can be processed into a variety of different things depending on the mods that are installed.\nThe chunks can be sorted or further purified in the next step, Leaching. +angels-floatation=Flotation is a secondary refining step that further washes the crushed ore to remove more impurities in the crushed ore, this is the first of the chemical refining steps, this one using purified water. It is advised to have a water purification system nearby, and a wastewater purification system for the byproduct. A side effect is geodes which are crystalline materials found commonly in soils and stones.\n\nThe general recipe converts crushed ore with some [img=fluid/water-purified] purified water into ore chunks, a chance of a geode and some wastewater.\nGeodes can be processed into a variety of different things depending on the mods that are installed.\nThe chunks can be sorted or further purified in the next step, Leaching. angels-floatation-notes=\n\n[font=default-bold]NOTES[/font]: Real world examples of ore flotation are numerous, primarily done with a soapy like material and either an acidic or alkaline water mixture, this will separate out the materials in the solution based on a variety of physical and chemical properties. If you wish for further reading, have a look for froth flotation (notice no ‘a’ in flot), which is the more general term for the process. -angels-leaching=The third step in the refining process is acid leaching, this process dissolves the chunk from the previous step in a strong acid leaving behind a bit of slag in the process (assumed to not be an issue at this point). This ore-acid mixture is crystallised out of to be relatively uniform high purity crystals. This process is once again taking advantage of the chemical properties of the ore.\n\nThe general recipe takes ore chunks with 10 acid in and outputs 2 ore crystals.\nMuch of the acid required in this step may be sourced from the previous step, floatation, but some additional acid may be required. This is the first stage with no waste production. +angels-leaching=The third step in the refining process is acid leaching, this process dissolves the chunk from the previous step in a strong acid leaving behind a bit of slag in the process (assumed to not be an issue at this point). This ore-acid mixture is crystallised out of to be relatively uniform high purity crystals. This process is once again taking advantage of the chemical properties of the ore.\n\nThe general recipe takes ore chunks with 10 acid in and outputs 2 ore crystals.\nMuch of the acid required in this step may be sourced from the previous step, flotation, but some additional acid may be required. This is the first stage with no waste production. angels-leaching-notes=\n\n[font=default-bold]NOTES[/font]: Real world examples of Acid Leaching generally refer to the waste heap, the crushed stone, and other solid waste products from the ore purification system are thrown in a large pit with a sealed concrete base (like a large swimming pool) and sprayed with acids which seep through the heaped mess dissolving any useful parts of the dirt that were previously missed. The liquor (acid solution) that is captured at the base is rich in minerals which are generally crystallised out to be returned to the smelting system. angels-purification=The final ore processing step is the ultimate in ore purification, removing the last of the impurities to reveal the cleanest ore yet. A combination of regenerative heat, chemical processing and electrolysis means no additional solid or liquid materials are needed or wasted in this process.\n\nThe general recipe converts ore crystals into purified ore out.\nThis ore “polishing” step is seldom used except for the most exotic and rarified substances to justify its high quality before smelting. From 08356d3f8b151c2117f026437bd071dcc63f878b Mon Sep 17 00:00:00 2001 From: KiwiHawk <59639+KiwiHawk@users.noreply.github.com> Date: Wed, 25 May 2022 07:41:15 +1200 Subject: [PATCH 26/42] Alien plant life sample QoL tweaks (#783, #784) --- angelsbioprocessing/changelog.txt | 5 + .../recipes/crop-farming-gardens.lua | 114 +++++------------- .../prototypes/technology/crop-farming.lua | 29 ++++- 3 files changed, 59 insertions(+), 89 deletions(-) diff --git a/angelsbioprocessing/changelog.txt b/angelsbioprocessing/changelog.txt index 9677d0227..105e92cc0 100644 --- a/angelsbioprocessing/changelog.txt +++ b/angelsbioprocessing/changelog.txt @@ -1,8 +1,13 @@ --------------------------------------------------------------------------------------------------- Version: 0.7.22 Date: ??? + Changes: + - Moved Garden cultivation recipe unlock to a new technology Garden processing 3 #783 + This recipe exists in case gardens of a particular type do not spawn + It is not for duplication of Gardens / Alien plant-life samples Bugfixes: - Polluted fish water from fish breeding was not being included in fluid production graphs #750 + - Fixed Alien plant life sample recipes in expensive mode were bypassing Alienated fertilizer #783 --------------------------------------------------------------------------------------------------- Version: 0.7.21 Date: 19.12.2021 diff --git a/angelsbioprocessing/prototypes/recipes/crop-farming-gardens.lua b/angelsbioprocessing/prototypes/recipes/crop-farming-gardens.lua index ec0632dd2..63de77413 100644 --- a/angelsbioprocessing/prototypes/recipes/crop-farming-gardens.lua +++ b/angelsbioprocessing/prototypes/recipes/crop-farming-gardens.lua @@ -9,39 +9,19 @@ data:extend( name = "temperate-garden-cultivating-a", category = "seed-extractor", subgroup = "farming-temperate-seed", - normal = + enabled = false, + energy_required = 300, + ingredients = { - enabled = false, - energy_required = 300, - ingredients = - { - {type = "item", name = "temperate-garden", amount = 1} - }, - results = - { - {type = "item", name = "token-bio", amount = 32} - }, - main_product = "token-bio", - always_show_products = true, - show_amount_in_title = false, + {type = "item", name = "temperate-garden", amount = 1} }, - expensive = + results = { - enabled = false, - energy_required = 300, - ingredients = - { - {type = "item", name = "temperate-garden", amount = 1} - }, - results = - { - {type = "item", name = "token-bio", amount = 1, probability = 1 / (2 * intermediatemulti)}, - {type = "item", name = "temperate-garden", amount = 1, catalyst_amount = 1} - }, - main_product = "token-bio", - always_show_products = true, - show_amount_in_title = false, + {type = "item", name = "token-bio", amount = 32} }, + main_product = "token-bio", + always_show_products = true, + show_amount_in_title = false, icons = { { @@ -202,39 +182,19 @@ data:extend( name = "desert-garden-cultivating-a", category = "seed-extractor", subgroup = "farming-desert-seed", - normal = + enabled = false, + energy_required = 300, + ingredients = { - enabled = false, - energy_required = 300, - ingredients = - { - {type = "item", name = "desert-garden", amount = 1} - }, - results = - { - {type = "item", name = "token-bio", amount = 32} - }, - main_product = "token-bio", - always_show_products = true, - show_amount_in_title = false, + {type = "item", name = "desert-garden", amount = 1} }, - expensive = + results = { - enabled = false, - energy_required = 300, - ingredients = - { - {type = "item", name = "desert-garden", amount = 1} - }, - results = - { - {type = "item", name = "token-bio", amount = 1, probability = 1 / (2 * intermediatemulti)}, - {type = "item", name = "desert-garden", amount = 1, catalyst_amount = 1} - }, - main_product = "token-bio", - always_show_products = true, - show_amount_in_title = false, + {type = "item", name = "token-bio", amount = 32} }, + main_product = "token-bio", + always_show_products = true, + show_amount_in_title = false, icons = { { @@ -395,39 +355,19 @@ data:extend( name = "swamp-garden-cultivating-a", category = "seed-extractor", subgroup = "farming-swamp-seed", - normal = + enabled = false, + energy_required = 300, + ingredients = { - enabled = false, - energy_required = 300, - ingredients = - { - {type = "item", name = "swamp-garden", amount = 1} - }, - results = - { - {type = "item", name = "token-bio", amount = 32} - }, - main_product = "token-bio", - always_show_products = true, - show_amount_in_title = false, + {type = "item", name = "swamp-garden", amount = 1} }, - expensive = + results = { - enabled = false, - energy_required = 300, - ingredients = - { - {type = "item", name = "swamp-garden", amount = 1} - }, - results = - { - {type = "item", name = "token-bio", amount = 1, probability = 1 / (2 * intermediatemulti)}, - {type = "item", name = "swamp-garden", amount = 1, catalyst_amount = 1} - }, - main_product = "token-bio", - always_show_products = true, - show_amount_in_title = false, + {type = "item", name = "token-bio", amount = 32} }, + main_product = "token-bio", + always_show_products = true, + show_amount_in_title = false, icons = { { diff --git a/angelsbioprocessing/prototypes/technology/crop-farming.lua b/angelsbioprocessing/prototypes/technology/crop-farming.lua index 9b9730b2f..3fd04497d 100644 --- a/angelsbioprocessing/prototypes/technology/crop-farming.lua +++ b/angelsbioprocessing/prototypes/technology/crop-farming.lua @@ -44,6 +44,7 @@ data:extend( prerequisites = { "bio-farm-1", "bio-paper-1", + "logistic-science-pack" }, effects = { { @@ -57,16 +58,40 @@ data:extend( { type = "unlock-recipe", recipe = "swamp-garden-cultivating-a" + } + }, + unit = { + count = 50, + ingredients = { + {type = "item", name = "automation-science-pack", amount = 1}, + {type = "item", name = "logistic-science-pack", amount = 1} }, + time = 30 + } + }, + { + type = "technology", + name = "gardens-3", + icon = "__angelsbioprocessing__/graphics/technology/seed-extractor-tech.png", + icon_size = 128, + order = "c-a", + prerequisites = { + "bio-farm-alien", + "chemical-science-pack" + }, + effects = { { type = "unlock-recipe", recipe = "garden-cultivating" } }, unit = { - count = 50, + count = 100, ingredients = { - {type = "item", name = "automation-science-pack", amount = 1} + {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 = "token-bio", amount = 1} }, time = 30 } From d73f3e2b4ed55d01a6bcb46452370300a26925f8 Mon Sep 17 00:00:00 2001 From: lovely_santa Date: Wed, 25 May 2022 20:36:35 +0200 Subject: [PATCH 27/42] Fixed bobs personal roboport mk2 depended on battery 5 (#761) --- angelsindustries/changelog.txt | 2 ++ .../components-bobs-recipe-update.lua | 19 +++++++++++++++++++ 2 files changed, 21 insertions(+) diff --git a/angelsindustries/changelog.txt b/angelsindustries/changelog.txt index ecc4ed0eb..03c941d1f 100644 --- a/angelsindustries/changelog.txt +++ b/angelsindustries/changelog.txt @@ -2,6 +2,8 @@ Version: 0.4.16 Date: xx.xx.202x Bugfixes: + - Component mode: + - Fixed bobs personal roboport mk2 depended on battery 5 (761) - Science mode: - Fixed science tiers of inserter stack size bonusses (740) - Fixed exploration tech lab 2 did not accept bio tokens (745) diff --git a/angelsindustries/prototypes/overrides/components-bobs-recipe-update.lua b/angelsindustries/prototypes/overrides/components-bobs-recipe-update.lua index 7a13c87e8..4d5ef7df0 100644 --- a/angelsindustries/prototypes/overrides/components-bobs-recipe-update.lua +++ b/angelsindustries/prototypes/overrides/components-bobs-recipe-update.lua @@ -57,6 +57,25 @@ if angelsmods.industries.components then OV.disable_recipe("superior-circuit-board") end + ----------------------------------------------------------------------------- + -- BOB EQUIPMENT ------------------------------------------------------------ + ----------------------------------------------------------------------------- + if mods["bobequipment"] then + OV.patch_recipes( + { + { + name = "personal-roboport-mk2-equipment", + ingredients = { + { type = "item", name = "battery-3", amount = "battery-5"} + } + }, + } + ) + OV.remove_prereq("personal-roboport-mk2-equipment", "angels-components-batteries-5") + OV.add_prereq("personal-roboport-mk2-equipment", "angels-components-batteries-3") + OV.add_prereq("personal-roboport-mk3-equipment", "angels-components-batteries-4") + end + ----------------------------------------------------------------------------- -- BOB REVAMP --------------------------------------------------------------- ----------------------------------------------------------------------------- From 814858f01ff2efa1fa9a23e51eb2fb0c078060ae Mon Sep 17 00:00:00 2001 From: Matan Shahar Date: Wed, 25 May 2022 22:13:35 +0300 Subject: [PATCH 28/42] Use the same path for loading recipe-builder (#781, #782) --- angelsrefining/prototypes/override-functions.lua | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/angelsrefining/prototypes/override-functions.lua b/angelsrefining/prototypes/override-functions.lua index bec3d0200..6a4ed2891 100644 --- a/angelsrefining/prototypes/override-functions.lua +++ b/angelsrefining/prototypes/override-functions.lua @@ -1,5 +1,5 @@ -local RB = require "recipe-builder" -require "angels-functions" +local RB = require("prototypes.recipe-builder") +require("prototypes.angels-functions") local ov_functions = {} -- OVERRIDE DATA TABLES From 9145155640056a7a06dd301197477068b9499a33 Mon Sep 17 00:00:00 2001 From: lovely_santa Date: Wed, 25 May 2022 22:13:51 +0200 Subject: [PATCH 29/42] Fixed centrifuges did not have their customizable lights enabled as intended (#772) --- angelsindustries/changelog.txt | 2 + .../prototypes/buildings/centrifuge.lua | 297 +++++++++++++++--- .../overrides/overhaul-nuclear-power.lua | 8 +- .../recipes/overhaul-nuclear-power.lua | 22 ++ 4 files changed, 285 insertions(+), 44 deletions(-) diff --git a/angelsindustries/changelog.txt b/angelsindustries/changelog.txt index 03c941d1f..d42d6223c 100644 --- a/angelsindustries/changelog.txt +++ b/angelsindustries/changelog.txt @@ -2,6 +2,8 @@ Version: 0.4.16 Date: xx.xx.202x Bugfixes: + - Regular mode: + - Fixed centrifuges did not have their customizable lights enabled as intended (772) - Component mode: - Fixed bobs personal roboport mk2 depended on battery 5 (761) - Science mode: diff --git a/angelsindustries/prototypes/buildings/centrifuge.lua b/angelsindustries/prototypes/buildings/centrifuge.lua index 8bdf4b3bc..e821f488b 100644 --- a/angelsindustries/prototypes/buildings/centrifuge.lua +++ b/angelsindustries/prototypes/buildings/centrifuge.lua @@ -1,46 +1,259 @@ -- add runtime tints to centrifuge animation -if data.raw["assembling-machine"]["centrifuge"].animation then - local animation = util.table.deepcopy(data.raw["assembling-machine"]["centrifuge"].animation) - data.raw["assembling-machine"]["centrifuge"].animation = nil - - animation.layers[1].filename = "__angelsindustries__/graphics/entity/centrifuge/centrifuge-C-light.png" - animation.layers[1].hr_version.filename = "__angelsindustries__/graphics/entity/centrifuge/hr-centrifuge-C-light.png" - animation.layers[2].filename = "__angelsindustries__/graphics/entity/centrifuge/centrifuge-B-light.png" - animation.layers[2].hr_version.filename = "__angelsindustries__/graphics/entity/centrifuge/hr-centrifuge-B-light.png" - animation.layers[3].filename = "__angelsindustries__/graphics/entity/centrifuge/centrifuge-A-light.png" - animation.layers[3].hr_version.filename = "__angelsindustries__/graphics/entity/centrifuge/hr-centrifuge-A-light.png" - - animation.layers[1].apply_runtime_tint = true - animation.layers[1].hr_version.apply_runtime_tint = true - animation.layers[2].apply_runtime_tint = true - animation.layers[2].hr_version.apply_runtime_tint = true - animation.layers[3].apply_runtime_tint = true - animation.layers[3].hr_version.apply_runtime_tint = true +for _,centrifuge_name in pairs{ + "centrifuge", + "centrifuge-2", + "centrifuge-3", +} do + local centrifuge = data.raw["assembling-machine"][centrifuge_name] + if centrifuge then + centrifuge.animation = nil + + centrifuge.idle_animation = { + layers = { + -- Centrifuge C + { + filename = "__base__/graphics/entity/centrifuge/centrifuge-C.png", + priority = "high", + line_length = 8, + width = 119, + height = 107, + frame_count = 64, + shift = util.by_pixel(-0.5, -26.5), + hr_version = { + filename = "__base__/graphics/entity/centrifuge/hr-centrifuge-C.png", + priority = "high", + scale = 0.5, + line_length = 8, + width = 237, + height = 214, + frame_count = 64, + shift = util.by_pixel(-0.25, -26.5) + } + }, + { + filename = "__base__/graphics/entity/centrifuge/centrifuge-C-shadow.png", + draw_as_shadow = true, + priority = "high", + line_length = 8, + width = 132, + height = 74, + frame_count = 64, + shift = util.by_pixel(20, -10), + hr_version = { + filename = "__base__/graphics/entity/centrifuge/hr-centrifuge-C-shadow.png", + draw_as_shadow = true, + priority = "high", + scale = 0.5, + line_length = 8, + width = 279, + height = 152, + frame_count = 64, + shift = util.by_pixel(16.75, -10) + } + }, + -- Centrifuge B + { + filename = "__base__/graphics/entity/centrifuge/centrifuge-B.png", + priority = "high", + line_length = 8, + width = 78, + height = 117, + frame_count = 64, + shift = util.by_pixel(23, 6.5), + hr_version = { + filename = "__base__/graphics/entity/centrifuge/hr-centrifuge-B.png", + priority = "high", + scale = 0.5, + line_length = 8, + width = 156, + height = 234, + frame_count = 64, + shift = util.by_pixel(23, 6.5) + } + }, + { + filename = "__base__/graphics/entity/centrifuge/centrifuge-B-shadow.png", + draw_as_shadow = true, + priority = "high", + line_length = 8, + width = 124, + height = 74, + frame_count = 64, + shift = util.by_pixel(63, 16), + hr_version = { + filename = "__base__/graphics/entity/centrifuge/hr-centrifuge-B-shadow.png", + draw_as_shadow = true, + priority = "high", + scale = 0.5, + line_length = 8, + width = 251, + height = 149, + frame_count = 64, + shift = util.by_pixel(63.25, 15.25) + } + }, + -- Centrifuge A + { + filename = "__base__/graphics/entity/centrifuge/centrifuge-A.png", + priority = "high", + line_length = 8, + width = 70, + height = 123, + frame_count = 64, + shift = util.by_pixel(-26, 3.5), + hr_version = { + filename = "__base__/graphics/entity/centrifuge/hr-centrifuge-A.png", + priority = "high", + scale = 0.5, + line_length = 8, + width = 139, + height = 246, + frame_count = 64, + shift = util.by_pixel(-26.25, 3.5) + } + }, + { + filename = "__base__/graphics/entity/centrifuge/centrifuge-A-shadow.png", + priority = "high", + draw_as_shadow = true, + line_length = 8, + width = 108, + height = 54, + frame_count = 64, + shift = util.by_pixel(6, 27), + hr_version = { + filename = "__base__/graphics/entity/centrifuge/hr-centrifuge-A-shadow.png", + priority = "high", + draw_as_shadow = true, + scale = 0.5, + line_length = 8, + width = 230, + height = 124, + frame_count = 64, + shift = util.by_pixel(8.5, 23.5) + } + } + } + } + + centrifuge.working_visualisations = { + -- WORKING LIGHTS + -- Centrifuge A (Front Left) + { + effect = "uranium-glow", + fadeout = true, + apply_recipe_tint = "primary", + animation = { + filename = "__angelsindustries__/graphics/entity/centrifuge/centrifuge-A-light.png", + priority = "high", + blend_mode = "additive", + line_length = 8, + width = 55, + height = 98, + frame_count = 64, + shift = util.by_pixel(-23.5, -2), + draw_as_glow = true, + hr_version = { + filename = "__angelsindustries__/graphics/entity/centrifuge/hr-centrifuge-A-light.png", + priority = "high", + scale = 0.5, + blend_mode = "additive", + line_length = 8, + width = 108, + height = 197, + frame_count = 64, + shift = util.by_pixel(-23.5, -1.75), + draw_as_glow = true, + } + }, + }, + -- Centrifuge B (Front Right) + { + effect = "uranium-glow", + fadeout = true, + apply_recipe_tint = "secondary", + animation = { + filename = "__angelsindustries__/graphics/entity/centrifuge/centrifuge-B-light.png", + priority = "high", + blend_mode = "additive", + line_length = 8, + width = 65, + height = 103, + frame_count = 64, + shift = util.by_pixel(16.5, 0.5), + draw_as_glow = true, + hr_version = { + filename = "__angelsindustries__/graphics/entity/centrifuge/hr-centrifuge-B-light.png", + priority = "high", + scale = 0.5, + blend_mode = "additive", + line_length = 8, + width = 131, + height = 206, + frame_count = 64, + shift = util.by_pixel(16.75, 0.5), + draw_as_glow = true, + } + }, + }, + -- Centrifuge C (Rear) + { + effect = "uranium-glow", + fadeout = true, + apply_recipe_tint = "tertiary", + animation = { + filename = "__angelsindustries__/graphics/entity/centrifuge/centrifuge-C-light.png", + priority = "high", + blend_mode = "additive", + line_length = 8, + width = 96, + height = 104, + frame_count = 64, + shift = util.by_pixel(0, -27), + draw_as_glow = true, + hr_version = { + filename = "__angelsindustries__/graphics/entity/centrifuge/hr-centrifuge-C-light.png", + priority = "high", + scale = 0.5, + blend_mode = "additive", + line_length = 8, + width = 190, + height = 207, + frame_count = 64, + shift = util.by_pixel(0, -27.25), + draw_as_glow = true, + } + } + }, + + -- AREA LIGHT + -- Centrifuge A (Front Left) + { + effect = "uranium-glow", + apply_recipe_tint = "primary", + fadeout = true, + light = {intensity = 0.066, size = 8.9, shift = {-1, 0.5}} + }, + -- Centrifuge B (Front Right) + { + effect = "uranium-glow", + apply_recipe_tint = "secondary", + fadeout = true, + light = {intensity = 0.066, size = 8.9, shift = {1, 0.5}} + }, + -- Centrifuge C (Rear) + { + effect = "uranium-glow", + apply_recipe_tint = "tertiary", + fadeout = true, + light = {intensity = 0.066, size = 8.9, shift = {0, -1.2}} + }, + } - data.raw["assembling-machine"]["centrifuge"].working_visualisations = - { - { - effect = "uranium-glow", -- changes alpha based on energy source light intensity - light = {intensity = 0.6, size = 9.9, shift = {0.0, 0.0}, color = {r = 1.0, g = 1.0, b = 1.0}}, - apply_recipe_tint = "primary" - }, - { - apply_recipe_tint = "primary", - animation = animation, + centrifuge.default_recipe_tint = { + primary = {r = 000 / 255, g = 255 / 255, b = 000 / 255, a = 1}, -- green + secondary = {r = 000 / 255, g = 255 / 255, b = 000 / 255, a = 1}, -- green + tertiary = {r = 000 / 255, g = 255 / 255, b = 000 / 255, a = 1}, -- green } - } -elseif data.raw["assembling-machine"]["centrifuge"].working_visualisations then --for the case where working_visualisations exist but no "animations" - local wv=data.raw["assembling-machine"]["centrifuge"].working_visualisations - for i=1,7 do - if wv[i] then - if wv[i].apply_recipe_tint then - wv[i].apply_recipe_tint="primary" - end - if wv[i].light then - if wv[i].light.apply_recipe_tint then - wv[i].light.apply_recipe_tint="primary" - end - end - end end -end \ No newline at end of file +end diff --git a/angelsindustries/prototypes/overrides/overhaul-nuclear-power.lua b/angelsindustries/prototypes/overrides/overhaul-nuclear-power.lua index 5e2ae242a..2de87c84b 100644 --- a/angelsindustries/prototypes/overrides/overhaul-nuclear-power.lua +++ b/angelsindustries/prototypes/overrides/overhaul-nuclear-power.lua @@ -51,7 +51,9 @@ if angelsmods.industries.overhaul then always_show_products = true, show_amount_in_title = false, crafting_machine_tint = { - primary = tint_colors.green + primary = tint_colors.green, + secondary = tint_colors.green, + tertiary = tint_colors.green, } }, { @@ -66,7 +68,9 @@ if angelsmods.industries.overhaul then {type = "item", name = "slag", amount = 5} }, crafting_machine_tint = { - primary = tint_colors.green + primary = tint_colors.green, + secondary = tint_colors.green, + tertiary = tint_colors.green, }, icons = { { -- need to have something as bottom layer diff --git a/angelsindustries/prototypes/recipes/overhaul-nuclear-power.lua b/angelsindustries/prototypes/recipes/overhaul-nuclear-power.lua index ee798ad2b..e415dbb1f 100644 --- a/angelsindustries/prototypes/recipes/overhaul-nuclear-power.lua +++ b/angelsindustries/prototypes/recipes/overhaul-nuclear-power.lua @@ -66,6 +66,8 @@ data:extend( crafting_machine_tint = { primary = tint_colors.orange, + secondary = tint_colors.orange, + tertiary = tint_colors.orange, }, }, { @@ -122,6 +124,8 @@ data:extend( crafting_machine_tint = { primary = tint_colors.orange, + secondary = tint_colors.orange, + tertiary = tint_colors.orange, }, }, { @@ -176,6 +180,8 @@ data:extend( crafting_machine_tint = { primary = tint_colors.red, + secondary = tint_colors.red, + tertiary = tint_colors.red, }, }, }) @@ -213,6 +219,8 @@ data:extend( crafting_machine_tint = { primary = tint_colors.green, + secondary = tint_colors.green, + tertiary = tint_colors.green, }, }, --advanced reprocessing @@ -298,6 +306,8 @@ data:extend( crafting_machine_tint = { primary = tint_colors.orange, + secondary = tint_colors.orange, + tertiary = tint_colors.orange, }, }, --basic reprocessing @@ -354,6 +364,8 @@ data:extend( crafting_machine_tint = { primary = tint_colors.orange, + secondary = tint_colors.orange, + tertiary = tint_colors.orange, }, }, --advanced reprocessing @@ -448,6 +460,8 @@ data:extend( crafting_machine_tint = { primary = tint_colors.red, + secondary = tint_colors.red, + tertiary = tint_colors.red, }, }, --advanced fuel cell @@ -477,6 +491,8 @@ data:extend( crafting_machine_tint = { primary = tint_colors.red, + secondary = tint_colors.red, + tertiary = tint_colors.red, }, },]] --basic reprocessing @@ -540,6 +556,8 @@ data:extend( crafting_machine_tint = { primary = tint_colors.red, + secondary = tint_colors.red, + tertiary = tint_colors.red, }, }, -- advanced reprocessing @@ -688,6 +706,8 @@ data:extend( crafting_machine_tint = { primary = tint_colors.blue, + secondary = tint_colors.blue, + tertiary = tint_colors.blue, }, }, -- advanced reprocessing @@ -750,6 +770,8 @@ data:extend( crafting_machine_tint = { primary = tint_colors.blue, + secondary = tint_colors.blue, + tertiary = tint_colors.blue, }, }, }) From 50b2ac935ba8a6b42d0c29aa608638cae25465dd Mon Sep 17 00:00:00 2001 From: lovely_santa Date: Thu, 26 May 2022 10:39:27 +0200 Subject: [PATCH 30/42] small improvement to build script --- build_angelmods.bat | 2 +- build_bobmods.bat | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/build_angelmods.bat b/build_angelmods.bat index 25dd20509..d5bb60684 100644 --- a/build_angelmods.bat +++ b/build_angelmods.bat @@ -1,4 +1,4 @@ @echo off -python %~dp0\angelsdev-unit-test\python\mod_builder.py --factoriodir="C:\Users\User\AppData\Roaming\Factorio" +python %~dp0\angelsdev-unit-test\python\mod_builder.py --factoriodir="%appdata%\Factorio" PAUSE diff --git a/build_bobmods.bat b/build_bobmods.bat index 33e66bc20..ee3fafbb1 100644 --- a/build_bobmods.bat +++ b/build_bobmods.bat @@ -1,4 +1,4 @@ @echo off -python %~dp0\angelsdev-unit-test\python\mod_downloader.py --factoriodir="C:\Users\User\AppData\Roaming\Factorio" +python %~dp0\angelsdev-unit-test\python\mod_downloader.py --factoriodir="%appdata%\Factorio" PAUSE From 103cad41d6bdf4caf34f16ced429238ea5ca62c1 Mon Sep 17 00:00:00 2001 From: Adoa Coturnix Date: Thu, 2 Jun 2022 18:29:22 +0200 Subject: [PATCH 31/42] Fixed spelling mistake (#786) Durflurp -> Dorflurp --- angelsbioprocessing/locale/en/bio-processing.cfg | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/angelsbioprocessing/locale/en/bio-processing.cfg b/angelsbioprocessing/locale/en/bio-processing.cfg index 8662b6e00..f17ad5e4d 100644 --- a/angelsbioprocessing/locale/en/bio-processing.cfg +++ b/angelsbioprocessing/locale/en/bio-processing.cfg @@ -495,12 +495,12 @@ hogger-breeding-5=EE hogger breeding fish-keeping-0=Factorian fish petting fish-keeping-1=Levac fish petting -fish-keeping-2=Durflurp jellyfish petting +fish-keeping-2=Dorflurp jellyfish petting fish-keeping-3=Santa ray petting fish-breeding-0=Factorian fish breeding fish-breeding-1=Levac fish breeding -fish-breeding-2=Durflurp jellyfish breeding +fish-breeding-2=Dorflurp jellyfish breeding fish-breeding-3=Santa ray breeding biter-small-eggsperiment=Small biter eggsperiment From ab5b2e10ebb8f4c4318d36e69c8b9bfa98e35236 Mon Sep 17 00:00:00 2001 From: KiwiHawk <59639+KiwiHawk@users.noreply.github.com> Date: Sat, 4 Jun 2022 22:12:28 +1200 Subject: [PATCH 32/42] Bob's mods 1.1.5 compatibility (#769, #774) * Hide Bob's void recipes * Fix for Bob's science packs * Ammonium chloride - Disabled Ammonium chloride recycling recipe from Bob's revamp - Disable Angel's Ammonium Chloride Gas if Platinum is disabled * Bob's technologies - Remove science pack and prerequisite patches for Bob's technologies. These have been fixed in Bob's mods. * Hide dead ends - Hide Hydrogen peroxide gas and Phosgene gas as they are unused * Bob's barrelling changes - bobplates has split barrels, gas bottles, and fluid canisters into their own separate techs - Also fixed a bug where barrels weren't getting a fluid icon overlay * Bob's compatibility - Force small alien artifacts to be enabled, even if biters don't drop them - Fix partially replaced Bob's items and recipes: - Salt - Lithium Chloride - Brine - Brine Electrolysis recipe - Fix tech science packs * Updating unit tests - Ignore fluids created by boilers * Science mode compatibility Co-authored-by: lovely_santa --- angelsaddons-storage/changelog.txt | 4 +- .../prototypes/overrides/silos.lua | 8 +- .../prototypes/overrides/warehouses.lua | 6 ++ angelsbioprocessing/data.lua | 1 + .../prototypes/bio-processing-override.lua | 2 +- angelsdev-unit-test/info.json | 9 +-- .../python/unit_test_configuration.py | 2 +- .../unit-tests/unit-test-003.lua | 7 +- .../unit-tests/unit-test-004.lua | 9 ++- .../unit-tests/unit-test-006.lua | 55 ++++++++++--- .../unit-tests/unit-test-007.lua | 29 ++++++- .../unit-tests/unit-test-008.lua | 31 ++++++- angelsindustries/changelog.txt | 3 + .../overrides/components-block-update.lua | 4 + .../components-bobs-assemblers-update.lua | 3 +- .../components-bobs-gun-update.lua | 10 +++ .../components-bobs-power-update.lua | 2 + .../components-bobs-robots-update.lua | 8 ++ .../components-bobs-recipe-update.lua | 17 ++++ .../overrides/global-tech-bobs-cores.lua | 9 ++- .../overrides/global-tech-bobs-packs.lua | 27 +++++-- .../overrides/overhaul-nuclear-power.lua | 1 + angelspetrochem/changelog.txt | 5 +- angelspetrochem/data.lua | 1 - angelspetrochem/locale/en/petrochem.cfg | 1 - .../global-override/bobassembly.lua | 76 ------------------ .../prototypes/global-override/bobplates.lua | 15 +++- .../prototypes/global-override/bobrevamp.lua | 30 +------ .../prototypes/override/angelspetrochem.lua | 22 +++-- .../prototypes/override/angelsrefining.lua | 2 +- .../prototypes/override/bobplates.lua | 2 +- .../prototypes/override/bobrevamp.lua | 4 - .../prototypes/override/bobwarfare.lua | 27 ++++--- angelspetrochem/settings-updates.lua | 1 - angelspetrochem/settings.lua | 7 -- angelsrefining/changelog.txt | 6 +- angelsrefining/data-final-fixes.lua | 5 +- .../prototypes/angels-functions.lua | 34 +++++--- .../prototypes/override-functions.lua | 24 ++---- .../refining-override-bobequipment.lua | 69 ---------------- .../refining-override-boblogistics.lua | 2 - .../override/refining-override-bobmining.lua | 80 +++++++++---------- .../override/refining-override-bobplates.lua | 12 +++ .../override/refining-override-bobpower.lua | 34 -------- .../override/refining-override-bobrevamp.lua | 20 ----- .../override/refining-override-bobtech.lua | 18 ----- .../refining-override-bobvehicleequipment.lua | 68 ---------------- .../override/refining-override-bobwarfare.lua | 14 ---- .../refining-override-water-treatment.lua | 8 +- .../prototypes/refining-generate.lua | 11 +-- .../prototypes/refining-override.lua | 11 ++- angelsrefining/settings-updates.lua | 1 + angelssmelting/changelog.txt | 1 + .../override/smelting-override-platinum.lua | 3 +- 54 files changed, 372 insertions(+), 489 deletions(-) diff --git a/angelsaddons-storage/changelog.txt b/angelsaddons-storage/changelog.txt index 9e7cc9430..6d40f13e2 100644 --- a/angelsaddons-storage/changelog.txt +++ b/angelsaddons-storage/changelog.txt @@ -1,7 +1,9 @@ --------------------------------------------------------------------------------------------------- Version: 0.0.9 -Date: xx.xx.202x +Date: ??? Bugfixes: + - Fixed technology cost of logistics silos when playing with bobtech + - Fixed technology cost of logistics warehouses when playing with bobtech - Added missing setting localisation - Fixed active / passive provider warehouse descriptions --------------------------------------------------------------------------------------------------- diff --git a/angelsaddons-storage/prototypes/overrides/silos.lua b/angelsaddons-storage/prototypes/overrides/silos.lua index 12b113d44..1ba115f9b 100644 --- a/angelsaddons-storage/prototypes/overrides/silos.lua +++ b/angelsaddons-storage/prototypes/overrides/silos.lua @@ -69,11 +69,17 @@ if angelsmods.industries then end --OVERRIDE FOR BOBS ---LOGISTICS if angelsmods.addons.storage.silos then + --LOGISTICS if mods["boblogistics"] then else table.insert(data.raw.technology["logistic-silos"].unit.ingredients, {type = "item", name = "utility-science-pack", amount = 1}) end + + --TECHNOLOGY + if mods["bobtech"] then + table.insert(data.raw.technology["logistic-silos"].unit.ingredients, + {type = "item", name = "advanced-logistic-science-pack", amount = 1}) + end end \ No newline at end of file diff --git a/angelsaddons-storage/prototypes/overrides/warehouses.lua b/angelsaddons-storage/prototypes/overrides/warehouses.lua index 79fdd4fbb..1daf6ded5 100644 --- a/angelsaddons-storage/prototypes/overrides/warehouses.lua +++ b/angelsaddons-storage/prototypes/overrides/warehouses.lua @@ -23,4 +23,10 @@ if angelsmods.addons.storage.warehouses then {type = "item", name = "utility-science-pack", amount = 1}) end + --TECHNOLOGY + if mods["bobtech"] then + table.insert(data.raw.technology["angels-logistic-warehouses"].unit.ingredients, + {type = "item", name = "advanced-logistic-science-pack", amount = 1}) + end + end \ No newline at end of file diff --git a/angelsbioprocessing/data.lua b/angelsbioprocessing/data.lua index d3cd6e482..a6ab9bfb3 100644 --- a/angelsbioprocessing/data.lua +++ b/angelsbioprocessing/data.lua @@ -19,6 +19,7 @@ if bobmods and bobmods.enemies and data.raw.item["small-alien-artifact-blue"] th angelsmods.triggers.artifacts["purple"] = true angelsmods.triggers.artifacts["green"] = true angelsmods.triggers.artifacts["base"] = true -- pink + bobmods.enemies.small_alien_artifacts = true end --BIO PASTES angelsmods.triggers.bio_pastes = angelsmods.triggers.bio_pastes or {} diff --git a/angelsbioprocessing/prototypes/bio-processing-override.lua b/angelsbioprocessing/prototypes/bio-processing-override.lua index 69470ed92..35507256f 100644 --- a/angelsbioprocessing/prototypes/bio-processing-override.lua +++ b/angelsbioprocessing/prototypes/bio-processing-override.lua @@ -88,7 +88,7 @@ else if bobmods and bobmods.plates then OV.patch_recipes( { - {name = "algae-brown-burning", results = {{"!!"},{name = "lithium-chloride", amount = 1, type = "item"}}} + {name = "algae-brown-burning", results = {{"!!"},{name = "solid-lithium", amount = 1, type = "item"}}} } ) else diff --git a/angelsdev-unit-test/info.json b/angelsdev-unit-test/info.json index a594fe1a4..140882da9 100644 --- a/angelsdev-unit-test/info.json +++ b/angelsdev-unit-test/info.json @@ -8,13 +8,6 @@ "homepage": "https://forums.factorio.com/viewforum.php?f=185", "description": "A tool to help process unit tests ingame", "dependencies": [ - "base >= 1.1.33", - - "angelsrefining", - "? angelspetrochem", - "? angelssmelting", - "? angelsbioprocessing", - "? angelsindustries", - "? angelsexploration" + "base >= 1.1.33" ] } diff --git a/angelsdev-unit-test/python/unit_test_configuration.py b/angelsdev-unit-test/python/unit_test_configuration.py index 9b158a999..034ad7b09 100644 --- a/angelsdev-unit-test/python/unit_test_configuration.py +++ b/angelsdev-unit-test/python/unit_test_configuration.py @@ -228,7 +228,7 @@ def addConfiguration(cls:UnitTestConfiguration, configName:str, modList:list[str #"boblogistics", #"bobmining", #"bobmodules", - #"bobores", + "bobores", "bobplates", #"bobpower", #"bobrevamp", diff --git a/angelsdev-unit-test/unit-tests/unit-test-003.lua b/angelsdev-unit-test/unit-tests/unit-test-003.lua index 520e32dcf..838fd9fdd 100644 --- a/angelsdev-unit-test/unit-tests/unit-test-003.lua +++ b/angelsdev-unit-test/unit-tests/unit-test-003.lua @@ -3,10 +3,13 @@ local unit_test_functions = require("unit-test-functions") local recipes_to_ignore = +{ + ["electric-energy-interface"] = true, -- base game +} +local products_to_ignore = { ["chemical-void"] = true, ["water-void"] = true, - ["electric-energy-interface"] = true, -- base game } local unit_test_003 = function() @@ -39,7 +42,7 @@ local unit_test_003 = function() local recipe_products = recipe_data.products for _, recipe_product in pairs(recipe_products) do --add exception list for results (void results) - if not (recipe_product.name == "chemical-void" or recipe_product.name == "water-void") then + if not products_to_ignore[recipe_product.name] then if recipe_product.type == "item" then if item_prototypes[recipe_product.name].has_flag("hidden") then unit_test_functions.print_msg(string.format("Recipe %q makes %q (item), which is hidden.", recipe_name, recipe_product.name)) diff --git a/angelsdev-unit-test/unit-tests/unit-test-004.lua b/angelsdev-unit-test/unit-tests/unit-test-004.lua index 90533d334..1a4b510d7 100644 --- a/angelsdev-unit-test/unit-tests/unit-test-004.lua +++ b/angelsdev-unit-test/unit-tests/unit-test-004.lua @@ -44,7 +44,14 @@ end local unit_test_004 = function() local unit_test_result = unit_test_functions.test_successful - + + if game.active_mods["SeaBlock"] then + tech_unlocked_by_script["sb-startup1"] = true + tech_unlocked_by_script["sb-startup2"] = true + tech_unlocked_by_script["sb-startup3"] = true + tech_unlocked_by_script["sct-automation-science-pack"] = true + end + local tech_prototypes = game.technology_prototypes for tech_name, tech_prototype in pairs(tech_prototypes) do if (not tech_hidden(tech_prototype)) and (not tech_unlocked_by_script[tech_name]) then diff --git a/angelsdev-unit-test/unit-tests/unit-test-006.lua b/angelsdev-unit-test/unit-tests/unit-test-006.lua index 3135e2d29..cd80a4abd 100644 --- a/angelsdev-unit-test/unit-tests/unit-test-006.lua +++ b/angelsdev-unit-test/unit-tests/unit-test-006.lua @@ -4,7 +4,6 @@ -- depends on a technology unlocking the required science level. local unit_test_functions = require("unit-test-functions") --- this unit test currently doesn't cover bobs technologies local technologies_to_ignore = { } @@ -76,6 +75,7 @@ local function calculate_science_pack_level() if game.active_mods["bobtech"] then -- bobs regular science packs for pack_name, pack_level in pairs{ + ["steam-science-pack"] = 30, ["advanced-logistic-science-pack"] = 50 + (science_pack_level["angels-science-pack-blue"] or science_pack_level["chemical-science-pack"]), } do science_pack_level[pack_name] = pack_level @@ -84,14 +84,14 @@ local function calculate_science_pack_level() if game.active_mods["bobenemies"] then -- bobs alien science packs for pack_name, pack_level in pairs{ - ["science-pack-gold"] = 50 + (science_pack_level["angels-science-pack-blue"] or science_pack_level["production-science-pack"]), - ["alien-science-pack"] = 50 + (science_pack_level["angels-science-pack-blue"] or science_pack_level["production-science-pack"]), - ["alien-science-pack-blue"] = 50 + (science_pack_level["angels-science-pack-blue"] or science_pack_level["production-science-pack"]), - ["alien-science-pack-orange"] = 50 + (science_pack_level["angels-science-pack-blue"] or science_pack_level["production-science-pack"]), - ["alien-science-pack-purple"] = 50 + (science_pack_level["angels-science-pack-blue"] or science_pack_level["production-science-pack"]), - ["alien-science-pack-yellow"] = 50 + (science_pack_level["angels-science-pack-blue"] or science_pack_level["production-science-pack"]), - ["alien-science-pack-green"] = 50 + (science_pack_level["angels-science-pack-blue"] or science_pack_level["production-science-pack"]), - ["alien-science-pack-red"] = 50 + (science_pack_level["angels-science-pack-blue"] or science_pack_level["production-science-pack"]), + ["science-pack-gold"] = 50 + (science_pack_level["angels-science-pack-blue"] or science_pack_level["utility-science-pack"]), + ["alien-science-pack"] = 50 + (science_pack_level["angels-science-pack-blue"] or science_pack_level["utility-science-pack"]), + ["alien-science-pack-blue"] = 50 + (science_pack_level["angels-science-pack-blue"] or science_pack_level["utility-science-pack"]), + ["alien-science-pack-orange"] = 50 + (science_pack_level["angels-science-pack-blue"] or science_pack_level["utility-science-pack"]), + ["alien-science-pack-purple"] = 50 + (science_pack_level["angels-science-pack-blue"] or science_pack_level["utility-science-pack"]), + ["alien-science-pack-yellow"] = 50 + (science_pack_level["angels-science-pack-blue"] or science_pack_level["utility-science-pack"]), + ["alien-science-pack-green"] = 50 + (science_pack_level["angels-science-pack-blue"] or science_pack_level["utility-science-pack"]), + ["alien-science-pack-red"] = 50 + (science_pack_level["angels-science-pack-blue"] or science_pack_level["utility-science-pack"]), } do science_pack_level[pack_name] = pack_level end @@ -111,6 +111,42 @@ local function calculate_science_pack_level() } do science_pack_level[pack_name] = pack_level end + technologies_to_ignore["effectivity-module-5"] = true + technologies_to_ignore["green-module-1"] = true + technologies_to_ignore["god-module-1"] = true + technologies_to_ignore["pollution-clean-module-5"] = true + technologies_to_ignore["pollution-create-module-5"] = true + technologies_to_ignore["productivity-module-5"] = true + technologies_to_ignore["raw-productivity-module-1"] = true + technologies_to_ignore["raw-speed-module-1"] = true + technologies_to_ignore["speed-module-5"] = true + end + + if game.active_mods["SeaBlock"] then + for pack_name, pack_level in pairs{ + ["sb-angelsore3-tool"] = 0, + ["sb-algae-brown-tool"] = 0, + ["sb-lab-tool"] = 0, + ["sb-basic-circuit-board-tool"] = 0 + } do + science_pack_level[pack_name] = pack_level + end + end + + if game.active_mods["ScienceCostTweakerM"] then + science_pack_level["sct-bio-science-pack"] = science_pack_level["token-bio"] + end + + if game.active_mods["SpaceMod"] then + technologies_to_ignore["space-assembly"] = true + technologies_to_ignore["protection-fields"] = true + technologies_to_ignore["fusion-reactor"] = true + technologies_to_ignore["fuel-cells"] = true + technologies_to_ignore["habitation"] = true + technologies_to_ignore["life-support-systems"] = true + technologies_to_ignore["spaceship-command"] = true + technologies_to_ignore["astrometrics"] = true + technologies_to_ignore["ftl-theory-A"] = true end end @@ -321,6 +357,7 @@ local unit_test_006 = function() unit_test_result = unit_test_functions.test_failed elseif ((bonus_upgrade_technologies[tech_name] ~= true) and tech_ingredient_levels[tech_name] > math.max(prereq_ingredient_level, prereq_unlock_level)) then unit_test_functions.print_msg(string.format("Technology %q requires higher science packs than its prerequisites provide.", tech_name)) + unit_test_result = unit_test_functions.test_failed elseif ((bonus_upgrade_technologies[tech_name] ~= true) and tech_ingredient_levels[tech_name] > math.max(prereq_ingredient_level, prereq_unlock_level)) then unit_test_result = unit_test_functions.test_failed end diff --git a/angelsdev-unit-test/unit-tests/unit-test-007.lua b/angelsdev-unit-test/unit-tests/unit-test-007.lua index 46cc5115f..e661504c2 100644 --- a/angelsdev-unit-test/unit-tests/unit-test-007.lua +++ b/angelsdev-unit-test/unit-tests/unit-test-007.lua @@ -5,6 +5,11 @@ local item_recipes_to_ignore = {} local fluid_recipes_to_ignore = {} +local recipe_categories_to_ignore = +{ + "barreling-pump" +} + local function has_recipe(recipe_filters, recipes_to_ignore) local recipe_prototypes = game.get_filtered_recipe_prototypes(recipe_filters) @@ -63,12 +68,34 @@ local unit_test_007 = function() end end + if game.active_mods["SpaceMod"] then + table.insert(items_to_ignore, "drydock-assembly") + table.insert(items_to_ignore, "drydock-structural") + table.insert(items_to_ignore, "fusion-reactor") + table.insert(items_to_ignore, "hull-component") + table.insert(items_to_ignore, "protection-field") + table.insert(items_to_ignore, "space-thruster") + table.insert(items_to_ignore, "fuel-cell") + table.insert(items_to_ignore, "habitation") + table.insert(items_to_ignore, "life-support") + table.insert(items_to_ignore, "command") + table.insert(items_to_ignore, "astrometrics") + table.insert(items_to_ignore, "ftl-drive") + end + -- Populate fluid_recipes_to_ignore with voiding and barreling recipes local recipe_filters = {} table.insert(recipe_filters, {filter = "has-product-item", invert = false, mode = "or", elem_filters = {{filter = "name", name = "chemical-void"}}}) table.insert(recipe_filters, {filter = "has-product-item", invert = false, mode = "or", elem_filters = {{filter = "name", name = "water-void"}}}) - table.insert(recipe_filters, {filter = "category", invert = false, mode = "or", category = "barreling-pump"}) + if #recipe_categories_to_ignore > 0 then + for _, category_name in pairs(recipe_categories_to_ignore) do + if game.recipe_category_prototypes[category] then + table.insert(recipe_filters, {filter = "category", invert = false, mode = "or", category = category_name}) + end + end + end + local recipe_prototypes = game.get_filtered_recipe_prototypes(recipe_filters) for recipe_name, recipe in pairs(recipe_prototypes) do diff --git a/angelsdev-unit-test/unit-tests/unit-test-008.lua b/angelsdev-unit-test/unit-tests/unit-test-008.lua index 7ddb68ce9..9679d6692 100644 --- a/angelsdev-unit-test/unit-tests/unit-test-008.lua +++ b/angelsdev-unit-test/unit-tests/unit-test-008.lua @@ -6,12 +6,18 @@ local items_to_ignore = {} local fluids_to_ignore = {} local item_recipes_to_ignore = {} local fluid_recipes_to_ignore = {} +local recipe_categories_to_ignore = +{ + "barreling-pump" +} local function has_recipe(recipe_filters, recipes_to_ignore) local recipe_prototypes = game.get_filtered_recipe_prototypes(recipe_filters) if #recipe_prototypes == 0 then return false + elseif #recipes_to_ignore == 0 then + return true else local used = false for recipe_name, recipe in pairs(recipe_prototypes) do @@ -94,7 +100,13 @@ local unit_test_008 = function() -- Populate fluid_recipes_to_ignore with unbarreling recipes local recipe_filters = {} - table.insert(recipe_filters, {filter = "category", invert = false, mode = "and", category = "barreling-pump"}) + if #recipe_categories_to_ignore > 0 then + for _, category_name in pairs(recipe_categories_to_ignore) do + if game.recipe_category_prototypes[category] then + table.insert(recipe_filters, {filter = "category", invert = false, mode = "or", category = category_name}) + end + end + end local recipe_prototypes = game.get_filtered_recipe_prototypes(recipe_filters) @@ -116,6 +128,23 @@ local unit_test_008 = function() end end + -- Populate fluid_to_ignore with boiler results + local entity_filters = {} + table.insert(entity_filters, {filter="type", type="boiler", mode="or"}) + table.insert(entity_filters, {filter="hidden", mode="and", invert=true}) + table.insert(entity_filters, {filter="type", type="boiler", mode="or"}) + table.insert(entity_filters, {filter="flag", flag="player-creation", mode="and"}) + local entity_prototypes = game.get_filtered_entity_prototypes(entity_filters) + + for boiler_name, boiler in pairs(entity_prototypes) do + for _, fluidbox in pairs(boiler.fluidbox_prototypes) do + if fluidbox.filter and fluidbox.production_type == "output" then + fluids_to_ignore[fluidbox.filter.name] = true + break + end + end + end + -- Check items local item_filters = {} table.insert(item_filters, {filter = "flag", invert = true, mode = "and", flag = "hidden"}) diff --git a/angelsindustries/changelog.txt b/angelsindustries/changelog.txt index d42d6223c..84351b5f9 100644 --- a/angelsindustries/changelog.txt +++ b/angelsindustries/changelog.txt @@ -1,6 +1,9 @@ --------------------------------------------------------------------------------------------------- Version: 0.4.16 Date: xx.xx.202x + Changes: + - Added support for separate techs for barrels, gas bottles, and fluid canisters added by + Bob's Metals, Chemicals and Intermediates mod (769) Bugfixes: - Regular mode: - Fixed centrifuges did not have their customizable lights enabled as intended (772) diff --git a/angelsindustries/prototypes/overrides/components-block-update.lua b/angelsindustries/prototypes/overrides/components-block-update.lua index 1ec0344da..5a419666b 100644 --- a/angelsindustries/prototypes/overrides/components-block-update.lua +++ b/angelsindustries/prototypes/overrides/components-block-update.lua @@ -27,6 +27,10 @@ if angelsmods.industries.components then OV.remove_science_pack("angels-steel-smelting-1", "logistic-science-pack") OV.remove_prereq("angels-steel-smelting-1", "angels-metallurgy-2") OV.add_prereq("angels-steel-smelting-1", "angels-metallurgy-1") + -- update depending technologies accordingly + if angelsmods.trigger.smelting_products["invar"].plate and mods["bobplates"] then + OV.add_prereq("angels-invar-smelting-1", "logistic-science-pack") + end ----------------------------------------------------------------------------- -- ADD ELECTRONIC RECIPES TO ELECTRONIC ASSMBLY ----------------------------- 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 61deb2a77..0408d6cb8 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 @@ -127,7 +127,8 @@ if angelsmods.industries.components then OV.add_prereq("electronics-machine-2", "angels-components-construction-3") OV.add_prereq("electronics-machine-2", "advanced-electronics") OV.add_prereq("electronics-machine-3", "angels-components-construction-5") - OV.add_prereq("electronics-machine-3", "advanced-electronics-2") + OV.add_prereq("electronics-machine-3", "advanced-electronics-3") + OV.set_science_pack("electronics-machine-3", "utility-science-pack") if angelsmods.industries.tech then OV.add_prereq("electronics-machine-1", "tech-specialised-labs-basic-enhance-1") OV.add_prereq("electronics-machine-2", "tech-specialised-labs-basic-enhance-2") diff --git a/angelsindustries/prototypes/overrides/components-bobs-entity-update/components-bobs-gun-update.lua b/angelsindustries/prototypes/overrides/components-bobs-entity-update/components-bobs-gun-update.lua index 321608fdb..15515cfdf 100644 --- a/angelsindustries/prototypes/overrides/components-bobs-entity-update/components-bobs-gun-update.lua +++ b/angelsindustries/prototypes/overrides/components-bobs-entity-update/components-bobs-gun-update.lua @@ -21,4 +21,14 @@ if angelsmods.industries.components then } ) + if mods["bobwarfare"] then + -- laser rifle + if angelsmods.industries.tech then + else + OV.remove_prereq("bob-laser-rifle-ammo-2", "military-3") + OV.add_prereq("bob-laser-rifle-ammo-3", "military-3") + end + end + + end \ No newline at end of file diff --git a/angelsindustries/prototypes/overrides/components-bobs-entity-update/components-bobs-power-update.lua b/angelsindustries/prototypes/overrides/components-bobs-entity-update/components-bobs-power-update.lua index d52bd1c3f..e64ab6581 100644 --- a/angelsindustries/prototypes/overrides/components-bobs-entity-update/components-bobs-power-update.lua +++ b/angelsindustries/prototypes/overrides/components-bobs-entity-update/components-bobs-power-update.lua @@ -120,6 +120,7 @@ if angelsmods.industries.components then OV.add_prereq("bob-solar-energy-2", "angels-basic-blocks-3") OV.add_prereq("bob-solar-energy-3", "angels-advanced-blocks-1") OV.add_prereq("bob-solar-energy-4", "angels-advanced-blocks-2") + OV.set_science_pack("bob-solar-energy-4", "utility-science-pack") end end @@ -231,6 +232,7 @@ if angelsmods.industries.components then --OV.add_prereq("bob-electric-energy-accumulators-2", "angels-basic-blocks-3") OV.add_prereq("bob-electric-energy-accumulators-3", "angels-advanced-blocks-1") OV.add_prereq("bob-electric-energy-accumulators-4", "angels-advanced-blocks-2") + OV.set_science_pack("bob-electric-energy-accumulators-4", "utility-science-pack") end end diff --git a/angelsindustries/prototypes/overrides/components-bobs-entity-update/components-bobs-robots-update.lua b/angelsindustries/prototypes/overrides/components-bobs-entity-update/components-bobs-robots-update.lua index e8546402f..f3c41ff34 100644 --- a/angelsindustries/prototypes/overrides/components-bobs-entity-update/components-bobs-robots-update.lua +++ b/angelsindustries/prototypes/overrides/components-bobs-entity-update/components-bobs-robots-update.lua @@ -96,6 +96,14 @@ if angelsmods.industries.components then end OV.add_prereq("bob-robotics-4", "angels-components-mechanical-5") OV.add_prereq("bob-robotics-4", "tech-yellow-circuit") + if angelsmods.industries.tech then + else + OV.set_science_pack("bob-robotics-4", "utility-science-pack") + OV.set_science_pack("bob-robots-3", "utility-science-pack") + if mods["bobwarfare"] then + OV.set_science_pack("bob-laser-robot", "utility-science-pack") + end + end -- charging pads OV.patch_recipes( diff --git a/angelsindustries/prototypes/overrides/components-bobs-recipe-update.lua b/angelsindustries/prototypes/overrides/components-bobs-recipe-update.lua index 4d5ef7df0..45c5c04b3 100644 --- a/angelsindustries/prototypes/overrides/components-bobs-recipe-update.lua +++ b/angelsindustries/prototypes/overrides/components-bobs-recipe-update.lua @@ -61,6 +61,7 @@ if angelsmods.industries.components then -- BOB EQUIPMENT ------------------------------------------------------------ ----------------------------------------------------------------------------- if mods["bobequipment"] then + -- roboports OV.patch_recipes( { { @@ -74,6 +75,22 @@ if angelsmods.industries.components then OV.remove_prereq("personal-roboport-mk2-equipment", "angels-components-batteries-5") OV.add_prereq("personal-roboport-mk2-equipment", "angels-components-batteries-3") OV.add_prereq("personal-roboport-mk3-equipment", "angels-components-batteries-4") + + -- exoskeleton + OV.patch_recipes( + { + { + name = "exoskeleton-equipment", + ingredients = + { + { type = "item", name = "motor-3", amount = "motor-4" }, + }, + } + } + ) + OV.remove_prereq("exoskeleton-equipment", "electric-engine") + OV.add_prereq("exoskeleton-equipment", "angels-components-mechanical-3") + OV.add_prereq("exoskeleton-equipment", "tech-orange-circuit") end ----------------------------------------------------------------------------- diff --git a/angelsindustries/prototypes/overrides/global-tech-bobs-cores.lua b/angelsindustries/prototypes/overrides/global-tech-bobs-cores.lua index 06d058a5d..961761344 100644 --- a/angelsindustries/prototypes/overrides/global-tech-bobs-cores.lua +++ b/angelsindustries/prototypes/overrides/global-tech-bobs-cores.lua @@ -17,6 +17,8 @@ if angelsmods.industries.tech then AI.core_replace("electric-mixing-furnace", "basic", "processing") AI.core_replace("steel-chemical-furnace", "basic", "processing") AI.core_replace("electric-chemical-furnace", "basic", "processing") + AI.core_replace("fluid-barrel-processing", "logistic", "processing") + AI.core_replace("fluid-canister-processing", "logistic", "processing") AI.core_replace("gas-canisters", "basic", "processing") AI.core_replace("ceramics", "basic", "processing") @@ -151,7 +153,7 @@ if angelsmods.industries.tech then AI.core_replace("bob-robo-modular-1", "basic", "logistic") AI.core_replace("bob-robo-modular-2", "basic", "logistic") AI.core_replace("bob-robo-modular-3", "basic", "logistic") - AI.core_replace("bob-robo-modular-4", "basic", "logistic") + AI.core_replace("bob-robo-modular-4", "processing", "logistic") -- repair packs AI.core_replace("bob-repair-pack-2", "basic", "enhance") AI.core_replace("bob-repair-pack-3", "basic", "enhance") @@ -180,7 +182,7 @@ if angelsmods.industries.tech then AI.core_replace("radars", "basic", "exploration") AI.core_replace("radars-2", "basic", "exploration") AI.core_replace("radars-3", "basic", "exploration") - AI.core_replace("radars-4", "war", "exploration") + AI.core_replace("radars-4", "processing", "exploration") --mines AI.core_replace("poison-mine", "basic", "war") AI.core_replace("slowdown-mine", "basic", "war") @@ -254,6 +256,9 @@ if angelsmods.industries.tech then OV.remove_science_pack("vehicle-energy-shield-equipment-4", "datacore-enhance-1") OV.remove_science_pack("vehicle-energy-shield-equipment-5", "datacore-enhance-1") OV.remove_science_pack("vehicle-energy-shield-equipment-6", "datacore-enhance-1") + OV.remove_science_pack("bob-explosive-artillery-shells", "datacore-war-1") + OV.remove_science_pack("bob-fire-artillery-shells", "datacore-war-1") + OV.remove_science_pack("bob-poison-artillery-shells", "datacore-war-1") --yellow tier OV.remove_science_pack("bob-power-armor-3", "datacore-enhance-1") OV.remove_science_pack("bob-power-armor-4", "datacore-enhance-1") diff --git a/angelsindustries/prototypes/overrides/global-tech-bobs-packs.lua b/angelsindustries/prototypes/overrides/global-tech-bobs-packs.lua index e3f0c1f75..9a61f6435 100644 --- a/angelsindustries/prototypes/overrides/global-tech-bobs-packs.lua +++ b/angelsindustries/prototypes/overrides/global-tech-bobs-packs.lua @@ -110,7 +110,7 @@ if angelsmods.industries.tech then end --mining drills AI.pack_replace("bob-drills-3", "blue", "orange") - AI.pack_replace("bob-area-drills-2", "blue", "orange") + AI.pack_replace("bob-area-drills-2", "green", "orange") AI.pack_replace("bob-area-drills-4", "blue", "yellow") end @@ -143,12 +143,16 @@ if angelsmods.industries.tech then OV.remove_prereq("bob-robo-modular-2", "tech-blue-packs") -- robots OV.remove_science_pack("construction-robotics", "angels-science-pack-orange") + AI.pack_replace("logistic-robotics", "blue", "orange") AI.pack_replace("bob-robots-1", "blue", "orange") OV.remove_prereq("bob-robo-modular-3", "production-science-pack") + AI.pack_replace("worker-robots-storage-1", "blue", "orange") if settings.startup["bobmods-logistics-flyingrobotframes"].value == true then OV.remove_science_pack("robotics", "angels-science-pack-orange") AI.pack_replace("bob-robotics-2", "blue", "orange") OV.remove_prereq("bob-robotics-3", "production-science-pack") + AI.pack_replace("bob-robotics-4", "blue", "yellow") + AI.pack_replace("bob-robots-3", "blue", "yellow") end -- inserter techs AI.pack_replace("inserter-capacity-bonus-1", "orange", "green") @@ -197,9 +201,11 @@ if angelsmods.industries.tech then AI.pack_replace("bob-turrets-3", "green", "orange") AI.pack_replace("bob-turrets-5", "blue", "yellow") AI.pack_replace("bob-sniper-turrets-2", "blue", "orange") - OV.remove_prereq("bob-sniper-turrets-2", "tech-blue-packs") + OV.remove_prereq("bob-sniper-turrets-2", "military-3") AI.pack_replace("bob-laser-turrets-2", "green", "orange") AI.pack_replace("bob-laser-turrets-3", "blue", "orange") + OV.remove_prereq("bob-laser-turrets-3", "military-3") + OV.add_prereq("bob-laser-turrets-4", "military-3") AI.pack_replace("bob-plasma-turrets-1", "green", "orange") AI.pack_replace("bob-plasma-turrets-2", "green", "orange") if mods["angelsexploration"] then @@ -208,15 +214,20 @@ if angelsmods.industries.tech then --laser rifles AI.pack_replace("bob-laser-rifle", "green", "orange") AI.pack_replace("bob-laser-rifle-ammo-1", "green", "orange") + AI.pack_replace("bob-laser-rifle-ammo-2", "green", "orange") + OV.remove_prereq("bob-laser-rifle-ammo-2", "military-3") + OV.add_prereq("bob-laser-rifle-ammo-3", "military-3") --Drones/CombatBots AI.pack_replace("bob-robot-gun-1", "green", "orange") AI.pack_replace("bob-robot-gun-drones", "green", "orange") AI.pack_replace("bob-robot-plasma-drones", "green", "orange") AI.pack_replace("bob-robot-laser-drones", "green", "orange") AI.pack_replace("bob-robot-flamethrower-drones", "green", "orange") + AI.pack_replace("bob-laser-robot", "blue", "yellow") --Rockets AI.pack_replace("rocketry", "green", "orange") - AI.pack_replace("bob-rocket", "green", "orange") + AI.pack_replace("bob-rocket", "blue", "orange") + AI.pre_req_replace("bob-rocket", "military-3", "angels-components-weapons-advanced") AI.pre_req_replace("bob-rocket", "tungsten-processing", "angels-explosives-1") --radars AI.pack_replace("radars-4", "blue", "yellow") @@ -236,7 +247,12 @@ if angelsmods.industries.tech then AI.pack_replace("vehicle-roboport-equipment", "green", "orange") AI.pack_replace("vehicle-roboport-modular-equipment-1", "green", "orange") OV.remove_prereq("vehicle-fusion-cell-equipment-2", "production-science-pack") + AI.pack_replace("vehicle-fusion-cell-equipment-3", "yellow", "blue") OV.remove_prereq("vehicle-fusion-reactor-equipment-2", "production-science-pack") + AI.pack_replace("vehicle-fusion-reactor-equipment-2", "yellow", "blue") + AI.pack_replace("vehicle-fusion-reactor-equipment-3", "yellow", "blue") + AI.pack_replace("vehicle-big-turret-equipment-3", "yellow", "blue") + AI.pre_req_replace("vehicle-big-turret-equipment-3", "military-4", "military-3") end ------------------------------------------------------------------------------- @@ -246,7 +262,7 @@ if angelsmods.industries.tech then --adds bob personal equipment stuffs AI.pack_replace("personal-roboport-equipment", "green", "orange") AI.pack_replace("personal-roboport-modular-equipment-1", "green", "orange") - AI.pack_replace("exoskeleton-equipment", "blue", "orange") + AI.pack_replace("exoskeleton-equipment", "green", "orange") AI.pack_replace("solar-panel-equipment-2", "green", "orange") AI.pack_replace("solar-panel-equipment-4", "blue", "yellow") end @@ -256,6 +272,7 @@ if angelsmods.industries.tech then ------------------------------------------------------------------------------- if mods["bobpower"] then --adds bob power stuffs + OV.remove_science_pack("electric-engine", "angels-science-pack-green") -- steam power if settings.startup["bobmods-power-steam"].value == true then AI.pack_replace("bob-steam-engine-4", "blue", "orange") @@ -289,7 +306,7 @@ if angelsmods.industries.tech then end -- power distribution if settings.startup["bobmods-power-poles"].value == true then - AI.pack_replace("electric-pole-2", "green", "orange") + AI.pack_replace("electric-pole-2", "blue", "orange") AI.pack_replace("electric-pole-4", "blue", "yellow") AI.pack_replace("electric-energy-distribution-2", "blue", "orange") AI.pack_replace("electric-substation-3", "blue", "yellow") diff --git a/angelsindustries/prototypes/overrides/overhaul-nuclear-power.lua b/angelsindustries/prototypes/overrides/overhaul-nuclear-power.lua index 2de87c84b..ffcf8ab4d 100644 --- a/angelsindustries/prototypes/overrides/overhaul-nuclear-power.lua +++ b/angelsindustries/prototypes/overrides/overhaul-nuclear-power.lua @@ -216,6 +216,7 @@ if angelsmods.industries.overhaul then if data.raw.reactor["nuclear-reactor-2"] then data.raw.item["angels-thorium-fuel-cell"].fuel_category = "thorium" OV.add_prereq("bob-nuclear-power-2", "angels-thorium-power") + OV.set_science_pack("bob-nuclear-power-2", "utility-science-pack") end end diff --git a/angelspetrochem/changelog.txt b/angelspetrochem/changelog.txt index 41b014e98..e77dd9d76 100644 --- a/angelspetrochem/changelog.txt +++ b/angelspetrochem/changelog.txt @@ -3,7 +3,10 @@ Version: 0.9.22 Date: ??? Changes: - Removed excessive logging entries from the log file (743) - - lowered the fuel value of crude to 35% to be more inline with the other fuels + - Lowered the fuel value of crude to 35% to be more inline with the other fuels + - Hid Ammonium chloride recycling recipe from Bob's revamp (769) + - Added support for separate techs for barrels, gas bottles, and fluid canisters added by + Bob's Metals, Chemicals and Intermediates mod (769) --------------------------------------------------------------------------------------------------- Version: 0.9.21 Date: 19.12.2021 diff --git a/angelspetrochem/data.lua b/angelspetrochem/data.lua index 5d3dd93d8..9bed2fbfc 100644 --- a/angelspetrochem/data.lua +++ b/angelspetrochem/data.lua @@ -18,7 +18,6 @@ angelsmods.trigger.liquid_cupric_chloride_solution = not angelsmods.functions.is --HIDE UNUSED BUILDINGS angelsmods.trigger.disable_bobs_electrolysers = settings.startup["angels-disable-bobs-electrolysers"].value angelsmods.trigger.disable_bobs_chemical_plants = settings.startup["angels-disable-bobs-chemical-plants"].value -angelsmods.trigger.disable_bobs_distilleries = settings.startup["angels-disable-bobs-distilleries"].value angelsmods.trigger.disable_vanilla_chemical_plants = mods["bobplates"] and settings.startup["angels-disable-bobs-chemical-plants"].value or angelsmods.trigger.disable_bobs_chemical_plants --OVERRIDE FOR REFINING diff --git a/angelspetrochem/locale/en/petrochem.cfg b/angelspetrochem/locale/en/petrochem.cfg index 3f5d45045..0eef4464e 100644 --- a/angelspetrochem/locale/en/petrochem.cfg +++ b/angelspetrochem/locale/en/petrochem.cfg @@ -503,7 +503,6 @@ angels-enable-acids=Add acids to ore refining and mining of infinite ores angels-disable-vanilla-chemical-plants=Disable base-game chemical plant angels-disable-bobs-electrolysers=Disable Bob's electrolysers angels-disable-bobs-chemical-plants=Disable Bob's chemical plants -angels-disable-bobs-distilleries=Disable Bob's distilleries angels-show-chemical-formula=Show chemical formulae in item descriptions [mod-setting-description] diff --git a/angelspetrochem/prototypes/global-override/bobassembly.lua b/angelspetrochem/prototypes/global-override/bobassembly.lua index 217c55615..1f4ed426f 100644 --- a/angelspetrochem/prototypes/global-override/bobassembly.lua +++ b/angelspetrochem/prototypes/global-override/bobassembly.lua @@ -138,79 +138,3 @@ if mods["bobplates"] then end end end - -------------------------------------------------------------------------------- --- DISTILLERIES --------------------------------------------------------------- -------------------------------------------------------------------------------- -if mods["bobplates"] then - -- Distillery 1 - move_item("bob-distillery", "petrochem-buildings-electrolyser", "aa[bobs-electrolyser]-a") - if angelsmods.trigger.disable_bobs_distilleries then - angelsmods.functions.add_flag("bob-distillery", "hidden") - angelsmods.functions.set_next_upgrade("assembling-machine", "bob-distillery", nil) - angelsmods.functions.set_next_upgrade("furnace", "bob-distillery", nil) - OV.global_replace_item("bob-distillery", "angels-chemical-plant") - OV.disable_recipe("bob-distillery") - --OV.remove_unlock("bob-distillery") - angelsmods.functions.remove_crafting_category("assembling-machine", "bob-distillery", "distillery") - angelsmods.functions.add_crafting_category("assembling-machine", "angels-chemical-plant", "distillery") - else - OV.add_unlock("basic-chemistry-2", "bob-distillery") --give the item a new home if still active - end - - if mods["bobassembly"] then - -- Distillery 2 - move_item("bob-distillery-2", "petrochem-buildings-electrolyser", "aa[bobs-electrolyser]-a") - if angelsmods.trigger.disable_bobs_distilleries then - angelsmods.functions.add_flag("bob-distillery-2", "hidden") - angelsmods.functions.set_next_upgrade("assembling-machine", "bob-distillery-2", nil) - angelsmods.functions.set_next_upgrade("furnace", "bob-distillery-2", nil) - OV.global_replace_item("bob-distillery-2", "angels-chemical-plant") - OV.disable_recipe("bob-distillery-2") - OV.disable_technology("bob-distillery-2") - angelsmods.functions.remove_crafting_category("assembling-machine", "bob-distillery-2", "distillery") - angelsmods.functions.add_crafting_category("assembling-machine", "angels-chemical-plant-2", "distillery") - else - OV.add_prereq("bob-distillery-2", "basic-chemistry-2") - end - - -- Distillery 3 - move_item("bob-distillery-3", "petrochem-buildings-electrolyser", "aa[bobs-electrolyser]-a") - if angelsmods.trigger.disable_bobs_distilleries then - angelsmods.functions.add_flag("bob-distillery-3", "hidden") - angelsmods.functions.set_next_upgrade("assembling-machine", "bob-distillery-3", nil) - angelsmods.functions.set_next_upgrade("furnace", "bob-distillery-3", nil) - OV.global_replace_item("bob-distillery-3", "angels-chemical-plant") - OV.disable_recipe("bob-distillery-3") - OV.disable_technology("bob-distillery-3") - angelsmods.functions.remove_crafting_category("assembling-machine", "bob-distillery-3", "distillery") - angelsmods.functions.add_crafting_category("assembling-machine", "angels-chemical-plant-3", "distillery") - end - - -- Distillery 4 - move_item("bob-distillery-4", "petrochem-buildings-electrolyser", "aa[bobs-electrolyser]-a") - if angelsmods.trigger.disable_bobs_distilleries then - angelsmods.functions.add_flag("bob-distillery-4", "hidden") - angelsmods.functions.set_next_upgrade("assembling-machine", "bob-distillery-4", nil) - angelsmods.functions.set_next_upgrade("furnace", "bob-distillery-4", nil) - OV.global_replace_item("bob-distillery-4", "angels-chemical-plant") - OV.disable_recipe("bob-distillery-4") - OV.disable_technology("bob-distillery-4") - angelsmods.functions.remove_crafting_category("assembling-machine", "bob-distillery-4", "distillery") - angelsmods.functions.add_crafting_category("assembling-machine", "angels-chemical-plant-4", "distillery") - end - - -- Distillery 5 - move_item("bob-distillery-5", "petrochem-buildings-electrolyser", "aa[bobs-electrolyser]-a") - if angelsmods.trigger.disable_bobs_distilleries then - angelsmods.functions.add_flag("bob-distillery-5", "hidden") - angelsmods.functions.set_next_upgrade("assembling-machine", "bob-distillery-5", nil) - angelsmods.functions.set_next_upgrade("furnace", "bob-distillery-5", nil) - OV.global_replace_item("bob-distillery-5", "angels-chemical-plant") - OV.disable_recipe("bob-distillery-5") - OV.disable_technology("bob-distillery-5") - angelsmods.functions.remove_crafting_category("assembling-machine", "bob-distillery-5", "distillery") - --angelsmods.functions.add_crafting_category("assembling-machine", "angels-chemical-plant-5", "distillery") - end - end -end \ No newline at end of file diff --git a/angelspetrochem/prototypes/global-override/bobplates.lua b/angelspetrochem/prototypes/global-override/bobplates.lua index 700bdc119..c2c364793 100644 --- a/angelspetrochem/prototypes/global-override/bobplates.lua +++ b/angelspetrochem/prototypes/global-override/bobplates.lua @@ -35,7 +35,20 @@ if mods["bobplates"] then "air-pump-2", "air-pump-3", "air-pump-4", + "void-ammonia", + "void-carbon-dioxide", + "void-chlorine", + "void-deuterium", + "void-hydrogen", + "void-hydrogen-chloride", + "void-hydrogen-sulfide", + "void-nitrogen", + "void-oxygen", + "void-petroleum-gas", "void-pump", + "void-sour-gas", + "void-steam", + "void-sulfur-dioxide", } ) end @@ -94,8 +107,6 @@ if mods["bobplates"] then OV.remove_unlock("chemical-processing-1", "carbon") -- lithium processing ------------------------------------------------------- - OV.global_replace_item("lithium-chloride", "solid-lithium") - angelsmods.functions.add_flag("lithium-chloride", "hidden") OV.patch_recipes( { { diff --git a/angelspetrochem/prototypes/global-override/bobrevamp.lua b/angelspetrochem/prototypes/global-override/bobrevamp.lua index b1ab26923..c8c525ab4 100644 --- a/angelspetrochem/prototypes/global-override/bobrevamp.lua +++ b/angelspetrochem/prototypes/global-override/bobrevamp.lua @@ -130,11 +130,6 @@ if mods["bobrevamp"] then } ) end - ----------------------------------------------------------------------------- - -- PEROXIDE DEAD END -------------------------------------------------------- - ----------------------------------------------------------------------------- - --this may be used at a later date, but for now, it is a dead-end - angelsmods.functions.add_flag("gas-hydrogen-peroxide","hidden") ----------------------------------------------------------------------------- -- RTG ---------------------------------------------------------------------- @@ -146,14 +141,10 @@ if mods["bobrevamp"] then if settings.startup["bobmods-revamp-hardmode"].value then OV.disable_recipe( { - "brine-electrolysis", -- equivalent of angels recipe "water-saline-seperation" "ammoniated-brine", "sodium-bicarbonate", "sodium-carbonate", -- angels has own process of creating "solid-sodium-carbonate" from saline water } ) - angelsmods.functions.add_flag("brine", "hidden") - angelsmods.functions.disable_barreling_recipes("brine") - angelsmods.functions.add_flag("ammoniated-brine", "hidden") angelsmods.functions.disable_barreling_recipes("ammoniated-brine") @@ -165,26 +156,7 @@ if mods["bobrevamp"] then OV.global_replace_item("sodium-perchlorate", "solid-sodium-perchlorate") angelsmods.functions.add_flag("sodium-perchlorate", "hidden") - OV.patch_recipes( - { - { - name = "ammonium-chloride-recycling", - ingredients = - { - --{name = "solid-limestone", type = "item", amount = 1}, - {name = "gas-ammonium-chloride", type = "fluid", amount = 20}, - {name = "ammonium-chloride", type = "item", amount = 0} - }, - results = - { - {type = "fluid", name = "gas-ammonia", amount = 40}, -- 40 instead of 50 to be ammonia neutral (no production of it) - }, - subgroup = "petrochem-basics", - crafting_machine_tint = angelsmods.functions.get_recipe_tints({"gas-ammonia","gas-ammonium-chloride"}), - order = "e[solid-calcium-chloride]-b" - } - } - ) + OV.disable_recipe({"ammonium-chloride-recycling"}) OV.converter_fluid("ammonium-chloride", "gas-ammonium-chloride") angelsmods.functions.add_flag("ammonium-chloride", "hidden") end diff --git a/angelspetrochem/prototypes/override/angelspetrochem.lua b/angelspetrochem/prototypes/override/angelspetrochem.lua index 1423e762c..2777a8096 100644 --- a/angelspetrochem/prototypes/override/angelspetrochem.lua +++ b/angelspetrochem/prototypes/override/angelspetrochem.lua @@ -226,12 +226,6 @@ if angelsmods.functions.is_special_vanilla() then }, "hidden") end - if mods["bobrevamp"] then - else - angelsmods.functions.add_flag({ - "gas-hydrogen-peroxide", - }, "hidden") - end end if angelsmods.trigger.resin then @@ -288,4 +282,18 @@ else } ) angelsmods.functions.add_flag("liquid-cupric-chloride-solution", "hidden") -end \ No newline at end of file +end + +----------------------------------------------------------------------------- +-- DEAD ENDS ---------------------------------------------------------------- +----------------------------------------------------------------------------- +--Hydrogen peroxide may be used at a later date, but for now, it is a dead-end +angelsmods.functions.add_flag({ + "gas-hydrogen-peroxide", + "gas-phosgene" +}, "hidden") +OV.disable_recipe( + { + "gas-phosgene" + } +) diff --git a/angelspetrochem/prototypes/override/angelsrefining.lua b/angelspetrochem/prototypes/override/angelsrefining.lua index 2c105a1bd..d28593145 100644 --- a/angelspetrochem/prototypes/override/angelsrefining.lua +++ b/angelspetrochem/prototypes/override/angelsrefining.lua @@ -79,7 +79,7 @@ if angelsmods.refining then OV.remove_science_pack("lubricant", "chemical-science-pack") -- handle electric engine since lubricant moved... - if mods["boblogistics"] and (not mods["angelsindustries"]) then + if mods["boblogistics"] then -- robotics required at green science else -- robotics required at blue science diff --git a/angelspetrochem/prototypes/override/bobplates.lua b/angelspetrochem/prototypes/override/bobplates.lua index e9f89c279..d3a7dc10b 100644 --- a/angelspetrochem/prototypes/override/bobplates.lua +++ b/angelspetrochem/prototypes/override/bobplates.lua @@ -119,7 +119,7 @@ if mods["bobplates"] then {{237, 212, 104}, {247, 216, 081}, {247, 216, 081}} ) OV.barrel_overrides("liquid-fuel", "acid") - + data.raw["recipe"]["liquid-fuel"].always_show_products = true data.raw["recipe"]["liquid-fuel"].icon = nil data.raw["recipe"]["liquid-fuel"].icons = angelsmods.functions.create_liquid_recipe_icon( diff --git a/angelspetrochem/prototypes/override/bobrevamp.lua b/angelspetrochem/prototypes/override/bobrevamp.lua index 9ea92ebd1..1df352d96 100644 --- a/angelspetrochem/prototypes/override/bobrevamp.lua +++ b/angelspetrochem/prototypes/override/bobrevamp.lua @@ -39,10 +39,6 @@ if mods["bobrevamp"] and mods["bobplates"] then name = "solid-calcium-chloride", icons = angelsmods.functions.create_solid_recipe_icon(nil, "solid-calcium-chloride", {"gas-hydrogen-chloride"}), order = "e[solid-calcium-chloride]-a" - }, - { - name = "ammonium-chloride-recycling", - icons = angelsmods.functions.create_solid_recipe_icon(nil, "solid-calcium-chloride", {"gas-ammonium-chloride"}), } } ) diff --git a/angelspetrochem/prototypes/override/bobwarfare.lua b/angelspetrochem/prototypes/override/bobwarfare.lua index c642cafe9..86383582e 100644 --- a/angelspetrochem/prototypes/override/bobwarfare.lua +++ b/angelspetrochem/prototypes/override/bobwarfare.lua @@ -4,19 +4,19 @@ if mods["bobwarfare"] then ----------------------------------------------------------------------------- -- SULFURIC NITRIC ACID ----------------------------------------------------- ----------------------------------------------------------------------------- - if data.raw.fluid["sulfuric-nitric-acid"] then - data.raw["fluid"]["sulfuric-nitric-acid"].icon = nil - data.raw["fluid"]["sulfuric-nitric-acid"].icons = angelsmods.functions.create_liquid_fluid_icon( - {"__bobwarfare__/graphics/icons/sulfuric-nitric-acid.png", 32}, - "NSO" - ) + if data.raw.fluid["sulfuric-nitric-acid"] then + data.raw["fluid"]["sulfuric-nitric-acid"].icon = nil + data.raw["fluid"]["sulfuric-nitric-acid"].icons = angelsmods.functions.create_liquid_fluid_icon( + {"__bobwarfare__/graphics/icons/sulfuric-nitric-acid.png", 32}, + "NSO" + ) - data.raw["recipe"]["sulfuric-nitric-acid"].icon = nil - data.raw["recipe"]["sulfuric-nitric-acid"].icons = angelsmods.functions.create_liquid_recipe_icon( - {{"__bobwarfare__/graphics/icons/sulfuric-nitric-acid.png", 32}}, - "NSO" - ) - end + data.raw["recipe"]["sulfuric-nitric-acid"].icon = nil + data.raw["recipe"]["sulfuric-nitric-acid"].icons = angelsmods.functions.create_liquid_recipe_icon( + {{"__bobwarfare__/graphics/icons/sulfuric-nitric-acid.png", 32}}, + "NSO" + ) + end ----------------------------------------------------------------------------- -- NITROGLYCERIN ------------------------------------------------------------ @@ -32,6 +32,7 @@ if mods["bobwarfare"] then {{"__bobwarfare__/graphics/icons/nitroglycerin.png", 64}}, "CNO" ) + -- move_item needs to be called before barrel_overrides + angelsmods.functions.move_item("nitroglycerin", "petrochem-nitrogen-fluids", "ob", "fluid") OV.barrel_overrides("nitroglycerin", "vanilla") - end diff --git a/angelspetrochem/settings-updates.lua b/angelspetrochem/settings-updates.lua index dfd252a06..5a1431e75 100644 --- a/angelspetrochem/settings-updates.lua +++ b/angelspetrochem/settings-updates.lua @@ -3,5 +3,4 @@ if mods["bobplates"] then else angelsmods.settings.hide_setting("bool-setting", "angels-disable-bobs-electrolysers", true) angelsmods.settings.hide_setting("bool-setting", "angels-disable-bobs-chemical-plants", true) - angelsmods.settings.hide_setting("bool-setting", "angels-disable-bobs-distilleries", true) end \ No newline at end of file diff --git a/angelspetrochem/settings.lua b/angelspetrochem/settings.lua index 398d2a1b1..5af99d3e9 100644 --- a/angelspetrochem/settings.lua +++ b/angelspetrochem/settings.lua @@ -42,13 +42,6 @@ data:extend( default_value = true, order = "cb" }, - { - type = "bool-setting", - name = "angels-disable-bobs-distilleries", - setting_type = "startup", - default_value = true, - order = "cc" - }, { type = "bool-setting", name = "angels-show-chemical-formula", diff --git a/angelsrefining/changelog.txt b/angelsrefining/changelog.txt index 6f1de95a8..4d603dfc6 100644 --- a/angelsrefining/changelog.txt +++ b/angelsrefining/changelog.txt @@ -3,9 +3,13 @@ Version: 0.12.2 Date: ?? Changes: - Removed the obsolete ingredient_count limitation on some refining buildings (763) + - Added support for separate techs for barrels, gas bottles, and fluid canisters added by + Bob's Metals, Chemicals and Intermediates mod (769) + - Removed setting for Bob's distilleries. These will now always be disabled (769) + - Hide Bob's salt, brine, and lithium chloride (769) Bugfixes: - Fixed crash when playing with bob enemies and bob equipment without bob artifacts enabled - - Fixed the void item group icon + - Fixed the void item group icon (770) --------------------------------------------------------------------------------------------------- Version: 0.12.1 Date: 19.12.2021 diff --git a/angelsrefining/data-final-fixes.lua b/angelsrefining/data-final-fixes.lua index b5952acb4..43daf044c 100644 --- a/angelsrefining/data-final-fixes.lua +++ b/angelsrefining/data-final-fixes.lua @@ -1,12 +1,11 @@ --- if angelsmods.refining then --- require("prototypes.generation.angels-override") --- end for _, fluid_n in pairs(data.raw.fluid) do if fluid_n.auto_barrel == false then angelsmods.functions.disable_barreling_recipes(fluid_n.name) end end + --MODIFY BARRELING RECIPES +angelsmods.functions.modify_barreling_recipes() angelsmods.functions.create_barreling_fluid_subgroup() require "prototypes.tips-and-tricks.tips-and-tricks" diff --git a/angelsrefining/prototypes/angels-functions.lua b/angelsrefining/prototypes/angels-functions.lua index 87eea983b..51f51889b 100644 --- a/angelsrefining/prototypes/angels-functions.lua +++ b/angelsrefining/prototypes/angels-functions.lua @@ -1488,14 +1488,14 @@ end function angelsmods.functions.modify_barreling_icon() for ix, item in pairs(data.raw.item) do - if item.subgroup == "fill-barrel" then + if item.subgroup and string.sub(item.name, -6, -1) == "barrel" then local icon_name = string.sub(item.name, 1, -8) for kx, fluid in pairs(data.raw.fluid) do if fluid.name == icon_name then if item.icons then local icon_size = fluid.icon_size or 32 if fluid.icon then - table.insert(item.icons, {icon = fluid.icon, icon_size = icon_size, shift = {0, 5}, scale = 16 / icon_size}) + table.insert(item.icons, {icon = fluid.icon, icon_size = icon_size, icon_mipmaps = fluid.icon_mipmaps, shift = {0, 5}, scale = 16 / icon_size}) end if fluid.icons then item.icons = util.combine_icons(item.icons, fluid.icons, {scale = 16 / icon_size, shift = {0, 5}}) @@ -1540,18 +1540,30 @@ function angelsmods.functions.create_barreling_fluid_subgroup(fluids_to_move) end for fn, fd in pairs(fluids_to_move) do - local recipe = recipes[fn] - - local subgroup_name = fd.subgroup or (recipe and recipe.subgroup) or "vanilla" - local subgroup = subgroups[subgroup_name] - local subgroup_order = subgroup and subgroup.order or "z" + local barrel = items[fn .. "-barrel"] - local group = groups[subgroup and subgroup.group or "vanilla"] - local group_order = group and group.order or "z" + if barrel then + local recipe = recipes[fn] + local subgroup_name + if barrel.subgroup ~= "barrel" then + subgroup_name = barrel.subgroup + elseif fd.subgroup then + subgroup_name = fd.subgroup + elseif recipe and recipe.subgroup then + if recipe.subgroup == "fluid-recipes" then + subgroup_name = "vanilla" + else + subgroup_name = recipe.subgroup + end + else + subgroup_name = "vanilla" + end + local subgroup = subgroups[subgroup_name] + local subgroup_order = subgroup and subgroup.order or "z" - local barrel = items[fn .. "-barrel"] + local group = groups[subgroup and subgroup.group or "vanilla"] + local group_order = group and group.order or "z" - if subgroup and barrel then barrel.subgroup = "angels-fluid-control-" .. subgroup_name barrel.order = fd.order or (recipe and recipe.order) or "z" diff --git a/angelsrefining/prototypes/override-functions.lua b/angelsrefining/prototypes/override-functions.lua index 6a4ed2891..405b2c342 100644 --- a/angelsrefining/prototypes/override-functions.lua +++ b/angelsrefining/prototypes/override-functions.lua @@ -202,14 +202,6 @@ local function generate_barrel_icons(fluid, style) {icon = "__base__/graphics/icons/fluid/barreling/barrel-hoop-top-mask.png", icon_size = 64, icon_mipmaps = 4, tint = fluid.flow_color}, } end - if fluid.icon and fluid.icon_size then - table.insert( - f_icon, - {icon = fluid.icon, icon_size = fluid.icon_size, scale = 16.0 / fluid.icon_size, shift = {0, 4}} - ) - elseif fluid.icons and util.combine_icons then - f_icon = util.combine_icons(f_icon, util.table.deepcopy(fluid.icons), {scale = 0.5, shift = {0, 4}}) - end return f_icon end @@ -665,14 +657,6 @@ ov_functions.barrel_overrides = function(fluid, style) --Bottling override funct F_Fill.icons = generate_fill_barrel_icons(fluid_s, style) F_Empty.icons = generate_empty_barrel_icons(fluid_s, style) fluid_i.icons = generate_barrel_icons(fluid_s, style) - if mods["angelspetrochem"] and fluid_s.subgroup then - fluid_i.subgroup = "angels-fluid-control-"..fluid_s.subgroup - fluid_i.order = fluid_s.order or fluid_i.order - F_Fill.subgroup = fluid_i.subgroup - F_Fill.order = fluid_i.order.."-a" - F_Empty.subgroup = fluid_i.subgroup - F_Empty.order = fluid_i.order.."-b" - end --results are generic for filled barrels F_Fill.results = { {type = "item", name = fluid_s.name .. "-barrel", amount = 1} @@ -703,9 +687,9 @@ ov_functions.barrel_overrides = function(fluid, style) --Bottling override funct "item-name.filled-gas-canister", fluid_s.localised_name or {"fluid-name." .. fluid_s.name} } - ov_functions.remove_unlock("fluid-handling", "fill-" .. fluid_s.name .. "-barrel") + ov_functions.remove_unlock("fluid-barrel-processing", "fill-" .. fluid_s.name .. "-barrel") ov_functions.add_unlock("gas-canisters", "fill-" .. fluid_s.name .. "-barrel") - ov_functions.remove_unlock("fluid-handling", "empty-" .. fluid_s.name .. "-barrel") + ov_functions.remove_unlock("fluid-barrel-processing", "empty-" .. fluid_s.name .. "-barrel") ov_functions.add_unlock("gas-canisters", "empty-" .. fluid_s.name .. "-barrel") elseif style == "acid" then -- Liquid Fuel Canisters F_Fill.localised_name = { @@ -728,6 +712,10 @@ ov_functions.barrel_overrides = function(fluid, style) --Bottling override funct "item-name.filled-canister", fluid_s.localised_name or {"fluid-name." .. fluid_s.name} } + ov_functions.remove_unlock("fluid-barrel-processing", "fill-" .. fluid_s.name .. "-barrel") + ov_functions.add_unlock("fluid-canister-processing", "fill-" .. fluid_s.name .. "-barrel") + ov_functions.remove_unlock("fluid-barrel-processing", "empty-" .. fluid_s.name .. "-barrel") + ov_functions.add_unlock("fluid-canister-processing", "empty-" .. fluid_s.name .. "-barrel") else -- Vanilla Barrel F_Fill.localised_name = { "recipe-name.fill-barrel", diff --git a/angelsrefining/prototypes/override/refining-override-bobequipment.lua b/angelsrefining/prototypes/override/refining-override-bobequipment.lua index ad70822b7..e69de29bb 100644 --- a/angelsrefining/prototypes/override/refining-override-bobequipment.lua +++ b/angelsrefining/prototypes/override/refining-override-bobequipment.lua @@ -1,69 +0,0 @@ -local OV = angelsmods.functions.OV - -if mods["bobequipment"] then - ----------------------------------------------------------------------------- - -- ENERGY SHIELD EQUIPMENT -------------------------------------------------- - ----------------------------------------------------------------------------- - OV.set_science_pack("bob-energy-shield-equipment-3", "production-science-pack") - if mods["bobelectronics"] then - else - OV.add_prereq({ - "bob-energy-shield-equipment-3", - }, "production-science-pack") - end - - if mods["bobenemies"] and mods["bobtech"] and - settings.startup["bobmods-enemies-enableartifacts"].value and - settings.startup["bobmods-enemies-enablenewartifacts"].value - then - OV.add_prereq("bob-energy-shield-equipment-4", "alien-research") - else -- not alien technology - OV.set_science_pack({ - "bob-energy-shield-equipment-4", - "bob-energy-shield-equipment-5", - "bob-energy-shield-equipment-6", - }, "production-science-pack") - end - - ----------------------------------------------------------------------------- - -- BATTERY EQUIPMENT -------------------------------------------------------- - ----------------------------------------------------------------------------- - if mods["bobenemies"] and mods["bobtech"] and - settings.startup["bobmods-enemies-enableartifacts"].value and - settings.startup["bobmods-enemies-enablenewartifacts"].value - then - OV.add_prereq("bob-battery-equipment-4", "alien-research") - end - - ----------------------------------------------------------------------------- - -- FUSION REACTOR EQUIPMENT ------------------------------------------------- - ----------------------------------------------------------------------------- - if mods["bobenemies"] and mods["bobtech"] and - settings.startup["bobmods-enemies-enableartifacts"].value and - settings.startup["bobmods-enemies-enablenewartifacts"].value - then - OV.remove_science_pack("fusion-reactor-equipment", "utility-science-pack") - OV.set_science_pack("fusion-reactor-equipment", "production-science-pack") - OV.remove_prereq("fusion-reactor-equipment", "utility-science-pack") - OV.add_prereq("fusion-reactor-equipment", "production-science-pack") - OV.add_prereq("fusion-reactor-equipment-2", "alien-research") - end - - ----------------------------------------------------------------------------- - -- LASER DEFENSE EQUIPMENT -------------------------------------------------- - ----------------------------------------------------------------------------- - OV.add_prereq("personal-laser-defense-equipment-4", "utility-science-pack") - - ----------------------------------------------------------------------------- - -- EXOSKELETON EQUIPMENT ---------------------------------------------------- - ----------------------------------------------------------------------------- - OV.set_science_pack("exoskeleton-equipment", "chemical-science-pack") - if mods["boblogistics"] and (not mods["angelsindustries"]) then - OV.add_prereq("exoskeleton-equipment", "chemical-science-pack") - end - - ----------------------------------------------------------------------------- - -- unknown ------------------------------------------------------------------ - ----------------------------------------------------------------------------- - angelsmods.functions.add_flag("combat-robot-dispenser-equipment", "hidden") -end \ No newline at end of file diff --git a/angelsrefining/prototypes/override/refining-override-boblogistics.lua b/angelsrefining/prototypes/override/refining-override-boblogistics.lua index 0eadf7a80..5e49b0418 100644 --- a/angelsrefining/prototypes/override/refining-override-boblogistics.lua +++ b/angelsrefining/prototypes/override/refining-override-boblogistics.lua @@ -37,7 +37,6 @@ if mods["boblogistics"] then ) end --repair pack techs - OV.set_science_pack("bob-repair-pack-4","chemical-science-pack", 1) OV.patch_recipes( { { @@ -51,5 +50,4 @@ if mods["boblogistics"] then ) OV.add_prereq("bob-repair-pack-3", {mods["bobplates"] and "zinc-processing" or "steel-axe",mods["bobplates"] and "invar-processing" or "steel-processing"}) OV.remove_prereq("bob-repair-pack-3","cobalt-processing") - OV.set_science_pack("bob-repair-pack-5",{"production-science-pack","chemical-science-pack"},1) end \ No newline at end of file diff --git a/angelsrefining/prototypes/override/refining-override-bobmining.lua b/angelsrefining/prototypes/override/refining-override-bobmining.lua index 86c1573d7..38eb104cc 100644 --- a/angelsrefining/prototypes/override/refining-override-bobmining.lua +++ b/angelsrefining/prototypes/override/refining-override-bobmining.lua @@ -4,56 +4,54 @@ local OV = angelsmods.functions.OV -- WATER MINERS --------------------------------------------------------------- ------------------------------------------------------------------------------- if mods["bobmining"] then - angelsmods.functions.add_flag({ + angelsmods.functions.add_flag({ + "water-miner-1", + "water-miner-2", + "water-miner-3", + "water-miner-4", + "water-miner-5" + }, "hidden") + + OV.disable_technology( + { "water-miner-1", "water-miner-2", "water-miner-3", "water-miner-4", "water-miner-5" - }, "hidden") + } + ) - OV.disable_technology( - { - "water-miner-1", - "water-miner-2", - "water-miner-3", - "water-miner-4", - "water-miner-5" - } - ) + OV.hide_recipe( + { + "water-miner-1", + "water-miner-2", + "water-miner-3", + "water-miner-4", + "water-miner-5" + } + ) - OV.hide_recipe( + if mods["bobplates"] then + OV.patch_recipes( { - "water-miner-1", - "water-miner-2", - "water-miner-3", - "water-miner-4", - "water-miner-5" - } - ) - - OV.set_science_pack("bob-area-drills-2","chemical-science-pack",1) - OV.set_science_pack("bob-area-drills-1","logistic-science-pack",1) - if mods["bobplates"] then - OV.patch_recipes( { - { - name = "bob-area-mining-drill-2", - ingredients = { - {name = "cobalt-steel-gear-wheel", amount = "brass-gear-wheel"} - } - }, - { - name = "bob-mining-drill-2", - ingredients = { - {name = "invar-alloy", amount = "cobalt-steel-alloy"} - } + name = "bob-area-mining-drill-2", + ingredients = { + {name = "invar-alloy", amount = "cobalt-steel-alloy"} + } + }, + { + name = "bob-mining-drill-2", + ingredients = { + {name = "invar-alloy", amount = "cobalt-steel-alloy"} } } - ) - OV.add_prereq("bob-drills-2", "invar-processing") - OV.remove_prereq("bob-drills-2","cobalt-processing") - OV.remove_prereq("bob-area-drills-2","zinc-processing") - end + } + ) + OV.add_prereq("bob-drills-2", "invar-processing") + OV.remove_prereq("bob-drills-2", "cobalt-processing") + OV.add_prereq("bob-area-drills-2", "invar-processing") + OV.remove_prereq("bob-area-drills-2", "cobalt-processing") end - \ No newline at end of file +end diff --git a/angelsrefining/prototypes/override/refining-override-bobplates.lua b/angelsrefining/prototypes/override/refining-override-bobplates.lua index 80a074111..963065313 100644 --- a/angelsrefining/prototypes/override/refining-override-bobplates.lua +++ b/angelsrefining/prototypes/override/refining-override-bobplates.lua @@ -205,3 +205,15 @@ if mods["bobplates"] then OV.set_science_pack("cobalt-processing", "chemical-science-pack", 1) OV.add_prereq("cobalt-processing", "ore-leaching") end + +------------------------------------------------------------------------------- +-- DISTILLERIES --------------------------------------------------------------- +------------------------------------------------------------------------------- +if mods["bobplates"] then + -- Distillery 1 + angelsmods.functions.add_flag("bob-distillery", "hidden") + angelsmods.functions.set_next_upgrade("assembling-machine", "bob-distillery", nil) + angelsmods.functions.set_next_upgrade("furnace", "bob-distillery", nil) + OV.global_replace_item("bob-distillery", "chemical-plant") + OV.disable_recipe("bob-distillery") +end diff --git a/angelsrefining/prototypes/override/refining-override-bobpower.lua b/angelsrefining/prototypes/override/refining-override-bobpower.lua index 48c699fa6..fb568096c 100644 --- a/angelsrefining/prototypes/override/refining-override-bobpower.lua +++ b/angelsrefining/prototypes/override/refining-override-bobpower.lua @@ -5,39 +5,6 @@ local move_item = angelsmods.functions.move_item -- ADVANCED POWER ------------------------------------------------------------- ------------------------------------------------------------------------------- if mods["bobpower"] then - if settings.startup["bobmods-power-steam"].value == true then - if angelsmods.functions.is_special_vanilla() then - OV.add_prereq("bob-boiler-3", "logistic-science-pack") - OV.add_prereq("bob-boiler-4", "chemical-science-pack") - OV.add_prereq("bob-boiler-5", "production-science-pack") - OV.add_prereq("bob-oil-boiler-2", "chemical-science-pack") - OV.add_prereq("bob-oil-boiler-3", "production-science-pack") - OV.add_prereq("bob-oil-boiler-4", "utility-science-pack") - OV.add_prereq("bob-steam-engine-3", "chemical-science-pack") - OV.add_prereq("bob-steam-engine-4", "production-science-pack") - OV.add_prereq("bob-steam-engine-5", "utility-science-pack") - OV.add_prereq("bob-heat-pipe-3", "production-science-pack") - end - end - - if settings.startup["bobmods-power-accumulators"].value == true then - if angelsmods.functions.is_special_vanilla() then - OV.add_prereq("bob-electric-energy-accumulators-3", "chemical-science-pack") - OV.add_prereq("bob-electric-energy-accumulators-4", "production-science-pack") - end - end - - if settings.startup["bobmods-power-poles"].value == true then - if angelsmods.functions.is_special_vanilla() then - OV.add_prereq("electric-pole-3", "chemical-science-pack") - else - OV.set_science_pack("electric-pole-4", "production-science-pack") - end - - OV.add_prereq("electric-substation-4", "production-science-pack") - OV.set_science_pack("electric-substation-4", "production-science-pack") - end - if mods["bobplates"] then --update to blue science level OV.set_science_pack("bob-steam-turbine-1","chemical-science-pack",1) @@ -60,6 +27,5 @@ if mods["bobpower"] then } ) OV.remove_prereq({"bob-steam-engine-3","fluid-generator-2"},"cobalt-processing") - --OV.add_prereq({""},"zinc-processing") end end \ No newline at end of file diff --git a/angelsrefining/prototypes/override/refining-override-bobrevamp.lua b/angelsrefining/prototypes/override/refining-override-bobrevamp.lua index c38341f83..debcd9a22 100644 --- a/angelsrefining/prototypes/override/refining-override-bobrevamp.lua +++ b/angelsrefining/prototypes/override/refining-override-bobrevamp.lua @@ -28,23 +28,3 @@ if mods["bobrevamp"] then OV.hide_recipe({"sulfuric-acid","sulfur"}) end end - ---local ammonium = data.raw.recipe["ammonium-chloride-recycling"] ---if ammonium then --- ammonium.icon = nil --- if angelsmods.petrochem then --- ammonium.icons = --- angelsmods.functions.create_solid_recipe_icon( --- {"solid-limestone", "gas-ammonium-chloride"}, --- "solid-calcium-chloride", --- {"gas-ammonia"} --- ) --- else --- ammonium.icons = --- angelsmods.functions.create_solid_recipe_icon( --- {"limestone", "ammonium-chloride"}, --- "calcium-chloride", --- {"ammonia"} --- ) --- end ---end diff --git a/angelsrefining/prototypes/override/refining-override-bobtech.lua b/angelsrefining/prototypes/override/refining-override-bobtech.lua index 7c856eaaf..f2dcd422e 100644 --- a/angelsrefining/prototypes/override/refining-override-bobtech.lua +++ b/angelsrefining/prototypes/override/refining-override-bobtech.lua @@ -7,21 +7,3 @@ if mods["bobtech"] and settings.startup["bobmods-burnerphase"].value then OV.add_prereq("ore-crushing", "automation-science-pack") OV.add_prereq("ore-crushing", "electricity") end - -------------------------------------------------------------------------------- --- ALIEN SCIENCE PACKS -------------------------------------------------------- -------------------------------------------------------------------------------- -if mods["bobenemies"] and mods["bobtech"] then - -- alien science packs are in use - OV.set_science_pack("alien-research", "production-science-pack", 1) - OV.add_prereq("alien-research", "production-science-pack") - - -- regular packs depending on alien science - if mods["bobwarfare"] then - OV.add_prereq({ - "bob-explosive-artillery-shells", - "bob-poison-artillery-shells", - "bob-fire-artillery-shells", - }, "production-science-pack") - end -end \ No newline at end of file diff --git a/angelsrefining/prototypes/override/refining-override-bobvehicleequipment.lua b/angelsrefining/prototypes/override/refining-override-bobvehicleequipment.lua index a25c4599b..e69de29bb 100644 --- a/angelsrefining/prototypes/override/refining-override-bobvehicleequipment.lua +++ b/angelsrefining/prototypes/override/refining-override-bobvehicleequipment.lua @@ -1,68 +0,0 @@ -local OV = angelsmods.functions.OV - -if mods["bobvehicleequipment"] then - ----------------------------------------------------------------------------- - -- ENERGY SHIELD EQUIPMENT -------------------------------------------------- - ----------------------------------------------------------------------------- - OV.set_science_pack("vehicle-energy-shield-equipment-3", "production-science-pack") - if mods["bobelectronics"] then - else - OV.add_prereq("vehicle-energy-shield-equipment-3", "production-science-pack") - end - - if mods["bobenemies"] and mods["bobtech"] then - else -- not alien technology - OV.set_science_pack({ - "vehicle-energy-shield-equipment-4", - "vehicle-energy-shield-equipment-5", - "vehicle-energy-shield-equipment-6", - }, "production-science-pack") - end - - ----------------------------------------------------------------------------- - -- ROBOPORT EQUIPMENT ------------------------------------------------------- - ----------------------------------------------------------------------------- - if mods["bobtech"] then - OV.remove_prereq("vehicle-roboport-equipment-2", "advanced-logistic-science-pack") - OV.add_prereq("vehicle-roboport-equipment-2", "chemical-science-pack") - OV.add_prereq("vehicle-roboport-equipment-3", "advanced-logistic-science-pack") - end - - ----------------------------------------------------------------------------- - -- LASER DEFENSE EQUIPMENT -------------------------------------------------- - ----------------------------------------------------------------------------- - OV.add_prereq("vehicle-laser-defense-equipment-1", "chemical-science-pack") - OV.add_prereq("vehicle-laser-defense-equipment-5", "production-science-pack") - if mods["bobplates"] or mods["bobelectronics"] then - OV.set_science_pack("vehicle-laser-defense-equipment-5", "production-science-pack") - OV.set_science_pack("vehicle-laser-defense-equipment-6", "production-science-pack") - end - OV.add_prereq("vehicle-laser-defense-equipment-6", "utility-science-pack") - - ----------------------------------------------------------------------------- - -- PLASMA CANNON EQUIPMENT -------------------------------------------------- - ----------------------------------------------------------------------------- - OV.remove_science_pack("vehicle-big-turret-equipment-3", "utility-science-pack") - OV.remove_prereq("vehicle-big-turret-equipment-3", "utility-science-pack") - if mods["bobenemies"] and mods["bobtech"] then - else - OV.add_prereq("vehicle-big-turret-equipment-4", "utility-science-pack") - end - - ----------------------------------------------------------------------------- - -- FUSION CELL EQUIPMENT ---------------------------------------------------- - ----------------------------------------------------------------------------- - if mods["bobenemies"] and mods["bobtech"] then - OV.remove_science_pack("vehicle-fusion-cell-equipment-3", "utility-science-pack") - OV.remove_prereq("vehicle-fusion-cell-equipment-3", "utility-science-pack") - end - - ----------------------------------------------------------------------------- - -- FUSION REACTOR EQUIPMENT ------------------------------------------------- - ----------------------------------------------------------------------------- - if mods["bobenemies"] and mods["bobtech"] then - OV.remove_science_pack("vehicle-fusion-reactor-equipment-3", "utility-science-pack") - OV.remove_prereq("vehicle-fusion-reactor-equipment-3", "utility-science-pack") - end - -end \ No newline at end of file diff --git a/angelsrefining/prototypes/override/refining-override-bobwarfare.lua b/angelsrefining/prototypes/override/refining-override-bobwarfare.lua index 63142ca14..b24038f0f 100644 --- a/angelsrefining/prototypes/override/refining-override-bobwarfare.lua +++ b/angelsrefining/prototypes/override/refining-override-bobwarfare.lua @@ -78,18 +78,4 @@ if mods["bobwarfare"] then OV.add_prereq("bob-armor-making-3","logistic-science-pack") OV.add_prereq("bob-armor-making-4","chemical-science-pack") end - - if mods["bobenemies"] and mods["bobtech"] and - settings.startup["bobmods-enemies-enableartifacts"].value and - settings.startup["bobmods-enemies-enablenewartifacts"].value - then - OV.remove_science_pack("bob-power-armor-2", "utility-science-pack") - OV.set_science_pack("bob-power-armor-2", "production-science-pack") - OV.remove_prereq("bob-power-armor-2", "utility-science-pack") - OV.add_prereq("bob-power-armor-2", "production-science-pack") - OV.add_prereq("bob-power-armor-2", "low-density-structure") - OV.add_prereq("bob-power-armor-2", "electric-engine") - OV.add_prereq("bob-power-armor-2", "advanced-electronics-2") - OV.add_prereq("bob-power-armor-3", "alien-research") - end end \ No newline at end of file diff --git a/angelsrefining/prototypes/override/refining-override-water-treatment.lua b/angelsrefining/prototypes/override/refining-override-water-treatment.lua index 543709e14..b51ff80cc 100644 --- a/angelsrefining/prototypes/override/refining-override-water-treatment.lua +++ b/angelsrefining/prototypes/override/refining-override-water-treatment.lua @@ -107,7 +107,7 @@ if mods["bobplates"] then angelsmods.functions.add_flag("salt", "hidden") if not angelsmods.petrochem then - OV.disable_recipe({"solid-salt-from-saline", "solid-salt"}) + OV.global_replace_item("salt", "solid-salt") data:extend( { @@ -205,6 +205,10 @@ if mods["bobplates"] then angelsmods.functions.disable_barreling_recipes("pure-water") end + -- lithium processing ------------------------------------------------------- + OV.global_replace_item("lithium-chloride", "solid-lithium") + angelsmods.functions.add_flag("lithium-chloride", "hidden") + --Insert water resources to bob recipes (NEED A WAY TO PATCH A SPECIFIC TINT) OV.patch_recipes( { @@ -223,7 +227,7 @@ if mods["bobplates"] then } ) else - if (angelsmods.smelting and angelsmods.trigger.smelting_products["lithium"].plate or mods["bobplates"]) or + if (angelsmods.smelting and angelsmods.trigger.smelting_products["lithium"].plate) or (angelsmods.industries and angelsmods.industries.overhaul) then else angelsmods.functions.add_flag("solid-lithium", "hidden") diff --git a/angelsrefining/prototypes/refining-generate.lua b/angelsrefining/prototypes/refining-generate.lua index 7095bb2cb..15056cec4 100644 --- a/angelsrefining/prototypes/refining-generate.lua +++ b/angelsrefining/prototypes/refining-generate.lua @@ -31,22 +31,17 @@ if angelsmods.refining then if bobmods and bobmods.plates then angelsmods.functions.make_void("lithia-water", "water") + else + --ADD THE BARRELING PUMP + angelsmods.functions.OV.add_unlock("fluid-handling", "barreling-pump") end - --ADD THE BARRELING PUMP - angelsmods.functions.OV.add_unlock("fluid-handling", "barreling-pump") - --MOVE EMPTY BARREL data.raw["item-subgroup"]["fill-barrel"].group = "angels-fluid-control" data.raw["item-subgroup"]["empty-barrel"].group = "angels-fluid-control" angelsmods.functions.move_item("empty-barrel", "angels-fluid-control", "h") angelsmods.functions.move_item("empty-barrel", "angels-fluid-control", "h", "recipe") - --angelsmods.functions.OV.set_special_recipe_override("empty-barrel", { subgroup = "angels-fluid-control", order = "h" }) --MOVE STORAGE TANK angelsmods.functions.move_item("storage-tank", "angels-fluid-tanks", "b[medium-tank]-a[mk1]-a[regular]") - --angelsmods.functions.OV.set_special_recipe_override("storage-tank", { subgroup = "angels-fluid-tanks", order = "a" }) - - --MODIFY BARRELING RECIPES - angelsmods.functions.modify_barreling_recipes() end \ No newline at end of file diff --git a/angelsrefining/prototypes/refining-override.lua b/angelsrefining/prototypes/refining-override.lua index 783b247f8..481e0bd34 100644 --- a/angelsrefining/prototypes/refining-override.lua +++ b/angelsrefining/prototypes/refining-override.lua @@ -43,6 +43,9 @@ require("prototypes.override.refining-override-bobvehicleequipment") if mods["bobplates"] then --revamp override if mods["bobrevamp"] and settings.startup["bobmods-revamp-hardmode"].value then + angelsmods.functions.disable_barreling_recipes("brine") + angelsmods.functions.add_flag("brine", "hidden") + OV.disable_recipe({"brine-electrolysis"}) -- equivalent of angels recipe "water-saline-seperation" OV.global_replace_item("brine", "water-saline") OV.disable_recipe("brine") end @@ -52,8 +55,11 @@ if mods["bobplates"] then data.raw.item["empty-canister"].order = "i" data.raw.item["gas-canister"].subgroup = "angels-fluid-control" data.raw.item["gas-canister"].order = "j" - data.raw.technology["gas-canisters"].prerequisites = {"fluid-handling"} + data.raw.technology["gas-canisters"].prerequisites = {"fluid-canister-processing"} data.raw.technology["gas-canisters"].enabled = true + OV.remove_prereq("fluid-canister-processing", "water-bore-1") + OV.add_prereq("fluid-canister-processing", "fluid-barrel-processing") + OV.remove_prereq("fluid-barrel-processing", "water-bore-1") OV.patch_recipes( { { @@ -75,6 +81,8 @@ if mods["bobplates"] then } ) end + OV.remove_unlock("fluid-handling", "barreling-pump") + OV.add_unlock("fluid-barrel-processing", "barreling-pump") end --General barrelling fix for _, fluid_n in pairs(data.raw.fluid) do @@ -93,6 +101,7 @@ for _, fluid_n in pairs(data.raw.fluid) do }, } ) + if mods["bobplates"] then if string.sub(fluid_n.name, 1, 3) == "gas" then OV.barrel_overrides(fluid_n.name, "gas") diff --git a/angelsrefining/settings-updates.lua b/angelsrefining/settings-updates.lua index 5e4683dae..e11c86ab3 100644 --- a/angelsrefining/settings-updates.lua +++ b/angelsrefining/settings-updates.lua @@ -52,6 +52,7 @@ end if mods["bobassembly"] then angelsmods.settings.hide_setting("bool-setting", "bobmods-assembly-limits", false) + angelsmods.settings.hide_setting("bool-setting", "bobmods-assembly-distilleries", false) end if mods["boblogistics"] then diff --git a/angelssmelting/changelog.txt b/angelssmelting/changelog.txt index eac677af1..9fc5bb7c7 100644 --- a/angelssmelting/changelog.txt +++ b/angelssmelting/changelog.txt @@ -3,6 +3,7 @@ Version: 0.6.19 Date: ??? Changes: - Removed the obsolete ingredient_count limitation on all smelting buildings (763) + - Disabled Ammonium chloride gas when platinum is disabled (769) - Added build and mining sounds to concrete brick tiles (776) --------------------------------------------------------------------------------------------------- Version: 0.6.18 diff --git a/angelssmelting/prototypes/override/smelting-override-platinum.lua b/angelssmelting/prototypes/override/smelting-override-platinum.lua index 9bbfbd545..719eab52f 100644 --- a/angelssmelting/prototypes/override/smelting-override-platinum.lua +++ b/angelssmelting/prototypes/override/smelting-override-platinum.lua @@ -39,8 +39,9 @@ else angelsmods.functions.add_flag("solid-ammonium-chloroplatinate", "hidden") angelsmods.functions.add_flag("ingot-platinum", "hidden") angelsmods.functions.add_flag("liquid-molten-platinum", "hidden") + angelsmods.functions.add_flag("gas-ammonium-chloride", "hidden") OV.disable_recipe({"platinum-ore-processing", "platinum-processed-processing"}) - OV.disable_recipe({"pellet-platinum-smelting", "liquid-hexachloroplatinic-acid-smelting"}) + OV.disable_recipe({"pellet-platinum-smelting", "liquid-hexachloroplatinic-acid-smelting", "gas-ammonium-chloride"}) OV.disable_recipe({"platinum-ore-smelting", "processed-platinum-smelting", "solid-ammonium-chloroplatinate-smelting"}) OV.disable_recipe({"molten-platinum-smelting"}) OV.disable_technology({"angels-platinum-smelting-1", "angels-platinum-smelting-2", "angels-platinum-smelting-3"}) From 20bffdc56f642b5875f88286fe41dad7dfb6b3de Mon Sep 17 00:00:00 2001 From: lovely_santa Date: Sat, 4 Jun 2022 23:41:58 +0200 Subject: [PATCH 33/42] Fixed centrifuges did not have a fluid inbox to craft the advanced deuterium reprocessing recipe (#759) --- angelsindustries/changelog.txt | 3 + .../prototypes/angels-industries-category.lua | 9 +++ .../prototypes/buildings/centrifuge.lua | 74 +++++++++++++++++++ .../overrides/global-tech-bobs-cores.lua | 5 ++ .../overrides/overhaul-nuclear-power.lua | 17 ++++- .../recipes/overhaul-nuclear-power.lua | 24 +++--- angelsindustries/settings-updates.lua | 3 + 7 files changed, 122 insertions(+), 13 deletions(-) diff --git a/angelsindustries/changelog.txt b/angelsindustries/changelog.txt index 84351b5f9..97be5f583 100644 --- a/angelsindustries/changelog.txt +++ b/angelsindustries/changelog.txt @@ -4,9 +4,12 @@ Date: xx.xx.202x Changes: - Added support for separate techs for barrels, gas bottles, and fluid canisters added by Bob's Metals, Chemicals and Intermediates mod (769) + - Added tiered centrifuge requirements for all nuclear fuel recipes Bugfixes: - Regular mode: - Fixed centrifuges did not have their customizable lights enabled as intended (772) + - Fixed centrifuges did not have a fluid inbox to craft the advanced deuterium reprocessing + recipe (759) - Component mode: - Fixed bobs personal roboport mk2 depended on battery 5 (761) - Science mode: diff --git a/angelsindustries/prototypes/angels-industries-category.lua b/angelsindustries/prototypes/angels-industries-category.lua index 476a9e473..4ff75a282 100644 --- a/angelsindustries/prototypes/angels-industries-category.lua +++ b/angelsindustries/prototypes/angels-industries-category.lua @@ -5,6 +5,15 @@ data:extend( type = "recipe-category", name = "bob-logistics" }, + -- centrifuging category part of base game + { + type = "recipe-category", + name = "centrifuging-2" + }, + { + type = "recipe-category", + name = "centrifuging-3" + }, --EQUIPMENT CATEGORY { type = "equipment-category", diff --git a/angelsindustries/prototypes/buildings/centrifuge.lua b/angelsindustries/prototypes/buildings/centrifuge.lua index e821f488b..201162a7c 100644 --- a/angelsindustries/prototypes/buildings/centrifuge.lua +++ b/angelsindustries/prototypes/buildings/centrifuge.lua @@ -257,3 +257,77 @@ for _,centrifuge_name in pairs{ } end end + +-- add pipe input to the centrifuge +for _,centrifuge_name in pairs{ + "centrifuge", + "centrifuge-2", + "centrifuge-3", +} do + local centrifuge = data.raw["assembling-machine"][centrifuge_name] + if centrifuge then + + local has_fluid_input_box = false + local has_fluid_output_box = false + if centrifuge.fluid_boxes then + for fluid_box_prototype in pairs(centrifuge.fluid_boxes) do + if fluid_box_prototype.production_type == "input" and fluid_box_prototype.filter == nil then + has_fluid_input_box = true + end + if fluid_box_prototype.production_type == "output" and fluid_box_prototype.filter == nil then + has_fluid_output_box = true + end + end + else + centrifuge.fluid_boxes = {} + end + + if has_fluid_input_box then + else + table.insert(centrifuge.fluid_boxes, { + production_type = "input", + pipe_covers = pipecoverspictures(), + base_area = 10, + base_level = -1, + pipe_connections = {{type = "input", position = {0, -2}}} -- assume 3x3 entity collision box + }) + end + + if has_fluid_output_box then + else + table.insert(centrifuge.fluid_boxes, { + production_type = "output", + pipe_covers = pipecoverspictures(), + base_area = 10, + base_level = 1, + pipe_connections = {{type = "input", position = {0, 2}}} -- assume 3x3 entity collision box + }) + end + + end +end + +-- add tiered crafting categories +local bob_centrifuge_2 = mods["bobsassembly"] and data.raw["assembling-machine"]["centrifuge-2"] and true or false +local bob_centrifuge_3 = bob_centrifuge_2 and data.raw["assembling-machine"]["centrifuge-3"] and true or false +for centrifuge_name,centrifuge_categegories in pairs{ + ["centrifuge"] = bob_centrifuge_2 and {"centrifuging"} or {"centrifuging", "centrifuging-2", "centrifuging-3"}, + ["centrifuge-2"] = bob_centrifuge_3 and {"centrifuging", "centrifuging-2"} or {"centrifuging", "centrifuging-2", "centrifuging-3"}, + ["centrifuge-3"] = {"centrifuging", "centrifuging-2", "centrifuging-3"}, +} do + local centrifuge = data.raw["assembling-machine"][centrifuge_name] + if centrifuge then + for _,centrifuge_category in pairs(centrifuge_categegories) do + local centrifuge_category_present = false + for category in pairs(centrifuge.crafting_categories) do + if category == centrifuge_category then + centrifuge_category_present = true + end + end + if centrifuge_category_present then + else + table.insert(centrifuge.crafting_categories, centrifuge_category) + end + end + end +end diff --git a/angelsindustries/prototypes/overrides/global-tech-bobs-cores.lua b/angelsindustries/prototypes/overrides/global-tech-bobs-cores.lua index 961761344..f687fbdbd 100644 --- a/angelsindustries/prototypes/overrides/global-tech-bobs-cores.lua +++ b/angelsindustries/prototypes/overrides/global-tech-bobs-cores.lua @@ -69,6 +69,11 @@ if angelsmods.industries.tech then AI.core_replace("bob-distillery-2", "basic", "processing") AI.core_replace("bob-distillery-3", "basic", "processing") end + -- centrifuge + if settings.startup["bobmods-assembly-centrifuge"].value then + AI.core_replace("centrifuge-2", "processing", "energy") + AI.core_replace("centrifuge-3", "processing", "energy") + end end ------------------------------------------------------------------------------- diff --git a/angelsindustries/prototypes/overrides/overhaul-nuclear-power.lua b/angelsindustries/prototypes/overrides/overhaul-nuclear-power.lua index ffcf8ab4d..815a13282 100644 --- a/angelsindustries/prototypes/overrides/overhaul-nuclear-power.lua +++ b/angelsindustries/prototypes/overrides/overhaul-nuclear-power.lua @@ -137,6 +137,15 @@ if angelsmods.industries.overhaul then ------------------------------------------------------------------------------- -- Bob nuclear addaption ------------------------------------------------------------------------------- + if mods["bobassembly"] and data.raw["assembling-machine"]["centrifuge-2"] then + OV.add_prereq("angels-plutonium-power", "centrifuge-2") + else + OV.add_prereq("angels-plutonium-power", "production-science-pack") + end + if mods["bobassembly"] and data.raw["assembling-machine"]["centrifuge-3"] then + OV.remove_prereq("angels-thorium-power", "utility-science-pack") + OV.add_prereq("angels-thorium-power", "centrifuge-3") + end if mods["bobplates"] then --basically remove all of bobs things (Sorry bob) OV.global_replace_item("plutonium-240", "plutonium-239") --use bobs plutonium @@ -154,10 +163,17 @@ if angelsmods.industries.overhaul then OV.disable_recipe("empty-nuclear-fuel-cell") angelsmods.functions.add_flag({"plutonium-240","empty-nuclear-fuel-cell"}, "hidden") + if data.raw.recipe["plutonium-nucleosynthesis"] then + data.raw.recipe["plutonium-nucleosynthesis"].category = "centrifuging-2" + end + -- plutonium enrichment process if mods["bobrevamp"] and settings.startup["bobmods-revamp-rtg"].value then OV.add_prereq("bobingabout-enrichment-process", "angels-plutonium-power") OV.patch_recipes({{name = "bobingabout-enrichment-process", subgroup = "angels-power-nuclear-processing", order="b[AMOX]-c[duplication]"}}) + if data.raw.recipe["bobingabout-enrichment-process"] then + data.raw.recipe["bobingabout-enrichment-process"].category = "centrifuging-2" + end else --if not rtg, remove bobingabout process OV.remove_unlock("bobingabout-enrichment-process", "bobingabout-enrichment-process") @@ -165,7 +181,6 @@ if angelsmods.industries.overhaul then OV.global_replace_technology("bobingabout-enrichment-process", "angels-plutonium-power") OV.disable_technology("bobingabout-enrichment-process") end - OV.add_prereq("angels-plutonium-power", "production-science-pack") angelsmods.functions.add_flag("plutonium-fuel-cell", "hidden") angelsmods.functions.add_flag("plutonium-fuel-cell", "hide-from-fuel-tooltip") diff --git a/angelsindustries/prototypes/recipes/overhaul-nuclear-power.lua b/angelsindustries/prototypes/recipes/overhaul-nuclear-power.lua index e415dbb1f..aa83e1371 100644 --- a/angelsindustries/prototypes/recipes/overhaul-nuclear-power.lua +++ b/angelsindustries/prototypes/recipes/overhaul-nuclear-power.lua @@ -18,7 +18,7 @@ data:extend( name = "angels-plutonium-synthesis", localised_name = {"recipe-name.angels-plutonium-synthesis"}, enabled = false, - category = "centrifuging", + category = "centrifuging-2", subgroup = "angels-power-nuclear-processing", energy_required = 120,--180 ingredients = @@ -74,7 +74,7 @@ data:extend( type = "recipe", name = "angels-americium-regeneration", enabled = false, - category = "centrifuging", + category = "centrifuging-2", subgroup = "angels-power-nuclear-processing", energy_required = 210,--540 ingredients = @@ -132,7 +132,7 @@ data:extend( type = "recipe", name = "angels-thorium-processing", enabled = false, - category = "centrifuging", + category = "centrifuging-3", subgroup = "angels-power-nuclear-processing", energy_required = 20, ingredients = @@ -285,7 +285,7 @@ data:extend( type = "recipe", name = "angels-mixed-oxide-cell", enabled = false, - category = "centrifuging", + category = "centrifuging-2", subgroup = "angels-power-nuclear-fuel-cell", energy_required = 80,--1200 ingredients = @@ -315,7 +315,7 @@ data:extend( type = "recipe", name = "angels-mixed-oxide-reprocessing", enabled = false, - category = "centrifuging", + category = "centrifuging-2", subgroup = "angels-power-nuclear-fuel-cell", energy_required = 110,--330 ingredients = @@ -438,7 +438,7 @@ data:extend( type = "recipe", name = "angels-thorium-fuel-cell", enabled = false, - category = "centrifuging", + category = "centrifuging-3", subgroup = "angels-power-nuclear-fuel-cell", energy_required = 500,--1000 ingredients = @@ -469,7 +469,7 @@ data:extend( type = "recipe", name = "angels-thorium-fuel-cell-2", enabled = false, - category = "centrifuging", + category = "centrifuging-3", subgroup = "angels-power-nuclear-fuel-cell", energy_required = 900, ingredients = @@ -500,7 +500,7 @@ data:extend( type = "recipe", name = "angels-thorium-fuel-cell-reprocessing", enabled = false, - category = "centrifuging", + category = "centrifuging-3", subgroup = "angels-power-nuclear-fuel-cell", energy_required = 400, --450 ingredients = @@ -659,7 +659,7 @@ data:extend( type = "recipe", name = "angels-deuterium-fuel-cell-reprocessing", enabled = false, - category = "centrifuging", + category = "centrifuging-3", subgroup = "angels-power-nuclear-fuel-cell", energy_required = 800, --6000 ingredients = @@ -715,7 +715,7 @@ data:extend( type = "recipe", name = "angels-advanced-deuterium-fuel-cell-reprocessing", enabled = false, - category = "centrifuging", + category = "centrifuging-3", subgroup = "angels-power-nuclear-fuel-cell", energy_required = 800, --6000 ingredients = @@ -785,7 +785,7 @@ data:extend( name = "angels-nuclear-fuel", energy_required = 90, enabled = false, - category = "centrifuging", + category = "centrifuging-2", ingredients ={ {type = "item", name = "plutonium-240", amount = 1}, {type = "item", name = "rocket-fuel", amount = 1} @@ -802,7 +802,7 @@ data:extend( name = "angels-nuclear-fuel-2", energy_required = 90, enabled = false, - category = "centrifuging", + category = "centrifuging-3", ingredients ={ {type = "item", name = "plutonium-240", amount = 2}, {type = "item", name = "rocket-fuel", amount = 3}, diff --git a/angelsindustries/settings-updates.lua b/angelsindustries/settings-updates.lua index b85640398..595317f9c 100644 --- a/angelsindustries/settings-updates.lua +++ b/angelsindustries/settings-updates.lua @@ -1,3 +1,6 @@ if mods["bobplates"] then data.raw["bool-setting"]["angels-enable-industries"].default_value = true end +if mods["bobassembly"] then + angelsmods.settings.hide_setting("bool-setting", "bobmods-assembly-centrifuge", true) +end From e8ba997294a05f9d402ee86fbb4555b4354efb25 Mon Sep 17 00:00:00 2001 From: maxreader <60635199+maxreader@users.noreply.github.com> Date: Sun, 5 Jun 2022 05:43:02 -0500 Subject: [PATCH 34/42] Steel smelting tier adjustments (#779, #780) Co-authored-by: lovely_santa --- .../prototypes/overrides/components-block-update.lua | 9 --------- .../prototypes/overrides/global-tech-base-packs.lua | 2 ++ .../technology/components-construction-technology.lua | 3 ++- .../technology/components-mechanical-technology.lua | 5 +++-- .../override/smelting-override-alloy-steel.lua | 2 ++ .../prototypes/technology/smelting-alloy-steel.lua | 8 +------- .../prototypes/technology/smelting-support.lua | 2 +- 7 files changed, 11 insertions(+), 20 deletions(-) diff --git a/angelsindustries/prototypes/overrides/components-block-update.lua b/angelsindustries/prototypes/overrides/components-block-update.lua index 5a419666b..74ef78179 100644 --- a/angelsindustries/prototypes/overrides/components-block-update.lua +++ b/angelsindustries/prototypes/overrides/components-block-update.lua @@ -23,15 +23,6 @@ if angelsmods.industries.components then OV.remove_prereq("angels-components-mechanical-2", "angels-stone-smelting-2") OV.add_prereq("angels-components-mechanical-2", "angels-stone-smelting-1") - -- move steel smelting 1 from green to red science - OV.remove_science_pack("angels-steel-smelting-1", "logistic-science-pack") - OV.remove_prereq("angels-steel-smelting-1", "angels-metallurgy-2") - OV.add_prereq("angels-steel-smelting-1", "angels-metallurgy-1") - -- update depending technologies accordingly - if angelsmods.trigger.smelting_products["invar"].plate and mods["bobplates"] then - OV.add_prereq("angels-invar-smelting-1", "logistic-science-pack") - end - ----------------------------------------------------------------------------- -- ADD ELECTRONIC RECIPES TO ELECTRONIC ASSMBLY ----------------------------- ----------------------------------------------------------------------------- diff --git a/angelsindustries/prototypes/overrides/global-tech-base-packs.lua b/angelsindustries/prototypes/overrides/global-tech-base-packs.lua index 9284855c9..1edb4ddef 100644 --- a/angelsindustries/prototypes/overrides/global-tech-base-packs.lua +++ b/angelsindustries/prototypes/overrides/global-tech-base-packs.lua @@ -46,6 +46,8 @@ if angelsmods.industries.tech then AI.pack_replace("armor-making-2", "green", "red") --move armour making down a tier AI.pack_replace("automation-2", "green", "red") OV.remove_prereq("automation-2", "tech-green-packs") + -- SMELTING + OV.add_prereq("angels-metallurgy-1","tech-specialised-labs-basic-processing-1") -- BIO PROCESSING AI.pack_count_update("bio-temperate-farming", "angels-science-pack-red", 4) AI.pack_replace("bio-fermentation", "green", "red") diff --git a/angelsindustries/prototypes/technology/components-construction-technology.lua b/angelsindustries/prototypes/technology/components-construction-technology.lua index c3287e19f..1b6840ea4 100644 --- a/angelsindustries/prototypes/technology/components-construction-technology.lua +++ b/angelsindustries/prototypes/technology/components-construction-technology.lua @@ -11,7 +11,8 @@ if angelsmods.industries.components then icon = "__angelsindustries__/graphics/technology/steel-components.png", icon_size = 128, prerequisites = { - "angels-steel-smelting-1" + "steel-processing", + "angels-iron-smelting-1" }, effects = { { diff --git a/angelsindustries/prototypes/technology/components-mechanical-technology.lua b/angelsindustries/prototypes/technology/components-mechanical-technology.lua index 6303969ed..5c6699dd6 100644 --- a/angelsindustries/prototypes/technology/components-mechanical-technology.lua +++ b/angelsindustries/prototypes/technology/components-mechanical-technology.lua @@ -68,8 +68,9 @@ if angelsmods.industries.components then prerequisites = { "angels-components-mechanical-1", "angels-stone-smelting-2", - "angels-steel-smelting-1", - "logistic-science-pack" + "logistic-science-pack", + "steel-processing", + "angels-iron-smelting-1" }, effects = { { diff --git a/angelssmelting/prototypes/override/smelting-override-alloy-steel.lua b/angelssmelting/prototypes/override/smelting-override-alloy-steel.lua index 33238c02b..59e6c8cc3 100644 --- a/angelssmelting/prototypes/override/smelting-override-alloy-steel.lua +++ b/angelssmelting/prototypes/override/smelting-override-alloy-steel.lua @@ -100,6 +100,7 @@ if angelsmods.trigger.smelting_products["steel"].plate then ) OV.add_unlock("steel-processing", "angels-plate-steel-pre-heating") OV.add_prereq("steel-processing", "automation") + OV.add_prereq("steel-processing", "angels-metallurgy-1") OV.global_replace_item("angels-plate-steel", "steel-plate") angelsmods.functions.add_flag("angels-plate-steel", "hidden") angelsmods.functions.move_item("steel-plate", "angels-steel-casting", "l") @@ -138,6 +139,7 @@ end -- ROD ------------------------------------------------------------------------ ------------------------------------------------------------------------------- if angelsmods.trigger.smelting_products["steel"].rod then + OV.add_unlock("steel-processing", "angels-rod-steel-plate") else angelsmods.functions.add_flag("angels-rod-stack-steel", "hidden") angelsmods.functions.add_flag("angels-rod-steel", "hidden") diff --git a/angelssmelting/prototypes/technology/smelting-alloy-steel.lua b/angelssmelting/prototypes/technology/smelting-alloy-steel.lua index 20ce2e365..c81f5eeb5 100644 --- a/angelssmelting/prototypes/technology/smelting-alloy-steel.lua +++ b/angelssmelting/prototypes/technology/smelting-alloy-steel.lua @@ -7,9 +7,7 @@ data:extend( icon_size = 256, icon_mipmaps = 4, prerequisites = { "angels-metallurgy-2", - "angels-iron-smelting-1", - "steel-processing", - "basic-chemistry" + "basic-chemistry-3" }, effects = { { @@ -23,10 +21,6 @@ data:extend( { type = "unlock-recipe", recipe = "angels-plate-steel" - }, - { - type = "unlock-recipe", - recipe = "angels-rod-steel-plate" } }, unit = { diff --git a/angelssmelting/prototypes/technology/smelting-support.lua b/angelssmelting/prototypes/technology/smelting-support.lua index 0086151dd..3ab6660e8 100644 --- a/angelssmelting/prototypes/technology/smelting-support.lua +++ b/angelssmelting/prototypes/technology/smelting-support.lua @@ -10,7 +10,7 @@ data:extend( icon_size = 256, icon_mipmaps = 2, prerequisites = { - "steel-processing" + "automation" }, effects = { { From d1e0f705f3dd9f0d7cb3db0fd42db90f042845af Mon Sep 17 00:00:00 2001 From: lovely_santa Date: Sun, 5 Jun 2022 12:50:03 +0200 Subject: [PATCH 35/42] changelog entry for #779, #780 --- angelssmelting/changelog.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/angelssmelting/changelog.txt b/angelssmelting/changelog.txt index 9fc5bb7c7..24b545129 100644 --- a/angelssmelting/changelog.txt +++ b/angelssmelting/changelog.txt @@ -5,6 +5,7 @@ Date: ??? - Removed the obsolete ingredient_count limitation on all smelting buildings (763) - Disabled Ammonium chloride gas when platinum is disabled (769) - Added build and mining sounds to concrete brick tiles (776) + - Streamlined steel smelting technology (779, 780) --------------------------------------------------------------------------------------------------- Version: 0.6.18 Date: 19.12.2021 From dcd39c7eb301b6010668abf18d2554b4d729e62a Mon Sep 17 00:00:00 2001 From: lovely_santa Date: Sun, 5 Jun 2022 13:54:38 +0200 Subject: [PATCH 36/42] Changed the recipe builder to use more bob items when available (#674) --- angelsrefining/changelog.txt | 4 ++++ .../prototypes/recipe-builder-fallbacks.lua | 13 +++++++++---- .../override/smelting-override-alloy-bronze.lua | 5 ++--- 3 files changed, 15 insertions(+), 7 deletions(-) diff --git a/angelsrefining/changelog.txt b/angelsrefining/changelog.txt index 4d603dfc6..ec79ea4b2 100644 --- a/angelsrefining/changelog.txt +++ b/angelsrefining/changelog.txt @@ -7,6 +7,10 @@ Date: ?? Bob's Metals, Chemicals and Intermediates mod (769) - Removed setting for Bob's distilleries. These will now always be disabled (769) - Hide Bob's salt, brine, and lithium chloride (769) + - Changed the recipe builder to use more bob items when available: + - T1 buildings now attempt to use steel pipes over iron pipes + - T2 buildings now attempt to use bronze plates over steel plates + - T2 buildings now attempt to use bronze pipes over steel pipes Bugfixes: - Fixed crash when playing with bob enemies and bob equipment without bob artifacts enabled - Fixed the void item group icon (770) diff --git a/angelsrefining/prototypes/recipe-builder-fallbacks.lua b/angelsrefining/prototypes/recipe-builder-fallbacks.lua index 07f60767a..fd953ca0c 100644 --- a/angelsrefining/prototypes/recipe-builder-fallbacks.lua +++ b/angelsrefining/prototypes/recipe-builder-fallbacks.lua @@ -6,14 +6,16 @@ angelsmods.functions.RB.set_fallback("item", "t3-circuit", { { "block-electronics-3" }, { "advanced-circuit" }, { "advanced-circuit" } }) angelsmods.functions.RB.set_fallback("item", "t4-circuit", { { "block-electronics-4" }, { "processing-unit" }, { "advanced-circuit" } }) angelsmods.functions.RB.set_fallback("item", "t5-circuit", { { "block-electronics-5" }, { "advanced-processing-unit" }, { "processing-unit" } }) + angelsmods.functions.RB.set_fallback("item", "t6-circuit", { { "block-electronics-5" }, { "advanced-processing-unit" }, { "processing-unit" } }) --PLATES angelsmods.functions.RB.set_fallback("item", "t0-plate", { { "block-construction-1" }, { "iron-plate", 3 } }) angelsmods.functions.RB.set_fallback("item", "t1-plate", { { "block-construction-1" }, { "steel-plate", 3 } }) - angelsmods.functions.RB.set_fallback("item", "t2-plate", { { "block-construction-2" }, { "steel-plate", 5 } }) + angelsmods.functions.RB.set_fallback("item", "t2-plate", { { "block-construction-2" }, { "bronze-alloy", 3, function(t, n) return mods["angelssmelting"] and angelsmods.trigger.smelting_products["bronze"].plate or false end }, { "steel-plate", 5 } }) angelsmods.functions.RB.set_fallback("item", "t3-plate", { { "block-construction-3" }, { "aluminium-plate", 4 }, { "angels-plate-aluminium", 4, function(t, n) return mods["angelssmelting"] and angelsmods.trigger.smelting_products["aluminium"].plate or false end }, { "steel-plate", 7 } }) angelsmods.functions.RB.set_fallback("item", "t4-plate", { { "block-construction-4" }, { "titanium-plate", 4 }, { "angels-plate-titanium", 4, function(t, n) return mods["angelssmelting"] and angelsmods.trigger.smelting_products["titanium"].plate or false end }, { "steel-plate", 9 } }) angelsmods.functions.RB.set_fallback("item", "t5-plate", { { "block-construction-5" }, { "tungsten-plate", 4 }, { "angels-plate-tungsten", 4, function(t, n) return mods["angelssmelting"] and angelsmods.trigger.smelting_products["tungsten"].plate or false end }, { "steel-plate", 11 } }) + angelsmods.functions.RB.set_fallback("item", "t6-plate", { { "block-construction-5" }, { "tungsten-carbide", 4, function(t, n) return mods["angelssmelting"] and angelsmods.trigger.smelting_products["tungsten"].plate or false end }, { "angels-plate-tungsten", 4, function(t, n) return mods["angelssmelting"] and angelsmods.trigger.smelting_products["tungsten"].plate or false end }, { "steel-plate", 13 } }) --BRICK angelsmods.functions.RB.set_fallback("item", "t0-brick", { { "block-construction-1" }, { "stone-brick", 5 } }) @@ -22,6 +24,7 @@ angelsmods.functions.RB.set_fallback("item", "t3-brick", { { "block-construction-3" }, { "concrete-brick", 5 }, { "stone-brick", 5 } }) angelsmods.functions.RB.set_fallback("item", "t4-brick", { { "block-construction-4" }, { "reinforced-concrete-brick", 5 }, { "stone-brick", 5 } }) angelsmods.functions.RB.set_fallback("item", "t5-brick", { { "block-construction-5" }, { "reinforced-concrete-brick", 5 }, { "stone-brick", 5 } }) + angelsmods.functions.RB.set_fallback("item", "t6-brick", { { "block-construction-5" }, { "reinforced-concrete-brick", 5 }, { "stone-brick", 5 } }) --GEARS angelsmods.functions.RB.set_fallback("item", "t0-gears", { { "block-mechanical-1" }, { "iron-gear-wheel", 3 } }) @@ -30,14 +33,16 @@ angelsmods.functions.RB.set_fallback("item", "t3-gears", { { "block-mechanical-2" }, { "brass-gear-wheel", 3 }, { "iron-gear-wheel", 7 } }) angelsmods.functions.RB.set_fallback("item", "t4-gears", { { "block-mechanical-2" }, { "titanium-gear-wheel", 3 }, { "iron-gear-wheel", 8 } }) angelsmods.functions.RB.set_fallback("item", "t5-gears", { { "block-mechanical-2" }, { "tungsten-gear-wheel", 3 }, { "iron-gear-wheel", 9 } }) + angelsmods.functions.RB.set_fallback("item", "t6-gears", { { "block-mechanical-2" }, { "nitinol-gear-wheel", 3 }, { "iron-gear-wheel", 9 } }) --PIPES angelsmods.functions.RB.set_fallback("item", "t0-pipe", { { "block-fluidbox-1" }, { "pipe", 3 } }) - angelsmods.functions.RB.set_fallback("item", "t1-pipe", { { "block-fluidbox-1" }, { "pipe", 3 }, { "pipe", 5 } }) - angelsmods.functions.RB.set_fallback("item", "t2-pipe", { { "block-fluidbox-1" }, { "steel-pipe", 3 }, { "pipe", 6} }) + angelsmods.functions.RB.set_fallback("item", "t1-pipe", { { "block-fluidbox-1" }, { "steel-pipe", 3 }, { "pipe", 5 } }) + angelsmods.functions.RB.set_fallback("item", "t2-pipe", { { "block-fluidbox-1" }, { "bronze-pipe", 3 }, { "pipe", 6} }) angelsmods.functions.RB.set_fallback("item", "t3-pipe", { { "block-fluidbox-2" }, { "brass-pipe", 3 }, { "pipe", 7 } }) angelsmods.functions.RB.set_fallback("item", "t4-pipe", { { "block-fluidbox-2" }, { "titanium-pipe", 3 }, { "pipe", 8 } }) - angelsmods.functions.RB.set_fallback("item", "t5-pipe", { { "block-fluidbox-2" }, { "tungsten-pipe", 3 }, { "pipe", 8 } }) + angelsmods.functions.RB.set_fallback("item", "t5-pipe", { { "block-fluidbox-2" }, { "tungsten-pipe", 3 }, { "pipe", 9 } }) + angelsmods.functions.RB.set_fallback("item", "t6-pipe", { { "block-fluidbox-2" }, { "copper-tungsten-pipe", 3 }, { "pipe", 10 } }) --BIO angelsmods.functions.RB.set_fallback("item", "t1-bio", { { "block-production-1" } }) diff --git a/angelssmelting/prototypes/override/smelting-override-alloy-bronze.lua b/angelssmelting/prototypes/override/smelting-override-alloy-bronze.lua index 58a7de26a..f980cc352 100644 --- a/angelssmelting/prototypes/override/smelting-override-alloy-bronze.lua +++ b/angelssmelting/prototypes/override/smelting-override-alloy-bronze.lua @@ -202,9 +202,8 @@ if angelsmods.trigger.smelting_products["bronze"].plate then OV.disable_recipe({"bronze-alloy"}) angelsmods.functions.allow_productivity("angels-plate-bronze") -- alloys shenanigans ------------------------------------------------------- - if mods["bobplates"] then - OV.add_prereq("alloy-processing","angels-bronze-smelting-1") - end + OV.add_prereq("alloy-processing","angels-bronze-smelting-1") + OV.add_prereq("angels-metallurgy-2", "alloy-processing") if mods["bobpower"] then OV.add_prereq("fluid-generator-1","angels-bronze-smelting-1") end From 8e85ccfe1788f54f0126cb5f0f1ca2134e9c4c9d Mon Sep 17 00:00:00 2001 From: Pezzawinkle <54166225+Pezzawinkle@users.noreply.github.com> Date: Mon, 6 Jun 2022 14:34:26 +1000 Subject: [PATCH 37/42] Fixes Tungstic Acid not using angels icons without smelting --- angelspetrochem/prototypes/override/bobplates.lua | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/angelspetrochem/prototypes/override/bobplates.lua b/angelspetrochem/prototypes/override/bobplates.lua index d3a7dc10b..af52cbae1 100644 --- a/angelspetrochem/prototypes/override/bobplates.lua +++ b/angelspetrochem/prototypes/override/bobplates.lua @@ -126,6 +126,11 @@ if mods["bobplates"] then {"liquid-fuel"}, {{237, 212, 104}, {247, 216, 081}, {247, 216, 081}} ) + --update bobs tungstic acid to use new icon + data.raw.fluid["tungstic-acid"].icons = angelsmods.functions.create_viscous_liquid_fluid_icon(nil, { {235,235,240}, {235,235,240}, {135,090,023,0.75}, {135,090,023,0.75} }) + data.raw.fluid["tungstic-acid"].icon = nil + data.raw.fluid["tungstic-acid"].icon_size = nil + data.raw.fluid["tungstic-acid"].icon_mipmaps = nil OV.patch_recipes( { { @@ -140,6 +145,10 @@ if mods["bobplates"] then }, subgroup = "petrochem-carbon-oil-feed", order = "h" + }, + { + name = "tungstic-acid", + icons = angelsmods.functions.create_liquid_recipe_icon(nil,{{135, 090, 023}, {170, 170, 180}, {170, 170, 180}},{{"__bobplates__/graphics/icons/tungstic-acid.png",32}}) } } ) From 4e801967fc5f897519f14607491bae55b5142a57 Mon Sep 17 00:00:00 2001 From: lovely_santa Date: Mon, 6 Jun 2022 10:37:17 +0200 Subject: [PATCH 38/42] Added release dates --- angelsaddons-storage/changelog.txt | 2 +- angelsbioprocessing/changelog.txt | 2 +- angelsexploration/changelog.txt | 2 +- angelsindustries/changelog.txt | 2 +- angelspetrochem/changelog.txt | 2 +- angelsrefining/changelog.txt | 4 ++-- angelssmelting/changelog.txt | 2 +- 7 files changed, 8 insertions(+), 8 deletions(-) diff --git a/angelsaddons-storage/changelog.txt b/angelsaddons-storage/changelog.txt index 6d40f13e2..55ad7684e 100644 --- a/angelsaddons-storage/changelog.txt +++ b/angelsaddons-storage/changelog.txt @@ -1,6 +1,6 @@ --------------------------------------------------------------------------------------------------- Version: 0.0.9 -Date: ??? +Date: 16.06.2022 Bugfixes: - Fixed technology cost of logistics silos when playing with bobtech - Fixed technology cost of logistics warehouses when playing with bobtech diff --git a/angelsbioprocessing/changelog.txt b/angelsbioprocessing/changelog.txt index 105e92cc0..c71006523 100644 --- a/angelsbioprocessing/changelog.txt +++ b/angelsbioprocessing/changelog.txt @@ -1,6 +1,6 @@ --------------------------------------------------------------------------------------------------- Version: 0.7.22 -Date: ??? +Date: 16.06.2022 Changes: - Moved Garden cultivation recipe unlock to a new technology Garden processing 3 #783 This recipe exists in case gardens of a particular type do not spawn diff --git a/angelsexploration/changelog.txt b/angelsexploration/changelog.txt index 2adc0f0cb..e7da50ce9 100644 --- a/angelsexploration/changelog.txt +++ b/angelsexploration/changelog.txt @@ -1,6 +1,6 @@ --------------------------------------------------------------------------------------------------- Version: 0.3.14 -Date: xx.xx.2021 +Date: 16.06.2022 Bugfixes: - Fixed crash when adding a newer version of this mod to an existing save while other mods are (wrongfully) placing entities while the configuration changes are being executed... diff --git a/angelsindustries/changelog.txt b/angelsindustries/changelog.txt index 97be5f583..2d440c474 100644 --- a/angelsindustries/changelog.txt +++ b/angelsindustries/changelog.txt @@ -1,6 +1,6 @@ --------------------------------------------------------------------------------------------------- Version: 0.4.16 -Date: xx.xx.202x +Date: 16.06.2022 Changes: - Added support for separate techs for barrels, gas bottles, and fluid canisters added by Bob's Metals, Chemicals and Intermediates mod (769) diff --git a/angelspetrochem/changelog.txt b/angelspetrochem/changelog.txt index e77dd9d76..2b77f12ec 100644 --- a/angelspetrochem/changelog.txt +++ b/angelspetrochem/changelog.txt @@ -1,6 +1,6 @@ --------------------------------------------------------------------------------------------------- Version: 0.9.22 -Date: ??? +Date: 16.06.2022 Changes: - Removed excessive logging entries from the log file (743) - Lowered the fuel value of crude to 35% to be more inline with the other fuels diff --git a/angelsrefining/changelog.txt b/angelsrefining/changelog.txt index ec79ea4b2..2e3baba4a 100644 --- a/angelsrefining/changelog.txt +++ b/angelsrefining/changelog.txt @@ -1,13 +1,13 @@ --------------------------------------------------------------------------------------------------- Version: 0.12.2 -Date: ?? +Date: 16.06.2022 Changes: - Removed the obsolete ingredient_count limitation on some refining buildings (763) - Added support for separate techs for barrels, gas bottles, and fluid canisters added by Bob's Metals, Chemicals and Intermediates mod (769) - Removed setting for Bob's distilleries. These will now always be disabled (769) - Hide Bob's salt, brine, and lithium chloride (769) - - Changed the recipe builder to use more bob items when available: + - Changed the recipe builder to use more bob items when available: (674) - T1 buildings now attempt to use steel pipes over iron pipes - T2 buildings now attempt to use bronze plates over steel plates - T2 buildings now attempt to use bronze pipes over steel pipes diff --git a/angelssmelting/changelog.txt b/angelssmelting/changelog.txt index 24b545129..0e96dfe1c 100644 --- a/angelssmelting/changelog.txt +++ b/angelssmelting/changelog.txt @@ -1,6 +1,6 @@ --------------------------------------------------------------------------------------------------- Version: 0.6.19 -Date: ??? +Date: 16.06.2022 Changes: - Removed the obsolete ingredient_count limitation on all smelting buildings (763) - Disabled Ammonium chloride gas when platinum is disabled (769) From 0e393d913c55f883dea52c7e3ff91de8ca688697 Mon Sep 17 00:00:00 2001 From: lovely_santa Date: Mon, 6 Jun 2022 13:15:07 +0200 Subject: [PATCH 39/42] correction of changelog dates --- angelsaddons-storage/changelog.txt | 2 +- angelsbioprocessing/changelog.txt | 2 +- angelsexploration/changelog.txt | 2 +- angelsindustries/changelog.txt | 2 +- angelspetrochem/changelog.txt | 2 +- angelsrefining/changelog.txt | 2 +- angelssmelting/changelog.txt | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) diff --git a/angelsaddons-storage/changelog.txt b/angelsaddons-storage/changelog.txt index 55ad7684e..88e1f8d16 100644 --- a/angelsaddons-storage/changelog.txt +++ b/angelsaddons-storage/changelog.txt @@ -1,6 +1,6 @@ --------------------------------------------------------------------------------------------------- Version: 0.0.9 -Date: 16.06.2022 +Date: 06.06.2022 Bugfixes: - Fixed technology cost of logistics silos when playing with bobtech - Fixed technology cost of logistics warehouses when playing with bobtech diff --git a/angelsbioprocessing/changelog.txt b/angelsbioprocessing/changelog.txt index c71006523..b4df3e0ca 100644 --- a/angelsbioprocessing/changelog.txt +++ b/angelsbioprocessing/changelog.txt @@ -1,6 +1,6 @@ --------------------------------------------------------------------------------------------------- Version: 0.7.22 -Date: 16.06.2022 +Date: 06.06.2022 Changes: - Moved Garden cultivation recipe unlock to a new technology Garden processing 3 #783 This recipe exists in case gardens of a particular type do not spawn diff --git a/angelsexploration/changelog.txt b/angelsexploration/changelog.txt index e7da50ce9..d1c4050d2 100644 --- a/angelsexploration/changelog.txt +++ b/angelsexploration/changelog.txt @@ -1,6 +1,6 @@ --------------------------------------------------------------------------------------------------- Version: 0.3.14 -Date: 16.06.2022 +Date: 06.06.2022 Bugfixes: - Fixed crash when adding a newer version of this mod to an existing save while other mods are (wrongfully) placing entities while the configuration changes are being executed... diff --git a/angelsindustries/changelog.txt b/angelsindustries/changelog.txt index 2d440c474..06b0acbc1 100644 --- a/angelsindustries/changelog.txt +++ b/angelsindustries/changelog.txt @@ -1,6 +1,6 @@ --------------------------------------------------------------------------------------------------- Version: 0.4.16 -Date: 16.06.2022 +Date: 06.06.2022 Changes: - Added support for separate techs for barrels, gas bottles, and fluid canisters added by Bob's Metals, Chemicals and Intermediates mod (769) diff --git a/angelspetrochem/changelog.txt b/angelspetrochem/changelog.txt index 2b77f12ec..ffc24bbe3 100644 --- a/angelspetrochem/changelog.txt +++ b/angelspetrochem/changelog.txt @@ -1,6 +1,6 @@ --------------------------------------------------------------------------------------------------- Version: 0.9.22 -Date: 16.06.2022 +Date: 06.06.2022 Changes: - Removed excessive logging entries from the log file (743) - Lowered the fuel value of crude to 35% to be more inline with the other fuels diff --git a/angelsrefining/changelog.txt b/angelsrefining/changelog.txt index 2e3baba4a..d6c15eb90 100644 --- a/angelsrefining/changelog.txt +++ b/angelsrefining/changelog.txt @@ -1,6 +1,6 @@ --------------------------------------------------------------------------------------------------- Version: 0.12.2 -Date: 16.06.2022 +Date: 06.06.2022 Changes: - Removed the obsolete ingredient_count limitation on some refining buildings (763) - Added support for separate techs for barrels, gas bottles, and fluid canisters added by diff --git a/angelssmelting/changelog.txt b/angelssmelting/changelog.txt index 0e96dfe1c..daeee621b 100644 --- a/angelssmelting/changelog.txt +++ b/angelssmelting/changelog.txt @@ -1,6 +1,6 @@ --------------------------------------------------------------------------------------------------- Version: 0.6.19 -Date: 16.06.2022 +Date: 06.06.2022 Changes: - Removed the obsolete ingredient_count limitation on all smelting buildings (763) - Disabled Ammonium chloride gas when platinum is disabled (769) From 2db26eb445c157484f4feead91f8b54b6b899a6e Mon Sep 17 00:00:00 2001 From: KiwiHawk <59639+KiwiHawk@users.noreply.github.com> Date: Tue, 7 Jun 2022 00:30:20 +1200 Subject: [PATCH 40/42] Small fixes for unit test failures (#788) * Add unit test ignores for Bob's and Sea Block * Add hidden dependency on boblogistics * Fix recipe not being unlocked Co-authored-by: lovely_santa --- angelsdev-unit-test/unit-tests/unit-test-003.lua | 1 + angelsdev-unit-test/unit-tests/unit-test-004.lua | 1 + angelsdev-unit-test/unit-tests/unit-test-006.lua | 1 + angelspetrochem/prototypes/global-override/bobrevamp.lua | 2 -- angelspetrochem/prototypes/override/bobplates.lua | 4 ++-- angelsrefining/info.json | 1 + 6 files changed, 6 insertions(+), 4 deletions(-) diff --git a/angelsdev-unit-test/unit-tests/unit-test-003.lua b/angelsdev-unit-test/unit-tests/unit-test-003.lua index 838fd9fdd..45c199a9b 100644 --- a/angelsdev-unit-test/unit-tests/unit-test-003.lua +++ b/angelsdev-unit-test/unit-tests/unit-test-003.lua @@ -10,6 +10,7 @@ local products_to_ignore = { ["chemical-void"] = true, ["water-void"] = true, + ["void"] = true -- Bob's void } local unit_test_003 = function() diff --git a/angelsdev-unit-test/unit-tests/unit-test-004.lua b/angelsdev-unit-test/unit-tests/unit-test-004.lua index 1a4b510d7..88d58fa07 100644 --- a/angelsdev-unit-test/unit-tests/unit-test-004.lua +++ b/angelsdev-unit-test/unit-tests/unit-test-004.lua @@ -49,6 +49,7 @@ local unit_test_004 = function() tech_unlocked_by_script["sb-startup1"] = true tech_unlocked_by_script["sb-startup2"] = true tech_unlocked_by_script["sb-startup3"] = true + tech_unlocked_by_script["sb-startup4"] = true tech_unlocked_by_script["sct-automation-science-pack"] = true end diff --git a/angelsdev-unit-test/unit-tests/unit-test-006.lua b/angelsdev-unit-test/unit-tests/unit-test-006.lua index cd80a4abd..b4e41a830 100644 --- a/angelsdev-unit-test/unit-tests/unit-test-006.lua +++ b/angelsdev-unit-test/unit-tests/unit-test-006.lua @@ -147,6 +147,7 @@ local function calculate_science_pack_level() technologies_to_ignore["spaceship-command"] = true technologies_to_ignore["astrometrics"] = true technologies_to_ignore["ftl-theory-A"] = true + technologies_to_ignore["ftl-propulsion"] = true end end diff --git a/angelspetrochem/prototypes/global-override/bobrevamp.lua b/angelspetrochem/prototypes/global-override/bobrevamp.lua index c8c525ab4..271b98cde 100644 --- a/angelspetrochem/prototypes/global-override/bobrevamp.lua +++ b/angelspetrochem/prototypes/global-override/bobrevamp.lua @@ -32,9 +32,7 @@ if mods["bobrevamp"] then OV.remove_unlock("angels-oil-processing", "liquid-fuel") OV.remove_unlock("angels-oil-processing", "solid-fuel-from-hydrogen") - OV.add_unlock("flammables", "liquid-fuel") --OV.add_unlock("flammables", "solid-fuel-from-hydrogen") - OV.add_unlock("flammables", "enriched-fuel-from-liquid-fuel") OV.add_prereq("chemical-processing-3", "flammables") diff --git a/angelspetrochem/prototypes/override/bobplates.lua b/angelspetrochem/prototypes/override/bobplates.lua index af52cbae1..84bbe47ef 100644 --- a/angelspetrochem/prototypes/override/bobplates.lua +++ b/angelspetrochem/prototypes/override/bobplates.lua @@ -152,8 +152,8 @@ if mods["bobplates"] then } } ) - OV.add_unlock("angels-oil-processing", "liquid-fuel") - + OV.add_unlock("flammables", "liquid-fuel") + OV.add_unlock("flammables", "enriched-fuel-from-liquid-fuel") end ------------------------------------------------------------------------------- diff --git a/angelsrefining/info.json b/angelsrefining/info.json index e848a3687..c76955388 100644 --- a/angelsrefining/info.json +++ b/angelsrefining/info.json @@ -12,6 +12,7 @@ "? bobplates >= 0.18.8", "? bobrevamp >= 0.18.5", "(?) bobmodules >= 0.18.0", + "(?) boblogistics", "? rso-mod >= 2.3.3", "? Yuoki >= 0.4.0", "? UraniumPower >= 0.6.4", From 7d8f493e78efe4be1326e2c82ca033b36602071b Mon Sep 17 00:00:00 2001 From: lovely_santa Date: Mon, 6 Jun 2022 15:24:51 +0200 Subject: [PATCH 41/42] Fixed crash related to biter tips and tricks when playing with other biter mods Also fixed unit test error (#789) --- angelsexploration/changelog.txt | 1 + angelsexploration/src/tips-and-tricks-triggers.lua | 8 +++++--- angelspetrochem/prototypes/petrochem-global-override.lua | 2 ++ 3 files changed, 8 insertions(+), 3 deletions(-) diff --git a/angelsexploration/changelog.txt b/angelsexploration/changelog.txt index d1c4050d2..a2513498e 100644 --- a/angelsexploration/changelog.txt +++ b/angelsexploration/changelog.txt @@ -4,6 +4,7 @@ Date: 06.06.2022 Bugfixes: - Fixed crash when adding a newer version of this mod to an existing save while other mods are (wrongfully) placing entities while the configuration changes are being executed... + - Fixed crash related to biter tips and tricks when playing with other biter mods Changes: - Added small description to the gathering turret --------------------------------------------------------------------------------------------------- diff --git a/angelsexploration/src/tips-and-tricks-triggers.lua b/angelsexploration/src/tips-and-tricks-triggers.lua index 0dc597811..bba2c6c85 100644 --- a/angelsexploration/src/tips-and-tricks-triggers.lua +++ b/angelsexploration/src/tips-and-tricks-triggers.lua @@ -47,9 +47,11 @@ function tips_and_tricks_triggers:init_force_data(force_name) local trigger_data = self:get_trigger_data() local technologies = game.forces[force_name].technologies for alien_name, trigger_name in pairs(trigger_data) do - if technologies[trigger_name].researched then - else - force_trigger_data[alien_name] = trigger_name + if technologies[trigger_name] then + if technologies[trigger_name].researched then + else + force_trigger_data[alien_name] = trigger_name + end end end diff --git a/angelspetrochem/prototypes/petrochem-global-override.lua b/angelspetrochem/prototypes/petrochem-global-override.lua index d29b41121..197fd369f 100644 --- a/angelspetrochem/prototypes/petrochem-global-override.lua +++ b/angelspetrochem/prototypes/petrochem-global-override.lua @@ -21,6 +21,8 @@ if data.raw["item"]["fluorite"] then OV.global_replace_item("fluorite", "fluorite-ore") end +OV.execute() + --RECIPE TINTS local recipe_categories = -- a list of all crafting categories for which (petrochem) machines supporting recipe tints { From d6731cc463475a26e2850881f7b4e59dce8c9eed Mon Sep 17 00:00:00 2001 From: lovely_santa Date: Mon, 6 Jun 2022 15:50:38 +0200 Subject: [PATCH 42/42] Fixed crash when the localised_description is a hardcoded string (#771) --- angelsaddons-mobility/changelog.txt | 5 +++++ angelsaddons-mobility/info.json | 2 +- angelsaddons-mobility/prototypes/train-functions.lua | 5 ++++- 3 files changed, 10 insertions(+), 2 deletions(-) diff --git a/angelsaddons-mobility/changelog.txt b/angelsaddons-mobility/changelog.txt index 1b2cc3bc7..c744e908c 100644 --- a/angelsaddons-mobility/changelog.txt +++ b/angelsaddons-mobility/changelog.txt @@ -1,4 +1,9 @@ --------------------------------------------------------------------------------------------------- +Version: 0.0.10 +Date: 06.06.2022 + Bugfixes: + - Fixed crash when the localised_description is a hardcoded string (771) +--------------------------------------------------------------------------------------------------- Version: 0.0.9 Date: 10.08.2021 Features: diff --git a/angelsaddons-mobility/info.json b/angelsaddons-mobility/info.json index 8e88ba694..bce32dd4e 100644 --- a/angelsaddons-mobility/info.json +++ b/angelsaddons-mobility/info.json @@ -1,6 +1,6 @@ { "name": "angelsaddons-mobility", - "version": "0.0.9", + "version": "0.0.10", "factorio_version": "1.1", "title": "Angel's Addons - Mass Transit", "author": "Arch666Angel, lovely_santa", diff --git a/angelsaddons-mobility/prototypes/train-functions.lua b/angelsaddons-mobility/prototypes/train-functions.lua index 545d00484..c742f1155 100644 --- a/angelsaddons-mobility/prototypes/train-functions.lua +++ b/angelsaddons-mobility/prototypes/train-functions.lua @@ -20,7 +20,10 @@ local function add_speed_locale() for _,train in pairs(data.raw[part]) do if train then if train.localised_description then --add to table - --table.insert(train.localised_description,"\n") --ensure new line at start? + if type(train.localised_description) == 'string' then + train.localised_description = {"", train.localised_description} + end + table.insert(train.localised_description,"\n") --ensure new line at start table.insert(train.localised_description,{"speed-text.speed-cap", train.max_speed*216}) else-- add new table train.localised_description={"speed-text.speed-cap", math.floor(train.max_speed*216*100)/100}--rounded tile/tick converted to km/h