diff --git a/changelog.txt b/changelog.txt index 801c2c9..8348d42 100644 --- a/changelog.txt +++ b/changelog.txt @@ -1,4 +1,10 @@ --------------------------------------------------------------------------------------------------- +Version: 0.1.6 +Date: 2022-08-19 + Changes: + - When used with Aluminum but not Lead, add new solder tech after copper-processing. + - Minor recipe tweaks, including simpler pipe to ground +--------------------------------------------------------------------------------------------------- Version: 0.1.5 Date: 2022-08-17 Fixes: diff --git a/info.json b/info.json index 95c2af2..4b073ea 100644 --- a/info.json +++ b/info.json @@ -1,6 +1,6 @@ { "name": "bztin", - "version": "0.1.5", + "version": "0.1.6", "factorio_version": "1.1", "title": "Tin", "author": "Brevven", diff --git a/locale/en/tin.cfg b/locale/en/tin.cfg index 53e6114..21d7017 100644 --- a/locale/en/tin.cfg +++ b/locale/en/tin.cfg @@ -28,6 +28,7 @@ tinned-cable=Tinned cable organotin-chemistry=Organotin chemistry tin-matter-processing=Tin conversion glassmaking=Glassmaking +solder=__ITEM__solder__ [technology-description] tinned-cable=Tinned copper cables to prevent corrosion diff --git a/tin-recipe-updates.lua b/tin-recipe-updates.lua index cfbeecc..8f93bf4 100644 --- a/tin-recipe-updates.lua +++ b/tin-recipe-updates.lua @@ -10,8 +10,7 @@ util.add_ingredient("slowdown-capsule", "organotins", 5) util.set_category("poison-capsule", "crafting-with-fluid") util.set_category("slowdown-capsule", "crafting-with-fluid") -util.replace_some_ingredient("pipe-to-ground", "lead-plate", 3, "solder", 3) -util.replace_some_ingredient("pipe-to-ground", "iron-plate", 3, "solder", 3) +util.replace_ingredient("pipe-to-ground", mods.bzlead and "lead-plate" or "iron-plate", "solder", 4) util.remove_ingredient("chemical-plant", "tungsten-plate") -- keep ingredients managable util.replace_some_ingredient("advanced-circuit", "copper-cable", 1, "solder", 1) @@ -158,6 +157,7 @@ if util.me.use_bronze() then util.add_ingredient("electric-engine-unit", "bronze-plate", 1) util.replace_some_ingredient("se-heavy-bearing", "se-iridium-plate", 1, "bronze-plate", 1) + end diff --git a/tin-recipe.lua b/tin-recipe.lua index 83d51f4..13c64e9 100644 --- a/tin-recipe.lua +++ b/tin-recipe.lua @@ -85,6 +85,29 @@ data:extend({ } }) +if mods.bzaluminum and not mods.bzlead then + data:extend({ + { + type = "technology", + name = "solder", + icon = "__bztin__/graphics/icons/solder.png", + icon_size = 128, + effects = { + { type = "unlock-recipe", recipe = "solder" }, + { type = "unlock-recipe", recipe = "pipe-to-ground" }, + }, + unit = { + count = 10, time = 15, + ingredients = {{"automation-science-pack", 1}}, + }, + prerequisites = {"copper-processing"}, + }, + }) + util.add_unlock_force("solder", "pipe-to-ground") + util.add_unlock_force("solder", "solder") + util.add_prerequisite("electronics", "solder") +end + data:extend({ { type = "fluid",