k2 mostly working, other stuff

data.lua

@@ -1,7 +1,7 @@
 require("tin-ore")
 require("tin-recipe")
--- require("tin-enriched")   -- Enriched Al for Krastorio 2
--- require("tin-recipe-se")         -- Space Exploration
+require("tin-enriched")   -- Enriched Al for Krastorio 2
+require("tin-recipe-se")         -- Space Exploration
 
 local util = require("data-util");
 

locale/en/tin.cfg

@@ -22,12 +22,13 @@ organotins=Organotins
 
 [technology-name]
 tinned-cable=Tinned cable
-organotins=Organotins
+organotin-chemistry=Organotin chemistry
 tin-matter-processing=Tin conversion
 
 [technology-description]
 enriched-tin=Enrich tin ore, purifying with sulfuric acid [fluid=sulfuric-acid] and water [fluid=water], improving the final yield. Produce dirty water [fluid=dirty-water] as a byproduct.
-tinned-cable=Tinned copper cables
+tinned-cable=Tinned copper cables to prevent corrosion
+organotin-chemistry=Toxic compounds often used to stabilize plastics
 
 [recipe-name]
 alumina=__ITEM__alumina__

tin-enriched.lua

@@ -22,6 +22,7 @@ data:extend(
   {
     type = "recipe",
     name = "enriched-tin",
+    main_product="enriched-tin",
     icon = "__bztin__/graphics/icons/enriched-tin.png",
     icon_size = 128,
     category = "chemistry",
@@ -54,10 +55,10 @@ data:extend(
   },
   {
       type = "recipe",
-      name = "enriched-alumina",
+      name = "enriched-tin-plate",
       icons =
       {
-        { icon = "__bztin__/graphics/icons/alumina.png", icon_size = 128 },
+        { icon = "__bztin__/graphics/icons/tin-plate.png", icon_size = 128 },
         { icon = "__bztin__/graphics/icons/enriched-tin.png", icon_size = 128, scale=0.125, shift= {-8, -8}},
       },
       category = "smelting",
@@ -67,8 +68,8 @@ data:extend(
       always_show_products = true,
       allow_productivity = true,
       ingredients = { {"enriched-tin", 5} },
-      results = { {"alumina", 5} },
-      order = "b[alumina]-b[enriched-alumina]",
+      results = { {"tin-plate", 5} },
+      order = "b[tin-plate]-b[enriched-tin-plate]",
   },	
 	{
 		type = "recipe",
@@ -100,7 +101,6 @@ data:extend(
 		results =
 		{
 			{type = "fluid", name = "water", amount = 90, catalyst_amount = 90},
-			mods.bzsilicon and {type = "item",  name = "silica", amount = 1} or 
 			{type = "item",  name = "stone", probability = 0.40, amount = 1},
 			{type = "item",  name = "tin-ore", probability = 0.10, amount = 1},
 		},
@@ -115,6 +115,6 @@ data:extend(
 }
 )
 util.add_effect("kr-enriched-ores", { type = "unlock-recipe", recipe = "enriched-tin" })
-util.add_effect("kr-enriched-ores", { type = "unlock-recipe", recipe = "enriched-alumina" })
+util.add_effect("kr-enriched-ores", { type = "unlock-recipe", recipe = "enriched-tin-plate" })
 util.add_effect("kr-enriched-ores", { type = "unlock-recipe", recipe = "dirty-water-filtration-tin" })
 end

tin-recipe-se.lua

@@ -105,10 +105,14 @@ if mods["space-exploration"] then
     order = "a-c-b"
   },
   })
+  util.add_effect("se-pyroflux-smelting", {type = "unlock-recipe", recipe= "molten-tin"})
+  util.add_effect("se-pyroflux-smelting", {type = "unlock-recipe", recipe= "tin-ingot"})
+  util.add_effect("se-pyroflux-smelting", {type = "unlock-recipe", recipe= "tin-ingot-to-plate"})
   util.add_effect("se-vulcanite-smelting", {type = "unlock-recipe", recipe= "molten-tin"})
   util.add_effect("se-vulcanite-smelting", {type = "unlock-recipe", recipe= "tin-ingot"})
   util.add_effect("se-vulcanite-smelting", {type = "unlock-recipe", recipe= "tin-ingot-to-plate"})
   if mods["Krastorio2"] then
+    util.set_item_subgroup("enriched-tin", "tin")
     data.raw.recipe["enriched-tin-plate"].order= "d[tin-plate]"
     se_delivery_cannon_recipes["enriched-tin"] = {name= "enriched-tin"}
   end

tin-recipe-updates.lua

@@ -5,12 +5,17 @@ local util = require("data-util");
 
 local organotins_quant = mods.Krastorio2 and 10 or 5
 util.replace_some_ingredient("plastic-bar", "petroleum-gas", organotins_quant, "organotins", organotins_quant)
+util.add_ingredient("poison-capsule", "organotins", 10)
+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.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.add_ingredient("chemical-plant", "solder", 5)
 util.add_ingredient("oil-refinery", "solder", 5)
 util.add_ingredient("assembling-machine-2", "solder", 5)
@@ -32,11 +37,19 @@ elseif mods["aai-industry"] then
     util.set_to_founding("glass-from-sand")
   end
 end
--- NOTE: K2 seems to reset this recipe, so moved to final fixes
+-- -- NOTE: K2 seems to reset this recipe, so moved to final fixes:
 -- util.replace_some_ingredient("se-glass-vulcanite", "sand", 1, "tin-plate", 1)
 -- util.add_product("se-glass-vulcanite", {type="item", name="tin-plate", amount=1, probability=0.8})
 -- util.set_main_product("se-glass-vulcanite", "glass")
 -- end glass
+--
+--
+
+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})
@@ -52,6 +65,10 @@ util.replace_some_ingredient("lithium-sulfur-battery", "copper-plate", 1, "tin-p
 
 if util.me.use_cable() then
   util.add_prerequisite("circuit-network", "tinned-cable")
+
+  util.add_ingredient("pumpjack", "tinned-cable", 5)
+
+
   util.replace_ingredient("arithmetic-combinator", "copper-cable", "tinned-cable")
   util.replace_ingredient("decider-combinator", "copper-cable", "tinned-cable")
   util.replace_ingredient("constant-combinator", "copper-cable", "tinned-cable")

tin-recipe.lua

@@ -9,7 +9,6 @@ data:extend({
     type = "recipe",
     name = "tin-plate",
     category = "smelting",
-    subgroup = "raw-material",
     order = "d[tin-plate]",
     icons = (mods["Krastorio2"] and
         {
@@ -21,14 +20,16 @@ data:extend({
 ),
     normal = (mods["Krastorio2"] and
         {
+          main_product = "tin-plate",
           enabled = true,
           energy_required = 12,
           ingredients = {{"tin-ore", 10}},
           results = {
-            {type="item", name = "tin-plate", amount=10}
+            {type="item", name = "tin-plate", amount=5}
           }
         } or
         {
+          main_product = "tin-plate",
           enabled = true,
           energy_required = 2.4,
           ingredients = {{"tin-ore", 1}},
@@ -38,6 +39,7 @@ data:extend({
         }),
     expensive =
     {
+      main_product = "tin-plate",
       enabled = true,
       energy_required = 4.8,
       ingredients = {{"tin-ore", 1}},
@@ -57,9 +59,9 @@ data:extend({
   },
 })
 
-local solder_ingredeents = {{"tin-plate", 4}, {"copper-plate"}, 1}
+local solder_ingredients = {{"tin-plate", 4}, {"copper-plate"}, 1}
 if mods.bzlead then
-  solder_ingredeents = {{"tin-plate", 3}, {"lead-plate", 2}}
+  solder_ingredients = {{"tin-plate", 3}, {"lead-plate", 2}}
 end
 data:extend({
   {
@@ -78,8 +80,8 @@ data:extend({
     order = "d[acsr-cable]",
     enabled = true,
     energy_required = 1,
-    ingredients = solder_ingredeents, 
-    results = {{"solder", 5}},
+    ingredients = solder_ingredients, 
+    results = {{"solder", 4}},
   }
 })
 
@@ -98,9 +100,9 @@ data:extend({
   {
     type = "recipe",
     name = "organotins",
-    category = "oil-processing",
+    category = "chemistry",
     subgroup = "fluid-recipes",
-    order = "d[organotins]",
+    order = "h[organotins]",
     enabled = true,
     energy_required = 5,
     ingredients = {{"tin-plate", 3}, {type="fluid", name="petroleum-gas", amount=20}},
@@ -108,7 +110,7 @@ data:extend({
   },
   {
     type = "technology",
-    name = "organotins",
+    name = "organotin-chemistry",
     icon = "__bztin__/graphics/technology/organotins.png",
     icon_size = 256,
     effects = {
@@ -123,7 +125,7 @@ data:extend({
   },
 })
 
-util.add_prerequisite("plastics", "organotins")
+util.add_prerequisite("plastics", "organotin-chemistry")
 
 if util.me.use_cable() then
 data:extend({