diff --git a/README.md b/README.md index 7b79234..d530431 100644 --- a/README.md +++ b/README.md @@ -2,20 +2,18 @@ **Compatibility with Space Age is explicitly excluded until someone integrates it nicely.** -# Mod +# Aluminum -Adds aluminum, alumina, alloys, and more to the base game. +Adds salt, chlorine, and other compounds to the game. Changes advanced circuit production and several other things. -## Created by +This mod adds more complexity to a vanailla factorio game. It pairs well with any other BZ mods, including the electronics modpack. With Graphite & Diamonds, carbon fiber is enabled as well. As always, the more BZ mods you add the more complex the game will become. -- [brevven](https://mods.factorio.com/user/brevven) (code, design, graphics) - -## Thanks to +## Credits - Brevven ([Original mod](https://mods.factorio.com/mod/bzaluminum)) +- [cackling fiend](https://mods.factorio.com/user/cackling.fiend) (Update to 2.0) - [snouz](https://github.com/snouz) (logo inspiration, ore graphics templates) - FreeSVG/OpenClipart for spark plug: https://freesvg.org/spark-plug-vector-image - Krastorio2 team for automation-core icons (Licensed under GNU LGPL v3.0) -- [cackling fiend](https://mods.factorio.com/user/cackling.fiend) (Update to 2.0) ### Compatibility - [U.N.Owen](https://mods.factorio.com/user/U.N.Owen) diff --git a/bzaluminum2/aluminum-burner-phase.lua b/bzaluminum2/aluminum-burner-phase.lua index 00a4a50..28fb76d 100644 --- a/bzaluminum2/aluminum-burner-phase.lua +++ b/bzaluminum2/aluminum-burner-phase.lua @@ -17,10 +17,19 @@ if not mods.Krastorio2 and not mods["aai-industry"] then util.add_effect("electronics", { type = "unlock-recipe", recipe = "electronic-circuit" }) util.add_effect("electronics", { type = "unlock-recipe", recipe = "inserter" }) util.add_effect("electronics", { type = "unlock-recipe", recipe = "long-handed-inserter" }) + util.remove_recipe_effect("electronics", "lab") util.remove_recipe_effect("automation", "long-handed-inserter") util.set_enabled("electronic-circuit", false) util.set_enabled("inserter", false) util.add_prerequisite("logistic-science-pack", "electronics") + util.remove_prerequisite("automation-science-pack", "electronics") + util.add_prerequisite("copper-processing", "automation-science-pack") + util.remove_prerequisite("automation-science-pack", "electronics") + util.add_effect("steam-power", { type = "unlock-recipe", recipe = "lab" }) + util.remove_prerequisite("fast-inserter", "automation-science-pack") + util.add_prerequisite("fast-inserter", "electronics") + util.remove_prerequisite("lamp", "automation-science-pack") + util.add_prerequisite("lamp", "electronics") end util.replace_ingredient("lab", "copper-plate", "aluminum-plate") diff --git a/bzaluminum2/aluminum-enriched.lua b/bzaluminum2/aluminum-enriched.lua index c8ebd51..160f945 100644 --- a/bzaluminum2/aluminum-enriched.lua +++ b/bzaluminum2/aluminum-enriched.lua @@ -100,7 +100,7 @@ data:extend( results = { {type = "fluid", name = "water", amount = 90, catalyst_amount = 90}, - mods.bzsilicon and util.me.byproduct() and {type = "item", name = "silica", amount = 1} or + mods["bzsilicon2"] and util.me.byproduct() and {type = "item", name = "silica", amount = 1} or {type = "item", name = "stone", probability = 0.40, amount = 1}, {type = "item", name = "aluminum-ore", probability = 0.10, amount = 1}, }, diff --git a/bzaluminum2/aluminum-ore.lua b/bzaluminum2/aluminum-ore.lua index 304bccb..a425bbb 100644 --- a/bzaluminum2/aluminum-ore.lua +++ b/bzaluminum2/aluminum-ore.lua @@ -26,7 +26,7 @@ data:extend({ minable = { hardness = 1, - mining_particle = mods.bztitanium and "titanium-ore-particle" or "iron-ore-particle", + mining_particle = mods["bztitanium2"] and "titanium-ore-particle" or "iron-ore-particle", mining_time = 1, result = "aluminum-ore" }, diff --git a/bzaluminum2/aluminum-recipe-final-stacking.lua b/bzaluminum2/aluminum-recipe-final-stacking.lua index c21240e..3ff95eb 100644 --- a/bzaluminum2/aluminum-recipe-final-stacking.lua +++ b/bzaluminum2/aluminum-recipe-final-stacking.lua @@ -11,7 +11,7 @@ if deadlock then deadlock.add_stack("spark-plug", "__bzaluminum2__/graphics/icons/stacked/spark-plug-stacked.png" , "deadlock-stacking-2", 128) deadlock.add_stack("aluminum-6061", "__bzaluminum2__/graphics/icons/stacked/aluminum-6061-stacked.png" , "deadlock-stacking-2", 128) deadlock.add_stack("aluminum-2219", "__bzaluminum2__/graphics/icons/stacked/aluminum-2219-stacked.png" , "deadlock-stacking-3", 128) - if mods.bztitanium then + if mods["bztitanium2"] then deadlock.add_stack("ti-sapphire", "__bzaluminum2__/graphics/icons/stacked/ti-sapphire-stacked.png" , "deadlock-stacking-3", 128) end @@ -45,7 +45,7 @@ if deadlock_crating then deadlock_crating.add_crate("spark-plug", "deadlock-crating-2") deadlock_crating.add_crate("aluminum-6061", "deadlock-crating-2") deadlock_crating.add_crate("aluminum-2219", "deadlock-crating-3") - if mods.bztitanium then + if mods["bztitanium2"] then deadlock_crating.add_crate("ti-sapphire", "deadlock-crating-3") end if mods.Krastorio2 then diff --git a/bzaluminum2/aluminum-recipe-updates-lds.lua b/bzaluminum2/aluminum-recipe-updates-lds.lua index 59ed9c9..5e4121c 100644 --- a/bzaluminum2/aluminum-recipe-updates-lds.lua +++ b/bzaluminum2/aluminum-recipe-updates-lds.lua @@ -5,7 +5,7 @@ util.remove_ingredient("low-density-structure", "copper-plate") util.remove_ingredient("low-density-structure", "steel-plate") util.remove_ingredient("low-density-structure", "titanium-plate") local amount = 20 -if mods.bzzirconium then +if mods["bzzirconium2"] then if mods.Krastorio2 and data.raw.item["cermet"] then amount = 6 else @@ -22,7 +22,7 @@ if mods["space-exploration"] then util.remove_ingredient("se-low-density-structure-beryllium", "copper-plate") util.remove_ingredient("se-low-density-structure-beryllium", "steel-plate") util.remove_ingredient("se-low-density-structure-beryllium", "titanium-plate") - if mods.bzzirconium then + if mods["bzzirconium2"] then amount = 2 else amount = 10 diff --git a/bzaluminum2/aluminum-recipe-updates.lua b/bzaluminum2/aluminum-recipe-updates.lua index 946484f..921c967 100644 --- a/bzaluminum2/aluminum-recipe-updates.lua +++ b/bzaluminum2/aluminum-recipe-updates.lua @@ -28,7 +28,7 @@ util.add_ingredient("tank", "spark-plug", 1) util.replace_some_ingredient("artillery-shell", "explosives", 4, "aluminum-2219", 4) -if mods.bztitanium then +if mods["bztitanium2"] then util.remove_ingredient("laser-turret", "diamond") util.add_ingredient("laser-turret", "ti-sapphire", 1) util.add_ingredient("obelisk-of-light", "ti-sapphire", 1) diff --git a/bzaluminum2/aluminum-recipe.lua b/bzaluminum2/aluminum-recipe.lua index 20a9cb4..0bb653d 100644 --- a/bzaluminum2/aluminum-recipe.lua +++ b/bzaluminum2/aluminum-recipe.lua @@ -5,12 +5,12 @@ local futil = require("util"); local alumina_results = {} -if mods.bzsilicon and util.me.byproduct() and not mods.Krastorio2 then +if mods["bzsilicon2"] and util.me.byproduct() and not mods.Krastorio2 then alumina_results ={ {type="item", name = "alumina", amount=1, probability=0.95}, {type="item", name = "silica", amount=1, probability=0.05}, } -elseif mods.bzsilicon and util.me.byproduct() and mods.Krastorio2 then +elseif mods["bzsilicon2"] and util.me.byproduct() and mods.Krastorio2 then alumina_results ={ {type="item", name = "alumina", amount=5, probability=0.95}, {type="item", name = "silica", amount=1, probability=0.25}, @@ -94,7 +94,7 @@ data:extend({ }, }) -if mods.bzsilicon then +if mods["bzsilicon2"] then landfill = futil.table.deepcopy(data.raw.recipe["landfill"]) landfill.name = "landfill-silica" data:extend({landfill}) @@ -247,7 +247,7 @@ local plug = { {type="item", name="copper-plate", amount=1}, {type="item", name="iron-plate", amount=1}, -- replace with tungsten plate later } -if mods.bzzirconium then +if mods["bzzirconium2"] then table.insert(plug, {type="item", name="zirconia", amount=1}) end data:extend({ @@ -273,7 +273,7 @@ data:extend({ }) util.add_effect("engine", { type = "unlock-recipe", recipe = "spark-plug" }) util.replace_ingredient("spark-plug", "iron-plate", "tungsten-plate") -if mods.bzzirconium then +if mods["bzzirconium2"] then util.add_prerequisite("engine", "zirconia-processing") end @@ -282,7 +282,7 @@ local aluminum_6061 = {} aluminum_6061["aluminum-plate"] = 18 aluminum_6061["copper-plate"] = 1 aluminum_6061["iron-plate"] = 1 -if mods.bzsilicon or mods.Krastorio2 then +if mods["bzsilicon2"] or mods.Krastorio2 then aluminum_6061[mods.Krastorio2 and "kr-silicon" or "silicon"] = 1 aluminum_6061["aluminum-plate"] = aluminum_6061["aluminum-plate"] - 1 end @@ -336,12 +336,12 @@ util.add_prerequisite("basic-alloys", "kr-silicon-processing") local aluminum_2219 = {} aluminum_2219["aluminum-plate"] = 16 aluminum_2219["copper-plate"] = 4 -if mods.bztitanium then +if mods["bztitanium2"] then aluminum_2219["titanium-plate"] = 2 aluminum_2219["aluminum-plate"] = aluminum_2219["aluminum-plate"] - 1 aluminum_2219["copper-plate"] = aluminum_2219["copper-plate"] - 1 end -if mods.bzzirconium then +if mods["bzzirconium2"] then aluminum_2219["zirconium-plate"] = 1 aluminum_2219["aluminum-plate"] = aluminum_2219["aluminum-plate"] - 1 end @@ -392,7 +392,7 @@ end util.add_prerequisite("aerospace-alloys", "titanium-processing") util.add_prerequisite("aerospace-alloys", "zirconia-processing") -if mods.bztitanium then +if mods["bztitanium2"] then data:extend({ { type = "item", @@ -423,7 +423,7 @@ if mods.bztitanium then }) util.add_effect("laser", {type="unlock-recipe", recipe="ti-sapphire"}) util.add_prerequisite("laser", util.titanium_processing) - if mods.bzcarbon then + if mods["bzcarbon"] then util.add_ingredient("ti-sapphire", "diamond", 1, {force=true}) util.add_product("ti-sapphire", {type="item", name="diamond", amount=1, probability=0.8, catalyst_amount=1}, {force=true}) end diff --git a/bzaluminum2/changelog.txt b/bzaluminum2/changelog.txt index 9c86971..f243d81 100644 --- a/bzaluminum2/changelog.txt +++ b/bzaluminum2/changelog.txt @@ -1,406 +1,15 @@ --------------------------------------------------------------------------------------------------- -Version: 0.4.28 -Date: 2024-03-15 - Fixes: - - With Bob's Electronics, fixed soft locks on lab recipe when used without Natural Gas +Version: 2.0.2 +Date: 22.10.2025 + Bug Fixes: + - Fix technologies --------------------------------------------------------------------------------------------------- -Version: 0.4.27 -Date: 2024-02-17 - Fixes: - - Prevent possible soft lock with Warptorio 2 Expansion +Version: 2.0.1 +Date: 21.10.2025 Changes: - - Some improved recipe compatibility for Xenos mods + - Switch to bz mods forks --------------------------------------------------------------------------------------------------- -Version: 0.4.26 -Date: 2023-12-26 +Version: 2.0.0 +Date: 18.10.2025 Changes: - - Copper processing tech ignores science multiplier - Localization: - - ja updates by Sakuro ---------------------------------------------------------------------------------------------------- -Version: 0.4.25 -Date: 2023-05-16 - Changes: - - Improved compatibility with bob's electronics ---------------------------------------------------------------------------------------------------- -Version: 0.4.24 -Date: 2023-03-13 - Changes: - - Now has a dependency on BZ Mods Bridge (bz-dsr-bridge) - - Trees will spawn less often on resources - Fixes: - - Fix compatibility issue with Bob's Power ---------------------------------------------------------------------------------------------------- -Version: 0.4.23 -Date: 2023-02-21 - Fixes: - - Fix startup when used with both Warptorio2 Expansion and Krastorio2 ---------------------------------------------------------------------------------------------------- -Version: 0.4.22 -Date: 2023-02-12 - Fixes: - - Improved compatibility with Warptorio2Expansion, thanks to Marwes - Changes: - - Improved Crafting efficiency compatibility, thanks to nihilistzsche ---------------------------------------------------------------------------------------------------- -Version: 0.4.21 -Date: 2023-02-03 - Features: - - Compatibility with Warptorio2Expansion, can now repair broken lab to unlock research. - No copper cable or circuits required. ---------------------------------------------------------------------------------------------------- -Version: 0.4.20 -Date: 2023-01-17 - Features: - - (Beta) Crafting efficiency compatibility - Localization: - - ru updates by CV514 ---------------------------------------------------------------------------------------------------- -Version: 0.4.19 -Date: 2022-12-30 - Changes: - - Textplates: Copper textplates have a tech, and are made from copper ---------------------------------------------------------------------------------------------------- -Version: 0.4.18 -Date: 2022-12-24 - Localization: - - zh-CN by sunnytan53 - Changes: - - SE ingot in delivery cannon - - When used without Titanium, use aluminum in flying robot frames. ---------------------------------------------------------------------------------------------------- -Version: 0.4.17 -Date: 2022-11-21 - Fixes: - - Rollback mod name change from 0.4.16. This broke the mod name when the mod was not enabled. ---------------------------------------------------------------------------------------------------- -Version: 0.4.16 -Date: 2022-11-20 - Changes: - - When used with Aluminium Localization mod, mod name changes as well - Fixes: - - K2+GDIW prod module fix ---------------------------------------------------------------------------------------------------- -Version: 0.4.15 -Date: 2022-09-29 - Changes: - - Space Exploration - delivery cannon recipes for some alloys ---------------------------------------------------------------------------------------------------- -Version: 0.4.14 -Date: 2022-08-25 - Changes: - - Space Exploration ore generation rebalance - more aluminum, a little less copper ---------------------------------------------------------------------------------------------------- -Version: 0.4.13 -Date: 2022-08-23 - Changes: - - Minor tech tree tweaks for some mod loadouts. - - deep core mining focused recipe balance tweak - - Recipe compatibility with new Advanced Belts mod ---------------------------------------------------------------------------------------------------- -Version: 0.4.12 -Date: 2022-08-22 - Fixes: - - Attempt to fix tech tree loop with Aluminum + K2 + Bitumen + Bobs etc - Localization: - - Ja updates by Sakuro ---------------------------------------------------------------------------------------------------- -Version: 0.4.11 -Date: 2022-08-18 - Fixes: - - Fix multiple prerequisite issue ---------------------------------------------------------------------------------------------------- -Version: 0.4.10 -Date: 2022-08-17 - Fixes: - - SE: Disable matter recipes at start - Changes: - - Further compatibility with bob's assemblers - - Minor nanobots compatibility tech tree fix - - Minor Renai Transportation compatibility tweak ---------------------------------------------------------------------------------------------------- -Version: 0.4.9 -Date: 2022-08-16 - Features: - - Support for SE matter fusion and SE+K2 matter liberation - Changes: - - With Tin, Can now bypass aluminum in bronze recipe if desired. ---------------------------------------------------------------------------------------------------- -Version: 0.4.8 -Date: 2022-08-15 - Fixes: - - Fix a tech loop when using Aluminum with Krastorio 2 and some of Bob's mods ---------------------------------------------------------------------------------------------------- -Version: 0.4.6 -Date: 2022-08-15 - Fixes: - - When grinding Ti-sapphires, returned diamonds no longer affected by prod modules - Changes: - - Industrial display plates compatibility - - More minor mod compatibility - various high-tier belts and inserters including - Bob's logistics, ultimate belts - Features: - - The engineer starts with a single burner inserter. Yay! (Setting to turn this off.) - This allows players to create aluminum plates without being forced to manually move items - from one machine to another. ---------------------------------------------------------------------------------------------------- -Version: 0.4.5 -Date: 2022-08-11 - Fixes: - - SE: Fix delivery cannon recipes post 0.4.0 ---------------------------------------------------------------------------------------------------- -Version: 0.4.4 -Date: 2022-08-10 - Changes: - - Cable item subgroup - - Rocket Silo Construction - initial compatibility - - With S&S mod, Silica landfill recipe icon shows silica ---------------------------------------------------------------------------------------------------- -Version: 0.4.3 -Date: 2022-08-10 - Changes: - - Lamp only requires 1 aluminum cable now. - Fixes: - - Some more general compatibility fixes, thanks to U.N.Owen, including improved compatibility - with their fork of Research Desk. ---------------------------------------------------------------------------------------------------- -Version: 0.4.2 -Date: 2022-08-08 - Fixes: - - Fix due to lua treating string 'false' as truthy and Factorio treating 'false' as falsy. - Fixes minor wierdness from 0.4.0 with some mods like switch button and filter combinator. ---------------------------------------------------------------------------------------------------- -Version: 0.4.1 -Date: 2022-08-07 - Fixes: - - Avoid strange situations related to previous change, eg. where copper wire recipe requires - aluminum plate. ---------------------------------------------------------------------------------------------------- -Version: 0.4.0 -Date: 2022-08-07 - Changes: - - All mods with early recipes requiring copper or electronic circuits should be more generally - compatible now. ---------------------------------------------------------------------------------------------------- -Version: 0.3.16 -Date: 2022-08-05 - Changes: - - Some more updated recipes for ScienceCostTweaker - blue science - - VTK deepcore mining, one more missing string ---------------------------------------------------------------------------------------------------- -Version: 0.3.15 -Date: 2022-08-02 - Changes: - - Transport Drones recipes - - Asteroid Mining compatibility ---------------------------------------------------------------------------------------------------- -Version: 0.3.14 -Date: 2022-07-31 - Localization: - - cs locale thanks to RiCZrd - Changes: - - Ti-sapphire recipe allows prod modules now ---------------------------------------------------------------------------------------------------- -Version: 0.3.13 -Date: 2022-07-20 - Changes: - - More laser mod compatibility, including modular turrets ---------------------------------------------------------------------------------------------------- -Version: 0.3.12 -Date: 2022-07-14 - Fixes: - - K2: Fix advanced crafting icons ---------------------------------------------------------------------------------------------------- -Version: 0.3.11 -Date: 2022-07-11 - Fixes: - - SE: Fix rocket silo recipe ---------------------------------------------------------------------------------------------------- -Version: 0.3.10 -Date: 2022-07-11 - Fixes: - - Fix issue from last update ---------------------------------------------------------------------------------------------------- -Version: 0.3.9 -Date: 2022-07-11 - Changes: - - ScienceCostTweaker compatibility - prevent initial deadlock around copper ---------------------------------------------------------------------------------------------------- -Version: 0.3.8 -Date: 2022-07-11 - Changes: - - Double Furnace recipe ---------------------------------------------------------------------------------------------------- -Version: 0.3.7 -Date: 2022-07-10 - Changes: - - Leighzer's scrapyards compatibility - Localization: - - ru l10n thanks to Pergamum663 ---------------------------------------------------------------------------------------------------- -Version: 0.3.6 -Date: 2022-07-09 - Changes: - - Temporary en locale strings for procedural deep core mining recipes - - K2: advanced assembler enriched aluminum --> cable recipe ---------------------------------------------------------------------------------------------------- -Version: 0.3.5 -Date: 2022-07-06 - Localization: - - Japanese (ja) l10n updates thanks to Sakuro - Changes: - - Tweak to ore entity graphics. ---------------------------------------------------------------------------------------------------- -Version: 0.3.4 -Date: 2022-07-04 - Changes: - - AAI: recipe requires alumina, in foundry. Can be handcrafted. - - Sand & Glass: recipe requires alumina, in foundry. - - 248K: motlen glass requires alumina - - K2 Shelter uses aluminum cable ---------------------------------------------------------------------------------------------------- -Version: 0.3.3 -Date: 2022-07-03 - Fixes: - - SE: Prod modules molten recipe - Changes: - - SE: No byproduct in molten recipe, regardless of setting. - - SE: Ingot time balanced ---------------------------------------------------------------------------------------------------- -Version: 0.3.2 -Date: 2022-07-02 - Fixes: - - SE K2 subgroup fix, more pyroflux tech fixes. ---------------------------------------------------------------------------------------------------- -Version: 0.3.1 -Date: 2022-07-01 - Changes: - - Minor SE tweaks including pyroflux tech change. - Features: - - Add option to turn off byproduct. (This setting will show up in other resource mods soon). ---------------------------------------------------------------------------------------------------- -Version: 0.3.0 -Date: 2022-07-01 - Changes: - - Compatible with Space Exploration 0.6 ---------------------------------------------------------------------------------------------------- -Version: 0.2.1 -Date: 2022-06-26 - Fixes: - - K2: Advanced crafting recipe for aluminum cable now hidden from handcrafting ---------------------------------------------------------------------------------------------------- -Version: 0.2.0 -Date: 2022-06-26 - Fixes: - - Beta support for 248k. This is an initial release and may change in the future - Aluminum items merged into one. Multiple production chains. ---------------------------------------------------------------------------------------------------- -Version: 0.1.10 -Date: 2022-06-23 - Fixes: - - K2: Advanced crafting recipe for aluminum cable in correct subgroup ---------------------------------------------------------------------------------------------------- -Version: 0.1.9 -Date: 2022-06-23 - Features: - - K2: Advanced crafting recipe for aluminum cable ---------------------------------------------------------------------------------------------------- -Version: 0.1.8 -Date: 2022-06-19 - Fixes: - - Enriched aluminum can be stacked now ---------------------------------------------------------------------------------------------------- -Version: 0.1.7 -Date: 2022-06-09 - Changes: - - SE: Vulcanite recipes can use prod modules. ---------------------------------------------------------------------------------------------------- -Version: 0.1.6 -Date: 2022-06-05 - Localization: - - Japanese (ja) l10n thanks to Sakuro - - German (de) l10n thanks to Yokmp ---------------------------------------------------------------------------------------------------- -Version: 0.1.5 -Date: 2022-05-30 - Localization: - - Enable alternate spelling for locale via other mods. - Changes: - - Compat with large electric pole ---------------------------------------------------------------------------------------------------- -Version: 0.1.4 -Date: 2022-03-16 - Fixes: - - Fix possible deadlock with glass in SE - - Can now prod module alumina from enriched aluminum ---------------------------------------------------------------------------------------------------- -Version: 0.1.3 -Date: 2022-02-27 - Fixes: - - K2 stacked icon fix - Changes: - - More train compatibility ---------------------------------------------------------------------------------------------------- -Version: 0.1.2 -Date: 2022-02-25 - Changes: - - Recipe updates for warehouses, storehouses, etc. - - Other minor compatibility updates ---------------------------------------------------------------------------------------------------- -Version: 0.1.1 -Date: 2022-02-24 - Changes: - - More train compatibility ---------------------------------------------------------------------------------------------------- -Version: 0.1.0 -Date: 2022-02-22 - Changes: - - Jetpack: changed progression a bit both with and without Titanium active. - - Artillery shells now require 2219 aluminum alloy (and slightly less explosives). - Features: - - SE Space Trains compatibility & Space trains compatibility - - Now officially in beta. Will be added to "Very BZ" in the coming weeks. ---------------------------------------------------------------------------------------------------- -Version: 0.0.7 -Date: 2022-02-22 - Localization: - - Korean (ko) l10n, thanks to x2605 ---------------------------------------------------------------------------------------------------- -Version: 0.0.6 -Date: 2022-02-17 - Changes: - - AAI - Tech tree tweaks ---------------------------------------------------------------------------------------------------- -Version: 0.0.5 -Date: 2022-02-14 - Changes: - - Change cost of ACSR cable a bit (slightly cheaper overall). - - Tweak costs of power poles and substations to be cheaper. - - Car requires 6061 aluminum alloy - - Tech tree tweaks ---------------------------------------------------------------------------------------------------- -Version: 0.0.4 -Date: 2022-02-13 - Fixes: - - K2 medium and up electric poles now use ACSR Cable - - SE electric pole recycling recipes ---------------------------------------------------------------------------------------------------- -Version: 0.0.3 -Date: 2022-02-12 - Fixes: - - Recipe list mod setting fixes - Changes: - - Minor SE recipe updates - - More recipe compatibility tweaks ---------------------------------------------------------------------------------------------------- -Version: 0.0.2 -Date: 2022-02-02 - Fixes: - - Tech tree deadlock fix for K2+AAI ---------------------------------------------------------------------------------------------------- -Version: 0.0.1 -Date: 2022-01-31 - Features: - - Alpha release. Adds aluminum, alumina, cables, alloys, etc. - - Compatible with Krastorio 2 - - Compatible with Space Exploration + - Update to Factorio 2.0 \ No newline at end of file diff --git a/bzaluminum2/compatibility/248k-recipes.lua b/bzaluminum2/compatibility/248k-recipes.lua index 30031ea..58dc490 100644 --- a/bzaluminum2/compatibility/248k-recipes.lua +++ b/bzaluminum2/compatibility/248k-recipes.lua @@ -5,7 +5,7 @@ data:extend({ { name = 'el_purify_aluminum_recipe', type = 'recipe', - enabled = 'false', + enabled = false, category = 'el_purifier_category', main_product = 'el_dirty_water', ingredients = { diff --git a/bzaluminum2/data-final-fixes.lua b/bzaluminum2/data-final-fixes.lua index 9b205c1..f29e22b 100644 --- a/bzaluminum2/data-final-fixes.lua +++ b/bzaluminum2/data-final-fixes.lua @@ -24,7 +24,7 @@ util.add_to_product("vtk-deepcore-mining-ore-chunk-refining", "vtk-deepcore-mini util.add_to_product("vtk-deepcore-mining-ore-chunk-refining-no-uranium", "vtk-deepcore-mining-aluminum-ore-chunk", 10) util.set_vtk_dcm_ingredients() -if mods.bzsilicon then +if mods["bzsilicon2"] then for i, entity in pairs(data.raw.furnace) do if entity.result_inventory_size ~= nil and entity.result_inventory_size < 2 and util.contains(entity.crafting_categories, "smelting") then entity.result_inventory_size = 2 @@ -32,7 +32,7 @@ for i, entity in pairs(data.raw.furnace) do end end -if mods.bztitanium then +if mods["bztitanium2"] then util.add_ingredient("w93-modular-gun-plaser", "ti-sapphire", 1) util.add_ingredient("w93-modular-gun-tlaser", "ti-sapphire", 1) util.add_ingredient("w93-modular-gun-beam", "ti-sapphire", 1) diff --git a/bzaluminum2/data-updates.lua b/bzaluminum2/data-updates.lua index 6cd5b8c..c92afa0 100644 --- a/bzaluminum2/data-updates.lua +++ b/bzaluminum2/data-updates.lua @@ -14,7 +14,7 @@ require("compatibility/rsc") require("compatibility/crafting-efficiency") local util = require("data-util") -if data.raw.resource["copper-ore"] and not mods["bzgold"] then +if data.raw.resource["copper-ore"] and not mods["bzgold2"] then if mods["space-exploration"] then -- decrease richness of copper a bit data.raw.resource["copper-ore"].autoplace.richness_expression = diff --git a/bzaluminum2/data-util.lua b/bzaluminum2/data-util.lua index 99b575a..e69f0d5 100644 --- a/bzaluminum2/data-util.lua +++ b/bzaluminum2/data-util.lua @@ -44,7 +44,7 @@ if get_setting("bz-recipe-bypass") then end function util.is_foundry() - return mods.bzfoundry and not me.get_setting("bzfoundry-minimal") + return mods.bzfoundry2 and not me.get_setting("bzfoundry-minimal") end function should_force(options) @@ -1188,8 +1188,8 @@ function util.replace_ingredients_prior_to(tech, old, new, multiplier) end util.remove_prior_unlocks(tech, old) for i, recipe in pairs(data.raw.recipe) do - if (recipe.enabled and recipe.enabled ~= 'false') - and (not recipe.hidden or recipe.hidden == 'true') -- probably don't want to change hidden recipes + if (recipe.enabled and recipe.enabled ~= false) + and (not recipe.hidden or recipe.hidden == true) -- probably don't want to change hidden recipes and string.sub(recipe.name, 1, 3) ~= 'se-' -- have to exlude SE in general :( then -- log("BZZZ due to 'enabled' replacing " .. old .. " with " .. new .." in " .. recipe.name) -- Handy Debug :| diff --git a/bzaluminum2/info.json b/bzaluminum2/info.json index c186637..79b1b04 100644 --- a/bzaluminum2/info.json +++ b/bzaluminum2/info.json @@ -1,32 +1,31 @@ { - "name": "bzaluminum2", - "version": "2.0.0", - "factorio_version": "2.0", - "title": "Aluminum", - "author": "Brevven, cackling fiend", - "homepage": "https://discord.gg/ufvFUJtVwk", - "dependencies": [ - "base >= 2.0.0", - "bzfoundry >= 2.0.0", - "~ bz-dsr-bridge", - "? bztitanium >= 2.0.26", - "? bzlead >= 2.0.28", - "? bzzirconium >= 2.1.13", - "? bztungsten >= 0.5.4", - "? bzcarbon >= 2.0.21", - "? space-exploration >= 0.7.34", - "? aai-industry >= 0.6.13", - "? Krastorio2 >= 2.0.8", - "? sand-and-glass", - "? 248k-Redux", - "? deadlock-beltboxes-loaders", - "? DeadlockCrating", - "(?) bobtech", - "(?) bobassembly", - "(?) bobpower", - "(?) scattergun_turret", - "! space-age" - ], - "description": "Adds aluminum, alumina, cables, alloys and more to the game.\n\nCompatible with Krastorio 2 and Space Exploration. A standalone piece of BZ Mods." + "name": "bzaluminum2", + "version": "2.0.2", + "factorio_version": "2.0", + "title": "Aluminum", + "description": "Adds aluminum, alumina, cables, alloys and more to the game.", + "author": "Brevven, cackling fiend", + "homepage": "https://discord.gg/ufvFUJtVwk", + "dependencies": [ + "base >= 2.0.0", + "bzfoundry2 >= 2.0.0", + "? bztitanium2 >= 2.0.27", + "? bzlead2 >= 2.0.29", + "? bzzirconium2 >= 2.1.14", + "? bztungsten2 >= 2.0.0", + "? bzcarbon2 >= 2.0.22", + "? space-exploration >= 0.7.34", + "? aai-industry >= 0.6.13", + "? Krastorio2 >= 2.0.8", + "? sand-and-glass", + "? 248k-Redux", + "? deadlock-beltboxes-loaders", + "? DeadlockCrating", + "(?) bobtech", + "(?) bobassembly", + "(?) bobpower", + "(?) scattergun_turret", + "! space-age" + ] }