diff --git a/graphics/icons/molten-titanium.png b/graphics/icons/molten-titanium.png new file mode 100644 index 0000000..bb2ba8e Binary files /dev/null and b/graphics/icons/molten-titanium.png differ diff --git a/graphics/icons/molten-titanium.xcf b/graphics/icons/molten-titanium.xcf new file mode 100644 index 0000000..f2071c9 Binary files /dev/null and b/graphics/icons/molten-titanium.xcf differ diff --git a/graphics/icons/titanium-ingot.png b/graphics/icons/titanium-ingot.png new file mode 100644 index 0000000..d549f57 Binary files /dev/null and b/graphics/icons/titanium-ingot.png differ diff --git a/graphics/icons/titanium-ingot.xcf b/graphics/icons/titanium-ingot.xcf new file mode 100644 index 0000000..ad9fd49 Binary files /dev/null and b/graphics/icons/titanium-ingot.xcf differ diff --git a/locale/en/titanium.cfg b/locale/en/titanium.cfg index 65eedaf..c53f19a 100644 --- a/locale/en/titanium.cfg +++ b/locale/en/titanium.cfg @@ -8,6 +8,7 @@ titanium-ore=[item=titanium-ore] Titanium ore titanium-ore=Titanium ore titanium-dust=Titanium dust titanium-plate=Titanium plate +titanium-ingot=Titanium ingot titanium-alloy=__ITEM__titanium-plate__ enriched-titanium=Enriched titanium compressed-titanium-ore=Compressed titanium ore @@ -16,6 +17,9 @@ compressed-titanium-ore=Compressed titanium ore titanium-ore=Can be smelted into titanium plates enriched-titanium=Can be efficiently smelted into titanium plates +[fluid-name] +molten-titanium=Molten titanium + [technology-name] titanium-processing=Titanium Processing enriched-titanium=Enriched Titanium diff --git a/titanium-recipe-final-se.lua b/titanium-recipe-final-se.lua index 85eb7ad..fdbaa84 100644 --- a/titanium-recipe-final-se.lua +++ b/titanium-recipe-final-se.lua @@ -4,7 +4,6 @@ local util = require("__bztitanium__.data-util"); if data.raw.recipe["se-space-pipe"] then -- Organization - data.raw.item[util.me.titanium_plate].subgroup = "plates" -- core mining balancing util.add_to_product("se-core-fragment-omni", "titanium-ore", -2) diff --git a/titanium-recipe-se.lua b/titanium-recipe-se.lua index 8762e0f..0f76817 100644 --- a/titanium-recipe-se.lua +++ b/titanium-recipe-se.lua @@ -1,10 +1,9 @@ -- Additional recipes if Space Exploration mod is enabled -local util = require("__bztitanium__.data-util"); +local util = require("data-util"); if mods["space-exploration"] then se_delivery_cannon_recipes["titanium-ore"] = {name= "titanium-ore"} se_delivery_cannon_recipes[util.me.titanium_plate] = {name= util.me.titanium_plate} - data:extend({ { type = "recipe", @@ -21,6 +20,103 @@ if mods["space-exploration"] then } }) +if string.sub(mods["space-exploration"], 1, 3) == "0.6" then + data:extend({ + { + type = "item-subgroup", + name = "titanium", + group = "resources", + order = "a-h-z-a", + } + }) + data.raw.item[util.titanium_plate].subgroup = "titanium" + if mods["Krastorio2"] then + data.raw.recipe["enriched-titanium-plate"].order= "d[titanium-plate]" + se_delivery_cannon_recipes["enriched-titanium"] = {name= "enriched-titanium"} + else + data:extend({ + { + type = "item", + name = "titanium-ingot", + icons = {{icon = "__bztitanium__/graphics/icons/titanium-ingot.png", icon_size = 128}}, + order = "b-b", + stack_size = 50, + subgroup = "titanium", + }, + { + type = "fluid", + name = "molten-titanium", + default_temperature = 1668, + max_temperature = 1668, + base_color = {r=171, g=219, b=233}, + flow_color = {r=171, g=219, b=233}, + icons = {{icon = "__bztitanium__/graphics/icons/molten-titanium.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-titanium", + subgroup = "titanium", + results = { + {type = "fluid", name = "molten-titanium", amount = 900}, + }, + energy_required = 60, + ingredients = { + {name = "titanium-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 = "titanium-ingot", + category = "casting", + results = {{"titanium-ingot", 1}}, + energy_required = 100, + ingredients = { + {type = "fluid", name = "molten-titanium", amount = 500}, + }, + enabled = false, + always_show_made_in = true, + allow_as_intermediate = false, + }, + { + type = "recipe", + category = "crafting", + name = "titanium-ingot-to-plate", + + icons = { + {icon = "__bztitanium__/graphics/icons/titanium-plate.png", icon_size = 64, icon_mipmaps = 3}, + {icon = "__bztitanium__/graphics/icons/titanium-ingot.png", icon_size = 128, scale = 0.25, shift = {-8, -8}}, + }, + results = { + {name = "titanium-plate", amount = 10}, + }, + energy_required = 5, + ingredients = { + {name = "titanium-ingot", amount = 1} + }, + enabled = false, + always_show_made_in = true, + allow_decomposition = false, + order = "a-c-b" + }, + }) + util.add_effect("se-processing-vulcanite", {type = "unlock-recipe", recipe= "molten-titanium"}) + util.add_effect("se-processing-vulcanite", {type = "unlock-recipe", recipe= "titanium-ingot"}) + util.add_effect("se-processing-vulcanite", {type = "unlock-recipe", recipe= "titanium-ingot-to-plate"}) + util.add_prerequisite(data.raw.technology["se-processing-vulcanite"], util.me.titanium_processing) + end +else + data.raw.item[util.me.titanium_plate].subgroup = "plates" if mods["Krastorio2"] then data:extend({ @@ -82,3 +178,4 @@ if mods["space-exploration"] then util.add_prerequisite(data.raw.technology["se-processing-vulcanite"], util.me.titanium_processing) end end +end