diff --git a/.gitignore b/.gitignore index a9218785c..a02478fa0 100644 --- a/.gitignore +++ b/.gitignore @@ -12,4 +12,7 @@ __pycache__/ # Unit test files angelsdev-unit-test/log/ -run_unit_tests_PWJ.bat \ No newline at end of file +run_unit_tests_PWJ.bat + +# Windows explorer cache +Thumbs.db \ No newline at end of file diff --git a/angelsaddons-cab/changelog.txt b/angelsaddons-cab/changelog.txt index 3fefb91b9..2571231a6 100644 --- a/angelsaddons-cab/changelog.txt +++ b/angelsaddons-cab/changelog.txt @@ -1,4 +1,9 @@ --------------------------------------------------------------------------------------------------- +Version: 0.2.9 +Date: 22.12.2023 + Changes: + - Cleanup of prototype data +--------------------------------------------------------------------------------------------------- Version: 0.2.8 Date: 19.12.2021 Changes: diff --git a/angelsaddons-cab/info.json b/angelsaddons-cab/info.json index cb28483da..a926d3dda 100644 --- a/angelsaddons-cab/info.json +++ b/angelsaddons-cab/info.json @@ -1,6 +1,6 @@ { "name": "angelsaddons-cab", - "version": "0.2.8", + "version": "0.2.9", "factorio_version": "1.1", "title": "Angel's Addons - C.A.B.", "author": "Arch666Angel, lovely_santa", diff --git a/angelsaddons-cab/prototypes/entities/equipment.lua b/angelsaddons-cab/prototypes/entities/equipment.lua index b8651223d..4fa3f12a1 100644 --- a/angelsaddons-cab/prototypes/entities/equipment.lua +++ b/angelsaddons-cab/prototypes/entities/equipment.lua @@ -92,19 +92,6 @@ data:extend({ --output_flow_limit = "0W", }, energy_input = "0W", - tint = { r = 1, g = 1, b = 1, a = 0 }, - desaturation_params = { - smoothstep_min = 0.1, - smoothstep_max = 0.7, - minimum = 0.3, - maximum = 1.0, - }, - light_params = { - smoothstep_min = 0.1, - smoothstep_max = 0.7, - minimum = 0.666, - maximum = 1.0, - }, categories = { "angels-cab" }, darkness_to_turn_on = 0, color_lookup = { { 0.5, "__core__/graphics/color_luts/nightvision.png" } }, @@ -119,7 +106,6 @@ data:extend({ icon = "__angelsaddons-cab__/graphics/icons/cab-icon.png", icon_size = 32, flags = { "not-blueprintable", "not-deconstructable", "not-on-map", "hide-alt-info" }, - enable_gui = false, allow_copy_paste = false, --minable = {mining_time = 1, result = energyInterfaceItem.name}, max_health = 50, @@ -139,7 +125,7 @@ data:extend({ render_no_power_icon = false, }, energy_production = "0kW", - energy_consumption = "0kW", + energy_usage = "0kW", picture = { filename = "__core__/graphics/empty.png", priority = "low", diff --git a/angelsbioprocessing/changelog.txt b/angelsbioprocessing/changelog.txt index d2ea1d460..2a8b11b3a 100644 --- a/angelsbioprocessing/changelog.txt +++ b/angelsbioprocessing/changelog.txt @@ -1,4 +1,24 @@ --------------------------------------------------------------------------------------------------- +Version: 0.7.25 +Date: 22.12.2023 + Changes: + - Added support for alien artifacts outside of bob enemies + - Compatibility with Bob's changes (911) + - Recipes that consume Gardens will now only buffer enough ingredients for 1 craft (918) + - Adjusted techs and added a new recipe (Sodium hypochlorite decomposition) to make Paper 2 viable when it is unlocked (922) + - Rebalanced paper and pulp recipes to make each tier feel like a significant upgrade (923) + - Made wood production available earlier (932) + - Recipe changes for Tree seed generators, Arboretum, and Composter + - Tech tree changes + - Added custom error message for when trying to insert invalid items into butchery, composter, or hatchery (933) + - Reworked recipes for Bob's circuit boards (936) + - Removed recipe paper to wooden boards + - Modified phenolic board recipe to require paper + liquid resin + - Prevent Bob's mods from enabling Agriculture Modules for non bio recipes (937) + - Remove unnecessary prerequisites from Alien Farming (943) + Bugfixes: + - Fixed Gaseous atmosphere puffing recipe missing product Acid gas (942) +--------------------------------------------------------------------------------------------------- Version: 0.7.24 Date: 23.02.2023 Bugfixes: diff --git a/angelsbioprocessing/control.lua b/angelsbioprocessing/control.lua index 5bca2e28b..7caf92c16 100644 --- a/angelsbioprocessing/control.lua +++ b/angelsbioprocessing/control.lua @@ -213,3 +213,31 @@ script.on_event(defines.events.on_player_main_inventory_changed, function(event) end end end) + +script.on_event(defines.events.on_entity_died, function(event) + local loot = event.loot + local killing_force = event.force + if (not killing_force) or loot.is_empty() then + return + end + loot = loot.get_contents() + for loot_item_name, loot_technology_to_research in pairs({ + ["small-alien-artifact"] = "angels-alien-artifact", + ["small-alien-artifact-red"] = "angels-alien-artifact-red", + ["small-alien-artifact-yellow"] = "angels-alien-artifact-yellow", + ["small-alien-artifact-orange"] = "angels-alien-artifact-orange", + ["small-alien-artifact-blue"] = "angels-alien-artifact-blue", + ["small-alien-artifact-purple"] = "angels-alien-artifact-purple", + ["small-alien-artifact-green"] = "angels-alien-artifact-green", + }) do + if loot[loot_item_name] then + local technology = killing_force.technologies[loot_technology_to_research] + if technology then + technology.researched = true + end + end + end +end, { + { mode = "or", filter = "type", type = "unit" }, + { mode = "or", filter = "type", type = "unit-spawner" }, +}) diff --git a/angelsbioprocessing/data.lua b/angelsbioprocessing/data.lua index ad53eac12..b998444c4 100644 --- a/angelsbioprocessing/data.lua +++ b/angelsbioprocessing/data.lua @@ -57,9 +57,11 @@ angelsmods.triggers.bio_plastic = angelsmods.triggers.bio_plastic or (angelsmods.trigger.plastic and (angelsmods.triggers.bio_resin or angelsmods.triggers.bio_rubber)) or false -angelsmods.triggers.paper = not angelsmods.functions.is_special_vanilla() +angelsmods.triggers.paper = (not angelsmods.functions.is_special_vanilla()) + or (mods["bobelectronics"] and true or false) if angelsmods.triggers.paper then angelsmods.trigger.water_red_waste = true + angelsmods.trigger.early_chemical_furnace = true end angelsmods.triggers.crystals_full = (not angelsmods.functions.is_special_vanilla()) or (mods["bobmodules"] and true or false) @@ -125,6 +127,7 @@ require("prototypes.recipes.bio-refugium-hogger") require("prototypes.recipes.bio-module") require("prototypes.technology.bio-processing-algae") +require("prototypes.technology.bio-processing-artifacts") require("prototypes.technology.bio-processing-wood-paper") require("prototypes.technology.bio-processing-alien") require("prototypes.technology.crop-farming") diff --git a/angelsbioprocessing/graphics/icons/alien-artifact-blue-small.png b/angelsbioprocessing/graphics/icons/alien-artifact-blue-small.png new file mode 100644 index 000000000..c1d3dea53 Binary files /dev/null and b/angelsbioprocessing/graphics/icons/alien-artifact-blue-small.png differ diff --git a/angelsbioprocessing/graphics/icons/alien-artifact-green-small.png b/angelsbioprocessing/graphics/icons/alien-artifact-green-small.png new file mode 100644 index 000000000..161400572 Binary files /dev/null and b/angelsbioprocessing/graphics/icons/alien-artifact-green-small.png differ diff --git a/angelsbioprocessing/graphics/icons/alien-artifact-orange-small.png b/angelsbioprocessing/graphics/icons/alien-artifact-orange-small.png new file mode 100644 index 000000000..bbe864658 Binary files /dev/null and b/angelsbioprocessing/graphics/icons/alien-artifact-orange-small.png differ diff --git a/angelsbioprocessing/graphics/icons/alien-artifact-purple-small.png b/angelsbioprocessing/graphics/icons/alien-artifact-purple-small.png new file mode 100644 index 000000000..cd18aa1ec Binary files /dev/null and b/angelsbioprocessing/graphics/icons/alien-artifact-purple-small.png differ diff --git a/angelsbioprocessing/graphics/icons/alien-artifact-red-small.png b/angelsbioprocessing/graphics/icons/alien-artifact-red-small.png new file mode 100644 index 000000000..2b3c954df Binary files /dev/null and b/angelsbioprocessing/graphics/icons/alien-artifact-red-small.png differ diff --git a/angelsbioprocessing/graphics/icons/alien-artifact-small.png b/angelsbioprocessing/graphics/icons/alien-artifact-small.png new file mode 100644 index 000000000..0ef673fe2 Binary files /dev/null and b/angelsbioprocessing/graphics/icons/alien-artifact-small.png differ diff --git a/angelsbioprocessing/graphics/icons/alien-artifact-yellow-small.png b/angelsbioprocessing/graphics/icons/alien-artifact-yellow-small.png new file mode 100644 index 000000000..2c7b970da Binary files /dev/null and b/angelsbioprocessing/graphics/icons/alien-artifact-yellow-small.png differ diff --git a/angelsbioprocessing/info.json b/angelsbioprocessing/info.json index 68ec35ac0..edff17896 100644 --- a/angelsbioprocessing/info.json +++ b/angelsbioprocessing/info.json @@ -1,6 +1,6 @@ { "name": "angelsbioprocessing", - "version": "0.7.24", + "version": "0.7.25", "factorio_version": "1.1", "title": "Angel's Bioprocessing", "author": "Arch666Angel", @@ -9,8 +9,9 @@ "description": "Adds ways to recycle and process waste products through biological means and make use of biological processes and farming.", "dependencies": [ "angelsrefining >= 0.12.1", - "angelspetrochem >= 0.9.21", + "angelspetrochem >= 0.9.25", "angelssmelting >= 0.6.17", - "? bobenemies >= 1.1.5" + "? bobenemies >= 1.1.5", + "? boblibrary >= 1.2.0" ] } diff --git a/angelsbioprocessing/locale/en/bio-processing.cfg b/angelsbioprocessing/locale/en/bio-processing.cfg index f17ad5e4d..037a1dc03 100644 --- a/angelsbioprocessing/locale/en/bio-processing.cfg +++ b/angelsbioprocessing/locale/en/bio-processing.cfg @@ -129,12 +129,26 @@ alien-pre-artifact-purple=Purple alien pre-artifact alien-pre-artifact-red=Red alien pre-artifact alien-pre-artifact-yellow=Yellow alien pre-artifact +small-alien-artifact=Small alien artifact +small-alien-artifact-red=Small red alien artifact +small-alien-artifact-orange=Small orange alien artifact +small-alien-artifact-yellow=Small yellow alien artifact +small-alien-artifact-green=Small green alien artifact +small-alien-artifact-blue=Small blue alien artifact +small-alien-artifact-purple=Small purple alien artifact + +alien-artifact=Alien artifact +alien-artifact-red=Red alien artifact +alien-artifact-orange=Orange alien artifact +alien-artifact-yellow=Yellow alien artifact +alien-artifact-green=Green alien artifact +alien-artifact-blue=Blue alien artifact +alien-artifact-purple=Purple alien artifact + alien-egg-red=Red alien egg alien-egg-green=Green alien egg alien-egg-blue=Blue alien egg -small-alien-artifact=Small alien artifact - temperate-tree=Temperate tree swamp-tree=Swamp tree desert-tree=Desert tree @@ -336,6 +350,8 @@ angels-bio-yield-module=A module that increases productivity, but only usable fo angels-bio-yield-module-2=A module that increases productivity, but only usable for agricultural processes. angels-bio-yield-module-3=A module that increases productivity, but only usable for agricultural processes. +alien-artifact-tool=Kill alien enemies to obtain these remnants to learn to understanding these native creatures better. + [fluid-name] alien-spores=Alien spores alien-goo=Alien goo @@ -373,10 +389,6 @@ paste-from-sodium-hydroxide=Paste from sodium hydroxide paste-from-gas-chlor-methane=Paste from chloromethane gas cellulose-fiber-raw-wood=Cellulose fiber from raw wood -wood-from-cellulose=Wood from cellulose and paste -wood-from-cellulose-resin=Wood from cellulose and resin -wood-pellets=Wood pellets -wood-bricks=Wood bricks gas-carbon-dioxide-from-wood=Carbon dioxide gas from wood gas-methanol-from-wood=Methanol gas from wood sulfite-pulping=Sulfite pulping @@ -387,6 +399,7 @@ kraft-causting=Kraft process causting paper-bleaching-1=Paper bleaching 1 paper-bleaching-2=Paper bleaching 2 paper-bleaching-3=Paper bleaching 3 +solid-sodium-hypochlorite-decomposition=__ITEM__solid-sodium-hypochlorite__ decomposition tree-arboretum-0=Rare tree cultivation temperate-tree-arboretum-1=Temperate tree cultivation @@ -551,6 +564,7 @@ bio-processing-crystal-shard=Crystal shard processing bio-processing-crystal-full=Crystal processing bio-processing-paste=Paste processing +angels-composting=Composting gardens=Garden processing angels-garden-mutations=Garden mutations bio-farm=Farming @@ -596,6 +610,7 @@ bio-processing-crystal-shard=Shards of crystals made from a combination of organ bio-processing-crystal-full=Crystals made from a combination of organic and inorganic material. bio-processing-paste=A paste from cellulose can act as growth medium for microbial cultures. +angels-composting=Recycling of left-over organic materials gardens=Allows you to extract seeds and plant-life samples from gardens growing on this alien planet. angels-garden-mutations=Artificial mutation of gardens via radioactive material. bio-farm=Basic technology for growing and processing crops. @@ -638,3 +653,8 @@ angels-bio-tile-pollution-absorbtion-multiplier=Biologically active tile polluti [mod-setting-description] angels-bio-tile-pollution-absorbtion-multiplier=Increases the pollution absorption to reduce the pollution cloud in your base. + +[cant_insert] +angels-butchery-limitation=__1__ cannot be butchered. +angels-composter-limitation=__1__ cannot be composted. +angels-hatchery-limitation=__1__ cannot be incubated. diff --git a/angelsbioprocessing/prototypes/bio-processing-override.lua b/angelsbioprocessing/prototypes/bio-processing-override.lua index e9ba20c43..70a090ca2 100644 --- a/angelsbioprocessing/prototypes/bio-processing-override.lua +++ b/angelsbioprocessing/prototypes/bio-processing-override.lua @@ -2,6 +2,7 @@ require("prototypes.overrides.bio-processing-override-special-vanilla") --UPDATE BUILDING RECIPES require("prototypes.recipes.bio-processing-entity-angels") --UPDATE BIO PRODUCT RECIPES +require("prototypes.overrides.bio-processing-override-artifacts") require("prototypes.overrides.bio-processing-override-arboretum") require("prototypes.overrides.bio-processing-override-paste") -- UPDATE OTHER STUFF @@ -57,7 +58,7 @@ if angelsmods.trigger.smelting_products["glass"].plate then }, }, }) - OV.remove_prereq("bio-processing-alien-1", "plastics") + OV.remove_prereq("bio-processing-alien-2", "plastics") end if angelsmods.functions.is_special_vanilla() then @@ -104,35 +105,6 @@ if data.raw.tile["frozen-snow-0"] then alien_biomes.list_tiles(alien_biomes.exclude_tags(alien_biomes.all_tiles(), { "frozen", "volcanic" })) end ---ADDED RECIPES BOBS -if bobmods then - if bobmods.electronics and angelsmods.triggers.paper then - data:extend({ - --CIRCUIT BOARD - { - type = "recipe", - name = "wooden-board-paper", - category = "advanced-crafting", - subgroup = "bio-paper", - enabled = false, - energy_required = 4, - ingredients = { - { type = "item", name = "solid-paper", amount = 2 }, - }, - results = { - { type = "item", name = "wooden-board", amount = 1 }, - }, - icon_size = 32, - order = "m", - }, - }) - OV.add_unlock("bio-paper-1", "wooden-board-paper") - end -end - ---ADDED RECIPES FOR BOBS ARTIFACTS -require("prototypes.overrides.bio-processing-override-bob-artifacts") - --OTHER BOB OVERRIDES require("prototypes.overrides.bio-processing-override-bob") require("prototypes.overrides.bio-processing-override-bobmodules") diff --git a/angelsbioprocessing/prototypes/bio-processing-triggers.lua b/angelsbioprocessing/prototypes/bio-processing-triggers.lua index c55eb7e08..71e13558e 100644 --- a/angelsbioprocessing/prototypes/bio-processing-triggers.lua +++ b/angelsbioprocessing/prototypes/bio-processing-triggers.lua @@ -2,6 +2,9 @@ if angelsmods.triggers.bio_pastes["cobalt"] then angelsmods.trigger.ores["cobalt"] = true + if mods["bobores"] then + bobmods.ores.cobalt.enabled = true + end angelsmods.trigger.smelting_products["cobalt"].powder = true end @@ -39,3 +42,6 @@ if angelsmods.triggers.bio_pastes["zinc"] then angelsmods.trigger.ores["zinc"] = true angelsmods.trigger.smelting_products["zinc"].powder = true end + +angelsmods.trigger.gas_acetone = true +angelsmods.trigger.gas_urea = true diff --git a/angelsbioprocessing/prototypes/buildings/butchery.lua b/angelsbioprocessing/prototypes/buildings/butchery.lua index a314c9aa2..d4ddabfc8 100644 --- a/angelsbioprocessing/prototypes/buildings/butchery.lua +++ b/angelsbioprocessing/prototypes/buildings/butchery.lua @@ -23,6 +23,7 @@ data:extend({ selection_box = { { -1.5, -1.5 }, { 1.5, 1.5 } }, drawing_box = { { -1.5, -1.75 }, { 1.5, 1.5 } }, crafting_categories = { "bio-butchery" }, + cant_insert_at_source_message_key = "cant_insert.angels-butchery-limitation", module_specification = { module_slots = 2, }, diff --git a/angelsbioprocessing/prototypes/buildings/composter.lua b/angelsbioprocessing/prototypes/buildings/composter.lua index 48071caa4..caec84e92 100644 --- a/angelsbioprocessing/prototypes/buildings/composter.lua +++ b/angelsbioprocessing/prototypes/buildings/composter.lua @@ -22,6 +22,7 @@ data:extend({ collision_box = { { -1.4, -1.4 }, { 1.4, 1.4 } }, selection_box = { { -1.5, -1.5 }, { 1.5, 1.5 } }, crafting_categories = { "angels-bio-void" }, + cant_insert_at_source_message_key = "cant_insert.angels-composter-limitation", module_specification = { module_slots = 2, }, diff --git a/angelsbioprocessing/prototypes/buildings/hatchery.lua b/angelsbioprocessing/prototypes/buildings/hatchery.lua index 2b88b8ccc..5c79b71ad 100644 --- a/angelsbioprocessing/prototypes/buildings/hatchery.lua +++ b/angelsbioprocessing/prototypes/buildings/hatchery.lua @@ -23,6 +23,7 @@ data:extend({ selection_box = { { -1.5, -1.5 }, { 1.5, 1.5 } }, drawing_box = { { -1.5, -1.75 }, { 1.5, 1.5 } }, crafting_categories = { "bio-hatchery" }, + cant_insert_at_source_message_key = "cant_insert.angels-hatchery-limitation", module_specification = { module_slots = 2, }, diff --git a/angelsbioprocessing/prototypes/overrides/bio-processing-override-angel.lua b/angelsbioprocessing/prototypes/overrides/bio-processing-override-angel.lua index 30c389104..04666b9d5 100644 --- a/angelsbioprocessing/prototypes/overrides/bio-processing-override-angel.lua +++ b/angelsbioprocessing/prototypes/overrides/bio-processing-override-angel.lua @@ -1,8 +1,8 @@ local OV = angelsmods.functions.OV -if angelsmods.trigger.smelting_products["glass"].board then --only change it if glass is actually active +if angelsmods.trigger.smelting_products["glass"].mixture then --only change it if glass is actually active OV.modify_input("bio-tile", { type = "item", name = "solid-glass-mixture", amount = 1 }) - OV.add_prereq("bio-farm-2", "angels-glass-smelting-1") + OV.add_prereq("gardens-3", "angels-glass-smelting-1") end if angelsmods.industries and angelsmods.industries.overhaul then @@ -38,7 +38,6 @@ else OV.modify_input("bio-tile", { type = "item", name = "steel-plate", amount = 1 }) OV.disable_recipe("algae-brown-burning") end -OV.add_unlock("bio-farm-2", "bio-tile") -- FARMING TOOLTIPS for _, item_name in pairs({ "solid-beans", "solid-corn", "solid-leafs", "solid-nuts", "solid-pips", "solid-fruit" }) do diff --git a/angelsbioprocessing/prototypes/overrides/bio-processing-override-arboretum.lua b/angelsbioprocessing/prototypes/overrides/bio-processing-override-arboretum.lua index 45084bea9..e1e0f2063 100644 --- a/angelsbioprocessing/prototypes/overrides/bio-processing-override-arboretum.lua +++ b/angelsbioprocessing/prototypes/overrides/bio-processing-override-arboretum.lua @@ -2,7 +2,7 @@ local OV = angelsmods.functions.OV if angelsmods.triggers.bio_rubber then OV.remove_prereq("rubbers", "rubber") - OV.add_prereq("rubbers", "angels-oil-processing") + OV.add_prereq("rubbers", "automation-2") OV.add_prereq("rubber", "rubbers") OV.remove_science_pack("rubbers", "chemical-science-pack") else @@ -49,6 +49,7 @@ else "bio-arboretum-temperate-2", "bio-arboretum-temperate-3", }) + OV.remove_prereq("bio-wood-processing-2", "bio-farm-1") end if angelsmods.triggers.bio_plastic then @@ -76,6 +77,11 @@ else end if angelsmods.triggers.paper then + OV.add_unlock("sodium-processing-1", "solid-sodium-hypochlorite-decomposition") + OV.remove_unlock("chlorine-processing-3", "solid-salt-separation") + OV.add_unlock("sodium-processing-1", "solid-salt-separation") + OV.add_prereq("sodium-processing-1", "angels-metallurgy-2") + OV.add_prereq("sodium-processing-1", "bio-paper-2") else OV.hide_recipe({ "solid-wood-pulp", @@ -90,6 +96,7 @@ else "kraft-recovery", "kraft-causting", "solid-alginic-acid", + "solid-sodium-hypochlorite-decomposition", }) angelsmods.functions.add_flag({ "pulping-liquor", @@ -113,7 +120,8 @@ else ingredients = { { name = "paste-cellulose", amount = "solid-wood-pulp" } }, }, }) - --rereq clean-out - OV.remove_prereq("gardens-2", "bio-paper-1") + --prereq clean-out + OV.remove_prereq("gardens-3", "bio-paper-1") + OV.add_prereq("gardens-3", "bio-processing-paste") OV.remove_unlock("bio-processing-brown", "solid-alginic-acid") end diff --git a/angelsbioprocessing/prototypes/overrides/bio-processing-override-bob-artifacts.lua b/angelsbioprocessing/prototypes/overrides/bio-processing-override-artifacts.lua similarity index 53% rename from angelsbioprocessing/prototypes/overrides/bio-processing-override-bob-artifacts.lua rename to angelsbioprocessing/prototypes/overrides/bio-processing-override-artifacts.lua index af6d54592..58d145b28 100644 --- a/angelsbioprocessing/prototypes/overrides/bio-processing-override-bob-artifacts.lua +++ b/angelsbioprocessing/prototypes/overrides/bio-processing-override-artifacts.lua @@ -1,15 +1,14 @@ local OV = angelsmods.functions.OV -local contais_artifacts = false -for color, available in pairs(angelsmods.triggers.artifacts) do - contais_artifacts = contais_artifacts or available or false -end +local contais_artifact_creation = false ------------------------------------------------------------------------------- -- RED ARTIFACTS -------------------------------------------------------------- ------------------------------------------------------------------------------- if angelsmods.triggers.artifacts["red"] then if angelsmods.triggers.bio_pastes["copper"] then + contais_artifact_creation = true + data:extend({ --PRE ARTIFACT { @@ -70,14 +69,85 @@ if angelsmods.triggers.artifacts["red"] then end if bobmods and bobmods.enemies and data.raw.item["small-alien-artifact-red"] then - if angelsmods.triggers.bio_pastes["copper"] then + if angelsmods.triggers.bio_pastes["copper"] or angelsmods.exploration then angelsmods.functions.move_item("small-alien-artifact-red", "bio-processing-alien-small", "a[red]") end angelsmods.functions.move_item("alien-artifact-red", "bio-processing-alien-large", "a[red]") OV.patch_recipes({ { name = "alien-artifact-red-from-basic", subgroup = "bio-processing-alien-large-convert" }, }) + if angelsmods.exploration then + OV.patch_recipes({ + { name = "alien-artifact-red-from-small", enabled = false }, + { name = "alien-artifact-red-from-basic", enabled = false }, + }) + end + else + data:extend({ + -- SMALL ARTIFACT + { + type = "item", + name = "small-alien-artifact-red", + icon = "__angelsbioprocessing__/graphics/icons/alien-artifact-red-small.png", + icon_size = 32, + subgroup = "bio-processing-alien-small", + order = "a[red]", + stack_size = 200, + }, + -- LARGE ARTIFACT + { + type = "item", + name = "alien-artifact-red", + icon = "__angelsbioprocessing__/graphics/icons/alien-artifact-red.png", + icon_size = 32, + subgroup = "bio-processing-alien-large", + order = "a[red]", + stack_size = 200, + }, + { + type = "recipe", + name = "alien-artifact-red-from-small", + category = "crafting", + enabled = false, + energy_required = 5, + ingredients = { + { type = "item", name = "small-alien-artifact-red", amount = 25 }, + }, + results = { + { type = "item", name = "alien-artifact-red", amount = 1 }, + }, + icon_size = 32, + order = "a[red]", + }, + { + type = "recipe", + name = "alien-artifact-red-from-basic", + category = "crafting", + subgroup = "bio-processing-alien-large-convert", + enabled = false, + energy_required = 5, + ingredients = { + { type = "item", name = "alien-artifact-red", amount = 1 }, + { type = "item", name = "alien-artifact", amount = 5 }, + }, + results = { + { type = "item", name = "alien-artifact-red", amount = 5 }, + }, + icon_size = 32, + order = "a[red]", + }, + }) end + + if angelsmods.exploration then + -- responsibility of angels exploration to handle the tech progress + else + OV.disable_technology("angels-alien-artifact-red") + end +else + OV.remove_unlock("angels-alien-artifact-red", "alien-artifact-red-from-small") + OV.remove_unlock("angels-alien-artifact-red", "alien-artifact-red-from-basic") + OV.disable_technology("angels-alien-artifact-red") end ------------------------------------------------------------------------------- @@ -85,6 +155,8 @@ end ------------------------------------------------------------------------------- if angelsmods.triggers.artifacts["yellow"] then if angelsmods.triggers.bio_pastes["gold"] then + contais_artifact_creation = true + data:extend({ --PRE ARTIFACT { @@ -145,14 +217,85 @@ if angelsmods.triggers.artifacts["yellow"] then end if bobmods and bobmods.enemies and data.raw.item["small-alien-artifact-yellow"] then - if angelsmods.triggers.bio_pastes["gold"] then + if angelsmods.triggers.bio_pastes["gold"] or angelsmods.exploration then angelsmods.functions.move_item("small-alien-artifact-yellow", "bio-processing-alien-small", "b[yellow]") end angelsmods.functions.move_item("alien-artifact-yellow", "bio-processing-alien-large", "b[yellow]") OV.patch_recipes({ { name = "alien-artifact-yellow-from-basic", subgroup = "bio-processing-alien-large-convert" }, }) + if angelsmods.exploration then + OV.patch_recipes({ + { name = "alien-artifact-yellow-from-small", enabled = false }, + { name = "alien-artifact-yellow-from-basic", enabled = false }, + }) + end + else + data:extend({ + -- SMALL ARTIFACT + { + type = "item", + name = "small-alien-artifact-yellow", + icon = "__angelsbioprocessing__/graphics/icons/alien-artifact-yellow-small.png", + icon_size = 32, + subgroup = "bio-processing-alien-small", + order = "b[yellow]", + stack_size = 200, + }, + -- LARGE ARTIFACT + { + type = "item", + name = "alien-artifact-yellow", + icon = "__angelsbioprocessing__/graphics/icons/alien-artifact-yellow.png", + icon_size = 32, + subgroup = "bio-processing-alien-large", + order = "b[yellow]", + stack_size = 200, + }, + { + type = "recipe", + name = "alien-artifact-yellow-from-small", + category = "crafting", + enabled = false, + energy_required = 5, + ingredients = { + { type = "item", name = "small-alien-artifact-yellow", amount = 25 }, + }, + results = { + { type = "item", name = "alien-artifact-yellow", amount = 1 }, + }, + icon_size = 32, + order = "b[yellow]", + }, + { + type = "recipe", + name = "alien-artifact-yellow-from-basic", + category = "crafting", + subgroup = "bio-processing-alien-large-convert", + enabled = false, + energy_required = 5, + ingredients = { + { type = "item", name = "alien-artifact-yellow", amount = 1 }, + { type = "item", name = "alien-artifact", amount = 5 }, + }, + results = { + { type = "item", name = "alien-artifact-yellow", amount = 5 }, + }, + icon_size = 32, + order = "b[yellow]", + }, + }) + end + + if angelsmods.exploration then + -- responsibility of angels exploration to handle the tech progress + else + OV.disable_technology("angels-alien-artifact-yellow") end +else + OV.remove_unlock("angels-alien-artifact-yellow", "alien-artifact-yellow-from-small") + OV.remove_unlock("angels-alien-artifact-yellow", "alien-artifact-yellow-from-basic") + OV.disable_technology("angels-alien-artifact-yellow") end ------------------------------------------------------------------------------- @@ -160,6 +303,8 @@ end ------------------------------------------------------------------------------- if angelsmods.triggers.artifacts["orange"] then if angelsmods.triggers.bio_pastes["tungsten"] then + contais_artifact_creation = true + data:extend({ --PRE ARTIFACT { @@ -220,14 +365,85 @@ if angelsmods.triggers.artifacts["orange"] then end if bobmods and bobmods.enemies and data.raw.item["small-alien-artifact-orange"] then - if angelsmods.triggers.bio_pastes["tungsten"] then + if angelsmods.triggers.bio_pastes["tungsten"] or angelsmods.exploration then angelsmods.functions.move_item("small-alien-artifact-orange", "bio-processing-alien-small", "c[orange]") end angelsmods.functions.move_item("alien-artifact-orange", "bio-processing-alien-large", "c[orange]") OV.patch_recipes({ { name = "alien-artifact-orange-from-basic", subgroup = "bio-processing-alien-large-convert" }, }) + if angelsmods.exploration then + OV.patch_recipes({ + { name = "alien-artifact-orange-from-small", enabled = false }, + { name = "alien-artifact-orange-from-basic", enabled = false }, + }) + end + else + data:extend({ + -- SMALL ARTIFACT + { + type = "item", + name = "small-alien-artifact-orange", + icon = "__angelsbioprocessing__/graphics/icons/alien-artifact-orange-small.png", + icon_size = 32, + subgroup = "bio-processing-alien-small", + order = "c[orange]", + stack_size = 200, + }, + -- LARGE ARTIFACT + { + type = "item", + name = "alien-artifact-orange", + icon = "__angelsbioprocessing__/graphics/icons/alien-artifact-orange.png", + icon_size = 32, + subgroup = "bio-processing-alien-large", + order = "c[orange]", + stack_size = 200, + }, + { + type = "recipe", + name = "alien-artifact-orange-from-small", + category = "crafting", + enabled = false, + energy_required = 5, + ingredients = { + { type = "item", name = "small-alien-artifact-orange", amount = 25 }, + }, + results = { + { type = "item", name = "alien-artifact-orange", amount = 1 }, + }, + icon_size = 32, + order = "c[orange]", + }, + { + type = "recipe", + name = "alien-artifact-orange-from-basic", + category = "crafting", + subgroup = "bio-processing-alien-large-convert", + enabled = false, + energy_required = 5, + ingredients = { + { type = "item", name = "alien-artifact-orange", amount = 1 }, + { type = "item", name = "alien-artifact", amount = 5 }, + }, + results = { + { type = "item", name = "alien-artifact-orange", amount = 5 }, + }, + icon_size = 32, + order = "c[orange]", + }, + }) + end + + if angelsmods.exploration then + -- responsibility of angels exploration to handle the tech progress + else + OV.disable_technology("angels-alien-artifact-orange") end +else + OV.remove_unlock("angels-alien-artifact-orange", "alien-artifact-orange-from-small") + OV.remove_unlock("angels-alien-artifact-orange", "alien-artifact-orange-from-basic") + OV.disable_technology("angels-alien-artifact-orange") end ------------------------------------------------------------------------------- @@ -235,6 +451,8 @@ end ------------------------------------------------------------------------------- if angelsmods.triggers.artifacts["blue"] then if angelsmods.triggers.bio_pastes["cobalt"] then + contais_artifact_creation = true + data:extend({ --PRE ARTIFACT { @@ -295,14 +513,85 @@ if angelsmods.triggers.artifacts["blue"] then end if bobmods and bobmods.enemies and data.raw.item["small-alien-artifact-blue"] then - if angelsmods.triggers.bio_pastes["cobalt"] then + if angelsmods.triggers.bio_pastes["cobalt"] or angelsmods.exploration then angelsmods.functions.move_item("small-alien-artifact-blue", "bio-processing-alien-small", "d[blue]") end angelsmods.functions.move_item("alien-artifact-blue", "bio-processing-alien-large", "d[blue]") OV.patch_recipes({ { name = "alien-artifact-blue-from-basic", subgroup = "bio-processing-alien-large-convert" }, }) + if angelsmods.exploration then + OV.patch_recipes({ + { name = "alien-artifact-blue-from-small", enabled = false }, + { name = "alien-artifact-blue-from-basic", enabled = false }, + }) + end + else + data:extend({ + -- SMALL ARTIFACT + { + type = "item", + name = "small-alien-artifact-blue", + icon = "__angelsbioprocessing__/graphics/icons/alien-artifact-blue-small.png", + icon_size = 32, + subgroup = "bio-processing-alien-small", + order = "d[blue]", + stack_size = 200, + }, + -- LARGE ARTIFACT + { + type = "item", + name = "alien-artifact-blue", + icon = "__angelsbioprocessing__/graphics/icons/alien-artifact-blue.png", + icon_size = 32, + subgroup = "bio-processing-alien-large", + order = "d[blue]", + stack_size = 200, + }, + { + type = "recipe", + name = "alien-artifact-blue-from-small", + category = "crafting", + enabled = false, + energy_required = 5, + ingredients = { + { type = "item", name = "small-alien-artifact-blue", amount = 25 }, + }, + results = { + { type = "item", name = "alien-artifact-blue", amount = 1 }, + }, + icon_size = 32, + order = "d[blue]", + }, + { + type = "recipe", + name = "alien-artifact-blue-from-basic", + category = "crafting", + subgroup = "bio-processing-alien-large-convert", + enabled = false, + energy_required = 5, + ingredients = { + { type = "item", name = "alien-artifact-blue", amount = 1 }, + { type = "item", name = "alien-artifact", amount = 5 }, + }, + results = { + { type = "item", name = "alien-artifact-blue", amount = 5 }, + }, + icon_size = 32, + order = "d[blue]", + }, + }) + end + + if angelsmods.exploration then + -- responsibility of angels exploration to handle the tech progress + else + OV.disable_technology("angels-alien-artifact-blue") end +else + OV.remove_unlock("angels-alien-artifact-blue", "alien-artifact-blue-from-small") + OV.remove_unlock("angels-alien-artifact-blue", "alien-artifact-blue-from-basic") + OV.disable_technology("angels-alien-artifact-blue") end ------------------------------------------------------------------------------- @@ -310,6 +599,8 @@ end ------------------------------------------------------------------------------- if angelsmods.triggers.artifacts["purple"] then if angelsmods.triggers.bio_pastes["titanium"] then + contais_artifact_creation = true + data:extend({ --PRE ARTIFACT { @@ -370,14 +661,85 @@ if angelsmods.triggers.artifacts["purple"] then end if bobmods and bobmods.enemies and data.raw.item["small-alien-artifact-purple"] then - if angelsmods.triggers.bio_pastes["titanium"] then + if angelsmods.triggers.bio_pastes["titanium"] or angelsmods.exploration then angelsmods.functions.move_item("small-alien-artifact-purple", "bio-processing-alien-small", "e[purple]") end angelsmods.functions.move_item("alien-artifact-purple", "bio-processing-alien-large", "e[purple]") OV.patch_recipes({ { name = "alien-artifact-purple-from-basic", subgroup = "bio-processing-alien-large-convert" }, }) + if angelsmods.exploration then + OV.patch_recipes({ + { name = "alien-artifact-purple-from-small", enabled = false }, + { name = "alien-artifact-purple-from-basic", enabled = false }, + }) + end + else + data:extend({ + -- SMALL ARTIFACT + { + type = "item", + name = "small-alien-artifact-purple", + icon = "__angelsbioprocessing__/graphics/icons/alien-artifact-purple-small.png", + icon_size = 32, + subgroup = "bio-processing-alien-small", + order = "e[purple]", + stack_size = 200, + }, + -- LARGE ARTIFACT + { + type = "item", + name = "alien-artifact-purple", + icon = "__angelsbioprocessing__/graphics/icons/alien-artifact-purple.png", + icon_size = 32, + subgroup = "bio-processing-alien-large", + order = "e[purple]", + stack_size = 200, + }, + { + type = "recipe", + name = "alien-artifact-purple-from-small", + category = "crafting", + enabled = false, + energy_required = 5, + ingredients = { + { type = "item", name = "small-alien-artifact-purple", amount = 25 }, + }, + results = { + { type = "item", name = "alien-artifact-purple", amount = 1 }, + }, + icon_size = 32, + order = "e[purple]", + }, + { + type = "recipe", + name = "alien-artifact-purple-from-basic", + category = "crafting", + subgroup = "bio-processing-alien-large-convert", + enabled = false, + energy_required = 5, + ingredients = { + { type = "item", name = "alien-artifact-purple", amount = 1 }, + { type = "item", name = "alien-artifact", amount = 5 }, + }, + results = { + { type = "item", name = "alien-artifact-purple", amount = 5 }, + }, + icon_size = 32, + order = "e[purple]", + }, + }) + end + + if angelsmods.exploration then + -- responsibility of angels exploration to handle the tech progress + else + OV.disable_technology("angels-alien-artifact-purple") end +else + OV.remove_unlock("angels-alien-artifact-purple", "alien-artifact-purple-from-small") + OV.remove_unlock("angels-alien-artifact-purple", "alien-artifact-purple-from-basic") + OV.disable_technology("angels-alien-artifact-purple") end ------------------------------------------------------------------------------- @@ -385,6 +747,8 @@ end ------------------------------------------------------------------------------- if angelsmods.triggers.artifacts["green"] then if angelsmods.triggers.bio_pastes["zinc"] then + contais_artifact_creation = true + data:extend({ --PRE ARTIFACT { @@ -445,14 +809,85 @@ if angelsmods.triggers.artifacts["green"] then end if bobmods and bobmods.enemies and data.raw.item["small-alien-artifact-green"] then - if angelsmods.triggers.bio_pastes["zinc"] then + if angelsmods.triggers.bio_pastes["zinc"] or angelsmods.exploration then angelsmods.functions.move_item("small-alien-artifact-green", "bio-processing-alien-small", "f[green]") end angelsmods.functions.move_item("alien-artifact-green", "bio-processing-alien-large", "f[green]") OV.patch_recipes({ { name = "alien-artifact-green-from-basic", subgroup = "bio-processing-alien-large-convert" }, }) + if angelsmods.exploration then + OV.patch_recipes({ + { name = "alien-artifact-green-from-small", enabled = false }, + { name = "alien-artifact-green-from-basic", enabled = false }, + }) + end + else + data:extend({ + -- SMALL ARTIFACT + { + type = "item", + name = "small-alien-artifact-green", + icon = "__angelsbioprocessing__/graphics/icons/alien-artifact-green-small.png", + icon_size = 32, + subgroup = "bio-processing-alien-small", + order = "f[green]", + stack_size = 200, + }, + -- LARGE ARTIFACT + { + type = "item", + name = "alien-artifact-green", + icon = "__angelsbioprocessing__/graphics/icons/alien-artifact-green.png", + icon_size = 32, + subgroup = "bio-processing-alien-large", + order = "f[green]", + stack_size = 200, + }, + { + type = "recipe", + name = "alien-artifact-green-from-small", + category = "crafting", + enabled = false, + energy_required = 5, + ingredients = { + { type = "item", name = "small-alien-artifact-green", amount = 25 }, + }, + results = { + { type = "item", name = "alien-artifact-green", amount = 1 }, + }, + icon_size = 32, + order = "f[green]", + }, + { + type = "recipe", + name = "alien-artifact-green-from-basic", + category = "crafting", + subgroup = "bio-processing-alien-large-convert", + enabled = false, + energy_required = 5, + ingredients = { + { type = "item", name = "alien-artifact-green", amount = 1 }, + { type = "item", name = "alien-artifact", amount = 5 }, + }, + results = { + { type = "item", name = "alien-artifact-green", amount = 5 }, + }, + icon_size = 32, + order = "f[green]", + }, + }) + end + + if angelsmods.exploration then + -- responsibility of angels exploration to handle the tech progress + else + OV.disable_technology("angels-alien-artifact-green") end +else + OV.remove_unlock("angels-alien-artifact-green", "alien-artifact-green-from-small") + OV.remove_unlock("angels-alien-artifact-green", "alien-artifact-green-from-basic") + OV.disable_technology("angels-alien-artifact-green") end ------------------------------------------------------------------------------- @@ -460,6 +895,8 @@ end ------------------------------------------------------------------------------- if angelsmods.triggers.artifacts["base"] then -- pink if angelsmods.triggers.bio_pastes["iron"] then + contais_artifact_creation = true + data:extend({ --PRE ARTIFACT { @@ -510,18 +947,75 @@ if angelsmods.triggers.artifacts["base"] then -- pink OV.add_unlock("bio-processing-alien-3", "alien-pre-artifact-base") OV.add_unlock("bio-processing-alien-3", "small-alien-artifact") + OV.add_prereq("bio-processing-alien-3", "angels-alien-artifact") end if bobmods and bobmods.enemies and data.raw.item["small-alien-artifact-blue"] then - if angelsmods.triggers.bio_pastes["iron"] then + if angelsmods.triggers.bio_pastes["iron"] or angelsmods.exploration then angelsmods.functions.move_item("small-alien-artifact", "bio-processing-alien-small", "g[base]") end angelsmods.functions.move_item("alien-artifact", "bio-processing-alien-large", "g[base]") + if angelsmods.exploration then + OV.patch_recipes({ + { name = "alien-artifact-from-small", enabled = false }, + }) + if mods["bobclasses"] and not data.raw.item["rtg"] then + OV.add_prereq("bodies", "angels-alien-artifact") + end + end + else + data:extend({ + -- SMALL ARTIFACT + { + type = "item", + name = "small-alien-artifact", + icon = "__angelsbioprocessing__/graphics/icons/alien-artifact-small.png", + icon_size = 32, + subgroup = "bio-processing-alien-small", + order = "g[base]", + stack_size = 200, + }, + -- LARGE ARTIFACT + { + type = "item", + name = "alien-artifact", + icon = "__angelsbioprocessing__/graphics/icons/alien-artifact.png", + icon_size = 32, + subgroup = "bio-processing-alien-large", + order = "g[base]", + stack_size = 200, + }, + { + type = "recipe", + name = "alien-artifact-from-small", + category = "crafting", + enabled = false, + energy_required = 5, + ingredients = { + { type = "item", name = "small-alien-artifact", amount = 25 }, + }, + results = { + { type = "item", name = "alien-artifact", amount = 1 }, + }, + icon_size = 32, + order = "g[base]", + }, + }) end + + if angelsmods.exploration then + -- responsibility of angels exploration to handle the tech progress + else + OV.remove_prereq("bio-processing-alien-3", "angels-alien-artifact") + OV.disable_technology("angels-alien-artifact") + end +else + OV.remove_unlock("angels-alien-artifact", "alien-artifact-from-small") + OV.disable_technology("angels-alien-artifact") end ------------------------------------------------------------------------------- -if contais_artifacts then +if contais_artifact_creation then else OV.disable_technology("bio-processing-alien-3") end diff --git a/angelsbioprocessing/prototypes/overrides/bio-processing-override-bob.lua b/angelsbioprocessing/prototypes/overrides/bio-processing-override-bob.lua index 44cb045d6..bda96ab5c 100644 --- a/angelsbioprocessing/prototypes/overrides/bio-processing-override-bob.lua +++ b/angelsbioprocessing/prototypes/overrides/bio-processing-override-bob.lua @@ -44,8 +44,7 @@ if mods["bobplates"] then end -- GEMS - OV.add_prereq("gem-processing-1", "geode-crystallization-1") - OV.add_prereq("bio-processing-alien-3", "gem-processing-1") + OV.add_prereq("bio-processing-alien-3", "gem-processing-2") -- CRYSTALS OV.modify_input("crystal-grindstone", { "grinding-wheel", "iron-plate" }) @@ -62,4 +61,32 @@ end if mods["bobassembly"] and settings.startup["bobmods-assembly-burner"].value == true then OV.remove_prereq("bio-processing-brown", "automation") OV.add_prereq("bio-processing-brown", "basic-automation") + OV.remove_prereq("basic-chemistry", "automation") + OV.add_prereq("basic-chemistry", "basic-automation") +end + +if mods["bobelectronics"] then + OV.patch_recipes({ + { + name = "wooden-board", + result_count = 1, + }, + }) + angelsmods.functions.remove_productivity("wooden-board") + + OV.patch_recipes({ + { + name = "phenolic-board", + energy_required = 2, + ingredients = { + { "!!" }, + { type = "fluid", name = "liquid-resin", amount = 10 }, + { type = "item", name = "solid-paper", amount = 10 }, + }, + category = "electronics-with-fluid", + }, + }) + OV.add_prereq("advanced-electronics", "bio-paper-1") + OV.add_prereq("advanced-electronics", "resins") + angelsmods.functions.remove_productivity("phenolic-board") end diff --git a/angelsbioprocessing/prototypes/overrides/bio-processing-override-bobgreenhouse.lua b/angelsbioprocessing/prototypes/overrides/bio-processing-override-bobgreenhouse.lua index a6fe60097..8cc0b2421 100644 --- a/angelsbioprocessing/prototypes/overrides/bio-processing-override-bobgreenhouse.lua +++ b/angelsbioprocessing/prototypes/overrides/bio-processing-override-bobgreenhouse.lua @@ -78,7 +78,7 @@ if mods["bobgreenhouse"] then shift = { -12, 12 }, scale = 0.35, }, - }, 1, angelsmods.bioprocessing.number_tint), + }, 2, angelsmods.bioprocessing.number_tint), }, }) -- manually patch the result as the recipe builder is failing @@ -202,9 +202,6 @@ if mods["bobgreenhouse"] then -- alter angels wood production to require seedlings OV.patch_recipes({ - { name = "tree-generator-1", ingredients = { { type = "item", name = "seedling", amount = 4 } } }, - { name = "tree-generator-2", ingredients = { { type = "item", name = "seedling", amount = 6 } } }, - { name = "tree-generator-3", ingredients = { { type = "item", name = "seedling", amount = 8 } } }, { name = "temperate-tree-generator-1", ingredients = { { type = "item", name = "seedling", amount = 4 } } }, { name = "temperate-tree-generator-2", ingredients = { { type = "item", name = "seedling", amount = 6 } } }, { name = "temperate-tree-generator-3", ingredients = { { type = "item", name = "seedling", amount = 8 } } }, @@ -219,5 +216,8 @@ if mods["bobgreenhouse"] then -- update tech OV.add_prereq("bob-greenhouse", "gardens") OV.add_unlock("bob-greenhouse", "wood-sawing-manual") - OV.add_prereq("bio-arboretum-1", "bob-greenhouse") + OV.add_prereq("bob-greenhouse", "bio-arboretum-1") + OV.add_prereq("bio-arboretum-desert-1", "bob-greenhouse") + OV.add_prereq("bio-arboretum-swamp-1", "bob-greenhouse") + OV.add_prereq("bio-arboretum-temperate-1", "bob-greenhouse") end diff --git a/angelsbioprocessing/prototypes/overrides/bio-processing-override-special-vanilla.lua b/angelsbioprocessing/prototypes/overrides/bio-processing-override-special-vanilla.lua index 3d749dd17..70f95ad1e 100644 --- a/angelsbioprocessing/prototypes/overrides/bio-processing-override-special-vanilla.lua +++ b/angelsbioprocessing/prototypes/overrides/bio-processing-override-special-vanilla.lua @@ -9,13 +9,16 @@ if angelsmods.refining and angelsmods.functions.is_special_vanilla() then OV.add_prereq("advanced-ore-refining-3", "ore-advanced-floatation") OV.disable_recipe({ - --"angelsore-crystal-mix6-processing", "electro-whinning-cell", "electro-whinning-cell-2", - "electro-whinning-cell-3", }) OV.remove_prereq("ore-powderizer", "ore-advanced-crushing") + OV.remove_prereq("ore-powderizer", "advanced-ore-refining-1") + + OV.remove_prereq("ore-advanced-floatation", "chlorine-processing-1") + OV.remove_prereq("ore-advanced-floatation", "thermal-water-extraction-2") + OV.add_prereq("ore-advanced-floatation", "chemical-science-pack") OV.execute() end diff --git a/angelsbioprocessing/prototypes/recipes/bio-module.lua b/angelsbioprocessing/prototypes/recipes/bio-module.lua index 12c187715..3930b99d3 100644 --- a/angelsbioprocessing/prototypes/recipes/bio-module.lua +++ b/angelsbioprocessing/prototypes/recipes/bio-module.lua @@ -41,3 +41,18 @@ data:extend({ result = "angels-bio-yield-module-3", }, }) + +if mods["boblibrary"] then + for _, module_name in pairs({ + "angels-bio-yield-module", + "angels-bio-yield-module-2", + "angels-bio-yield-module-3", + "angels-bio-yield-module-4", + "angels-bio-yield-module-5", + "angels-bio-yield-module-6", + "angels-bio-yield-module-7", + "angels-bio-yield-module-8", + }) do + bobmods.lib.module.exclude_productivity_module(module_name) + end +end diff --git a/angelsbioprocessing/prototypes/recipes/bio-processing-algae.lua b/angelsbioprocessing/prototypes/recipes/bio-processing-algae.lua index 493019722..af66d5e95 100644 --- a/angelsbioprocessing/prototypes/recipes/bio-processing-algae.lua +++ b/angelsbioprocessing/prototypes/recipes/bio-processing-algae.lua @@ -1,7 +1,7 @@ local AF = angelsmods.functions local tints = { - ["solid-sodium-carbonate"] = { AF.fluid_color("Na2CO3") }, - ["solid-alginic-acid"] = { AF.fluid_color("C6H8O6") }, + ["solid-sodium-carbonate"] = AF.fluid_color("Na2CO3"), + ["solid-alginic-acid"] = AF.fluid_color("C6H8O6"), ["algae-brown"] = { r = 225 / 255, g = 160 / 255, b = 106 / 255 }, ["algae-green"] = { r = 84 / 255, g = 118 / 255, b = 76 / 255 }, ["algae-blue"] = { r = 89 / 255, g = 89 / 255, b = 188 / 255 }, diff --git a/angelsbioprocessing/prototypes/recipes/bio-processing-alien.lua b/angelsbioprocessing/prototypes/recipes/bio-processing-alien.lua index 7b2d0cbbd..0e6dc12f3 100644 --- a/angelsbioprocessing/prototypes/recipes/bio-processing-alien.lua +++ b/angelsbioprocessing/prototypes/recipes/bio-processing-alien.lua @@ -1,24 +1,6 @@ data:extend({ --ALIEN ARTIFACTS --PRE - --{ - -- type = "recipe", - -- name = "alien-air-filtering", - -- category = "petrochem-air-filtering", - -- subgroup = "bio-processing-alien-intermediate", - -- enabled = false, - -- energy_required = 20, - -- ingredients ={ - -- {type="fluid", name="water-purified", amount=50}, - -- }, - -- results= - -- { - -- {type="fluid", name="alien-spores", amount=50}, - -- }, - -- icon = "__angelsbioprocessing__/graphics/icons/alien-spores.png", - -- icon_size = 32, - -- order = "a", - --}, { type = "recipe", name = "alien-spores", diff --git a/angelsbioprocessing/prototypes/recipes/bio-processing-entity-angels.lua b/angelsbioprocessing/prototypes/recipes/bio-processing-entity-angels.lua index b00fcfce0..d03cebe44 100644 --- a/angelsbioprocessing/prototypes/recipes/bio-processing-entity-angels.lua +++ b/angelsbioprocessing/prototypes/recipes/bio-processing-entity-angels.lua @@ -317,10 +317,10 @@ angelsmods.functions.RB.build({ enabled = false, ingredients = { { type = "item", name = "compo-1", amount = 1 }, - { type = "item", name = "t1-plate", amount = 2 }, - { type = "item", name = "t1-circuit", amount = 2 }, - { type = "item", name = "t1-brick", amount = 2 }, - { type = "item", name = "t1-gears", amount = 2 }, + { type = "item", name = "t0-plate", amount = 2 }, + { type = "item", name = "t0-circuit", amount = 2 }, + { type = "item", name = "t0-brick", amount = 2 }, + { type = "item", name = "t0-gears", amount = 2 }, }, result = "composter", }, @@ -329,10 +329,10 @@ angelsmods.functions.RB.build({ enabled = false, ingredients = { { type = "item", name = "compo-1", amount = 1 }, - { type = "item", name = "t1-plate", amount = 2 * buildingmulti }, - { type = "item", name = "t1-circuit", amount = 2 * buildingmulti }, - { type = "item", name = "t1-brick", amount = 2 * buildingmulti }, - { type = "item", name = "t1-gears", amount = 2 * buildingmulti }, + { type = "item", name = "t0-plate", amount = 2 * buildingmulti }, + { type = "item", name = "t0-circuit", amount = 2 * buildingmulti }, + { type = "item", name = "t0-brick", amount = 2 * buildingmulti }, + { type = "item", name = "t0-gears", amount = 2 * buildingmulti }, }, result = "composter", }, @@ -466,10 +466,10 @@ angelsmods.functions.RB.build({ enabled = false, ingredients = { { type = "item", name = "temperate-tree", amount = 1 }, - { type = "item", name = "t1-plate", amount = 2 }, - { type = "item", name = "t1-circuit", amount = 2 }, - { type = "item", name = "t1-brick", amount = 1 }, - { type = "item", name = "t1-pipe", amount = 3 }, + { type = "item", name = "t0-plate", amount = 2 }, + { type = "item", name = "t0-circuit", amount = 2 }, + { type = "item", name = "t0-brick", amount = 1 }, + { type = "item", name = "t0-pipe", amount = 3 }, }, result = "bio-generator-temperate-1", }, @@ -478,10 +478,10 @@ angelsmods.functions.RB.build({ enabled = false, ingredients = { { type = "item", name = "temperate-tree", amount = 1 }, - { type = "item", name = "t1-plate", amount = 2 * buildingmulti }, - { type = "item", name = "t1-circuit", amount = 2 * buildingmulti }, - { type = "item", name = "t1-brick", amount = 1 * buildingmulti }, - { type = "item", name = "t1-pipe", amount = 3 * buildingmulti }, + { type = "item", name = "t0-plate", amount = 2 * buildingmulti }, + { type = "item", name = "t0-circuit", amount = 2 * buildingmulti }, + { type = "item", name = "t0-brick", amount = 1 * buildingmulti }, + { type = "item", name = "t0-pipe", amount = 3 * buildingmulti }, }, result = "bio-generator-temperate-1", }, @@ -494,10 +494,10 @@ angelsmods.functions.RB.build({ enabled = false, ingredients = { { type = "item", name = "swamp-tree", amount = 1 }, - { type = "item", name = "t1-plate", amount = 2 }, - { type = "item", name = "t1-circuit", amount = 2 }, - { type = "item", name = "t1-brick", amount = 1 }, - { type = "item", name = "t1-pipe", amount = 3 }, + { type = "item", name = "t0-plate", amount = 2 }, + { type = "item", name = "t0-circuit", amount = 2 }, + { type = "item", name = "t0-brick", amount = 1 }, + { type = "item", name = "t0-pipe", amount = 3 }, }, result = "bio-generator-swamp-1", }, @@ -506,10 +506,10 @@ angelsmods.functions.RB.build({ enabled = false, ingredients = { { type = "item", name = "swamp-tree", amount = 1 }, - { type = "item", name = "t1-plate", amount = 2 * buildingmulti }, - { type = "item", name = "t1-circuit", amount = 2 * buildingmulti }, - { type = "item", name = "t1-brick", amount = 1 * buildingmulti }, - { type = "item", name = "t1-pipe", amount = 3 * buildingmulti }, + { type = "item", name = "t0-plate", amount = 2 * buildingmulti }, + { type = "item", name = "t0-circuit", amount = 2 * buildingmulti }, + { type = "item", name = "t0-brick", amount = 1 * buildingmulti }, + { type = "item", name = "t0-pipe", amount = 3 * buildingmulti }, }, result = "bio-generator-swamp-1", }, @@ -522,10 +522,10 @@ angelsmods.functions.RB.build({ enabled = false, ingredients = { { type = "item", name = "desert-tree", amount = 1 }, - { type = "item", name = "t1-plate", amount = 2 }, - { type = "item", name = "t1-circuit", amount = 2 }, - { type = "item", name = "t1-brick", amount = 1 }, - { type = "item", name = "t1-pipe", amount = 3 }, + { type = "item", name = "t0-plate", amount = 2 }, + { type = "item", name = "t0-circuit", amount = 2 }, + { type = "item", name = "t0-brick", amount = 1 }, + { type = "item", name = "t0-pipe", amount = 3 }, }, result = "bio-generator-desert-1", }, @@ -534,10 +534,10 @@ angelsmods.functions.RB.build({ enabled = false, ingredients = { { type = "item", name = "desert-tree", amount = 1 }, - { type = "item", name = "t1-plate", amount = 2 * buildingmulti }, - { type = "item", name = "t1-circuit", amount = 2 * buildingmulti }, - { type = "item", name = "t1-brick", amount = 1 * buildingmulti }, - { type = "item", name = "t1-pipe", amount = 3 * buildingmulti }, + { type = "item", name = "t0-plate", amount = 2 * buildingmulti }, + { type = "item", name = "t0-circuit", amount = 2 * buildingmulti }, + { type = "item", name = "t0-brick", amount = 1 * buildingmulti }, + { type = "item", name = "t0-pipe", amount = 3 * buildingmulti }, }, result = "bio-generator-desert-1", }, @@ -551,10 +551,10 @@ angelsmods.functions.RB.build({ enabled = false, ingredients = { { type = "item", name = "arboretum-1", amount = 1 }, - { type = "item", name = "t1-plate", amount = 6 }, - { type = "item", name = "t1-circuit", amount = 2 }, - { type = "item", name = "t1-brick", amount = 6 }, - { type = "item", name = "t1-pipe", amount = 8 }, + { type = "item", name = "t0-plate", amount = 6 }, + { type = "item", name = "t0-circuit", amount = 2 }, + { type = "item", name = "t0-brick", amount = 6 }, + { type = "item", name = "t0-pipe", amount = 8 }, }, result = "bio-arboretum-1", }, @@ -563,10 +563,10 @@ angelsmods.functions.RB.build({ enabled = false, ingredients = { { type = "item", name = "arboretum-1", amount = 1 }, - { type = "item", name = "t1-plate", amount = 6 * buildingmulti }, - { type = "item", name = "t1-circuit", amount = 2 * buildingmulti }, - { type = "item", name = "t1-brick", amount = 6 * buildingmulti }, - { type = "item", name = "t1-pipe", amount = 8 * buildingmulti }, + { type = "item", name = "t0-plate", amount = 6 * buildingmulti }, + { type = "item", name = "t0-circuit", amount = 2 * buildingmulti }, + { type = "item", name = "t0-brick", amount = 6 * buildingmulti }, + { type = "item", name = "t0-pipe", amount = 8 * buildingmulti }, }, result = "bio-arboretum-1", }, diff --git a/angelsbioprocessing/prototypes/recipes/bio-processing-paper.lua b/angelsbioprocessing/prototypes/recipes/bio-processing-paper.lua index cbf9d8b7f..28abd7c5b 100644 --- a/angelsbioprocessing/prototypes/recipes/bio-processing-paper.lua +++ b/angelsbioprocessing/prototypes/recipes/bio-processing-paper.lua @@ -3,6 +3,7 @@ data:extend({ { type = "recipe", name = "cellulose-fiber-raw-wood", + localised_name = { "recipe-name.cellulose-fiber-raw-wood" }, category = "crafting", subgroup = "bio-processing-wood", enabled = true, @@ -13,6 +14,8 @@ data:extend({ results = { { type = "item", name = "cellulose-fiber", amount = 4 }, }, + always_show_products = true, + show_amount_in_title = false, icon = "__angelsbioprocessing__/graphics/icons/cellulose-fiber-raw-wood.png", icon_size = 32, order = "b", @@ -54,6 +57,7 @@ data:extend({ { type = "recipe", name = "gas-carbon-dioxide-from-wood", + localised_name = { "recipe-name.gas-carbon-dioxide-from-wood" }, category = "liquifying", subgroup = "bio-processing-wood", enabled = false, @@ -65,6 +69,7 @@ data:extend({ { type = "fluid", name = "gas-carbon-dioxide", amount = 70 }, }, always_show_products = true, + show_amount_in_title = false, icons = AF.create_gas_recipe_icon({ { "__angelspetrochem__/graphics/icons/molecules/carbon-dioxide.png", 72 }, }, "COcOc"), @@ -120,18 +125,22 @@ data:extend({ { type = "recipe", name = "solid-wood-pulp", - category = "crafting", + category = "liquifying", subgroup = "bio-paper", enabled = false, - energy_required = 4, + energy_required = 20, ingredients = { { type = "item", name = "cellulose-fiber", amount = 20 }, { type = "item", name = "solid-alginic-acid", amount = 5 }, + { type = "fluid", name = "water", amount = 20 }, }, results = { { type = "item", name = "solid-wood-pulp", amount = 20 }, }, icons = AF.add_number_icon_layer(AF.get_object_icons("solid-wood-pulp"), 1, angelsmods.bioprocessing.number_tint), + crafting_machine_tint = AF.get_recipe_tints({ + "water", + }), order = "aa", }, --T2 SULFITE PROCESS @@ -249,6 +258,7 @@ data:extend({ { type = "recipe", name = "kraft-recovery", + localised_name = { "recipe-name.kraft-recovery" }, category = "liquifying", subgroup = "bio-liquor", enabled = false, @@ -261,6 +271,7 @@ data:extend({ }, main_product = "liquid-green-liquor", always_show_products = true, + show_amount_in_title = false, crafting_machine_tint = AF.get_recipe_tints({ "liquid-green-liquor", "liquid-black-liquor", @@ -272,6 +283,7 @@ data:extend({ { type = "recipe", name = "kraft-causting", + localised_name = { "recipe-name.kraft-causting" }, category = "chemistry", subgroup = "bio-liquor", enabled = false, @@ -307,7 +319,7 @@ data:extend({ { type = "fluid", name = "liquid-white-liquor", amount = 40 }, }, results = { - { type = "item", name = "solid-wood-pulp", amount = 30 }, + { type = "item", name = "solid-wood-pulp", amount = 40 }, { type = "fluid", name = "liquid-black-liquor", amount_min = 35, amount_max = 40 }, }, always_show_products = true, @@ -324,6 +336,7 @@ data:extend({ { type = "recipe", name = "paper-bleaching-1", + localised_name = { "recipe-name.paper-bleaching-1" }, category = "crafting", subgroup = "bio-paper", enabled = false, @@ -332,9 +345,10 @@ data:extend({ { type = "item", name = "solid-wood-pulp", amount = 2 }, }, results = { - { type = "item", name = "solid-paper", amount = 4 }, + { type = "item", name = "solid-paper", amount = 3 }, }, - --main_product = "solid-paper", + always_show_products = true, + show_amount_in_title = false, allow_decomposition = false, icons = AF.add_number_icon_layer(AF.get_object_icons("solid-paper"), 1, angelsmods.bioprocessing.number_tint), order = "ba", @@ -345,47 +359,66 @@ data:extend({ category = "liquifying", subgroup = "bio-paper", enabled = false, - energy_required = 4, + energy_required = 2, ingredients = { { type = "item", name = "solid-wood-pulp", amount = 2 }, { type = "item", name = "solid-sodium-hydroxide", amount = 2 }, - { type = "fluid", name = "gas-chlorine", amount = 60 }, + { type = "fluid", name = "gas-chlorine", amount = 80 }, }, results = { - { type = "item", name = "solid-paper", amount = 5 }, + { type = "item", name = "solid-paper", amount = 4 }, { type = "item", name = "solid-sodium-hypochlorite", amount = 2 }, }, - --main_product = "solid-paper", allow_decomposition = false, icons = AF.add_number_icon_layer(AF.get_object_icons("solid-paper"), 2, angelsmods.bioprocessing.number_tint), crafting_machine_tint = AF.get_recipe_tints({ AF.fluid_color("NaOCl"), "gas-chlorine", AF.fluid_color("NaOH"), - { 1, 1, 1, 1 },--[[paper]] + { r = 1, g = 1, b = 1, a = 1 },--[[paper]] }), order = "bb", }, + -- SOLID SOIDUM HYPOCHLORITE DECOMPOSITION + { + type = "recipe", + name = "solid-sodium-hypochlorite-decomposition", + localised_name = { "recipe-name.solid-sodium-hypochlorite-decomposition" }, + category = "chemical-smelting", + subgroup = "petrochem-sodium", + energy_required = 2, + enabled = false, + ingredients = { + { type = "item", name = "solid-sodium-hypochlorite", amount = 10 }, + }, + results = { + { type = "item", name = "solid-salt", amount = 20 }, + { type = "fluid", name = "gas-oxygen", amount = 100 }, + }, + main_product = "solid-salt", + icon_size = 32, + crafting_machine_tint = AF.get_recipe_tints({ "gas-oxygen", AF.fluid_color("NaOCl") }), + order = "g[solid-sodium-hypochlorite-decomposition]", + }, { type = "recipe", name = "paper-bleaching-3", - category = "advanced-chemistry", + category = "chemistry", subgroup = "bio-paper", enabled = false, - energy_required = 4, + energy_required = 2, ingredients = { { type = "item", name = "solid-wood-pulp", amount = 2 }, { type = "item", name = "solid-sodium-hydroxide", amount = 2 }, - { type = "fluid", name = "gas-oxygen", amount = 60 }, { type = "fluid", name = "gas-sulfur-dioxide", amount = 40 }, { type = "fluid", name = "water", amount = 100 }, }, results = { - { type = "item", name = "solid-paper", amount = 6 }, + { type = "item", name = "solid-paper", amount = 10 }, { type = "item", name = "solid-sodium-carbonate", amount = 2 }, + { type = "fluid", name = "gas-oxygen", amount = 40 }, { type = "fluid", name = "water-yellow-waste", amount = 100 }, }, - --main_product = "solid-paper", allow_decomposition = false, icons = AF.add_number_icon_layer(AF.get_object_icons("solid-paper"), 3, angelsmods.bioprocessing.number_tint), crafting_machine_tint = AF.get_recipe_tints({ "water-yellow-waste", "water", "gas-oxygen", "gas-sulfur-dioxide" }), diff --git a/angelsbioprocessing/prototypes/recipes/bio-refugium-puffer.lua b/angelsbioprocessing/prototypes/recipes/bio-refugium-puffer.lua index 1840c3cf6..572aada2a 100644 --- a/angelsbioprocessing/prototypes/recipes/bio-refugium-puffer.lua +++ b/angelsbioprocessing/prototypes/recipes/bio-refugium-puffer.lua @@ -237,7 +237,7 @@ data:extend({ }, { type = "fluid", - name = "gas-puffer-atmosphere", + name = "gas-acid", amount = 20, catalyst_amount = 20, show_details_in_recipe_tooltip = false, diff --git a/angelsbioprocessing/prototypes/recipes/crop-farming-gardens.lua b/angelsbioprocessing/prototypes/recipes/crop-farming-gardens.lua index a93a59880..eb3d9871f 100644 --- a/angelsbioprocessing/prototypes/recipes/crop-farming-gardens.lua +++ b/angelsbioprocessing/prototypes/recipes/crop-farming-gardens.lua @@ -10,6 +10,7 @@ data:extend({ subgroup = "farming-temperate-seed", enabled = false, energy_required = 300, + overload_multiplier = 1, ingredients = { { type = "item", name = "temperate-garden", amount = 1 }, }, @@ -39,6 +40,7 @@ data:extend({ subgroup = "farming-temperate-seed", enabled = false, energy_required = 60, + overload_multiplier = 1, ingredients = { { type = "item", name = "temperate-garden", amount = 1, catalyst_amount = 1 }, { type = "item", name = "solid-alienated-fertilizer", amount = 2 }, @@ -63,6 +65,7 @@ data:extend({ subgroup = "farming-temperate-seed", enabled = false, energy_required = 300, + overload_multiplier = 1, ingredients = { { type = "item", name = "temperate-garden", amount = 1 }, }, @@ -120,6 +123,7 @@ data:extend({ subgroup = "farming-temperate-seed", enabled = false, energy_required = 300, + overload_multiplier = 1, ingredients = { { type = "item", name = "temperate-garden", amount = 1 }, }, @@ -172,6 +176,7 @@ data:extend({ subgroup = "farming-desert-seed", enabled = false, energy_required = 300, + overload_multiplier = 1, ingredients = { { type = "item", name = "desert-garden", amount = 1 }, }, @@ -201,6 +206,7 @@ data:extend({ subgroup = "farming-desert-seed", enabled = false, energy_required = 60, + overload_multiplier = 1, ingredients = { { type = "item", name = "desert-garden", amount = 1, catalyst_amount = 1 }, { type = "item", name = "solid-alienated-fertilizer", amount = 2 }, @@ -225,6 +231,7 @@ data:extend({ subgroup = "farming-desert-seed", enabled = false, energy_required = 300, + overload_multiplier = 1, ingredients = { { type = "item", name = "desert-garden", amount = 1 }, }, @@ -282,6 +289,7 @@ data:extend({ subgroup = "farming-desert-seed", enabled = false, energy_required = 300, + overload_multiplier = 1, ingredients = { { type = "item", name = "desert-garden", amount = 1 }, }, @@ -334,6 +342,7 @@ data:extend({ subgroup = "farming-swamp-seed", enabled = false, energy_required = 300, + overload_multiplier = 1, ingredients = { { type = "item", name = "swamp-garden", amount = 1 }, }, @@ -363,6 +372,7 @@ data:extend({ subgroup = "farming-swamp-seed", enabled = false, energy_required = 60, + overload_multiplier = 1, ingredients = { { type = "item", name = "swamp-garden", amount = 1, catalyst_amount = 1 }, { type = "item", name = "solid-alienated-fertilizer", amount = 2 }, @@ -387,6 +397,7 @@ data:extend({ subgroup = "farming-swamp-seed", enabled = false, energy_required = 300, + overload_multiplier = 1, ingredients = { { type = "item", name = "swamp-garden", amount = 1 }, }, @@ -444,6 +455,7 @@ data:extend({ subgroup = "farming-swamp-seed", enabled = false, energy_required = 300, + overload_multiplier = 1, ingredients = { { type = "item", name = "swamp-garden", amount = 1 }, }, @@ -639,6 +651,7 @@ data:extend({ -- subgroup = "farming-temperate-seed", -- enabled = false, -- energy_required = 600, + -- overload_multiplier = 1, -- ingredients = -- { -- {type = "item", name = "desert-garden", amount = 1}, @@ -662,6 +675,7 @@ data:extend({ -- subgroup = "bio-processor-swamp", -- enabled = false, -- energy_required = 600, + -- overload_multiplier = 1, -- ingredients = -- { -- {type = "item", name = "swamp-garden", amount = 1}, @@ -685,6 +699,7 @@ data:extend({ -- subgroup = "farming-temperate", -- enabled = false, -- energy_required = 600, + -- overload_multiplier = 1, -- ingredients = -- { -- {type = "item", name = "temperate-garden", amount = 1}, @@ -708,6 +723,7 @@ data:extend({ -- subgroup = "bio-processor-swamp", -- enabled = false, -- energy_required = 600, + -- overload_multiplier = 1, -- ingredients = -- { -- {type = "item", name = "desert-garden", amount = 1}, @@ -731,6 +747,7 @@ data:extend({ -- subgroup = "bio-processor-temperate", -- enabled = false, -- energy_required = 600, + -- overload_multiplier = 1, -- ingredients = -- { -- {type = "item", name = "swamp-garden", amount = 1}, @@ -754,6 +771,7 @@ data:extend({ -- subgroup = "farming-desert-seed", -- enabled = false, -- energy_required = 600, + -- overload_multiplier = 1, -- ingredients = -- { -- {type = "item", name = "temperate-garden", amount = 4}, diff --git a/angelsbioprocessing/prototypes/technology/bio-processing-algae.lua b/angelsbioprocessing/prototypes/technology/bio-processing-algae.lua index 4ffc89113..a9724f9f9 100644 --- a/angelsbioprocessing/prototypes/technology/bio-processing-algae.lua +++ b/angelsbioprocessing/prototypes/technology/bio-processing-algae.lua @@ -13,10 +13,6 @@ data:extend({ type = "unlock-recipe", recipe = "algae-farm", }, - { - type = "unlock-recipe", - recipe = "solid-alginic-acid", - }, { type = "unlock-recipe", recipe = "algae-green-simple", @@ -27,11 +23,11 @@ data:extend({ }, }, unit = { - count = 50, + count = 10, ingredients = { { type = "item", name = "automation-science-pack", amount = 1 }, }, - time = 30, + time = 15, }, ignore_tech_cost_multiplier = true, }, diff --git a/angelsbioprocessing/prototypes/technology/bio-processing-alien.lua b/angelsbioprocessing/prototypes/technology/bio-processing-alien.lua index 183fb9f46..fd60d3b28 100644 --- a/angelsbioprocessing/prototypes/technology/bio-processing-alien.lua +++ b/angelsbioprocessing/prototypes/technology/bio-processing-alien.lua @@ -8,8 +8,7 @@ data:extend({ order = "c-a", prerequisites = { "bio-processing-brown", - "bio-nutrient-paste", - "chlorine-processing-1", + "chlorine-processing-2", }, effects = { { @@ -67,38 +66,23 @@ data:extend({ prerequisites = { "bio-refugium-fish-1", "bio-processing-red", - "bio-processing-paste", - "plastics", + "chlorine-processing-1", }, effects = { { type = "unlock-recipe", - --recipe = "alien-air-filtering" recipe = "alien-spores", }, { type = "unlock-recipe", recipe = "alien-bacteria", }, - { - type = "unlock-recipe", - recipe = "petri-dish", - }, - { - type = "unlock-recipe", - recipe = "substrate-dish", - }, - { - type = "unlock-recipe", - recipe = "seeded-dish", - }, }, unit = { count = 50, ingredients = { { type = "item", name = "automation-science-pack", amount = 1 }, { type = "item", name = "logistic-science-pack", amount = 1 }, - --{"chemical-science-pack", amount = 1}, }, time = 30, }, @@ -111,21 +95,21 @@ data:extend({ order = "c-a", prerequisites = { "bio-processing-alien-1", - "geode-processing-2", - "ore-powderizer", + "bio-processing-paste", + "plastics", }, effects = { { type = "unlock-recipe", - recipe = "crystal-powder-from-dust", + recipe = "petri-dish", }, { type = "unlock-recipe", - recipe = "crystal-powder-slurry", + recipe = "substrate-dish", }, { type = "unlock-recipe", - recipe = "crystal-enhancer", + recipe = "seeded-dish", }, }, unit = { @@ -169,7 +153,7 @@ data:extend({ order = "c-a", prerequisites = { "bio-refugium-fish-1", - "geode-processing-2", + "geode-processing-1", }, effects = { { @@ -215,7 +199,7 @@ data:extend({ order = "c-a", prerequisites = { "bio-processing-crystal-splinter-1", - "bio-processing-alien-1", + "bio-processing-alien-2", }, effects = { { @@ -250,6 +234,7 @@ data:extend({ prerequisites = { "bio-processing-crystal-splinter-2", "bio-processing-alien-2", + "ore-powderizer", }, effects = { { @@ -264,6 +249,14 @@ data:extend({ type = "unlock-recipe", recipe = "crystal-powder-splinter-green", }, + { + type = "unlock-recipe", + recipe = "crystal-powder-from-dust", + }, + { + type = "unlock-recipe", + recipe = "crystal-powder-slurry", + }, }, unit = { count = 50, @@ -283,12 +276,10 @@ data:extend({ icon_size = 128, order = "c-a", prerequisites = { - "bio-processing-alien-1", - --"bio-refugium-hatchery", + "bio-processing-alien-2", "bio-refugium-puffer-2", "bio-processing-crystal-splinter-1", "ore-powderizer", - "geode-processing-2", "slag-processing-2", }, effects = { @@ -342,8 +333,13 @@ data:extend({ "bio-processing-alien-2", "bio-processing-crystal-shard-1", "bio-processing-crystal-splinter-2", + "geode-processing-2", }, effects = { + { + type = "unlock-recipe", + recipe = "crystal-enhancer", + }, { type = "unlock-recipe", recipe = "crystal-shard-crystalization-2", diff --git a/angelsbioprocessing/prototypes/technology/bio-processing-artifacts.lua b/angelsbioprocessing/prototypes/technology/bio-processing-artifacts.lua new file mode 100644 index 000000000..513c41a36 --- /dev/null +++ b/angelsbioprocessing/prototypes/technology/bio-processing-artifacts.lua @@ -0,0 +1,300 @@ +data:extend({ + ------------------------------------------------------------------------------- + -- RED ARTIFACTS -------------------------------------------------------------- + ------------------------------------------------------------------------------- + { + type = "tool", + name = "alien-artifact-red-tool", + localised_name = { "item-name.small-alien-artifact-red" }, + localised_description = { "item-description.alien-artifact-tool" }, + icon = "__angelsbioprocessing__/graphics/icons/alien-artifact-red-small.png", + icon_size = 32, + flags = { "hidden" }, + stack_size = 1, + durability = 1, + order = "zzz", + }, + { + type = "technology", + name = "angels-alien-artifact-red", + localised_name = { "item-name.alien-artifact-red" }, + icon = "__angelsbioprocessing__/graphics/technology/paste.png", + icon_size = 128, + order = "c-a", + prerequisites = { + "angels-alien-artifact-purple", + "angels-alien-artifact-yellow", + }, + effects = { + { + type = "unlock-recipe", + recipe = "alien-artifact-red-from-small", + }, + { + type = "unlock-recipe", + recipe = "alien-artifact-red-from-basic", + }, + }, + unit = { + count = 50, + ingredients = { + { type = "item", name = "alien-artifact-red-tool", amount = 1 }, + }, + time = 30, + }, + }, + ------------------------------------------------------------------------------- + -- YELLOW ARTIFACTS ----------------------------------------------------------- + ------------------------------------------------------------------------------- + { + type = "tool", + name = "alien-artifact-yellow-tool", + localised_name = { "item-name.small-alien-artifact-yellow" }, + localised_description = { "item-description.alien-artifact-tool" }, + icon = "__angelsbioprocessing__/graphics/icons/alien-artifact-yellow-small.png", + icon_size = 32, + flags = { "hidden" }, + stack_size = 1, + durability = 1, + order = "zzz", + }, + { + type = "technology", + name = "angels-alien-artifact-yellow", + localised_name = { "item-name.alien-artifact-yellow" }, + icon = "__angelsbioprocessing__/graphics/technology/paste.png", + icon_size = 128, + order = "c-a", + prerequisites = { + "angels-alien-artifact-blue", + "angels-alien-artifact-orange", + }, + effects = { + { + type = "unlock-recipe", + recipe = "alien-artifact-yellow-from-small", + }, + { + type = "unlock-recipe", + recipe = "alien-artifact-yellow-from-basic", + }, + }, + unit = { + count = 50, + ingredients = { + { type = "item", name = "alien-artifact-yellow-tool", amount = 1 }, + }, + time = 30, + }, + }, + ------------------------------------------------------------------------------- + -- ORANGE ARTIFACTS ----------------------------------------------------------- + ------------------------------------------------------------------------------- + { + type = "tool", + name = "alien-artifact-orange-tool", + localised_name = { "item-name.small-alien-artifact-orange" }, + localised_description = { "item-description.alien-artifact-tool" }, + icon = "__angelsbioprocessing__/graphics/icons/alien-artifact-orange-small.png", + icon_size = 32, + flags = { "hidden" }, + stack_size = 1, + durability = 1, + order = "zzz", + }, + { + type = "technology", + name = "angels-alien-artifact-orange", + localised_name = { "item-name.alien-artifact-orange" }, + icon = "__angelsbioprocessing__/graphics/technology/paste.png", + icon_size = 128, + order = "c-a", + prerequisites = { + "angels-alien-artifact", + }, + effects = { + { + type = "unlock-recipe", + recipe = "alien-artifact-orange-from-small", + }, + { + type = "unlock-recipe", + recipe = "alien-artifact-orange-from-basic", + }, + }, + unit = { + count = 50, + ingredients = { + { type = "item", name = "alien-artifact-orange-tool", amount = 1 }, + }, + time = 30, + }, + }, + ------------------------------------------------------------------------------- + -- BLUE ARTIFACTS ------------------------------------------------------------- + ------------------------------------------------------------------------------- + { + type = "tool", + name = "alien-artifact-blue-tool", + localised_name = { "item-name.small-alien-artifact-blue" }, + localised_description = { "item-description.alien-artifact-tool" }, + icon = "__angelsbioprocessing__/graphics/icons/alien-artifact-blue-small.png", + icon_size = 32, + flags = { "hidden" }, + stack_size = 1, + durability = 1, + order = "zzz", + }, + { + type = "technology", + name = "angels-alien-artifact-blue", + localised_name = { "item-name.alien-artifact-blue" }, + icon = "__angelsbioprocessing__/graphics/technology/paste.png", + icon_size = 128, + order = "c-a", + prerequisites = { + "angels-alien-artifact", + }, + effects = { + { + type = "unlock-recipe", + recipe = "alien-artifact-blue-from-small", + }, + { + type = "unlock-recipe", + recipe = "alien-artifact-blue-from-basic", + }, + }, + unit = { + count = 50, + ingredients = { + { type = "item", name = "alien-artifact-blue-tool", amount = 1 }, + }, + time = 30, + }, + }, + ------------------------------------------------------------------------------- + -- PURPLE ARTIFACTS ----------------------------------------------------------- + ------------------------------------------------------------------------------- + { + type = "tool", + name = "alien-artifact-purple-tool", + localised_name = { "item-name.small-alien-artifact-purple" }, + localised_description = { "item-description.alien-artifact-tool" }, + icon = "__angelsbioprocessing__/graphics/icons/alien-artifact-purple-small.png", + icon_size = 32, + flags = { "hidden" }, + stack_size = 1, + durability = 1, + order = "zzz", + }, + { + type = "technology", + name = "angels-alien-artifact-purple", + localised_name = { "item-name.alien-artifact-purple" }, + icon = "__angelsbioprocessing__/graphics/technology/paste.png", + icon_size = 128, + order = "c-a", + prerequisites = { + "angels-alien-artifact-blue", + "angels-alien-artifact-orange", + }, + effects = { + { + type = "unlock-recipe", + recipe = "alien-artifact-purple-from-small", + }, + { + type = "unlock-recipe", + recipe = "alien-artifact-purple-from-basic", + }, + }, + unit = { + count = 50, + ingredients = { + { type = "item", name = "alien-artifact-purple-tool", amount = 1 }, + }, + time = 30, + }, + }, + ------------------------------------------------------------------------------- + -- GREEN ARTIFACTS ------------------------------------------------------------ + ------------------------------------------------------------------------------- + { + type = "tool", + name = "alien-artifact-green-tool", + localised_name = { "item-name.small-alien-artifact-green" }, + localised_description = { "item-description.alien-artifact-tool" }, + icon = "__angelsbioprocessing__/graphics/icons/alien-artifact-green-small.png", + icon_size = 32, + flags = { "hidden" }, + stack_size = 1, + durability = 1, + order = "zzz", + }, + { + type = "technology", + name = "angels-alien-artifact-green", + localised_name = { "item-name.alien-artifact-green" }, + icon = "__angelsbioprocessing__/graphics/technology/paste.png", + icon_size = 128, + order = "c-a", + prerequisites = { + "angels-alien-artifact-purple", + "angels-alien-artifact-yellow", + }, + effects = { + { + type = "unlock-recipe", + recipe = "alien-artifact-green-from-small", + }, + { + type = "unlock-recipe", + recipe = "alien-artifact-green-from-basic", + }, + }, + unit = { + count = 50, + ingredients = { + { type = "item", name = "alien-artifact-green-tool", amount = 1 }, + }, + time = 30, + }, + }, + ------------------------------------------------------------------------------- + -- BASE ARTIFACTS (pink) ------------------------------------------------------ + ------------------------------------------------------------------------------- + { + type = "tool", + name = "alien-artifact-tool", + localised_name = { "item-name.small-alien-artifact" }, + icon = "__angelsbioprocessing__/graphics/icons/alien-artifact-small.png", + icon_size = 32, + flags = { "hidden" }, + stack_size = 1, + durability = 1, + order = "zzz", + }, + { + type = "technology", + name = "angels-alien-artifact", + localised_name = { "item-name.alien-artifact" }, + icon = "__angelsbioprocessing__/graphics/technology/paste.png", + icon_size = 128, + order = "c-a", + prerequisites = {}, + effects = { + { + type = "unlock-recipe", + recipe = "alien-artifact-from-small", + }, + }, + unit = { + count = 50, + ingredients = { + { type = "item", name = "alien-artifact-tool", amount = 1 }, + }, + time = 30, + }, + }, +}) diff --git a/angelsbioprocessing/prototypes/technology/bio-processing-wood-paper.lua b/angelsbioprocessing/prototypes/technology/bio-processing-wood-paper.lua index 0bc59e67a..8d1674a9e 100644 --- a/angelsbioprocessing/prototypes/technology/bio-processing-wood-paper.lua +++ b/angelsbioprocessing/prototypes/technology/bio-processing-wood-paper.lua @@ -29,9 +29,8 @@ data:extend({ icon_size = 128, order = "c-a", prerequisites = { + "bio-farm-1", "bio-wood-processing", - "angels-coal-processing", - "advanced-material-processing", }, effects = { { @@ -40,18 +39,13 @@ data:extend({ }, { type = "unlock-recipe", - recipe = "carbon-from-charcoal", - }, - { - type = "unlock-recipe", - recipe = "gas-carbon-dioxide-from-wood", + recipe = "bio-resin-wood-reprocessing", }, }, unit = { count = 50, ingredients = { { type = "item", name = "automation-science-pack", amount = 1 }, - { type = "item", name = "logistic-science-pack", amount = 1 }, }, time = 30, }, @@ -63,14 +57,23 @@ data:extend({ icon_size = 128, order = "c-a", prerequisites = { + "angels-coal-processing", "bio-wood-processing-2", - "angels-coal-processing-3", + "logistic-science-pack", }, effects = { { type = "unlock-recipe", recipe = "wood-bricks", }, + { + type = "unlock-recipe", + recipe = "carbon-from-charcoal", + }, + { + type = "unlock-recipe", + recipe = "gas-carbon-dioxide-from-wood", + }, }, unit = { count = 50, @@ -92,8 +95,8 @@ data:extend({ icon_size = 128, order = "c-a", prerequisites = { - "bio-wood-processing", - "bio-farm-1", + "angels-composting", + "bio-processing-brown", }, effects = { { @@ -108,10 +111,6 @@ data:extend({ type = "unlock-recipe", recipe = "bio-generator-desert-1", }, - { - type = "unlock-recipe", - recipe = "tree-arboretum-1", - }, { type = "unlock-recipe", recipe = "bio-arboretum-1", @@ -122,24 +121,25 @@ data:extend({ }, { type = "unlock-recipe", - recipe = "wood-sawing-1", + recipe = "tree-arboretum-1", }, { type = "unlock-recipe", - recipe = "solid-saw", + recipe = "wood-sawing-1", }, { type = "unlock-recipe", - recipe = "bio-resin-wood-reprocessing", + recipe = "solid-saw", }, }, unit = { - count = 50, + count = 10, ingredients = { { type = "item", name = "automation-science-pack", amount = 1 }, }, - time = 30, + time = 15, }, + ignore_tech_cost_multiplier = true, }, { type = "technology", @@ -578,9 +578,15 @@ data:extend({ icon_size = 128, order = "c-a", prerequisites = { + "basic-chemistry", "bio-processing-brown", + "logistic-science-pack", }, effects = { + { + type = "unlock-recipe", + recipe = "solid-alginic-acid", + }, { type = "unlock-recipe", recipe = "solid-wood-pulp", @@ -594,10 +600,10 @@ data:extend({ count = 50, ingredients = { { type = "item", name = "automation-science-pack", amount = 1 }, + { type = "item", name = "logistic-science-pack", amount = 1 }, }, time = 30, }, - ignore_tech_cost_multiplier = true, }, { type = "technology", @@ -606,10 +612,10 @@ data:extend({ icon_size = 128, order = "c-a", prerequisites = { + "angels-nitrogen-processing-2", "bio-paper-1", + "chemical-science-pack", "chlorine-processing-1", - "angels-nitrogen-processing-2", - "angels-sulfur-processing-2", }, effects = { { @@ -634,6 +640,7 @@ data:extend({ ingredients = { { type = "item", name = "automation-science-pack", amount = 1 }, { type = "item", name = "logistic-science-pack", amount = 1 }, + { type = "item", name = "chemical-science-pack", amount = 1 }, }, time = 30, }, @@ -646,7 +653,8 @@ data:extend({ order = "c-a", prerequisites = { "bio-paper-2", - "chlorine-processing-3", + "sodium-processing-2", + "production-science-pack", }, effects = { { @@ -676,6 +684,7 @@ data:extend({ { type = "item", name = "automation-science-pack", amount = 1 }, { type = "item", name = "logistic-science-pack", amount = 1 }, { type = "item", name = "chemical-science-pack", amount = 1 }, + { type = "item", name = "production-science-pack", amount = 1 }, }, time = 30, }, diff --git a/angelsbioprocessing/prototypes/technology/bio-refugium.lua b/angelsbioprocessing/prototypes/technology/bio-refugium.lua index 2f2a4a5c3..ab2db73a3 100644 --- a/angelsbioprocessing/prototypes/technology/bio-refugium.lua +++ b/angelsbioprocessing/prototypes/technology/bio-refugium.lua @@ -325,7 +325,7 @@ data:extend({ order = "c-a", prerequisites = { "bio-farm-alien", - --"bio-refugium-butchery-2", + "bio-refugium-butchery-2", "bio-refugium-puffer-2", "bio-processing-crystal-splinter-2", "stone-wall", @@ -588,6 +588,10 @@ data:extend({ type = "unlock-recipe", recipe = "fish-butchery-3", }, + { + type = "unlock-recipe", + recipe = "liquid-polluted-fish-atmosphere", + }, }, unit = { count = 50, diff --git a/angelsbioprocessing/prototypes/technology/crop-farming.lua b/angelsbioprocessing/prototypes/technology/crop-farming.lua index 8a10315b2..46353f3c2 100644 --- a/angelsbioprocessing/prototypes/technology/crop-farming.lua +++ b/angelsbioprocessing/prototypes/technology/crop-farming.lua @@ -1,4 +1,37 @@ data:extend({ + { + type = "technology", + name = "angels-composting", + icon = "__angelsbioprocessing__/graphics/technology/fermentation-tech.png", + icon_size = 128, + order = "c-a", + prerequisites = { + "bio-processing-brown", + "water-washing-1", + }, + effects = { + { + type = "unlock-recipe", + recipe = "composter", + }, + { + type = "unlock-recipe", + recipe = "solid-soil", + }, + { + type = "unlock-recipe", + recipe = "solid-soil-alternative", + }, + }, + unit = { + count = 10, + ingredients = { + { type = "item", name = "automation-science-pack", amount = 1 }, + }, + time = 15, + }, + ignore_tech_cost_multiplier = true, + }, { type = "technology", name = "gardens", @@ -42,7 +75,6 @@ data:extend({ order = "c-a", prerequisites = { "bio-farm-1", - "bio-paper-1", "logistic-science-pack", }, effects = { @@ -75,7 +107,9 @@ data:extend({ icon_size = 128, order = "c-a", prerequisites = { + "angels-stone-smelting-2", "bio-farm-alien", + "bio-paper-1", "chemical-science-pack", }, effects = { @@ -83,6 +117,10 @@ data:extend({ type = "unlock-recipe", recipe = "garden-cultivating", }, + { + type = "unlock-recipe", + recipe = "bio-tile", + }, }, unit = { count = 100, @@ -102,26 +140,18 @@ data:extend({ icon_size = 128, order = "c-a", prerequisites = { + "angels-composting", "gardens", - "water-washing-1", }, effects = { { type = "unlock-recipe", recipe = "crop-farm", }, - { - type = "unlock-recipe", - recipe = "composter", - }, { type = "unlock-recipe", recipe = "bio-processor", }, - { - type = "unlock-recipe", - recipe = "solid-soil", - }, }, unit = { count = 50, @@ -138,15 +168,11 @@ data:extend({ icon_size = 128, order = "c-a", prerequisites = { + "automation-2", "bio-farm-1", "angels-nitrogen-processing-2", - "angels-stone-smelting-2", }, effects = { - { - type = "unlock-recipe", - recipe = "solid-soil-alternative", - }, { type = "unlock-recipe", recipe = "solid-fertilizer", @@ -170,14 +196,9 @@ data:extend({ prerequisites = { "bio-farm-2", "bio-processing-alien-1", - "bio-refugium-butchery-1", "gardens-2", }, effects = { - { - type = "unlock-recipe", - recipe = "liquid-polluted-fish-atmosphere", - }, { type = "unlock-recipe", recipe = "alien-goo", @@ -216,6 +237,7 @@ data:extend({ order = "c-a", prerequisites = { "bio-farm-1", + "logistic-science-pack", }, effects = { { @@ -260,6 +282,7 @@ data:extend({ ingredients = { { type = "item", name = "automation-science-pack", amount = 4 }, { type = "item", name = "token-bio", amount = 1 }, + { type = "item", name = "logistic-science-pack", amount = 4 }, }, time = 30, }, @@ -301,7 +324,7 @@ data:extend({ }, }, unit = { - count = 32, + count = 64, ingredients = { { type = "item", name = "automation-science-pack", amount = 4 }, { type = "item", name = "logistic-science-pack", amount = 4 }, @@ -337,7 +360,7 @@ data:extend({ }, }, unit = { - count = 64, + count = 32, ingredients = { { type = "item", name = "automation-science-pack", amount = 4 }, { type = "item", name = "logistic-science-pack", amount = 4 }, @@ -355,6 +378,7 @@ data:extend({ order = "c-a", prerequisites = { "bio-farm-1", + "logistic-science-pack", }, effects = { { @@ -399,6 +423,7 @@ data:extend({ ingredients = { { type = "item", name = "automation-science-pack", amount = 4 }, { type = "item", name = "token-bio", amount = 1 }, + { type = "item", name = "logistic-science-pack", amount = 4 }, }, time = 30, }, @@ -440,7 +465,7 @@ data:extend({ }, }, unit = { - count = 32, + count = 64, ingredients = { { type = "item", name = "automation-science-pack", amount = 4 }, { type = "item", name = "logistic-science-pack", amount = 4 }, @@ -476,7 +501,7 @@ data:extend({ }, }, unit = { - count = 64, + count = 32, ingredients = { { type = "item", name = "automation-science-pack", amount = 4 }, { type = "item", name = "logistic-science-pack", amount = 4 }, @@ -494,6 +519,7 @@ data:extend({ order = "c-a", prerequisites = { "bio-farm-1", + "logistic-science-pack", }, effects = { { @@ -538,6 +564,7 @@ data:extend({ ingredients = { { type = "item", name = "automation-science-pack", amount = 4 }, { type = "item", name = "token-bio", amount = 1 }, + { type = "item", name = "logistic-science-pack", amount = 4 }, }, time = 30, }, @@ -579,7 +606,7 @@ data:extend({ }, }, unit = { - count = 32, + count = 64, ingredients = { { type = "item", name = "automation-science-pack", amount = 4 }, { type = "item", name = "logistic-science-pack", amount = 4 }, @@ -615,7 +642,7 @@ data:extend({ }, }, unit = { - count = 64, + count = 32, ingredients = { { type = "item", name = "automation-science-pack", amount = 4 }, { type = "item", name = "logistic-science-pack", amount = 4 }, diff --git a/angelsdev-unit-test/unit-tests.lua b/angelsdev-unit-test/unit-tests.lua index 046bc1e17..faf0859ec 100644 --- a/angelsdev-unit-test/unit-tests.lua +++ b/angelsdev-unit-test/unit-tests.lua @@ -10,6 +10,7 @@ local unit_tests = { require("unit-tests.unit-test-009"), require("unit-tests.unit-test-010"), require("unit-tests.unit-test-011"), + require("unit-tests.unit-test-012"), } local unit_test_functions = require("unit-test-functions") diff --git a/angelsdev-unit-test/unit-tests/unit-test-004.lua b/angelsdev-unit-test/unit-tests/unit-test-004.lua index eac2c4b65..4097cfec9 100644 --- a/angelsdev-unit-test/unit-tests/unit-test-004.lua +++ b/angelsdev-unit-test/unit-tests/unit-test-004.lua @@ -52,6 +52,16 @@ end local unit_test_004 = function() local unit_test_result = unit_test_functions.test_successful + if game.active_mods["angelsbioprocessing"] then + tech_unlocked_by_script["angels-alien-artifact"] = true + tech_unlocked_by_script["angels-alien-artifact-red"] = true + tech_unlocked_by_script["angels-alien-artifact-yellow"] = true + tech_unlocked_by_script["angels-alien-artifact-orange"] = true + tech_unlocked_by_script["angels-alien-artifact-blue"] = true + tech_unlocked_by_script["angels-alien-artifact-purple"] = true + tech_unlocked_by_script["angels-alien-artifact-green"] = true + end + if game.active_mods["SeaBlock"] then tech_unlocked_by_script["sb-startup1"] = true tech_unlocked_by_script["sb-startup2"] = true diff --git a/angelsdev-unit-test/unit-tests/unit-test-006.lua b/angelsdev-unit-test/unit-tests/unit-test-006.lua index 36c2c787a..088f8a2d4 100644 --- a/angelsdev-unit-test/unit-tests/unit-test-006.lua +++ b/angelsdev-unit-test/unit-tests/unit-test-006.lua @@ -68,6 +68,14 @@ local function calculate_science_pack_level() if game.active_mods["angelsbioprocessing"] then science_pack_level["token-bio"] = science_pack_level["angels-science-pack-red"] or science_pack_level["automation-science-pack"] + + science_pack_level["alien-artifact-tool"] = 0 + science_pack_level["alien-artifact-red-tool"] = 0 + science_pack_level["alien-artifact-yellow-tool"] = 0 + science_pack_level["alien-artifact-orange-tool"] = 0 + science_pack_level["alien-artifact-blue-tool"] = 0 + science_pack_level["alien-artifact-purple-tool"] = 0 + science_pack_level["alien-artifact-green-tool"] = 0 end if game.active_mods["bobtech"] then @@ -84,21 +92,21 @@ local function calculate_science_pack_level() -- 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["utility-science-pack"]), + + (science_pack_level["angels-science-pack-yellow"] 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"]), + + (science_pack_level["angels-science-pack-yellow"] 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"]), + + (science_pack_level["angels-science-pack-yellow"] 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"]), + + (science_pack_level["angels-science-pack-yellow"] 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"]), + + (science_pack_level["angels-science-pack-yellow"] 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"]), + + (science_pack_level["angels-science-pack-yellow"] 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"]), + + (science_pack_level["angels-science-pack-yellow"] 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"]), + + (science_pack_level["angels-science-pack-yellow"] or science_pack_level["utility-science-pack"]), }) do science_pack_level[pack_name] = pack_level end diff --git a/angelsdev-unit-test/unit-tests/unit-test-010.lua b/angelsdev-unit-test/unit-tests/unit-test-010.lua index 9ef55b2d5..f43457cd4 100644 --- a/angelsdev-unit-test/unit-tests/unit-test-010.lua +++ b/angelsdev-unit-test/unit-tests/unit-test-010.lua @@ -400,6 +400,7 @@ local function add_ignores() ["powder-gold"] = true, ["powder-iron"] = true, ["powder-titanium"] = true, + ["powder-tungsten"] = true, ["powdered-tungsten"] = true, ["powder-zinc"] = true, }, @@ -452,6 +453,23 @@ local function add_ignores() ["crystal-full-green"] = true, }, } + + ignored_unlocks["bio-desert-farm"] = { + items = { + ["clay-brick"] = true, + }, + } + ignored_unlocks["bio-swamp-farm"] = { + items = { + ["bronze-pipe"] = true, + }, + } + ignored_unlocks["bio-temperate-farm"] = { + items = { + ["bronze-pipe"] = true, + ["clay-brick"] = true, + }, + } end if game.active_mods["angelsindustries"] then @@ -551,8 +569,13 @@ local unit_test_010 = function() end if escape == true then - unit_test_functions.print_msg("Not all techs were checked. Possibly due to hidden prerequisites") + unit_test_functions.print_msg("The following techs were not checked. Possibly due to hidden prerequisites") unit_test_result = unit_test_functions.test_failed + for tech_name, tech in pairs(tech_prototypes) do + if not processed_techs[tech_name] then + unit_test_functions.print_msg(tech_name) + end + end end return unit_test_result diff --git a/angelsdev-unit-test/unit-tests/unit-test-012.lua b/angelsdev-unit-test/unit-tests/unit-test-012.lua new file mode 100644 index 000000000..0eb4d6437 --- /dev/null +++ b/angelsdev-unit-test/unit-tests/unit-test-012.lua @@ -0,0 +1,112 @@ +-- This unit test validates that recipes are not unlocked by both a technology and one of it's prerequite technologies +local unit_test_functions = require("unit-test-functions") + +local starting_unlocks = { recipes = {} } +local processed_techs = {} +local unit_test_result = unit_test_functions.test_successful + +local function process_tech(tech) + local result = { name = tech.name, recipes = {} } + + -- Get unlocks from prerequisite techs + for prereq_name, _ in pairs(tech.prerequisites) do + local prereq = processed_techs[prereq_name] + if prereq then + for recipe_name, unlocked_by in pairs(prereq.recipes) do + result.recipes[recipe_name] = unlocked_by + end + end + end + + if #tech.prerequisites == 0 then + for recipe_name, _ in pairs(starting_unlocks.recipes) do + result.recipes[recipe_name] = "N/A" + end + end + + -- Build lists of recipes unlocked by this tech + for _, modifier in pairs(tech.effects) do + if modifier.type == "unlock-recipe" then + local unlocked_by = result.recipes[modifier.recipe] + if unlocked_by then + unit_test_functions.print_msg( + string.format( + "Recipe %q is unlocked by Tech %q as well as prerequisite tech %q.", + modifier.recipe, + tech.name, + unlocked_by + ) + ) + unit_test_result = unit_test_functions.test_failed + end + result.recipes[modifier.recipe] = unlocked_by or tech.name + end + end + + return result +end + +local function make_starting_unlocks() + local starting_tech = { name = "starting", prerequisites = {}, effects = {} } + + local recipe_filters = {} + table.insert(recipe_filters, { filter = "hidden", invert = true, mode = "and" }) + table.insert(recipe_filters, { filter = "enabled", invert = false, mode = "and" }) + local recipe_prototypes = game.get_filtered_recipe_prototypes(recipe_filters) + + for _, recipe in pairs(recipe_prototypes) do + table.insert(starting_tech.effects, { type = "unlock-recipe", recipe = recipe.name }) + end + + starting_unlocks = process_tech(starting_tech) +end + +local unit_test_012 = function() + -- Build lists recipes unlocked at the start of the game + make_starting_unlocks() + + -- Build list of technologies with recipes + + local tech_filters = {} + table.insert(tech_filters, { filter = "hidden", invert = true, mode = "and" }) + table.insert(tech_filters, { filter = "enabled", invert = false, mode = "and" }) + local tech_prototypes = game.get_filtered_technology_prototypes(tech_filters) + + local I = 0 + local escape = false + + while (#tech_prototypes > I) and (escape == false) do + escape = true + for tech_name, tech in pairs(tech_prototypes) do + if not processed_techs[tech_name] then + local all_prereqs_processed = true + for prereq_name, prereq in pairs(tech.prerequisites) do + if not processed_techs[prereq_name] then + all_prereqs_processed = false + break + end + end + + if all_prereqs_processed then + processed_techs[tech_name] = process_tech(tech) + I = I + 1 + escape = false + end + end + end + end + + if escape == true then + unit_test_functions.print_msg("The following techs were not checked. Possibly due to hidden prerequisites") + unit_test_result = unit_test_functions.test_failed + for tech_name, tech in pairs(tech_prototypes) do + if not processed_techs[tech_name] then + unit_test_functions.print_msg(tech_name) + end + end + end + + return unit_test_result +end + +return unit_test_012 diff --git a/angelsexploration/changelog.txt b/angelsexploration/changelog.txt index 916807101..76a49265b 100644 --- a/angelsexploration/changelog.txt +++ b/angelsexploration/changelog.txt @@ -1,9 +1,10 @@ --------------------------------------------------------------------------------------------------- Version: 0.3.15 -Date: xx.xx.2023 +Date: 22.12.2023 Changes: - Added "Thorvin" bicycle; credits to the TurboBike mod for the graphics (790) - Spitters are back doing acid splash instead of their bio splash + - Scarab start spawning at 15% evolution rather than 10% - First (partial) rework on artifact drop rates (748) Bugfixes: - Fixed the native inhabitants tips and tricks could not become visible diff --git a/angelsexploration/data.lua b/angelsexploration/data.lua index f0b179529..4b2268c89 100644 --- a/angelsexploration/data.lua +++ b/angelsexploration/data.lua @@ -12,6 +12,16 @@ angelsmods.triggers.artifacts["purple"] = true angelsmods.triggers.artifacts["green"] = true angelsmods.triggers.artifacts["base"] = true -- pink +--angelsmods.triggers.bio_pastes["copper"] = true +--angelsmods.triggers.bio_pastes["gold"] = true +--angelsmods.triggers.bio_pastes["tungsten"] = true +--angelsmods.triggers.bio_pastes["cobalt"] = true +--angelsmods.triggers.bio_pastes["titanium"] = true +--angelsmods.triggers.bio_pastes["zinc"] = true +--angelsmods.triggers.bio_pastes["iron"] = true + +--angelsmods.trigger.smelting_products["iron"].powder = true + --LOAD PROTOTYPES require("prototypes.exploration-category") require("prototypes.exploration-debug") diff --git a/angelsexploration/info.json b/angelsexploration/info.json index 49728e571..e6d9bdede 100644 --- a/angelsexploration/info.json +++ b/angelsexploration/info.json @@ -11,7 +11,7 @@ "angelsrefining >= 0.12.1", "angelspetrochem >= 0.9.21", "angelssmelting >= 0.6.18", - "angelsbioprocessing >= 0.7.21", + "angelsbioprocessing >= 0.7.25", "angelsindustries >= 0.4.15", "? bobenemies >= 1.1.5", "? bobwarfare >= 1.1.5" diff --git a/angelsexploration/locale/en/exploration.cfg b/angelsexploration/locale/en/exploration.cfg index b7ff283d9..68a1982d3 100644 --- a/angelsexploration/locale/en/exploration.cfg +++ b/angelsexploration/locale/en/exploration.cfg @@ -78,6 +78,22 @@ cannon-turret-shell-3=Uranium cannon turret shell bio-gun=Peztilence spreader bio-ammo=Peztilence ammo +small-alien-artifact=Small alien artifact (basic) +small-alien-artifact-blue=Small alien artifact (piercing) +small-alien-artifact-orange=Small alien artifact (acidic) +small-alien-artifact-purple=Small alien artifact (electric) +small-alien-artifact-yellow=Small alien artifact (explosive) +small-alien-artifact-red=Small alien artifact (fiery) +small-alien-artifact-green=Small alien artifact (poisonous) + +alien-artifact=Alien artifact (basic) +alien-artifact-blue=Alien artifact (piercing) +alien-artifact-orange=Alien artifact (acidic) +alien-artifact-purple=Alien artifact (electric) +alien-artifact-yellow=Alien artifact (explosive) +alien-artifact-red=Alien artifact (fiery) +alien-artifact-green=Alien artifact (poisonous) + [technology-name] angels-vequipment=Vehicle equipment angels-turbo-bike="Thorvin" bicycles @@ -91,6 +107,13 @@ angels-gathering-speed=Gathering speed angels-bio-gun=Peztilence spreader angels-refined-biological=Refined biological weapons +alien-research-blue=Piercing alien research +alien-research-orange=Acidic alien research +alien-research-purple=Electric alien research +alien-research-yellow=Explosive alien research +alien-research-red=Fiery alien research +alien-research-green=Poisonous alien research + [damage-type-name] bio=Biological plasma=Plasma diff --git a/angelsexploration/prototypes/entities/biter-builder.lua b/angelsexploration/prototypes/entities/biter-builder.lua index b443cb714..e61abf0f9 100644 --- a/angelsexploration/prototypes/entities/biter-builder.lua +++ b/angelsexploration/prototypes/entities/biter-builder.lua @@ -1728,7 +1728,6 @@ function angelsmods.functions.make_alien(def_data) "placeable-off-grid", "not-repairable", "breaths-air", - "hidden", }, max_health = def_data.appearance.health, resistances = def_data.resistance, @@ -1859,10 +1858,8 @@ function angelsmods.functions.update_spawner(us_data) if us_data == nil then return end - local s_name = us_data.appearance.type .. "-spawner" - if data.raw["unit-spawner"][s_name] then - local spawner = data.raw["unit-spawner"][s_name] - --log(serpent.block(spawner)) + local spawner = data.raw["unit-spawner"][us_data.appearance.full_name or (us_data.appearance.type .. "-spawner")] + if spawner then spawner.resistances = spawner.resistances or {} for _, new_resistance_data in pairs(us_data.resistance or {}) do local existing_resistance = false @@ -1877,8 +1874,8 @@ function angelsmods.functions.update_spawner(us_data) table.insert(spawner.resistances, new_resistance_data) end end - spawner.max_health = us_data.appearance.health - spawner.spawning_cooldown = us_data.appearance.spawn_cooldown + spawner.max_health = us_data.appearance.health or spawner.max_health + spawner.spawning_cooldown = us_data.appearance.spawn_cooldown or spawner.spawning_cooldown spawner.result_units = spawner.result_units or {} for _, new_result_unit_data in pairs(us_data.results or {}) do local existing_result_unit = false diff --git a/angelsexploration/prototypes/entities/biter-definitions.lua b/angelsexploration/prototypes/entities/biter-definitions.lua index b887eff2c..cb73809f8 100644 --- a/angelsexploration/prototypes/entities/biter-definitions.lua +++ b/angelsexploration/prototypes/entities/biter-definitions.lua @@ -779,6 +779,37 @@ biter_definitions.bob_giant_poison_biter = { }, } +biter_definitions.bob_titan_biter = { + appearance = { + full_name = "bob-titan-biter", + }, + loot = { + create_loot_definition("yellow", 1.5, 1), -- 1-2 + create_loot_definition("green", 2.5, 1), -- 2-3 + }, +} + +biter_definitions.bob_behemoth_biter = { + appearance = { + full_name = "bob-behemoth-biter", + }, + loot = { + create_loot_definition("green", 2, 1), -- 2-3 + create_loot_definition("red", 2, 1), -- 2-3 + }, +} + +biter_definitions.bob_leviathan_biter = { + appearance = { + full_name = "bob-leviathan-biter", + }, + loot = { + create_loot_definition("yellow", 2, 0), -- 2 + create_loot_definition("green", 3, 0), -- 3 + create_loot_definition("red", 3, 0), -- 3 + }, +} + ------------------------------------------------------------------------------- -- BOB ELEMENTAL SPITTER DEFINITIONS ------------------------------------------ ------------------------------------------------------------------------------- @@ -827,6 +858,37 @@ biter_definitions.bob_giant_poison_spitter = { }, } +biter_definitions.bob_titan_spitter = { + appearance = { + full_name = "bob-titan-spitter", + }, + loot = { + create_loot_definition("yellow", 1.5, 1), -- 1-2 + create_loot_definition("red", 2.5, 1), -- 2-3 + }, +} + +biter_definitions.bob_behemoth_spitter = { + appearance = { + full_name = "bob-behemoth-spitter", + }, + loot = { + create_loot_definition("green", 2, 1), -- 2-3 + create_loot_definition("red", 2, 1), -- 2-3 + }, +} + +biter_definitions.bob_leviathan_spitter = { + appearance = { + full_name = "bob-leviathan-spitter", + }, + loot = { + create_loot_definition("yellow", 2, 0), -- 2 + create_loot_definition("green", 3, 0), -- 3 + create_loot_definition("red", 3, 0), -- 3 + }, +} + ------------------------------------------------------------------------------- -- SPAWNER DEFINITIONS -------------------------------------------------------- ------------------------------------------------------------------------------- @@ -848,6 +910,9 @@ biter_definitions.biter_spawner = { {type = "laser", decrease = 5, percent = 10},]] { type = "plasma", decrease = 5, percent = 10 }, }, + loot = { + create_loot_definition("base", 15, 10), -- 10-20 + }, } biter_definitions.spitter_spawner = { @@ -868,6 +933,9 @@ biter_definitions.spitter_spawner = { {type = "laser", decrease = 5, percent = 10},]] { type = "plasma", decrease = 5, percent = 10 }, }, + loot = { + create_loot_definition("base", 15, 10), -- 10-20 + }, } biter_definitions.scarab_spawner = { @@ -879,8 +947,8 @@ biter_definitions.scarab_spawner = { order = "b-d-c", }, results = { - { "small-biter", { { 0.0, 0.2 }, { 0.1, 0.4 }, { 0.2, 0.0 } } }, - { "small-scarab", { { 0.1, 0.0 }, { 0.25, 0.2 }, { 0.75, 0.0 } } }, + { "small-biter", { { 0.0, 0.2 }, { 0.15, 0.4 }, { 0.2, 0.0 } } }, + { "small-scarab", { { 0.15, 0.0 }, { 0.25, 0.2 }, { 0.75, 0.0 } } }, { "medium-scarab", { { 0.25, 0.0 }, { 0.5, 0.3 }, { 1.0, 0.2 } } }, { "big-scarab", { { 0.55, 0.0 }, { 0.75, 0.4 }, { 0.8, 0.4 } } }, { "behemoth-scarab", { { 0.93, 0.0 }, { 1.0, 0.6 } } }, @@ -893,6 +961,9 @@ biter_definitions.scarab_spawner = { { type = "laser", decrease = 5, percent = 10 }, { type = "plasma", decrease = 5, percent = 10 }, }, + loot = { + create_loot_definition("base", 21, 8), -- 17-25 + }, } biter_definitions.psyker_spawner = { @@ -904,8 +975,8 @@ biter_definitions.psyker_spawner = { order = "b-d-d", }, results = { - { "small-biter", { { 0.0, 1.6 }, { 0.1, 1.6 }, { 0.2, 0.4 }, { 0.3, 0.0 } } }, - { "small-scarab", { { 0.1, 0.0 }, { 0.2, 0.4 }, { 0.3, 1.5 }, { 0.4, 0.0 } } }, + { "small-biter", { { 0.0, 1.6 }, { 0.16, 1.6 }, { 0.2, 0.4 }, { 0.3, 0.0 } } }, + { "small-scarab", { { 0.16, 0.0 }, { 0.2, 0.4 }, { 0.3, 1.5 }, { 0.4, 0.0 } } }, { "small-psyker", { { 0.3, 0.0 }, { 0.4, 0.4 }, { 0.7, 0.0 } } }, { "medium-psyker", { { 0.45, 0.0 }, { 0.55, 0.1 }, { 0.7, 0.8 }, { 1.0, 0.1 } } }, { "big-psyker", { { 0.55, 0.0 }, { 0.7, 0.5 } } }, @@ -919,6 +990,27 @@ biter_definitions.psyker_spawner = { { type = "laser", decrease = 5, percent = 10 }, { type = "plasma", decrease = 5, percent = 10 }, }, + loot = { + create_loot_definition("base", 21, 8), -- 17-25 + }, +} + +biter_definitions.bob_biter_spawner = { + appearance = { + full_name = "bob-biter-spawner", + }, + loot = { + create_loot_definition("base", 27, 6), -- 24-30 + }, +} + +biter_definitions.bob_spitter_spawner = { + appearance = { + full_name = "bob-spitter-spawner", + }, + loot = { + create_loot_definition("base", 27, 6), -- 24-30 + }, } return biter_definitions diff --git a/angelsexploration/prototypes/exploration-debug.lua b/angelsexploration/prototypes/exploration-debug.lua index 15d037533..b6f72fd24 100644 --- a/angelsexploration/prototypes/exploration-debug.lua +++ b/angelsexploration/prototypes/exploration-debug.lua @@ -12,6 +12,5 @@ data.raw["gui-style"]["default"]["enemy_statistics_graph_label"] = { parent = "label", minimal_width = 100, height = 2, - scalable = true, font = "enemy_statistics_graph_font", } diff --git a/angelsexploration/prototypes/exploration-override.lua b/angelsexploration/prototypes/exploration-override.lua index ba8ec043b..b17e782ab 100644 --- a/angelsexploration/prototypes/exploration-override.lua +++ b/angelsexploration/prototypes/exploration-override.lua @@ -205,6 +205,7 @@ if mods["bobvehicleequipment"] then data.raw.car["angels-heavy-tank"].equipment_grid = "angels-heavy-tank" end +require("prototypes.overrides.artifacts-updates") require("prototypes.overrides.biter-updates") require("prototypes.overrides.gathering-turret-updates") require("prototypes.overrides.vehicle-updates") diff --git a/angelsexploration/prototypes/overrides/artifacts-updates.lua b/angelsexploration/prototypes/overrides/artifacts-updates.lua new file mode 100644 index 000000000..fcc946c29 --- /dev/null +++ b/angelsexploration/prototypes/overrides/artifacts-updates.lua @@ -0,0 +1,524 @@ +local OV = angelsmods.functions.OV + +local alien_technology = bobmods and bobmods.tech and data.raw.technology["alien-research"] and true or false +------------------------------------------------------------------------------- +-- BASE ARTIFACTS (pink, T0) -------------------------------------------------- +------------------------------------------------------------------------------- +if alien_technology then + OV.add_prereq("alien-research", "angels-alien-artifact") + + for _, tech_name in pairs({ + -- personal equipment + bobmods.equipment and "solar-panel-equipment-4" or nil, + bobmods.equipment and "night-vision-equipment-3" or nil, + bobmods.equipment and "bob-energy-shield-equipment-3" or nil, + -- vehicle equipment + bobmods.equipment and "vehicle-solar-panel-equipment-5" or nil, + bobmods.equipment and "vehicle-fusion-cell-equipment-2" or nil, + bobmods.equipment and "vehicle-fusion-reactor-equipment-2" or nil, + bobmods.equipment and "vehicle-energy-shield-equipment-3" or nil, + bobmods.equipment and "vehicle-big-turret-equipment-1" or nil, + }) do + OV.add_prereq(tech_name, "angels-alien-artifact") + end + + if angelsmods.functions.is_special_vanilla() then + if bobmods.modules then + for _, tech_name in pairs({ + "speed-module-5", + "productivity-module-5", + "effectivity-module-5", + "pollution-clean-module-5", + "pollution-create-module-5", + }) do + OV.add_prereq(tech_name, "angels-alien-artifact") + end + end + end +end + +------------------------------------------------------------------------------- +-- BLUE ARTIFACTS (T1) -------------------------------------------------------- +------------------------------------------------------------------------------- +if alien_technology then + data:extend({ + { + type = "technology", + name = "alien-research-blue", + icon = "__bobtech__/graphics/icons/alien-technology.png", + icon_size = 128, + order = "e-f-a", + prerequisites = { + "alien-research", + "angels-alien-artifact-blue", + }, + effects = { + { + type = "unlock-recipe", + recipe = "alien-science-pack-blue", + }, + }, + unit = { + count = 250, + ingredients = { + { type = "item", name = "science-pack-gold", amount = 1 }, + { type = "item", name = "alien-science-pack", amount = 2 }, + }, + time = 30, + }, + }, + }) + OV.remove_unlock("alien-research", "alien-science-pack-blue") + + if bobmods.warfare then + for _, tech_name in pairs({ + (not bobmods.plates) and "bob-ap-bullets" or nil, + (not bobmods.plates) and "bob-shotgun-ap-shells" or nil, + (not bobmods.plates) and "bob-piercing-rocket" or nil, + bobmods.plates and "alien-blue-research" or nil, + }) do + OV.remove_prereq(tech_name, "alien-research") + OV.add_prereq(tech_name, "alien-research-blue") + end + end +end + +------------------------------------------------------------------------------- +-- ORANGE ARTIFACTS (T1) ------------------------------------------------------ +------------------------------------------------------------------------------- +if alien_technology then + data:extend({ + { + type = "technology", + name = "alien-research-orange", + icon = "__bobtech__/graphics/icons/alien-technology.png", + icon_size = 128, + order = "e-f-a", + prerequisites = { + "alien-research", + "angels-alien-artifact-orange", + }, + effects = { + { + type = "unlock-recipe", + recipe = "alien-science-pack-orange", + }, + }, + unit = { + count = 250, + ingredients = { + { type = "item", name = "science-pack-gold", amount = 1 }, + { type = "item", name = "alien-science-pack", amount = 2 }, + }, + time = 30, + }, + }, + }) + OV.remove_unlock("alien-research", "alien-science-pack-orange") + + if bobmods.warfare then + for _, tech_name in pairs({ + (not bobmods.plates) and "bob-acid-bullets" or nil, + (not bobmods.plates) and "bob-shotgun-acid-shells" or nil, + (not bobmods.plates) and "bob-acid-rocket" or nil, + bobmods.plates and "alien-orange-research" or nil, + }) do + OV.remove_prereq(tech_name, "alien-research") + OV.add_prereq(tech_name, "alien-research-orange") + end + if bobmods.plates then -- swap purple and orange artifacts type + for _, tech_name in pairs({ + "bob-acid-bullets", + "bob-shotgun-acid-shells", + "bob-acid-rocket", + }) do + OV.remove_prereq(tech_name, "alien-purple-research") + OV.add_prereq(tech_name, "alien-orange-research") + end + end + end +end + +------------------------------------------------------------------------------- +-- BLUE + ORANGE ARTIFACTS (T1.5) --------------------------------------------- +------------------------------------------------------------------------------- +if alien_technology then + for _, tech_name in pairs({ + bobmods.warfare and "bob-power-armor-3" or nil, + -- personal equipment + bobmods.equipment and "fusion-reactor-equipment-2" or nil, + bobmods.equipment and "bob-battery-equipment-4" or nil, + bobmods.equipment and "bob-energy-shield-equipment-4" or nil, + -- vehicle equipment + bobmods.equipment and "vehicle-fusion-cell-equipment-4" or nil, + bobmods.equipment and "vehicle-fusion-reactor-equipment-4" or nil, + bobmods.equipment and "vehicle-battery-equipment-4" or nil, + bobmods.equipment and "vehicle-energy-shield-equipment-4" or nil, + bobmods.equipment and "vehicle-big-turret-equipment-4" or nil, + }) do + OV.remove_prereq(tech_name, "alien-research") + OV.add_prereq(tech_name, "alien-research-blue") + OV.add_prereq(tech_name, "alien-research-orange") + end +end + +------------------------------------------------------------------------------- +-- PURPLE ARTIFACTS (T2) ------------------------------------------------------ +------------------------------------------------------------------------------- +if alien_technology then + data:extend({ + { + type = "technology", + name = "alien-research-purple", + icon = "__bobtech__/graphics/icons/alien-technology.png", + icon_size = 128, + order = "e-f-a", + prerequisites = { + "alien-research", + "angels-alien-artifact-purple", + }, + effects = { + { + type = "unlock-recipe", + recipe = "alien-science-pack-purple", + }, + }, + unit = { + count = 250, + ingredients = { + { type = "item", name = "science-pack-gold", amount = 1 }, + { type = "item", name = "alien-science-pack", amount = 2 }, + }, + time = 30, + }, + }, + }) + OV.remove_unlock("alien-research", "alien-science-pack-purple") + + if bobmods.warfare then + for _, tech_name in pairs({ + (not bobmods.plates) and "bob-electric-bullets" or nil, + (not bobmods.plates) and "bob-shotgun-electric-shells" or nil, + (not bobmods.plates) and "bob-electric-rocket" or nil, + bobmods.plates and "alien-purple-research" or nil, + }) do + OV.remove_prereq(tech_name, "alien-research") + OV.add_prereq(tech_name, "alien-research-purple") + end + if bobmods.plates then -- swap purple and orange artifacts type + for _, tech_name in pairs({ + "bob-electric-bullets", + "bob-shotgun-electric-shells", + "bob-electric-rocket", + }) do + OV.remove_prereq(tech_name, "alien-orange-research") + OV.add_prereq(tech_name, "alien-purple-research") + end + end + end +end + +------------------------------------------------------------------------------- +-- YELLOW ARTIFACTS (T2) ------------------------------------------------------ +------------------------------------------------------------------------------- +if alien_technology then + data:extend({ + { + type = "technology", + name = "alien-research-yellow", + icon = "__bobtech__/graphics/icons/alien-technology.png", + icon_size = 128, + order = "e-f-a", + prerequisites = { + "alien-research", + "angels-alien-artifact-yellow", + }, + effects = { + { + type = "unlock-recipe", + recipe = "alien-science-pack-yellow", + }, + }, + unit = { + count = 250, + ingredients = { + { type = "item", name = "science-pack-gold", amount = 1 }, + { type = "item", name = "alien-science-pack", amount = 2 }, + }, + time = 30, + }, + }, + }) + OV.remove_unlock("alien-research", "alien-science-pack-yellow") + + if bobmods.warfare then + for _, tech_name in pairs({ + (not bobmods.plates) and "bob-he-bullets" or nil, + (not bobmods.plates) and "bob-shotgun-explosive-shells" or nil, + (not bobmods.plates) and "bob-explosive-rocket" or nil, + (not bobmods.plates) and "bob-explosive-artillery-shells" or nil, + bobmods.plates and "alien-yellow-research" or nil, + }) do + OV.remove_prereq(tech_name, "alien-research") + OV.add_prereq(tech_name, "alien-research-yellow") + end + end +end + +------------------------------------------------------------------------------- +-- PURPLE + YELLOW ARTIFACTS (T2.5) ------------------------------------------- +------------------------------------------------------------------------------- +if alien_technology then + for _, tech_name in pairs({ + bobmods.warfare and "bob-power-armor-4" or nil, + -- personal equipment + bobmods.equipment and "fusion-reactor-equipment-3" or nil, + bobmods.equipment and "bob-battery-equipment-5" or nil, + bobmods.equipment and "bob-energy-shield-equipment-5" or nil, + -- vehicle equipment + bobmods.equipment and "vehicle-fusion-cell-equipment-5" or nil, + bobmods.equipment and "vehicle-fusion-reactor-equipment-5" or nil, + bobmods.equipment and "vehicle-battery-equipment-5" or nil, + bobmods.equipment and "vehicle-energy-shield-equipment-5" or nil, + bobmods.equipment and "vehicle-big-turret-equipment-5" or nil, + }) do + OV.remove_prereq(tech_name, "alien-research") + OV.add_prereq(tech_name, "alien-research-purple") + OV.add_prereq(tech_name, "alien-research-yellow") + end +end + +------------------------------------------------------------------------------- +-- GREEN ARTIFACTS (T3) ------------------------------------------------------- +------------------------------------------------------------------------------- +if alien_technology then + data:extend({ + { + type = "technology", + name = "alien-research-green", + icon = "__bobtech__/graphics/icons/alien-technology.png", + icon_size = 128, + order = "e-f-a", + prerequisites = { + "alien-research", + "angels-alien-artifact-green", + }, + effects = { + { + type = "unlock-recipe", + recipe = "alien-science-pack-green", + }, + }, + unit = { + count = 250, + ingredients = { + { type = "item", name = "science-pack-gold", amount = 1 }, + { type = "item", name = "alien-science-pack", amount = 2 }, + }, + time = 30, + }, + }, + }) + OV.remove_unlock("alien-research", "alien-science-pack-green") + + if bobmods.warfare then + for _, tech_name in pairs({ + (not bobmods.plates) and "bob-poison-bullets" or nil, + (not bobmods.plates) and "bob-shotgun-poison-shells" or nil, + (not bobmods.plates) and "bob-poison-rocket" or nil, + (not bobmods.plates) and "bob-poison-artillery-shells" or nil, + bobmods.plates and "alien-green-research" or nil, + }) do + OV.remove_prereq(tech_name, "alien-research") + OV.add_prereq(tech_name, "alien-research-green") + end + end +end + +------------------------------------------------------------------------------- +-- RED ARTIFACTS (T3) --------------------------------------------------------- +------------------------------------------------------------------------------- +if alien_technology then + data:extend({ + { + type = "technology", + name = "alien-research-red", + icon = "__bobtech__/graphics/icons/alien-technology.png", + icon_size = 128, + order = "e-f-a", + prerequisites = { + "alien-research", + "angels-alien-artifact-red", + }, + effects = { + { + type = "unlock-recipe", + recipe = "alien-science-pack-red", + }, + }, + unit = { + count = 250, + ingredients = { + { type = "item", name = "science-pack-gold", amount = 1 }, + { type = "item", name = "alien-science-pack", amount = 2 }, + }, + time = 30, + }, + }, + }) + OV.remove_unlock("alien-research", "alien-science-pack-red") + + if bobmods.warfare then + for _, tech_name in pairs({ + (not bobmods.plates) and "bob-flame-bullets" or nil, + (not bobmods.plates) and "bob-shotgun-flame-shells" or nil, + (not bobmods.plates) and "bob-flame-rocket" or nil, + (not bobmods.plates) and "bob-fire-artillery-shells" or nil, + bobmods.plates and "alien-red-research" or nil, + }) do + OV.remove_prereq(tech_name, "alien-research") + OV.add_prereq(tech_name, "alien-research-red") + end + end +end + +------------------------------------------------------------------------------- +-- GREEN + RED ARTIFACTS (T3.5) ----------------------------------------------- +------------------------------------------------------------------------------- +if alien_technology then + for _, tech_name in pairs({ + bobmods.warfare and "bob-power-armor-5" or nil, + -- personal equipment + bobmods.equipment and "fusion-reactor-equipment-4" or nil, + bobmods.equipment and "bob-battery-equipment-6" or nil, + bobmods.equipment and "bob-energy-shield-equipment-6" or nil, + bobmods.equipment and "personal-laser-defense-equipment-6" or nil, + -- vehicle equipment + bobmods.equipment and "vehicle-fusion-cell-equipment-6" or nil, + bobmods.equipment and "vehicle-fusion-reactor-equipment-6" or nil, + bobmods.equipment and "vehicle-battery-equipment-6" or nil, + bobmods.equipment and "vehicle-energy-shield-equipment-6" or nil, + bobmods.equipment and "vehicle-big-turret-equipment-6" or nil, + }) do + OV.remove_prereq(tech_name, "alien-research") + OV.add_prereq(tech_name, "alien-research-green") + OV.add_prereq(tech_name, "alien-research-red") + end +end + +------------------------------------------------------------------------------- +-- ALL ARTIFACTS (T4) --------------------------------------------------------- +------------------------------------------------------------------------------- +if alien_technology then + for _, tech_name in pairs({ + bobmods.warfare and "bob-plasma-bullets" or nil, + bobmods.warfare and "bob-shotgun-plasma-shells" or nil, + bobmods.warfare and "bob-plasma-rocket" or nil, + }) do + OV.remove_prereq(tech_name, "alien-research") + OV.add_prereq(tech_name, "alien-research-blue") + OV.add_prereq(tech_name, "alien-research-orange") + OV.add_prereq(tech_name, "alien-research-purple") + OV.add_prereq(tech_name, "alien-research-yellow") + OV.add_prereq(tech_name, "alien-research-green") + OV.add_prereq(tech_name, "alien-research-red") + end +end + +------------------------------------------------------------------------------- +------------------------------------------------------------------------------- +------------------------------------------------------------------------------- +-- execute the remaining swap of the purple - orange artifact +if alien_technology then + if bobmods.warfare then + for _, icon_property in pairs({ + "icon", + "icon_size", + "icon_mipmaps", + "scale", + "shift", + "tint", + "unit", -- for now, we just swap the science packs as well... + }) do + for purple_tech_name, orange_tech_name in pairs({ + ["bob-electric-bullets"] = "bob-acid-bullets", + ["bob-shotgun-electric-shells"] = "bob-shotgun-acid-shells", + ["bob-electric-rocket"] = "bob-acid-rocket", + }) do + local purple_tech = data.raw.technology[purple_tech_name] + local orange_tech = data.raw.technology[orange_tech_name] + if purple_tech and orange_tech then + purple_tech[icon_property], orange_tech[icon_property] = + orange_tech[icon_property], purple_tech[icon_property] + end + end + for purple_item_name, orange_item_name in pairs({ + ["electric-bullet-projectile"] = "acid-bullet-projectile", + ["electric-bullet"] = "acid-bullet", + ["electric-bullet-magazine"] = "acid-bullet-magazine", + ["shotgun-electric-shell"] = "shotgun-acid-shell", + ["bob-electric-rocket"] = "bob-acid-rocket", + ["electric-rocket-warhead"] = "acid-rocket-warhead", + }) do + local purple_item = data.raw.item[purple_item_name] or data.raw.ammo[purple_item_name] + local orange_item = data.raw.item[orange_item_name] or data.raw.ammo[orange_item_name] + if purple_item and orange_item then + purple_item[icon_property], orange_item[icon_property] = + orange_item[icon_property], purple_item[icon_property] + end + end + end + if bobmods.plates then + OV.patch_recipes({ + { + name = "electric-bullet-projectile", + ingredients = { + { type = "item", name = "alien-orange-alloy", amount = 0 }, + { type = "fluid", name = "alien-acid", amount = 10 }, + }, + category = "crafting-with-fluid", + }, + { + name = "shotgun-electric-shell", + ingredients = { + { type = "item", name = "alien-orange-alloy", amount = 0 }, + { type = "fluid", name = "alien-acid", amount = 10 }, + }, + category = "crafting-with-fluid", + }, + { + name = "electric-rocket-warhead", + ingredients = { + { type = "item", name = "alien-orange-alloy", amount = 0 }, + { type = "fluid", name = "alien-acid", amount = 20 }, + }, + category = "crafting-with-fluid", + }, + { + name = "acid-bullet-projectile", + ingredients = { + { type = "fluid", name = "alien-acid", amount = 0 }, + { type = "item", name = "alien-orange-alloy", amount = 1 }, + }, + category = "crafting", + }, + { + name = "shotgun-acid-shell", + ingredients = { + { type = "fluid", name = "alien-acid", amount = 0 }, + { type = "item", name = "alien-orange-alloy", amount = 1 }, + }, + category = "crafting", + }, + { + name = "acid-rocket-warhead", + ingredients = { + { type = "fluid", name = "alien-acid", amount = 0 }, + { type = "item", name = "alien-orange-alloy", amount = 2 }, + }, + category = "crafting", + }, + }) + end + end +end diff --git a/angelsexploration/prototypes/overrides/biter-updates.lua b/angelsexploration/prototypes/overrides/biter-updates.lua index f36865ba7..196c701a2 100644 --- a/angelsexploration/prototypes/overrides/biter-updates.lua +++ b/angelsexploration/prototypes/overrides/biter-updates.lua @@ -1,6 +1,8 @@ --UPDATE BOB SPAWNERS if mods["bobenemies"] then - -- update the earliest spawn point of spitter on bobs spawner to the same evolution point of the base game spawner (with a small correction factor) + unit_correction_offset = 1 / 100000000 + + -- update the earliest spawn point of biters on bobs spawner to the same evolution point of the base game spawner (with a small correction factor) local base_spawner = data.raw["unit-spawner"]["biter-spawner"] for _, bob_spawner in pairs({ data.raw["unit-spawner"]["bob-biter-spawner"], @@ -8,7 +10,7 @@ if mods["bobenemies"] then }) do if base_spawner and bob_spawner then for unit, unit_correction in pairs({ - ["big-biter"] = 1 / 100000000, + ["big-biter"] = unit_correction_offset, }) do for bob_spawn_idx, bob_spawn_data in pairs(bob_spawner.result_units) do if (bob_spawn_data.unit or bob_spawn_data[1]) == unit then @@ -48,6 +50,7 @@ if mods["bobenemies"] then end end + -- update the earliest spawn point of spitters on bobs spawner to the same evolution point of the base game spawner (with a small correction factor) base_spawner = data.raw["unit-spawner"]["spitter-spawner"] for _, bob_spawner in pairs({ data.raw["unit-spawner"]["bob-spitter-spawner"], @@ -55,9 +58,9 @@ if mods["bobenemies"] then }) do if base_spawner and bob_spawner then for unit, unit_correction in pairs({ - ["small-spitter"] = 1 / 100000000, - ["medium-spitter"] = 1 / 100000000, - ["big-spitter"] = 1 / 100000000, + ["small-spitter"] = unit_correction_offset, + ["medium-spitter"] = unit_correction_offset, + ["big-spitter"] = unit_correction_offset, }) do for bob_spawn_idx, bob_spawn_data in pairs(bob_spawner.result_units) do if (bob_spawn_data.unit or bob_spawn_data[1]) == unit then @@ -97,6 +100,29 @@ if mods["bobenemies"] then end end + -- change the earliest spawn point of enemies in bobs biter spawner + local elemental_biter_spawner = data.raw["unit-spawner"]["bob-biter-spawner"] + if elemental_biter_spawner then + for _, elemental_biter_spawner_data in pairs(elemental_biter_spawner.result_units) do + local elemental_biter_spawner_biter = elemental_biter_spawner_data[1] + if elemental_biter_spawner_biter == "bob-huge-acid-biter" then + elemental_biter_spawner_data[2][1][1] = 0.45 + end + end + end + + -- change the earliest spawn point of enemies in bobs spitter spawner + local elemental_spitter_spawner = data.raw["unit-spawner"]["bob-spitter-spawner"] + if elemental_spitter_spawner then + for _, elemental_spitter_spawner_data in pairs(elemental_spitter_spawner.result_units) do + local elemental_spitter_spawner_spitter = elemental_spitter_spawner_data[1] + if elemental_spitter_spawner_spitter == "bob-huge-acid-spitter" then + elemental_spitter_spawner_data[2][1][1] = 0.45 + unit_correction_offset + end + end + end + + -- change the earliest spawn point of enemies in bobs super spawner local super_spawner = data.raw["unit-spawner"]["bob-super-spawner"] if super_spawner then for _, super_spawner_data in pairs(super_spawner.result_units) do @@ -128,20 +154,42 @@ angelsmods.functions.update_alien(biter_definitions.big_spitter) angelsmods.functions.update_alien(biter_definitions.behemoth_spitter) angelsmods.functions.update_alien(biter_definitions.colossal_spitter) +angelsmods.functions.update_alien(biter_definitions.small_scarab) +angelsmods.functions.update_alien(biter_definitions.medium_scarab) +angelsmods.functions.update_alien(biter_definitions.big_scarab) +angelsmods.functions.update_alien(biter_definitions.behemoth_scarab) +angelsmods.functions.update_alien(biter_definitions.colossal_scarab) + +angelsmods.functions.update_alien(biter_definitions.small_psyker) +angelsmods.functions.update_alien(biter_definitions.medium_psyker) +angelsmods.functions.update_alien(biter_definitions.big_psyker) +angelsmods.functions.update_alien(biter_definitions.behemoth_psyker) +angelsmods.functions.update_alien(biter_definitions.colossal_psyker) + angelsmods.functions.update_alien(biter_definitions.bob_big_piercing_biter) angelsmods.functions.update_alien(biter_definitions.bob_huge_acid_biter) angelsmods.functions.update_alien(biter_definitions.bob_huge_explosive_biter) angelsmods.functions.update_alien(biter_definitions.bob_giant_fire_biter) angelsmods.functions.update_alien(biter_definitions.bob_giant_poison_biter) +angelsmods.functions.update_alien(biter_definitions.bob_titan_biter) +angelsmods.functions.update_alien(biter_definitions.bob_behemoth_biter) +angelsmods.functions.update_alien(biter_definitions.bob_leviathan_biter) angelsmods.functions.update_alien(biter_definitions.bob_big_electric_spitter) angelsmods.functions.update_alien(biter_definitions.bob_huge_acid_spitter) angelsmods.functions.update_alien(biter_definitions.bob_huge_explosive_spitter) angelsmods.functions.update_alien(biter_definitions.bob_giant_fire_spitter) angelsmods.functions.update_alien(biter_definitions.bob_giant_poison_spitter) +angelsmods.functions.update_alien(biter_definitions.bob_titan_spitter) +angelsmods.functions.update_alien(biter_definitions.bob_behemoth_spitter) +angelsmods.functions.update_alien(biter_definitions.bob_leviathan_spitter) angelsmods.functions.update_spawner(biter_definitions.spitter_spawner) angelsmods.functions.update_spawner(biter_definitions.biter_spawner) +angelsmods.functions.update_spawner(biter_definitions.scarab_spawner) +angelsmods.functions.update_spawner(biter_definitions.psyker_spawner) +angelsmods.functions.update_spawner(biter_definitions.bob_biter_spawner) +angelsmods.functions.update_spawner(biter_definitions.bob_spitter_spawner) --SHOW RESISTANCES for _, unit in pairs(data.raw.unit) do @@ -190,18 +238,3 @@ for _, type in pairs({ "unit", "unit-spawner", "turret" }) do update_loot_table(unit.loot) end end - ---[[if mods["bobenemies"] then - for _, biter in pairs({ "behemoth-biter", "behemoth-spitter" }) do - local unit = data.raw.unit[biter] - if biter then - for _, loot in pairs(unit.loot or {}) do - if loot.item == "small-alien-artifact" then - loot.count_min = ((loot.count_min == nil and 1) or loot.count_min) / 4 -- 4 -> 1 - loot.count_max = ((loot.count_max == nil and 1) or loot.count_max) / 4 -- 12 -> 3 - end - end - end - end -end ---]] diff --git a/angelsexploration/prototypes/overrides/gathering-turret-updates.lua b/angelsexploration/prototypes/overrides/gathering-turret-updates.lua index 33a20b2e2..49d69ad49 100644 --- a/angelsexploration/prototypes/overrides/gathering-turret-updates.lua +++ b/angelsexploration/prototypes/overrides/gathering-turret-updates.lua @@ -68,41 +68,59 @@ if angelsmods.triggers.artifacts["red"] then angelsmods.functions.create_gathering_turret_target({ name = "small-alien-artifact-red", require_tech_unlock = true, - additional_tech_prerequisites = "angels-gathering-turret", + additional_tech_prerequisites = { + "angels-gathering-turret", + "angels-alien-artifact-red", + }, }) end if angelsmods.triggers.artifacts["yellow"] then angelsmods.functions.create_gathering_turret_target({ name = "small-alien-artifact-yellow", require_tech_unlock = true, - additional_tech_prerequisites = "angels-gathering-turret", + additional_tech_prerequisites = { + "angels-gathering-turret", + "angels-alien-artifact-yellow", + }, }) end if angelsmods.triggers.artifacts["orange"] then angelsmods.functions.create_gathering_turret_target({ name = "small-alien-artifact-orange", require_tech_unlock = true, - additional_tech_prerequisites = "angels-gathering-turret", + additional_tech_prerequisites = { + "angels-gathering-turret", + "angels-alien-artifact-orange", + }, }) end if angelsmods.triggers.artifacts["blue"] then angelsmods.functions.create_gathering_turret_target({ name = "small-alien-artifact-blue", require_tech_unlock = true, - additional_tech_prerequisites = "angels-gathering-turret", + additional_tech_prerequisites = { + "angels-gathering-turret", + "angels-alien-artifact-blue", + }, }) end if angelsmods.triggers.artifacts["purple"] then angelsmods.functions.create_gathering_turret_target({ name = "small-alien-artifact-purple", require_tech_unlock = true, - additional_tech_prerequisites = "angels-gathering-turret", + additional_tech_prerequisites = { + "angels-gathering-turret", + "angels-alien-artifact-purple", + }, }) end if angelsmods.triggers.artifacts["green"] then angelsmods.functions.create_gathering_turret_target({ name = "small-alien-artifact-green", require_tech_unlock = true, - additional_tech_prerequisites = "angels-gathering-turret", + additional_tech_prerequisites = { + "angels-gathering-turret", + "angels-alien-artifact-green", + }, }) end diff --git a/angelsexploration/prototypes/technology/exploration-technology.lua b/angelsexploration/prototypes/technology/exploration-technology.lua index 313a81ed7..ad3c82c23 100644 --- a/angelsexploration/prototypes/technology/exploration-technology.lua +++ b/angelsexploration/prototypes/technology/exploration-technology.lua @@ -126,6 +126,7 @@ data:extend({ icon_mipmaps = 4, prerequisites = { "military-science-pack", + "angels-alien-artifact", }, effects = { { diff --git a/angelsexploration/settings-updates.lua b/angelsexploration/settings-updates.lua index ca068b554..6803b11bd 100644 --- a/angelsexploration/settings-updates.lua +++ b/angelsexploration/settings-updates.lua @@ -1,3 +1,4 @@ if mods["bobenemies"] then angelsmods.settings.hide_setting("bool-setting", "bobmods-enemies-enableartifacts", true) -- enable artifacts + angelsmods.settings.hide_setting("bool-setting", "bobmods-enemies-biggersooner", false) -- fixed biter rates to keep biter progression end diff --git a/angelsindustries/changelog.txt b/angelsindustries/changelog.txt index 9111bfb45..566e8e6bf 100644 --- a/angelsindustries/changelog.txt +++ b/angelsindustries/changelog.txt @@ -1,4 +1,12 @@ --------------------------------------------------------------------------------------------------- +Version: 0.4.19 +Date: 22.12.2023 + Changes: + - Compatibility with Bob's changes (911) + Bugfixes: + - Component mode: + - Fixed the regular recipe for fiber board was still available when playing with bobs mods +--------------------------------------------------------------------------------------------------- Version: 0.4.18 Date: 23.02.2023 Bugfixes: diff --git a/angelsindustries/graphics/entity/cargo-robot/Thumbs.db b/angelsindustries/graphics/entity/cargo-robot/Thumbs.db deleted file mode 100644 index b06a3968e..000000000 Binary files a/angelsindustries/graphics/entity/cargo-robot/Thumbs.db and /dev/null differ diff --git a/angelsindustries/info.json b/angelsindustries/info.json index da4045720..4146e8b41 100644 --- a/angelsindustries/info.json +++ b/angelsindustries/info.json @@ -1,6 +1,6 @@ { "name": "angelsindustries", - "version": "0.4.18", + "version": "0.4.19", "factorio_version": "1.1", "title": "Angel's Industries", "author": "Arch666Angel", @@ -9,7 +9,7 @@ "description": "Adds industrial equipment as well as the tools you need to expand and grow your base. Adds extra components [BETA] and a tech [ALPHA] overhaul.", "dependencies": [ "angelsrefining >= 0.12.1", - "angelspetrochem >= 0.9.20", + "angelspetrochem >= 0.9.25", "angelssmelting >= 0.6.17", "angelsbioprocessing >= 0.7.21", "(?) bobassembly >= 1.1.5", diff --git a/angelsindustries/locale/en/nuclear-power.cfg b/angelsindustries/locale/en/nuclear-power.cfg index 6dd421918..5006dea9b 100644 --- a/angelsindustries/locale/en/nuclear-power.cfg +++ b/angelsindustries/locale/en/nuclear-power.cfg @@ -15,7 +15,7 @@ used-up-AMOX-cell=Used-up mixed-oxide (MOX) fuel cell angels-thorium-fuel-cell=Thorium fuel cell used-up-angels-thorium-fuel-cell=Used-up thorium fuel cell angels-deuterium-fuel-cell=Deuterium fuel cell -used-up-angels-deuterium-fuel-cell=Used up deuterium fuel cell +used-up-angels-deuterium-fuel-cell=Used-up deuterium fuel cell angels-nuclear-fuel=Plutonium nuclear fuel angels-nuclear-fuel-2=Fusion nuclear fuel diff --git a/angelsindustries/prototypes/angels-industries-triggers.lua b/angelsindustries/prototypes/angels-industries-triggers.lua index a3b125c6f..f411af31f 100644 --- a/angelsindustries/prototypes/angels-industries-triggers.lua +++ b/angelsindustries/prototypes/angels-industries-triggers.lua @@ -4,6 +4,9 @@ if angelsmods.industries.overhaul then angelsmods.trigger.ores["aluminium"] = true angelsmods.trigger.ores["chrome"] = true angelsmods.trigger.ores["cobalt"] = true + if mods["bobores"] then + bobmods.ores.cobalt.enabled = true + end angelsmods.trigger.ores["copper"] = true angelsmods.trigger.ores["gold"] = true angelsmods.trigger.ores["iron"] = true @@ -55,6 +58,7 @@ if angelsmods.industries.components then angelsmods.trigger.smelting_products["solder"].mixture = true angelsmods.trigger.smelting_molds = true angelsmods.trigger.smelting_products["glass"].fibre = true + angelsmods.trigger.smelting_products["glass"].board = false angelsmods.trigger.smelting_products["iron"].rod = true angelsmods.trigger.smelting_products["platinum"].plate = true angelsmods.trigger.smelting_products["platinum"].wire = true diff --git a/angelsindustries/prototypes/ordening/angels-intermediates.lua b/angelsindustries/prototypes/ordening/angels-intermediates.lua index 5c0c7a2a2..be7a6aa69 100644 --- a/angelsindustries/prototypes/ordening/angels-intermediates.lua +++ b/angelsindustries/prototypes/ordening/angels-intermediates.lua @@ -69,6 +69,7 @@ if angelsmods.industries.overhaul then move_item("wooden-board", "angels-board", "z[bob]-a") move_item("phenolic-board", "angels-board", "z[bob]-b") move_item("fibreglass-board", "angels-board", "z[bob]-c") + move_item("angels-glass-fiber-board", "angels-board", "z[bob]-c", "recipe") move_item("basic-circuit-board", "angels-circuit-board", "z[bob]-a") move_item("circuit-board", "angels-circuit-board", "z[bob]-b") diff --git a/angelsindustries/prototypes/overrides/components-base-recipe-update.lua b/angelsindustries/prototypes/overrides/components-base-recipe-update.lua index ebbb2934e..2ac732fa6 100644 --- a/angelsindustries/prototypes/overrides/components-base-recipe-update.lua +++ b/angelsindustries/prototypes/overrides/components-base-recipe-update.lua @@ -7,15 +7,21 @@ if angelsmods.industries.components then OV.add_unlock("angels-components-weapons-basic", "submachine-gun") --battery requirements + OV.remove_prereq("angels-glass-smelting-3", "strand-casting-3") OV.remove_unlock("angels-glass-smelting-2", "angels-coil-glass-fiber") - OV.remove_prereq("angels-glass-smelting-2", "strand-casting-2") + OV.remove_unlock("angels-glass-smelting-3", "angels-coil-glass-fiber-fast") OV.add_unlock("angels-glass-smelting-1", "angels-coil-glass-fiber") + OV.add_unlock("angels-glass-smelting-2", "angels-coil-glass-fiber-fast") OV.add_prereq("angels-glass-smelting-1", "strand-casting-1") OV.patch_recipes({ { name = "angels-coil-glass-fiber", category = "strand-casting", }, + { + name = "angels-coil-glass-fiber-fast", + category = "strand-casting-2", + }, }) --battery usage --vanilla replacements diff --git a/angelsindustries/prototypes/overrides/components-block-update.lua b/angelsindustries/prototypes/overrides/components-block-update.lua index 51d530b5c..30ce406a8 100644 --- a/angelsindustries/prototypes/overrides/components-block-update.lua +++ b/angelsindustries/prototypes/overrides/components-block-update.lua @@ -9,7 +9,7 @@ if angelsmods.industries.components then OV.remove_unlock("angels-stone-smelting-2", "mold-expendable") OV.add_unlock("angels-stone-smelting-1", "mold-expendable") OV.remove_prereq("angels-stone-smelting-2", "bio-arboretum-1") - OV.add_prereq("angels-stone-smelting-1", "bio-arboretum-1") + OV.add_prereq("angels-stone-smelting-1", "bio-wood-processing-2") OV.add_prereq("angels-stone-smelting-1", "angels-components-mechanical-1") -- update depending technologies accordingly OV.remove_prereq("angels-iron-smelting-2", "angels-stone-smelting-2") @@ -17,52 +17,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") - ----------------------------------------------------------------------------- - -- ADD ELECTRONIC RECIPES TO ELECTRONIC ASSMBLY ----------------------------- - ----------------------------------------------------------------------------- - if mods["bobassembly"] and settings.startup["bobmods-assembly-electronicmachines"].value == true then - --create list of recipes to add to the electronicmachines - for _, elec in pairs({ - -- todo: move cables and coils to smelting! - "copper-cable", - "angels-wire-coil-copper-converting", - "angels-wire-gold", - "angels-wire-coil-gold-converting", - "basic-platinated-copper-wire", - "angels-wire-coil-platinum-converting", - "basic-silvered-copper-wire", - "angels-wire-coil-silver-converting", - "basic-tinned-copper-wire", - "angels-wire-coil-tin-converting", - "angels-roll-solder-converting", - "circuit-red-board", - "circuit-green-board", - "circuit-orange-board", - "circuit-blue-board", - --"circuit-yellow-board" --crafted with 2 fluids - "circuit-grey-board", - "circuit-grey-board-alternative", - "circuit-red", - "circuit-green", - "circuit-orange", - "circuit-blue", - "circuit-yellow", - "circuit-grey", - "circuit-red-loaded", - "circuit-green-loaded", - "circuit-orange-loaded", - "circuit-blue-loaded", - "circuit-yellow-loaded", - "circuit-resistor", - "circuit-transistor", - "circuit-microchip", - "circuit-transformer", - "circuit-cpu", - }) do - data.raw.recipe[elec].category = "electronics" - end - end - if angelsmods.industries.tech then else ----------------------------------------------------------------------------- @@ -231,7 +185,6 @@ if angelsmods.industries.components then OV.add_unlock("military-science-pack", "block-mechanical-2") OV.add_prereq("ore-leaching", "angels-basic-blocks-3") OV.add_prereq("advanced-ore-refining-2", "angels-basic-blocks-3") - OV.add_prereq("ore-electro-whinning-cell", "angels-basic-blocks-3") OV.add_prereq("angels-advanced-chemistry-2", "angels-basic-blocks-3") OV.add_prereq("angels-metallurgy-3", "angels-basic-blocks-3") 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 da63d98f2..e78fc2273 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 @@ -126,7 +126,9 @@ 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-3") + if data.raw.technology["advanced-electronics-3"] then + OV.add_prereq("electronics-machine-3", "advanced-electronics-3") + end 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") diff --git a/angelsindustries/prototypes/overrides/components-bobs-entity-update/components-bobs-radar-update.lua b/angelsindustries/prototypes/overrides/components-bobs-entity-update/components-bobs-radar-update.lua index 236398753..f224754db 100644 --- a/angelsindustries/prototypes/overrides/components-bobs-entity-update/components-bobs-radar-update.lua +++ b/angelsindustries/prototypes/overrides/components-bobs-entity-update/components-bobs-radar-update.lua @@ -56,12 +56,21 @@ if angelsmods.industries.components then }, }) - OV.add_prereq("radars-1", "angels-basic-blocks-1") - OV.add_prereq("radars-2", "angels-basic-blocks-2") - OV.add_prereq("radars-3", "angels-components-weapons-advanced") - OV.add_prereq("radars-4", "military-3") - OV.add_prereq("radars-4", "angels-advanced-blocks-1") - OV.add_prereq("radars-5", "angels-advanced-blocks-2") + angelsmods.industries.blocks.enhancement5 = true + + if angelsmods.industries.tech then + OV.add_prereq("radars-2", "tech-specialised-labs-basic-enhance-2") + OV.add_prereq("radars-3", "tech-specialised-labs-basic-enhance-3") + OV.add_prereq("radars-4", "tech-specialised-labs-advanced-enhance-1") + OV.add_prereq("radars-5", "tech-specialised-labs-advanced-enhance-2") + else + OV.add_prereq("radars-1", "angels-basic-blocks-1") + OV.add_prereq("radars-2", "angels-basic-blocks-2") + OV.add_prereq("radars-3", "angels-components-weapons-advanced") + OV.add_prereq("radars-4", "military-3") + OV.add_prereq("radars-4", "angels-advanced-blocks-1") + OV.add_prereq("radars-5", "angels-advanced-blocks-2") + end OV.remove_prereq("radars-2", "electronics") OV.remove_prereq("radars-3", "military-3") diff --git a/angelsindustries/prototypes/overrides/components-bobs-recipe-update.lua b/angelsindustries/prototypes/overrides/components-bobs-recipe-update.lua index 1a1bc4154..72be6a906 100644 --- a/angelsindustries/prototypes/overrides/components-bobs-recipe-update.lua +++ b/angelsindustries/prototypes/overrides/components-bobs-recipe-update.lua @@ -9,17 +9,17 @@ if angelsmods.industries.components then { name = "circuit-grey-board", category = "electronics" }, { name = "circuit-grey-board-alternative", category = "electronics" }, { name = "circuit-red-board", category = "electronics" }, - { name = "circuit-green-board", category = "electronics-machine" }, - { name = "circuit-orange-board", category = "electronics-machine" }, - { name = "circuit-blue-board", category = "electronics-machine" }, - --{ name = "circuit-yellow-board", category = "electronics-machine" }, + { name = "circuit-green-board", category = "electronics-with-fluid" }, + { name = "circuit-orange-board", category = "electronics-with-fluid" }, + { name = "circuit-blue-board", category = "electronics-with-fluid" }, + --{ name = "circuit-yellow-board", category = "electronics-with-fluid" }, --crafted with 2 fluids { name = "circuit-grey", category = "electronics" }, { name = "circuit-red", category = "electronics" }, { name = "circuit-green", category = "electronics-machine" }, - { name = "circuit-orange", category = "electronics-machine" }, - { name = "circuit-blue", category = "electronics-machine" }, - { name = "circuit-yellow", category = "electronics-machine" }, + { name = "circuit-orange", category = "electronics-with-fluid" }, + { name = "circuit-blue", category = "electronics-with-fluid" }, + { name = "circuit-yellow", category = "electronics-with-fluid" }, { name = "circuit-red-loaded", category = "electronics" }, { name = "circuit-green-loaded", category = "electronics-machine" }, @@ -29,9 +29,9 @@ if angelsmods.industries.components then { name = "circuit-resistor", category = "electronics" }, { name = "circuit-transistor", category = "electronics-machine" }, - { name = "circuit-microchip", category = "electronics-machine" }, + { name = "circuit-microchip", category = "electronics-with-fluid" }, { name = "circuit-transformer", category = "electronics-machine" }, - { name = "circuit-cpu", category = "electronics-machine" }, + { name = "circuit-cpu", category = "electronics-with-fluid" }, { name = "electronic-parts-resistor", category = "electronics-machine" }, { name = "electronic-parts-transistor", category = "electronics-machine" }, { name = "electronic-parts-microchip", category = "electronics-machine" }, @@ -51,7 +51,6 @@ if angelsmods.industries.components then -- BOB ELECTRONICS ---------------------------------------------------------- ----------------------------------------------------------------------------- if mods["bobelectronics"] then - OV.disable_recipe("wooden-board-paper") OV.disable_recipe("superior-circuit-board") end @@ -200,7 +199,17 @@ if angelsmods.industries.components then OV.global_replace_technology("battery-3", "angels-components-batteries-4") OV.disable_technology("battery-3") - OV.add_unlock("angels-components-batteries-6", "silver-oxide") + + OV.disable_recipe("silver-oxide") + OV.disable_recipe("lithium") + OV.disable_recipe("lithium-water-electrolysis") + OV.disable_recipe("lithium-chloride") + OV.disable_recipe("water-thermal-lithia") + angelsmods.functions.add_flag("silver-oxide", "hidden") + angelsmods.functions.add_flag("lithium", "hidden") + angelsmods.functions.add_flag("lithium-perchlorate", "hidden") + angelsmods.functions.add_flag("lithia-water", "hidden") + OV.disable_technology("lithium-processing") end ----------------------------------------------------------------------------- diff --git a/angelsindustries/prototypes/overrides/global-tech-base-cores.lua b/angelsindustries/prototypes/overrides/global-tech-base-cores.lua index 75fdefc97..9133a39c9 100644 --- a/angelsindustries/prototypes/overrides/global-tech-base-cores.lua +++ b/angelsindustries/prototypes/overrides/global-tech-base-cores.lua @@ -22,6 +22,8 @@ if angelsmods.industries.tech then AI.core_replace("turrets", "war", "basic") AI.core_replace("flammables", "war", "enhance") -- REFINING + -- PETROCHEM + AI.core_replace("basic-chemistry", "processing", "basic") -- SMELTING AI.core_replace("angels-solder-smelting-basic", "processing", "basic") -- BIO PROCESSING @@ -185,7 +187,6 @@ if angelsmods.industries.tech then OV.set_science_pack("low-density-structure", "datacore-processing-1", 2) -- REFINING OV.set_science_pack("geode-crystallization-1", "datacore-processing-1", 2) - OV.set_science_pack("geode-crystallization-2", "datacore-processing-1", 2) OV.set_science_pack("thermal-water-extraction", "datacore-processing-1", 2) -- PETROCHEM OV.set_science_pack("angels-coal-cracking", "datacore-processing-1", 2) @@ -198,6 +199,8 @@ if angelsmods.industries.tech then OV.set_science_pack("rubber", "datacore-processing-1", 2) AI.core_replace("rocket-booster-1", "war", "processing") AI.core_replace("rocket-booster-2", "war", "processing") + -- BIOPROCESSING + AI.core_replace("angels-composting", "basic", "processing") OV.execute() ------------------------------------------------------------------ -- now upgrade the cores to tier 2 and let them depend on the correct technology diff --git a/angelsindustries/prototypes/overrides/global-tech-base-packs.lua b/angelsindustries/prototypes/overrides/global-tech-base-packs.lua index 052a1e0dc..79570edf1 100644 --- a/angelsindustries/prototypes/overrides/global-tech-base-packs.lua +++ b/angelsindustries/prototypes/overrides/global-tech-base-packs.lua @@ -15,6 +15,8 @@ if angelsmods.industries.tech then "logistics", "turrets", -- REFINING + -- PETROCHEM + "basic-chemistry", -- SMELTING "angels-solder-smelting-basic", -- BIO PROCESSING @@ -71,6 +73,7 @@ if angelsmods.industries.tech then AI.pack_replace("lubricant", "blue", "green") -- BIO PROCESSING OV.add_prereq("bio-refugium-fish-1", "water-treatment-2") + AI.pack_replace("bio-paper-2", "blue", "green") -- INDUSTRIES OV.remove_prereq("tech-orange-circuit", "angels-components-batteries-3") OV.add_prereq("tech-orange-circuit", "angels-components-batteries-2") @@ -161,7 +164,6 @@ if angelsmods.industries.tech then AI.pack_replace("bio-processing-alien-2", "green", "orange") AI.pack_replace("bio-processing-alien-3", "green", "orange") AI.pack_replace("geode-crystallization-1", "green", "orange") - AI.pack_replace("geode-crystallization-2", "green", "orange") AI.pack_replace("bio-processing-crystal-splinter-1", "green", "orange") AI.pack_replace("bio-processing-crystal-splinter-2", "green", "orange") AI.pack_replace("bio-processing-crystal-splinter-3", "green", "orange") @@ -203,6 +205,8 @@ if angelsmods.industries.tech then -- SMELTING OV.remove_prereq("angels-metallurgy-4", "production-science-pack") OV.remove_science_pack("angels-tungsten-smelting-2", "production-science-pack") + -- BIOPROCESSING + OV.remove_prereq("bio-paper-3", "production-science-pack") -- INDUSTRIES AI.pack_replace("tech-yellow-circuit", "yellow", "blue") OV.remove_prereq("tech-yellow-circuit", "angels-components-batteries-5") diff --git a/angelsindustries/prototypes/overrides/global-tech-bobs-cores.lua b/angelsindustries/prototypes/overrides/global-tech-bobs-cores.lua index 8980e8026..f403318fc 100644 --- a/angelsindustries/prototypes/overrides/global-tech-bobs-cores.lua +++ b/angelsindustries/prototypes/overrides/global-tech-bobs-cores.lua @@ -40,8 +40,6 @@ if angelsmods.industries.tech then if settings.startup["bobmods-assembly-burner"].value == true then AI.core_replace("basic-automation", "processing", "basic") AI.core_replace("automation", "basic", "processing") - else - AI.core_replace("automation", "processing", "basic") end --chemplants if settings.startup["bobmods-assembly-chemicalplants"].value == true then @@ -160,7 +158,9 @@ 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") + -- "bob-robo-modular-4" could be using basic or processing core, depending on which of Bob's mods are enabled 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") @@ -221,7 +221,6 @@ if angelsmods.industries.tech then -- BOBS POWER ----------------------------------------------------------------- ------------------------------------------------------------------------------- if mods["bobpower"] then - AI.core_replace("steam-power", "energy", "basic") if settings.startup["bobmods-power-fluidgenerator"].value == true then AI.core_replace("fluid-generator-1", "logistic", "energy") AI.core_replace("fluid-generator-2", "logistic", "energy") @@ -252,6 +251,12 @@ if angelsmods.industries.tech then if mods["bobtech"] then --Remove cores associated with advanced alien technologies if data.raw.tool["science-pack-gold"] then + OV.remove_science_pack("alien-research-blue", "datacore-processing-1") + OV.remove_science_pack("alien-research-orange", "datacore-processing-1") + OV.remove_science_pack("alien-research-purple", "datacore-processing-1") + OV.remove_science_pack("alien-research-yellow", "datacore-processing-1") + OV.remove_science_pack("alien-research-green", "datacore-processing-1") + OV.remove_science_pack("alien-research-red", "datacore-processing-1") --blue tier OV.remove_science_pack("bob-battery-equipment-4", "datacore-enhance-1") OV.remove_science_pack("bob-battery-equipment-5", "datacore-enhance-1") @@ -284,6 +289,7 @@ if angelsmods.industries.tech then OV.remove_science_pack("vehicle-fusion-reactor-equipment-4", "datacore-enhance-1") OV.remove_science_pack("vehicle-fusion-reactor-equipment-5", "datacore-enhance-1") OV.remove_science_pack("vehicle-fusion-reactor-equipment-6", "datacore-enhance-1") + OV.remove_science_pack("personal-laser-defense-equipment-6", "datacore-enhance-1") table.insert( data.raw.recipe["science-pack-gold"].ingredients, diff --git a/angelsindustries/prototypes/overrides/global-tech-bobs-packs.lua b/angelsindustries/prototypes/overrides/global-tech-bobs-packs.lua index cdd48ec33..66c62ffc6 100644 --- a/angelsindustries/prototypes/overrides/global-tech-bobs-packs.lua +++ b/angelsindustries/prototypes/overrides/global-tech-bobs-packs.lua @@ -15,6 +15,7 @@ if angelsmods.industries.tech then AI.pack_replace("polishing", "green", "orange") AI.pack_replace("gem-processing-1", "green", "orange") AI.pack_replace("gem-processing-2", "green", "orange") + AI.pack_replace("gem-processing-3", "green", "orange") AI.pack_replace("electric-mixing-furnace", "blue", "orange") if not mods["bobtech"] then --alien resources @@ -213,6 +214,7 @@ if angelsmods.industries.tech then --AI.pack_replace("bob-robo-modular-1", "green", "orange") AI.pack_replace("bob-robo-modular-2", "blue", "orange") OV.remove_prereq("bob-robo-modular-2", "tech-blue-packs") + AI.pack_replace("bob-robo-modular-3", "yellow", "blue") -- robots OV.remove_science_pack("construction-robotics", "angels-science-pack-orange") AI.pack_replace("logistic-robotics", "blue", "orange") @@ -299,10 +301,17 @@ if angelsmods.industries.tech then 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") + if mods["boblogistics"] then + 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") + else + AI.pack_replace("bob-robot-gun-drones", "blue", "orange") + AI.pack_replace("bob-robot-plasma-drones", "blue", "orange") + AI.pack_replace("bob-robot-laser-drones", "blue", "orange") + AI.pack_replace("bob-robot-flamethrower-drones", "blue", "orange") + end AI.pack_replace("bob-laser-robot", "blue", "yellow") --Rockets AI.pack_replace("rocketry", "green", "orange") @@ -314,7 +323,6 @@ if angelsmods.industries.tech then --small fixes AI.pack_replace("follower-robot-count-1", "green", "orange") AI.pack_replace("follower-robot-count-2", "green", "orange") - OV.remove_prereq("nitroglycerin-processing", "chlorine-processing-2") -- no clue why it works nowhere else... OV.remove_prereq("walking-vehicle", "production-science-pack") end @@ -361,7 +369,6 @@ if angelsmods.industries.tech then -- BOBS POWER ----------------------------------------------------------------- ------------------------------------------------------------------------------- if mods["bobpower"] then - AI.pack_replace("steam-power", "red", "grey") --adds bob power stuffs OV.remove_science_pack("electric-engine", "angels-science-pack-green") -- steam power diff --git a/angelsindustries/prototypes/overrides/overhaul-nuclear-power.lua b/angelsindustries/prototypes/overrides/overhaul-nuclear-power.lua index 235f75c72..8ad71ff62 100644 --- a/angelsindustries/prototypes/overrides/overhaul-nuclear-power.lua +++ b/angelsindustries/prototypes/overrides/overhaul-nuclear-power.lua @@ -110,7 +110,6 @@ if angelsmods.industries.overhaul then -- Productivity ------------------------------------------------------------------------------- angelsmods.functions.allow_productivity("angels-thorium-processing") - angelsmods.functions.allow_productivity("angelsore-crystal-mix6-processing") --thorium ore angelsmods.functions.allow_productivity("angels-uranium-fuel-cell") angelsmods.functions.allow_productivity("angels-mixed-oxide-cell") angelsmods.functions.allow_productivity("angels-thorium-fuel-cell") @@ -188,6 +187,15 @@ if angelsmods.industries.overhaul then end end end + if data.raw.recipe["plutonium-nucleosynthesis"] then + OV.patch_recipes({ + { + name = "plutonium-nucleosynthesis", + subgroup = "angels-power-nuclear-processing", + order = "b[AMOX]-d[synthesis]", + }, + }) + end else --if not rtg, remove bobingabout process OV.remove_unlock("bobingabout-enrichment-process", "bobingabout-enrichment-process") diff --git a/angelsindustries/prototypes/technology/components-batteries-technology.lua b/angelsindustries/prototypes/technology/components-batteries-technology.lua index 838e574dd..c92309a6f 100644 --- a/angelsindustries/prototypes/technology/components-batteries-technology.lua +++ b/angelsindustries/prototypes/technology/components-batteries-technology.lua @@ -113,7 +113,7 @@ if angelsmods.industries.components then "thermal-water-extraction", "bio-processing-green", "angels-components-batteries-2", - "gas-steam-cracking-1", + "steam-cracking-1", }, effects = { { @@ -261,7 +261,7 @@ if angelsmods.industries.components then icon_size = 256, icon_mipmaps = 4, prerequisites = { - "sodium-processing", + "sodium-processing-2", "angels-tungsten-smelting-1", "angels-silver-smelting-2", "angels-components-batteries-5", diff --git a/angelsindustries/prototypes/technology/components-electronics-technology.lua b/angelsindustries/prototypes/technology/components-electronics-technology.lua index bdc2ff571..71850a441 100644 --- a/angelsindustries/prototypes/technology/components-electronics-technology.lua +++ b/angelsindustries/prototypes/technology/components-electronics-technology.lua @@ -1,6 +1,8 @@ local OV = angelsmods.functions.OV if angelsmods.industries.components then OV.add_unlock("bio-paper-1", "circuit-grey-board-alternative") + OV.remove_science_pack("bio-paper-1", "logistic-science-pack") + OV.remove_prereq("bio-paper-1", "logistic-science-pack") OV.execute() data:extend({ diff --git a/angelsinfiniteores/changelog.txt b/angelsinfiniteores/changelog.txt index d4380e6fa..26958b51b 100644 --- a/angelsinfiniteores/changelog.txt +++ b/angelsinfiniteores/changelog.txt @@ -1,4 +1,9 @@ --------------------------------------------------------------------------------------------------- +Version: 0.9.11 +Date: 22.12.2023 + Bugfixes: + - Fixed infinite ore not showing for Bob's Ores (914) +--------------------------------------------------------------------------------------------------- Version: 0.9.10 Date: 19.12.2021 Changes: diff --git a/angelsinfiniteores/graphics/entity/ores/Thumbs.db b/angelsinfiniteores/graphics/entity/ores/Thumbs.db deleted file mode 100644 index 8a5636a0c..000000000 Binary files a/angelsinfiniteores/graphics/entity/ores/Thumbs.db and /dev/null differ diff --git a/angelsinfiniteores/info.json b/angelsinfiniteores/info.json index 67a65d787..a3b921034 100644 --- a/angelsinfiniteores/info.json +++ b/angelsinfiniteores/info.json @@ -1,6 +1,6 @@ { "name": "angelsinfiniteores", - "version": "0.9.10", + "version": "0.9.11", "factorio_version": "1.1", "title": "Angel's Infinite Ores", "author": "Arch666Angel", diff --git a/angelsinfiniteores/prototypes/generation/bob-options.lua b/angelsinfiniteores/prototypes/generation/bob-options.lua index 16b816041..72ee12a5a 100644 --- a/angelsinfiniteores/prototypes/generation/bob-options.lua +++ b/angelsinfiniteores/prototypes/generation/bob-options.lua @@ -1,7 +1,12 @@ if mods["bobores"] then - if bobmods.ores.settings.UnsortedGemOre == true then + if not bobmods.ores.gems.enabled then + -- Do nothing + elseif bobmods.ores.settings.UnsortedGemOre == true then bobmods.lib.resource.add_result("infinite-gem-ore", { name = "gem-ore" }) else + -- remove unsorted gem ore + bobmods.lib.resource.remove_result("infinite-gem-ore", "gem-ore") + bobmods.lib.resource.add_result( "infinite-gem-ore", { name = "diamond-ore", probability = bobmods.gems.DiamondRatio } @@ -20,8 +25,6 @@ if mods["bobores"] then { name = "sapphire-ore", probability = bobmods.gems.SapphireRatio } ) bobmods.lib.resource.add_result("infinite-gem-ore", { name = "topaz-ore", probability = bobmods.gems.TopazRatio }) - --remove regular gems - bobmods.lib.resource.remove_result("infinite-gem-ore", "gem-ore") end if bobmods.ores.settings.GemsFromOtherOres == true then diff --git a/angelsinfiniteores/prototypes/generation/bob-ore-inf.lua b/angelsinfiniteores/prototypes/generation/bob-ore-inf.lua index e1675b7f9..1336cd200 100644 --- a/angelsinfiniteores/prototypes/generation/bob-ore-inf.lua +++ b/angelsinfiniteores/prototypes/generation/bob-ore-inf.lua @@ -1,6 +1,6 @@ if mods["bobores"] then if angelsmods.ores.disable_ore_override or not angelsmods.refining then - if settings.startup["bobmods-ores-enablebauxite"].value == true then + if bobmods.ores.bauxite.enabled == true then if data.raw.resource["bauxite-ore"] then angelsmods.functions.add_resource("make", { name = "infinite-bauxite-ore", @@ -34,7 +34,7 @@ if mods["bobores"] then end end - if settings.startup["bobmods-ores-enablecobaltore"].value == true then + if bobmods.ores.cobalt.enabled == true then if data.raw.resource["cobalt-ore"] then angelsmods.functions.add_resource("make", { name = "infinite-cobalt-ore", @@ -68,7 +68,7 @@ if mods["bobores"] then end end - if settings.startup["bobmods-ores-enablegemsore"].value == true then + if bobmods.ores.gems.enabled == true then if data.raw.resource["gem-ore"] then angelsmods.functions.add_resource("make", { name = "infinite-gem-ore", @@ -102,7 +102,7 @@ if mods["bobores"] then end end - if settings.startup["bobmods-ores-enablegoldore"].value == true then + if bobmods.ores.gold.enabled == true then if data.raw.resource["gold-ore"] then angelsmods.functions.add_resource("make", { name = "infinite-gold-ore", @@ -136,7 +136,7 @@ if mods["bobores"] then end end - if settings.startup["bobmods-ores-enableleadore"].value == true then + if bobmods.ores.lead.enabled == true then if data.raw.resource["lead-ore"] then angelsmods.functions.add_resource("make", { name = "infinite-lead-ore", @@ -170,7 +170,7 @@ if mods["bobores"] then end end - if settings.startup["bobmods-ores-enablenickelore"].value == true then + if bobmods.ores.nickel.enabled == true then if data.raw.resource["nickel-ore"] then angelsmods.functions.add_resource("make", { name = "infinite-nickel-ore", @@ -204,7 +204,7 @@ if mods["bobores"] then end end - if settings.startup["bobmods-ores-enablequartz"].value == true then + if bobmods.ores.quartz.enabled == true then if data.raw.resource["quartz"] then angelsmods.functions.add_resource("make", { name = "infinite-quartz", @@ -238,7 +238,7 @@ if mods["bobores"] then end end - if settings.startup["bobmods-ores-enablerutile"].value == true then + if bobmods.ores.rutile.enabled == true then if data.raw.resource["rutile-ore"] then angelsmods.functions.add_resource("make", { name = "infinite-rutile-ore", @@ -272,7 +272,7 @@ if mods["bobores"] then end end - if settings.startup["bobmods-ores-enablesilverore"].value == true then + if bobmods.ores.silver.enabled == true then if data.raw.resource["silver-ore"] then angelsmods.functions.add_resource("make", { name = "infinite-silver-ore", @@ -306,7 +306,7 @@ if mods["bobores"] then end end - if settings.startup["bobmods-ores-enablesulfur"].value == true then + if bobmods.ores.sulfur.enabled == true then if data.raw.resource["sulfur"] then angelsmods.functions.add_resource("make", { name = "infinite-sulfur", @@ -340,7 +340,7 @@ if mods["bobores"] then end end - if settings.startup["bobmods-ores-enablethoriumore"].value == true then + if bobmods.ores.thorium.enabled == true then if data.raw.resource["thorium-ore"] then angelsmods.functions.add_resource("make", { name = "infinite-thorium-ore", @@ -374,7 +374,7 @@ if mods["bobores"] then end end - if settings.startup["bobmods-ores-enabletinore"].value == true then + if bobmods.ores.tin.enabled == true then if data.raw.resource["tin-ore"] then angelsmods.functions.add_resource("make", { name = "infinite-tin-ore", @@ -408,7 +408,7 @@ if mods["bobores"] then end end - if settings.startup["bobmods-ores-enabletungstenore"].value == true then + if bobmods.ores.tungsten.enabled == true then if data.raw.resource["tungsten-ore"] then angelsmods.functions.add_resource("make", { name = "infinite-tungsten-ore", @@ -442,7 +442,7 @@ if mods["bobores"] then end end - if settings.startup["bobmods-ores-enablezincore"].value == true then + if bobmods.ores.zinc.enabled == true then if data.raw.resource["zinc-ore"] then angelsmods.functions.add_resource("make", { name = "infinite-zinc-ore", diff --git a/angelspetrochem/changelog.txt b/angelspetrochem/changelog.txt index 69a086d3f..d0c7fb03e 100644 --- a/angelspetrochem/changelog.txt +++ b/angelspetrochem/changelog.txt @@ -1,4 +1,14 @@ --------------------------------------------------------------------------------------------------- +Version: 0.9.25 +Date: 22.12.2023 + Changes: + - Compatibility with Bob's changes (911) + - Split tech Sodium processing into Sodium processing 1 and Sodium processing 2 (922) + - Combined techs Oil Steam cracking and Gas Steam Cracking (951) + Bugfixes: + - Fixed recipe order of carbon products to correctly display in helmod + - Fixed fertiliser not being craftable in mod configurations (924) +--------------------------------------------------------------------------------------------------- Version: 0.9.24 Date: 23.02.2023 Bugfixes: diff --git a/angelspetrochem/data.lua b/angelspetrochem/data.lua index 01739c6cc..e2d24626d 100644 --- a/angelspetrochem/data.lua +++ b/angelspetrochem/data.lua @@ -11,7 +11,7 @@ angelsmods.trigger.enableconverter = settings.startup["angels-enable-converter"] angelsmods.trigger.hideconverter = settings.startup["angels-hide-converter"].value --PETRO PRODUCS angelsmods.trigger.plastic = true -angelsmods.trigger.resin = not (angelsmods.functions.is_special_vanilla() or not mods["bobelectronics"]) +angelsmods.trigger.resin = (not angelsmods.functions.is_special_vanilla()) or (mods["bobelectronics"] and true or false) angelsmods.trigger.rubber = ( (not angelsmods.functions.is_special_vanilla()) or mods["bobelectronics"] @@ -25,6 +25,8 @@ angelsmods.trigger.gas_ammonium_chloride = false angelsmods.trigger.early_sulfuric_acid = false angelsmods.trigger.gas_hydrogen_fluoride = settings.startup["angels-enable-acids"].value or (mods["angelsbioprocessing"] and true or false) +angelsmods.trigger.gas_acetone = angelsmods.trigger.resin +angelsmods.trigger.gas_urea = (mods["bobgreenhouse"] or angelsmods.trigger.resin) and true or false --HIDE UNUSED BUILDINGS angelsmods.trigger.disable_bobs_electrolysers = settings.startup["angels-disable-bobs-electrolysers"].value diff --git a/angelspetrochem/info.json b/angelspetrochem/info.json index abc5a1bd7..4c205b40a 100644 --- a/angelspetrochem/info.json +++ b/angelspetrochem/info.json @@ -1,6 +1,6 @@ { "name": "angelspetrochem", - "version": "0.9.24", + "version": "0.9.25", "factorio_version": "1.1", "title": "Angel's Petrochemical Processing", "author": "Arch666Angel", @@ -11,6 +11,7 @@ "angelsrefining >= 0.12.3", "? bobplates >= 1.1.6", "? bobassembly >= 1.1.5", - "? bobrevamp >= 1.1.5" + "? bobrevamp >= 1.1.5", + "? bobelectronics >= 1.1.6" ] } diff --git a/angelspetrochem/locale/en/petrochem.cfg b/angelspetrochem/locale/en/petrochem.cfg index 04f9a10b2..86922f018 100644 --- a/angelspetrochem/locale/en/petrochem.cfg +++ b/angelspetrochem/locale/en/petrochem.cfg @@ -455,8 +455,7 @@ angels-advanced-chemistry=Advanced chemistry angels-coal-processing=Coal processing angels-coal-cracking=Coal cracking gas-synthesis=Synthesis gas processing -gas-steam-cracking=Gas steam cracking -oil-steam-cracking=Oil steam cracking +steam-cracking=Steam cracking plastic=Plastic resins=Resins resin=Resin @@ -475,7 +474,7 @@ water-chemistry=Enrichment and processing of heavy water. angels-sulfur-processing=Sulfur is a highly reactive non-metallic chemical with a broad range of applications. angels-nitrogen-processing=Nitrogen is a non-metallic chemical with a broad range of applications. chlorine-processing=Chlorine is a reactive halogen with a broad range of applications. -oil-gas-extraction=Organic compounds from fossile deposits serve as the base for a vast number of production chains. +oil-gas-extraction=Organic compounds from fossil deposits serve as the base for a vast number of production chains. angels-advanced-gas-processing=Alternative ways of fractioning short-chained hydrocarbons. angels-oil-processing=Key technology for the processing of long-chained hydrocarbons. angels-advanced-oil-processing=Alternative ways of fractioning of long-chained hydrocarbons. @@ -485,8 +484,7 @@ angels-advanced-chemistry=Selective chemical conversions using catalysts. angels-coal-processing=Purification and use of coke as well as carbon. angels-coal-cracking=Liquefaction and gasification of coal. gas-synthesis=De novo synthesis of hydrocarbons from base chemicals. -gas-steam-cracking=Re-combination of short-chained hydrocarbons. -oil-steam-cracking=Cracking down of long-chained hydrocarbons. +steam-cracking=Steam cracking of hydrocarbons. plastic=Various sources for plastic. resins=Synthetic polymeric materials that can be molded into protective composition. resin=Various sources for resins. diff --git a/angelspetrochem/migrations/angelspetrochem_0.9.25.json b/angelspetrochem/migrations/angelspetrochem_0.9.25.json new file mode 100644 index 000000000..01ec35ab9 --- /dev/null +++ b/angelspetrochem/migrations/angelspetrochem_0.9.25.json @@ -0,0 +1,6 @@ +{ + "technology": + [ + ["sodium-processing", "sodium-processing-1"] + ] +} diff --git a/angelspetrochem/migrations/angelspetrochem_0.9.25.lua b/angelspetrochem/migrations/angelspetrochem_0.9.25.lua new file mode 100644 index 000000000..921469f83 --- /dev/null +++ b/angelspetrochem/migrations/angelspetrochem_0.9.25.lua @@ -0,0 +1,7 @@ +for index, force in pairs(game.forces) do + local technologies = force.technologies + + if technologies["sodium-processing-1"].researched then + technologies["sodium-processing-2"].researched = true + end +end diff --git a/angelspetrochem/prototypes/global-override/bobplates.lua b/angelspetrochem/prototypes/global-override/bobplates.lua index 2540d9388..a68ae8594 100644 --- a/angelspetrochem/prototypes/global-override/bobplates.lua +++ b/angelspetrochem/prototypes/global-override/bobplates.lua @@ -83,6 +83,7 @@ if mods["bobplates"] then OV.remove_prereq("cobalt-processing", "electrolysis-1") OV.remove_prereq("chemical-processing-2", "electrolysis-2") + OV.remove_prereq("plastics", "chemical-plant") OV.remove_prereq("plastics", "electrolysis-2") OV.remove_prereq("aluminium-processing", "electrolysis-2") OV.add_prereq("aluminium-processing", "chlorine-processing-1") @@ -196,13 +197,6 @@ if mods["bobplates"] then -- other oil related stuffs OV.patch_recipes({ - { - name = "petroleum-jelly", - ingredients = { - { name = "gas-residual", type = "fluid", amount = "liquid-naphtha" }, - }, - crafting_machine_tint = angelsmods.functions.get_recipe_tints({ "gas-residual" }), - }, { name = "polishing-compound", ingredients = { @@ -218,65 +212,6 @@ elseif mods["bobelectronics"] then }) end -------------------------------------------------------------------------------- --- RUBBER HANDLING ------------------------------------------------------------ -------------------------------------------------------------------------------- -if mods["bobplates"] then - -- bob electronics - if mods["bobelectronics"] then --check if it exists first - move_item("insulated-cable", "petrochem-solids", "a[petrochem-solids]-c[rubber]-b") - --[[ - Normal Bob's (w or w/o Greenhouses) is 1 wood per 1 rubber per 2 circuit wires. - Bob's + Angel's Petrochem is 15 wood per 1 rubber per 2 circuit wires - Bob's + Angel's Petrochem + Bob's Greenhouses is 27 wood per 1 rubber per 2 circuit wires. - Bob's + Angel's Bioprocessing (w or w/o Greenhouses) is 30 wood per 1 rubber per 2 circuit wires. - How much tinned wire, and the yield is caculated by: - insulated-cable amount = wood_per_rubber * 2 - tinned-copper-cable amount = wood_per_rubber * 2 - energy_required = wood_per_rubber / 2 - ]] - local wood_per_rubber = 15 - if angelsmods.bioprocessing then - wood_per_rubber = 30 - elseif mods["bobgreenhouse"] then - wood_per_rubber = 27 - end - - OV.patch_recipes({ - { - name = "insulated-cable", - subgroup = "petrochem-solids-2", - order = "b[rubber]-c[cable]-c", - ingredients = { - { type = "item", name = "tinned-copper-cable", amount = wood_per_rubber * 2 }, - { type = "item", name = "rubber", amount = 1 }, - }, - results = { { type = "item", name = "insulated-cable", amount = wood_per_rubber * 2 } }, - energy_required = wood_per_rubber / 2, - }, - }) - - OV.remove_unlock("electronics", "insulated-cable") - OV.add_unlock("circuit-network", "insulated-cable") - OV.add_unlock("circuit-network", "bob-rubber") - if mods["angelsbioprocessing"] then - OV.add_prereq("circuit-network", "bio-arboretum-1") - end - OV.add_prereq("rubbers", "circuit-network") - OV.add_prereq("advanced-electronics-2", "rubbers") - end -end - -------------------------------------------------------------------------------- --- RESIN ---------------------------------------------------------------------- -------------------------------------------------------------------------------- -if mods["bobplates"] then - -- bob electronics - if mods["bobelectronics"] then --check if it exists first - OV.add_prereq("advanced-electronics", "resins") - end -end - ------------------------------------------------------------------------------- -- WATER ENRICHMENT ----------------------------------------------------------- ------------------------------------------------------------------------------- diff --git a/angelspetrochem/prototypes/global-override/bobrevamp.lua b/angelspetrochem/prototypes/global-override/bobrevamp.lua index 55acd98f0..41b615a0c 100644 --- a/angelspetrochem/prototypes/global-override/bobrevamp.lua +++ b/angelspetrochem/prototypes/global-override/bobrevamp.lua @@ -16,27 +16,9 @@ if mods["bobrevamp"] then OV.disable_technology({ "solid-fuel" }) - OV.remove_unlock("angels-oil-processing", "solid-fuel-fuel-oil") - OV.remove_unlock("angels-oil-processing", "solid-fuel-naphtha") - OV.remove_unlock("gas-processing", "solid-fuel-methane") - - OV.add_unlock("flammables", "solid-fuel-fuel-oil") - OV.add_unlock("flammables", "solid-fuel-naphtha") - OV.add_unlock("angels-advanced-gas-processing", "solid-fuel-methane") - - OV.add_prereq("angels-advanced-gas-processing", "flammables") - OV.add_prereq("gas-synthesis", "flammables") - OV.add_prereq("angels-nitrogen-processing-3", "flammables") - - if mods["bobplates"] then - OV.remove_unlock("angels-oil-processing", "liquid-fuel") - OV.remove_unlock("angels-oil-processing", "solid-fuel-from-hydrogen") - - --OV.add_unlock("flammables", "solid-fuel-from-hydrogen") - - if mods["bobwarfare"] then - OV.add_prereq("military-3", "flammables") - end + if mods["bobwarfare"] then + -- Napalm capsules require Liquid fuel / Fuel oil + OV.add_prereq("military-3", "flammables") end ----------------------------------------------------------------------------- @@ -45,7 +27,6 @@ if mods["bobrevamp"] then OV.disable_recipe("petroleum-gas-sweetening") angelsmods.functions.add_flag("sour-gas", "hidden") - angelsmods.functions.disable_barreling_recipes("sour-gas") OV.hide_recipe("ammonia") OV.converter_fluid("ammonia", "gas-ammonia") @@ -61,9 +42,8 @@ if mods["bobrevamp"] then end if settings.startup["bobmods-revamp-oil"] then OV.hide_recipe("solid-fuel-from-sour-gas") - if mods["bobelectronics"] then - OV.hide_recipe("bob-oil-processing") - end + OV.remove_unlock("flammables", "solid-fuel-from-sour-gas") + OV.remove_unlock("flammables", "solid-fuel-from-petroleum-gas") end if angelsmods.trigger.disable_bobs_chemical_plants then @@ -104,7 +84,6 @@ if mods["bobrevamp"] then OV.converter_fluid("carbon-dioxide", "gas-carbon-dioxide") angelsmods.functions.disable_barreling_recipes("carbon-dioxide") - --OV.remove_unlock("chemical-processing-2", "carbon-dioxide") OV.global_replace_item("sodium-carbonate", "solid-sodium-carbonate") angelsmods.functions.add_flag("sodium-carbonate", "hidden") @@ -142,7 +121,6 @@ if mods["bobrevamp"] then }) angelsmods.functions.add_flag("ammoniated-brine", "hidden") - angelsmods.functions.disable_barreling_recipes("ammoniated-brine") angelsmods.functions.add_flag("sodium-bicarbonate", "hidden") diff --git a/angelspetrochem/prototypes/global-override/bobwarfare.lua b/angelspetrochem/prototypes/global-override/bobwarfare.lua index 5bbe98118..92fde55df 100644 --- a/angelspetrochem/prototypes/global-override/bobwarfare.lua +++ b/angelspetrochem/prototypes/global-override/bobwarfare.lua @@ -28,11 +28,6 @@ if mods["bobwarfare"] then angelsmods.functions.add_flag("sulfuric-nitric-acid", "hidden") OV.disable_recipe({ "sulfuric-nitric-acid" }) end - - OV.add_prereq("nitroglycerin-processing", "angels-sulfur-processing-2") - OV.add_prereq("nitroglycerin-processing", "angels-nitrogen-processing-2") - else - OV.add_prereq("cordite-processing", "angels-nitrogen-processing-2") end ----------------------------------------------------------------------------- @@ -63,7 +58,7 @@ if mods["bobwarfare"] then data.raw["recipe"]["nitroglycerin"].always_show_products = true OV.remove_unlock("nitroglycerin-processing", "glycerol") - OV.add_prereq("nitroglycerin-processing", "chlorine-processing-2") + OV.add_prereq("nitroglycerin-processing", "angels-explosives-1") ----------------------------------------------------------------------------- -- GLYCEROL ----------------------------------------------------------------- @@ -89,4 +84,17 @@ if mods["bobwarfare"] then }, }, }) + + ----------------------------------------------------------------------------- + -- PETROLEUM JELLY ---------------------------------------------------------- + ----------------------------------------------------------------------------- + OV.patch_recipes({ + { + name = "petroleum-jelly", + ingredients = { + { name = "gas-residual", type = "fluid", amount = "liquid-naphtha" }, + }, + crafting_machine_tint = angelsmods.functions.get_recipe_tints({ "gas-residual" }), + }, + }) end diff --git a/angelspetrochem/prototypes/override/angelspetrochem.lua b/angelspetrochem/prototypes/override/angelspetrochem.lua index 22513069b..d05892f4f 100644 --- a/angelspetrochem/prototypes/override/angelspetrochem.lua +++ b/angelspetrochem/prototypes/override/angelspetrochem.lua @@ -19,7 +19,11 @@ if mods["bobplates"] and data.raw["fluid"]["deuterium"] then OV.disable_technology("deuterium-processing") OV.add_prereq("water-chemistry-2", "nuclear-fuel-reprocessing") - OV.add_unlock("water-chemistry-2", "deuterium-fuel-cell") + if mods["bobrevamp"] and mods["bobpower"] and settings.startup["bobmods-revamp-nuclear"].value == true then + -- deuterium-fuel-cell will be unlocked by bob-nuclear-power-3 + else + OV.add_unlock("water-chemistry-2", "deuterium-fuel-cell") + end OV.set_science_pack("deuterium-fuel-reprocessing", "utility-science-pack", 1) OV.set_science_pack("deuterium-fuel-cell-2", "utility-science-pack", 1) elseif angelsmods.industries and angelsmods.industries.overhaul then @@ -30,17 +34,11 @@ elseif angelsmods.industries and angelsmods.industries.overhaul then -- not bobs mods, should we do something, usual thing is to do nothing... else -- no deuterium required, disabling it... angelsmods.functions.add_flag("gas-enriched-hydrogen-sulfide", "hidden") - angelsmods.functions.disable_barreling_recipes("gas-enriched-hydrogen-sulfide") angelsmods.functions.add_flag("liquid-water-semiheavy-1", "hidden") - angelsmods.functions.disable_barreling_recipes("liquid-water-semiheavy-1") angelsmods.functions.add_flag("liquid-water-semiheavy-2", "hidden") - angelsmods.functions.disable_barreling_recipes("liquid-water-semiheavy-2") angelsmods.functions.add_flag("liquid-water-semiheavy-3", "hidden") - angelsmods.functions.disable_barreling_recipes("liquid-water-semiheavy-3") angelsmods.functions.add_flag("liquid-water-heavy", "hidden") - angelsmods.functions.disable_barreling_recipes("liquid-water-heavy") angelsmods.functions.add_flag("gas-deuterium", "hidden") - angelsmods.functions.disable_barreling_recipes("gas-deuterium") OV.disable_recipe({ "angels-hydrogen-sulfide-enrichment", @@ -186,25 +184,30 @@ end if angelsmods.functions.is_special_vanilla() then OV.disable_recipe({ "solid-calcium-chloride", - "cumene-process", -- "gas-acetone" - "gas-phosgene", }) - OV.remove_prereq("angels-nitrogen-processing-2", "chlorine-processing-1") angelsmods.functions.add_flag({ "solid-calcium-chloride", - "gas-phosgene", }, "hidden") +end - if angelsmods.bioprocessing then - else - OV.disable_recipe({ - "gas-urea", - }) - angelsmods.functions.add_flag({ - "gas-urea", - "gas-acetone", - }, "hidden") - end +if angelsmods.trigger.gas_acetone then +else + OV.disable_recipe({ + "cumene-process", + }) + angelsmods.functions.add_flag({ + "gas-acetone", + }, "hidden") +end + +if angelsmods.trigger.gas_urea then +else + OV.disable_recipe({ + "gas-urea", + }) + angelsmods.functions.add_flag({ + "gas-urea", + }, "hidden") end if angelsmods.trigger.resin then @@ -287,8 +290,9 @@ else OV.disable_recipe({ "gas-ammonium-chloride", }) - OV.remove_unlock("angels-nitrogen-processing-2", "gas-ammonium-chloride") + OV.remove_unlock("angels-nitrogen-processing-4", "gas-ammonium-chloride") angelsmods.functions.add_flag("gas-ammonium-chloride", "hidden") + OV.remove_prereq("angels-nitrogen-processing-3", "chlorine-processing-2") end ----------------------------------------------------------------------------- diff --git a/angelspetrochem/prototypes/override/angelsrefining.lua b/angelspetrochem/prototypes/override/angelsrefining.lua index 7275d75fd..7355b9d85 100644 --- a/angelspetrochem/prototypes/override/angelsrefining.lua +++ b/angelspetrochem/prototypes/override/angelsrefining.lua @@ -37,16 +37,12 @@ if angelsmods.refining then }) OV.remove_unlock("water-treatment", "liquifier") - OV.add_unlock("basic-chemistry", "liquifier") OV.remove_prereq("slag-processing-1", "water-treatment") OV.remove_prereq("slag-processing-1", "ore-crushing") OV.add_prereq("advanced-ore-refining-1", "ore-crushing") OV.remove_unlock("slag-processing-1", "liquifier-2") OV.remove_unlock("slag-processing-2", "liquifier-3") OV.remove_unlock("slag-processing-3", "liquifier-4") - OV.add_unlock("angels-advanced-chemistry-1", "liquifier-2") - OV.add_unlock("angels-advanced-chemistry-2", "liquifier-3") - OV.add_unlock("angels-advanced-chemistry-4", "liquifier-4") OV.add_prereq("ore-advanced-floatation", "chlorine-processing-1") end diff --git a/angelspetrochem/prototypes/override/angelssmelting.lua b/angelspetrochem/prototypes/override/angelssmelting.lua index 4967e15bb..7033bd867 100644 --- a/angelspetrochem/prototypes/override/angelssmelting.lua +++ b/angelspetrochem/prototypes/override/angelssmelting.lua @@ -34,4 +34,6 @@ else "solid-sodium-hydroxide-solid-sodium-sulfate", }) angelsmods.functions.add_flag("solid-sodium-cyanide", "hidden") + OV.remove_prereq("sodium-processing-1", "chlorine-processing-1") + OV.add_prereq("sodium-processing-1", "chlorine-processing-3") end diff --git a/angelspetrochem/prototypes/override/base-game.lua b/angelspetrochem/prototypes/override/base-game.lua index 29ddb21e0..fd7b99b0d 100644 --- a/angelspetrochem/prototypes/override/base-game.lua +++ b/angelspetrochem/prototypes/override/base-game.lua @@ -45,8 +45,7 @@ angelsmods.functions.add_flag("heavy-oil", "hidden") move_item("lubricant", "petrochem-carbon-fluids", "dcd", "fluid") OV.remove_prereq("lubricant", "oil-processing") OV.remove_prereq("lubricant", "chemical-plant") -OV.add_prereq("lubricant", "angels-oil-processing") -OV.add_prereq("lubricant", "gas-steam-cracking-1") +OV.add_prereq("lubricant", "steam-cracking-1") ------------------------------------------------------------------------------- -- PLASTICS ------------------------------------------------------------------- @@ -81,11 +80,8 @@ end move_item("steam", "petrochem-basic-fluids", "a", "fluid") move_item("solid-fuel", "petrochem-fuel", "a[solid-fuel]-a") -OV.remove_unlock("angels-oil-processing", "solid-fuel-naphtha") OV.add_unlock("flammables", "solid-fuel-naphtha") -OV.remove_unlock("angels-oil-processing", "solid-fuel-fuel-oil") OV.add_unlock("flammables", "solid-fuel-fuel-oil") -OV.remove_unlock("gas-processing", "solid-fuel-methane") OV.add_unlock("flammables", "solid-fuel-methane") OV.add_prereq("flammables", "gas-processing") diff --git a/angelspetrochem/prototypes/override/bob.lua b/angelspetrochem/prototypes/override/bob.lua new file mode 100644 index 000000000..0356da3c1 --- /dev/null +++ b/angelspetrochem/prototypes/override/bob.lua @@ -0,0 +1,7 @@ +local OV = angelsmods.functions.OV + +if mods["bobelectronics"] or mods["boblogistics"] or mods["bobplates"] then + OV.remove_unlock("flammables", "solid-fuel-from-petroleum-gas") + OV.remove_unlock("flammables", "solid-fuel-from-light-oil") + OV.remove_unlock("flammables", "solid-fuel-from-heavy-oil") +end diff --git a/angelspetrochem/prototypes/override/bobelectronics.lua b/angelspetrochem/prototypes/override/bobelectronics.lua index 446455923..f6675029e 100644 --- a/angelspetrochem/prototypes/override/bobelectronics.lua +++ b/angelspetrochem/prototypes/override/bobelectronics.lua @@ -1,6 +1,64 @@ local OV = angelsmods.functions.OV +local move_item = angelsmods.functions.move_item if mods["bobelectronics"] then OV.add_prereq("advanced-electronics", "chlorine-processing-1") + OV.add_prereq("advanced-electronics", "resins") OV.hide_recipe("bob-oil-processing") end + +------------------------------------------------------------------------------- +-- RUBBER HANDLING ------------------------------------------------------------ +------------------------------------------------------------------------------- +if mods["bobelectronics"] then + move_item("insulated-cable", "petrochem-solids", "a[petrochem-solids]-c[rubber]-b") + --[[ + Normal Bob's (w or w/o Greenhouses) is 1 wood per 1 rubber per 2 circuit wires. + Bob's + Angel's Petrochem is 15 wood per 1 rubber per 2 circuit wires + Bob's + Angel's Petrochem + Bob's Greenhouses is 27 wood per 1 rubber per 2 circuit wires. + Bob's + Angel's Bioprocessing (w or w/o Greenhouses) is 30 wood per 1 rubber per 2 circuit wires. + How much tinned wire, and the yield is caculated by: + insulated-cable amount = wood_per_rubber * 2 + tinned-copper-cable amount = wood_per_rubber * 2 + energy_required = wood_per_rubber / 2 + ]] + local wood_per_rubber = 15 + if angelsmods.bioprocessing then + wood_per_rubber = 30 + elseif mods["bobgreenhouse"] then + wood_per_rubber = 27 + end + + if mods["bobplates"] then + OV.patch_recipes({ + { + name = "insulated-cable", + ingredients = { + { type = "item", name = "tinned-copper-cable", amount = wood_per_rubber * 2 }, + { type = "item", name = "rubber", amount = 1 }, + }, + }, + }) + end + OV.patch_recipes({ + { + name = "insulated-cable", + subgroup = "petrochem-solids-2", + order = "b[rubber]-c[cable]-c", + results = { { type = "item", name = "insulated-cable", amount = wood_per_rubber * 2 } }, + energy_required = wood_per_rubber / 2, + }, + }) + + OV.remove_unlock("bob-wood-processing", "bob-rubber") + OV.remove_unlock("electronics", "insulated-cable") + if mods["angelsbioprocessing"] then + OV.add_unlock("bio-wood-processing-2", "bob-rubber") + OV.add_prereq("circuit-network", "bio-wood-processing-2") + else + OV.add_unlock("circuit-network", "bob-rubber") + end + OV.add_unlock("circuit-network", "insulated-cable") + OV.add_prereq("rubbers", "circuit-network") + OV.add_prereq("advanced-electronics-2", "rubbers") +end diff --git a/angelspetrochem/prototypes/override/boblogistics.lua b/angelspetrochem/prototypes/override/boblogistics.lua index 54af654ce..756e99861 100644 --- a/angelspetrochem/prototypes/override/boblogistics.lua +++ b/angelspetrochem/prototypes/override/boblogistics.lua @@ -5,4 +5,6 @@ if mods["boblogistics"] then angelsmods.functions.move_item("angels-storage-tank-1", "angels-fluid-tanks", "c[large-tank]-c[gas]") angelsmods.functions.move_item("angels-storage-tank-2", "angels-fluid-tanks", "c[large-tank]-b[oil]") angelsmods.functions.move_item("angels-storage-tank-3", "angels-fluid-tanks", "c[large-tank]-a[inline]") + + OV.hide_recipe("bob-oil-processing") end diff --git a/angelspetrochem/prototypes/override/bobplates.lua b/angelspetrochem/prototypes/override/bobplates.lua index a2cae75a4..5785aa90b 100644 --- a/angelspetrochem/prototypes/override/bobplates.lua +++ b/angelspetrochem/prototypes/override/bobplates.lua @@ -143,6 +143,7 @@ if mods["bobplates"] then data.raw.fluid["tungstic-acid"].icon = nil data.raw.fluid["tungstic-acid"].icon_size = nil data.raw.fluid["tungstic-acid"].icon_mipmaps = nil + data.raw.recipe["tungstic-acid"].icon = nil OV.patch_recipes({ { name = "liquid-fuel", @@ -169,17 +170,19 @@ if mods["bobplates"] then OV.add_unlock("flammables", "liquid-fuel") OV.add_unlock("flammables", "enriched-fuel-from-liquid-fuel") OV.remove_prereq("flammables", "gas-processing") - OV.add_prereq("flammables", "gas-steam-cracking-1") + OV.add_prereq("flammables", "steam-cracking-1") end ------------------------------------------------------------------------------- -- RESIN HANDLING ------------------------------------------------------------- ------------------------------------------------------------------------------- -if mods["bobplates"] then +if mods["bobplates"] or mods["bobelectronics"] then if angelsmods.trigger.resin then OV.global_replace_item({ "solid-resin" }, "resin") angelsmods.functions.add_flag("solid-resin", "hidden") move_item("resin", "petrochem-solids", "a[petrochem-solids]-b[resin]") + local resin_icon = mods["bobplates"] and "__bobplates__/graphics/icons/resin.png" + or "__bobelectronics__/graphics/icons/resin.png" OV.patch_recipes({ { @@ -191,7 +194,7 @@ if mods["bobplates"] then order = "b[resin]-b[solid]-a", icons = angelsmods.functions.add_number_icon_layer({ { - icon = "__bobplates__/graphics/icons/resin.png", + icon = resin_icon, icon_size = 32, icon_mipmaps = 1, }, @@ -202,13 +205,13 @@ if mods["bobplates"] then order = "b[resin]-b[solid]-b", icons = mods["angelsbioprocessing"] and { { - icon = "__bobplates__/graphics/icons/resin.png", + icon = resin_icon, icon_size = 32, icon_mipmaps = 1, }, } or angelsmods.functions.add_number_icon_layer({ { - icon = "__bobplates__/graphics/icons/resin.png", + icon = resin_icon, icon_size = 32, icon_mipmaps = 1, }, @@ -218,17 +221,28 @@ if mods["bobplates"] then if mods["angelsbioprocessing"] then OV.disable_recipe({ "bob-resin-wood" }) + OV.disable_technology({ "bob-wood-processing" }) + OV.remove_prereq({ + "bodies", + "electronics", + "walking-vehicle", + }, "bob-wood-processing") + OV.add_prereq("electronics", "automation") + else + OV.add_prereq("resins", "bob-wood-processing") end - - OV.remove_unlock("plastics", "synthetic-wood") - OV.disable_recipe({ "synthetic-wood" }) else angelsmods.functions.add_flag("resin", "hidden") OV.disable_recipe({ "bob-resin-wood", "solid-resin", }) - OV.remove_unlock("plastics", "synthetic-wood") + end + + OV.remove_unlock("plastics", "synthetic-wood") + if mods["angelsbioprocessing"] then + OV.disable_recipe({ "synthetic-wood" }) + else OV.add_unlock("plastic-1", "synthetic-wood") end end @@ -236,7 +250,7 @@ end ------------------------------------------------------------------------------- -- RUBBER HANDLING ------------------------------------------------------------ ------------------------------------------------------------------------------- -if mods["bobplates"] then +if mods["bobplates"] or mods["bobelectronics"] then if angelsmods.trigger.rubber then OV.global_replace_item("solid-rubber", "rubber") angelsmods.functions.add_flag("solid-rubber", "hidden") @@ -246,7 +260,6 @@ if mods["bobplates"] then OV.patch_recipes({ { name = "bob-rubber", - enabled = false, ingredients = { { "!!" }, { type = "item", name = "resin", amount = 3 }, @@ -255,7 +268,7 @@ if mods["bobplates"] then order = "b[rubber]-b[solid]-a", icons = angelsmods.functions.add_number_icon_layer({ { - icon = "__bobplates__/graphics/icons/rubber.png", + icon = "__bobelectronics__/graphics/icons/rubber.png", icon_size = 32, icon_mipmaps = 1, }, @@ -267,7 +280,7 @@ if mods["bobplates"] then order = "b[rubber]-b[solid]-a", icons = angelsmods.functions.add_number_icon_layer({ { - icon = "__bobplates__/graphics/icons/rubber.png", + icon = "__bobelectronics__/graphics/icons/rubber.png", icon_size = 32, icon_mipmaps = 1, }, diff --git a/angelspetrochem/prototypes/override/bobrevamp.lua b/angelspetrochem/prototypes/override/bobrevamp.lua index 6ebec4543..f1cb0d626 100644 --- a/angelspetrochem/prototypes/override/bobrevamp.lua +++ b/angelspetrochem/prototypes/override/bobrevamp.lua @@ -5,6 +5,7 @@ if mods["bobrevamp"] and mods["bobplates"] then ----------------------------------------------------------------------------- -- SOLID FUEL --------------------------------------------------------------- ----------------------------------------------------------------------------- + data.raw.recipe["solid-fuel-from-hydrogen"].icon = nil data.raw.recipe["solid-fuel-from-hydrogen"].icons = angelsmods.functions.create_solid_recipe_icon({ { "__angelspetrochem__/graphics/icons/molecules/hydrogen.png", 72 }, }, "solid-fuel") @@ -39,6 +40,6 @@ if mods["bobrevamp"] and mods["bobplates"] then }, }) end - OV.add_prereq("rtg", "sodium-processing") + OV.add_prereq("rtg", "angels-coal-processing-3") end end diff --git a/angelspetrochem/prototypes/petrochem-override.lua b/angelspetrochem/prototypes/petrochem-override.lua index b44330db3..151b88770 100644 --- a/angelspetrochem/prototypes/petrochem-override.lua +++ b/angelspetrochem/prototypes/petrochem-override.lua @@ -14,6 +14,7 @@ require("prototypes.override.angelssmelting") require("prototypes.override.angelsindustries") --OVERRIDE FOR BOBS +require("prototypes.override.bob") require("prototypes.override.bobplates") require("prototypes.override.bobassembly") require("prototypes.override.bobgreenhouse") diff --git a/angelspetrochem/prototypes/recipes/petrochem-basics.lua b/angelspetrochem/prototypes/recipes/petrochem-basics.lua index d8b8538dd..18619f5f7 100644 --- a/angelspetrochem/prototypes/recipes/petrochem-basics.lua +++ b/angelspetrochem/prototypes/recipes/petrochem-basics.lua @@ -285,8 +285,12 @@ data:extend({ results = { { type = "item", name = "solid-calcium-chloride", amount = 3 }, }, - icon = "__angelspetrochem__/graphics/icons/solid-calcium-chloride.png", - icon_size = 32, + icons = { + { + icon = "__angelspetrochem__/graphics/icons/solid-calcium-chloride.png", + icon_size = 32, + }, + }, order = "e[solid-calcium-chloride]", crafting_machine_tint = AF.get_recipe_tints({ { r = 168 / 255, g = 203 / 255, b = 105 / 255, a = 0 / 255 }, @@ -487,7 +491,7 @@ data:extend({ { type = "item", name = "solid-carbon", amount = 3 }, }, icons = AF.add_number_icon_layer(AF.get_object_icons("solid-carbon"), 1, angelsmods.petrochem.number_tint), - order = "d[coke-purification]", + order = "d[coke-purification]-a", crafting_machine_tint = AF.get_recipe_tints({ { r = 1, g = 1, b = 1 }, { r = 1, g = 1, b = 1 }, "steam" }),--[[{ primary = {r = 1, g = 0.5, b = 0.5, a = 0}, secondary = {r = 1, g = 0.5, b = 0.5, a = 0}, @@ -512,7 +516,7 @@ data:extend({ { type = "fluid", name = "water", amount = 10 }, }, icons = AF.add_number_icon_layer(AF.get_object_icons("solid-carbon"), 2, angelsmods.petrochem.number_tint), - order = "d[coke-purification]", + order = "d[coke-purification]-b", crafting_machine_tint = AF.get_recipe_tints({ { r = 1, g = 1, b = 1 }, "gas-nitrogen", @@ -539,7 +543,7 @@ data:extend({ }, icon = "__angelspetrochem__/graphics/icons/coal-crushed.png", icon_size = 32, - order = "a[coal-crushed]", + order = "b[coal-crushed]", }, { type = "recipe", @@ -555,7 +559,7 @@ data:extend({ { type = "item", name = "solid-coke", amount = 2 }, }, icons = AF.add_number_icon_layer(AF.get_object_icons("solid-coke"), 1, angelsmods.petrochem.number_tint), - order = "b[coal-crushed]", + order = "c[coke]-a", }, { type = "recipe", @@ -573,7 +577,7 @@ data:extend({ { type = "fluid", name = "water-yellow-waste", amount = 50 }, }, icons = AF.add_number_icon_layer(AF.get_object_icons("solid-coke"), 2, angelsmods.petrochem.number_tint), - order = "c[solid-coke-sulfur]", + order = "c[coke]-b", crafting_machine_tint = AF.get_recipe_tints({ "water-yellow-waste", "water-purified" }),--[[{ primary = {r = 1, g = 0.5, b = 0.5, a = 0}, secondary = {r = 0.9, g = 0.9, b = 0.4, a = 0}, diff --git a/angelspetrochem/prototypes/recipes/petrochem-solids.lua b/angelspetrochem/prototypes/recipes/petrochem-solids.lua index 71eaadc33..902c0fe9e 100644 --- a/angelspetrochem/prototypes/recipes/petrochem-solids.lua +++ b/angelspetrochem/prototypes/recipes/petrochem-solids.lua @@ -120,8 +120,12 @@ data:extend({ { type = "item", name = "solid-resin", amount = 4 }, }, }, - icon = "__angelspetrochem__/graphics/icons/solid-resin.png", - icon_size = 32, + icons = { + { + icon = "__angelspetrochem__/graphics/icons/solid-resin.png", + icon_size = 32, + }, + }, crafting_machine_tint = AF.get_fluid_recipe_tint("liquid-resin"), order = "b[resin]-b[solid]", }, @@ -214,8 +218,12 @@ data:extend({ { type = "item", name = "solid-rubber", amount = 4 }, }, }, - icon = "__angelspetrochem__/graphics/icons/solid-rubber.png", - icon_size = 32, + icons = { + { + icon = "__angelspetrochem__/graphics/icons/solid-rubber.png", + icon_size = 32, + }, + }, crafting_machine_tint = AF.get_fluid_recipe_tint("liquid-rubber"), order = "b[rubber]-b[solid]", }, diff --git a/angelspetrochem/prototypes/technology/petrochem-basic-chemistry.lua b/angelspetrochem/prototypes/technology/petrochem-basic-chemistry.lua index e4b3e13fa..b3eacea77 100644 --- a/angelspetrochem/prototypes/technology/petrochem-basic-chemistry.lua +++ b/angelspetrochem/prototypes/technology/petrochem-basic-chemistry.lua @@ -8,6 +8,10 @@ data:extend({ "automation", }, effects = { + { + type = "unlock-recipe", + recipe = "liquifier", + }, { type = "unlock-recipe", recipe = "angels-electrolyser", @@ -493,7 +497,6 @@ data:extend({ "angels-nitrogen-processing-1", "angels-sulfur-processing-1", "angels-advanced-chemistry-1", - "chlorine-processing-1", "water-treatment-2", }, effects = { @@ -517,10 +520,6 @@ data:extend({ type = "unlock-recipe", recipe = "gas-nitrogen-dioxide", }, - { - type = "unlock-recipe", - recipe = "gas-ammonium-chloride", - }, { type = "unlock-recipe", recipe = "gas-urea", @@ -551,7 +550,9 @@ data:extend({ prerequisites = { "angels-nitrogen-processing-2", "angels-advanced-chemistry-3", - "sodium-processing", + "chlorine-processing-2", + "sodium-processing-1", + "flammables", }, effects = { { @@ -599,6 +600,10 @@ data:extend({ "angels-advanced-chemistry-5", }, effects = { + { + type = "unlock-recipe", + recipe = "gas-refinery-4", + }, { type = "unlock-recipe", recipe = "gas-dinitrogen-tetroxide", @@ -617,7 +622,7 @@ data:extend({ }, { type = "unlock-recipe", - recipe = "gas-refinery-4", + recipe = "gas-ammonium-chloride", }, }, unit = { @@ -638,20 +643,13 @@ data:extend({ name = "chlorine-processing-1", icons = angelsmods.functions.create_gas_tech_icon("ClClCl"), prerequisites = { - --"basic-chemistry-2", - --"water-treatment", - "ore-crushing", - "gas-processing", + "basic-chemistry-3", }, effects = { { type = "unlock-recipe", recipe = "water-saline-separation", }, - { - type = "unlock-recipe", - recipe = "gas-chlor-methane", - }, { type = "unlock-recipe", recipe = "gas-hydrogen-chloride", @@ -677,20 +675,20 @@ data:extend({ icons = angelsmods.functions.create_gas_tech_icon("ClClCl"), prerequisites = { "chlorine-processing-1", - "gas-steam-cracking-1", + "steam-cracking-1", }, effects = { { type = "unlock-recipe", - recipe = "gas-allylchlorid", + recipe = "gas-chlor-methane", }, { type = "unlock-recipe", - recipe = "gas-epichlorhydrin", + recipe = "gas-allylchlorid", }, { type = "unlock-recipe", - recipe = "liquid-glycerol", + recipe = "gas-epichlorhydrin", }, { type = "unlock-recipe", @@ -715,7 +713,6 @@ data:extend({ prerequisites = { "chlorine-processing-2", "water-treatment-3", - "chemical-science-pack", }, effects = { { @@ -752,7 +749,7 @@ data:extend({ icons = angelsmods.functions.create_gas_tech_icon("ClClCl"), prerequisites = { "chlorine-processing-3", - "sodium-processing", + "sodium-processing-1", "angels-advanced-chemistry-3", }, effects = { @@ -782,50 +779,75 @@ data:extend({ }, { type = "technology", - name = "sodium-processing", + name = "sodium-processing-1", icon = "__angelspetrochem__/graphics/technology/sodium-tech.png", icon_size = 128, prerequisites = { - "chlorine-processing-3", - "angels-coal-processing-3", - "angels-nitrogen-processing-2", + "angels-sulfur-processing-1", + "chemical-science-pack", + "chlorine-processing-1", }, effects = { { type = "unlock-recipe", - recipe = "liquid-aqueous-sodium-hydroxide", + recipe = "solid-sodium-hydroxide-solid-sodium-sulfate", }, { type = "unlock-recipe", - recipe = "liquid-aqueous-sodium-hydroxide-reverse", + recipe = "solid-sodium-sulfate-separation", }, { type = "unlock-recipe", - recipe = "solid-sodium", + recipe = "solid-sodium-hydroxide", }, { type = "unlock-recipe", - recipe = "solid-sodium-hydroxide", + recipe = "liquid-aqueous-sodium-hydroxide", }, + }, + unit = { + count = 50, + ingredients = { + { type = "item", name = "automation-science-pack", amount = 1 }, + { type = "item", name = "logistic-science-pack", amount = 1 }, + { type = "item", name = "chemical-science-pack", amount = 1 }, + }, + time = 15, + }, + order = "c-a", + }, + { + type = "technology", + name = "sodium-processing-2", + icon = "__angelspetrochem__/graphics/technology/sodium-tech.png", + icon_size = 128, + prerequisites = { + "chlorine-processing-3", + "angels-coal-processing-3", + "angels-nitrogen-processing-2", + "production-science-pack", + "sodium-processing-1", + }, + effects = { { type = "unlock-recipe", - recipe = "solid-sodium-carbonate", + recipe = "liquid-aqueous-sodium-hydroxide-reverse", }, { type = "unlock-recipe", - recipe = "solid-sodium-carbonate-electrolysis", + recipe = "solid-sodium", }, { type = "unlock-recipe", - recipe = "solid-sodium-cyanide", + recipe = "solid-sodium-carbonate", }, { type = "unlock-recipe", - recipe = "solid-sodium-hydroxide-solid-sodium-sulfate", + recipe = "solid-sodium-carbonate-electrolysis", }, { type = "unlock-recipe", - recipe = "solid-sodium-sulfate-separation", + recipe = "solid-sodium-cyanide", }, }, unit = { @@ -834,6 +856,7 @@ data:extend({ { type = "item", name = "automation-science-pack", amount = 1 }, { type = "item", name = "logistic-science-pack", amount = 1 }, { type = "item", name = "chemical-science-pack", amount = 1 }, + { type = "item", name = "production-science-pack", amount = 1 }, }, time = 15, }, diff --git a/angelspetrochem/prototypes/technology/petrochem-petro-chemistry.lua b/angelspetrochem/prototypes/technology/petrochem-petro-chemistry.lua index e52476d28..2ac2dd73c 100644 --- a/angelspetrochem/prototypes/technology/petrochem-petro-chemistry.lua +++ b/angelspetrochem/prototypes/technology/petrochem-petro-chemistry.lua @@ -64,14 +64,6 @@ data:extend({ type = "unlock-recipe", recipe = "condensates-oil-refining", }, - { - type = "unlock-recipe", - recipe = "solid-fuel-naphtha", - }, - { - type = "unlock-recipe", - recipe = "solid-fuel-fuel-oil", - }, }, unit = { count = 50, @@ -139,10 +131,6 @@ data:extend({ type = "unlock-recipe", recipe = "gas-fractioning", }, - { - type = "unlock-recipe", - recipe = "solid-fuel-methane", - }, }, unit = { count = 50, @@ -161,7 +149,7 @@ data:extend({ icon_size = 256, icon_mipmaps = 2, prerequisites = { - "gas-steam-cracking-2", + "steam-cracking-2", }, effects = { { @@ -226,6 +214,10 @@ data:extend({ "ore-floatation", }, effects = { + { + type = "unlock-recipe", + recipe = "liquifier-2", + }, { type = "unlock-recipe", recipe = "angels-electrolyser-2", @@ -269,12 +261,15 @@ data:extend({ prerequisites = { "angels-advanced-chemistry-1", "advanced-electronics", - "gas-steam-cracking-1", - "oil-steam-cracking-1", + "steam-cracking-1", "chemical-science-pack", "angels-sulfur-processing-2", }, effects = { + { + type = "unlock-recipe", + recipe = "liquifier-3", + }, { type = "unlock-recipe", recipe = "angels-electrolyser-3", @@ -328,7 +323,7 @@ data:extend({ "angels-advanced-chemistry-2", "angels-advanced-gas-processing", "chlorine-processing-1", - "oil-steam-cracking-2", + "steam-cracking-2", "thermal-water-extraction", }, effects = { @@ -348,14 +343,6 @@ data:extend({ type = "unlock-recipe", recipe = "catalyst-metal-blue", }, - { - type = "unlock-recipe", - recipe = "liquid-toluene-from-benzene", - }, - { - type = "unlock-recipe", - recipe = "liquid-toluene-from-naphtha", - }, }, unit = { count = 50, @@ -379,6 +366,10 @@ data:extend({ "production-science-pack", }, effects = { + { + type = "unlock-recipe", + recipe = "liquifier-4", + }, { type = "unlock-recipe", recipe = "angels-electrolyser-4", @@ -490,6 +481,7 @@ data:extend({ icons = angelsmods.functions.create_gas_tech_icon({ { 210, 120, 210 }, { 175, 100, 175 }, { 140, 080, 140 } }), prerequisites = { "angels-advanced-chemistry-3", + "flammables", }, effects = { { @@ -530,11 +522,13 @@ data:extend({ }, { type = "technology", - name = "gas-steam-cracking-1", + name = "steam-cracking-1", icon = "__angelspetrochem__/graphics/technology/steam-cracker-tech.png", icon_size = 128, prerequisites = { + "angels-advanced-chemistry-1", "gas-processing", + "oil-processing", }, effects = { { @@ -543,91 +537,35 @@ data:extend({ }, { type = "unlock-recipe", - recipe = "steam-cracking-methane", - }, - { - type = "unlock-recipe", - recipe = "steam-cracking-ethane", - }, - { - type = "unlock-recipe", - recipe = "steam-cracking-butane", - }, - { - type = "unlock-recipe", - recipe = "gas-propene-synthesis", + recipe = "catalyst-steam-cracking-butane", }, { type = "unlock-recipe", - recipe = "gas-ethylene-oxide", + recipe = "catalyst-steam-cracking-naphtha", }, { type = "unlock-recipe", - recipe = "liquid-ethylene-carbonate", - }, - }, - unit = { - count = 50, - ingredients = { - { type = "item", name = "automation-science-pack", amount = 1 }, - { type = "item", name = "logistic-science-pack", amount = 1 }, + recipe = "steam-cracking-methane", }, - time = 15, - }, - order = "c-a", - }, - { - type = "technology", - name = "gas-steam-cracking-2", - icon = "__angelspetrochem__/graphics/technology/steam-cracker-tech.png", - icon_size = 128, - prerequisites = { - "gas-steam-cracking-1", - "angels-advanced-chemistry-2", - "chemical-science-pack", - }, - effects = { { type = "unlock-recipe", - recipe = "steam-cracker-2", + recipe = "steam-cracking-ethane", }, { type = "unlock-recipe", - recipe = "steam-cracking-gas-residual", - }, - }, - unit = { - count = 50, - ingredients = { - { type = "item", name = "automation-science-pack", amount = 1 }, - { type = "item", name = "logistic-science-pack", amount = 1 }, - { type = "item", name = "chemical-science-pack", amount = 1 }, + recipe = "steam-cracking-butane", }, - time = 15, - }, - order = "c-a", - }, - { - type = "technology", - name = "oil-steam-cracking-1", - icon = "__angelspetrochem__/graphics/technology/steam-cracker-tech.png", - icon_size = 128, - prerequisites = { - "oil-processing", - "angels-advanced-chemistry-1", - }, - effects = { { type = "unlock-recipe", - recipe = "steam-cracker", + recipe = "gas-propene-synthesis", }, { type = "unlock-recipe", - recipe = "catalyst-steam-cracking-butane", + recipe = "gas-ethylene-oxide", }, { type = "unlock-recipe", - recipe = "catalyst-steam-cracking-naphtha", + recipe = "liquid-ethylene-carbonate", }, }, unit = { @@ -642,13 +580,12 @@ data:extend({ }, { type = "technology", - name = "oil-steam-cracking-2", + name = "steam-cracking-2", icon = "__angelspetrochem__/graphics/technology/steam-cracker-tech.png", icon_size = 128, prerequisites = { - "oil-steam-cracking-1", "angels-advanced-chemistry-2", - "chemical-science-pack", + "steam-cracking-1", }, effects = { { @@ -671,6 +608,10 @@ data:extend({ type = "unlock-recipe", recipe = "steam-cracking-oil-residual", }, + { + type = "unlock-recipe", + recipe = "steam-cracking-gas-residual", + }, }, unit = { count = 50, @@ -689,8 +630,7 @@ data:extend({ icon = "__angelspetrochem__/graphics/technology/electric-boiler-tech.png", icon_size = 128, prerequisites = { - "oil-steam-cracking-1", - "gas-steam-cracking-1", + "steam-cracking-1", }, effects = { { @@ -719,8 +659,7 @@ data:extend({ icon_size = 128, prerequisites = { "angels-electric-boiler", - "oil-steam-cracking-2", - "gas-steam-cracking-2", + "steam-cracking-2", }, effects = { { diff --git a/angelspetrochem/prototypes/technology/petrochem-solids.lua b/angelspetrochem/prototypes/technology/petrochem-solids.lua index 35b009836..bc4f11299 100644 --- a/angelspetrochem/prototypes/technology/petrochem-solids.lua +++ b/angelspetrochem/prototypes/technology/petrochem-solids.lua @@ -6,8 +6,7 @@ data:extend({ icon = "__angelspetrochem__/graphics/technology/plastic-1-tech.png", icon_size = 128, prerequisites = { - "gas-steam-cracking-1", - "oil-steam-cracking-1", + "steam-cracking-1", }, effects = { { @@ -214,7 +213,7 @@ data:extend({ icon = "__angelspetrochem__/graphics/technology/separator-tech.png", icon_size = 128, prerequisites = { - --"oil-steam-cracking-1", + --"steam-cracking-1", "angels-advanced-chemistry-2", }, effects = { diff --git a/angelspetrochem/prototypes/technology/petrochem-weaponary.lua b/angelspetrochem/prototypes/technology/petrochem-weaponary.lua index c7c58b7b9..f7677c0cc 100644 --- a/angelspetrochem/prototypes/technology/petrochem-weaponary.lua +++ b/angelspetrochem/prototypes/technology/petrochem-weaponary.lua @@ -70,6 +70,10 @@ data:extend({ "military-science-pack", }, effects = { + { + type = "unlock-recipe", + recipe = "liquid-glycerol", + }, { type = "unlock-recipe", recipe = "solid-nitroglycerin", @@ -96,6 +100,14 @@ data:extend({ "angels-advanced-chemistry-3", }, effects = { + { + type = "unlock-recipe", + recipe = "liquid-toluene-from-benzene", + }, + { + type = "unlock-recipe", + recipe = "liquid-toluene-from-naphtha", + }, { type = "unlock-recipe", recipe = "solid-trinitrotoluene", diff --git a/angelsrefining/changelog.txt b/angelsrefining/changelog.txt index 7ab29aad8..4824690e6 100644 --- a/angelsrefining/changelog.txt +++ b/angelsrefining/changelog.txt @@ -1,4 +1,16 @@ --------------------------------------------------------------------------------------------------- +Version: 0.12.5 +Date: 22.12.2023 + Changes: + - Moved Electro-refining to purple science. Replaced Crystal catalyst with Hybrid catalyst in Thorium sorting recipe (909) + - Compatibility with Bob's changes (911) + - Enabled productivity modules for Thorium Ore sorting recipe (929) + - Added custom error message for when trying to insert invalid items into a barreling pump (933) + - Changed Crystal catalyst recipe to require Crystallizer 2 (943) + - Removed Crystal catalyst from Bob's gem ore crystallization recipes (943) + - Changed the Recipe Builder to make it easier for other mods to add their own materials (950) + - Added a beaconable electric offshore waterpump (952) +--------------------------------------------------------------------------------------------------- Version: 0.12.4 Date: 23.02.2023 Bugfixes: diff --git a/angelsrefining/control.lua b/angelsrefining/control.lua index 19f4bdd33..4f47d3f11 100644 --- a/angelsrefining/control.lua +++ b/angelsrefining/control.lua @@ -1,19 +1,64 @@ local starting_items = require("src.starting_items") local welcome_dialog = require("src.welcome_dialog") local ground_water_pump = require("src.ground_water_pump") +local sea_pump = require("src.sea-pump") +-- initialisation +local on_configuration_changed = require("src.mod-config") +script.on_configuration_changed(on_configuration_changed) script.on_init(function() starting_items:on_init() + sea_pump:on_init() end) script.on_event(defines.events.on_cutscene_cancelled, function(event) welcome_dialog:on_cutscene_cancelled(event.player_index) end) -script.on_event(defines.events.on_gui_click, function(event) - welcome_dialog:on_gui_click(event.element.name, event.player_index) +-- built events +script.on_event(defines.events.on_built_entity, function(event) + sea_pump:on_build_entity(event.created_entity, {}) +end) +script.on_event(defines.events.on_robot_built_entity, function(event) + sea_pump:on_build_entity(event.created_entity, event.tags or {}) +end) +script.on_event(defines.events.script_raised_built, function(event) + sea_pump:on_build_entity(event.entity, {}) +end) +script.on_event(defines.events.script_raised_revive, function(event) + sea_pump:on_build_entity(event.entity, {}) +end) +script.on_event(defines.events.on_post_entity_died, function(event) + sea_pump:on_build_entity(event.ghost, {}) end) script.on_event(defines.events.on_player_rotated_entity, function(event) ground_water_pump:on_player_rotated_entity(event.entity, event.previous_direction, event.player_index) end) + +-- destroy events +script.on_event(defines.events.on_entity_died, function(event) + sea_pump:on_remove_entity(event.entity) +end) +script.on_event(defines.events.on_player_mined_entity, function(event) + sea_pump:on_remove_entity(event.entity) +end) +script.on_event(defines.events.on_robot_mined_entity, function(event) + sea_pump:on_remove_entity(event.entity) +end) +script.on_event(defines.events.script_raised_destroy, function(event) + sea_pump:on_remove_entity(event.entity) +end) + +-- blueprint events +script.on_event(defines.events.on_player_setup_blueprint, function(event) + sea_pump:on_blueprint_setup(event.player_index) +end) +script.on_event(defines.events.on_player_configured_blueprint, function(event) + sea_pump:on_blueprint_setup(event.player_index) +end) + +-- gui events +script.on_event(defines.events.on_gui_click, function(event) + welcome_dialog:on_gui_click(event.element.name, event.player_index) +end) diff --git a/angelsrefining/data.lua b/angelsrefining/data.lua index 54f905f27..3956136ea 100644 --- a/angelsrefining/data.lua +++ b/angelsrefining/data.lua @@ -128,6 +128,7 @@ require("prototypes.buildings.hydro-plant") require("prototypes.buildings.ground-water-pump") require("prototypes.buildings.salination-plant") require("prototypes.buildings.seafloor-pump") +require("prototypes.buildings.sea-pump") require("prototypes.buildings.washing-plant") require("prototypes.buildings.clarifier") require("prototypes.buildings.barreling-pump") diff --git a/angelsrefining/graphics/entity/ores/Thumbs.db b/angelsrefining/graphics/entity/ores/Thumbs.db deleted file mode 100644 index 8a5636a0c..000000000 Binary files a/angelsrefining/graphics/entity/ores/Thumbs.db and /dev/null differ diff --git a/angelsrefining/graphics/entity/sea-pump/empty.png b/angelsrefining/graphics/entity/sea-pump/empty.png new file mode 100644 index 000000000..877eed1e3 Binary files /dev/null and b/angelsrefining/graphics/entity/sea-pump/empty.png differ diff --git a/angelsrefining/graphics/entity/sea-pump/sea-pump.png b/angelsrefining/graphics/entity/sea-pump/sea-pump.png new file mode 100644 index 000000000..b374f2702 Binary files /dev/null and b/angelsrefining/graphics/entity/sea-pump/sea-pump.png differ diff --git a/angelsrefining/graphics/icons/sea-pump-ico.png b/angelsrefining/graphics/icons/sea-pump-ico.png new file mode 100644 index 000000000..a1c07dde6 Binary files /dev/null and b/angelsrefining/graphics/icons/sea-pump-ico.png differ diff --git a/angelsrefining/graphics/technology/Thumbs.db b/angelsrefining/graphics/technology/Thumbs.db deleted file mode 100644 index e616efbfc..000000000 Binary files a/angelsrefining/graphics/technology/Thumbs.db and /dev/null differ diff --git a/angelsrefining/info.json b/angelsrefining/info.json index b64d4f505..e2eee627a 100644 --- a/angelsrefining/info.json +++ b/angelsrefining/info.json @@ -1,6 +1,6 @@ { "name": "angelsrefining", - "version": "0.12.4", + "version": "0.12.5", "factorio_version": "1.1", "title": "Angel's Refining", "author": "Arch666Angel", @@ -14,6 +14,7 @@ "(?) bobmodules", "(?) boblogistics", "(?) bobpower", + "(?) bobelectronics", "? rso-mod >= 2.3.3", "? Yuoki >= 0.4.0", "? UraniumPower >= 0.6.4", diff --git a/angelsrefining/locale/en/water-treatment.cfg b/angelsrefining/locale/en/water-treatment.cfg index fa4baf2b5..02f007c02 100644 --- a/angelsrefining/locale/en/water-treatment.cfg +++ b/angelsrefining/locale/en/water-treatment.cfg @@ -51,6 +51,7 @@ clarifier=Clarifier salination-plant=Salination plant 1 salination-plant-2=Salination plant 2 seafloor-pump=Seafloor pump +sea-pump=Heavy offshore pump washing-plant=Washing plant 1 washing-plant-2=Washing plant 2 barreling-pump=Barreling pump @@ -64,6 +65,7 @@ clarifier=Helps you to get rid of all the water you don't want. salination-plant=Increases salinity of water via evaporation. salination-plant-2=Increases salinity of water via evaporation. seafloor-pump=Extracts viscous mud water from a body of water. +sea-pump=An energised offshore pump to increase pumping performance to pump fluids from a body of water. washing-plant=Dilutes mud water or extracts sediments. washing-plant-2=Dilutes mud water or extracts sediments. barreling-pump=Fills or empties fluid containers. @@ -92,3 +94,8 @@ water-treatment=Essential methods for the treatment of impure water. angels-fluid-barreling=Methods to fill fluids into containers for alternative transport. water-washing=Processing of mud water and extraction of sediments. +[cant_insert] +angels-barreling-pump-limitation=__1__ cannot be filled. + +[tooltip-description] +custom-parameter=\n__1__: [font=default][color=1,0.74,0.4]__2__[/color][/font] \ No newline at end of file diff --git a/angelsrefining/migrations/angelsrefining_0.11.17.lua b/angelsrefining/migrations/angelsrefining_0.11.17.lua index 91675624b..d3119685c 100644 --- a/angelsrefining/migrations/angelsrefining_0.11.17.lua +++ b/angelsrefining/migrations/angelsrefining_0.11.17.lua @@ -1,8 +1,4 @@ for _, force in pairs(game.forces) do - if force.technologies["geode-crystallization-2"] and force.technologies["geode-crystallization-1"] then - force.technologies["geode-crystallization-2"].researched = force.technologies["geode-crystallization-1"].researched - end - force.reset_recipes() force.reset_technologies() force.reset_technology_effects() diff --git a/angelsrefining/migrations/angelsrefining_0.11.20.lua b/angelsrefining/migrations/angelsrefining_0.11.20.lua index 60e32361d..461c0ff66 100644 --- a/angelsrefining/migrations/angelsrefining_0.11.20.lua +++ b/angelsrefining/migrations/angelsrefining_0.11.20.lua @@ -1,13 +1,4 @@ for _, force in pairs(game.forces) do - if force.technologies["geode-crystallization-2"] and force.technologies["geode-processing-3"] then - force.technologies["geode-processing-3"].researched = force.technologies["geode-crystallization-2"].researched - if force.technologies["gem-processing-1"] then - force.technologies["geode-crystallization-2"].researched = force.technologies["gem-processing-1"].researched - else - force.technologies["geode-crystallization-2"].researched = false - end - end - --left-overs from misfiring past migrations for _, tech_name in pairs({ "water-washing-1", diff --git a/angelsrefining/migrations/angelsrefining_0.12.5.json b/angelsrefining/migrations/angelsrefining_0.12.5.json new file mode 100644 index 000000000..cd7c15236 --- /dev/null +++ b/angelsrefining/migrations/angelsrefining_0.12.5.json @@ -0,0 +1,10 @@ +{ + "entity": + [ + ["electro-whinning-cell-3", "electro-whinning-cell-2"] + ], + "item": + [ + ["electro-whinning-cell-3", "electro-whinning-cell-2"] + ] +} diff --git a/angelsrefining/prototypes/buildings/barreling-pump.lua b/angelsrefining/prototypes/buildings/barreling-pump.lua index 340c6d4a7..15bc885e4 100644 --- a/angelsrefining/prototypes/buildings/barreling-pump.lua +++ b/angelsrefining/prototypes/buildings/barreling-pump.lua @@ -117,6 +117,7 @@ if angelsmods.trigger.enable_auto_barreling then barreling_pump.result_inventory_size = 1 barreling_pump.source_inventory_size = 1 barreling_pump.ingredient_count = nil + barreling_pump.cant_insert_at_source_message_key = "cant_insert.angels-barreling-pump-limitation" end data:extend({ barreling_pump }) diff --git a/angelsrefining/prototypes/buildings/electro-whinning-cell.lua b/angelsrefining/prototypes/buildings/electro-whinning-cell.lua index ff9ca3bc8..3f4962b0d 100644 --- a/angelsrefining/prototypes/buildings/electro-whinning-cell.lua +++ b/angelsrefining/prototypes/buildings/electro-whinning-cell.lua @@ -34,11 +34,11 @@ data:extend({ collision_box = { { -2.4, -2.4 }, { 2.4, 2.4 } }, selection_box = { { -2.5, -2.5 }, { 2.5, 2.5 } }, module_specification = { - module_slots = 1, + module_slots = 2, }, allowed_effects = { "consumption", "speed", "pollution", "productivity" }, crafting_categories = { "ore-refining-t3-5" }, - crafting_speed = 0.75, + crafting_speed = 1, energy_source = { type = "electric", usage_priority = "secondary-input", @@ -135,114 +135,6 @@ data:extend({ flags = { "placeable-neutral", "player-creation" }, minable = { mining_time = 1, result = "electro-whinning-cell-2" }, fast_replaceable_group = "electro-whinning-cell", - next_upgrade = "electro-whinning-cell-3", - max_health = 300, - corpse = "big-remnants", - dying_explosion = "medium-explosion", - collision_box = { { -2.4, -2.4 }, { 2.4, 2.4 } }, - selection_box = { { -2.5, -2.5 }, { 2.5, 2.5 } }, - module_specification = { - module_slots = 2, - }, - allowed_effects = { "consumption", "speed", "pollution", "productivity" }, - crafting_categories = { "ore-refining-t3-5" }, - crafting_speed = 1, - energy_source = { - type = "electric", - usage_priority = "secondary-input", - emissions_per_minute = 0.03 * 60, - }, - energy_usage = "250kW", - ingredient_count = 3, - animation = { - filename = "__angelsrefining__/graphics/entity/electro-whinning-cell/electro-whinning-cell.png", - priority = "extra-high", - width = 224, - height = 224, - frame_count = 36, - line_length = 6, - shift = { 0, 0 }, - animation_speed = 0.5, - -- hr_version = - -- { - -- filename = "__angelsrefining__/graphics/entity/electro-whinning-cell/1electro-whinning-cell.png", - -- priority = "extra-high", - -- width = 192, - -- height = 192, - -- frame_count = 16, - -- line_length = 4, - -- shift = {0.45, 0.7}, - -- animation_speed = 0.5, - -- scale = 0.5 - -- }, - }, - vehicle_impact_sound = { filename = "__base__/sound/car-metal-impact.ogg", volume = 0.65 }, - working_sound = { - sound = { filename = "__angelsrefining__/sound/ore-leaching-plant.ogg" }, - idle_sound = { filename = "__base__/sound/idle1.ogg", volume = 0.6 }, - apparent_volume = 2.5, - }, - fluid_boxes = { - { - production_type = "input", - pipe_picture = angelsmods.refining.floatationpipepictures(), - pipe_covers = pipecoverspictures(), - base_area = 10, - base_level = -1, - pipe_connections = { { type = "input", position = { 1, 3 } } }, - }, - { - production_type = "input", - pipe_picture = angelsmods.refining.floatationpipepictures(), - pipe_covers = pipecoverspictures(), - base_area = 10, - base_level = -1, - pipe_connections = { { type = "input", position = { -1, 3 } } }, - }, - { - production_type = "output", - pipe_picture = angelsmods.refining.floatationpipepictures(), - pipe_covers = pipecoverspictures(), - base_level = 1, - pipe_connections = { { type = "output", position = { 1, -3 } } }, - }, - { - production_type = "output", - pipe_picture = angelsmods.refining.floatationpipepictures(), - pipe_covers = pipecoverspictures(), - base_level = 1, - pipe_connections = { { type = "output", position = { -1, -3 } } }, - }, - }, - }, - { - type = "item", - name = "electro-whinning-cell-3", - icons = angelsmods.functions.add_number_icon_layer({ - { - icon = "__angelsrefining__/graphics/icons/electro-whinning-cell-ico.png", - icon_size = 32, - icon_mipmaps = 1, - }, - }, 3, angelsmods.refining.number_tint), - subgroup = "ore-whinning", - order = "f", - place_result = "electro-whinning-cell-3", - stack_size = 10, - }, - { - type = "assembling-machine", - name = "electro-whinning-cell-3", - icons = angelsmods.functions.add_number_icon_layer({ - { - icon = "__angelsrefining__/graphics/icons/electro-whinning-cell-ico.png", - icon_size = 32, - icon_mipmaps = 1, - }, - }, 3, angelsmods.refining.number_tint), - flags = { "placeable-neutral", "player-creation" }, - minable = { mining_time = 1, result = "electro-whinning-cell-3" }, - fast_replaceable_group = "electro-whinning-cell", max_health = 300, corpse = "big-remnants", dying_explosion = "medium-explosion", @@ -257,9 +149,9 @@ data:extend({ energy_source = { type = "electric", usage_priority = "secondary-input", - emissions_per_minute = 0.04 * 60, + emissions_per_minute = 0.03 * 60, }, - energy_usage = "300kW", + energy_usage = "250kW", ingredient_count = 3, animation = { filename = "__angelsrefining__/graphics/entity/electro-whinning-cell/electro-whinning-cell.png", diff --git a/angelsrefining/prototypes/buildings/ore-leaching-plant.lua b/angelsrefining/prototypes/buildings/ore-leaching-plant.lua index d13395abc..f7a63aa90 100644 --- a/angelsrefining/prototypes/buildings/ore-leaching-plant.lua +++ b/angelsrefining/prototypes/buildings/ore-leaching-plant.lua @@ -116,7 +116,7 @@ data:extend({ module_slots = 2, }, allowed_effects = { "consumption", "speed", "pollution", "productivity" }, - crafting_categories = { "ore-refining-t3" }, + crafting_categories = { "ore-refining-t3", "ore-refining-t3b" }, crafting_speed = 1, energy_source = { type = "electric", @@ -206,7 +206,7 @@ data:extend({ module_slots = 3, }, allowed_effects = { "consumption", "speed", "pollution", "productivity" }, - crafting_categories = { "ore-refining-t3" }, + crafting_categories = { "ore-refining-t3", "ore-refining-t3b" }, crafting_speed = 1.5, energy_source = { type = "electric", diff --git a/angelsrefining/prototypes/buildings/sea-pump.lua b/angelsrefining/prototypes/buildings/sea-pump.lua new file mode 100644 index 000000000..2c858d397 --- /dev/null +++ b/angelsrefining/prototypes/buildings/sea-pump.lua @@ -0,0 +1,348 @@ +local sounds = require("__base__.prototypes.entity.sounds") +local hit_effects = require("__base__.prototypes.entity.hit-effects") + +data:extend({ + { + type = "item", + name = "sea-pump", + icon = "__angelsrefining__/graphics/icons/sea-pump-ico.png", + icon_size = 32, + subgroup = "washing-building", + order = "f", + place_result = "sea-pump-placeable", + stack_size = 10, + }, + { + type = "offshore-pump", + name = "sea-pump-placeable", + localised_name = { "entity-name.sea-pump" }, + localised_description = { "entity-description.sea-pump" }, + icon = "__angelsrefining__/graphics/icons/sea-pump-ico.png", + icon_size = 32, + flags = { "placeable-neutral", "player-creation", "filter-directions" }, + collision_mask = { "object-layer", "train-layer" }, -- collide just with object-layer and train-layer which don't collide with water, this allows us to build on 1 tile wide ground + center_collision_mask = { "water-tile", "object-layer", "player-layer" }, -- to test that tile directly under the pump is ground + fluid_box_tile_collision_test = { "ground-tile" }, + adjacent_tile_collision_test = { "water-tile" }, + adjacent_tile_collision_mask = { "ground-tile" }, -- to prevent building on edge of map :( + adjacent_tile_collision_box = { { -2, -3 }, { 2, -2 } }, + minable = { mining_time = 1, result = "sea-pump" }, + max_health = 200, + corpse = "small-remnants", + fluid = "water", + resistances = { + { + type = "fire", + percent = 70, + }, + }, + collision_box = { { -1.4, -2.45 }, { 1.4, 0.3 } }, + selection_box = { { -1.6, -2.49 }, { 1.6, 0.49 } }, + fluid_box = { + base_area = 1, + base_level = 1, + pipe_covers = pipecoverspictures(), + production_type = "output", + filter = "water", + pipe_connections = { + { + position = { 0, 1 }, + type = "output", + }, + }, + }, + pumping_speed = 1500 / 60, + tile_width = 3, + tile_height = 3, + vehicle_impact_sound = { filename = "__base__/sound/car-metal-impact.ogg", volume = 0.65 }, + picture = { + north = { + filename = "__angelsrefining__/graphics/entity/sea-pump/sea-pump.png", + priority = "high", + shift = { 0, -1 }, + width = 160, + height = 160, + }, + east = { + filename = "__angelsrefining__/graphics/entity/sea-pump/sea-pump.png", + priority = "high", + shift = { 1, 0 }, + x = 160, + width = 160, + height = 160, + }, + south = { + filename = "__angelsrefining__/graphics/entity/sea-pump/sea-pump.png", + priority = "high", + shift = { 0, 1 }, + x = 320, + width = 160, + height = 160, + }, + west = { + filename = "__angelsrefining__/graphics/entity/sea-pump/sea-pump.png", + priority = "high", + shift = { -1, 0 }, + x = 480, + width = 160, + height = 160, + }, + }, + placeable_position_visualization = { + filename = "__core__/graphics/cursor-boxes-32x32.png", + priority = "extra-high-no-scale", + width = 64, + height = 64, + scale = 0.5, + x = 3 * 64, + }, + circuit_wire_connection_points = circuit_connector_definitions["offshore-pump"].points, + circuit_connector_sprites = circuit_connector_definitions["offshore-pump"].sprites, + circuit_wire_max_distance = default_circuit_wire_max_distance, + }, + { + type = "resource-category", + name = "sea-pump", + }, + { + type = "resource", + name = "sea-pump-resource", + localised_name = { "fluid-name.water" }, + icon = "__base__/graphics/icons/fluid/water.png", + icon_size = 64, + icon_mipmaps = 4, + flags = { "placeable-neutral", "not-on-map" }, + selectable_in_game = false, + category = "sea-pump", + subgroup = "raw-resource", + order = "a-b-a", + infinite = true, + highlight = false, + minimum = 100000, + normal = 100000, + infinite_depletion_amount = 1, + resource_patch_search_radius = 1, + --tree_removal_probability = 0.7, + --tree_removal_max_distance = 32 * 32, + minable = { + mining_time = 1, -- how long it takes to 'tick' + results = { + { + type = "fluid", + name = "water", + amount_min = 1500, -- amount of water it produces each 'tick' + amount_max = 1500, + probability = 1, + }, + }, + }, + walking_sound = sounds.oil, + collision_box = { { -0.5, -0.5 }, { 0.5, 0.5 } }, + selection_box = { { -0.5, -0.5 }, { 0.5, 0.5 } }, + --autoplace = resource_autoplace.resource_autoplace_settings + --{ + -- name = "crude-oil", + -- order = "c", -- Other resources are "b"; oil won't get placed if something else is already there. + -- base_density = 8.2, + -- base_spots_per_km2 = 1.8, + -- random_probability = 1/48, + -- random_spot_size_minimum = 1, + -- random_spot_size_maximum = 1, -- don't randomize spot size + -- additional_richness = 220000, -- this increases the total everywhere, so base_density needs to be decreased to compensate + -- has_starting_area_placement = false, + -- regular_rq_factor_multiplier = 1 + --}, + stage_counts = { 0 }, + stages = { + sheet = { + filename = "__angelsrefining__/graphics/entity/sea-pump/empty.png", + priority = "extra-high", + width = 1, + height = 1, + frame_count = 1, + variation_count = 1, + shift = util.by_pixel(0, 0), + hr_version = { + filename = "__angelsrefining__/graphics/entity/sea-pump/empty.png", + priority = "extra-high", + width = 1, + height = 1, + frame_count = 1, + variation_count = 1, + shift = util.by_pixel(0, 0), + scale = 1, + }, + }, + }, + --map_color = {0.78, 0.2, 0.77}, + --map_grid = false + }, + { + type = "mining-drill", + name = "sea-pump", + localised_name = { "entity-name.sea-pump" }, + localised_description = { "entity-description.sea-pump" }, + icon = "__angelsrefining__/graphics/icons/sea-pump-ico.png", + icon_size = 32, + icon_mipmaps = 1, + flags = { "placeable-neutral", "player-creation" }, + minable = { mining_time = 0.5, result = "sea-pump" }, + placeable_by = { item = "sea-pump", count = 1 }, + resource_categories = { "sea-pump" }, + max_health = 200, + corpse = "small-remnants", + dying_explosion = "pumpjack-explosion", + collision_box = { { -1.4, -2.45 }, { 1.4, 0.3 } }, + selection_box = { { -1.6, -2.49 }, { 1.6, 0.49 } }, + drawing_box = { { -1.6, -2.5 }, { 1.5, 1.6 } }, + damaged_trigger_effect = hit_effects.entity(), + energy_source = { + type = "electric", + emissions_per_minute = 10, + usage_priority = "secondary-input", + }, + output_fluid_box = { + filter = "water", + base_area = 50, -- box size = area * level * height * 100 = 10 000 + base_level = 1, + height = 2, + pipe_covers = pipecoverspictures(), + pipe_connections = { + { + position = { 0, 1 }, + type = "output", + }, + }, + }, + energy_usage = "250kW", + mining_speed = 1, -- how fast it 'ticks' + base_productivity = -0.8, -- partially disable mining productivity. Setting this more negative seems to have no effect + resource_searching_radius = 0.49, + vector_to_place_result = { 0, 0 }, + module_specification = { + module_slots = 2, + }, + allowed_effects = { "speed", "consumption", "pollution" }, -- disallow productivity modules + radius_visualisation_picture = { + filename = "__base__/graphics/entity/pumpjack/pumpjack-radius-visualization.png", + width = 12, + height = 12, + }, + --monitor_visualization_tint = {r=78, g=173, b=255}, + --base_render_layer = "lower-object-above-shadow", + base_picture = { + north = { + filename = "__angelsrefining__/graphics/entity/sea-pump/sea-pump.png", + priority = "high", + shift = { 0, -1 }, + width = 160, + height = 160, + }, + east = { + filename = "__angelsrefining__/graphics/entity/sea-pump/sea-pump.png", + priority = "high", + shift = { 1, 0 }, + x = 160, + width = 160, + height = 160, + }, + south = { + filename = "__angelsrefining__/graphics/entity/sea-pump/sea-pump.png", + priority = "high", + shift = { 0, 1 }, + x = 320, + width = 160, + height = 160, + }, + west = { + filename = "__angelsrefining__/graphics/entity/sea-pump/sea-pump.png", + priority = "high", + shift = { -1, 0 }, + x = 480, + width = 160, + height = 160, + }, + }, + --animations = + --{ + -- north = + -- { + -- layers = + -- { + -- { + -- priority = "high", + -- filename = "__base__/graphics/entity/pumpjack/pumpjack-horsehead.png", + -- line_length = 8, + -- width = 104, + -- height = 102, + -- frame_count = 40, + -- shift = util.by_pixel(-4, -24), + -- animation_speed = 0.5, + -- hr_version = + -- { + -- priority = "high", + -- filename = "__base__/graphics/entity/pumpjack/hr-pumpjack-horsehead.png", + -- animation_speed = 0.5, + -- scale = 0.5, + -- line_length = 8, + -- width = 206, + -- height = 202, + -- frame_count = 40, + -- shift = util.by_pixel(-4, -24) + -- } + -- }, + -- { + -- priority = "high", + -- filename = "__base__/graphics/entity/pumpjack/pumpjack-horsehead-shadow.png", + -- animation_speed = 0.5, + -- draw_as_shadow = true, + -- line_length = 8, + -- width = 155, + -- height = 41, + -- frame_count = 40, + -- shift = util.by_pixel(17.5, 14.5), + -- hr_version = + -- { + -- priority = "high", + -- filename = "__base__/graphics/entity/pumpjack/hr-pumpjack-horsehead-shadow.png", + -- animation_speed = 0.5, + -- draw_as_shadow = true, + -- line_length = 8, + -- width = 309, + -- height = 82, + -- frame_count = 40, + -- scale = 0.5, + -- shift = util.by_pixel(17.75, 14.5) + -- } + -- } + -- } + -- } + --}, + vehicle_impact_sound = sounds.generic_impact, + open_sound = sounds.machine_open, + close_sound = sounds.machine_close, + --working_sound = + --{ + -- sound = + -- { + -- { + -- filename = "__base__/sound/pumpjack.ogg", + -- volume = 0.7 + -- }, + -- --{ + -- -- filename = "__base__/sound/pumpjack-1.ogg", + -- -- volume = 0.43 + -- --} + -- }, + -- max_sounds_per_type = 3, + -- audible_distance_modifier = 0.6, + -- fade_in_ticks = 4, + -- fade_out_ticks = 10 + --}, + --fast_replaceable_group = "pumpjack", + + circuit_wire_connection_points = circuit_connector_definitions["offshore-pump"].points, + circuit_connector_sprites = circuit_connector_definitions["offshore-pump"].sprites, + circuit_wire_max_distance = default_circuit_wire_max_distance, + }, +}) diff --git a/angelsrefining/prototypes/override-functions.lua b/angelsrefining/prototypes/override-functions.lua index 1166d5b18..7fdec33e3 100644 --- a/angelsrefining/prototypes/override-functions.lua +++ b/angelsrefining/prototypes/override-functions.lua @@ -669,12 +669,6 @@ ov_functions.set_temperature_barreling = function(fluid, temp, min_temp, max_tem end end end - if temp then - fill_barrel.temperature = temp - else - fill_barrel.minimum_temperature = min_temp - fill_barrel.maximum_temperature = max_temp - end end end end diff --git a/angelsrefining/prototypes/override/refining-override-bobgems.lua b/angelsrefining/prototypes/override/refining-override-bobgems.lua index 384d202a5..6a94b96b2 100644 --- a/angelsrefining/prototypes/override/refining-override-bobgems.lua +++ b/angelsrefining/prototypes/override/refining-override-bobgems.lua @@ -12,7 +12,7 @@ local create_single_gem_crystallization = function(recipe_bace_name, ores) local ore_name = type(ore_data) == "table" and ore_data[1] or ore_data local ore_amount = type(ore_data) == "table" and ore_data[2] or 1 if data.raw.item[ore_name] and ore_amount > 0 then - table.insert(recipe.results, { ore_name, ore_amount }) + table.insert(recipe.results, { name = ore_name, amount = ore_amount }) recipe.order = type(ore_data) == "table" and ore_data[3] or nil recipe.icons = angelsmods.functions.create_liquid_recipe_icon( { ore_name }, diff --git a/angelsrefining/prototypes/override/refining-override-bobplates.lua b/angelsrefining/prototypes/override/refining-override-bobplates.lua index 4f9816c2c..a989baf58 100644 --- a/angelsrefining/prototypes/override/refining-override-bobplates.lua +++ b/angelsrefining/prototypes/override/refining-override-bobplates.lua @@ -106,53 +106,10 @@ if mods["bobplates"] then }, order = "a-a-a1", }, - { - type = "technology", - name = "geode-crystallization-2", - icon = "__angelsrefining__/graphics/technology/geode-processing-blue.png", - icon_size = 256, - icon_mipmaps = 2, - prerequisites = { - "geode-crystallization-1", - }, - effects = { - { - type = "unlock-recipe", - recipe = "bob-ruby-3", - }, - { - type = "unlock-recipe", - recipe = "bob-sapphire-3", - }, - { - type = "unlock-recipe", - recipe = "bob-emerald-3", - }, - { - type = "unlock-recipe", - recipe = "bob-amethyst-3", - }, - { - type = "unlock-recipe", - recipe = "bob-topaz-3", - }, - { - type = "unlock-recipe", - recipe = "bob-diamond-3", - }, - }, - unit = { - count = 50, - ingredients = { - { type = "item", name = "automation-science-pack", amount = 1 }, - { type = "item", name = "logistic-science-pack", amount = 1 }, - }, - time = 30, - }, - order = "a-a-a1", - }, }) - OV.add_prereq("gem-processing-1", "geode-crystallization-2") + OV.add_prereq("gem-processing-1", "geode-crystallization-1") + OV.set_science_pack("gem-processing-1", "logistic-science-pack", 1) + OV.set_research_difficulty("gem-processing-1", 30, 50) for _, recipeName in pairs({ "bob-ruby-3", "bob-sapphire-3", @@ -183,6 +140,7 @@ if mods["bobplates"] then -- angels industries takes care of this with angels nuclear overhaul else OV.add_prereq("thorium-processing", "ore-electro-whinning-cell") + OV.set_science_pack("thorium-processing", "production-science-pack", 1) move_item("thorium-processing", "raw-material", "l[thorium-processing]", "recipe") end end @@ -206,6 +164,19 @@ if mods["bobplates"] then OV.add_prereq("chemical-processing-2", "ore-crushing") if mods["bobwarfare"] then OV.set_science_pack("bob-rocket", "production-science-pack", 1) + if + not settings.startup["bobmods-enemies-enableartifacts"] + or settings.startup["bobmods-enemies-enableartifacts"].value == false + then + OV.set_science_pack("bob-ap-bullets", "production-science-pack", 1) + OV.set_science_pack("bob-shotgun-ap-shells", "production-science-pack", 1) + OV.set_science_pack("bob-piercing-rocket", "production-science-pack", 1) + OV.set_science_pack("bob-electric-rocket", "production-science-pack", 1) + OV.set_science_pack("bob-explosive-rocket", "production-science-pack", 1) + OV.set_science_pack("bob-acid-rocket", "production-science-pack", 1) + OV.set_science_pack("bob-flame-rocket", "production-science-pack", 1) + OV.set_science_pack("bob-poison-rocket", "production-science-pack", 1) + end end end diff --git a/angelsrefining/prototypes/override/refining-override-sorting.lua b/angelsrefining/prototypes/override/refining-override-sorting.lua index 966f75e22..fc71d00a4 100644 --- a/angelsrefining/prototypes/override/refining-override-sorting.lua +++ b/angelsrefining/prototypes/override/refining-override-sorting.lua @@ -539,6 +539,14 @@ OV.patch_recipes(merge_table_of_tables({ if special_vanilla then OV.remove_prereq("uranium-processing", "ore-leaching") OV.add_prereq("uranium-processing", "slag-processing-2") + OV.remove_unlock("slag-processing-3", "slag-processing-9") + OV.add_unlock("slag-processing-2", "slag-processing-9") + OV.patch_recipes({ + { + name = "slag-processing-9", + category = "crystallizing-2", + }, + }) else -- disable the nuggets and pebbles OV.disable_recipe({ @@ -565,19 +573,17 @@ else "ore-advanced-floatation", "ore-electro-whinning-cell", }) - OV.remove_prereq("advanced-ore-refining-3", "ore-electro-whinning-cell") + OV.remove_prereq("advanced-ore-refining-3", "ore-advanced-floatation") + OV.remove_prereq("advanced-ore-refining-4", "ore-electro-whinning-cell") -- hide electro winning cells OV.hide_recipe({ "electro-whinning-cell", "electro-whinning-cell-2", - "electro-whinning-cell-3", }) angelsmods.functions.add_flag("electro-whinning-cell", "hidden") angelsmods.functions.add_flag("electro-whinning-cell-2", "hidden") - angelsmods.functions.add_flag("electro-whinning-cell-3", "hidden") - OV.remove_unlock("advanced-ore-refining-3", "electro-whinning-cell-2") - OV.remove_unlock("advanced-ore-refining-4", "electro-whinning-cell-3") + OV.remove_unlock("advanced-ore-refining-4", "electro-whinning-cell-2") if angelsmods.bioprocessing then else @@ -600,7 +606,7 @@ end if ore_enabled("ferrous") and ore_enabled("cupric") then else - OV.remove_unlock("ore-electro-whinning-cell", "angelsore-crystal-mix6-processing") + OV.remove_unlock("advanced-ore-refining-3", "angelsore-crystal-mix6-processing") OV.disable_recipe("angelsore-crystal-mix6-processing") end if not ore_enabled("ferrous") then --I DON'T KNOW WHY THIS IS STILL GETTING THROUGH!!! diff --git a/angelsrefining/prototypes/override/refining-override-water-treatment.lua b/angelsrefining/prototypes/override/refining-override-water-treatment.lua index 7a750bb50..42918b424 100644 --- a/angelsrefining/prototypes/override/refining-override-water-treatment.lua +++ b/angelsrefining/prototypes/override/refining-override-water-treatment.lua @@ -155,6 +155,7 @@ if angelsmods.trigger.washing_tech == false then --not angelsmods.smelting then -- disable technology OV.disable_technology({ "water-washing-1", "water-washing-2" }) OV.remove_prereq("geode-processing-1", "water-washing-2") + OV.add_unlock("water-treatment", "clarifier") else angelsmods.trigger.geode_red = true angelsmods.trigger.geode_cyan = true @@ -306,8 +307,7 @@ if mods["bobplates"] then if data.raw.fluid["pure-water"] then OV.global_replace_item("pure-water", "water-purified") OV.disable_recipe({ "pure-water", "pure-water-from-lithia" }) - data.raw.fluid["pure-water"].hidden = true - angelsmods.functions.disable_barreling_recipes("pure-water") + angelsmods.functions.add_flag("pure-water", "hidden") end -- lithium processing ------------------------------------------------------- diff --git a/angelsrefining/prototypes/recipe-builder-fallbacks.lua b/angelsrefining/prototypes/recipe-builder-fallbacks.lua index 959727b8a..fb14b1f67 100644 --- a/angelsrefining/prototypes/recipe-builder-fallbacks.lua +++ b/angelsrefining/prototypes/recipe-builder-fallbacks.lua @@ -251,18 +251,15 @@ angelsmods.functions.RB.set_fallback("item", "orepowder-1", { { "block-productio angelsmods.functions.RB.set_fallback("item", "orepowder-2", { { "block-mprocessing-3", 1 }, { "ore-powderizer" } }) angelsmods.functions.RB.set_fallback("item", "orepowder-3", { { "block-mprocessing-4", 1 }, { "ore-powderizer-2" } }) -angelsmods.functions.RB.set_fallback("item", "oreelectro-1", { { "block-mprocessing-3", 3 } }) +angelsmods.functions.RB.set_fallback("item", "oreelectro-1", { { "block-mprocessing-4", 3 } }) angelsmods.functions.RB.set_fallback( "item", "oreelectro-2", - { { "block-mprocessing-4", 3 }, { "electro-whinning-cell" } } -) -angelsmods.functions.RB.set_fallback( - "item", - "oreelectro-3", - { { "block-mprocessing-5", 3 }, { "electro-whinning-cell-2" } } + { { "block-mprocessing-5", 3 }, { "electro-whinning-cell" } } ) +angelsmods.functions.RB.set_fallback("item", "waterpump-2", { { "block-production-2", 3 }, { "offshore-pump", 1 } }) + --PETROCHEM angelsmods.functions.RB.set_fallback("item", "ogseparat-1", { { "block-production-2", 3 } }) angelsmods.functions.RB.set_fallback("item", "ogseparat-2", { { "block-cprocessing-3", 3 }, { "separator" } }) @@ -425,33 +422,16 @@ angelsmods.functions.RB.set_fallback("item", "algaefarm-4", { { "block-bprocessi angelsmods.functions.RB.set_fallback("item", "cropfarm-1", { { "block-production-1", 3 }, { "solid-soil", 15 } }) angelsmods.functions.RB.set_fallback("item", "cropfarm-2", { { "block-bprocessing-3", 3 }, { "crop-farm" } }) -angelsmods.functions.RB.set_fallback("item", "compo-1", { { "block-production-1", 1 }, { "wooden-chest", 1 } }) ---angelsmods.functions.RB.set_fallback("item", "compo-2", { { "block-bprocessing-3", 3 }, { "composter" } } ) - +if angelsmods.industries and angelsmods.industries.components then + angelsmods.functions.RB.set_fallback("item", "compo-1", {}) +else + angelsmods.functions.RB.set_fallback("item", "compo-1", { { "wooden-chest", 1 } }) +end angelsmods.functions.RB.set_fallback("item", "seedex-1", { { "block-production-1", 1 } }) ---angelsmods.functions.RB.set_fallback("item", "seedex-2", { { "block-bprocessing-3", 3 }, { "seed-extractor" } } ) - angelsmods.functions.RB.set_fallback("item", "biopress-1", { { "block-production-2", 1 } }) ---angelsmods.functions.RB.set_fallback("item", "biopress-2", { { "block-bprocessing-3", 3 }, { "bio-press" } } ) - angelsmods.functions.RB.set_fallback("item", "biopro-1", { { "block-production-1", 1 } }) ---angelsmods.functions.RB.set_fallback("item", "biopro-2", { { "block-bprocessing-3", 3 }, { "bio-processor" } } ) - angelsmods.functions.RB.set_fallback("item", "nutrientex-1", { { "block-production-2", 1 } }) ---angelsmods.functions.RB.set_fallback("item", "nutrientex-2", { { "block-bprocessing-3", 3 }, { "nutrient-extractor" } } ) - -angelsmods.functions.RB.set_fallback("item", "arboretum-1", { - { "block-production-1", 1 }, - { "glass", 6 }, - { - "angels-plate-glass", - 6, - function(t, n) - return mods["angelssmelting"] and angelsmods.trigger.smelting_products["glass"].plate or false - end, - }, -}) ---angelsmods.functions.RB.set_fallback("item", "arboretum-2", { { "block-bprocessing-3", 3 }, { "bio-arboretum-1" } } ) +angelsmods.functions.RB.set_fallback("item", "arboretum-1", {}) angelsmods.functions.RB.set_fallback("item", "puffer-1", { { "block-bprocessing-3", 2 }, @@ -464,7 +444,6 @@ angelsmods.functions.RB.set_fallback("item", "puffer-1", { end, }, }) ---angelsmods.functions.RB.set_fallback("item", "puffer-2", { { "block-bprocessing-3", 3 }, { "bio-refugium-puffer" } } ) angelsmods.functions.RB.set_fallback("item", "fish-1", { { "block-production-2", 1 }, @@ -477,13 +456,9 @@ angelsmods.functions.RB.set_fallback("item", "fish-1", { end, }, }) ---angelsmods.functions.RB.set_fallback("item", "fish-2", { { "block-bprocessing-3", 3 }, { "bio-refugium-fish" } } ) angelsmods.functions.RB.set_fallback("item", "biter-1", { { "block-bprocessing-4", 3 }, { "stone-wall", 4 } }) ---angelsmods.functions.RB.set_fallback("item", "biter-2", { { "block-bprocessing-3", 3 }, { "bio-refugium-biter" } } ) angelsmods.functions.RB.set_fallback("item", "hatch-1", { { "block-bprocessing-3", 1 }, { "small-lamp", 3 } }) ---angelsmods.functions.RB.set_fallback("item", "hatch-2", { { "block-bprocessing-4", 3 }, { "bio-hatchery" } } ) angelsmods.functions.RB.set_fallback("item", "butch-1", { { "block-production-2", 1 } }) ---angelsmods.functions.RB.set_fallback("item", "butch-2", { { "block-bprocessing-3", 3 }, { "bio-butchery" } } ) diff --git a/angelsrefining/prototypes/recipe-builder.lua b/angelsrefining/prototypes/recipe-builder.lua index 22051a1e8..fbcc9668a 100644 --- a/angelsrefining/prototypes/recipe-builder.lua +++ b/angelsrefining/prototypes/recipe-builder.lua @@ -34,7 +34,9 @@ end RB.set_fallback = function(i_type, i_name, fb_list, i_condition) -- i_type either "item" or "fluid", i_name the name of the item, fb_list a table containing subtables { name, multiplier, condition } where item_name is a string, multiplier is a positive number (defaults to 1), and condition is a function taking i_type and i_name as arguments and returning a boolean (defaults to return true) can also be formatted { name = name, multiplier = multiplier, condition = condition }, condition (optional) is like the condition field in a subtable of fb_list but for i_name local parent = fallbacks[i_type] if parent then - if check_raw_for(i_type, i_name) and (not i_condition or i_condition(i_type, i_name)) then + if parent[i_name] ~= nil then + -- fallback already exists + elseif check_raw_for(i_type, i_name) and (not i_condition or i_condition(i_type, i_name)) then parent[i_name] = nil else local sentinel = true diff --git a/angelsrefining/prototypes/recipes/refining-dynamic/crystal-processing-mix.lua b/angelsrefining/prototypes/recipes/refining-dynamic/crystal-processing-mix.lua index 2e8f6e73b..f2b6fea8c 100644 --- a/angelsrefining/prototypes/recipes/refining-dynamic/crystal-processing-mix.lua +++ b/angelsrefining/prototypes/recipes/refining-dynamic/crystal-processing-mix.lua @@ -171,7 +171,7 @@ data:extend({ { type = "recipe", name = "angelsore8-crystal-processing", - category = "ore-sorting-3", + category = "ore-sorting-4", subgroup = "ore-sorting-t4", energy_required = 1.5, allow_decomposition = false, @@ -203,7 +203,7 @@ data:extend({ { type = "recipe", name = "angelsore9-crystal-processing", - category = "ore-sorting-3", + category = "ore-sorting-4", subgroup = "ore-sorting-t4", energy_required = 1.5, allow_decomposition = false, @@ -232,11 +232,11 @@ data:extend({ icon_size = 32, order = "h", }, - -- TIER 3.5 MIX + -- TIER 4 MIX { type = "recipe", name = "angelsore-crystal-mix6-processing", --thorium - category = "ore-sorting-3", + category = "ore-sorting-4", subgroup = "ore-sorting-advanced", energy_required = 1.5, allow_decomposition = false, @@ -245,7 +245,7 @@ data:extend({ ingredients = { { type = "item", name = "angels-ore8-crystal", amount = 2 }, { type = "item", name = "angels-ore9-crystal", amount = 2 }, - { type = "item", name = "catalysator-green", amount = 1 }, + { type = "item", name = "catalysator-orange", amount = 1 }, }, results = { { type = "item", name = "angels-void", amount = 1 }, diff --git a/angelsrefining/prototypes/recipes/refining-dynamic/gems.lua b/angelsrefining/prototypes/recipes/refining-dynamic/gems.lua index fd11c777d..21656037e 100644 --- a/angelsrefining/prototypes/recipes/refining-dynamic/gems.lua +++ b/angelsrefining/prototypes/recipes/refining-dynamic/gems.lua @@ -11,8 +11,7 @@ data:extend({ enabled = false, normal = { ingredients = { - { type = "fluid", name = "crystal-seedling", amount = 50 }, - { type = "item", name = "catalysator-green", amount = 1 }, + { type = "fluid", name = "crystal-seedling", amount = 75 }, }, results = { { type = "item", name = "angels-void", amount = 1 }, @@ -21,7 +20,6 @@ data:extend({ expensive = { ingredients = { { type = "fluid", name = "crystal-seedling", amount = 75 * rawmulti }, - { type = "item", name = "catalysator-green", amount = 1 }, }, results = { { type = "item", name = "angels-void", amount = 1 }, @@ -39,8 +37,7 @@ data:extend({ enabled = false, normal = { ingredients = { - { type = "fluid", name = "crystal-seedling", amount = 50 }, - { type = "item", name = "catalysator-green", amount = 1 }, + { type = "fluid", name = "crystal-seedling", amount = 75 }, }, results = { { type = "item", name = "angels-void", amount = 1 }, @@ -49,7 +46,6 @@ data:extend({ expensive = { ingredients = { { type = "fluid", name = "crystal-seedling", amount = 75 * rawmulti }, - { type = "item", name = "catalysator-green", amount = 1 }, }, results = { { type = "item", name = "angels-void", amount = 1 }, @@ -67,8 +63,7 @@ data:extend({ enabled = false, normal = { ingredients = { - { type = "fluid", name = "crystal-seedling", amount = 50 }, - { type = "item", name = "catalysator-green", amount = 1 }, + { type = "fluid", name = "crystal-seedling", amount = 75 }, }, results = { { type = "item", name = "angels-void", amount = 1 }, @@ -77,7 +72,6 @@ data:extend({ expensive = { ingredients = { { type = "fluid", name = "crystal-seedling", amount = 75 * rawmulti }, - { type = "item", name = "catalysator-green", amount = 1 }, }, results = { { type = "item", name = "angels-void", amount = 1 }, @@ -95,8 +89,7 @@ data:extend({ enabled = false, normal = { ingredients = { - { type = "fluid", name = "crystal-seedling", amount = 50 }, - { type = "item", name = "catalysator-green", amount = 1 }, + { type = "fluid", name = "crystal-seedling", amount = 75 }, }, results = { { type = "item", name = "angels-void", amount = 1 }, @@ -105,7 +98,6 @@ data:extend({ expensive = { ingredients = { { type = "fluid", name = "crystal-seedling", amount = 75 * rawmulti }, - { type = "item", name = "catalysator-green", amount = 1 }, }, results = { { type = "item", name = "angels-void", amount = 1 }, @@ -123,8 +115,7 @@ data:extend({ enabled = false, normal = { ingredients = { - { type = "fluid", name = "crystal-seedling", amount = 50 }, - { type = "item", name = "catalysator-green", amount = 1 }, + { type = "fluid", name = "crystal-seedling", amount = 75 }, }, results = { { type = "item", name = "angels-void", amount = 1 }, @@ -133,7 +124,6 @@ data:extend({ expensive = { ingredients = { { type = "fluid", name = "crystal-seedling", amount = 75 * rawmulti }, - { type = "item", name = "catalysator-green", amount = 1 }, }, results = { { type = "item", name = "angels-void", amount = 1 }, @@ -151,8 +141,7 @@ data:extend({ enabled = false, normal = { ingredients = { - { type = "fluid", name = "crystal-seedling", amount = 50 }, - { type = "item", name = "catalysator-green", amount = 1 }, + { type = "fluid", name = "crystal-seedling", amount = 75 }, }, results = { { type = "item", name = "angels-void", amount = 1 }, @@ -161,7 +150,6 @@ data:extend({ expensive = { ingredients = { { type = "fluid", name = "crystal-seedling", amount = 75 * rawmulti }, - { type = "item", name = "catalysator-green", amount = 1 }, }, results = { { type = "item", name = "angels-void", amount = 1 }, diff --git a/angelsrefining/prototypes/recipes/refining-dynamic/slag-stone.lua b/angelsrefining/prototypes/recipes/refining-dynamic/slag-stone.lua index 9b5096bcf..6fe1806ca 100644 --- a/angelsrefining/prototypes/recipes/refining-dynamic/slag-stone.lua +++ b/angelsrefining/prototypes/recipes/refining-dynamic/slag-stone.lua @@ -239,7 +239,7 @@ data:extend({ { type = "recipe", name = "slag-processing-8", - category = "crystallizing-2", + category = "crystallizing-3", subgroup = "slag-processing-1", energy_required = 8, enabled = false, @@ -272,7 +272,7 @@ data:extend({ { type = "recipe", name = "slag-processing-9", - category = "crystallizing-2", + category = "crystallizing-3", subgroup = "slag-processing-1", energy_required = 8, enabled = false, diff --git a/angelsrefining/prototypes/recipes/refining-entity-angels.lua b/angelsrefining/prototypes/recipes/refining-entity-angels.lua index d383c8a60..d0a1d7065 100644 --- a/angelsrefining/prototypes/recipes/refining-entity-angels.lua +++ b/angelsrefining/prototypes/recipes/refining-entity-angels.lua @@ -1008,6 +1008,35 @@ angelsmods.functions.RB.build({ result = "seafloor-pump", }, }, + --SEA PUMP + { + type = "recipe", + name = "sea-pump", + normal = { + energy_required = 2, + enabled = false, + ingredients = { + { type = "item", name = "waterpump-2", amount = 1 }, + { type = "item", name = "t3-plate", amount = 2 }, + { type = "item", name = "t3-circuit", amount = 5 }, + { type = "item", name = "t3-brick", amount = 6 }, + { type = "item", name = "t3-pipe", amount = 4 }, + }, + result = "sea-pump", + }, + expensive = { + energy_required = 2 * buildingtime, + enabled = false, + ingredients = { + { type = "item", name = "waterpump-2", amount = 1 }, + { type = "item", name = "t3-plate", amount = 2 * buildingmulti }, + { type = "item", name = "t3-circuit", amount = 5 * buildingmulti }, + { type = "item", name = "t3-brick", amount = 6 * buildingmulti }, + { type = "item", name = "t3-pipe", amount = 4 * buildingmulti }, + }, + result = "sea-pump", + }, + }, --LAND PUMP { type = "recipe", @@ -1175,80 +1204,52 @@ angelsmods.functions.RB.build({ enabled = false, ingredients = { { type = "item", name = "oreelectro-1", amount = 1 }, - { type = "item", name = "t3-plate", amount = 4 }, - { type = "item", name = "t3-circuit", amount = 8 }, - { type = "item", name = "t3-brick", amount = 4 }, - { type = "item", name = "t3-pipe", amount = 6 }, - }, - result = "electro-whinning-cell", - }, - expensive = { - energy_required = 5 * buildingtime, - enabled = false, - ingredients = { - { type = "item", name = "oreelectro-1", amount = 1 }, - { type = "item", name = "t3-plate", amount = 4 * buildingmulti }, - { type = "item", name = "t3-circuit", amount = 8 * buildingmulti }, - { type = "item", name = "t3-brick", amount = 4 * buildingmulti }, - { type = "item", name = "t3-pipe", amount = 6 * buildingmulti }, - }, - result = "electro-whinning-cell", - }, - }, - { - type = "recipe", - name = "electro-whinning-cell-2", - normal = { - energy_required = 5, - enabled = false, - ingredients = { - { type = "item", name = "oreelectro-2", amount = 1 }, { type = "item", name = "t4-plate", amount = 4 }, { type = "item", name = "t4-circuit", amount = 8 }, { type = "item", name = "t4-brick", amount = 4 }, { type = "item", name = "t4-pipe", amount = 6 }, }, - result = "electro-whinning-cell-2", + result = "electro-whinning-cell", }, expensive = { energy_required = 5 * buildingtime, enabled = false, ingredients = { - { type = "item", name = "oreelectro-2", amount = 1 }, + { type = "item", name = "oreelectro-1", amount = 1 }, { type = "item", name = "t4-plate", amount = 4 * buildingmulti }, { type = "item", name = "t4-circuit", amount = 8 * buildingmulti }, { type = "item", name = "t4-brick", amount = 4 * buildingmulti }, { type = "item", name = "t4-pipe", amount = 6 * buildingmulti }, }, - result = "electro-whinning-cell-2", + result = "electro-whinning-cell", }, }, { type = "recipe", - name = "electro-whinning-cell-3", + name = "electro-whinning-cell-2", normal = { energy_required = 5, enabled = false, ingredients = { - { type = "item", name = "oreelectro-3", amount = 1 }, + { type = "item", name = "oreelectro-2", amount = 1 }, { type = "item", name = "t5-plate", amount = 4 }, { type = "item", name = "t5-circuit", amount = 8 }, { type = "item", name = "t5-brick", amount = 4 }, { type = "item", name = "t5-pipe", amount = 6 }, }, - result = "electro-whinning-cell-3", + result = "electro-whinning-cell-2", }, expensive = { energy_required = 5 * buildingtime, enabled = false, ingredients = { - { type = "item", name = "oreelectro-3", amount = 1 }, + { type = "item", name = "oreelectro-2", amount = 1 }, { type = "item", name = "t5-plate", amount = 4 * buildingmulti }, { type = "item", name = "t5-circuit", amount = 8 * buildingmulti }, { type = "item", name = "t5-brick", amount = 4 * buildingmulti }, { type = "item", name = "t5-pipe", amount = 6 * buildingmulti }, }, - result = "electro-whinning-cell-3", + result = "electro-whinning-cell-2", }, }, }) diff --git a/angelsrefining/prototypes/recipes/refining-entity.lua b/angelsrefining/prototypes/recipes/refining-entity.lua index 374ad472f..0582c5c99 100644 --- a/angelsrefining/prototypes/recipes/refining-entity.lua +++ b/angelsrefining/prototypes/recipes/refining-entity.lua @@ -372,6 +372,17 @@ data:extend({ }, result = "seafloor-pump", }, + --SEA PUMP + { + type = "recipe", + name = "sea-pump", + energy_required = 5, + enabled = false, + ingredients = { + { type = "item", name = "angels-void", amount = 1 }, + }, + result = "sea-pump", + }, --LAND PUMP { type = "recipe", @@ -457,14 +468,4 @@ data:extend({ }, result = "electro-whinning-cell-2", }, - { - type = "recipe", - name = "electro-whinning-cell-3", - energy_required = 2, - enabled = false, - ingredients = { - { type = "item", name = "angels-void", amount = 1 }, - }, - result = "electro-whinning-cell-3", - }, }) diff --git a/angelsrefining/prototypes/recipes/refining-static.lua b/angelsrefining/prototypes/recipes/refining-static.lua index faa02586e..545d3128a 100644 --- a/angelsrefining/prototypes/recipes/refining-static.lua +++ b/angelsrefining/prototypes/recipes/refining-static.lua @@ -639,7 +639,7 @@ data:extend({ type = "recipe", name = "angelsore8-solution", localised_name = { "recipe-name.angelsore8-solution" }, - category = "ore-refining-t3", + category = "ore-refining-t3b", subgroup = "ore-processing-c", energy_required = 2, enabled = false, @@ -665,7 +665,7 @@ data:extend({ type = "recipe", name = "angelsore8-anode-sludge-filtering", localised_name = { "recipe-name.angelsore8-solution-filtering" }, - category = "filtering-2", + category = "filtering-3", subgroup = "ore-processing-c", energy_required = 2, enabled = false, @@ -723,7 +723,7 @@ data:extend({ type = "recipe", name = "angelsore8-crystal", localised_name = { "recipe-name.angelsore8-crystal" }, - category = "crystallizing-2", + category = "crystallizing-3", subgroup = "ore-processing-d", energy_required = 2, enabled = false, @@ -745,7 +745,7 @@ data:extend({ type = "recipe", name = "angelsore9-solution", localised_name = { "recipe-name.angelsore9-solution" }, - category = "ore-refining-t3", + category = "ore-refining-t3b", subgroup = "ore-processing-c", energy_required = 2, enabled = false, @@ -771,7 +771,7 @@ data:extend({ type = "recipe", name = "angelsore9-anode-sludge-filtering", localised_name = { "recipe-name.angelsore9-solution-filtering" }, - category = "filtering-2", + category = "filtering-3", subgroup = "ore-processing-c", energy_required = 2, enabled = false, @@ -829,7 +829,7 @@ data:extend({ type = "recipe", name = "angelsore9-crystal", localised_name = { "recipe-name.angelsore9-crystal" }, - category = "crystallizing-2", + category = "crystallizing-3", subgroup = "ore-processing-d", energy_required = 2, enabled = false, @@ -1514,7 +1514,7 @@ data:extend({ { type = "recipe", name = "catalysator-green", - category = "crystallizing", + category = "crystallizing-2", subgroup = "geode-crystallization", energy_required = 0.5, enabled = false, diff --git a/angelsrefining/prototypes/refining-category.lua b/angelsrefining/prototypes/refining-category.lua index 1bda90401..3810e4b47 100644 --- a/angelsrefining/prototypes/refining-category.lua +++ b/angelsrefining/prototypes/refining-category.lua @@ -10,6 +10,7 @@ data:extend({ { type = "recipe-category", name = "ore-refining-t1-5" }, -- powderizer { type = "recipe-category", name = "ore-refining-t2" }, -- flotation { type = "recipe-category", name = "ore-refining-t3" }, -- leaching + { type = "recipe-category", name = "ore-refining-t3b" }, -- leaching 2 { type = "recipe-category", name = "ore-refining-t3-5" }, -- electrowinning { type = "recipe-category", name = "ore-refining-t4" }, -- refinery diff --git a/angelsrefining/prototypes/refining-override.lua b/angelsrefining/prototypes/refining-override.lua index 7c1e84fdd..5dad8c966 100644 --- a/angelsrefining/prototypes/refining-override.lua +++ b/angelsrefining/prototypes/refining-override.lua @@ -42,7 +42,6 @@ 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") @@ -498,6 +497,7 @@ angelsmods.functions.allow_productivity("angelsore-crystal-mix2-processing") angelsmods.functions.allow_productivity("angelsore-crystal-mix3-processing") angelsmods.functions.allow_productivity("angelsore-crystal-mix4-processing") angelsmods.functions.allow_productivity("angelsore-crystal-mix5-processing") +angelsmods.functions.allow_productivity("angelsore-crystal-mix6-processing") angelsmods.functions.allow_productivity("angelsore-pure-mix1-processing") angelsmods.functions.allow_productivity("angelsore-pure-mix2-processing") diff --git a/angelsrefining/prototypes/technology/refining-technology.lua b/angelsrefining/prototypes/technology/refining-technology.lua index 6a7ca245c..0635d69b7 100644 --- a/angelsrefining/prototypes/technology/refining-technology.lua +++ b/angelsrefining/prototypes/technology/refining-technology.lua @@ -127,6 +127,7 @@ data:extend({ prerequisites = { --"ore-crushing", "ore-floatation", + "slag-processing-1", "water-washing-2", }, effects = { @@ -154,6 +155,14 @@ data:extend({ type = "unlock-recipe", recipe = "geode-yellow-processing", }, + { + type = "unlock-recipe", + recipe = "crystal-dust-liquify", + }, + { + type = "unlock-recipe", + recipe = "crystal-slurry-filtering-conversion-1", + }, }, unit = { count = 50, @@ -320,9 +329,9 @@ data:extend({ prerequisites = { --"ore-floatation", "advanced-ore-refining-1", - "geode-processing-2", "chemical-science-pack", "ore-powderizer", + "slag-processing-2", }, effects = { { @@ -384,9 +393,7 @@ data:extend({ icon_size = 256, icon_mipmaps = 2, prerequisites = { - --"ore-crushing", "geode-processing-1", - "slag-processing-1", }, effects = { { @@ -413,22 +420,10 @@ data:extend({ type = "unlock-recipe", recipe = "geode-yellow-liquify", }, - { - type = "unlock-recipe", - recipe = "crystal-dust-liquify", - }, { type = "unlock-recipe", recipe = "crystal-slurry-filtering-1", }, - { - type = "unlock-recipe", - recipe = "crystal-slurry-filtering-conversion-1", - }, - { - type = "unlock-recipe", - recipe = "catalysator-green", - }, }, unit = { count = 75, @@ -448,6 +443,7 @@ data:extend({ prerequisites = { "slag-processing-1", "chemical-science-pack", + "geode-processing-2", }, effects = { { @@ -462,6 +458,10 @@ data:extend({ type = "unlock-recipe", recipe = "liquifier-3", }, + { + type = "unlock-recipe", + recipe = "catalysator-green", + }, { type = "unlock-recipe", recipe = "slag-processing-4", @@ -478,14 +478,6 @@ data:extend({ type = "unlock-recipe", recipe = "slag-processing-7", }, - { - type = "unlock-recipe", - recipe = "slag-processing-8", - }, - { - type = "unlock-recipe", - recipe = "slag-processing-9", - }, { type = "unlock-recipe", recipe = "filter-ceramic", @@ -516,9 +508,9 @@ data:extend({ icon = "__angelsrefining__/graphics/technology/slag-processing.png", icon_size = 64, prerequisites = { - "geode-processing-3", "advanced-electronics-2", "production-science-pack", + "slag-processing-2", }, effects = { { @@ -537,6 +529,14 @@ data:extend({ type = "unlock-recipe", recipe = "catalysator-orange", }, + { + type = "unlock-recipe", + recipe = "slag-processing-8", + }, + { + type = "unlock-recipe", + recipe = "slag-processing-9", + }, }, unit = { count = 50, @@ -556,8 +556,7 @@ data:extend({ icon = "__angelsrefining__/graphics/technology/thermal-extractor.png", icon_size = 128, prerequisites = { - --"slag-processing-1", - "advanced-ore-refining-1", + "water-treatment-2", }, effects = { { @@ -717,8 +716,8 @@ data:extend({ prerequisites = { "ore-leaching", "advanced-ore-refining-2", - "ore-electro-whinning-cell", "slag-processing-3", + "ore-advanced-floatation", }, effects = { { @@ -737,10 +736,6 @@ data:extend({ type = "unlock-recipe", recipe = "ore-powderizer-3", }, - { - type = "unlock-recipe", - recipe = "electro-whinning-cell-2", - }, { type = "unlock-recipe", recipe = "angelsore-crystal-mix1-processing", @@ -893,6 +888,7 @@ data:extend({ prerequisites = { "ore-refining", "advanced-ore-refining-3", + "ore-electro-whinning-cell", "utility-science-pack", }, effects = { @@ -906,7 +902,7 @@ data:extend({ }, { type = "unlock-recipe", - recipe = "electro-whinning-cell-3", + recipe = "electro-whinning-cell-2", }, { type = "unlock-recipe", @@ -1028,7 +1024,6 @@ data:extend({ icon_size = 128, prerequisites = { "ore-powderizer", - "advanced-ore-refining-2", "thermal-water-extraction-2", }, effects = { @@ -1078,9 +1073,8 @@ data:extend({ icon = "__angelsrefining__/graphics/technology/electro-whinning-cell-tech.png", icon_size = 128, prerequisites = { - "ore-advanced-floatation", - "geode-processing-3", "ore-leaching", + "advanced-ore-refining-3", }, effects = { { @@ -1138,6 +1132,7 @@ data:extend({ { type = "item", name = "automation-science-pack", amount = 1 }, { type = "item", name = "logistic-science-pack", amount = 1 }, { type = "item", name = "chemical-science-pack", amount = 1 }, + { type = "item", name = "production-science-pack", amount = 1 }, }, time = 15, }, diff --git a/angelsrefining/prototypes/technology/water-treatment-technology.lua b/angelsrefining/prototypes/technology/water-treatment-technology.lua index 9ec2f4c8c..73fe5fbff 100644 --- a/angelsrefining/prototypes/technology/water-treatment-technology.lua +++ b/angelsrefining/prototypes/technology/water-treatment-technology.lua @@ -38,20 +38,16 @@ data:extend({ effects = { { type = "unlock-recipe", - recipe = "hydro-plant", + recipe = "ground-water-pump", }, { type = "unlock-recipe", - recipe = "clarifier", + recipe = "hydro-plant", }, { type = "unlock-recipe", recipe = "liquifier", }, - { - type = "unlock-recipe", - recipe = "ground-water-pump", - }, { type = "unlock-recipe", recipe = "water-purification", @@ -124,6 +120,10 @@ data:extend({ "chemical-science-pack", }, effects = { + { + type = "unlock-recipe", + recipe = "sea-pump", + }, { type = "unlock-recipe", recipe = "hydro-plant-3", @@ -199,7 +199,7 @@ data:extend({ icon = "__angelsrefining__/graphics/technology/washing-plant-tech.png", icon_size = 128, prerequisites = { - "water-treatment", + "automation", }, effects = { { @@ -212,7 +212,7 @@ data:extend({ }, { type = "unlock-recipe", - recipe = "water-viscous-mud", + recipe = "clarifier", }, { type = "unlock-recipe", @@ -248,12 +248,13 @@ data:extend({ }, }, unit = { - count = 30, + count = 10, ingredients = { { type = "item", name = "automation-science-pack", amount = 1 }, }, time = 15, }, + ignore_tech_cost_multiplier = true, order = "c-a", }, { @@ -271,6 +272,10 @@ data:extend({ type = "unlock-recipe", recipe = "washing-plant-2", }, + { + type = "unlock-recipe", + recipe = "water-viscous-mud", + }, { type = "unlock-recipe", recipe = "solid-geodes", diff --git a/angelsrefining/settings-updates.lua b/angelsrefining/settings-updates.lua index 88118295d..33c0ce04a 100644 --- a/angelsrefining/settings-updates.lua +++ b/angelsrefining/settings-updates.lua @@ -1,4 +1,9 @@ -- EXECUTE OVERRIDES +if mods["boblibrary"] then + angelsmods.settings.hide_setting("bool-setting", "bobmods-library-recipe-cleanup", true) + angelsmods.settings.hide_setting("bool-setting", "bobmods-library-technology-cleanup", true) +end + if mods["bobplates"] then angelsmods.settings.hide_setting("bool-setting", "bobmods-plates-groundwater") angelsmods.settings.hide_setting("bool-setting", "bobmods-plates-vanillabarrelling") @@ -36,6 +41,8 @@ if mods["bobores"] then angelsmods.settings.hide_setting("bool-setting", "bobmods-ores-nickelgivescobalt") angelsmods.settings.hide_setting("double-setting", "bobmods-ores-nickelcobaltratio") + angelsmods.settings.hide_setting("bool-setting", "bobmods-ores-infiniteore", false) + --gems angelsmods.settings.hide_setting("bool-setting", "bobmods-ores-unsortedgemore", false) angelsmods.settings.hide_setting("double-setting", "bobmods-gems-rubyratio") diff --git a/angelsrefining/src/mod-config.lua b/angelsrefining/src/mod-config.lua new file mode 100644 index 000000000..cbb447d7e --- /dev/null +++ b/angelsrefining/src/mod-config.lua @@ -0,0 +1,23 @@ +local sea_pump = require("src.sea-pump") + +return function(configuration_data) + local mod_changes = configuration_data.mod_changes["angelspump"] + if mod_changes and mod_changes.new_version ~= (mod_changes.old_version or "") then + log( + string.format( + "Updating angelspump from version %q to version %q", + mod_changes.old_version or "nil", + mod_changes.new_version + ) + ) + + -------------------------------------------------- + -- Sea pump script----- -- + -------------------------------------------------- + if global.SP_data.version == 1 then + log("Updating sea pump from version 1 to version 2.") + global.SP_data["entity_modules_data_tag"] = "sea-pump-modules_request" -- the tag name where the data is stored in the entity + global.SP_data.version = 2 + end + end +end diff --git a/angelsrefining/src/sea-pump.lua b/angelsrefining/src/sea-pump.lua new file mode 100644 index 000000000..f54b2ac9b --- /dev/null +++ b/angelsrefining/src/sea-pump.lua @@ -0,0 +1,228 @@ +require("util") + +-- Create class --------------------------------------------------------------- +local sea_pump = {} + +------------------------------------------------------------------------------- +-- Initiation of the class +------------------------------------------------------------------------------- +function sea_pump:on_init() + if not global.SP_data then + global.SP_data = self:init_global_data() + end +end + +function sea_pump:init_global_data() + local SP_data = { + ["version"] = 2, -- version of the global data + + ["prototype_data"] = self:init_prototype_data(), -- data storing info about the prototypes + ["entity_modules_data_tag"] = "sea-pump-modules_request", -- the tag name where the data is stored in the entity + } + return SP_data +end + +function sea_pump:init_prototype_data() + return { + ["sea_pump_name"] = "sea-pump", -- the actual pump + ["sea_pump_placeable"] = "sea-pump-placeable", -- the name of the entity being placed + ["sea_pump_resource"] = "sea-pump-resource", -- the resource the actual pump is placed on + } +end + +------------------------------------------------------------------------------- +-- Setter functions to alter data into the data structure +------------------------------------------------------------------------------- + +------------------------------------------------------------------------------- +-- Getter functions to extract data from the data structure +------------------------------------------------------------------------------- +function sea_pump:get_pump_name() + if global.SP_data then + return global.SP_data.prototype_data.sea_pump_name + else + return "angels-void" + end +end + +function sea_pump:get_placeable_name() + if global.SP_data then + return global.SP_data.prototype_data.sea_pump_placeable + else + return "angels-void" + end +end + +function sea_pump:get_resource_name() + if global.SP_data then + return global.SP_data.prototype_data.sea_pump_resource + else + return "angels-void" + end +end + +function sea_pump:get_ghost_tag_name() + if global.SP_data then + return global.SP_data.entity_modules_data_tag + else + return "angels-void" + end +end + +------------------------------------------------------------------------------- +-- Behaviour functions, mostly event handlers +------------------------------------------------------------------------------- +function sea_pump:on_build_entity(created_entity, entity_tags) + if not (created_entity and created_entity.valid) then + return + end + + if created_entity.name == self:get_placeable_name() then + local surface = created_entity.surface + local position = created_entity.position + local force = created_entity.force + local direction = created_entity.direction + + -- remove the sea pump placeable + created_entity.destroy({ raise_destroy = true }) + + -- create the resource to be mined by the sea pump (miner) + surface.create_entity({ + name = self:get_resource_name(), + position = position, + force = "neutral", + }) + + -- create the actual sea pump + local created_entity_2 = surface.create_entity({ + name = self:get_pump_name(), + position = position, + direction = direction, + force = force, + create_build_effect_smoke = true, + raise_built = true, + }) + + local requested_modules = entity_tags[self:get_ghost_tag_name()] + if requested_modules then + local created_entity_2_proxy = surface.create_entity({ + name = "item-request-proxy", + position = position, + force = force, + target = created_entity_2, + modules = requested_modules, + }) + end + elseif created_entity.name == self:get_pump_name() then + -- make sure the sea pump (miner) cannot be rotated + created_entity.rotatable = false + elseif created_entity.name == "entity-ghost" then + if created_entity.ghost_name == self:get_placeable_name() then + local modules = {} + local has_modules = false + local module_prototypes = game.get_filtered_item_prototypes({ + { filter = "type", type = "module" }, + }) + for module_name, module_count in pairs(created_entity.item_requests) do + if module_prototypes[module_name] then + modules[module_name] = module_count + has_modules = true + end + end + if has_modules then + local created_entity_tags = created_entity.tags or {} + created_entity_tags[self:get_ghost_tag_name()] = modules + created_entity.tags = created_entity_tags + end + elseif created_entity.ghost_name == self:get_pump_name() then + local surface = created_entity.surface + local position = created_entity.position + local force = created_entity.force + local direction = created_entity.direction + local time_to_live = created_entity.time_to_live + local item_requests = created_entity.item_requests + + -- remove the sea pump (miner) ghost + created_entity.destroy({ raise_destroy = true }) + + -- create the sea pump (placeable) ghost + created_entity_2 = surface.create_entity({ + name = "entity-ghost", + inner_name = self:get_placeable_name(), + position = position, + direction = direction, + force = force, + expires = time_to_live, + create_build_effect_smoke = false, + raise_built = false, -- raise manually after adding the item requests + }) + created_entity_2.item_requests = item_requests + script.raise_event(defines.events.script_raised_built, { entity = created_entity_2 }) + end + end +end + +function sea_pump:on_remove_entity(removed_entity) + if not removed_entity then + return + end + if removed_entity.name ~= self:get_pump_name() then + return + end + + -- remove the resource that was being mined by the sea pump (miner) + local surface = removed_entity.surface + local position = removed_entity.position + local resource_entity = surface.find_entity(self:get_resource_name(), position) + if resource_entity ~= nil then + resource_entity.destroy({ raise_destroy = false }) + end +end + +function sea_pump:on_blueprint_setup(player_index) + -- obtain the blueprint from the player + local player = game.get_player(player_index) + if not player then + return + end + + local blueprint = player.blueprint_to_setup + if not blueprint or not blueprint.valid_for_read then + blueprint = player.cursor_stack + if not blueprint or not blueprint.valid_for_read then + return + end + end + + while blueprint.type == "blueprint-book" do + local blueprint_inventory = blueprint.get_inventory(defines.inventory.item_main) + if blueprint_inventory then + blueprint = blueprint_inventory[blueprint.active_index] + else + return + end + end + + -- obtain all blueprint entitites + local entities = blueprint.get_blueprint_entities() + if entities == nil then + return + end + + -- replace the sea pump (miner) with sea pump (placeable) + local pump_mining_name = self:get_pump_name() + local pump_place_name = self:get_placeable_name() + local entities_replaced = false + for index, entity in pairs(entities) do + if entity.name == pump_mining_name then + entities[index].name = pump_place_name + entities_replaced = true + end + end + if entities_replaced then + blueprint.set_blueprint_entities(entities) + end +end + +-- Return class --------------------------------------------------------------- +return sea_pump diff --git a/angelssmelting/changelog.txt b/angelssmelting/changelog.txt index f253fac12..6a834d31c 100644 --- a/angelssmelting/changelog.txt +++ b/angelssmelting/changelog.txt @@ -1,4 +1,15 @@ --------------------------------------------------------------------------------------------------- +Version: 0.6.22 +Date: 22.12.2023 + Changes: + - Increased the tech and required machine tier of Chrome and Platinum (909) + - Allow Fibreglass boards to be made in Bob's Electronics assembling machines (921) + - Enabled productivity modules for Glass, Glass fiber, and Fibreglass recipes (929) + - Added water to recipe Glass fiber casting 1. Added new recipe Glass fiber casting 2 (939) + Bugfixes: + - Another attempt at fixed smoke on the blast furnace + - Fixed names and descriptions of Bronze processing and Brass processing techs from Bob's MCI mod (926) +--------------------------------------------------------------------------------------------------- Version: 0.6.21 Date: 23.02.2023 Changes: diff --git a/angelssmelting/data.lua b/angelssmelting/data.lua index 6d7b46668..26b53d537 100644 --- a/angelssmelting/data.lua +++ b/angelssmelting/data.lua @@ -26,7 +26,7 @@ angelsmods.trigger.smelting_products["gunmetal"] = angelsmods.trigger.smelting_p angelsmods.trigger.smelting_products["invar"] = angelsmods.trigger.smelting_products["invar"] or {} angelsmods.trigger.smelting_products["nitinol"] = angelsmods.trigger.smelting_products["nitinol"] or {} angelsmods.trigger.smelting_products["solder"] = angelsmods.trigger.smelting_products["solder"] or {} -angelsmods.trigger.smelting_products["steel"] = angelsmods.trigger.smelting_products["copper"] or {} +angelsmods.trigger.smelting_products["steel"] = angelsmods.trigger.smelting_products["steel"] or {} angelsmods.trigger.smelting_products["aluminium"] = angelsmods.trigger.smelting_products["aluminium"] or {} angelsmods.trigger.smelting_products["chrome"] = angelsmods.trigger.smelting_products["chrome"] or {} angelsmods.trigger.smelting_products["cobalt"] = angelsmods.trigger.smelting_products["cobalt"] or {} @@ -75,7 +75,10 @@ angelsmods.trigger.smelting_products["copper"].wire = true --glass angelsmods.trigger.smelting_products["glass"].plate = mods["bobplates"] and true or false angelsmods.trigger.smelting_products["glass"].fibre = false -angelsmods.trigger.smelting_products["glass"].board = mods["bobplates"] and mods["bobelectronics"] and true or false +angelsmods.trigger.smelting_products["glass"].board = not angelsmods.functions.is_special_vanilla() + and mods["bobelectronics"] + and true + or false --gold angelsmods.trigger.smelting_products["gold"].plate = mods["bobplates"] and true or false angelsmods.trigger.smelting_products["gold"].wire = angelsmods.trigger.smelting_products["gold"].plate diff --git a/angelssmelting/info.json b/angelssmelting/info.json index 2c052bc6e..3443f165d 100644 --- a/angelssmelting/info.json +++ b/angelssmelting/info.json @@ -1,6 +1,6 @@ { "name": "angelssmelting", - "version": "0.6.21", + "version": "0.6.22", "factorio_version": "1.1", "title": "Angel's Smelting", "author": "Arch666Angel", @@ -9,7 +9,7 @@ "description": "Angel's Smelting provides alternative ways to produce plate and increase ore yield at the expense of space and energy.", "dependencies": [ "angelsrefining >= 0.12.1", - "angelspetrochem >= 0.9.20", + "angelspetrochem >= 0.9.25", "? bobplates >= 1.1.6" ] } diff --git a/angelssmelting/locale/en/smelting.cfg b/angelssmelting/locale/en/smelting.cfg index c4faa8dc8..a498e71d7 100644 --- a/angelssmelting/locale/en/smelting.cfg +++ b/angelssmelting/locale/en/smelting.cfg @@ -200,6 +200,7 @@ ingot-copper=Copper ingot powder-copper=Copper powder angels-plate-copper=Copper plate angels-wire-copper=Copper wire +copper-cable=Copper wire angels-wire-coil-copper=Copper wire coil angels-roll-copper=Copper sheet coil @@ -218,6 +219,7 @@ angels-plate-gold=Gold plate angels-roll-gold=Gold sheet coil angels-wire-gold=Gold wire angels-wire-coil-gold=Gold wire coil +gilded-copper-cable=__ITEM__angels-wire-gold__ processed-iron=Processed iron pellet-iron=Iron pellet @@ -465,6 +467,9 @@ electric-mixing-furnace=Electric filtering furnace 1 angels-multi-purpose-furnace-1=Electric filtering furnace 2 angels-multi-purpose-furnace-2=Electric filtering furnace 3 +alloy-processing=Bronze processing +zinc-processing=Brass processing + [technology-description] angels-metallurgy=Machines for advanced metallurgical smelting. @@ -554,6 +559,8 @@ angels-invar-smelting=Advanced processing steps for the production of invar. angels-cobalt-steel-smelting=Advanced processing steps for the production of cobalt steel. angels-nitinol-smelting=Advanced processing steps for the production of nitinol. +alloy-processing= + [tile-name] clay-bricks=Clay path concrete-brick=Concrete slab (grid) diff --git a/angelssmelting/prototypes/buildings/blast-furnace.lua b/angelssmelting/prototypes/buildings/blast-furnace.lua index e442fd089..96cd157f5 100644 --- a/angelssmelting/prototypes/buildings/blast-furnace.lua +++ b/angelssmelting/prototypes/buildings/blast-furnace.lua @@ -52,7 +52,10 @@ data:extend({ name = "smoke", deviation = { 0.1, 0.1 }, frequency = 10, - position = { 2.0, -1.8 }, + north_position = { -2.0, -1.8 }, + south_position = { -2.0, -1.8 }, + east_position = { -2.0, -1.8 }, + west_position = { -2.0, -1.8 }, starting_vertical_speed = 0.08, starting_frame_deviation = 60, }, @@ -259,7 +262,10 @@ data:extend({ name = "smoke", deviation = { 0.1, 0.1 }, frequency = 10, - position = { 2.0, -1.8 }, + north_position = { -2.0, -1.8 }, + south_position = { -2.0, -1.8 }, + east_position = { -2.0, -1.8 }, + west_position = { -2.0, -1.8 }, starting_vertical_speed = 0.08, starting_frame_deviation = 60, }, @@ -466,7 +472,10 @@ data:extend({ name = "smoke", deviation = { 0.1, 0.1 }, frequency = 10, - position = { 2.0, -1.8 }, + north_position = { -2.0, -1.8 }, + south_position = { -2.0, -1.8 }, + east_position = { -2.0, -1.8 }, + west_position = { -2.0, -1.8 }, starting_vertical_speed = 0.08, starting_frame_deviation = 60, }, @@ -672,7 +681,10 @@ data:extend({ name = "smoke", deviation = { 0.1, 0.1 }, frequency = 10, - position = { 2.0, -1.8 }, + north_position = { -2.0, -1.8 }, + south_position = { -2.0, -1.8 }, + east_position = { -2.0, -1.8 }, + west_position = { -2.0, -1.8 }, starting_vertical_speed = 0.08, starting_frame_deviation = 60, }, diff --git a/angelssmelting/prototypes/override/smelting-override-alloy-bronze.lua b/angelssmelting/prototypes/override/smelting-override-alloy-bronze.lua index 6fcd7417d..a01446719 100644 --- a/angelssmelting/prototypes/override/smelting-override-alloy-bronze.lua +++ b/angelssmelting/prototypes/override/smelting-override-alloy-bronze.lua @@ -200,7 +200,6 @@ if angelsmods.trigger.smelting_products["bronze"].plate then order = "c-a", }, }) - OV.add_prereq("alloy-processing-1", "angels-bronze-smelting-1") angelsmods.functions.move_item("bronze-alloy", "angels-alloys-casting", "a[bronze]-b[bronze-alloy]") data.raw["item"]["bronze-alloy"].icon = "__angelssmelting__/graphics/icons/plate-bronze.png" data.raw["item"]["bronze-alloy"].icon_size = 32 @@ -209,7 +208,16 @@ if angelsmods.trigger.smelting_products["bronze"].plate then angelsmods.functions.allow_productivity("angels-plate-bronze") -- alloys shenanigans ------------------------------------------------------- OV.add_prereq("alloy-processing", "angels-bronze-smelting-1") + OV.add_prereq("logistics-2", "angels-bronze-smelting-1") + OV.remove_prereq("chemical-science-pack", "alloy-processing") + OV.remove_prereq("cobalt-processing", "alloy-processing") + OV.remove_prereq("logistics-2", "alloy-processing") + OV.remove_prereq("nitinol-processing", "alloy-processing") + OV.remove_prereq("tungsten-processing", "alloy-processing") + OV.remove_prereq("tungsten-alloy-processing", "alloy-processing") + OV.remove_prereq("zinc-processing", "alloy-processing") if mods["bobpower"] then + OV.remove_prereq("fluid-generator-1", "alloy-processing") OV.add_prereq("fluid-generator-1", "angels-bronze-smelting-1") end end diff --git a/angelssmelting/prototypes/override/smelting-override-alloy-solder.lua b/angelssmelting/prototypes/override/smelting-override-alloy-solder.lua index df3e0f89c..fe1693fd8 100644 --- a/angelssmelting/prototypes/override/smelting-override-alloy-solder.lua +++ b/angelssmelting/prototypes/override/smelting-override-alloy-solder.lua @@ -34,7 +34,9 @@ if angelsmods.trigger.smelting_products["solder"].wire then else OV.add_prereq("electronics", "angels-solder-smelting-1") end + end + if mods["bobassembly"] and settings.startup["bobmods-assembly-electronicmachines"].value then OV.patch_recipes({ { name = "angels-roll-solder-converting", category = "electronics-machine" } }) end diff --git a/angelssmelting/prototypes/override/smelting-override-copper.lua b/angelssmelting/prototypes/override/smelting-override-copper.lua index e1d5acd14..2f2d41f1a 100644 --- a/angelssmelting/prototypes/override/smelting-override-copper.lua +++ b/angelssmelting/prototypes/override/smelting-override-copper.lua @@ -172,7 +172,7 @@ if angelsmods.trigger.smelting_products["copper"].wire then "__angelssmelting__/graphics/icons/wire-copper.png" ) - if mods["bobassembly"] and mods["bobelectronics"] then + if mods["bobassembly"] and settings.startup["bobmods-assembly-electronicmachines"].value then OV.patch_recipes({ { name = "copper-cable", diff --git a/angelssmelting/prototypes/override/smelting-override-glass.lua b/angelssmelting/prototypes/override/smelting-override-glass.lua index b9845bca2..e774d6c92 100644 --- a/angelssmelting/prototypes/override/smelting-override-glass.lua +++ b/angelssmelting/prototypes/override/smelting-override-glass.lua @@ -94,23 +94,10 @@ end -- FIBREGLASS ----------------------------------------------------------------- ------------------------------------------------------------------------------- if angelsmods.trigger.smelting_products["glass"].fibre then - if mods["bobelectronics"] then - else - --[[OV.patch_recipes( - { - { - name = "angels-glass-fiber-board", - results = { - {"!!"}, - {name = "angels-glass-fiber-board", type = "item", amount = 4} - }, - } - } - )]] - end else angelsmods.functions.add_flag("angels-coil-glass-fiber", "hidden") OV.disable_recipe({ "angels-coil-glass-fiber" }) + OV.disable_recipe({ "angels-coil-glass-fiber-fast" }) end ------------------------------------------------------------------------------- @@ -140,6 +127,8 @@ if angelsmods.trigger.smelting_products["glass"].board then }, }, icon_size = 32, + subgroup = "bob-boards", + order = "c-a3[fibreglass-board]", }, }) OV.add_unlock("angels-glass-smelting-2", "angels-glass-fiber-board") @@ -150,6 +139,15 @@ if angelsmods.trigger.smelting_products["glass"].board then OV.remove_unlock("advanced-electronics-2", "fibreglass-board") OV.disable_recipe({ "fibreglass-board" }) end + + if mods["bobassembly"] and settings.startup["bobmods-assembly-electronicmachines"].value then + OV.patch_recipes({ + { + name = "angels-glass-fiber-board", + category = "electronics-with-fluid", + }, + }) + end else OV.disable_recipe({ "angels-glass-fiber-board" }) end diff --git a/angelssmelting/prototypes/override/smelting-override-gold.lua b/angelssmelting/prototypes/override/smelting-override-gold.lua index 5d764933c..6f78fb1db 100644 --- a/angelssmelting/prototypes/override/smelting-override-gold.lua +++ b/angelssmelting/prototypes/override/smelting-override-gold.lua @@ -100,7 +100,7 @@ if angelsmods.trigger.smelting_products["gold"].wire then { type = "item", name = angelsmods.trigger.smelting_products["platinum"].wire and "gilded-copper-cable" or "insulated-cable", - amount = "tinned-copper-cable" or 2, + amount = "tinned-copper-cable", }, }, }, @@ -117,7 +117,7 @@ if angelsmods.trigger.smelting_products["gold"].wire then OV.add_prereq("advanced-electronics-2", "angels-gold-smelting-1") end - if mods["bobassembly"] and mods["bobelectronics"] then + if mods["bobassembly"] and settings.startup["bobmods-assembly-electronicmachines"].value then OV.patch_recipes({ { name = "angels-wire-gold", diff --git a/angelssmelting/prototypes/override/smelting-override-platinum.lua b/angelssmelting/prototypes/override/smelting-override-platinum.lua index d607f614b..aee53fa63 100644 --- a/angelssmelting/prototypes/override/smelting-override-platinum.lua +++ b/angelssmelting/prototypes/override/smelting-override-platinum.lua @@ -76,7 +76,7 @@ if angelsmods.trigger.smelting_products["platinum"].wire then }, }, }) - if mods["bobassembly"] and mods["bobelectronics"] then + if mods["bobassembly"] and settings.startup["bobmods-assembly-electronicmachines"].value then OV.patch_recipes({ { name = "basic-platinated-copper-wire", diff --git a/angelssmelting/prototypes/override/smelting-override-productivity.lua b/angelssmelting/prototypes/override/smelting-override-productivity.lua index 2d2408f37..05b788963 100644 --- a/angelssmelting/prototypes/override/smelting-override-productivity.lua +++ b/angelssmelting/prototypes/override/smelting-override-productivity.lua @@ -41,6 +41,11 @@ angelsmods.functions.allow_productivity("angels-roll-platinum-converting") angelsmods.functions.allow_productivity("angels-mono-silicon-1") angelsmods.functions.allow_productivity("angels-mono-silicon-2") +angelsmods.functions.allow_productivity("angels-plate-glass-1") +angelsmods.functions.allow_productivity("angels-plate-glass-2") +angelsmods.functions.allow_productivity("angels-plate-glass-3") +angelsmods.functions.allow_productivity("angels-coil-glass-fiber") +angelsmods.functions.allow_productivity("angels-coil-glass-fiber-fast") angelsmods.functions.allow_productivity("angels-plate-silver") angelsmods.functions.allow_productivity("angels-wire-coil-silver-converting") diff --git a/angelssmelting/prototypes/override/smelting-override-silver.lua b/angelssmelting/prototypes/override/smelting-override-silver.lua index b9fa99592..8b3ca74a6 100644 --- a/angelssmelting/prototypes/override/smelting-override-silver.lua +++ b/angelssmelting/prototypes/override/smelting-override-silver.lua @@ -167,7 +167,7 @@ if angelsmods.trigger.smelting_products["silver"].wire then end OV.add_prereq("advanced-electronics", "angels-silver-smelting-1") - if mods["bobassembly"] and mods["bobelectronics"] then + if mods["bobassembly"] and settings.startup["bobmods-assembly-electronicmachines"].value then OV.patch_recipes({ { name = "basic-silvered-copper-wire", diff --git a/angelssmelting/prototypes/override/smelting-override-tin.lua b/angelssmelting/prototypes/override/smelting-override-tin.lua index 42b40370f..2d31a9cea 100644 --- a/angelssmelting/prototypes/override/smelting-override-tin.lua +++ b/angelssmelting/prototypes/override/smelting-override-tin.lua @@ -153,19 +153,19 @@ if angelsmods.trigger.smelting_products["tin"].wire then "__bobelectronics__/graphics/icons/tinned-copper-cable.png", "__angelssmelting__/graphics/icons/wire-tin.png" ) + end - if mods["bobassembly"] then - OV.patch_recipes({ - { - name = "basic-tinned-copper-wire", - category = "electronics", - }, - { - name = "angels-wire-coil-tin-converting", - category = "electronics-machine", - }, - }) - end + if mods["bobassembly"] and settings.startup["bobmods-assembly-electronicmachines"].value then + OV.patch_recipes({ + { + name = "basic-tinned-copper-wire", + category = "electronics", + }, + { + name = "angels-wire-coil-tin-converting", + category = "electronics-machine", + }, + }) end else angelsmods.functions.add_flag("angels-wire-tin", "hidden") diff --git a/angelssmelting/prototypes/recipes/smelting-chrome.lua b/angelssmelting/prototypes/recipes/smelting-chrome.lua index 9eda7b92f..25abfceac 100644 --- a/angelssmelting/prototypes/recipes/smelting-chrome.lua +++ b/angelssmelting/prototypes/recipes/smelting-chrome.lua @@ -7,7 +7,7 @@ data:extend({ { type = "recipe", name = "chrome-ore-processing", - category = "ore-processing-3", + category = "ore-processing-4", subgroup = "angels-chrome", energy_required = 2, enabled = false, @@ -23,7 +23,7 @@ data:extend({ { type = "recipe", name = "chrome-processed-processing", - category = "pellet-pressing-3", + category = "pellet-pressing-4", subgroup = "angels-chrome", energy_required = 2, enabled = false, @@ -100,7 +100,7 @@ data:extend({ { type = "recipe", name = "chrome-ore-smelting", - category = "chemical-smelting-2", + category = "chemical-smelting-3", subgroup = "angels-chrome", energy_required = 4, enabled = false, @@ -173,7 +173,7 @@ data:extend({ { type = "recipe", name = "molten-chrome-smelting", - category = "induction-smelting-3", + category = "induction-smelting-4", subgroup = "angels-chrome-casting", energy_required = 4, enabled = false, @@ -189,7 +189,7 @@ data:extend({ { type = "recipe", name = "roll-chrome-casting", - category = "strand-casting-3", + category = "strand-casting-4", subgroup = "angels-chrome-casting", normal = { enabled = false, @@ -256,7 +256,7 @@ data:extend({ { type = "recipe", name = "angels-plate-chrome", - category = "casting-3", + category = "casting-4", subgroup = "angels-chrome-casting", normal = { enabled = false, diff --git a/angelssmelting/prototypes/recipes/smelting-glass.lua b/angelssmelting/prototypes/recipes/smelting-glass.lua index 60c4c0a94..0faff8828 100644 --- a/angelssmelting/prototypes/recipes/smelting-glass.lua +++ b/angelssmelting/prototypes/recipes/smelting-glass.lua @@ -117,6 +117,7 @@ data:extend({ energy_required = 4, ingredients = { { type = "fluid", name = "liquid-molten-glass", amount = 80 }, + { type = "fluid", name = "water", amount = 40 }, }, results = { { type = "item", name = "angels-coil-glass-fiber", amount = 4 }, @@ -127,12 +128,57 @@ data:extend({ energy_required = 4, ingredients = { { type = "fluid", name = "liquid-molten-glass", amount = 100 * intermediatemulti }, + { type = "fluid", name = "water", amount = 40 }, }, results = { { type = "item", name = "angels-coil-glass-fiber", amount = 4 }, }, }, - order = "c[angels-coil-glass-fiber]", + icons = angelsmods.functions.add_number_icon_layer( + angelsmods.functions.get_object_icons("angels-coil-glass-fiber"), + 1, + angelsmods.smelting.number_tint + ), + order = "c[angels-coil-glass-fiber]-a", + crafting_machine_tint = angelsmods.functions.get_fluid_recipe_tint("liquid-molten-glass"), + }, + { + type = "recipe", + name = "angels-coil-glass-fiber-fast", + category = "strand-casting-3", + subgroup = "angels-glass-casting", + normal = { + enabled = false, + energy_required = 2, + ingredients = { + { type = "fluid", name = "liquid-molten-glass", amount = 140 }, + { type = "fluid", name = "liquid-coolant", amount = 40 }, + }, + results = { + { type = "item", name = "angels-coil-glass-fiber", amount = 8 }, + { type = "fluid", name = "liquid-coolant-used", amount = 40, catalyst_amount = 40, temperature = 300 }, + }, + main_product = "angels-coil-glass-fiber", + }, + expensive = { + enabled = false, + energy_required = 2, + ingredients = { + { type = "fluid", name = "liquid-molten-glass", amount = 180 * intermediatemulti }, + { type = "fluid", name = "liquid-coolant", amount = 40 }, + }, + results = { + { type = "item", name = "angels-coil-glass-fiber", amount = 8 }, + { type = "fluid", name = "liquid-coolant-used", amount = 40, catalyst_amount = 40, temperature = 300 }, + }, + main_product = "angels-coil-glass-fiber", + }, + icons = angelsmods.functions.add_number_icon_layer( + angelsmods.functions.get_object_icons("angels-coil-glass-fiber"), + 2, + angelsmods.smelting.number_tint + ), + order = "c[angels-coil-glass-fiber]-b", crafting_machine_tint = angelsmods.functions.get_fluid_recipe_tint("liquid-molten-glass"), }, -- CASTING RESULT @@ -178,11 +224,11 @@ data:extend({ energy_required = 3, ingredients = { { type = "fluid", name = "liquid-molten-glass", amount = 40 }, - { type = "fluid", name = "liquid-molten-lead", amount = 20 }, + { type = "fluid", name = "liquid-molten-lead", amount = 20, catalyst_amount = 20 }, }, results = { { type = "item", name = "angels-plate-glass", amount = 4 }, - { type = "item", name = "solid-lead-oxide", amount = 2 }, + { type = "item", name = "solid-lead-oxide", amount = 2, catalyst_amount = 2 }, }, main_product = "angels-plate-glass", }, @@ -191,11 +237,11 @@ data:extend({ energy_required = 3, ingredients = { { type = "fluid", name = "liquid-molten-glass", amount = 50 * intermediatemulti }, - { type = "fluid", name = "liquid-molten-lead", amount = 20 }, + { type = "fluid", name = "liquid-molten-lead", amount = 20, catalyst_amount = 20 }, }, results = { { type = "item", name = "angels-plate-glass", amount = 4 }, - { type = "item", name = "solid-lead-oxide", amount = 2 }, + { type = "item", name = "solid-lead-oxide", amount = 2, catalyst_amount = 2 }, }, main_product = "angels-plate-glass", }, @@ -216,12 +262,12 @@ data:extend({ energy_required = 2, ingredients = { { type = "fluid", name = "liquid-molten-glass", amount = 40 }, - { type = "fluid", name = "liquid-molten-tin", amount = 20 }, + { type = "fluid", name = "liquid-molten-tin", amount = 20, catalyst_amount = 20 }, { type = "fluid", name = "gas-nitrogen", amount = 20 }, }, results = { { type = "item", name = "angels-plate-glass", amount = 5 }, - { type = "item", name = "ingot-tin", amount = 2 }, + { type = "item", name = "ingot-tin", amount = 2, catalyst_amount = 2 }, }, main_product = "angels-plate-glass", }, @@ -230,12 +276,12 @@ data:extend({ energy_required = 2, ingredients = { { type = "fluid", name = "liquid-molten-glass", amount = 50 * intermediatemulti }, - { type = "fluid", name = "liquid-molten-tin", amount = 20 }, + { type = "fluid", name = "liquid-molten-tin", amount = 20, catalyst_amount = 20 }, { type = "fluid", name = "gas-nitrogen", amount = 20 }, }, results = { { type = "item", name = "angels-plate-glass", amount = 5 }, - { type = "item", name = "ingot-tin", amount = 2 }, + { type = "item", name = "ingot-tin", amount = 2, catalyst_amount = 2 }, }, main_product = "angels-plate-glass", }, diff --git a/angelssmelting/prototypes/recipes/smelting-platinum.lua b/angelssmelting/prototypes/recipes/smelting-platinum.lua index 4530f7582..0d232a895 100644 --- a/angelssmelting/prototypes/recipes/smelting-platinum.lua +++ b/angelssmelting/prototypes/recipes/smelting-platinum.lua @@ -7,7 +7,7 @@ data:extend({ { type = "recipe", name = "platinum-ore-processing", - category = "ore-processing-3", + category = "ore-processing-4", subgroup = "angels-platinum", energy_required = 2, enabled = false, @@ -23,7 +23,7 @@ data:extend({ { type = "recipe", name = "platinum-processed-processing", - category = "pellet-pressing-3", + category = "pellet-pressing-4", subgroup = "angels-platinum", energy_required = 2, enabled = false, @@ -76,7 +76,7 @@ data:extend({ { type = "recipe", name = "platinum-ore-smelting", - category = "blast-smelting-3", + category = "blast-smelting-4", subgroup = "angels-platinum", energy_required = 4, enabled = false, @@ -141,7 +141,7 @@ data:extend({ { type = "recipe", name = "molten-platinum-smelting", - category = "induction-smelting-3", + category = "induction-smelting-4", subgroup = "angels-platinum-casting", energy_required = 4, enabled = false, @@ -157,7 +157,7 @@ data:extend({ { type = "recipe", name = "roll-platinum-casting", - category = "strand-casting-3", + category = "strand-casting-4", subgroup = "angels-platinum-casting", normal = { enabled = false, @@ -223,7 +223,7 @@ data:extend({ { type = "recipe", name = "angels-wire-coil-platinum-casting", - category = "strand-casting-3", + category = "strand-casting-4", subgroup = "angels-platinum-casting", normal = { enabled = false, @@ -302,7 +302,7 @@ data:extend({ { type = "recipe", name = "angels-plate-platinum", - category = "casting-3", + category = "casting-4", subgroup = "angels-platinum-casting", normal = { enabled = false, diff --git a/angelssmelting/prototypes/recipes/smelting-titanium.lua b/angelssmelting/prototypes/recipes/smelting-titanium.lua index 061daa6ec..4ca8c2c0b 100644 --- a/angelssmelting/prototypes/recipes/smelting-titanium.lua +++ b/angelssmelting/prototypes/recipes/smelting-titanium.lua @@ -1,7 +1,7 @@ local intermediatemulti = angelsmods.marathon.intermediatemulti data:extend({ - --CHROME + --TITANIUM -- SMELTING INTERMEDIATE { type = "recipe", diff --git a/angelssmelting/prototypes/recipes/smelting-tungsten.lua b/angelssmelting/prototypes/recipes/smelting-tungsten.lua index e8b5b96fb..c8e0d8803 100644 --- a/angelssmelting/prototypes/recipes/smelting-tungsten.lua +++ b/angelssmelting/prototypes/recipes/smelting-tungsten.lua @@ -1,7 +1,7 @@ local intermediatemulti = angelsmods.marathon.intermediatemulti data:extend({ - --CHROME + --TUNGSTEN -- SMELTING INTERMEDIATE { type = "recipe", diff --git a/angelssmelting/prototypes/technology/smelting-aluminium.lua b/angelssmelting/prototypes/technology/smelting-aluminium.lua index 84cb9466a..76dcdaeda 100644 --- a/angelssmelting/prototypes/technology/smelting-aluminium.lua +++ b/angelssmelting/prototypes/technology/smelting-aluminium.lua @@ -130,7 +130,7 @@ data:extend({ --"angels-metallurgy-4", "ore-processing-3", "angels-aluminium-smelting-2", - "sodium-processing", + "sodium-processing-2", }, effects = { { diff --git a/angelssmelting/prototypes/technology/smelting-chrome.lua b/angelssmelting/prototypes/technology/smelting-chrome.lua index 4f9e21085..3c68c626c 100644 --- a/angelssmelting/prototypes/technology/smelting-chrome.lua +++ b/angelssmelting/prototypes/technology/smelting-chrome.lua @@ -9,8 +9,8 @@ data:extend({ icon_mipmaps = 4, prerequisites = { "ore-electro-whinning-cell", - "angels-metallurgy-3", - "angels-coal-processing-2", + "angels-metallurgy-4", + "angels-coal-processing-3", }, effects = { { @@ -27,11 +27,12 @@ data:extend({ }, }, unit = { - count = 200, + count = 250, ingredients = { { type = "item", name = "automation-science-pack", amount = 1 }, { type = "item", name = "logistic-science-pack", amount = 1 }, { type = "item", name = "chemical-science-pack", amount = 1 }, + { type = "item", name = "production-science-pack", amount = 1 }, }, time = 30, }, @@ -44,8 +45,8 @@ data:extend({ icon_size = 256, icon_mipmaps = 4, prerequisites = { - --"angels-metallurgy-4", - "ore-processing-3", + --"angels-metallurgy-5", + "ore-processing-4", "angels-chrome-smelting-1", }, effects = { @@ -63,12 +64,13 @@ data:extend({ }, }, unit = { - count = 250, + count = 300, ingredients = { { type = "item", name = "automation-science-pack", amount = 1 }, { type = "item", name = "logistic-science-pack", amount = 1 }, { type = "item", name = "chemical-science-pack", amount = 1 }, { type = "item", name = "production-science-pack", amount = 1 }, + { type = "item", name = "utility-science-pack", amount = 1 }, }, time = 30, }, @@ -81,8 +83,8 @@ data:extend({ icon_size = 256, icon_mipmaps = 4, prerequisites = { - --"angels-metallurgy-4", - "strand-casting-3", + --"angels-metallurgy-5", + "strand-casting-4", "angels-chrome-smelting-1", }, effects = { @@ -96,12 +98,13 @@ data:extend({ }, }, unit = { - count = 250, + count = 300, ingredients = { { type = "item", name = "automation-science-pack", amount = 1 }, { type = "item", name = "logistic-science-pack", amount = 1 }, { type = "item", name = "chemical-science-pack", amount = 1 }, { type = "item", name = "production-science-pack", amount = 1 }, + { type = "item", name = "utility-science-pack", amount = 1 }, }, time = 30, }, @@ -115,10 +118,9 @@ data:extend({ icon_mipmaps = 4, prerequisites = { --"angels-metallurgy-5", - "ore-processing-4", + "ore-processing-5", "angels-chrome-smelting-2", - --"angels-sulfur-processing-1", -- it seems rediculous adding this prerequisite to yellow... - "sodium-processing", + "sodium-processing-2", }, effects = { { @@ -143,7 +145,7 @@ data:extend({ }, }, unit = { - count = 300, + count = 350, ingredients = { { type = "item", name = "automation-science-pack", amount = 1 }, { type = "item", name = "logistic-science-pack", amount = 1 }, @@ -163,7 +165,7 @@ data:extend({ icon_mipmaps = 4, prerequisites = { --"angels-metallurgy-5", - "strand-casting-4", + --"strand-casting-4", "angels-chrome-casting-2", }, effects = { @@ -173,7 +175,7 @@ data:extend({ }, }, unit = { - count = 300, + count = 350, ingredients = { { type = "item", name = "automation-science-pack", amount = 1 }, { type = "item", name = "logistic-science-pack", amount = 1 }, diff --git a/angelssmelting/prototypes/technology/smelting-glass.lua b/angelssmelting/prototypes/technology/smelting-glass.lua index 4c4fad24c..6868887c5 100644 --- a/angelssmelting/prototypes/technology/smelting-glass.lua +++ b/angelssmelting/prototypes/technology/smelting-glass.lua @@ -81,11 +81,11 @@ data:extend({ prerequisites = { --"angels-metallurgy-4", "powder-metallurgy-4", - --[["strand-casting-1",]] + "strand-casting-3", "angels-glass-smelting-2", "angels-aluminium-smelting-2", "angels-tin-casting-3", - "sodium-processing", + "sodium-processing-2", --"angels-nitrogen-processing-1" }, effects = { @@ -101,10 +101,10 @@ data:extend({ type = "unlock-recipe", recipe = "angels-plate-glass-3", }, - --[[{ + { type = "unlock-recipe", - recipe = "angels-coil-glass-fiber" - },]] + recipe = "angels-coil-glass-fiber-fast", + }, }, unit = { count = 250, diff --git a/angelssmelting/prototypes/technology/smelting-gold.lua b/angelssmelting/prototypes/technology/smelting-gold.lua index 62a423f95..eabfb54fd 100644 --- a/angelssmelting/prototypes/technology/smelting-gold.lua +++ b/angelssmelting/prototypes/technology/smelting-gold.lua @@ -139,7 +139,7 @@ data:extend({ --"angels-metallurgy-5", "ore-processing-4", "angels-gold-smelting-2", - "sodium-processing", + "sodium-processing-2", }, effects = { { diff --git a/angelssmelting/prototypes/technology/smelting-platinum.lua b/angelssmelting/prototypes/technology/smelting-platinum.lua index 5414d4638..75d0c185b 100644 --- a/angelssmelting/prototypes/technology/smelting-platinum.lua +++ b/angelssmelting/prototypes/technology/smelting-platinum.lua @@ -9,7 +9,7 @@ data:extend({ icon_mipmaps = 4, prerequisites = { "ore-electro-whinning-cell", - "angels-metallurgy-3", + "angels-metallurgy-4", }, effects = { { @@ -30,11 +30,12 @@ data:extend({ }, }, unit = { - count = 200, + count = 250, ingredients = { { type = "item", name = "automation-science-pack", amount = 1 }, { type = "item", name = "logistic-science-pack", amount = 1 }, { type = "item", name = "chemical-science-pack", amount = 1 }, + { type = "item", name = "production-science-pack", amount = 1 }, }, time = 30, }, @@ -47,8 +48,8 @@ data:extend({ icon_size = 256, icon_mipmaps = 4, prerequisites = { - --"angels-metallurgy-4", - "ore-processing-3", + --"angels-metallurgy-5", + "ore-processing-4", "angels-platinum-smelting-1", "angels-sulfur-processing-1", }, @@ -67,12 +68,13 @@ data:extend({ }, }, unit = { - count = 250, + count = 300, ingredients = { { type = "item", name = "automation-science-pack", amount = 1 }, { type = "item", name = "logistic-science-pack", amount = 1 }, { type = "item", name = "chemical-science-pack", amount = 1 }, { type = "item", name = "production-science-pack", amount = 1 }, + { type = "item", name = "utility-science-pack", amount = 1 }, }, time = 30, }, @@ -85,8 +87,8 @@ data:extend({ icon_size = 256, icon_mipmaps = 4, prerequisites = { - --"angels-metallurgy-4", - "strand-casting-3", + --"angels-metallurgy-5", + "strand-casting-4", "angels-platinum-smelting-1", "angels-copper-casting-3", }, @@ -109,12 +111,13 @@ data:extend({ }, }, unit = { - count = 250, + count = 300, ingredients = { { type = "item", name = "automation-science-pack", amount = 1 }, { type = "item", name = "logistic-science-pack", amount = 1 }, { type = "item", name = "chemical-science-pack", amount = 1 }, { type = "item", name = "production-science-pack", amount = 1 }, + { type = "item", name = "utility-science-pack", amount = 1 }, }, time = 30, }, @@ -128,10 +131,9 @@ data:extend({ icon_mipmaps = 4, prerequisites = { --"angels-metallurgy-5", - "ore-processing-4", + "ore-processing-5", "angels-platinum-smelting-2", - "chlorine-processing-1", -- it seems rediculous adding this prerequisite to yellow... - "angels-nitrogen-processing-2", -- it seems rediculous adding this prerequisite to yellow... + "angels-nitrogen-processing-4", }, effects = { { @@ -152,7 +154,7 @@ data:extend({ }, }, unit = { - count = 300, + count = 350, ingredients = { { type = "item", name = "automation-science-pack", amount = 1 }, { type = "item", name = "logistic-science-pack", amount = 1 }, @@ -172,7 +174,7 @@ data:extend({ icon_mipmaps = 4, prerequisites = { --"angels-metallurgy-5", - "strand-casting-4", + --"strand-casting-4", "angels-platinum-casting-2", }, effects = { @@ -186,7 +188,7 @@ data:extend({ }, }, unit = { - count = 300, + count = 350, ingredients = { { type = "item", name = "automation-science-pack", amount = 1 }, { type = "item", name = "logistic-science-pack", amount = 1 }, diff --git a/angelssmelting/prototypes/technology/smelting-silver.lua b/angelssmelting/prototypes/technology/smelting-silver.lua index 3273a5799..c99475fee 100644 --- a/angelssmelting/prototypes/technology/smelting-silver.lua +++ b/angelssmelting/prototypes/technology/smelting-silver.lua @@ -131,7 +131,7 @@ data:extend({ --"angels-metallurgy-4", "ore-processing-3", "angels-silver-smelting-2", - "sodium-processing", + "sodium-processing-2", }, effects = { { diff --git a/angelssmelting/prototypes/technology/smelting-titanium.lua b/angelssmelting/prototypes/technology/smelting-titanium.lua index f86be4acc..464b69927 100644 --- a/angelssmelting/prototypes/technology/smelting-titanium.lua +++ b/angelssmelting/prototypes/technology/smelting-titanium.lua @@ -173,7 +173,7 @@ data:extend({ "angels-titanium-casting-2", "angels-tin-smelting-3", "angels-aluminium-smelting-3", - "angels-chrome-smelting-2", + "angels-chrome-smelting-1", "angels-cobalt-smelting-2", }, effects = {