diff --git a/changelog.txt b/changelog.txt index 4349844..27eb9cd 100644 --- a/changelog.txt +++ b/changelog.txt @@ -1,5 +1,10 @@ --------------------------------------------------------------------------------------------------- Version: 0.8.3 +Date: 2020-12-07 + Features: + - Compatible with Modmash +--------------------------------------------------------------------------------------------------- +Version: 0.8.3 Date: 2020-12-07 Features: - Compatible with 5Dim's diff --git a/data-final-fixes.lua b/data-final-fixes.lua index 815de8e..d3f8836 100644 --- a/data-final-fixes.lua +++ b/data-final-fixes.lua @@ -19,5 +19,8 @@ require("titanium-recipe-final-transport") -- 5Dim's final fixes require("titanium-recipe-final-5d") +-- Modmash final fixes +require("titanium-recipe-final-modmash") + require("titanium-data-final-settings") diff --git a/info.json b/info.json index d5963aa..e5c6d7d 100644 --- a/info.json +++ b/info.json @@ -1,6 +1,6 @@ { "name": "bztitanium", - "version": "0.8.3", + "version": "0.9.0", "factorio_version": "1.1", "title": "Titanium", "author": "Brevven", @@ -15,7 +15,8 @@ "? Pre0-17-60Oil", "? Deadlock-SE-bridge", "? deadlock-beltboxes-loaders", - "? DeadlockCrating" + "? DeadlockCrating", + "? modmashsplinterresources" ], "description": "Adds titanium to the base game.\n\nTitanium is used in Low Density Structures, Flying Robot Frames and a few other places.\n\nCompatible with Krastorio 2, Space Exploration, Aircraft, 5Dim's, FE+ and other mods." } diff --git a/titanium-recipe-final-modmash.lua b/titanium-recipe-final-modmash.lua new file mode 100644 index 0000000..0fcedcb --- /dev/null +++ b/titanium-recipe-final-modmash.lua @@ -0,0 +1,33 @@ +if mods["modmashsplinter"] then + if mods["modmashsplinterresources"] then + util.remove_raw("recipe", "titanium-extraction-process") + + data.raw.recipe["alien-enrichment-process-to-titanium-ore"].icons = { + { icon = "__modmashsplinterresources__/graphics/icons/alien-ooze.png", icon_size = 64}, + { icon = "__bztitanium__/graphics/icons/titanium-ore.png", icon_size = 32, scale=0.5, shift= {8, 8}}, + } + + if mods["modmashsplinterenrichment"] then + data.raw.recipe["ore-enrichment-process-titanium-ore"].icons = { + { icon = "__base__/graphics/icons/fluid/steam.png", icon_size = 64}, + { icon = "__bztitanium__/graphics/icons/titanium-ore.png", icon_size = 32, scale=0.5, shift= {8, 8}}, + } + end + end + + if mods["modmashsplinterlogistics"] then + util.steel_to_titanium(data.raw.recipe["regenerative-transport-belt"]) + util.steel_to_titanium(data.raw.recipe["regenerative-transport-belt"].normal) + util.steel_to_titanium(data.raw.recipe["regenerative-transport-belt"].expensive) + util.steel_to_titanium(data.raw.recipe["regenerative-splitter"]) + util.steel_to_titanium(data.raw.recipe["regenerative-splitter"].normal) + util.steel_to_titanium(data.raw.recipe["regenerative-splitter"].expensive) + util.steel_to_titanium(data.raw.recipe["regenerative-underground-belt-structure"]) + util.steel_to_titanium(data.raw.recipe["regenerative-underground-belt-structure"].normal) + util.steel_to_titanium(data.raw.recipe["regenerative-underground-belt-structure"].expensive) + util.steel_to_titanium(data.raw.recipe["regenerative-mini-loader"]) + util.steel_to_titanium(data.raw.recipe["regenerative-mini-loader"].normal) + util.steel_to_titanium(data.raw.recipe["regenerative-mini-loader"].expensive) + end + +end diff --git a/titanium-recipe.lua b/titanium-recipe.lua index a282d0c..1ac5507 100644 --- a/titanium-recipe.lua +++ b/titanium-recipe.lua @@ -9,6 +9,11 @@ if mods["FactorioExtended-Plus-Core"] then util.remove_raw("technology", "titanium-processing") end +if mods["modmashsplinterresources"] then + util.remove_raw("item", "titanium-plate") + util.remove_raw("recipe", "titanium-extraction-process") +end + data:extend( { {