Compare commits
10 commits
960200bc7a
...
6592f44b59
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
6592f44b59 | ||
|
|
3f90d7488c | ||
|
|
7c52c4f890 | ||
|
|
4fd444a4d1 | ||
|
|
c5ee695a57 | ||
|
|
9ccae84270 | ||
|
|
05b698f24b | ||
|
|
6a99862a12 | ||
|
|
2d3fcf48f1 | ||
|
|
d1d471c416 |
3
.editorconfig
Normal file
|
|
@ -0,0 +1,3 @@
|
||||||
|
[*]
|
||||||
|
indent_style = space
|
||||||
|
indent_size = 2
|
||||||
3
.gitignore
vendored
|
|
@ -1 +1,2 @@
|
||||||
.idea
|
.idea
|
||||||
|
*.zip
|
||||||
37
Makefile
|
|
@ -1,37 +0,0 @@
|
||||||
# General makefile for factorio mods.
|
|
||||||
#
|
|
||||||
# Presumes the development work is done in a <factoriodir>/dev/<modname>/
|
|
||||||
# directory where this makefile resides. This directory must be parallel to
|
|
||||||
# the <factoriodir>/mods/ directory where mods are installed. Run `make
|
|
||||||
# install` from dev/<modname> to install the mod as a zip file. That zip file
|
|
||||||
# should also be ready to upload to the mod portal
|
|
||||||
|
|
||||||
.PHONY: copy lint-changelog install
|
|
||||||
|
|
||||||
libdir = "../bzlib"
|
|
||||||
libfiles = $(shell ls $(libdir)/*.lua | grep -o '[^/]*.lua')
|
|
||||||
pwd = $(shell pwd)
|
|
||||||
v = $(shell basename "$(pwd)")_$(shell jq -r .version info.json)
|
|
||||||
|
|
||||||
link:
|
|
||||||
for f in $(libfiles) ; do \
|
|
||||||
echo "using $(libdir)/$$f" ;\
|
|
||||||
cp $(libdir)/$$f .; \
|
|
||||||
done;
|
|
||||||
|
|
||||||
copy: link
|
|
||||||
rm -rf ../$(v)
|
|
||||||
mkdir -p ../$(v)
|
|
||||||
cp -rf * ../$(v)
|
|
||||||
rm -f ../$(v).zip
|
|
||||||
cd ..; zip -9 -r -y $(v).zip $(v) -x "*.xcf" -x "*.git*" -x "*.bak" -x "*.blend*"
|
|
||||||
|
|
||||||
install: lint-changelog copy
|
|
||||||
cp -f ../$(v).zip ../../mods/
|
|
||||||
|
|
||||||
lint-changelog: copy
|
|
||||||
python3 ../da-changelog-tools_0.0.14/changelog-checker.py --changelog ../$(v).zip
|
|
||||||
|
|
||||||
zorro:
|
|
||||||
python3 ../da-changelog-tools_0.0.14/changelog-checker.py --zorro --changelog ../$(v).zip
|
|
||||||
|
|
||||||
25
README.md
|
|
@ -1,27 +1,26 @@
|
||||||
|
**This is an unofficial forked version and it stays until Brevven takes over again.**
|
||||||
|
|
||||||
|
**Compatibility with Space Age is explicitly excluded. Stick to the original mod for Space Age.**
|
||||||
|
|
||||||
# Tin
|
# Tin
|
||||||
|
Adds tin ore, tin plates, solder, organotins, and (optionally) tinned cable and bronze to the game.
|
||||||
|
|
||||||
[factorio mod page](https://mods.factorio.com/mod/bztin)
|
This mod mostly retains the vanilla feel, with a new resource integrated into the game. There are also production chains on the other planets in Space Age.
|
||||||
|
|
||||||
Adds tin to the base game
|
If you want a vanilla-esque game with some tweaks, try this mod, or perhaps a less complex one like Titanium or Lead.
|
||||||
|
|
||||||
## Version History
|
Tin is an early game resource and is slightly easier to process than other metals. It has less overall use than Titanium or Lead, but a bit higher complexity, especially if tinned cable and bronze are enabled.
|
||||||
See changelog.txt
|
|
||||||
|
|
||||||
## Created by
|
## Credits
|
||||||
|
- Brevven ([Original mod](https://mods.factorio.com/mod/bzsilicon))
|
||||||
- [brevven](https://mods.factorio.com/user/brevven) (code, design, graphics)
|
- [cackling fiend](https://mods.factorio.com/user/cackling.fiend) (mod integrations and maintenance)
|
||||||
|
|
||||||
## Thanks to
|
|
||||||
- [snouz](https://github.com/snouz) (logo inspiration, ore graphics templates)
|
- [snouz](https://github.com/snouz) (logo inspiration, ore graphics templates)
|
||||||
|
|
||||||
### Compatibility
|
### Compatibility
|
||||||
- [nihilistzsche](https://github.com/nihilistzsche)
|
- [nihilistzsche](https://github.com/nihilistzsche)
|
||||||
|
|
||||||
### Localization
|
### Localization
|
||||||
|
|
||||||
- [Pergamum663](https://github.com/Pergamum663) (ru)
|
- [Pergamum663](https://github.com/Pergamum663) (ru)
|
||||||
- [RiCZrd](https://mods.factorio.com/user/RiCZrd) (cs)
|
- [RiCZrd](https://mods.factorio.com/user/RiCZrd) (cs)
|
||||||
- [Sakuro](https://github.com/sakuro) (ja)
|
- [Sakuro](https://github.com/sakuro) (ja)
|
||||||
- [sunnytan53](https://github.com/sunnytan53) (zh-CN)
|
- [sunnytan53](https://github.com/sunnytan53) (zh-CN)
|
||||||
|
|
||||||
|
|
||||||
7
bztin2/changelog.txt
Normal file
|
|
@ -0,0 +1,7 @@
|
||||||
|
---------------------------------------------------------------------------------------------------
|
||||||
|
Version: 2.1.16
|
||||||
|
Date: 20.10.2025
|
||||||
|
Legacy version meant to be played with my other forks and ATOM.
|
||||||
|
|
||||||
|
Bug Fixes:
|
||||||
|
- Various mod compatibility fixes
|
||||||
|
|
@ -1,6 +1,6 @@
|
||||||
local util = require("data-util");
|
local util = require("data-util");
|
||||||
|
|
||||||
if mods["248k"] then
|
if mods["248k-Redux"] then
|
||||||
util.add_ingredient("gr_circuit_recipe", "solder", 2)
|
util.add_ingredient("gr_circuit_recipe", "solder", 2)
|
||||||
|
|
||||||
-- glass
|
-- glass
|
||||||
32
bztin2/compatibility/data/hot-metals.lua
Normal file
|
|
@ -0,0 +1,32 @@
|
||||||
|
local util = require("data-util");
|
||||||
|
|
||||||
|
util.add_hot_metals({
|
||||||
|
{name="tin-plate", icons={
|
||||||
|
{ icon = "__bztin2__/graphics/icons/tin-plate.png", icon_size = 128},
|
||||||
|
{ icon = "__bztin2__/graphics/icons/tin-plate.png", icon_size = 128, tint={.9,.3,0, .5}},
|
||||||
|
}},
|
||||||
|
{name="bronze-plate", icons={
|
||||||
|
{ icon = "__bztin2__/graphics/icons/bronze-plate.png", icon_size = 128},
|
||||||
|
{ icon = "__bztin2__/graphics/icons/bronze-plate.png", icon_size = 128, tint={.9,.3,0, .5}},
|
||||||
|
}},
|
||||||
|
{name="tinned-cable", icons={
|
||||||
|
{ icon = "__bztin2__/graphics/icons/tinned-cable.png", icon_size = 64},
|
||||||
|
{ icon = "__bztin2__/graphics/icons/tinned-cable.png", icon_size = 64, tint={.9,.3,0, .5}},
|
||||||
|
}},
|
||||||
|
{name="solder", icons={
|
||||||
|
{ icon = "__bztin2__/graphics/icons/solder.png", icon_size = 128},
|
||||||
|
{ icon = "__bztin2__/graphics/icons/solder.png", icon_size = 128, tint={.9,.3,0, .5}},
|
||||||
|
}},
|
||||||
|
})
|
||||||
|
|
||||||
|
if HotMetals then
|
||||||
|
if not data.raw["recipe-category"]["advanced-crafting-hot"] then
|
||||||
|
data:extend({{
|
||||||
|
type="recipe-category",
|
||||||
|
name="advanced-crafting-hot",
|
||||||
|
}})
|
||||||
|
table.insert(HotMetals.craftingCategories, "advanced-crafting-hot")
|
||||||
|
util.add_crafting_category_if("assembling-machine", "advanced-crafting-hot", "advanced-crafting")
|
||||||
|
end
|
||||||
|
util.set_category("bronze-plate", "advanced-crafting-hot")
|
||||||
|
end
|
||||||
|
|
@ -6,7 +6,7 @@ local util = require("data-util");
|
||||||
|
|
||||||
util.add_product("jellynut-processing", util.item("jellyskin", 1, .25)) -- in case of clobbering
|
util.add_product("jellynut-processing", util.item("jellyskin", 1, .25)) -- in case of clobbering
|
||||||
|
|
||||||
util.replace_some_ingredient("se-glass-vulcanite", "sand", 1, "tin-plate", 1)
|
util.replace_some_ingredient("se-glass-vulcanite", mods["Krastorio2"] and "kr-sand" or "sand", 1, "tin-plate", 1)
|
||||||
util.add_product("se-glass-vulcanite", {type="item", name="tin-plate", amount=1, catalyst_amount=1, probability=0.8})
|
util.add_product("se-glass-vulcanite", {type="item", name="tin-plate", amount=1, catalyst_amount=1, probability=0.8})
|
||||||
util.set_main_product("se-glass-vulcanite", mods["Krastorio2"] and "kr-glass" or "glass")
|
util.set_main_product("se-glass-vulcanite", mods["Krastorio2"] and "kr-glass" or "glass")
|
||||||
|
|
||||||
|
|
@ -99,7 +99,7 @@ if get_setting("bz-recipe-bypass") then
|
||||||
end
|
end
|
||||||
|
|
||||||
function util.is_foundry()
|
function util.is_foundry()
|
||||||
return mods.bzfoundry and not me.get_setting("bzfoundry-minimal")
|
return mods.bzfoundry2 and not me.get_setting("bzfoundry-minimal")
|
||||||
end
|
end
|
||||||
|
|
||||||
function should_force(options)
|
function should_force(options)
|
||||||
|
Before Width: | Height: | Size: 1.9 MiB After Width: | Height: | Size: 1.9 MiB |
|
Before Width: | Height: | Size: 12 KiB After Width: | Height: | Size: 12 KiB |
|
Before Width: | Height: | Size: 23 KiB After Width: | Height: | Size: 23 KiB |
|
Before Width: | Height: | Size: 24 KiB After Width: | Height: | Size: 24 KiB |
|
Before Width: | Height: | Size: 24 KiB After Width: | Height: | Size: 24 KiB |
|
Before Width: | Height: | Size: 23 KiB After Width: | Height: | Size: 23 KiB |
|
Before Width: | Height: | Size: 8.2 KiB After Width: | Height: | Size: 8.2 KiB |
|
Before Width: | Height: | Size: 13 KiB After Width: | Height: | Size: 13 KiB |
|
Before Width: | Height: | Size: 12 KiB After Width: | Height: | Size: 12 KiB |
|
Before Width: | Height: | Size: 6.8 KiB After Width: | Height: | Size: 6.8 KiB |
|
Before Width: | Height: | Size: 25 KiB After Width: | Height: | Size: 25 KiB |
|
Before Width: | Height: | Size: 14 KiB After Width: | Height: | Size: 14 KiB |
|
Before Width: | Height: | Size: 17 KiB After Width: | Height: | Size: 17 KiB |
|
Before Width: | Height: | Size: 29 KiB After Width: | Height: | Size: 29 KiB |
|
Before Width: | Height: | Size: 18 KiB After Width: | Height: | Size: 18 KiB |
|
Before Width: | Height: | Size: 8.2 KiB After Width: | Height: | Size: 8.2 KiB |
|
Before Width: | Height: | Size: 15 KiB After Width: | Height: | Size: 15 KiB |
|
Before Width: | Height: | Size: 21 KiB After Width: | Height: | Size: 21 KiB |
|
Before Width: | Height: | Size: 12 KiB After Width: | Height: | Size: 12 KiB |
|
Before Width: | Height: | Size: 12 KiB After Width: | Height: | Size: 12 KiB |
|
Before Width: | Height: | Size: 12 KiB After Width: | Height: | Size: 12 KiB |
|
Before Width: | Height: | Size: 9 KiB After Width: | Height: | Size: 9 KiB |
|
Before Width: | Height: | Size: 13 KiB After Width: | Height: | Size: 13 KiB |
|
Before Width: | Height: | Size: 15 KiB After Width: | Height: | Size: 15 KiB |
|
Before Width: | Height: | Size: 9.3 KiB After Width: | Height: | Size: 9.3 KiB |
|
Before Width: | Height: | Size: 14 KiB After Width: | Height: | Size: 14 KiB |
|
Before Width: | Height: | Size: 4.4 KiB After Width: | Height: | Size: 4.4 KiB |
|
Before Width: | Height: | Size: 38 KiB After Width: | Height: | Size: 38 KiB |
31
bztin2/info.json
Normal file
|
|
@ -0,0 +1,31 @@
|
||||||
|
{
|
||||||
|
"name": "bztin2",
|
||||||
|
"version": "2.1.16",
|
||||||
|
"factorio_version": "2.0",
|
||||||
|
"title": "Tin - Legacy",
|
||||||
|
"description": "Adds tin, solder and more to the base game.",
|
||||||
|
"author": "Brevven, cackling fiend",
|
||||||
|
"homepage": "https://discord.gg/ufvFUJtVwk",
|
||||||
|
"dependencies": [
|
||||||
|
"base >= 2.0.0",
|
||||||
|
"? bzfoundry2 >= 2.0.0",
|
||||||
|
"? bztitanium >= 1.2.0",
|
||||||
|
"? bzlead2 >= 2.0.29",
|
||||||
|
"? bzzirconium >= 0.6.0",
|
||||||
|
"? bztungsten2 >= 2.0.0",
|
||||||
|
"? bzcarbon2 >= 2.0.22",
|
||||||
|
"? bzaluminum2 >= 0.4.9",
|
||||||
|
"? space-exploration >= 0.5.100",
|
||||||
|
"(?) aai-industry",
|
||||||
|
"? aai-industry",
|
||||||
|
"? hot-metals",
|
||||||
|
"? Krastorio2",
|
||||||
|
"? Krastorio2-spaced-out",
|
||||||
|
"? sand-and-glass",
|
||||||
|
"? deadlock-beltboxes-loaders",
|
||||||
|
"? DeadlockCrating",
|
||||||
|
"(?) RenaiTransportation",
|
||||||
|
"! space-age"
|
||||||
|
]
|
||||||
|
}
|
||||||
|
|
||||||
|
|
@ -1,6 +1,6 @@
|
||||||
local me = {}
|
local me = {}
|
||||||
|
|
||||||
me.name = "bztin"
|
me.name = "bztin2"
|
||||||
me.resources = {{"tin-ore", "nauvis"}}
|
me.resources = {{"tin-ore", "nauvis"}}
|
||||||
me.list = {}
|
me.list = {}
|
||||||
me.recipes = {"tin-plate", "solder", "organotins",
|
me.recipes = {"tin-plate", "solder", "organotins",
|
||||||
|
|
@ -1,7 +1,7 @@
|
||||||
local util = require("data-util");
|
local util = require("data-util");
|
||||||
|
|
||||||
local ore = "tin-ore"
|
local ore = "tin-ore"
|
||||||
local ore_icon = "__bztin__/graphics/icons/tin-ore.png"
|
local ore_icon = "__bztin2__/graphics/icons/tin-ore.png"
|
||||||
|
|
||||||
if mods["StrangeMatter"] then
|
if mods["StrangeMatter"] then
|
||||||
data:extend({
|
data:extend({
|
||||||
|
Before Width: | Height: | Size: 29 KiB After Width: | Height: | Size: 29 KiB |
|
|
@ -8,12 +8,12 @@ data:extend(
|
||||||
type = "item",
|
type = "item",
|
||||||
name = "enriched-tin",
|
name = "enriched-tin",
|
||||||
icon_size = 128,
|
icon_size = 128,
|
||||||
icon = "__bztin__/graphics/icons/enriched-tin.png",
|
icon = "__bztin2__/graphics/icons/enriched-tin.png",
|
||||||
pictures = {
|
pictures = {
|
||||||
{filename="__bztin__/graphics/icons/enriched-tin.png", size=128, scale=0.125},
|
{filename="__bztin2__/graphics/icons/enriched-tin.png", size=128, scale=0.25},
|
||||||
{filename="__bztin__/graphics/icons/enriched-tin-1.png", size=128, scale=0.125},
|
{filename="__bztin2__/graphics/icons/enriched-tin-1.png", size=128, scale=0.25},
|
||||||
{filename="__bztin__/graphics/icons/enriched-tin-2.png", size=128, scale=0.125},
|
{filename="__bztin2__/graphics/icons/enriched-tin-2.png", size=128, scale=0.25},
|
||||||
{filename="__bztin__/graphics/icons/enriched-tin-3.png", size=128, scale=0.125},
|
{filename="__bztin2__/graphics/icons/enriched-tin-3.png", size=128, scale=0.25},
|
||||||
},
|
},
|
||||||
subgroup = "raw-material",
|
subgroup = "raw-material",
|
||||||
order = "e05-a[enriched-ores]-a1[enriched-tin]",
|
order = "e05-a[enriched-ores]-a1[enriched-tin]",
|
||||||
|
|
@ -23,7 +23,7 @@ data:extend(
|
||||||
type = "recipe",
|
type = "recipe",
|
||||||
name = "enriched-tin",
|
name = "enriched-tin",
|
||||||
main_product="enriched-tin",
|
main_product="enriched-tin",
|
||||||
icon = "__bztin__/graphics/icons/enriched-tin.png",
|
icon = "__bztin2__/graphics/icons/enriched-tin.png",
|
||||||
icon_size = 128,
|
icon_size = 128,
|
||||||
category = "chemistry",
|
category = "chemistry",
|
||||||
energy_required = 3,
|
energy_required = 3,
|
||||||
|
|
@ -34,7 +34,7 @@ data:extend(
|
||||||
subgroup = "raw-material",
|
subgroup = "raw-material",
|
||||||
ingredients =
|
ingredients =
|
||||||
{
|
{
|
||||||
mods.bzcarbon and {type = "item", name = "graphite", amount = 1}
|
mods["bzcarbon2"] and {type = "item", name = "graphite", amount = 1}
|
||||||
or {type = "fluid", name = "sulfuric-acid", amount = 3},
|
or {type = "fluid", name = "sulfuric-acid", amount = 3},
|
||||||
{type = "fluid", name = "water", amount = 25, catalyst_amount = 25},
|
{type = "fluid", name = "water", amount = 25, catalyst_amount = 25},
|
||||||
{type = "item", name = "tin-ore", amount = 9}
|
{type = "item", name = "tin-ore", amount = 9}
|
||||||
|
|
@ -58,8 +58,8 @@ data:extend(
|
||||||
name = "enriched-tin-plate",
|
name = "enriched-tin-plate",
|
||||||
icons =
|
icons =
|
||||||
{
|
{
|
||||||
{ icon = "__bztin__/graphics/icons/tin-plate.png", icon_size = 128 },
|
{ icon = "__bztin2__/graphics/icons/tin-plate.png", icon_size = 128 },
|
||||||
{ icon = "__bztin__/graphics/icons/enriched-tin.png", icon_size = 128, scale=0.125, shift= {-8, -8}},
|
{ icon = "__bztin2__/graphics/icons/enriched-tin.png", icon_size = 128, scale=0.125, shift= {-8, -8}},
|
||||||
},
|
},
|
||||||
category = "smelting",
|
category = "smelting",
|
||||||
energy_required = 16,
|
energy_required = 16,
|
||||||
|
|
@ -15,7 +15,7 @@ if mods["Krastorio2"] then
|
||||||
unlocked_by = "tin-matter-processing",
|
unlocked_by = "tin-matter-processing",
|
||||||
},
|
},
|
||||||
k2baseicon = "stone",
|
k2baseicon = "stone",
|
||||||
icon = { icon = "__bztin__/graphics/icons/tin-ore.png", icon_size = 64, scale = 1.4}
|
icon = { icon = "__bztin2__/graphics/icons/tin-ore.png", icon_size = 64, scale = 1.4}
|
||||||
})
|
})
|
||||||
|
|
||||||
util.k2matter({
|
util.k2matter({
|
||||||
|
|
@ -26,7 +26,7 @@ data:extend({
|
||||||
type = "resource",
|
type = "resource",
|
||||||
icon_size = 64, icon_mipmaps = 3,
|
icon_size = 64, icon_mipmaps = 3,
|
||||||
name = "tin-ore",
|
name = "tin-ore",
|
||||||
icon = "__bztin__/graphics/icons/tin-ore.png",
|
icon = "__bztin2__/graphics/icons/tin-ore.png",
|
||||||
flags = {"placeable-neutral"},
|
flags = {"placeable-neutral"},
|
||||||
order="a-b-a",
|
order="a-b-a",
|
||||||
map_color = {r=0.90, g=1.00, b=0.10},
|
map_color = {r=0.90, g=1.00, b=0.10},
|
||||||
|
|
@ -53,7 +53,7 @@ data:extend({
|
||||||
stage_counts = {15000, 9500, 5500, 2900, 1300, 400, 150, 80},
|
stage_counts = {15000, 9500, 5500, 2900, 1300, 400, 150, 80},
|
||||||
stages = {
|
stages = {
|
||||||
sheet = {
|
sheet = {
|
||||||
filename = "__bztin__/graphics/entity/ores/hr-tin-ore.png",
|
filename = "__bztin2__/graphics/entity/ores/hr-tin-ore.png",
|
||||||
priority = "extra-high",
|
priority = "extra-high",
|
||||||
size = 128,
|
size = 128,
|
||||||
frame_count = 8,
|
frame_count = 8,
|
||||||
|
|
@ -66,12 +66,12 @@ data:extend({
|
||||||
type = "item",
|
type = "item",
|
||||||
name = "tin-ore",
|
name = "tin-ore",
|
||||||
icon_size = 64, icon_mipmaps = 3,
|
icon_size = 64, icon_mipmaps = 3,
|
||||||
icon = "__bztin__/graphics/icons/tin-ore.png",
|
icon = "__bztin2__/graphics/icons/tin-ore.png",
|
||||||
pictures = {
|
pictures = {
|
||||||
{filename="__bztin__/graphics/icons/tin-ore.png", size=64, scale=0.5},
|
{filename="__bztin2__/graphics/icons/tin-ore.png", size=64, scale=0.5},
|
||||||
{filename="__bztin__/graphics/icons/tin-ore-1.png", size=64, scale=0.5},
|
{filename="__bztin2__/graphics/icons/tin-ore-1.png", size=64, scale=0.5},
|
||||||
{filename="__bztin__/graphics/icons/tin-ore-2.png", size=64, scale=0.5},
|
{filename="__bztin2__/graphics/icons/tin-ore-2.png", size=64, scale=0.5},
|
||||||
{filename="__bztin__/graphics/icons/tin-ore-3.png", size=64, scale=0.5},
|
{filename="__bztin2__/graphics/icons/tin-ore-3.png", size=64, scale=0.5},
|
||||||
},
|
},
|
||||||
inventory_move_sound = item_sounds.resource_inventory_move,
|
inventory_move_sound = item_sounds.resource_inventory_move,
|
||||||
pick_sound = item_sounds.resource_inventory_pickup,
|
pick_sound = item_sounds.resource_inventory_pickup,
|
||||||
|
|
@ -3,9 +3,9 @@
|
||||||
local util = require("data-util");
|
local util = require("data-util");
|
||||||
|
|
||||||
if deadlock and deadlock["add_stack"] then
|
if deadlock and deadlock["add_stack"] then
|
||||||
deadlock.add_stack("tin-ore", "__bztin__/graphics/icons/stacked/tin-ore-stacked.png", "deadlock-stacking-1", 64)
|
deadlock.add_stack("tin-ore", "__bztin2__/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("tin-plate", "__bztin2__/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)
|
deadlock.add_stack("solder", "__bztin2__/graphics/icons/stacked/solder-stacked.png", "deadlock-stacking-1", 128)
|
||||||
if data.raw.item["tinned-cable"] then
|
if data.raw.item["tinned-cable"] then
|
||||||
deadlock.add_stack("tinned-cable", nil , "deadlock-stacking-2", nil)
|
deadlock.add_stack("tinned-cable", nil , "deadlock-stacking-2", nil)
|
||||||
end
|
end
|
||||||
|
|
@ -13,7 +13,7 @@ if deadlock and deadlock["add_stack"] then
|
||||||
deadlock.add_stack("bronze-plate", nil , "deadlock-stacking-1", nil)
|
deadlock.add_stack("bronze-plate", nil , "deadlock-stacking-1", nil)
|
||||||
end
|
end
|
||||||
if mods.Krastorio2 then
|
if mods.Krastorio2 then
|
||||||
deadlock.add_stack("enriched-tin", "__bztin__/graphics/icons/stacked/enriched-tin-ore-stacked.png" , "deadlock-stacking-3", 128)
|
deadlock.add_stack("enriched-tin", "__bztin2__/graphics/icons/stacked/enriched-tin-ore-stacked.png" , "deadlock-stacking-3", 128)
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
|
|
@ -20,7 +20,7 @@ if mods["space-exploration"] then
|
||||||
{
|
{
|
||||||
type = "item",
|
type = "item",
|
||||||
name = "tin-ingot",
|
name = "tin-ingot",
|
||||||
icons = {{icon = "__bztin__/graphics/icons/tin-ingot.png", icon_size = 128}},
|
icons = {{icon = "__bztin2__/graphics/icons/tin-ingot.png", icon_size = 128}},
|
||||||
order = "b-b",
|
order = "b-b",
|
||||||
stack_size = 50,
|
stack_size = 50,
|
||||||
subgroup = "tin",
|
subgroup = "tin",
|
||||||
|
|
@ -32,7 +32,7 @@ if mods["space-exploration"] then
|
||||||
max_temperature = 232,
|
max_temperature = 232,
|
||||||
base_color = {r=191, g=219, b=233},
|
base_color = {r=191, g=219, b=233},
|
||||||
flow_color = {r=191, g=219, b=233},
|
flow_color = {r=191, g=219, b=233},
|
||||||
icons = {{icon = "__bztin__/graphics/icons/molten-tin.png", icon_size = 128}},
|
icons = {{icon = "__bztin2__/graphics/icons/molten-tin.png", icon_size = 128}},
|
||||||
order = "a[molten]-a",
|
order = "a[molten]-a",
|
||||||
pressure_to_speed_ratio = 0.4,
|
pressure_to_speed_ratio = 0.4,
|
||||||
flow_to_energy_ratio = 0.59,
|
flow_to_energy_ratio = 0.59,
|
||||||
|
|
@ -76,8 +76,8 @@ if mods["space-exploration"] then
|
||||||
name = "tin-ingot-to-plate",
|
name = "tin-ingot-to-plate",
|
||||||
|
|
||||||
icons = {
|
icons = {
|
||||||
{icon = "__bztin__/graphics/icons/tin-plate.png", icon_size = 128},
|
{icon = "__bztin2__/graphics/icons/tin-plate.png", icon_size = 128},
|
||||||
{icon = "__bztin__/graphics/icons/tin-ingot.png", icon_size = 128, scale = 0.125, shift = {-8, -8}},
|
{icon = "__bztin2__/graphics/icons/tin-ingot.png", icon_size = 128, scale = 0.125, shift = {-8, -8}},
|
||||||
},
|
},
|
||||||
results = {
|
results = {
|
||||||
{type = "item", name = "tin-plate", amount = 10},
|
{type = "item", name = "tin-plate", amount = 10},
|
||||||
|
|
@ -3,7 +3,7 @@ local util = require("data-util");
|
||||||
|
|
||||||
-- Space Age
|
-- Space Age
|
||||||
|
|
||||||
if mods.bzlead and data.raw.item["lead-expansion-bolt"] then
|
if mods["bzlead2"] and data.raw.item["lead-expansion-bolt"] then
|
||||||
util.replace_product("scrap-recycling", "lead-expansion-bolt", "solder")
|
util.replace_product("scrap-recycling", "lead-expansion-bolt", "solder")
|
||||||
else
|
else
|
||||||
util.add_product("scrap-recycling", util.item("solder", 1, .01))
|
util.add_product("scrap-recycling", util.item("solder", 1, .01))
|
||||||
|
|
@ -36,7 +36,7 @@ util.add_ingredient("slowdown-capsule", "organotins", 5)
|
||||||
util.set_category("poison-capsule", "crafting-with-fluid")
|
util.set_category("poison-capsule", "crafting-with-fluid")
|
||||||
util.set_category("slowdown-capsule", "crafting-with-fluid")
|
util.set_category("slowdown-capsule", "crafting-with-fluid")
|
||||||
|
|
||||||
util.replace_ingredient("pipe-to-ground", mods.bzlead and "lead-plate" or "iron-plate", "solder", 4)
|
util.replace_ingredient("pipe-to-ground", mods["bzlead2"] and "lead-plate" or "iron-plate", "solder", 4)
|
||||||
util.remove_ingredient("chemical-plant", "tungsten-plate") -- keep ingredients managable
|
util.remove_ingredient("chemical-plant", "tungsten-plate") -- keep ingredients managable
|
||||||
|
|
||||||
util.replace_some_ingredient("advanced-circuit", "copper-cable", 1, "solder", 1)
|
util.replace_some_ingredient("advanced-circuit", "copper-cable", 1, "solder", 1)
|
||||||
|
|
@ -55,20 +55,14 @@ util.add_ingredient("se-pylon-substation", "solder", 2)
|
||||||
util.add_ingredient("se-pylon", "solder", 2)
|
util.add_ingredient("se-pylon", "solder", 2)
|
||||||
util.add_ingredient("se-holmium-solenoid", "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
|
-- glass
|
||||||
if mods.Krastorio2 then
|
if mods.Krastorio2 then
|
||||||
util.replace_some_ingredient("glass", "sand", 1, "tin-plate", 1)
|
util.replace_some_ingredient("kr-glass", "kr-sand", 1, "tin-plate", 1)
|
||||||
util.add_product("glass", {type="item", name="tin-plate", amount=1, catalyst_amount=1, probability=0.8})
|
util.add_product("kr-glass", {type="item", name="tin-plate", amount=1, catalyst_amount=1, probability=0.8})
|
||||||
util.set_main_product("glass", "glass")
|
util.set_main_product("kr-glass", "kr-glass")
|
||||||
else
|
else
|
||||||
if mods.bzfoundry then
|
if mods.bzfoundry2 then
|
||||||
if not mods.bzaluminum then
|
if not mods.bzaluminum2 then
|
||||||
util.multiply_recipe("glass-from-sand", 4) -- aai
|
util.multiply_recipe("glass-from-sand", 4) -- aai
|
||||||
util.multiply_recipe("sng-glass-plate", 4) -- sand and glass
|
util.multiply_recipe("sng-glass-plate", 4) -- sand and glass
|
||||||
end
|
end
|
||||||
|
|
@ -86,12 +80,6 @@ else
|
||||||
util.set_category("sng-glass-plate", "basic-founding")
|
util.set_category("sng-glass-plate", "basic-founding")
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
-- -- 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")
|
|
||||||
--
|
|
||||||
-- 248k in /compatibility dir
|
|
||||||
-- end glass
|
-- end glass
|
||||||
|
|
||||||
util.add_ingredient("kr-fuel-refinery", "solder", 5)
|
util.add_ingredient("kr-fuel-refinery", "solder", 5)
|
||||||
|
|
@ -177,10 +165,9 @@ if util.me.use_bronze() then
|
||||||
util.add_ingredient("maraxsis-nuclear-submarine", "bronze-plate", 10)
|
util.add_ingredient("maraxsis-nuclear-submarine", "bronze-plate", 10)
|
||||||
util.add_ingredient("maraxsis-salt-reactor", "bronze-plate", 10)
|
util.add_ingredient("maraxsis-salt-reactor", "bronze-plate", 10)
|
||||||
util.add_ingredient("maraxsis-hydro-plant", "bronze-plate", 10)
|
util.add_ingredient("maraxsis-hydro-plant", "bronze-plate", 10)
|
||||||
local fast_i = mods.bzaluminum and "aluminum-plate" or "iron-plate"
|
local fast_i = mods.bzaluminum2 and "aluminum-plate" or "iron-plate"
|
||||||
util.replace_some_ingredient("fast-inserter", fast_i, 1, "bronze-plate", 1)
|
util.replace_some_ingredient("fast-inserter", fast_i, 1, "bronze-plate", 1)
|
||||||
if mods.Krastorio2 then
|
if mods.Krastorio2 then
|
||||||
util.replace_some_ingredient("filter-inserter", fast_i, 1, "bronze-plate", 1)
|
|
||||||
util.replace_ingredient("kr-steel-pump", "steel-beam", "bronze-plate", 4)
|
util.replace_ingredient("kr-steel-pump", "steel-beam", "bronze-plate", 4)
|
||||||
end
|
end
|
||||||
|
|
||||||
|
|
@ -194,7 +181,7 @@ if util.me.use_bronze() then
|
||||||
end
|
end
|
||||||
|
|
||||||
|
|
||||||
if mods.bztungsten and not mods.bzaluminum then
|
if mods.bztungsten2 and not mods.bzaluminum2 then
|
||||||
util.replace_ingredient("small-lamp", "copper-cable", "tinned-cable")
|
util.replace_ingredient("small-lamp", "copper-cable", "tinned-cable")
|
||||||
util.add_prerequisite("optics", "tinned-cable")
|
util.add_prerequisite("optics", "tinned-cable")
|
||||||
end
|
end
|
||||||
|
|
@ -13,10 +13,10 @@ data:extend({
|
||||||
order = "d[tin-plate]",
|
order = "d[tin-plate]",
|
||||||
icons = (mods["Krastorio2"] and
|
icons = (mods["Krastorio2"] and
|
||||||
{
|
{
|
||||||
{ icon = "__bztin__/graphics/icons/tin-plate.png", icon_size = 128},
|
{ icon = "__bztin2__/graphics/icons/tin-plate.png", icon_size = 128},
|
||||||
{ icon = "__bztin__/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 = "__bztin__/graphics/icons/tin-plate.png", icon_size = 128},
|
{ icon = "__bztin2__/graphics/icons/tin-plate.png", icon_size = 128},
|
||||||
}
|
}
|
||||||
),
|
),
|
||||||
-- (mods["Krastorio2"] and
|
-- (mods["Krastorio2"] and
|
||||||
|
|
@ -51,7 +51,7 @@ data:extend({
|
||||||
{
|
{
|
||||||
type = "item",
|
type = "item",
|
||||||
name = "tin-plate",
|
name = "tin-plate",
|
||||||
icon = "__bztin__/graphics/icons/tin-plate.png",
|
icon = "__bztin2__/graphics/icons/tin-plate.png",
|
||||||
icon_size = 128,
|
icon_size = 128,
|
||||||
subgroup = "raw-material",
|
subgroup = "raw-material",
|
||||||
order = "b[tin-plate]",
|
order = "b[tin-plate]",
|
||||||
|
|
@ -65,7 +65,7 @@ data:extend({
|
||||||
|
|
||||||
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.bzlead 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
|
||||||
|
|
@ -73,7 +73,7 @@ data:extend({
|
||||||
{
|
{
|
||||||
type = "item",
|
type = "item",
|
||||||
name = "solder",
|
name = "solder",
|
||||||
icon = "__bztin__/graphics/icons/solder.png",
|
icon = "__bztin2__/graphics/icons/solder.png",
|
||||||
icon_size = 128,
|
icon_size = 128,
|
||||||
subgroup = "intermediate-product",
|
subgroup = "intermediate-product",
|
||||||
order = "b[solder]",
|
order = "b[solder]",
|
||||||
|
|
@ -105,8 +105,8 @@ data:extend({
|
||||||
subgroup = "vulcanus-processes",
|
subgroup = "vulcanus-processes",
|
||||||
order = "z[casting]-d[casting-solder]",
|
order = "z[casting]-d[casting-solder]",
|
||||||
icons = {
|
icons = {
|
||||||
{icon = "__bztin__/graphics/icons/solder.png", icon_size = 128, shift={-4,4}},
|
{icon = "__bztin2__/graphics/icons/solder.png", icon_size = 128, shift={-4,4}},
|
||||||
{icon = "__bztin__/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,
|
||||||
|
|
@ -124,9 +124,9 @@ data:extend({
|
||||||
type = "technology",
|
type = "technology",
|
||||||
name = "alloy-separation",
|
name = "alloy-separation",
|
||||||
icons = {
|
icons = {
|
||||||
{icon = "__bztin__/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 = "__bztin__/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.bzlead and {icon = "__bzlead__/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}},
|
{icon = "__base__/graphics/icons/copper-plate.png", icon_size = 64, scale = 0.5, shift = {6,4}},
|
||||||
},
|
},
|
||||||
effects = {},
|
effects = {},
|
||||||
|
|
@ -143,12 +143,12 @@ data:extend({
|
||||||
})
|
})
|
||||||
util.add_effect("foundry", { type = "unlock-recipe", recipe = "casting-solder" })
|
util.add_effect("foundry", { type = "unlock-recipe", recipe = "casting-solder" })
|
||||||
end
|
end
|
||||||
if mods.bzaluminum and not mods.bzlead then
|
if mods.bzaluminum2 and not mods["bzlead2"] then
|
||||||
data:extend({
|
data:extend({
|
||||||
{
|
{
|
||||||
type = "technology",
|
type = "technology",
|
||||||
name = "solder",
|
name = "solder",
|
||||||
icon = "__bztin__/graphics/icons/solder.png",
|
icon = "__bztin2__/graphics/icons/solder.png",
|
||||||
icon_size = 128,
|
icon_size = 128,
|
||||||
effects = {
|
effects = {
|
||||||
{ type = "unlock-recipe", recipe = "solder" },
|
{ type = "unlock-recipe", recipe = "solder" },
|
||||||
|
|
@ -182,7 +182,7 @@ data:extend({
|
||||||
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 = "__bztin__/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]"
|
||||||
},
|
},
|
||||||
|
|
@ -207,7 +207,7 @@ data:extend({
|
||||||
{
|
{
|
||||||
type = "technology",
|
type = "technology",
|
||||||
name = "organotin-chemistry",
|
name = "organotin-chemistry",
|
||||||
icon = "__bztin__/graphics/technology/organotins.png",
|
icon = "__bztin2__/graphics/technology/organotins.png",
|
||||||
icon_size = 256,
|
icon_size = 256,
|
||||||
effects = {
|
effects = {
|
||||||
{ type = "unlock-recipe", recipe = "organotins" },
|
{ type = "unlock-recipe", recipe = "organotins" },
|
||||||
|
|
@ -228,7 +228,7 @@ data:extend({
|
||||||
{
|
{
|
||||||
type = "item",
|
type = "item",
|
||||||
name = "tinned-cable",
|
name = "tinned-cable",
|
||||||
icon = "__bztin__/graphics/icons/tinned-cable.png",
|
icon = "__bztin2__/graphics/icons/tinned-cable.png",
|
||||||
icon_size = 64, icon_mipmaps = 4,
|
icon_size = 64, icon_mipmaps = 4,
|
||||||
subgroup = util.cablesg,
|
subgroup = util.cablesg,
|
||||||
order = "b[tinned-cable]",
|
order = "b[tinned-cable]",
|
||||||
|
|
@ -252,7 +252,7 @@ data:extend({
|
||||||
{
|
{
|
||||||
type = "technology",
|
type = "technology",
|
||||||
name = "tinned-cable",
|
name = "tinned-cable",
|
||||||
icon = "__bztin__/graphics/icons/tinned-cable.png",
|
icon = "__bztin2__/graphics/icons/tinned-cable.png",
|
||||||
icon_size = 64, icon_mipmaps = 4,
|
icon_size = 64, icon_mipmaps = 4,
|
||||||
effects = {
|
effects = {
|
||||||
{ type = "unlock-recipe", recipe = "tinned-cable" },
|
{ type = "unlock-recipe", recipe = "tinned-cable" },
|
||||||
|
|
@ -281,7 +281,7 @@ data:extend({
|
||||||
{
|
{
|
||||||
type = "item",
|
type = "item",
|
||||||
name = "bronze-plate",
|
name = "bronze-plate",
|
||||||
icon = "__bztin__/graphics/icons/bronze-plate.png",
|
icon = "__bztin2__/graphics/icons/bronze-plate.png",
|
||||||
icon_size = 128,
|
icon_size = 128,
|
||||||
subgroup = "intermediate-product",
|
subgroup = "intermediate-product",
|
||||||
order = "b[bronze-plate]",
|
order = "b[bronze-plate]",
|
||||||
|
|
@ -306,7 +306,7 @@ data:extend({
|
||||||
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.bzfoundry 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})
|
||||||
|
|
@ -319,7 +319,7 @@ data:extend({
|
||||||
subgroup = "vulcanus-processes",
|
subgroup = "vulcanus-processes",
|
||||||
order = "b[casting]-d[casting-tin-bronze]",
|
order = "b[casting]-d[casting-tin-bronze]",
|
||||||
icons = {
|
icons = {
|
||||||
{icon = "__bztin__/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,
|
||||||
|
|
@ -391,7 +391,7 @@ data:extend({
|
||||||
allow_productivity = true,
|
allow_productivity = true,
|
||||||
energy_required = 2,
|
energy_required = 2,
|
||||||
icons = {
|
icons = {
|
||||||
{ icon="__bztin__/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.bztitanium and {
|
ingredients = mods.bztitanium and {
|
||||||
|
|
@ -408,7 +408,7 @@ data:extend({
|
||||||
{
|
{
|
||||||
type = "fluid",
|
type = "fluid",
|
||||||
name = "molten-tin",
|
name = "molten-tin",
|
||||||
icon = "__bztin__/graphics/icons/molten-tin-sa.png",
|
icon = "__bztin2__/graphics/icons/molten-tin-sa.png",
|
||||||
subgroup = "fluid",
|
subgroup = "fluid",
|
||||||
order = "b[new-fluid]-b[vulcanus]-d[molten-tin]",
|
order = "b[new-fluid]-b[vulcanus]-d[molten-tin]",
|
||||||
default_temperature = 1500,
|
default_temperature = 1500,
|
||||||
|
|
@ -444,8 +444,8 @@ data:extend({
|
||||||
subgroup = "vulcanus-processes",
|
subgroup = "vulcanus-processes",
|
||||||
order = "b[casting]-d[casting-tin]",
|
order = "b[casting]-d[casting-tin]",
|
||||||
icons = {
|
icons = {
|
||||||
{icon = "__bztin__/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 = "__bztin__/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 =
|
||||||
|
|
@ -469,7 +469,7 @@ data:extend({
|
||||||
{
|
{
|
||||||
type = "item",
|
type = "item",
|
||||||
name = "jellyskin",
|
name = "jellyskin",
|
||||||
icon = "__bztin__/graphics/icons/jellyskin.png",
|
icon = "__bztin2__/graphics/icons/jellyskin.png",
|
||||||
icon_size = 64,
|
icon_size = 64,
|
||||||
subgroup = "agriculture-processes",
|
subgroup = "agriculture-processes",
|
||||||
order = "b[agriulture]-d[tin]",
|
order = "b[agriulture]-d[tin]",
|
||||||
|
|
@ -492,8 +492,8 @@ data:extend({
|
||||||
subgroup = "agriculture-processes",
|
subgroup = "agriculture-processes",
|
||||||
order = "e[agriculture]-a[tin]",
|
order = "e[agriculture]-a[tin]",
|
||||||
icons = {
|
icons = {
|
||||||
{icon = "__bztin__/graphics/icons/organotins.png", icon_size = 64},
|
{icon = "__bztin2__/graphics/icons/organotins.png", icon_size = 64},
|
||||||
{icon = "__bztin__/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,
|
||||||
|
|
@ -515,8 +515,8 @@ data:extend({
|
||||||
subgroup = "agriculture-processes",
|
subgroup = "agriculture-processes",
|
||||||
order = "e[agriculture]-a[tin]",
|
order = "e[agriculture]-a[tin]",
|
||||||
icons = {
|
icons = {
|
||||||
{icon = "__bztin__/graphics/icons/organotins.png", icon_size = 64},
|
{icon = "__bztin2__/graphics/icons/organotins.png", icon_size = 64},
|
||||||
{icon = "__bztin__/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,
|
||||||
|
|
@ -538,7 +538,7 @@ 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 = "__bztin__/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")
|
||||||
|
|
@ -551,7 +551,7 @@ data:extend({
|
||||||
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="__bztin__/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",
|
||||||
290
changelog.txt
|
|
@ -1,290 +0,0 @@
|
||||||
---------------------------------------------------------------------------------------------------
|
|
||||||
Version: 2.1.14
|
|
||||||
Date: 2025-05-04
|
|
||||||
Changes:
|
|
||||||
- Support for Krastorio2 spaced out
|
|
||||||
- Minor tweaks to K2 integration
|
|
||||||
---------------------------------------------------------------------------------------------------
|
|
||||||
Version: 2.1.13
|
|
||||||
Date: 2025-05-03
|
|
||||||
Fixes:
|
|
||||||
- Fix mod load issue with Bob's
|
|
||||||
Changes:
|
|
||||||
- K2: Compatibility updates (with thanks to autechr3 and pla)
|
|
||||||
---------------------------------------------------------------------------------------------------
|
|
||||||
Version: 2.1.12
|
|
||||||
Date: 2025-04-20
|
|
||||||
Fixes:
|
|
||||||
- Cerys: Fix tinned cable ratios in recycling on both Cerys and Fulgora
|
|
||||||
- Cerys: Fix soft lock on initial power poles by providing some in huge and colossal ruins
|
|
||||||
Changes:
|
|
||||||
- Any planet start: On Vulcanus, unlock tinned cable earlier
|
|
||||||
---------------------------------------------------------------------------------------------------
|
|
||||||
Version: 2.1.11
|
|
||||||
Date: 2025-04-08
|
|
||||||
Changes:
|
|
||||||
- Space Age: Asteroid crushing recipe now affected by productivity research
|
|
||||||
- Integrate better into Cerys recyling and ruins
|
|
||||||
---------------------------------------------------------------------------------------------------
|
|
||||||
Version: 2.1.10
|
|
||||||
Date: 2025-03-22
|
|
||||||
Changes:
|
|
||||||
- Set inventory sounds for some items
|
|
||||||
Fixes:
|
|
||||||
- Loads with crafting efficiency
|
|
||||||
- Improved compatibility with Muluna
|
|
||||||
---------------------------------------------------------------------------------------------------
|
|
||||||
Version: 2.1.9
|
|
||||||
Date: 2025-03-04
|
|
||||||
Changes:
|
|
||||||
- Align various electronic circuit recipes to all use solder
|
|
||||||
---------------------------------------------------------------------------------------------------
|
|
||||||
Version: 2.1.8
|
|
||||||
Date: 2025-03-03
|
|
||||||
Changes:
|
|
||||||
- Allow productivity on several recipes
|
|
||||||
- Other minor tweaks and fixes
|
|
||||||
---------------------------------------------------------------------------------------------------
|
|
||||||
Version: 2.1.7
|
|
||||||
Date: 2025-02-22
|
|
||||||
Fixes:
|
|
||||||
- Vanilla: Fix runtime crash when adding certain mods to existing game.
|
|
||||||
---------------------------------------------------------------------------------------------------
|
|
||||||
Version: 2.1.6
|
|
||||||
Date: 2025-02-10
|
|
||||||
Changes:
|
|
||||||
- Compatibility with Probablistic Agriculture
|
|
||||||
---------------------------------------------------------------------------------------------------
|
|
||||||
Version: 2.1.5
|
|
||||||
Date: 2025-02-01
|
|
||||||
Changes:
|
|
||||||
- Add shiftite recipe for Janus mod
|
|
||||||
---------------------------------------------------------------------------------------------------
|
|
||||||
Version: 2.1.4
|
|
||||||
Date: 2025-01-25
|
|
||||||
Changes:
|
|
||||||
- Maraxsis: Glass requires tin. Can get tin from rocks.
|
|
||||||
- Tweak Any Planet Start resourcing
|
|
||||||
- Other minor tweaks to improve compatibility and progression
|
|
||||||
---------------------------------------------------------------------------------------------------
|
|
||||||
Version: 2.1.3
|
|
||||||
Date: 2025-01-25
|
|
||||||
Fixes:
|
|
||||||
- Improve compatibility with mods that change armor recipes in certain ways
|
|
||||||
---------------------------------------------------------------------------------------------------
|
|
||||||
Version: 2.1.2
|
|
||||||
Date: 2025-01-20
|
|
||||||
Fixes:
|
|
||||||
- Loads properly again with vanilla
|
|
||||||
Changes:
|
|
||||||
- Space Age: Solder can be made in electromagnetic plant
|
|
||||||
---------------------------------------------------------------------------------------------------
|
|
||||||
Version: 2.1.1
|
|
||||||
Date: 2025-01-17
|
|
||||||
Changes:
|
|
||||||
- Fix load issues with some mod settings and loadouts introduced last version
|
|
||||||
---------------------------------------------------------------------------------------------------
|
|
||||||
Version: 2.1.0
|
|
||||||
Date: 2025-01-17
|
|
||||||
Changes:
|
|
||||||
- Space Age: Add new "Alloy separation" technology that allows recycling of some alloys,
|
|
||||||
including solder and bronze. These alloys will only self-recycle at first, but researching
|
|
||||||
the new tech will unlock a recycling recipe that breaks them down into components.
|
|
||||||
- Space Age: Tinned cable is always enabled (mostly affects combinator and pumpjack recipes)
|
|
||||||
Scrap recycling now produces tinned cable instead of copper cable, at 4x the rate.
|
|
||||||
This will almost certainly require some adjustment on Fulgora, but will be a buff to tin
|
|
||||||
production on Fulgora, without nerfing copper production.
|
|
||||||
- Space Age: When bronze plate is enabled, Fulgoran ruins now hold some.
|
|
||||||
- Space Age: Big Fulgora rocks now have some tin ore (and if Lead mod is enabled, lead ore) to
|
|
||||||
help kickstart production before solder can be recycled.
|
|
||||||
- Space Age / Any Planet Start: Scrap recycling no longer produces bronze plates
|
|
||||||
---------------------------------------------------------------------------------------------------
|
|
||||||
Version: 2.0.6
|
|
||||||
Date: 2025-01-14
|
|
||||||
Fixes:
|
|
||||||
- Working with Asteroid Mining mod
|
|
||||||
---------------------------------------------------------------------------------------------------
|
|
||||||
Version: 2.0.5
|
|
||||||
Date: 2025-01-07
|
|
||||||
Fixes:
|
|
||||||
- Improve some mod compatibility
|
|
||||||
---------------------------------------------------------------------------------------------------
|
|
||||||
Version: 2.0.4
|
|
||||||
Date: 2025-01-06
|
|
||||||
Fixes:
|
|
||||||
- Fix recycling recipes for items that use tin.
|
|
||||||
- Also, attempt to respect disabling of recycling recipes
|
|
||||||
---------------------------------------------------------------------------------------------------
|
|
||||||
Version: 2.0.3
|
|
||||||
Date: 2025-01-05
|
|
||||||
Changes:
|
|
||||||
- Vulcanus rocks now have some tin ore to avoid possible soft locks
|
|
||||||
- Gleba highlands have rocks with tin ore to avoid possible soft locks
|
|
||||||
- Other minor tweaks to prevent softlocks, especially with Any Planet Start mod
|
|
||||||
---------------------------------------------------------------------------------------------------
|
|
||||||
Version: 2.0.2
|
|
||||||
Date: 2025-01-04
|
|
||||||
Fixes:
|
|
||||||
- Lock tin sulfides properly behind tech
|
|
||||||
Changes:
|
|
||||||
- Update weights for rockets
|
|
||||||
- Hot metals: use default cooling time
|
|
||||||
---------------------------------------------------------------------------------------------------
|
|
||||||
Version: 2.0.1
|
|
||||||
Date: 2025-01-01
|
|
||||||
Changes:
|
|
||||||
- Organotins will show up in a better location in places like Factoriopedia
|
|
||||||
- Tweak bronze plate icon
|
|
||||||
Features:
|
|
||||||
- Supports Hot metals mod.
|
|
||||||
- Add casting recipes for solder, and bronze if enabled.
|
|
||||||
---------------------------------------------------------------------------------------------------
|
|
||||||
Version: 2.0.0
|
|
||||||
Date: 2024-12-31
|
|
||||||
Changes:
|
|
||||||
- Updated to Factorio 2.0 and Space Age
|
|
||||||
Can be added to existing savegame. Will generate ore patches on newly explored chunks on Nauvis.
|
|
||||||
To add ore patches to previously explored chunks, use /bz-regenerate console command.
|
|
||||||
- bzlist chat command is now a proper console command: /bz-list
|
|
||||||
- Alternate processes for creating tin on Vulcanus and Gleba, and recycling on Fulgora
|
|
||||||
- A small number of new uses for tin in Spage Age. (More may come later)
|
|
||||||
- Confirmed compatible with many modded planets.
|
|
||||||
- Compatibility with other mods is not confirmed, but many will still work
|
|
||||||
---------------------------------------------------------------------------------------------------
|
|
||||||
Version: 0.1.13
|
|
||||||
Date: 2024-02-10
|
|
||||||
Changes:
|
|
||||||
- Compatibility fix for Warptorio Expansion to prevent soft lock when used without Aluminum
|
|
||||||
---------------------------------------------------------------------------------------------------
|
|
||||||
Version: 0.1.12
|
|
||||||
Date: 2023-12-24
|
|
||||||
Localization:
|
|
||||||
- ja updates, thanks to Sakuro
|
|
||||||
---------------------------------------------------------------------------------------------------
|
|
||||||
Version: 0.1.11
|
|
||||||
Date: 2023-03-27
|
|
||||||
Fixes:
|
|
||||||
- K2SE: Matter stabilizers
|
|
||||||
---------------------------------------------------------------------------------------------------
|
|
||||||
Version: 0.1.10
|
|
||||||
Date: 2023-02-12
|
|
||||||
Changes:
|
|
||||||
- Crafting efficiency improvements, thanks to nihilistzsche
|
|
||||||
---------------------------------------------------------------------------------------------------
|
|
||||||
Version: 0.1.9
|
|
||||||
Date: 2023-01-17
|
|
||||||
Features:
|
|
||||||
- (Beta) Crafting efficiency compatibility
|
|
||||||
---------------------------------------------------------------------------------------------------
|
|
||||||
Version: 0.1.8
|
|
||||||
Date: 2022-12-28
|
|
||||||
Changes:
|
|
||||||
- Updates for compatibility with Graphite & Diamonds 0.5.5
|
|
||||||
---------------------------------------------------------------------------------------------------
|
|
||||||
Version: 0.1.7
|
|
||||||
Date: 2022-12-24
|
|
||||||
Localization:
|
|
||||||
- zh-CN by sunnytan53
|
|
||||||
Fixes:
|
|
||||||
- GDIW modules
|
|
||||||
Changes:
|
|
||||||
- SE ingot in delivery cannon
|
|
||||||
---------------------------------------------------------------------------------------------------
|
|
||||||
Version: 0.1.6
|
|
||||||
Date: 2022-08-19
|
|
||||||
Changes:
|
|
||||||
- When used with Aluminum but not Lead, add new solder tech after copper-processing. Solder and
|
|
||||||
pipe to ground unlock with (or after) this tech.
|
|
||||||
- Minor recipe tweaks, including simpler pipe to ground recipe
|
|
||||||
Localization:
|
|
||||||
- ja, thanks to Sakuro
|
|
||||||
---------------------------------------------------------------------------------------------------
|
|
||||||
Version: 0.1.5
|
|
||||||
Date: 2022-08-17
|
|
||||||
Fixes:
|
|
||||||
- SE: Disable matter recipes at start
|
|
||||||
Changes:
|
|
||||||
- Compatibility with bob's assembling machines
|
|
||||||
- Compatibility with Renai Transportation inserters
|
|
||||||
---------------------------------------------------------------------------------------------------
|
|
||||||
Version: 0.1.4
|
|
||||||
Date: 2022-08-16
|
|
||||||
Changes:
|
|
||||||
- In some very specific mod loadouts, tinned cable used in lamps
|
|
||||||
- Stacked solder icon updated, too
|
|
||||||
Features:
|
|
||||||
- Support for SE matter fusion and SE+K2 matter liberation
|
|
||||||
---------------------------------------------------------------------------------------------------
|
|
||||||
Version: 0.1.3
|
|
||||||
Date: 2022-08-10
|
|
||||||
Changes:
|
|
||||||
- Improved solder icon
|
|
||||||
- Cables subgroup
|
|
||||||
---------------------------------------------------------------------------------------------------
|
|
||||||
Version: 0.1.2
|
|
||||||
Date: 2022-08-05
|
|
||||||
Fixes:
|
|
||||||
- When bypass setting is used with recipes with altered outputs (eg. Glass with Foundry or K2),
|
|
||||||
the outputs will now, correctly, not be altered. A similar fix will go out to other BZ mods
|
|
||||||
over the coming days/weeks.
|
|
||||||
---------------------------------------------------------------------------------------------------
|
|
||||||
Version: 0.1.1
|
|
||||||
Date: 2022-08-05
|
|
||||||
Features:
|
|
||||||
- Some support for ScienceCostTweaker - green science
|
|
||||||
---------------------------------------------------------------------------------------------------
|
|
||||||
Version: 0.1.0
|
|
||||||
Date: 2022-08-02
|
|
||||||
Changes:
|
|
||||||
- Asteroid mining compatibility
|
|
||||||
- K2: remove some descriptions that were misleading and no longer K2 standard.
|
|
||||||
---------------------------------------------------------------------------------------------------
|
|
||||||
Version: 0.0.8
|
|
||||||
Date: 2022-07-24
|
|
||||||
Localization:
|
|
||||||
- cs locale thanks to RiCZrd
|
|
||||||
---------------------------------------------------------------------------------------------------
|
|
||||||
Version: 0.0.7
|
|
||||||
Date: 2022-07-23
|
|
||||||
Localization:
|
|
||||||
- ru locale thanks to Pergamum663
|
|
||||||
---------------------------------------------------------------------------------------------------
|
|
||||||
Version: 0.0.6
|
|
||||||
Date: 2022-07-19
|
|
||||||
Changes:
|
|
||||||
- Deadlock Stacking: Bronze support
|
|
||||||
---------------------------------------------------------------------------------------------------
|
|
||||||
Version: 0.0.5
|
|
||||||
Date: 2022-07-16
|
|
||||||
Changes:
|
|
||||||
- Machine coloring tweaks
|
|
||||||
Fixes:
|
|
||||||
- K2, AAI, 248k etc: Tin in glass recipes no longer affected by productivity
|
|
||||||
- (minor) ordering of solder item
|
|
||||||
---------------------------------------------------------------------------------------------------
|
|
||||||
Version: 0.0.4
|
|
||||||
Date: 2022-07-07
|
|
||||||
Fixes:
|
|
||||||
- Support foundry minimal mode for bronze
|
|
||||||
Changes:
|
|
||||||
- Thumbnail tweak
|
|
||||||
---------------------------------------------------------------------------------------------------
|
|
||||||
Version: 0.0.3
|
|
||||||
Date: 2022-07-06
|
|
||||||
Features:
|
|
||||||
- Optional bronze plate item added, defaults to not enabled.
|
|
||||||
---------------------------------------------------------------------------------------------------
|
|
||||||
Version: 0.0.2
|
|
||||||
Date: 2022-07-06
|
|
||||||
Features:
|
|
||||||
- Compatible with both Space Exploration 0.5 and 0.6. Compatibility with SE 0.5 will likely not
|
|
||||||
be as up to date, and will eventually not be supported after a few months.
|
|
||||||
---------------------------------------------------------------------------------------------------
|
|
||||||
Version: 0.0.1
|
|
||||||
Date: 2022-07-05
|
|
||||||
Features:
|
|
||||||
- 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
|
|
||||||
|
|
@ -1,32 +0,0 @@
|
||||||
local util = require("data-util");
|
|
||||||
|
|
||||||
util.add_hot_metals({
|
|
||||||
{name="tin-plate", icons={
|
|
||||||
{ icon = "__bztin__/graphics/icons/tin-plate.png", icon_size = 128},
|
|
||||||
{ icon = "__bztin__/graphics/icons/tin-plate.png", icon_size = 128, tint={.9,.3,0, .5}},
|
|
||||||
}},
|
|
||||||
{name="bronze-plate", icons={
|
|
||||||
{ icon = "__bztin__/graphics/icons/bronze-plate.png", icon_size = 128},
|
|
||||||
{ icon = "__bztin__/graphics/icons/bronze-plate.png", icon_size = 128, tint={.9,.3,0, .5}},
|
|
||||||
}},
|
|
||||||
{name="tinned-cable", icons={
|
|
||||||
{ icon = "__bztin__/graphics/icons/tinned-cable.png", icon_size = 64},
|
|
||||||
{ icon = "__bztin__/graphics/icons/tinned-cable.png", icon_size = 64, tint={.9,.3,0, .5}},
|
|
||||||
}},
|
|
||||||
{name="solder", icons={
|
|
||||||
{ icon = "__bztin__/graphics/icons/solder.png", icon_size = 128},
|
|
||||||
{ icon = "__bztin__/graphics/icons/solder.png", icon_size = 128, tint={.9,.3,0, .5}},
|
|
||||||
}},
|
|
||||||
})
|
|
||||||
|
|
||||||
if HotMetals then
|
|
||||||
if not data.raw["recipe-category"]["advanced-crafting-hot"] then
|
|
||||||
data:extend({{
|
|
||||||
type="recipe-category",
|
|
||||||
name="advanced-crafting-hot",
|
|
||||||
}})
|
|
||||||
table.insert(HotMetals.craftingCategories, "advanced-crafting-hot")
|
|
||||||
util.add_crafting_category_if("assembling-machine", "advanced-crafting-hot", "advanced-crafting")
|
|
||||||
end
|
|
||||||
util.set_category("bronze-plate", "advanced-crafting-hot")
|
|
||||||
end
|
|
||||||
32
info.json
|
|
@ -1,32 +0,0 @@
|
||||||
{
|
|
||||||
"name": "bztin",
|
|
||||||
"version": "2.1.14",
|
|
||||||
"factorio_version": "2.0",
|
|
||||||
"title": "Tin",
|
|
||||||
"author": "Brevven",
|
|
||||||
"contact": "",
|
|
||||||
"homepage": "",
|
|
||||||
"dependencies": [
|
|
||||||
"base >= 1.1.0",
|
|
||||||
"? bzfoundry >= 0.2.1",
|
|
||||||
"? bztitanium >= 1.2.0",
|
|
||||||
"? bzlead >= 1.2.0",
|
|
||||||
"? bzzirconium >= 0.6.0",
|
|
||||||
"? bztungsten >= 0.6.0",
|
|
||||||
"? bzcarbon >= 0.5.5",
|
|
||||||
"? bzaluminum >= 0.4.9",
|
|
||||||
"? space-exploration >= 0.5.100",
|
|
||||||
"(?) aai-industry",
|
|
||||||
"? aai-industry",
|
|
||||||
"? hot-metals",
|
|
||||||
"? Krastorio2",
|
|
||||||
"? Krastorio2-spaced-out",
|
|
||||||
"? sand-and-glass",
|
|
||||||
"? deadlock-beltboxes-loaders",
|
|
||||||
"? DeadlockCrating",
|
|
||||||
"? space-age",
|
|
||||||
"(?) RenaiTransportation"
|
|
||||||
],
|
|
||||||
"description": "Adds tin, solder and more to the base game.\n\nCompatible with Space Age.\n\nA standalone piece of BZ Mods."
|
|
||||||
}
|
|
||||||
|
|
||||||
BIN
sources/graphics/technology/organotins.jpg
Normal file
|
After Width: | Height: | Size: 14 KiB |