Compare commits

..

No commits in common. "main" and "2.1.16" have entirely different histories.
main ... 2.1.16

4 changed files with 563 additions and 556 deletions

View file

@ -1,11 +1,4 @@
--------------------------------------------------------------------------------------------------- ---------------------------------------------------------------------------------------------------
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 Version: 2.1.16
Date: 20.10.2025 Date: 20.10.2025
Legacy version meant to be played with my other forks and ATOM. Legacy version meant to be played with my other forks and ATOM.

View file

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

View file

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

View file

@ -2,9 +2,10 @@
local item_sounds = require('__base__.prototypes.item_sounds') local item_sounds = require('__base__.prototypes.item_sounds')
local util = require("data-util"); local util = require("data-util");
local futil = require("util");
if (not mods["pyrawores"] and not mods["bobplates"] and not mods["angelssmelting"]) then if (not mods["pyrawores"] and not mods["bobplates"] and not mods["angelssmelting"] ) then
data:extend({ data:extend({
{ {
type = "recipe", type = "recipe",
name = "tin-plate", name = "tin-plate",
@ -12,20 +13,40 @@ if (not mods["pyrawores"] and not mods["bobplates"] and not mods["angelssmelting
order = "d[tin-plate]", order = "d[tin-plate]",
icons = (mods["Krastorio2"] and icons = (mods["Krastorio2"] and
{ {
{ icon = "__bztin2__/graphics/icons/tin-plate.png", icon_size = 128 }, { icon = "__bztin2__/graphics/icons/tin-plate.png", icon_size = 128},
{ icon = "__bztin2__/graphics/icons/tin-ore.png", icon_size = 64, scale = 0.125, shift = { -8, -8 } }, { icon = "__bztin2__/graphics/icons/tin-ore.png", icon_size = 64, scale=0.125, shift= {-8, -8}},
} or { } or {
{ icon = "__bztin2__/graphics/icons/tin-plate.png", icon_size = 128 }, { 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", main_product = "tin-plate",
enabled = true, enabled = true,
energy_required = mods["Krastorio2"] and 12 or 2.4, energy_required = 2.4,
ingredients = { util.item("tin-ore", mods["Krastorio2"] and 10 or 1) }, ingredients = {util.item("tin-ore", 1)},
results = { results = {
{ type = "item", name = "tin-plate", amount = mods["Krastorio2"] and 5 or 1 } {type="item", name = "tin-plate", amount=1}
}, },
allow_productivity = true, 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", type = "item",
@ -35,20 +56,20 @@ if (not mods["pyrawores"] and not mods["bobplates"] and not mods["angelssmelting
subgroup = "raw-material", subgroup = "raw-material",
order = "b[tin-plate]", order = "b[tin-plate]",
stack_size = util.get_stack_size(100), stack_size = util.get_stack_size(100),
weight = 1 * kg, weight = 1*kg,
inventory_move_sound = item_sounds.metal_small_inventory_move, inventory_move_sound = item_sounds.metal_small_inventory_move,
pick_sound = item_sounds.metal_small_inventory_pickup, pick_sound = item_sounds.metal_small_inventory_pickup,
drop_sound = item_sounds.metal_small_inventory_move, drop_sound = item_sounds.metal_small_inventory_move,
}, },
}) })
local solder_ingredients = { util.item("tin-plate", 4), util.item("copper-plate", 1) } local solder_ingredients = {util.item("tin-plate", 4), util.item("copper-plate", 1)}
local solder_casting = { util.fluid("molten-tin", 40), util.fluid("molten-copper", 10) } local solder_casting = {util.fluid("molten-tin", 40), util.fluid("molten-copper", 10)}
if mods["bzlead2"] then if mods["bzlead2"] then
solder_ingredients = { util.item("tin-plate", 3), util.item("lead-plate", 2) } solder_ingredients = {util.item("tin-plate", 3), util.item("lead-plate", 2)}
solder_casting = { util.fluid("molten-tin", 30), util.fluid("molten-lead", 20) } solder_casting = {util.fluid("molten-tin", 30), util.fluid("molten-lead", 20)}
end end
data:extend({ data:extend({
{ {
type = "item", type = "item",
name = "solder", name = "solder",
@ -57,7 +78,7 @@ if (not mods["pyrawores"] and not mods["bobplates"] and not mods["angelssmelting
subgroup = "intermediate-product", subgroup = "intermediate-product",
order = "b[solder]", order = "b[solder]",
stack_size = util.get_stack_size(100), stack_size = util.get_stack_size(100),
weight = 1 * kg, weight = 1*kg,
inventory_move_sound = item_sounds.wire_inventory_move, inventory_move_sound = item_sounds.wire_inventory_move,
pick_sound = item_sounds.wire_inventory_pickup, pick_sound = item_sounds.wire_inventory_pickup,
drop_sound = item_sounds.wire_inventory_move, drop_sound = item_sounds.wire_inventory_move,
@ -70,13 +91,13 @@ if (not mods["pyrawores"] and not mods["bobplates"] and not mods["angelssmelting
enabled = true, enabled = true,
energy_required = 1, energy_required = 1,
ingredients = solder_ingredients, ingredients = solder_ingredients,
results = { util.item("solder", 4) }, results = {util.item("solder", 4)},
allow_productivity = true, allow_productivity = true,
} }
}) })
if mods["space-age"] then if mods["space-age"] then
data:extend({ data:extend({
{ {
type = "recipe", type = "recipe",
name = "casting-solder", name = "casting-solder",
@ -84,14 +105,14 @@ if (not mods["pyrawores"] and not mods["bobplates"] and not mods["angelssmelting
subgroup = "vulcanus-processes", subgroup = "vulcanus-processes",
order = "z[casting]-d[casting-solder]", order = "z[casting]-d[casting-solder]",
icons = { icons = {
{ icon = "__bztin2__/graphics/icons/solder.png", icon_size = 128, shift = { -4, 4 } }, {icon = "__bztin2__/graphics/icons/solder.png", icon_size = 128, shift={-4,4}},
{ icon = "__bztin2__/graphics/icons/molten-tin-sa.png", icon_size = 64, shift = { 4, -4 } }, {icon = "__bztin2__/graphics/icons/molten-tin-sa.png", icon_size = 64, shift={4,-4}},
}, },
enabled = false, enabled = false,
ingredients = solder_casting, ingredients = solder_casting,
energy_required = 10, energy_required = 10,
allow_decomposition = false, allow_decomposition = false,
results = { { type = "item", name = "solder", amount = 40 } }, results = {{type = "item", name = "solder", amount = 40}},
allow_productivity = true allow_productivity = true
}, },
{ {
@ -103,28 +124,26 @@ if (not mods["pyrawores"] and not mods["bobplates"] and not mods["angelssmelting
type = "technology", type = "technology",
name = "alloy-separation", name = "alloy-separation",
icons = { icons = {
{ icon = "__bztin2__/graphics/icons/solder.png", icon_size = 128, scale = 0.33, shift = { 0, -6 } }, {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 } }, {icon = "__bztin2__/graphics/icons/tin-plate.png", icon_size = 128, scale = 0.25, shift = {-6,4}},
mods["bzlead2"] and mods["bzlead2"] and {icon = "__bzlead2__/graphics/icons/lead-plate.png", icon_size = 64, scale = 0.5, shift = {6,4}} or
{ 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}},
{ icon = "__base__/graphics/icons/copper-plate.png", icon_size = 64, scale = 0.5, shift = { 6, 4 } },
}, },
effects = {}, effects = {},
prerequisites = { "metallurgic-science-pack", "electromagnetic-science-pack" }, prerequisites = {"metallurgic-science-pack", "electromagnetic-science-pack"},
unit = { unit = {
count = 250, count = 250, time = 30,
time = 30,
ingredients = { ingredients = {
{ "chemical-science-pack", 1 }, {"chemical-science-pack", 1},
{ "electromagnetic-science-pack", 1 }, {"electromagnetic-science-pack", 1},
{ "metallurgic-science-pack", 1 }, {"metallurgic-science-pack", 1},
} }
} }
}, },
}) })
util.add_effect("foundry", { type = "unlock-recipe", recipe = "casting-solder" }) util.add_effect("foundry", { type = "unlock-recipe", recipe = "casting-solder" })
end end
if mods.bzaluminum2 and not mods["bzlead2"] then if mods.bzaluminum2 and not mods["bzlead2"] then
data:extend({ data:extend({
{ {
type = "technology", type = "technology",
@ -135,11 +154,10 @@ if (not mods["pyrawores"] and not mods["bobplates"] and not mods["angelssmelting
{ type = "unlock-recipe", recipe = "solder" }, { type = "unlock-recipe", recipe = "solder" },
}, },
unit = { unit = {
count = 10, count = 10, time = 15,
time = 15, ingredients = {{"automation-science-pack", 1}},
ingredients = { { "automation-science-pack", 1 } },
}, },
prerequisites = { "copper-processing" }, prerequisites = {"copper-processing"},
}, },
}) })
util.add_unlock_force("solder", "solder") util.add_unlock_force("solder", "solder")
@ -151,19 +169,19 @@ if (not mods["pyrawores"] and not mods["bobplates"] and not mods["angelssmelting
util.add_unlock_force("solder", "pipe-to-ground") util.add_unlock_force("solder", "pipe-to-ground")
end end
if mods.Krastorio2 then if mods.Krastorio2 then
util.set_tech_recipe("solder", { { "basic-tech-card", 1 } }) util.set_tech_recipe("solder", {{"basic-tech-card", 1}})
end
end end
end
data:extend({ data:extend({
{ {
type = "fluid", type = "fluid",
name = "organotins", name = "organotins",
subgroup = "fluid", subgroup = "fluid",
default_temperature = 25, default_temperature = 25,
heat_capacity = "0.1kJ", heat_capacity = "0.1kJ",
base_color = { r = 0.75, g = 0.65, b = 0.1 }, base_color = {r=0.75, g=0.65, b=0.1},
flow_color = { r = 0.7, g = 1, b = 0.1 }, flow_color = {r=0.7, g=1, b=0.1},
icon = "__bztin2__/graphics/icons/organotins.png", icon = "__bztin2__/graphics/icons/organotins.png",
icon_size = 64, icon_size = 64,
order = "a[fluid]-f[organotins]" order = "a[fluid]-f[organotins]"
@ -176,14 +194,14 @@ if (not mods["pyrawores"] and not mods["bobplates"] and not mods["angelssmelting
order = "h[organotins]", order = "h[organotins]",
enabled = false, enabled = false,
energy_required = 5, energy_required = 5,
ingredients = { util.item("tin-plate", 3), { type = "fluid", name = "petroleum-gas", amount = 20 } }, ingredients = {util.item("tin-plate", 3), {type="fluid", name="petroleum-gas", amount=20}},
results = { { type = "fluid", name = "organotins", amount = 50 } }, results = {{type="fluid", name="organotins", amount=50}},
allow_productivity = true, allow_productivity = true,
crafting_machine_tint = { crafting_machine_tint = {
primary = { r = 1.000, g = 0.995, b = 0.089, a = 1.000 }, primary = {r = 1.000, g = 0.995, b = 0.089, a = 1.000},
secondary = { r = 1.000, g = 0.975, b = 0.890, a = 1.000 }, secondary = {r = 1.000, g = 0.975, b = 0.890, a = 1.000},
tertiary = { r = 0.825, g = 0.740, b = 0.810, a = 1.000 }, tertiary = {r = 0.825, g = 0.740, b = 0.810, a = 1.000},
quaternary = { r = 0.950, g = 1.000, b = 0.350, a = 1.000 }, quaternary = {r = 0.950, g = 1.000, b = 0.350, a = 1.000},
} }
}, },
{ {
@ -195,29 +213,27 @@ if (not mods["pyrawores"] and not mods["bobplates"] and not mods["angelssmelting
{ type = "unlock-recipe", recipe = "organotins" }, { type = "unlock-recipe", recipe = "organotins" },
}, },
unit = { unit = {
count = 50, count = 50, time = 30,
time = 30, ingredients = {{"automation-science-pack", 1}, {"logistic-science-pack", 1}},
ingredients = { { "automation-science-pack", 1 }, { "logistic-science-pack", 1 } },
}, },
prerequisites = { "oil-processing" }, prerequisites = {"oil-processing"},
order = "b-b", order = "b-b",
}, },
}) })
util.add_prerequisite("plastics", "organotin-chemistry") util.add_prerequisite("plastics", "organotin-chemistry")
if util.me.use_cable() then if util.me.use_cable() then
data:extend({ data:extend({
{ {
type = "item", type = "item",
name = "tinned-cable", name = "tinned-cable",
icon = "__bztin2__/graphics/icons/tinned-cable.png", icon = "__bztin2__/graphics/icons/tinned-cable.png",
icon_size = 64, icon_size = 64, icon_mipmaps = 4,
icon_mipmaps = 4,
subgroup = util.cablesg, subgroup = util.cablesg,
order = "b[tinned-cable]", order = "b[tinned-cable]",
stack_size = util.get_stack_size(100), stack_size = util.get_stack_size(100),
weight = 1 * kg, weight = 1*kg,
inventory_move_sound = item_sounds.wire_inventory_move, inventory_move_sound = item_sounds.wire_inventory_move,
pick_sound = item_sounds.wire_inventory_pickup, pick_sound = item_sounds.wire_inventory_pickup,
drop_sound = item_sounds.wire_inventory_move, drop_sound = item_sounds.wire_inventory_move,
@ -229,41 +245,39 @@ if (not mods["pyrawores"] and not mods["bobplates"] and not mods["angelssmelting
order = "d[tinned-cable]", order = "d[tinned-cable]",
enabled = false, enabled = false,
energy_required = 1.5, energy_required = 1.5,
ingredients = { util.item("tin-plate", 1), util.item("copper-cable", 8) }, ingredients = {util.item("tin-plate", 1), util.item("copper-cable", 8)},
allow_productivity = true, allow_productivity = true,
results = { util.item("tinned-cable", 8) }, results = {util.item("tinned-cable", 8)},
}, },
{ {
type = "technology", type = "technology",
name = "tinned-cable", name = "tinned-cable",
icon = "__bztin2__/graphics/icons/tinned-cable.png", icon = "__bztin2__/graphics/icons/tinned-cable.png",
icon_size = 64, icon_size = 64, icon_mipmaps = 4,
icon_mipmaps = 4,
effects = { effects = {
{ type = "unlock-recipe", recipe = "tinned-cable" }, { type = "unlock-recipe", recipe = "tinned-cable" },
}, },
unit = { unit = {
count = 50, count = 50, time = 15,
time = 15, ingredients = {{"automation-science-pack", 1}, {"logistic-science-pack", 1}},
ingredients = { { "automation-science-pack", 1 }, { "logistic-science-pack", 1 } },
}, },
prerequisites = { "logistic-science-pack" }, prerequisites = {"logistic-science-pack"},
order = "b-b", order = "b-b",
}, },
}) })
util.add_prerequisite("tinned-cable", "copper-processing") util.add_prerequisite("tinned-cable", "copper-processing")
if util.me.get_setting("aps-planet") == "vulcanus" then if util.me.get_setting("aps-planet") == "vulcanus" then
util.set_prerequisite("tinned-cable", { "automation-science-pack" }) util.set_prerequisite("tinned-cable", {"automation-science-pack"})
util.set_tech_recipe("tinned-cable", { { "automation-science-pack", 1 } }) util.set_tech_recipe("tinned-cable", {{"automation-science-pack", 1}})
end end
end end
if util.me.use_bronze() then if util.me.use_bronze() then
local bronze_i = {} local bronze_i = {}
bronze_i["copper-plate"] = 17 bronze_i["copper-plate"] = 17
bronze_i["tin-plate"] = 3 bronze_i["tin-plate"] = 3
data:extend({ data:extend({
{ {
type = "item", type = "item",
name = "bronze-plate", name = "bronze-plate",
@ -272,7 +286,7 @@ if (not mods["pyrawores"] and not mods["bobplates"] and not mods["angelssmelting
subgroup = "intermediate-product", subgroup = "intermediate-product",
order = "b[bronze-plate]", order = "b[bronze-plate]",
stack_size = util.get_stack_size(100), stack_size = util.get_stack_size(100),
weight = 1 * kg, weight = 1*kg,
inventory_move_sound = item_sounds.metal_small_inventory_move, inventory_move_sound = item_sounds.metal_small_inventory_move,
pick_sound = item_sounds.metal_small_inventory_pickup, pick_sound = item_sounds.metal_small_inventory_pickup,
drop_sound = item_sounds.metal_small_inventory_move, drop_sound = item_sounds.metal_small_inventory_move,
@ -285,19 +299,19 @@ if (not mods["pyrawores"] and not mods["bobplates"] and not mods["angelssmelting
enabled = false, enabled = false,
energy_required = 60, energy_required = 60,
ingredients = {}, ingredients = {},
results = { util.item("bronze-plate", 20) }, results = {util.item("bronze-plate", 20)},
allow_productivity = true, allow_productivity = true,
}, },
}) })
for item, count in pairs(bronze_i) do for item, count in pairs(bronze_i) do
util.add_ingredient("bronze-plate", item, count, { force = true }) util.add_ingredient("bronze-plate", item, count, {force=true})
end end
if mods.bzfoundry2 and data.raw.item["foundry"] then if mods.bzfoundry2 and data.raw.item["foundry"] then
util.add_effect("foundry", { type = "unlock-recipe", recipe = "bronze-plate" }) util.add_effect("foundry", { type = "unlock-recipe", recipe = "bronze-plate" })
util.add_prerequisite("fast-inserter", "foundry") util.add_prerequisite("fast-inserter", "foundry")
util.set_to_founding("bronze-plate", { force = true }) util.set_to_founding("bronze-plate", {force=true})
elseif mods["space-age"] then elseif mods["space-age"] then
data:extend({ data:extend({
{ {
type = "recipe", type = "recipe",
name = "casting-bronze", name = "casting-bronze",
@ -305,41 +319,41 @@ if (not mods["pyrawores"] and not mods["bobplates"] and not mods["angelssmelting
subgroup = "vulcanus-processes", subgroup = "vulcanus-processes",
order = "b[casting]-d[casting-tin-bronze]", order = "b[casting]-d[casting-tin-bronze]",
icons = { icons = {
{ icon = "__bztin2__/graphics/icons/bronze-plate.png", icon_size = 128, shift = { -4, 4 } }, {icon = "__bztin2__/graphics/icons/bronze-plate.png", icon_size = 128, shift={-4,4}},
{ icon = "__space-age__/graphics/icons/fluid/molten-copper.png", icon_size = 64, shift = { 4, -4 } }, {icon = "__space-age__/graphics/icons/fluid/molten-copper.png", icon_size = 64, shift={4,-4}},
}, },
enabled = false, enabled = false,
ingredients = ingredients =
{ {
{ type = "fluid", name = "molten-copper", amount = bronze_i["copper-plate"], fluidbox_multiplier = 10 }, {type = "fluid", name = "molten-copper", amount = bronze_i["copper-plate"], fluidbox_multiplier = 10},
{ type = "fluid", name = "molten-tin", amount = bronze_i["tin-plate"], fluidbox_multiplier = 10 }, {type = "fluid", name = "molten-tin", amount = bronze_i["tin-plate"], fluidbox_multiplier = 10},
}, },
energy_required = 2.4, energy_required = 2.4,
allow_decomposition = false, allow_decomposition = false,
results = { { type = "item", name = "bronze-plate", amount = 2 } }, results = {{type = "item", name = "bronze-plate", amount = 2}},
allow_productivity = true allow_productivity = true
}, },
}) })
util.add_effect("foundry", { type = "unlock-recipe", recipe = "casting-bronze" }) util.add_effect("foundry", { type = "unlock-recipe", recipe = "casting-bronze" })
util.add_effect("automation", { type = "unlock-recipe", recipe = "bronze-plate" })
else
util.add_effect("automation", { type = "unlock-recipe", recipe = "bronze-plate" }) util.add_effect("automation", { type = "unlock-recipe", recipe = "bronze-plate" })
else end
util.add_effect("automation", { type = "unlock-recipe", recipe = "bronze-plate" }) end
end if mods["space-age"] then
end data:extend({
if mods["space-age"] then
data:extend({
{ {
type = "fluid", type = "fluid",
name = "tin-sulfides", name = "tin-sulfides",
icons = { { icon = "__base__/graphics/icons/fluid/steam.png", icon_size = 64, tint = { r = .9, g = .9, b = .1, a = .7 } } }, icons = {{ icon="__base__/graphics/icons/fluid/steam.png", icon_size=64, tint={r=.9, g=.9, b=.1, a=.7}}},
subgroup = "fluid", subgroup = "fluid",
order = "b[new-fluid]-b[vulcanus]-t[tin-sulfides]", order = "b[new-fluid]-b[vulcanus]-t[tin-sulfides]",
default_temperature = 315, default_temperature = 315,
max_temperature = 2000, max_temperature = 2000,
gas_temperature = 300, gas_temperature = 300,
heat_capacity = ".1kJ", heat_capacity = ".1kJ",
base_color = { 1, 1, 0 }, base_color = {1,1,0},
flow_color = { .95, .99, .1 }, flow_color = {.95,.99,.1},
}, },
{ {
type = "recipe", type = "recipe",
@ -377,10 +391,10 @@ if (not mods["pyrawores"] and not mods["bobplates"] and not mods["angelssmelting
allow_productivity = true, allow_productivity = true,
energy_required = 2, energy_required = 2,
icons = { icons = {
{ icon = "__bztin2__/graphics/icons/tin-ore.png", icon_size = 64 }, { 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 } }, { 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["bztitanium2"] and { ingredients = mods.bztitanium and {
util.fluid("tin-sulfides", 40), util.fluid("tin-sulfides", 40),
util.fluid("vacuum", 1), util.fluid("vacuum", 1),
} or { } or {
@ -400,8 +414,8 @@ if (not mods["pyrawores"] and not mods["bobplates"] and not mods["angelssmelting
default_temperature = 1500, default_temperature = 1500,
max_temperature = 2000, max_temperature = 2000,
heat_capacity = "0.01kJ", heat_capacity = "0.01kJ",
base_color = { .6, 0.4, 0.23 }, base_color = {.6, 0.4, 0.23},
flow_color = { 0.6, 0.4, 0.23 }, flow_color = {0.6, 0.4, 0.23},
auto_barrel = false auto_barrel = false
}, },
{ {
@ -414,11 +428,11 @@ if (not mods["pyrawores"] and not mods["bobplates"] and not mods["angelssmelting
enabled = false, enabled = false,
ingredients = ingredients =
{ {
{ type = "item", name = "tin-ore", amount = 100 }, {type = "item", name = "tin-ore", amount = 100},
{ type = "item", name = "calcite", amount = 1 }, {type = "item", name = "calcite", amount = 1},
}, },
energy_required = 48, energy_required = 48,
results = { { type = "fluid", name = "molten-tin", amount = 1000 } }, results = {{type = "fluid", name = "molten-tin", amount = 1000}},
allow_productivity = true, allow_productivity = true,
hide_from_signal_gui = false, hide_from_signal_gui = false,
main_product = "molten-tin", main_product = "molten-tin",
@ -430,28 +444,28 @@ if (not mods["pyrawores"] and not mods["bobplates"] and not mods["angelssmelting
subgroup = "vulcanus-processes", subgroup = "vulcanus-processes",
order = "b[casting]-d[casting-tin]", order = "b[casting]-d[casting-tin]",
icons = { icons = {
{ icon = "__bztin2__/graphics/icons/tin-plate.png", icon_size = 128, shift = { -4, 4 } }, {icon = "__bztin2__/graphics/icons/tin-plate.png", icon_size = 128, shift={-4,4}},
{ icon = "__bztin2__/graphics/icons/molten-tin-sa.png", icon_size = 64, shift = { 4, -4 } }, {icon = "__bztin2__/graphics/icons/molten-tin-sa.png", icon_size = 64, shift={4,-4}},
}, },
enabled = false, enabled = false,
ingredients = ingredients =
{ {
{ type = "fluid", name = "molten-tin", amount = 20, fluidbox_multiplier = 10 }, {type = "fluid", name = "molten-tin", amount = 20, fluidbox_multiplier = 10},
}, },
energy_required = 2.4, energy_required = 2.4,
allow_decomposition = false, allow_decomposition = false,
results = { { type = "item", name = "tin-plate", amount = 2 } }, results = {{type = "item", name = "tin-plate", amount = 2}},
allow_productivity = true allow_productivity = true
}, },
}) })
util.add_unlock("foundry", "casting-tin") util.add_unlock("foundry", "casting-tin")
util.add_unlock("foundry", "molten-tin") util.add_unlock("foundry", "molten-tin")
util.add_unlock("foundry", "tin-sulfides") util.add_unlock("foundry", "tin-sulfides")
util.add_unlock("foundry", "tin-sulfide-processing") util.add_unlock("foundry", "tin-sulfide-processing")
local space_age_item_sounds = require("__space-age__.prototypes.item_sounds") local space_age_item_sounds = require("__space-age__.prototypes.item_sounds")
data:extend({ data:extend({
{ {
type = "item", type = "item",
name = "jellyskin", name = "jellyskin",
@ -469,7 +483,7 @@ if (not mods["pyrawores"] and not mods["bobplates"] and not mods["angelssmelting
drop_sound = space_age_item_sounds.agriculture_inventory_move, drop_sound = space_age_item_sounds.agriculture_inventory_move,
stack_size = 100, stack_size = 100,
default_import_location = "gleba", default_import_location = "gleba",
weight = 1 * kg, weight = 1*kg,
}, },
{ {
type = "recipe", type = "recipe",
@ -478,8 +492,8 @@ if (not mods["pyrawores"] and not mods["bobplates"] and not mods["angelssmelting
subgroup = "agriculture-processes", subgroup = "agriculture-processes",
order = "e[agriculture]-a[tin]", order = "e[agriculture]-a[tin]",
icons = { icons = {
{ icon = "__bztin2__/graphics/icons/organotins.png", icon_size = 64 }, {icon = "__bztin2__/graphics/icons/organotins.png", icon_size = 64},
{ icon = "__bztin2__/graphics/icons/jellyskin.png", icon_size = 64, shift = { 0, -8 } }, {icon = "__bztin2__/graphics/icons/jellyskin.png", icon_size=64, shift={0,-8}},
}, },
enabled = false, enabled = false,
allow_productivity = true, allow_productivity = true,
@ -487,12 +501,12 @@ if (not mods["pyrawores"] and not mods["bobplates"] and not mods["angelssmelting
{ {
util.item("jellyskin", 1), util.item("jellyskin", 1),
}, },
energy_required = 8 / 3, energy_required = 8/3,
allow_decomposition = false, allow_decomposition = false,
results = { results = {
util.fluid("organotins", 100), util.fluid("organotins", 100),
}, },
main_product = "organotins", main_product="organotins",
}, },
{ {
type = "recipe", type = "recipe",
@ -501,8 +515,8 @@ if (not mods["pyrawores"] and not mods["bobplates"] and not mods["angelssmelting
subgroup = "agriculture-processes", subgroup = "agriculture-processes",
order = "e[agriculture]-a[tin]", order = "e[agriculture]-a[tin]",
icons = { icons = {
{ icon = "__bztin2__/graphics/icons/organotins.png", icon_size = 64 }, {icon = "__bztin2__/graphics/icons/organotins.png", icon_size = 64},
{ icon = "__bztin2__/graphics/icons/tin-ore.png", icon_size = 64, scale = 0.333, shift = { 0, 8 } }, {icon = "__bztin2__/graphics/icons/tin-ore.png", icon_size=64, scale=0.333, shift={0,8}},
}, },
enabled = false, enabled = false,
allow_productivity = true, allow_productivity = true,
@ -511,54 +525,54 @@ if (not mods["pyrawores"] and not mods["bobplates"] and not mods["angelssmelting
util.fluid("organotins", 100), util.fluid("organotins", 100),
util.item("pentapod-egg"), util.item("pentapod-egg"),
}, },
energy_required = 16 / 3, energy_required = 16/3,
allow_decomposition = false, allow_decomposition = false,
results = { results = {
util.item("tin-ore", 6), util.item("tin-ore", 6),
}, },
main_product = "tin-ore", main_product="tin-ore",
}, },
}) })
util.add_product("jellynut-processing", util.item("jellyskin", 1, .25)) util.add_product("jellynut-processing", util.item("jellyskin", 1, .25))
util.add_ingredient("bioplastic", "organotins", 7.5) util.add_ingredient("bioplastic", "organotins", 7.5)
util.set_icons("bioplastic", { util.set_icons("bioplastic", {
{ icon = "__space-age__/graphics/icons/bioplastic.png", icon_size = 64 }, {icon = "__space-age__/graphics/icons/bioplastic.png", icon_size = 64},
{ icon = "__bztin2__/graphics/icons/organotins.png", icon_size = 64, scale = .25, shift = { 0, -8 } }, {icon = "__bztin2__/graphics/icons/organotins.png", icon_size = 64, scale=.25, shift={0,-8}},
}) })
util.add_unlock("biochamber", "jellyskin-processing") util.add_unlock("biochamber", "jellyskin-processing")
util.add_unlock("biochamber", "tin-from-organotins") util.add_unlock("biochamber", "tin-from-organotins")
end end
if mods["planet-muluna"] then -- moon where you get resources from crushing on the surface if mods["planet-muluna"] then -- moon where you get resources from crushing on the surface
data:extend({ data:extend({
{ {
type = "recipe", type = "recipe",
name = "metallic-asteroid-crushing-tin", name = "metallic-asteroid-crushing-tin",
icons = { icons = {
{ icon = "__space-age__/graphics/icons/metallic-asteroid-crushing.png", icon_size = 64 }, {icon = "__space-age__/graphics/icons/metallic-asteroid-crushing.png", icon_size=64},
{ icon = "__bztin2__/graphics/icons/tin-ore.png", icon_size = 64, scale = 0.25, shift = { 0, 4 } }, {icon="__bztin2__/graphics/icons/tin-ore.png", icon_size=64, scale =0.25, shift = {0,4}},
}, },
category = "crushing", category = "crushing",
subgroup = "space-crushing", subgroup="space-crushing",
order = "b-a-a", order = "b-a-a",
auto_recycle = false, auto_recycle = false,
enabled = false, enabled = false,
ingredients = ingredients =
{ {
{ type = "item", name = "metallic-asteroid-chunk", amount = 1 }, {type = "item", name = "metallic-asteroid-chunk", amount = 1},
}, },
energy_required = 2, energy_required = 2,
results = results =
{ {
{ type = "item", name = "tin-ore", amount = 15 }, {type = "item", name = "tin-ore", amount = 15},
{ type = "item", name = "metallic-asteroid-chunk", amount = 1, probability = 0.2 } {type = "item", name = "metallic-asteroid-chunk", amount = 1, probability = 0.2}
}, },
allow_productivity = true, allow_productivity = true,
allow_decomposition = false allow_decomposition = false
}, },
}) })
util.add_unlock("space-platform-thruster", "metallic-asteroid-crushing-tin") util.add_unlock("space-platform-thruster", "metallic-asteroid-crushing-tin")
util.add_to_productivity_research("asteroid-productivity", "metallic-asteroid-crushing-tin") util.add_to_productivity_research("asteroid-productivity", "metallic-asteroid-crushing-tin")
end end
end end