k2, se, stacking

changelog.txt

@@ -1,7 +1,9 @@
 ---------------------------------------------------------------------------------------------------
 Version: 0.0.1
-Date: 2022-07-01
+Date: 2022-07-04
   Features:
-    - Alpha release. Adds tin, solder, and other optional intermediates
+    - Alpha release. Adds tin, solder, organotins, and (optionally) tinned cable
     - Compatible with Krastorio 2
     - Compatible with Space Exploration
+    - Compatible with deadlock stacking/crating
+    - Compatible with many other mods

data-final-fixes.lua

@@ -1,4 +1,4 @@
--- require("tin-recipe-final-stacking")
+require("tin-recipe-final-stacking")
 require("tin-recipe-modules")
 -- require("tin-recipe-final-5d")
 require("tin-recipe-final-rrr")
@@ -9,5 +9,13 @@ util.add_product("se-glass-vulcanite", {type="item", name="tin-plate", amount=1,
 util.set_main_product("se-glass-vulcanite", "glass")
 
 
+
+-- Electronic circuits need final fixes
+util.multiply_recipe("electronic-circuit-stone", 2)
+util.replace_some_ingredient("electronic-circuit-stone", "copper-cable", 1, "solder", 1)
+
+util.multiply_recipe("electronic-circuit", 2)
+util.replace_some_ingredient("electronic-circuit", "copper-cable", 1, "solder", 1)
+
 -- Must be last
 util.create_list()

info.json

@@ -9,17 +9,17 @@
     "dependencies": [
       "base >= 1.1.0",
       "bzfoundry",
-      "? bztitanium >= 1.1.1",
+      "? bztitanium >= 1.2.0",
-      "? bzlead",
+      "? bzlead >= 1.2.0",
-      "? bzzirconium >= 0.5.4",
+      "? bzzirconium >= 0.6.0",
-      "? bztungsten >= 0.5.4",
+      "? bztungsten >= 0.6.0",
-      "? bzcarbon >= 0.2.0",
+      "? bzcarbon >= 0.3.0",
       "? space-exploration >= 0.6.0",
       "? aai-industry",
       "? Krastorio2",
       "? deadlock-beltboxes-loaders",
       "? DeadlockCrating"
     ],
-    "description": "Adds tin to the base game.\n\nCompatible with Krastorio 2 and Space Exploration. A standalone piece of BZ Mods."
+    "description": "Adds tin, solder and more to the base game.\n\nCompatible with Krastorio 2 and Space Exploration. A standalone piece of BZ Mods."
 }
 

locale/en/tin.cfg

@@ -2,12 +2,13 @@
 tin-ore=Tin ore
 
 [autoplace-control-names]
-tin-ore=Tin ore
+tin-ore=[item=tin-ore] Tin ore
 
 [item-name]
 tin-ore=Tin ore
 tin-dust=Tin dust
 tin-plate=Tin plate
+tin-ingot=Tin ingot
 solder=Solder
 tinned-cable=Tinned cable
 enriched-tin=Enriched tin
@@ -18,6 +19,7 @@ tin-ore=Can be smelted into tin plates
 enriched-tin=Can be efficiently smelted into tin plates
 
 [fluid-name]
+molten-tin=Molten tin
 organotins=Organotins
 
 [technology-name]

tin-enriched.lua

@@ -50,7 +50,6 @@ data:extend(
       tertiary = {r = 0.690, g = 0.768, b = 0.870, a = 0.000}, 
       quaternary = {r = 0.0, g = 0.980, b = 0.603, a = 0.900}
     },
-    subgroup = "raw-material",
     order = "e03[enriched-tin]"
   },
   {

tin-matter.lua

@@ -35,7 +35,7 @@ data:extend(
   },
 })
 
-local flake_graphite_matter = 
+local tin_ore_matter = 
 	{
     item_name = "tin-ore",
     minimum_conversion_quantity = 10,
@@ -44,20 +44,9 @@ local flake_graphite_matter =
     need_stabilizer = false,
     unlocked_by_technology = "tin-matter-processing"
 	}
-matter.createMatterRecipe(flake_graphite_matter)
+matter.createMatterRecipe(tin_ore_matter)
 
