From ab36b75b7b493821f9a4e7b36bda11f01ee50df2 Mon Sep 17 00:00:00 2001 From: Brevven Date: Sun, 13 Sep 2020 05:16:35 -0700 Subject: [PATCH] base improvements for Krastorio2 --- README.md | 2 + data.lua | 1 + graphics/icons/enriched-titanium.png | Bin 0 -> 19766 bytes graphics/icons/enriched-titanium.xcf | Bin 0 -> 34824 bytes info.json | 3 +- locale/en/ore-refining.cfg | 12 +++- titanium-enriched.lua | 99 +++++++++++++++++++++++++++ titanium-ore.lua | 2 +- titanium-recipe.lua | 61 ++++++++++------- 9 files changed, 149 insertions(+), 31 deletions(-) create mode 100644 graphics/icons/enriched-titanium.png create mode 100644 graphics/icons/enriched-titanium.xcf create mode 100644 titanium-enriched.lua 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 0000000000000000000000000000000000000000..efb6ca0468fd8c3914ae7ec1a6037af0d6bfd5bf GIT binary patch literal 19766 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 literal 0 HcmV?d00001 diff --git a/graphics/icons/enriched-titanium.xcf b/graphics/icons/enriched-titanium.xcf new file mode 100644 index 0000000000000000000000000000000000000000..1af5f52c432f85a2cb19960b88de7dbdb888b901 GIT binary patch literal 34824 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

A!gJZZ0QHwRv+{On#zI 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 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( }, } ) - -