2.1.17

bztin2/changelog.txt

@@ -1,4 +1,11 @@
 ---------------------------------------------------------------------------------------------------
+Version: 2.1.17
+Date: 21.10.2025
+  Changes:
+    - Switch to bz mods forks
+  Bug Fixes:
+    - Correct tin plate recipe for K2
+---------------------------------------------------------------------------------------------------
 Version: 2.1.16
 Date: 20.10.2025
   Legacy version meant to be played with my other forks and ATOM.

bztin2/info.json

@@ -1,6 +1,6 @@
 {
   "name": "bztin2",
-  "version": "2.1.16",
+  "version": "2.1.17",
   "factorio_version": "2.0",
   "title": "Tin - Legacy",
   "description": "Adds tin, solder and more to the base game.",
@@ -9,9 +9,9 @@
   "dependencies": [
     "base >= 2.0.0",
     "? bzfoundry2 >= 2.0.0",
-    "? bztitanium >= 1.2.0",
+    "? bztitanium2 >= 2.0.27",
     "? bzlead2 >= 2.0.29",
-    "? bzzirconium >= 0.6.0",
+    "? bzzirconium2 >= 2.1.14",
     "? bztungsten2 >= 2.0.0",
     "? bzcarbon2 >= 2.0.22",
     "? bzaluminum2 >= 0.4.9",

bztin2/tin-recipe-updates.lua

@@ -20,7 +20,7 @@ if mods["space-age"] then
   util.add_prerequisite("moon-discovery-cerys", "alloy-separation")
 end
 
-if mods.bztitanium then
+if mods["bztitanium2"] then
   util.replace_ingredient("superconductor", "titanium-plate", "tin-plate")
 else
   util.add_ingredient("superconductor", "tin-plate", 1)

bztin2/tin-recipe.lua

@@ -2,7 +2,6 @@
 
 local item_sounds = require('__base__.prototypes.item_sounds')
 local util = require("data-util");
-local futil = require("util");
 
 if (not mods["pyrawores"] and not mods["bobplates"] and not mods["angelssmelting"]) then
   data:extend({
@@ -19,34 +18,14 @@ data:extend({
           { icon = "__bztin2__/graphics/icons/tin-plate.png", icon_size = 128 },
         }
       ),
-    -- (mods["Krastorio2"] and
-    --    {
-    --      main_product = "tin-plate",
-    --      enabled = true,
-    --      energy_required = 12,
-    --      ingredients = {{"tin-ore", 10}},
-    --      results = {
-    --        {type="item", name = "tin-plate", amount=5}
-    --      }
-    --    } or
       main_product = "tin-plate",
       enabled = true,
-    energy_required = 2.4,
-    ingredients = {util.item("tin-ore", 1)},
+      energy_required = mods["Krastorio2"] and 12 or 2.4,
+      ingredients = { util.item("tin-ore", mods["Krastorio2"] and 10 or 1) },
       results = {
-      {type="item", name = "tin-plate", amount=1}
+        { type = "item", name = "tin-plate", amount = mods["Krastorio2"] and 5 or 1 }
       },
       allow_productivity = true,
-    -- expensive =
-    -- {
-    --   main_product = "tin-plate",
-    --   enabled = true,
-    --   energy_required = 4.8,
-    --   ingredients = {{"tin-ore", 1}},
-    --   results = {
-    --     {type="item", name = "tin-plate", amount=1},
-    --   }
-    -- }
     },
     {
       type = "item",
@@ -126,13 +105,15 @@ data:extend({
         icons = {
           { icon = "__bztin2__/graphics/icons/solder.png",    icon_size = 128, scale = 0.33, shift = { 0, -6 } },
           { icon = "__bztin2__/graphics/icons/tin-plate.png", icon_size = 128, scale = 0.25, shift = { -6, 4 } },
-      mods["bzlead2"] and {icon = "__bzlead2__/graphics/icons/lead-plate.png", icon_size = 64, scale = 0.5, shift = {6,4}} or
+          mods["bzlead2"] and
+          { icon = "__bzlead2__/graphics/icons/lead-plate.png", icon_size = 64, scale = 0.5, shift = { 6, 4 } } or
           { icon = "__base__/graphics/icons/copper-plate.png", icon_size = 64, scale = 0.5, shift = { 6, 4 } },
         },
         effects = {},
         prerequisites = { "metallurgic-science-pack", "electromagnetic-science-pack" },
         unit = {
-      count = 250, time = 30,
+          count = 250,
+          time = 30,
           ingredients = {
             { "chemical-science-pack",        1 },
             { "electromagnetic-science-pack", 1 },
@@ -154,7 +135,8 @@ if mods.bzaluminum2 and not mods["bzlead2"] then
           { type = "unlock-recipe", recipe = "solder" },
         },
         unit = {
-      count = 10, time = 15,
+          count = 10,
+          time = 15,
           ingredients = { { "automation-science-pack", 1 } },
         },
         prerequisites = { "copper-processing" },
@@ -213,7 +195,8 @@ data:extend({
         { type = "unlock-recipe", recipe = "organotins" },
       },
       unit = {
-      count = 50, time = 30,
+        count = 50,
+        time = 30,
         ingredients = { { "automation-science-pack", 1 }, { "logistic-science-pack", 1 } },
       },
       prerequisites = { "oil-processing" },
@@ -229,7 +212,8 @@ data:extend({
         type = "item",
         name = "tinned-cable",
         icon = "__bztin2__/graphics/icons/tinned-cable.png",
-    icon_size = 64, icon_mipmaps = 4,
+        icon_size = 64,
+        icon_mipmaps = 4,
         subgroup = util.cablesg,
         order = "b[tinned-cable]",
         stack_size = util.get_stack_size(100),
@@ -253,12 +237,14 @@ data:extend({
         type = "technology",
         name = "tinned-cable",
         icon = "__bztin2__/graphics/icons/tinned-cable.png",
-    icon_size = 64, icon_mipmaps = 4,
+        icon_size = 64,
+        icon_mipmaps = 4,
         effects = {
           { type = "unlock-recipe", recipe = "tinned-cable" },
         },
         unit = {
-      count = 50, time = 15,
+          count = 50,
+          time = 15,
           ingredients = { { "automation-science-pack", 1 }, { "logistic-science-pack", 1 } },
         },
         prerequisites = { "logistic-science-pack" },
@@ -394,7 +380,7 @@ data:extend({
           { icon = "__bztin2__/graphics/icons/tin-ore.png", icon_size = 64 },
           { icon = "__base__/graphics/icons/fluid/steam.png", icon_size = 64, tint = { r = .9, g = .9, b = .1, a = .7 }, scale = 0.5, shift = { -8, -8 } },
         },
-    ingredients = mods.bztitanium and {
+        ingredients = mods["bztitanium2"] and {
           util.fluid("tin-sulfides", 40),
           util.fluid("vacuum", 1),
         } or {