-local graphite_matter = 
+local tin_plate_matter = 
-	{
-    item_name = "alumina",
-    minimum_conversion_quantity = 10,
-    matter_value = 7.5,
-    energy_required = 2,
-    only_deconversion = true,
-    need_stabilizer = true,
-    unlocked_by_technology = "tin-matter-processing"
-	}
-matter.createMatterRecipe(graphite_matter)
-local graphite_matter = 
 	{
     item_name = "tin-plate",
     minimum_conversion_quantity = 10,
@@ -67,5 +56,5 @@ local graphite_matter =
     need_stabilizer = true,
     unlocked_by_technology = "tin-matter-processing"
 	}
-matter.createMatterRecipe(graphite_matter)
+matter.createMatterRecipe(tin_plate_matter)
 end

tin-ore.lua

@@ -40,7 +40,7 @@ data:extend({
       base_spots_per_km2 = 1,
       has_starting_area_placement = true,
       regular_rq_factor_multiplier = 1.0,
-      starting_rq_factor_multiplier = 1.3,
+      starting_rq_factor_multiplier = 1.0,
     },
 
     stage_counts = {15000, 9500, 5500, 2900, 1300, 400, 150, 80},
@@ -72,9 +72,9 @@ data:extend({
       icon = "__bztin__/graphics/icons/tin-ore.png",
       pictures = {
         {filename="__bztin__/graphics/icons/tin-ore.png", size=64, scale=0.25},
+        {filename="__bztin__/graphics/icons/tin-ore-1.png", size=64, scale=0.25},
         {filename="__bztin__/graphics/icons/tin-ore-2.png", size=64, scale=0.25},
         {filename="__bztin__/graphics/icons/tin-ore-3.png", size=64, scale=0.25},
-        {filename="__bztin__/graphics/icons/tin-ore-4.png", size=64, scale=0.25},
       },
       subgroup = "raw-resource",
       order = "t-c-a",

tin-recipe-final-stacking.lua

@@ -6,7 +6,9 @@ if deadlock then
   deadlock.add_stack("tin-ore",  "__bztin__/graphics/icons/stacked/tin-ore-stacked.png", "deadlock-stacking-1", 64)
   deadlock.add_stack("tin-plate",  "__bztin__/graphics/icons/stacked/tin-plate-stacked.png", "deadlock-stacking-1", 128)
   deadlock.add_stack("solder",  "__bztin__/graphics/icons/stacked/solder-stacked.png", "deadlock-stacking-1", 128)
-
+  if data.raw.item["tinned-cable"] then
+    deadlock.add_stack("tinned-cable", nil , "deadlock-stacking-2", nil)
+  end
   if mods.Krastorio2 then
     deadlock.add_stack("enriched-tin", "__bztin__/graphics/icons/stacked/enriched-tin-ore-stacked.png" , "deadlock-stacking-3", 128)
   end
@@ -17,5 +19,11 @@ if deadlock_crating then
   deadlock_crating.add_crate("tin-ore", "deadlock-crating-1")
   deadlock_crating.add_crate("tin-plate", "deadlock-crating-1")
   deadlock_crating.add_crate("solder", "deadlock-crating-1")
+  if data.raw.item["tinned-cable"] then
+    deadlock_crating.add_crate("tinned-cable", "deadlock-crating-2")
+  end
+  if mods.Krastorio2 then
+    deadlock_crating.add_crate("enriched-tin", "deadlock-crating-3")
+  end
 end
 

tin-recipe-modules.lua

@@ -3,9 +3,11 @@
 recipes = {"tin-plate", "solder", "organotins"}
 if mods["Krastorio2"] then
   table.insert(recipes, "enriched-tin")
+  table.insert(recipes, "enriched-tin-plate")
 end
 if mods["space-exploration"] then
   table.insert(recipes, "tin-smelting-vulcanite")
+  table.insert(recipes, "molten-tin")
   if mods["Krastorio2"] then
     table.insert(recipes, "enriched-tin-smelting-vulcanite")
   end

tin-recipe-se.lua

@@ -3,13 +3,13 @@ local util = require("data-util");
 
 if mods["space-exploration"] then
   se_delivery_cannon_recipes["tin-ore"] = {name= "tin-ore"}
-  se_delivery_cannon_recipes[util.me.titanium_plate] = {name= util.me.titanium_plate}
+  se_delivery_cannon_recipes["tin-plate"] = {name= "tin-plate"}
   data:extend({
   {
     type = "recipe",
     icons = {
       { icon = "__base__/graphics/icons/landfill.png", icon_size = 64, icon_mipmaps = 3 },
-      { icon = "__bztitanium__/graphics/icons/tin-ore.png", icon_size = 64, scale = 0.25},
+      { icon = "__bztin__/graphics/icons/tin-ore.png", icon_size = 64, scale = 0.25},
     },
     name = "landfill-tin-ore",
     category = "hard-recycling",
@@ -33,7 +33,7 @@ if mods["space-exploration"] then
   {
     type = "item",
     name = "tin-ingot",
-    icons = {{icon = "__bztitanium__/graphics/icons/tin-ingot.png", icon_size = 128}},
+    icons = {{icon = "__bztin__/graphics/icons/tin-ingot.png", icon_size = 128}},
     order = "b-b",
     stack_size = 50,
     subgroup = "tin",
@@ -45,7 +45,7 @@ if mods["space-exploration"] then
     max_temperature = 232,
     base_color = {r=191, g=219, b=233},
     flow_color = {r=191, g=219, b=233},
-    icons = {{icon = "__bztitanium__/graphics/icons/molten-tin.png", icon_size = 128}},
+    icons = {{icon = "__bztin__/graphics/icons/molten-tin.png", icon_size = 128}},
     order = "a[molten]-a",
     pressure_to_speed_ratio = 0.4,
     flow_to_energy_ratio = 0.59,
@@ -60,7 +60,7 @@ if mods["space-exploration"] then
     results = {
       {type = "fluid", name = "molten-tin", amount = mods.Krastorio2 and 750 or 900},
     },
-    energy_required = 60,
+    energy_required = 45,
     ingredients = {
       {name = mods.Krastorio2 and "enriched-tin" or "tin-ore", amount = 24},
       {type = "fluid", name = "se-pyroflux", amount = 10},
@@ -89,8 +89,8 @@ if mods["space-exploration"] then
     name = "tin-ingot-to-plate",
 
     icons = {
-      {icon = "__bztitanium__/graphics/icons/tin-plate.png", icon_size = 64, icon_mipmaps = 3},
+      {icon = "__bztin__/graphics/icons/tin-plate.png", icon_size = 128},
-      {icon = "__bztitanium__/graphics/icons/tin-ingot.png", icon_size = 128, scale = 0.25, shift = {-8, -8}},
+      {icon = "__bztin__/graphics/icons/tin-ingot.png", icon_size = 128, scale = 0.125, shift = {-8, -8}},
     },
     results = {
       {name = "tin-plate", amount = 10},

tin-recipe-updates.lua

@@ -12,14 +12,29 @@ 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.multiply_recipe("electronic-circuit", 2)
-util.replace_some_ingredient("electronic-circuit", "copper-cable", 1, "solder", 1)
-util.replace_some_ingredient("advanced-circuit", "copper-cable", 1, "solder", 1)
 util.remove_ingredient("chemical-plant", "tungsten-plate")   -- keep ingredients managable
+
+util.replace_some_ingredient("advanced-circuit", "copper-cable", 1, "solder", 1)
 util.add_ingredient("chemical-plant", "solder", 5)
 util.add_ingredient("oil-refinery", "solder", 5)
 util.add_ingredient("assembling-machine-2", "solder", 5)
 util.add_ingredient("rocket-silo", "solder", 100)
+util.add_ingredient("accumulator", "solder", 2)
+util.add_ingredient("se-space-accumulator", "solder", 2)
+util.add_ingredient("storage-tank", "solder", 4)
+util.add_ingredient("kr-fluid-storage-1", "solder", 4)
+util.add_ingredient("kr-fluid-storage-2", "solder", 12)
+util.add_ingredient("substation", "solder", 2)
+util.add_ingredient("kr-substation-mk2", "solder", 2)
+util.add_ingredient("se-pylon-substation", "solder", 2)
+util.add_ingredient("se-pylon", "solder", 2)
+util.add_ingredient("se-holmium-solenoid", "solder", 2)
+
+-- --  Elecrontics circuit recipes are updated in final fixes:
+-- util.multiply_recipe("electronic-circuit", 2)
+-- util.replace_some_ingredient("electronic-circuit", "copper-cable", 1, "solder", 1)
+-- util.multiply_recipe("electronic-circuit-stone", 2)
+-- util.replace_some_ingredient("electronic-circuit-stone", "copper-cable", 1, "solder", 1)
 
 -- glass
 if mods.Krastorio2 then
@@ -49,7 +64,6 @@ util.add_ingredient("kr-fuel-refinery", "solder", 5)
 util.add_ingredient("kr-electrolysis-plant", "solder", 10)
 util.replace_some_ingredient("kr-steel-pipe-to-ground", "steel-plate", 3, "solder", 8)
 util.replace_ingredient("kr-biomass-growing", "petroleum-gas", "organotins")
-util.replace_ingredient("buisart-lab", "copper-cable", "tinned-cable")
 
 
 util.add_product("se-scrap-recycling", {name="tin-ore", amount=1, probability=0.05})
@@ -57,17 +71,32 @@ util.add_ingredient("se-experimental-alloys-data", "tin-plate", 1)
 util.add_to_product("se-experimental-alloys-data", "se-experimental-alloys-data", 1)
 util.add_to_product("se-experimental-alloys-data", "se-scrap", 1)
 util.add_to_ingredient("se-experimental-alloys-data", "se-empty-data", 1)
+util.add_ingredient("se-biochemical-data", "organotins", 10)
+util.add_ingredient("se-corrosion-resistance-data", "tin-plate", 1)
+
+util.add_ingredient("se-space-biochemical-laboratory", "solder", 8)
+util.add_ingredient("se-decontamination-facility", "solder", 10)
+util.add_ingredient("se-life-support-facility", "solder", 40)
 
 util.multiply_recipe("lithium-sulfur-battery", 2)
 util.replace_some_ingredient("lithium-sulfur-battery", "copper-plate", 1, "tin-plate", 1)
 
+util.add_ingredient("roboport", "solder", 20)
+util.add_ingredient("kr-large-roboport", "solder", 20)
+util.add_ingredient("kr-small-roboport", "solder", 10)
+util.add_ingredient("se-supercharger", "solder", 15)
+
 
 
 if util.me.use_cable() then
+
   util.add_prerequisite("circuit-network", "tinned-cable")
 
   util.add_ingredient("pumpjack", "tinned-cable", 5)
 
+  util.remove_ingredient("se-delivery-cannon-capsule", "copper-cable")
+  util.add_ingredient("se-delivery-cannon-capsule", "tinned-cable", 8)
+
 
   util.replace_ingredient("arithmetic-combinator", "copper-cable", "tinned-cable")
   util.replace_ingredient("decider-combinator", "copper-cable", "tinned-cable")
@@ -92,4 +121,8 @@ if util.me.use_cable() then
   for i, v in pairs(modded_combinators) do
     util.replace_ingredient(v, "copper-cable", "tinned-cable")
   end
+
+  -- k2
+  util.replace_ingredient("buisart-lab", "copper-cable", "tinned-cable")
+  util.replace_ingredient("energy-absorber", "copper-cable", "tinned-cable")
 end

tin-recipe.lua

@@ -77,7 +77,7 @@ data:extend({
     type = "recipe",
     name = "solder",
     category = "crafting",
-    order = "d[acsr-cable]",
+    order = "d[solder]",
     enabled = true,
     energy_required = 1,
     ingredients = solder_ingredients, 
@@ -145,8 +145,8 @@ data:extend({
     order = "d[tinned-cable]",
     enabled = true,
     energy_required = 1.5,
-    ingredients = {{"tin-plate", 1}, {"copper-cable", 4}},
+    ingredients = {{"tin-plate", 1}, {"copper-cable", 8}},
-    results = {{"tinned-cable", 4}},
+    results = {{"tinned-cable", 8}},
   },
   {
     type = "technology",