diff --git a/README.md b/README.md index 688e092..4f46a3f 100644 --- a/README.md +++ b/README.md @@ -4,6 +4,8 @@ Adds titanium ore and plates to the base game. It requires lubricant to mine. Most recipes that should be lightweight that use steel now use titanium. Other minor recipe tweaks as well. ## Version History +- 0.4.0 Support Krastorio2 including enriched titanium + - 0.3.0 Update to support alternate lds in space exploration - 0.2.0 Compatible with base game. diff --git a/data.lua b/data.lua index a351ac3..8701758 100644 --- a/data.lua +++ b/data.lua @@ -1,4 +1,5 @@ require("titanium-ore") require("titanium-ore-particle") require("titanium-recipe") +require("titanium-enriched") diff --git a/graphics/icons/enriched-titanium.png b/graphics/icons/enriched-titanium.png new file mode 100644 index 0000000..efb6ca0 Binary files /dev/null and b/graphics/icons/enriched-titanium.png differ diff --git a/graphics/icons/enriched-titanium.xcf b/graphics/icons/enriched-titanium.xcf new file mode 100644 index 0000000..1af5f52 Binary files /dev/null and b/graphics/icons/enriched-titanium.xcf differ diff --git a/info.json b/info.json index f942704..6939b25 100644 --- a/info.json +++ b/info.json @@ -1,6 +1,6 @@ { "name": "bztitanium", - "version": "0.3.0", + "version": "0.4.0", "factorio_version": "0.18", "title": "Titanium", "author": "Brevven", @@ -10,6 +10,7 @@ "base >= 0.18", "? aai-industry", "? space-exploration", + "? Krastorio2", "? Pre0-17-60Oil" ], "description": "Adds titanium to the base game" diff --git a/locale/en/ore-refining.cfg b/locale/en/ore-refining.cfg index 8bcb77b..cb7b7fb 100644 --- a/locale/en/ore-refining.cfg +++ b/locale/en/ore-refining.cfg @@ -4,16 +4,22 @@ titanium-ore=Titanium [autoplace-control-names] titanium-ore=Titanium Ore - [item-name] titanium-ore=Titanium Ore titanium-plate=Titanium Plate - - +enriched-titanium=Enriched titanium [item-description] titanium-ore=Can be smelted into titanium plates +enriched-titanium=Can be efficiently smelted into titanium plates [technology-name] titanium-processing=Titanium Processing +enriched-titanium=Enriched Titanium +[technology-description] +titanium-processing=Process titanium ore into titanium plates +enriched-titanium=Enrich titanium to efficiently produce titanium plates + +[recipe-name] +enriched-titanium=__ITEM__enriched-titanium__ diff --git a/titanium-enriched.lua b/titanium-enriched.lua new file mode 100644 index 0000000..5836f44 --- /dev/null +++ b/titanium-enriched.lua @@ -0,0 +1,99 @@ +-- Enriched Titanium for Krastorio2 +if mods["Krastorio2"] then +data:extend( +{ + { + type = "item", + name = "enriched-titanium", + icon_size = 64, + icon = "__bztitanium__/graphics/icons/enriched-titanium.png", + subgroup = "raw-material", + order = "e05-a[enriched-ores]-a1[enriched-titanium]", + stack_size = 200 + }, + { + type = "recipe", + name = "enriched-titanium", + icon = "__bztitanium__/graphics/icons/enriched-titanium.png", + icon_size = 64, + category = "chemistry", + energy_required = 3, + enabled = false, + always_show_made_in = true, + always_show_products = true, + allow_productivity = true, + ingredients = + { + {type = "fluid", name = "hydrogen-chloride", amount = 10}, + {type = "fluid", name = "water", amount = 25, catalyst_amount = 25}, + {type = "item", name = "titanium-ore", amount = 9} + }, + results = + { + {type = "item", name = "enriched-titanium", 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-titanium]" + }, + { + type = "recipe", + name = "enriched-titanium-plate", + icons = + { + { icon = "__bztitanium__/graphics/icons/titanium-plate.png", icon_size = 32 }, + { icon = "__bztitanium__/graphics/icons/enriched-titanium.png", icon_size = 64, scale=0.25, shift= {-8, -8}}, + }, + category = "smelting", + energy_required = 16, + enabled = false, + always_show_made_in = true, + always_show_products = true, + allow_productivity = true, + ingredients = + { + {"enriched-titanium", 10} + }, + result = "titanium-plate", + result_count = 5, + order = "b[titanium-plate]-b[enriched-titanium-plate]" + }, + { + type = "technology", + name = "enriched-titanium", + icon = "__bztitanium__/graphics/icons/enriched-titanium.png", + icon_size = 64, + effects = + { + { + type = "unlock-recipe", + recipe = "enriched-titanium" + }, + { + type = "unlock-recipe", + recipe = "enriched-titanium-plate" + } + }, + prerequisites = {"kr-enriched-ores", "titanium-processing"}, + unit = + { + count = 150, + ingredients = + { + {"automation-science-pack", 1}, + {"logistic-science-pack", 1}, + {"chemical-science-pack", 1} + }, + time = 30 + } + } +} +) +end diff --git a/titanium-ore.lua b/titanium-ore.lua index 8bbc862..177733e 100644 --- a/titanium-ore.lua +++ b/titanium-ore.lua @@ -72,7 +72,7 @@ data:extend( icon = "__bztitanium__/graphics/icons/titanium-ore.png", subgroup = "raw-resource", order = "t-c-a", - stack_size = 50 + stack_size = (mods["Krastorio2"] and 200 or 50) }, } ) diff --git a/titanium-recipe.lua b/titanium-recipe.lua index fd06713..08a637f 100644 --- a/titanium-recipe.lua +++ b/titanium-recipe.lua @@ -5,20 +5,31 @@ data:extend( type = "recipe", name = "titanium-plate", category = "smelting", - normal = - { - enabled = false, - energy_required = 8, - ingredients = {{"titanium-ore", 5}}, - result = "titanium-plate" - }, - expensive = - { - enabled = false, - energy_required = 16, - ingredients = {{"titanium-ore", 10}}, - result = "titanium-plate" - } + icons = (mods["Krastorio2"] and + { + { icon = "__bztitanium__/graphics/icons/titanium-plate.png", icon_size = 32 }, + { icon = "__bztitanium__/graphics/icons/titanium-ore.png", icon_size = 32, scale=0.5, shift= {-8, -8}}, + } or nil), + normal = (mods["Krastorio2"] and + { + enabled = false, + energy_required = 16, + ingredients = {{"titanium-ore", 10}}, + results = {{type="item", name="titanium-plate", amount_min=2, amount_max=3}}, + } or + { + enabled = false, + energy_required = 8, + ingredients = {{"titanium-ore", 5}}, + result = "titanium-plate" + }), + expensive = + { + enabled = false, + energy_required = 16, + ingredients = {{"titanium-ore", 10}}, + result = "titanium-plate" + } }, { type = "item", @@ -27,7 +38,7 @@ data:extend( icon_size = 32, subgroup = "raw-material", order = "b[titanium-plate]", - stack_size = 100 + stack_size = (mods["Krastorio2"] and 200 or 100) }, { type = "technology", @@ -45,15 +56,15 @@ data:extend( { count = 75, ingredients = (mods["Pre0-17-60Oil"] and - { - {"automation-science-pack", 1}, - {"logistic-science-pack", 1} - } or - { - {"automation-science-pack", 1}, - {"logistic-science-pack", 1}, - {"chemical-science-pack", 1} - }), + { + {"automation-science-pack", 1}, + {"logistic-science-pack", 1} + } or + { + {"automation-science-pack", 1}, + {"logistic-science-pack", 1}, + {"chemical-science-pack", 1} + }), time = 30 }, prerequisites = {"lubricant"}, @@ -61,5 +72,3 @@ data:extend( }, } ) - -