From 19ccc88774b9285fd5b9737695cd5a1e3a0024ab Mon Sep 17 00:00:00 2001 From: Brevven Date: Sun, 23 Jan 2022 04:08:32 -0800 Subject: [PATCH] updates, stacking, etc --- aluminum-recipe-final-stacking.lua | 27 +++++++++++++++++++++++++++ aluminum-recipe-modules.lua | 2 +- data-final-fixes.lua | 10 +++++++++- data-updates.lua | 2 ++ info.json | 6 +++++- locale/en/aluminum.cfg | 11 +++++++++-- 6 files changed, 53 insertions(+), 5 deletions(-) create mode 100644 aluminum-recipe-final-stacking.lua diff --git a/aluminum-recipe-final-stacking.lua b/aluminum-recipe-final-stacking.lua new file mode 100644 index 0000000..02d1e19 --- /dev/null +++ b/aluminum-recipe-final-stacking.lua @@ -0,0 +1,27 @@ +-- Deadlock stacking recipes + +local util = require("data-util"); + +if deadlock then + deadlock.add_stack("aluminum-ore", "__bzaluminum__/graphics/icons/stacked/aluminum-ore-stacked.png", "deadlock-stacking-1", 64) + deadlock.add_stack("aluminum-plate", "__bzaluminum__/graphics/icons/stacked/aluminum-plate-stacked.png", "deadlock-stacking-1", 128) + deadlock.add_stack("alumina", "__bzaluminum__/graphics/icons/stacked/alumina-stacked.png" , "deadlock-stacking-1", 128) + deadlock.add_stack("aluminum-cable", nil, "deadlock-stacking-1", 128) + deadlock.add_stack("acsr-cable", "__bzaluminum__/graphics/icons/stacked/acsr-cable-stacked.png" , "deadlock-stacking-2", 128) + deadlock.add_stack("spark-plug", "__bzaluminum__/graphics/icons/stacked/spark-plug-stacked.png" , "deadlock-stacking-2", 128) + deadlock.add_stack("aluminum-6061", "__bzaluminum__/graphics/icons/stacked/aluminum-6061-stacked.png" , "deadlock-stacking-2", 128) + deadlock.add_stack("aluminum-2219", "__bzaluminum__/graphics/icons/stacked/aluminum-2219-stacked.png" , "deadlock-stacking-3", 128) +end + +-- Deadlock crating recipes +if deadlock_crating then + deadlock_crating.add_crate("aluminum-ore", "deadlock-crating-1") + deadlock_crating.add_crate("aluminum-plate", "deadlock-crating-1") + deadlock_crating.add_crate("alumina", "deadlock-crating-1") + deadlock_crating.add_crate("aluminum-cable", "deadlock-crating-1") + deadlock_crating.add_crate("acsr-cable", "deadlock-crating-2") + 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") +end + diff --git a/aluminum-recipe-modules.lua b/aluminum-recipe-modules.lua index 68aaba0..5472e1f 100644 --- a/aluminum-recipe-modules.lua +++ b/aluminum-recipe-modules.lua @@ -1,6 +1,6 @@ -- Enable prod modules for all aluminum plate and ore recipes -recipes = {"alumina", "aluminum-plate", "aluminum-cable", "acsr-cable"} +recipes = {"alumina", "aluminum-plate", "aluminum-cable", "acsr-cable", "spark-plug", "aluminum-alloy-2219", "aluminum-alloy-6061"} if mods["Krastorio2"] then table.insert(recipes, "enriched-aluminum-plate") table.insert(recipes, "enriched-aluminum") diff --git a/data-final-fixes.lua b/data-final-fixes.lua index 7e79a2f..91bdfb8 100644 --- a/data-final-fixes.lua +++ b/data-final-fixes.lua @@ -1,4 +1,4 @@ --- require("aluminum-recipe-final-stacking") +require("aluminum-recipe-final-stacking") require("aluminum-recipe-modules") -- require("aluminum-recipe-final-5d") require("aluminum-recipe-final-rrr") @@ -17,6 +17,14 @@ if mods["space-exploration"] then util.add_to_product("se-core-fragment-omni", "aluminum-ore", -3) end +if mods.bzsilicon 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 + end +end +end + -- Must be last util.create_list() diff --git a/data-updates.lua b/data-updates.lua index 5bd7a87..60f2fb7 100644 --- a/data-updates.lua +++ b/data-updates.lua @@ -1,4 +1,6 @@ require("aluminum-recipe-updates") +require("aluminum-recipe-updates-lds") +require("aluminum-recipe-updates-transport") require("aluminum-matter") -- require("omni") require("map-gen-preset-updates") diff --git a/info.json b/info.json index e9d1507..fb19304 100644 --- a/info.json +++ b/info.json @@ -8,12 +8,16 @@ "homepage": "", "dependencies": [ "base >= 1.1.0", + "bzfoundry", + "? bztitanium", + "? bzzirconium", + "? bztungsten", "? space-exploration", "? aai-industry", "? Krastorio2", "? deadlock-beltboxes-loaders", "? DeadlockCrating" ], - "description": "Adds aluminum, alumina, and cable and alloys and more to the game\n\nCompatible with Krastorio 2 and Space Exploration. A standalone piece of BZ Mods." + "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." } diff --git a/locale/en/aluminum.cfg b/locale/en/aluminum.cfg index 5b2d884..66d6c0e 100644 --- a/locale/en/aluminum.cfg +++ b/locale/en/aluminum.cfg @@ -10,25 +10,32 @@ alumina=Alumina aluminum-dust=Aluminum dust aluminum-plate=Aluminum plate aluminum-cable=Aluminum cable -aluminum-2219=Aluminum Aerospace Alloy +aluminum-2219=2219 aluminum alloy +aluminum-6061=6061 aluminum alloy enriched-aluminum=Enriched aluminum compressed-aluminum-ore=Compressed aluminum ore acsr-cable=ACSR cable +spark-plug=Spark plug [item-description] aluminum-ore=Can be smelted into aluminum plates enriched-aluminum=Can be efficiently smelted into aluminum plates aluminum-2219=An aerospace-grade aluminum alloy +aluminum-6061=A common aluminum alloy aluminum-cable=AAAC cable acsr-cable=Aluminum conductor steel-reinforced [technology-name] aluminum-matter-processing=Aluminum conversion reinforced-cable=Reinforced cable +aerospace-alloys=Aerospace alloys +basic-alloys=Basic alloys +copper-processing=Copper processing [technology-description] enriched-aluminum=Enrich aluminum ore, purifying with sulfuric acid [fluid=sulfuric-acid] and water [fluid=water], improving the final yield. Produce dirty water [fluid=dirty-water] as a byproduct. -reinforced-cable=More power means bigger cables. +reinforced-cable=Bigger cables, more power. +aerospace-alloys=Alloys suited to the task. [recipe-name] enriched-aluminum=__ITEM__enriched-aluminum__