diff --git a/aluminum-recipe-final-stacking.lua b/aluminum-recipe-final-stacking.lua index 5f9999e..8ee6877 100644 --- a/aluminum-recipe-final-stacking.lua +++ b/aluminum-recipe-final-stacking.lua @@ -28,6 +28,9 @@ if deadlock then {icon="__bzaluminum__/graphics/icons/stacked/automation-core-stacked.png", icon_size=64}, }) end + if mods["space-exploration"] then + deadlock.add_stack("aluminum-ingot", nil, "deadlock-stacking-2", nil) + end end -- Deadlock crating recipes @@ -41,5 +44,11 @@ if deadlock_crating then deadlock_crating.add_crate("aluminum-6061", "deadlock-crating-2") deadlock_crating.add_crate("aluminum-2219", "deadlock-crating-3") deadlock_crating.add_crate("ti-sapphire", "deadlock-crating-3") + if mods.Krastorio2 then + deadlock_crating.add_crate("enriched-aluminum", "deadlock-crating-2") + end + if mods["space-exploration"] then + deadlock_crating.add_crate("aluminum-ingot", "deadlock-crating-2") + end end diff --git a/aluminum-recipe-se.lua b/aluminum-recipe-se.lua index 6517b6b..4e35e1d 100644 --- a/aluminum-recipe-se.lua +++ b/aluminum-recipe-se.lua @@ -22,6 +22,106 @@ if mods["space-exploration"] then } }) +if string.sub(mods["space-exploration"], 1, 3) == "0.6" then + data:extend({ + { + type = "item-subgroup", + name = "aluminum", + group = "resources", + order = "a-h-z-a", + } + }) + data.raw.item["alumina"].subgroup = "aluminum" + data.raw.item["aluminum-plate"].subgroup = "aluminum" + data:extend({ + { + type = "item", + name = "aluminum-ingot", + icons = {{icon = "__bzaluminum__/graphics/icons/aluminum-ingot.png", icon_size = 128}}, + order = "b-b", + stack_size = 50, + subgroup = "aluminum", + }, + { + type = "fluid", + name = "molten-aluminum", + default_temperature = 660, + max_temperature = 660, + base_color = {r=230, g=230, b=220}, + flow_color = {r=230, g=230, b=220}, + icons = {{icon = "__bzaluminum__/graphics/icons/molten-aluminum.png", icon_size = 128}}, + order = "a[molten]-a", + pressure_to_speed_ratio = 0.4, + flow_to_energy_ratio = 0.59, + auto_barrel = false, + subgroup = "fluid", + }, + { + type = "recipe", + category = "smelting", + name = "molten-aluminum", + main_product = "molten-aluminum", + subgroup = "aluminum", + results = { + {type = "fluid", name = "molten-aluminum", amount = mods.Krastorio2 and 750 or 900}, + }, + energy_required = 60, + ingredients = { + {name = "alumina", amount = 24}, + {type = "fluid", name = "se-pyroflux", amount = 10}, + }, + enabled = false, + always_show_made_in = true, + allow_as_intermediate = false, + order = "a-a" + }, + { + type = "recipe", + name = "aluminum-ingot", + category = "casting", + results = {{"aluminum-ingot", 1}}, + energy_required = 100, + ingredients = { + {type = "fluid", name = "molten-aluminum", amount = 250}, + }, + enabled = false, + always_show_made_in = true, + allow_as_intermediate = false, + }, + { + type = "recipe", + category = "crafting", + name = "aluminum-ingot-to-plate", + + icons = { + {icon = "__bzaluminum__/graphics/icons/aluminum-plate.png", icon_size = 128, icon_mipmaps = 3}, + {icon = "__bzaluminum__/graphics/icons/aluminum-ingot.png", icon_size = 128, scale = 0.125, shift = {-8, -8}}, + }, + results = { + {name = "aluminum-plate", amount = 10}, + }, + energy_required = 5, + ingredients = { + {name = "aluminum-ingot", amount = 1} + }, + enabled = false, + always_show_made_in = true, + allow_decomposition = false, + order = "a-c-b" + }, + }) + util.add_effect("se-vulcanite-smelting", {type = "unlock-recipe", recipe= "molten-aluminum"}) + util.add_effect("se-vulcanite-smelting", {type = "unlock-recipe", recipe= "aluminum-ingot"}) + util.add_effect("se-vulcanite-smelting", {type = "unlock-recipe", recipe= "aluminum-ingot-to-plate"}) + if mods["Krastorio2"] then + se_delivery_cannon_recipes["enriched-aluminum"] = {name= "enriched-aluminum"} + end + +else + -- Organization + data.raw.item["aluminum-plate"].subgroup = "plates" + data.raw.recipe["aluminum-plate"].subgroup = "plates" + data:extend({ { @@ -131,3 +231,4 @@ if mods["space-exploration"] then table.insert(data.raw.technology["se-processing-vulcanite"].effects, {type = "unlock-recipe", recipe= "aluminum-plate-smelting-vulcanite"}) end +end diff --git a/changelog.txt b/changelog.txt index 5f06729..1482415 100644 --- a/changelog.txt +++ b/changelog.txt @@ -1,4 +1,9 @@ --------------------------------------------------------------------------------------------------- +Version: 0.3.0 +Date: 2022-07-01 + Changes: + - Compatible with Space Exploration 0.6 +--------------------------------------------------------------------------------------------------- Version: 0.2.1 Date: 2022-06-26 Fixes: diff --git a/data-final-fixes.lua b/data-final-fixes.lua index 063d641..0fa5eb4 100644 --- a/data-final-fixes.lua +++ b/data-final-fixes.lua @@ -12,10 +12,6 @@ if mods["space-exploration"] then -- Must be in final fixes util.replace_ingredient("rocket-control-unit", "iron-plate", "aluminum-plate") - -- Organization - data.raw.item["aluminum-plate"].subgroup = "plates" - data.raw.recipe["aluminum-plate"].subgroup = "plates" - -- core mining balancing util.add_to_product("se-core-fragment-omni", "aluminum-ore", -2) end diff --git a/graphics/icons/aluminum-ingot.png b/graphics/icons/aluminum-ingot.png new file mode 100644 index 0000000..e421371 Binary files /dev/null and b/graphics/icons/aluminum-ingot.png differ diff --git a/graphics/icons/aluminum-ingot.xcf b/graphics/icons/aluminum-ingot.xcf new file mode 100644 index 0000000..c929069 Binary files /dev/null and b/graphics/icons/aluminum-ingot.xcf differ diff --git a/graphics/icons/molten-aluminum.png b/graphics/icons/molten-aluminum.png new file mode 100644 index 0000000..19f4330 Binary files /dev/null and b/graphics/icons/molten-aluminum.png differ diff --git a/graphics/icons/molten-aluminum.xcf b/graphics/icons/molten-aluminum.xcf new file mode 100644 index 0000000..13b022c Binary files /dev/null and b/graphics/icons/molten-aluminum.xcf differ diff --git a/info.json b/info.json index 7ba1189..4f02f08 100644 --- a/info.json +++ b/info.json @@ -1,6 +1,6 @@ { "name": "bzaluminum", - "version": "0.2.1", + "version": "0.3.0", "factorio_version": "1.1", "title": "Aluminum", "author": "Brevven", diff --git a/locale/en/aluminum.cfg b/locale/en/aluminum.cfg index f55a53f..3213d2c 100644 --- a/locale/en/aluminum.cfg +++ b/locale/en/aluminum.cfg @@ -11,6 +11,7 @@ aluminum-ore=__ITEM__aluminum_upper__ ore alumina=Alumina aluminum-dust=__ITEM__aluminum_upper__ dust aluminum-plate=__ITEM__aluminum_upper__ plate +aluminum-ingot=__ITEM__aluminum_upper__ ingot aluminum-cable=__ITEM__aluminum_upper__ cable aluminum-2219=2219 __ITEM__aluminum_lower__ alloy aluminum-6061=6061 __ITEM__aluminum_lower__ alloy @@ -29,6 +30,9 @@ aluminum-cable=AAAC cable acsr-cable=__ITEM__aluminum_upper__ conductor steel-reinforced spark-plug=A flame igniter +[fluid-name] +molten-aluminum=Molten __ITEM__aluminum_lower__ + [technology-name] aluminum-matter-processing=__ITEM__aluminum_upper__ conversion reinforced-cable=Reinforced cable