diff --git a/changelog.txt b/changelog.txt index b406035..54f5a9c 100644 --- a/changelog.txt +++ b/changelog.txt @@ -1,4 +1,12 @@ --------------------------------------------------------------------------------------------------- +Version: 0.10.10 +Date: 2021-05-01 + Fixes: + - Fixed startup error with angels smelting. + - Fixed equipment not using titanium + Features: + - Some basic compatibility with angels smelting (without bobs) +--------------------------------------------------------------------------------------------------- Version: 0.10.9 Date: 2021-04-30 Features: diff --git a/info.json b/info.json index be9c83b..0c906e3 100644 --- a/info.json +++ b/info.json @@ -1,6 +1,6 @@ { "name": "bztitanium", - "version": "0.10.9", + "version": "0.10.10", "factorio_version": "1.1", "title": "Titanium", "author": "Brevven", diff --git a/map-gen-preset-updates.lua b/map-gen-preset-updates.lua index 3d1443a..060fbf4 100644 --- a/map-gen-preset-updates.lua +++ b/map-gen-preset-updates.lua @@ -1,11 +1,15 @@ -if (not mods["pyrawores"] and not mods["bobplates"] and not mods["angelssmelting"]) then +local base_ore = "iron-ore" +if mods["angelssmelting"] then + base_ore = "angels-ore1" +end +if (not mods["pyrawores"] and not mods["bobplates"]) then if data.raw["map-gen-presets"] and data.raw["map-gen-presets"].default then for name, preset in pairs(data.raw["map-gen-presets"].default) do if type(preset) == "table" and preset.basic_settings and preset.basic_settings.autoplace_controls and - preset.basic_settings.autoplace_controls["iron-ore"] then - preset.basic_settings.autoplace_controls["titanium-ore"] = preset.basic_settings.autoplace_controls["iron-ore"] + preset.basic_settings.autoplace_controls[base_ore] then + preset.basic_settings.autoplace_controls["titanium-ore"] = preset.basic_settings.autoplace_controls[base_ore] end end end diff --git a/titanium-data-final-settings.lua b/titanium-data-final-settings.lua index f8a6dcf..6fd8406 100644 --- a/titanium-data-final-settings.lua +++ b/titanium-data-final-settings.lua @@ -17,7 +17,9 @@ elseif mining_fluid == "sulfuric-acid" then data.raw.technology[util.titanium_processing].unit.ingredients = { {"automation-science-pack", 1}, {"logistic-science-pack", 1}} else - data.raw.technology[util.titanium_processing].prerequisites = {"lubricant"} + if data.raw.technology["titanium-processing"] then + data.raw.technology["titanium-processing"].prerequisites = {"lubricant"} + end if not mods["Pre0-17-60Oil"] then data.raw.technology["solar-panel-equipment"].unit.ingredients = { {"automation-science-pack", 1}, {"logistic-science-pack", 1}, {"chemical-science-pack", 1}} diff --git a/titanium-recipe-final.lua b/titanium-recipe-final.lua index bcac9c1..e688c9b 100644 --- a/titanium-recipe-final.lua +++ b/titanium-recipe-final.lua @@ -12,7 +12,7 @@ if not mods["bobrevamp"] then util.add_titanium_prerequisite("low-density-structure") end -if (not mods["bobplates"] and not mods["angelssmelting"]) then +if (not mods["bobplates"]) then util.steel_to_titanium("flying-robot-frame") util.add_titanium_prerequisite("robotics") end diff --git a/titanium-recipe-updates.lua b/titanium-recipe-updates.lua index e873c5d..14822cb 100644 --- a/titanium-recipe-updates.lua +++ b/titanium-recipe-updates.lua @@ -2,10 +2,15 @@ -- local util = require("__bztitanium__.data-util"); -if (not mods["bobplates"] and not mods["angelssmelting"]) then +if (not mods["bobplates"]) then util.replace_ingredient("power-armor", "steel", "titanium") util.add_prerequisite("power-armor", util.titanium_processing) + -- Generally, steel-based equipment techs require solar panel tech, so only require + -- titanium processing for that. + util.add_prerequisite("solar-panel-equipment", util.titanium_processing) + + -- 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 @@ -14,10 +19,6 @@ if (not mods["bobplates"] and not mods["angelssmelting"]) then end end --- Generally, steel-based equipment techs require solar panel tech, so only require --- titanium processing for that. -util.add_prerequisite("solar-panel-equipment", util.titanium_processing) - -- Also add titanium to some nuclear steam-handling stuff util.add_titanium_ingredient(20, "steam-turbine") diff --git a/titanium-recipe.lua b/titanium-recipe.lua index c34193f..b9e4348 100644 --- a/titanium-recipe.lua +++ b/titanium-recipe.lua @@ -18,9 +18,8 @@ if (mods["bobrevamp"] and not mods["bobores"]) then util.remove_raw("technology", "titanium-processing") end -if (not mods["pyrawores"] and not mods["bobplates"] and not mods["angelssmelting"]) then -data:extend( -{ +if (not mods["pyrawores"] and not mods["bobplates"]) then +data:extend({ { type = "recipe", name = util.titanium_plate, @@ -117,7 +116,6 @@ data:extend( result_count = 10, } } or nil, -} -) +}) end