diff --git a/data-util.lua b/data-util.lua index ffda9ed..0994028 100644 --- a/data-util.lua +++ b/data-util.lua @@ -566,6 +566,14 @@ function util.set_subgroup(recipe_name, subgroup) end end +-- Set item subgroup +function util.set_item_subgroup(item, subgroup) + if me.bypass[item] then return end + if data.raw.item[item] and data.raw["item-subgroup"][subgroup] then + data.raw.item[item].subgroup = subgroup + end +end + -- Set recipe icons function util.set_icons(recipe_name, icons) if me.bypass[recipe_name] then return end diff --git a/info.json b/info.json index ad85088..8a92fe7 100644 --- a/info.json +++ b/info.json @@ -14,7 +14,7 @@ "? bzzirconium >= 0.5.4", "? bztungsten >= 0.5.4", "? bzcarbon >= 0.2.0", - "? space-exploration", + "? space-exploration >= 0.6.0", "? aai-industry", "? Krastorio2", "? deadlock-beltboxes-loaders", diff --git a/tin-enriched.lua b/tin-enriched.lua index 95f5ed9..6604456 100644 --- a/tin-enriched.lua +++ b/tin-enriched.lua @@ -32,7 +32,8 @@ data:extend( allow_productivity = true, ingredients = { - {type = "fluid", name = "sulfuric-acid", amount = 3}, + mods.bzcarbon and {type = "item", name = "graphite", amount = 1} + or {type = "fluid", name = "sulfuric-acid", amount = 3}, {type = "fluid", name = "water", amount = 25, catalyst_amount = 25}, {type = "item", name = "tin-ore", amount = 9} }, diff --git a/tin-recipe-se.lua b/tin-recipe-se.lua index 441e92a..fc0c684 100644 --- a/tin-recipe-se.lua +++ b/tin-recipe-se.lua @@ -3,15 +3,13 @@ local util = require("data-util"); if mods["space-exploration"] then se_delivery_cannon_recipes["tin-ore"] = {name= "tin-ore"} - se_delivery_cannon_recipes["alumina"] = {name= "alumina"} - se_delivery_cannon_recipes["tin-plate"] = {name= "tin-plate"} - + se_delivery_cannon_recipes[util.me.titanium_plate] = {name= util.me.titanium_plate} data:extend({ { type = "recipe", icons = { { icon = "__base__/graphics/icons/landfill.png", icon_size = 64, icon_mipmaps = 3 }, - { icon = "__bztin__/graphics/icons/tin-ore.png", icon_size = 64, scale = 0.25}, + { icon = "__bztitanium__/graphics/icons/tin-ore.png", icon_size = 64, scale = 0.25}, }, name = "landfill-tin-ore", category = "hard-recycling", @@ -22,112 +20,96 @@ if mods["space-exploration"] then } }) - data:extend({ { - type = "recipe", - icons = { - { icon = "__base__/graphics/icons/landfill.png", icon_size = 64, icon_mipmaps = 3 }, - { icon = "__bztin__/graphics/icons/tin-ore.png", icon_size = 64, scale = 0.25}, - }, - name = "landfill-tin-ore", - category = "hard-recycling", - order = "z-b-tin", - subgroup = "terrain", - result = "landfill", - ingredients = {{"tin-ore", 50}}, + type = "item-subgroup", + name = "tin", + group = "resources", + order = "a-h-z-a", } }) + util.set_item_subgroup("tin-plate", "tin") + data:extend({ + { + type = "item", + name = "tin-ingot", + icons = {{icon = "__bztitanium__/graphics/icons/tin-ingot.png", icon_size = 128}}, + order = "b-b", + stack_size = 50, + subgroup = "tin", + }, + { + type = "fluid", + name = "molten-tin", + default_temperature = 232, + max_temperature = 232, + base_color = {r=191, g=219, b=233}, + flow_color = {r=191, g=219, b=233}, + icons = {{icon = "__bztitanium__/graphics/icons/molten-tin.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-tin", + subgroup = "tin", + results = { + {type = "fluid", name = "molten-tin", amount = mods.Krastorio2 and 750 or 900}, + }, + energy_required = 60, + ingredients = { + {name = mods.Krastorio2 and "enriched-tin" or "tin-ore", 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 = "tin-ingot", + category = "casting", + results = {{"tin-ingot", 1}}, + energy_required = 18.75, + ingredients = { + {type = "fluid", name = "molten-tin", amount = 250}, + }, + enabled = false, + always_show_made_in = true, + allow_as_intermediate = false, + }, + { + type = "recipe", + category = "crafting", + name = "tin-ingot-to-plate", + icons = { + {icon = "__bztitanium__/graphics/icons/tin-plate.png", icon_size = 64, icon_mipmaps = 3}, + {icon = "__bztitanium__/graphics/icons/tin-ingot.png", icon_size = 128, scale = 0.25, shift = {-8, -8}}, + }, + results = { + {name = "tin-plate", amount = 10}, + }, + energy_required = 3.75, + ingredients = { + {name = "tin-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-tin"}) + util.add_effect("se-vulcanite-smelting", {type = "unlock-recipe", recipe= "tin-ingot"}) + util.add_effect("se-vulcanite-smelting", {type = "unlock-recipe", recipe= "tin-ingot-to-plate"}) 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-tin", amount = 8}, - {name = "se-vulcanite-block", amount = 1}, - }, - results = { - {name = "alumina", amount = 12}, - }, - icons = - { - { icon = "__bztin__/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]" + data.raw.recipe["enriched-tin-plate"].order= "d[tin-plate]" se_delivery_cannon_recipes["enriched-tin"] = {name= "enriched-tin"} - 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 = "tin-ore", amount = 8}, - {name = "se-vulcanite-block", amount = 1}, - }, - results = { - {name = "alumina", amount = 10}, - {name = "silica", amount = 2}, - }, - icons = - { - { icon = "__bztin__/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 = "tin-plate-smelting-vulcanite", - category = "smelting", - subgroup = "plates", - order = "d[tin-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 = "tin-plate", amount = 12}, - }, - icons = - { - { icon = "__bztin__/graphics/icons/tin-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= "tin-plate-smelting-vulcanite"}) end