From 4a2341a7151aaccdded9bcc80f2df4eb9debe159 Mon Sep 17 00:00:00 2001 From: Brevven Date: Sun, 26 Jun 2022 02:07:11 -0700 Subject: [PATCH] 248k --- changelog.txt | 6 ++++++ compatibility/248k-recipes.lua | 31 +++++++++++++++++++++++++++++++ compatibility/248k.lua | 31 +++++++++++++++++++++++++++++++ data-updates.lua | 1 + data.lua | 1 + info.json | 3 ++- migrations/bzaluminum.0.2.0.json | 7 +++++++ 7 files changed, 79 insertions(+), 1 deletion(-) create mode 100644 compatibility/248k-recipes.lua create mode 100644 compatibility/248k.lua create mode 100644 migrations/bzaluminum.0.2.0.json diff --git a/changelog.txt b/changelog.txt index 17fa4c4..5f69c85 100644 --- a/changelog.txt +++ b/changelog.txt @@ -1,4 +1,10 @@ --------------------------------------------------------------------------------------------------- +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: diff --git a/compatibility/248k-recipes.lua b/compatibility/248k-recipes.lua new file mode 100644 index 0000000..7852c92 --- /dev/null +++ b/compatibility/248k-recipes.lua @@ -0,0 +1,31 @@ + +if mods["248k"] then +data:extend({ + + { + name = 'el_purify_aluminum_recipe', + type = 'recipe', + enabled = 'false', + category = 'el_purifier_category', + main_product = 'el_dirty_water', + ingredients = { + {type="fluid", name="water", amount=50}, + {type="item", name="aluminum-ore", amount=10} + }, + results = { + {type="fluid", name="el_dirty_water", amount=50}, + {type="item", name="el_materials_pure_aluminum", amount=5}, + }, + energy_required = 1, + always_show_made_in = true, + icons = { + { + icon = "__248k__/ressources/fluids/el_dirty_water.png", icon_size = 64, + }, + { + icon = "__bzaluminum__/graphics/icons/aluminum-ore.png", icon_size = 64, icon_mipmaps = 3, scale=0.25, shift= {-8, -8} + }, + } + }, +}) +end diff --git a/compatibility/248k.lua b/compatibility/248k.lua new file mode 100644 index 0000000..5e565d0 --- /dev/null +++ b/compatibility/248k.lua @@ -0,0 +1,31 @@ +local util = require("data-util"); + +-- ADD PURIFICATION RECIPE + +local al2 = "el_aluminum_item" + + +-- Swap out all 248k titanium for BZ titanium_plate +for i, recipe in pairs(data.raw.recipe) do + util.replace_ingredient(recipe.name, al2, "aluminum-plate") + util.replace_product(recipe.name, al2, "aluminum-plate") +end + +-- Remove 248k titanium plate +util.remove_raw("item", al2) + +-- Stone purification should produce even outputs now +util.add_to_ingredient("el_purify_stone_recipe", "stone", 5) +util.add_to_ingredient("el_purify_stone_recipe", "water", 50) +util.add_to_product("el_purify_stone_recipe", "el_materials_pure_iron", 1) +util.add_to_product("el_purify_stone_recipe", "el_materials_pure_copper", 1) +util.add_to_product("el_purify_stone_recipe", "el_dirty_water", 50) +util.multiply_time("el_purify_stone_recipe", 1.5) + +-- Unlock new aluminum purification recipe +util.add_effect("el_purifier_tech", {type = "unlock-recipe", recipe = "el_purify_aluminum_recipe"}) + +-- Remove no-longer-necessary aluminum-focused purification +util.remove_raw("technology", "el_purifier_2_tech") +util.remove_raw("recipe", "el_purify_stone_2_recipe") + diff --git a/data-updates.lua b/data-updates.lua index dccfd7b..67b8d21 100644 --- a/data-updates.lua +++ b/data-updates.lua @@ -8,6 +8,7 @@ require("aluminum-matter") -- require("omni") require("map-gen-preset-updates") require("strange-matter") +require("compatibility/248k") local util = require("data-util") if data.raw.resource["copper-ore"] then diff --git a/data.lua b/data.lua index e95cd1c..0aefb62 100644 --- a/data.lua +++ b/data.lua @@ -2,6 +2,7 @@ require("aluminum-ore") require("aluminum-recipe") require("aluminum-enriched") -- Enriched Al for Krastorio 2 require("aluminum-recipe-se") -- Space Exploration +require("compatibility/248k-recipes") -- require("aluminum-compressed") local util = require("data-util"); diff --git a/info.json b/info.json index 111a58f..cafadd9 100644 --- a/info.json +++ b/info.json @@ -1,6 +1,6 @@ { "name": "bzaluminum", - "version": "0.1.10", + "version": "0.2.0", "factorio_version": "1.1", "title": "Aluminum", "author": "Brevven", @@ -17,6 +17,7 @@ "? space-exploration", "? aai-industry", "? Krastorio2", + "? 248k", "? deadlock-beltboxes-loaders", "? DeadlockCrating" ], diff --git a/migrations/bzaluminum.0.2.0.json b/migrations/bzaluminum.0.2.0.json new file mode 100644 index 0000000..b2b44aa --- /dev/null +++ b/migrations/bzaluminum.0.2.0.json @@ -0,0 +1,7 @@ +{ + "item": + [ + ["el_aluminum_item", "aluminum-plate"] + ] +} +