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) 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 diff --git a/angelsaddons-storage/changelog.txt b/angelsaddons-storage/changelog.txt index 850d07ec8..88e1f8d16 100644 --- a/angelsaddons-storage/changelog.txt +++ b/angelsaddons-storage/changelog.txt @@ -1,9 +1,17 @@ --------------------------------------------------------------------------------------------------- +Version: 0.0.9 +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 + - 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/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", 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. 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/changelog.txt b/angelsbioprocessing/changelog.txt index 114ede77a..b4df3e0ca 100644 --- a/angelsbioprocessing/changelog.txt +++ b/angelsbioprocessing/changelog.txt @@ -1,4 +1,14 @@ --------------------------------------------------------------------------------------------------- +Version: 0.7.22 +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 + 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 Changes: 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/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/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 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/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 = { { 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 } 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 998805bc7..034ad7b09 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) @@ -225,7 +228,7 @@ def addConfiguration(cls:UnitTestConfiguration, configName:str, modList:list[str #"boblogistics", #"bobmining", #"bobmodules", - #"bobores", + "bobores", "bobplates", #"bobpower", #"bobrevamp", @@ -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/angelsdev-unit-test/unit-tests/unit-test-003.lua b/angelsdev-unit-test/unit-tests/unit-test-003.lua index 520e32dcf..45c199a9b 100644 --- a/angelsdev-unit-test/unit-tests/unit-test-003.lua +++ b/angelsdev-unit-test/unit-tests/unit-test-003.lua @@ -3,10 +3,14 @@ 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 + ["void"] = true -- Bob's void } local unit_test_003 = function() @@ -39,7 +43,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 ef1c6d3ba..88d58fa07 100644 --- a/angelsdev-unit-test/unit-tests/unit-test-004.lua +++ b/angelsdev-unit-test/unit-tests/unit-test-004.lua @@ -11,21 +11,73 @@ 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 - + + 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["sb-startup4"] = 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 - -- 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 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 diff --git a/angelsdev-unit-test/unit-tests/unit-test-006.lua b/angelsdev-unit-test/unit-tests/unit-test-006.lua index 3135e2d29..b4e41a830 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,43 @@ 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 + technologies_to_ignore["ftl-propulsion"] = true end end @@ -321,6 +358,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/angelsexploration/changelog.txt b/angelsexploration/changelog.txt index 4a7201db3..a2513498e 100644 --- a/angelsexploration/changelog.txt +++ b/angelsexploration/changelog.txt @@ -1,4 +1,13 @@ --------------------------------------------------------------------------------------------------- +Version: 0.3.14 +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 +--------------------------------------------------------------------------------------------------- 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] 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) 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() 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/angelsindustries/changelog.txt b/angelsindustries/changelog.txt index f69dc6878..06b0acbc1 100644 --- a/angelsindustries/changelog.txt +++ b/angelsindustries/changelog.txt @@ -1,4 +1,22 @@ --------------------------------------------------------------------------------------------------- +Version: 0.4.16 +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) + - 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: + - 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 Bugfixes: 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/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/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 diff --git a/angelsindustries/prototypes/buildings/centrifuge.lua b/angelsindustries/prototypes/buildings/centrifuge.lua index 8bdf4b3bc..201162a7c 100644 --- a/angelsindustries/prototypes/buildings/centrifuge.lua +++ b/angelsindustries/prototypes/buildings/centrifuge.lua @@ -1,46 +1,333 @@ -- 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 +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 - if wv[i].light then - if wv[i].light.apply_recipe_tint then - wv[i].light.apply_recipe_tint="primary" + 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 \ No newline at end of file +end diff --git a/angelsindustries/prototypes/overrides/components-block-update.lua b/angelsindustries/prototypes/overrides/components-block-update.lua index 1ec0344da..74ef78179 100644 --- a/angelsindustries/prototypes/overrides/components-block-update.lua +++ b/angelsindustries/prototypes/overrides/components-block-update.lua @@ -23,11 +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") - ----------------------------------------------------------------------------- -- 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 7a13c87e8..45c5c04b3 100644 --- a/angelsindustries/prototypes/overrides/components-bobs-recipe-update.lua +++ b/angelsindustries/prototypes/overrides/components-bobs-recipe-update.lua @@ -57,6 +57,42 @@ if angelsmods.industries.components then OV.disable_recipe("superior-circuit-board") end + ----------------------------------------------------------------------------- + -- BOB EQUIPMENT ------------------------------------------------------------ + ----------------------------------------------------------------------------- + if mods["bobequipment"] then + -- roboports + 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") + + -- 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 + ----------------------------------------------------------------------------- -- BOB REVAMP --------------------------------------------------------------- ----------------------------------------------------------------------------- diff --git a/angelsindustries/prototypes/overrides/global-tech-base-packs.lua b/angelsindustries/prototypes/overrides/global-tech-base-packs.lua index be294d02a..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") @@ -207,6 +209,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-cores.lua b/angelsindustries/prototypes/overrides/global-tech-bobs-cores.lua index 06d058a5d..f687fbdbd 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") @@ -67,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 ------------------------------------------------------------------------------- @@ -151,7 +158,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 +187,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 +261,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 fca62301c..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,14 +143,21 @@ 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") + 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") AI.pack_replace("stack-inserter", "orange", "green") @@ -194,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 @@ -205,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") @@ -233,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 ------------------------------------------------------------------------------- @@ -243,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 @@ -253,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") @@ -286,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/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 diff --git a/angelsindustries/prototypes/overrides/overhaul-nuclear-power.lua b/angelsindustries/prototypes/overrides/overhaul-nuclear-power.lua index 5e2ae242a..815a13282 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 @@ -133,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 @@ -150,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") @@ -161,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") @@ -212,6 +231,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/angelsindustries/prototypes/recipes/overhaul-nuclear-power.lua b/angelsindustries/prototypes/recipes/overhaul-nuclear-power.lua index ee798ad2b..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 = @@ -66,13 +66,15 @@ data:extend( crafting_machine_tint = { primary = tint_colors.orange, + secondary = tint_colors.orange, + tertiary = tint_colors.orange, }, }, { type = "recipe", name = "angels-americium-regeneration", enabled = false, - category = "centrifuging", + category = "centrifuging-2", subgroup = "angels-power-nuclear-processing", energy_required = 210,--540 ingredients = @@ -122,13 +124,15 @@ data:extend( crafting_machine_tint = { primary = tint_colors.orange, + secondary = tint_colors.orange, + tertiary = tint_colors.orange, }, }, { type = "recipe", name = "angels-thorium-processing", enabled = false, - category = "centrifuging", + category = "centrifuging-3", subgroup = "angels-power-nuclear-processing", energy_required = 20, ingredients = @@ -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 @@ -277,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 = @@ -298,6 +306,8 @@ data:extend( crafting_machine_tint = { primary = tint_colors.orange, + secondary = tint_colors.orange, + tertiary = tint_colors.orange, }, }, --basic reprocessing @@ -305,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 = @@ -354,6 +364,8 @@ data:extend( crafting_machine_tint = { primary = tint_colors.orange, + secondary = tint_colors.orange, + tertiary = tint_colors.orange, }, }, --advanced reprocessing @@ -426,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 = @@ -448,6 +460,8 @@ data:extend( crafting_machine_tint = { primary = tint_colors.red, + secondary = tint_colors.red, + tertiary = tint_colors.red, }, }, --advanced fuel cell @@ -455,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 = @@ -477,6 +491,8 @@ data:extend( crafting_machine_tint = { primary = tint_colors.red, + secondary = tint_colors.red, + tertiary = tint_colors.red, }, },]] --basic reprocessing @@ -484,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 = @@ -540,6 +556,8 @@ data:extend( crafting_machine_tint = { primary = tint_colors.red, + secondary = tint_colors.red, + tertiary = tint_colors.red, }, }, -- advanced reprocessing @@ -641,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 = @@ -688,6 +706,8 @@ data:extend( crafting_machine_tint = { primary = tint_colors.blue, + secondary = tint_colors.blue, + tertiary = tint_colors.blue, }, }, -- advanced reprocessing @@ -695,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 = @@ -750,6 +770,8 @@ data:extend( crafting_machine_tint = { primary = tint_colors.blue, + secondary = tint_colors.blue, + tertiary = tint_colors.blue, }, }, }) @@ -763,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} @@ -780,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/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/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 diff --git a/angelspetrochem/changelog.txt b/angelspetrochem/changelog.txt index d840ad216..ffc24bbe3 100644 --- a/angelspetrochem/changelog.txt +++ b/angelspetrochem/changelog.txt @@ -1,4 +1,13 @@ --------------------------------------------------------------------------------------------------- +Version: 0.9.22 +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 + - 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 Changes: 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/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/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..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") @@ -130,11 +128,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 +139,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 +154,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/items/petrochem-basics.lua b/angelspetrochem/prototypes/items/petrochem-basics.lua index b473029f8..40964297d 100644 --- a/angelspetrochem/prototypes/items/petrochem-basics.lua +++ b/angelspetrochem/prototypes/items/petrochem-basics.lua @@ -254,15 +254,17 @@ data:extend( name = "chemical-void", icons = { { - icon = "__angelsrefining__/graphics/icons/void.png", + icon = "__angelspetrochem__/graphics/icons/flare-stack.png", + icon_size = 64, + icon_mipmaps = 4 }, { - icon = "__angelspetrochem__/graphics/icons/flare-stack.png", + 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/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 cc196ca49..84bbe47ef 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 @@ -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 @@ -119,13 +119,18 @@ 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( {"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,11 +145,15 @@ 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}}) } } ) - 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/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/prototypes/petrochem-global-override.lua b/angelspetrochem/prototypes/petrochem-global-override.lua index 3b415cbce..197fd369f 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,28 @@ require("prototypes.global-override.boblogistics") 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 +{ + ["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 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 fec816753..d6c15eb90 100644 --- a/angelsrefining/changelog.txt +++ b/angelsrefining/changelog.txt @@ -1,4 +1,20 @@ --------------------------------------------------------------------------------------------------- +Version: 0.12.2 +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 + 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: (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 + Bugfixes: + - Fixed crash when playing with bob enemies and bob equipment without bob artifacts enabled + - Fixed the void item group icon (770) +--------------------------------------------------------------------------------------------------- Version: 0.12.1 Date: 19.12.2021 Changes: 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/graphics/item-group/void-group.png b/angelsrefining/graphics/item-group/void-group.png new file mode 100644 index 000000000..68c77923e Binary files /dev/null and b/angelsrefining/graphics/item-group/void-group.png differ diff --git a/angelsrefining/info.json b/angelsrefining/info.json index 513b10186..c76955388 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", @@ -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", 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. 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/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/angelsrefining/prototypes/items/water-treatment-items.lua b/angelsrefining/prototypes/items/water-treatment-items.lua index f931b3df7..de6c63163 100644 --- a/angelsrefining/prototypes/items/water-treatment-items.lua +++ b/angelsrefining/prototypes/items/water-treatment-items.lua @@ -237,15 +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, + 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]", diff --git a/angelsrefining/prototypes/override-functions.lua b/angelsrefining/prototypes/override-functions.lua index bec3d0200..405b2c342 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 @@ -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 7ccd2ad75..e69de29bb 100644 --- a/angelsrefining/prototypes/override/refining-override-bobequipment.lua +++ b/angelsrefining/prototypes/override/refining-override-bobequipment.lua @@ -1,60 +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"] 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"] then - OV.add_prereq("bob-battery-equipment-4", "alien-research") - end - - ----------------------------------------------------------------------------- - -- FUSION REACTOR EQUIPMENT ------------------------------------------------- - ----------------------------------------------------------------------------- - if mods["bobenemies"] and mods["bobtech"] 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 7bf33d07a..b24038f0f 100644 --- a/angelsrefining/prototypes/override/refining-override-bobwarfare.lua +++ b/angelsrefining/prototypes/override/refining-override-bobwarfare.lua @@ -78,15 +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"] 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/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/angelsrefining/prototypes/refining-category.lua b/angelsrefining/prototypes/refining-category.lua index 37786d78f..24655aaed 100644 --- a/angelsrefining/prototypes/refining-category.lua +++ b/angelsrefining/prototypes/refining-category.lua @@ -386,9 +386,10 @@ data:extend( order = "la[angels]-z[void]-a", icons = { { - icon = "__angelsrefining__/graphics/item-group/barreling-group.png", + icon = "__angelsrefining__/graphics/item-group/void-group.png", icon_size = 128, - scale = 0.5 + scale = 0.5, + icon_mipmaps = 2 }, { icon = "__angelsrefining__/graphics/icons/void.png", 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 781c04206..daeee621b 100644 --- a/angelssmelting/changelog.txt +++ b/angelssmelting/changelog.txt @@ -1,4 +1,12 @@ --------------------------------------------------------------------------------------------------- +Version: 0.6.19 +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) + - Added build and mining sounds to concrete brick tiles (776) + - Streamlined steel smelting technology (779, 780) +--------------------------------------------------------------------------------------------------- Version: 0.6.18 Date: 19.12.2021 Changes: 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", 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/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", { 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", 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 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/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"}) 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 = { { 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