diff --git a/changelog.txt b/changelog.txt index f4ed86a..ef92a4b 100644 --- a/changelog.txt +++ b/changelog.txt @@ -1,4 +1,9 @@ --------------------------------------------------------------------------------------------------- +Version: 0.11.0 +Date: 2021-06-14 + Features: + - EndgameCombat compatibility +--------------------------------------------------------------------------------------------------- Version: 0.10.14 Date: 2021-05-23 Features: diff --git a/compatibility/titanium-endgame-combat-data.lua b/compatibility/titanium-endgame-combat-data.lua new file mode 100644 index 0000000..5790510 --- /dev/null +++ b/compatibility/titanium-endgame-combat-data.lua @@ -0,0 +1,41 @@ +-- First part of hack for endgame combat +if mods["EndgameCombat"] and not mods["pyrawores"] and not mods["bobplates"] and not mods["angelssmelting"] then + +local dummy_items = {"cobalt-steel", "nickel", "aluminium"} +if not mods.bztungsten then + table.insert(dummy_items, "tungsten") +end +for i, dummy in pairs(dummy_items) do + if not data.raw.item[dummy] then + data:extend({{ + type = "item", + name = dummy, + icon = "__bztitanium__/graphics/icons/titanium-plate.png", + icon_size = 64, icon_mipmaps = 3, + subgroup = "raw-material", + order = "zzzz-dummy", + stack_size = 100, + }}) + end +end +local dummy_techs = {"cobalt-processing", "nickel-processing", "aluminium-processing", "tungsten-processing"} +for i, dummy in pairs(dummy_techs) do + if not data.raw.technology[dummy] then + data:extend({{ + type = "technology", + name = dummy, + icon_size = 256, icon_mipmaps = 4, + icon = "__bztitanium__/graphics/technology/titanium-processing.png", + effects = nil, + unit = + { + count = 1, + ingredients = {{"automation-science-pack", 1}}, + time = 1 + }, + order = "zzzz-dummy", + }}) + end +end + +end diff --git a/compatibility/titanium-endgame-combat-final.lua b/compatibility/titanium-endgame-combat-final.lua new file mode 100644 index 0000000..9f2d8b9 --- /dev/null +++ b/compatibility/titanium-endgame-combat-final.lua @@ -0,0 +1,39 @@ +-- Second part of hack for endgame combat +if mods["EndgameCombat"] and not mods["pyrawores"] and not mods["bobplates"] and not mods["angelssmelting"] then + +local util = require("__bztitanium__.data-util"); + +local dummy_items = {"cobalt-steel", "nickel", "aluminium"} +if not mods.bztungsten then + table.insert(dummy_items, "tungsten") +end +for i, dummy in pairs(dummy_items) do + util.remove_raw("item", dummy) +end + +local dummy_techs = {"cobalt-processing", "nickel-processing", "aluminium-processing"} +if not mods.bztungsten then + table.insert(dummy_techs, "tungsten-processing") +end +for i, dummy in pairs(dummy_techs) do + util.remove_raw("technology", dummy) +end + +util.remove_ingredient("cannon-turret", "cobalt-steel") +util.remove_prerequisite("cannon-turrets", "cobalt-processing") + +util.remove_ingredient("shockwave-turret", "nickel") +util.remove_prerequisite("shockwave-turrets", "nickel-processing") + +util.remove_ingredient("acid-turret", "aluminium") +util.remove_prerequisite("acid-turrets", "aluminium-processing") + +util.remove_ingredient("power-armor-mk3", "copper-tungsten-alloy") +util.remove_prerequisite("power-armor-mk3", "nitinol-processing") +if not mods.bztungsten then + util.remove_prerequisite("power-armor-mk3", "tungsten-processing") + + util.remove_ingredient("lightning-turret", "tungsten") + util.remove_prerequisite("lightning-turrets", "tungsten-processing") +end +end diff --git a/data-final-fixes.lua b/data-final-fixes.lua index aeed555..6703b12 100644 --- a/data-final-fixes.lua +++ b/data-final-fixes.lua @@ -27,3 +27,7 @@ require("titanium-recipe-final-modmash") require("titanium-data-final-settings") + + +-- Second part of hack for endgame combat +require("compatibility/titanium-endgame-combat-final") diff --git a/data.lua b/data.lua index 47fb460..6df808c 100644 --- a/data.lua +++ b/data.lua @@ -5,3 +5,5 @@ require("titanium-enriched") -- Enriched Ti for Krastorio 2 require("titanium-recipe-se") -- Space Exploration special recipes (depends on K2 if present) require("titanium-compressed") +-- First part of hack for endgame combat +require("compatibility/titanium-endgame-combat-data") diff --git a/info.json b/info.json index e525a89..9fc17d5 100644 --- a/info.json +++ b/info.json @@ -1,6 +1,6 @@ { "name": "bztitanium", - "version": "0.10.14", + "version": "0.11.0", "factorio_version": "1.1", "title": "Titanium", "author": "Brevven", @@ -18,6 +18,7 @@ "? deadlock-beltboxes-loaders", "? DeadlockCrating", "? modmashsplinterresources", + "? EndgameCombat", "! nullius" ], "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."