diff --git a/changelog.txt b/changelog.txt index 9823bf9..145f1fc 100644 --- a/changelog.txt +++ b/changelog.txt @@ -1,9 +1,15 @@ --------------------------------------------------------------------------------------------------- +Version: 0.8.0 +Date: 2020-11-27 + Changes: + - Capitalization + Features: + - Initial support for 5Dim's mod. (Not available until 5Dim's is updated to 1.1) +--------------------------------------------------------------------------------------------------- Version: 0.7.0 Date: 2020-11-23 Changes: - Support 1.1 - --------------------------------------------------------------------------------------------------- Version: 0.6.11 Date: 2020-11-23 diff --git a/data-final-fixes.lua b/data-final-fixes.lua index 27e3a56..815de8e 100644 --- a/data-final-fixes.lua +++ b/data-final-fixes.lua @@ -16,5 +16,8 @@ require("titanium-recipe-final-stacking") -- Various playter transport mods like Aircraft require("titanium-recipe-final-transport") +-- 5Dim's final fixes +require("titanium-recipe-final-5d") + require("titanium-data-final-settings") diff --git a/graphics/icons/titanium-powder.png b/graphics/icons/titanium-powder.png new file mode 100644 index 0000000..7340f60 Binary files /dev/null and b/graphics/icons/titanium-powder.png differ diff --git a/graphics/icons/titanium-powder.xcf b/graphics/icons/titanium-powder.xcf new file mode 100644 index 0000000..17fd057 Binary files /dev/null and b/graphics/icons/titanium-powder.xcf differ diff --git a/info.json b/info.json index a75b2d9..0fbf7e9 100644 --- a/info.json +++ b/info.json @@ -1,6 +1,6 @@ { "name": "bztitanium", - "version": "0.7.0", + "version": "0.8.0", "factorio_version": "1.1", "title": "Titanium", "author": "Brevven", diff --git a/locale/en/ore-refining.cfg b/locale/en/ore-refining.cfg index 0e3097d..963e825 100644 --- a/locale/en/ore-refining.cfg +++ b/locale/en/ore-refining.cfg @@ -2,11 +2,12 @@ titanium-ore=Titanium [autoplace-control-names] -titanium-ore=Titanium Ore +titanium-ore=Titanium ore [item-name] -titanium-ore=Titanium Ore -titanium-plate=Titanium Plate +titanium-ore=Titanium ore +titanium-dust=Titanium dust +titanium-plate=Titanium plate titanium-alloy=__ITEM__titanium-plate__ enriched-titanium=Enriched titanium diff --git a/titanium-recipe-final-5d.lua b/titanium-recipe-final-5d.lua new file mode 100644 index 0000000..88e8d6d --- /dev/null +++ b/titanium-recipe-final-5d.lua @@ -0,0 +1,110 @@ +local util = require("__bztitanium__.data-util"); + +if mods["5dim_core"] then + + data.raw.item["titanium-plate"].subgroup = "plates-plates" + data.raw.recipe["titanium-plate"].subgroup = "plates-plates" + + -- Industrial furnace + data:extend({ + { + type = "recipe", + name = "titanium-plate-industrial-ore", + category = "industrial-furnace", + subgroup = "plates-industrial-ore", + order = "ad[titanium-plate]", + icon = "__bztitanium__/graphics/icons/titanium-plate.png", + icon_size = 64, + enabled = false, + energy_required = 140, + ingredients = {{"titanium-ore", 425}}, + result = util.titanium_plate, + result_count = 100, + } + }) + table.insert(data.raw.technology["titanium-processing"].effects, + {type = "unlock-recipe", recipe="titanium-plate-industrial-ore"}) + + + -- Titanium dust + data:extend( + { + { + type = "item", + name = "titanium-dust", + icon_size = 32, + subgroup = "plates-dust", + order = "d[titanium-plate]", + icon = "__bztitanium__/graphics/icons/titanium-powder.png", + icon_size = 64, + stack_size = 200 + }, + { + type = "recipe", + name = "titanium-plate-dust", + icon = "__bztitanium__/graphics/icons/titanium-plate.png", + icon_size = 64, + subgroup = "plates-plates2", + order = "d[titanium-plate]", + category = "smelting", + energy_required = 8, + enabled = false, + ingredients = { + {"titanium-dust", 5} + }, + result = util.titanium_plate + }, + { + type = "recipe", + name = "titanium-dust", + category = "mashering", + order = "d[titanium-plate]", + energy_required = 3.2, + enabled = false, + ingredients = { + {"titanium-ore", 1} + }, + result = "titanium-dust", + result_count = 2 + }, + { + type = "recipe", + name = "titanium-plate-industrial-dust", + category = "industrial-furnace", + subgroup = "plates-industrial-dust", + order = "ad[titanium-plate]", + icon = "__bztitanium__/graphics/icons/titanium-plate.png", + icon_size = 64, + enabled = false, + energy_required = 140, + ingredients = {{"titanium-dust", 425}}, + result = util.titanium_plate, + result_count = 100, + } + }) + table.insert(data.raw.technology["titanium-processing"].effects, + {type = "unlock-recipe", recipe="titanium-dust"}) + table.insert(data.raw.technology["titanium-processing"].effects, + {type = "unlock-recipe", recipe="titanium-plate-dust"}) + table.insert(data.raw.technology["titanium-processing"].effects, + {type = "unlock-recipe", recipe="titanium-plate-industrial-dust"}) + + + -- Vehicles + if mods["5dim_vehicle"] then + util.steel_to_titanium(data.raw.recipe["5d-air-plane"]) + util.steel_to_titanium(data.raw.recipe["5d-air-plane"].normal) + util.steel_to_titanium(data.raw.recipe["5d-air-plane"].expensive) + util.steel_to_titanium(data.raw.recipe["5d-boat"]) + util.steel_to_titanium(data.raw.recipe["5d-boat"].normal) + util.steel_to_titanium(data.raw.recipe["5d-boat"].expensive) + end + + if mods["5dim_transport"] then + util.steel_to_titanium(data.raw.recipe["5d-mk5-transport-belt"]) + util.steel_to_titanium(data.raw.recipe["5d-mk5-transport-belt"].normal) + util.steel_to_titanium(data.raw.recipe["5d-mk5-transport-belt"].expensive) + end + + +end