diff --git a/changelog.txt b/changelog.txt index 35abcb2..8c3452a 100644 --- a/changelog.txt +++ b/changelog.txt @@ -1,4 +1,9 @@ --------------------------------------------------------------------------------------------------- +Version: 0.9.5 +Date: 2020-12-29 + Changes: + - Base "naive" compatibility with AngelBob +--------------------------------------------------------------------------------------------------- Version: 0.9.4 Date: 2020-12-29 Changes: diff --git a/data-util.lua b/data-util.lua index 312f33c..367b379 100644 --- a/data-util.lua +++ b/data-util.lua @@ -50,7 +50,7 @@ end --- Add titanium processing as a prerequisite to a given technology function data_util.add_titanium_prerequisite(technology) - if mods["pyrawores"] then + if (mods["pyrawores"] or mods["bobplates"] or mods["angelssmelting"]) then return end table.insert(technology.prerequisites, data_util.titanium_processing) diff --git a/info.json b/info.json index cb224f8..2e6ed37 100644 --- a/info.json +++ b/info.json @@ -1,6 +1,6 @@ { "name": "bztitanium", - "version": "0.9.4", + "version": "0.9.5", "factorio_version": "1.1", "title": "Titanium", "author": "Brevven", diff --git a/titanium-recipe-final.lua b/titanium-recipe-final.lua index e449111..68e7041 100644 --- a/titanium-recipe-final.lua +++ b/titanium-recipe-final.lua @@ -8,11 +8,12 @@ util.steel_to_titanium(data.raw.recipe["low-density-structure"].normal) util.steel_to_titanium(data.raw.recipe["low-density-structure"].expensive) util.add_titanium_prerequisite(data.raw.technology["low-density-structure"]) -util.steel_to_titanium(data.raw.recipe["flying-robot-frame"]) -util.steel_to_titanium(data.raw.recipe["flying-robot-frame"].normal) -util.steel_to_titanium(data.raw.recipe["flying-robot-frame"].expensive) - -util.add_titanium_prerequisite(data.raw.technology["robotics"]) +if (not mods["bobplates"] and not mods["angelssmelting"]) then + util.steel_to_titanium(data.raw.recipe["flying-robot-frame"]) + util.steel_to_titanium(data.raw.recipe["flying-robot-frame"].normal) + util.steel_to_titanium(data.raw.recipe["flying-robot-frame"].expensive) + util.add_titanium_prerequisite(data.raw.technology["robotics"]) +end -- Memory storage changes diff --git a/titanium-recipe-updates.lua b/titanium-recipe-updates.lua index d9b75ee..72c2313 100644 --- a/titanium-recipe-updates.lua +++ b/titanium-recipe-updates.lua @@ -2,15 +2,18 @@ -- local util = require("__bztitanium__.data-util"); -util.steel_to_titanium(data.raw.recipe["power-armor"]) -util.add_titanium_prerequisite(data.raw.technology["power-armor"]) +if (not mods["bobplates"] and not mods["angelssmelting"]) then + util.steel_to_titanium(data.raw.recipe["power-armor"]) + util.add_titanium_prerequisite(data.raw.technology["power-armor"]) --- All equipment that uses steel now uses titanium. Who wants to carry around steel! -for name, recipe in pairs(data.raw.recipe) do - if recipe.result ~= nil and recipe.result:find("equipment") then - util.steel_to_titanium(recipe) - end + -- All equipment that uses steel now uses titanium. Who wants to carry around steel! + for name, recipe in pairs(data.raw.recipe) do + if recipe.result ~= nil and recipe.result:find("equipment") then + util.steel_to_titanium(recipe) + end + end end + -- Generally, steel-based equipment techs require solar panel tech, so only require -- titanium processing for that. util.add_titanium_prerequisite(data.raw.technology["solar-panel-equipment"]) diff --git a/titanium-recipe.lua b/titanium-recipe.lua index c7fcac0..164576c 100644 --- a/titanium-recipe.lua +++ b/titanium-recipe.lua @@ -14,7 +14,7 @@ if mods["modmashsplinterresources"] then util.remove_raw("recipe", "titanium-extraction-process") end -if not mods["pyrawores"] then +if (not mods["pyrawores"] and not mods["bobplates"] and not mods["angelssmelting"]) then data:extend( { {