From 25847840d288bdef927fced7235d2885b31d2d93 Mon Sep 17 00:00:00 2001 From: Brevven Date: Wed, 26 Jan 2022 05:13:06 -0800 Subject: [PATCH] enriched, vulcanite --- aluminum-enriched.lua | 121 ++++++++++++++++++++++++++++++++++++ aluminum-recipe-se.lua | 117 ++++++++++++++++++++++++++++++++++ aluminum-recipe-updates.lua | 1 + data-updates.lua | 6 -- data.lua | 4 +- locale/en/aluminum.cfg | 6 +- 6 files changed, 245 insertions(+), 10 deletions(-) create mode 100644 aluminum-enriched.lua create mode 100644 aluminum-recipe-se.lua diff --git a/aluminum-enriched.lua b/aluminum-enriched.lua new file mode 100644 index 0000000..55346d5 --- /dev/null +++ b/aluminum-enriched.lua @@ -0,0 +1,121 @@ +-- Enriched Lead for Krastorio2 +local util = require("data-util"); + +if mods["Krastorio2"] then +data:extend( +{ + { + type = "item", + name = "enriched-aluminum", + icon_size = 64, + icon = "__bzaluminum__/graphics/icons/enriched-aluminum.png", + icon_mipmaps = 3, + pictures = { + {filename="__bzaluminum__/graphics/icons/enriched-aluminum.png", size=128, scale=0.125}, + {filename="__bzaluminum__/graphics/icons/enriched-aluminum-2.png", size=128, scale=0.125}, + {filename="__bzaluminum__/graphics/icons/enriched-aluminum-3.png", size=128, scale=0.125}, + {filename="__bzaluminum__/graphics/icons/enriched-aluminum-4.png", size=64, scale=0.125}, + }, + subgroup = "raw-material", + order = "e05-a[enriched-ores]-a1[enriched-aluminum]", + stack_size = util.get_stack_size(100) + }, + { + type = "recipe", + name = "enriched-aluminum", + icon = "__bzaluminum__/graphics/icons/enriched-aluminum.png", + icon_size = 64, + icon_mipmaps = 3, + category = "chemistry", + energy_required = 3, + enabled = false, + always_show_made_in = true, + always_show_products = true, + allow_productivity = true, + ingredients = + { + {type = "fluid", name = "sulfuric-acid", amount = 3}, + {type = "fluid", name = "water", amount = 25, catalyst_amount = 25}, + {type = "item", name = "aluminum-ore", amount = 9} + }, + results = + { + {type = "item", name = "enriched-aluminum", amount = 6}, + {type = "fluid", name = "dirty-water", amount = 25, catalyst_amount = 25} + }, + crafting_machine_tint = + { + primary = {r = 0.721, g = 0.525, b = 0.043, a = 0.000}, + secondary = {r = 0.200, g = 0.680, b = 0.300, a = 0.357}, + tertiary = {r = 0.690, g = 0.768, b = 0.870, a = 0.000}, + quaternary = {r = 0.0, g = 0.980, b = 0.603, a = 0.900} + }, + subgroup = "raw-material", + order = "e03[enriched-aluminum]" + }, + { + type = "recipe", + name = "enriched-alumina", + icons = + { + { icon = "__bzaluminum__/graphics/icons/alumina.png", icon_size = 128 }, + { icon = "__bzaluminum__/graphics/icons/enriched-aluminum.png", icon_size = 128, scale=0.125, shift= {-8, -8}}, + }, + category = "smelting", + energy_required = 16, + enabled = false, + always_show_made_in = true, + always_show_products = true, + allow_productivity = true, + ingredients = { {"enriched-aluminum", 5} }, + results = { {"alumina", 5} }, + order = "b[aluminum-plate]-b[enriched-aluminum-plate]" + }, + { + type = "recipe", + name = "dirty-water-filtration-aluminum", + category = "fluid-filtration", + icons = + { + { + icon = data.raw.fluid["dirty-water"].icon, + icon_size = data.raw.fluid["dirty-water"].icon_size + }, + { + icon = data.raw.item["aluminum-ore"].icon, + icon_size = data.raw.item["aluminum-ore"].icon_size, + scale = 0.20 * (data.raw.fluid["dirty-water"].icon_size/data.raw.item["aluminum-ore"].icon_size), + shift = {0, 4} + } + }, + icon_size = data.raw.fluid["dirty-water"].icon_size, + energy_required = 2, + enabled = false, + allow_as_intermediate = false, + always_show_made_in = true, + always_show_products = true, + ingredients = + { + {type = "fluid", name = "dirty-water", amount = 100, catalyst_amount = 100}, + }, + results = + { + {type = "fluid", name = "water", amount = 90, catalyst_amount = 90}, + mods.bzsilicon 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}, + }, + crafting_machine_tint = + { + primary = {r = 0.60, g = 0.20, b = 0, a = 0.6}, + secondary = {r = 1.0, g = 0.843, b = 0.0, a = 0.9} + }, + subgroup = "raw-material", + order = "w013[dirty-water-filtration-aluminum]" + } +} +) +util.add_effect("kr-enriched-ores", { type = "unlock-recipe", recipe = "enriched-aluminum" }) +util.add_effect("kr-enriched-ores", { type = "unlock-recipe", recipe = "enriched-alumina" }) +util.add_effect("kr-enriched-ores", { type = "unlock-recipe", recipe = "dirty-water-filtration-aluminum" }) +end diff --git a/aluminum-recipe-se.lua b/aluminum-recipe-se.lua new file mode 100644 index 0000000..f052722 --- /dev/null +++ b/aluminum-recipe-se.lua @@ -0,0 +1,117 @@ +-- Additional recipes if Space Exploration mod is enabled +local util = require("data-util"); + +if mods["space-exploration"] then + se_delivery_cannon_recipes["aluminum-ore"] = {name= "aluminum-ore"} + se_delivery_cannon_recipes["alumina"] = {name= "alumina"} + se_delivery_cannon_recipes["aluminum-plate"] = {name= "aluminum-plate"} + + + data:extend({ + { + type = "recipe", + icons = { + { icon = "__base__/graphics/icons/landfill.png", icon_size = 64, icon_mipmaps = 3 }, + { icon = "__bzaluminum__/graphics/icons/aluminum-ore.png", icon_size = 64, scale = 0.25}, + }, + name = "landfill-aluminum-ore", + category = "hard-recycling", + order = "z-b-aluminum", + subgroup = "terrain", + result = "landfill", + ingredients = {{"aluminum-ore", 50}}, + } + }) + + if mods["Krastorio2"] then + data:extend({ + { + type = "recipe", + name = "enriched-alumina-smelting-vulcanite", + category = "smelting", + order = "d[alumina]", + energy_required = 24, + enabled = false, + always_show_made_in = true, + allow_as_intermediate = false, + ingredients = { + {name = "enriched-aluminum", amount = 8}, + {name = "se-vulcanite-block", amount = 1}, + }, + results = { + {name = "alumina", amount = 12}, + }, + icons = + { + { icon = "__bzaluminum__/graphics/icons/alumina.png", icon_size = 128 }, + { icon = "__space-exploration-graphics__/graphics/icons/vulcanite-block.png", icon_size = 64, scale=0.25, shift= {-10, -10}}, + }, + + }, + }) + table.insert(data.raw.technology["se-processing-vulcanite"].effects, + {type = "unlock-recipe", recipe= "enriched-alumina-smelting-vulcanite"}) + data.raw.recipe["enriched-alumina"].order= "d[alumina]" + se_delivery_cannon_recipes["enriched-aluminum"] = {name= "enriched-aluminum"} + else + data:extend({ + { + type = "recipe", + name = "alumina-smelting-vulcanite", + category = "smelting", + subgroup = "plates", + order = "d[alumina]", + energy_required = 24, + enabled = false, + always_show_made_in = true, + allow_as_intermediate = false, + ingredients = { + {name = "aluminum-ore", amount = 8}, + {name = "se-vulcanite-block", amount = 1}, + }, + results = { + {name = "alumina", amount = 10}, + {name = "silica", amount = 2}, + }, + icons = + { + { icon = "__bzaluminum__/graphics/icons/alumina.png", icon_size = 128}, + { icon = "__space-exploration-graphics__/graphics/icons/vulcanite-block.png", icon_size = 64, icon_mipmaps = 3, scale=0.25, shift= {-10, -10}}, + }, + + + }, + }) + table.insert(data.raw.technology["se-processing-vulcanite"].effects, + {type = "unlock-recipe", recipe= "alumina-smelting-vulcanite"}) + end + data:extend({ + { + type = "recipe", + name = "aluminum-plate-smelting-vulcanite", + category = "smelting", + subgroup = "plates", + order = "d[aluminum-plate]", + energy_required = 24, + enabled = false, + always_show_made_in = true, + allow_as_intermediate = false, + ingredients = { + {name = "alumina", amount = 8}, + {name = "se-vulcanite-block", amount = 1}, + }, + results = { + {name = "aluminum-plate", amount = 12}, + }, + icons = + { + { icon = "__bzaluminum__/graphics/icons/aluminum-plate.png", icon_size = 128}, + { icon = "__space-exploration-graphics__/graphics/icons/vulcanite-block.png", icon_size = 64, icon_mipmaps = 3, scale=0.25, shift= {-10, -10}}, + }, + + + }, + }) + table.insert(data.raw.technology["se-processing-vulcanite"].effects, + {type = "unlock-recipe", recipe= "aluminum-plate-smelting-vulcanite"}) +end diff --git a/aluminum-recipe-updates.lua b/aluminum-recipe-updates.lua index 5dc3a91..24f6fc1 100644 --- a/aluminum-recipe-updates.lua +++ b/aluminum-recipe-updates.lua @@ -104,6 +104,7 @@ end if mods["space-exploration"] then util.replace_ingredient("se-space-transport-belt", "copper-plate", "aluminum-2219") + util.add_ingredient("se-energy-beam-defence", "acsr-cable", 20) util.add_ingredient("se-experimental-alloys-data", "aluminum-plate", 1) util.add_to_product("se-experimental-alloys-data", "se-experimental-alloys-data", 1) diff --git a/data-updates.lua b/data-updates.lua index ccc3547..d7b32bc 100644 --- a/data-updates.lua +++ b/data-updates.lua @@ -7,12 +7,6 @@ require("map-gen-preset-updates") require("strange-matter") local util = require("data-util"); -if mods["space-exploration"] then - se_delivery_cannon_recipes["aluminum-ore"] = {name= "aluminum-ore"} - se_delivery_cannon_recipes["alumina"] = {name= "alumina"} - se_delivery_cannon_recipes["aluminum-plate"] = {name= "aluminum-plate"} -end - if data.raw.resource["copper-ore"] then if mods["space-exploration"] then local noise = require('noise'); diff --git a/data.lua b/data.lua index 44a7336..58c5924 100644 --- a/data.lua +++ b/data.lua @@ -1,7 +1,7 @@ require("aluminum-ore") require("aluminum-recipe") --- require("aluminum-enriched") -- Enriched Al for Krastorio 2 --- require("aluminum-recipe-se") +require("aluminum-enriched") -- Enriched Al for Krastorio 2 +require("aluminum-recipe-se") -- Space Exploration -- require("aluminum-compressed") local util = require("data-util"); diff --git a/locale/en/aluminum.cfg b/locale/en/aluminum.cfg index 66d6c0e..a44ccf8 100644 --- a/locale/en/aluminum.cfg +++ b/locale/en/aluminum.cfg @@ -1,5 +1,5 @@ [entity-name] -aluminum-ore=Aluminum +aluminum-ore=Aluminum ore [autoplace-control-names] aluminum-ore=[item=aluminum-ore] Aluminum ore @@ -38,17 +38,19 @@ reinforced-cable=Bigger cables, more power. aerospace-alloys=Alloys suited to the task. [recipe-name] +alumina=__ITEM__alumina__ enriched-aluminum=__ITEM__enriched-aluminum__ aluminum-plate=__ITEM__aluminum-plate__ smelt-compressed-aluminum-ore=__ITEM__aluminum-plate__ aluminum-dust=__ITEM__aluminum-dust__ dirty-water-filtration-aluminum=Filter dirty water [item=aluminum-ore] bz-aluminum-ingot=Aluminum ingot +alumina-smelting-vulcanite=__ITEM__alumina__ [recipe-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. -dirty-water-filtration-aluminum=Filter dirty water, giving aluminum ore [item=aluminum-ore], copper ore [item=copper-ore] and stone [item=stone] (probabilistically). +dirty-water-filtration-aluminum=Filter dirty water, giving aluminum ore [item=aluminum-ore] and other outputs (probabilistically). # Settings