MetzNet
/
dfhack
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'develop' of https://github.com/dfhack/dfhack into develop

develop
lethosor 2016-02-24 16:34:29 -05:00
parent 79fde493e2 d479f30592
commit 9d0d4fd08b
1 changed files with 33 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
plugins/lua/stockflow.lua
Unescape Escape View File

@ -272,6 +272,8 @@ function collect_reactions()
materials.wood.adjective = "wooden" materials.wood.adjective = "wooden"
materials.tooth.adjective = "ivory/tooth" materials.tooth.adjective = "ivory/tooth"
materials.leather.clothing_flag = "LEATHER" materials.leather.clothing_flag = "LEATHER"
materials.shell.short = true
materials.pearl.short = true
-- Collection and Entrapment -- Collection and Entrapment
reaction_entry(result, job_types.CollectWebs) reaction_entry(result, job_types.CollectWebs)
@ -360,6 +362,7 @@ function collect_reactions()
local cloth_mats = {materials.cloth, materials.silk, materials.yarn, materials.leather} local cloth_mats = {materials.cloth, materials.silk, materials.yarn, materials.leather}
for _, material in ipairs(cloth_mats) do for _, material in ipairs(cloth_mats) do
material_reactions(result, {{job_types.SewImage, "Sew", "Image"}}, material) material_reactions(result, {{job_types.SewImage, "Sew", "Image"}}, material)
material.cloth = true
end end
for _, spec in ipairs{materials.bone, materials.shell, materials.tooth, materials.horn, materials.pearl} do for _, spec in ipairs{materials.bone, materials.shell, materials.tooth, materials.horn, materials.pearl} do
@ -527,6 +530,14 @@ function collect_reactions()
{job_types.MakeFlask, "Forge", "Flask"}, {job_types.MakeFlask, "Forge", "Flask"},
{job_types.MakeChain, "Forge", "Chain"}, {job_types.MakeChain, "Forge", "Chain"},
{job_types.MakeCrafts, "Make", "Crafts"}, {job_types.MakeCrafts, "Make", "Crafts"},
{job_types.MakeFigurine, "Make", "Figurine"},
{job_types.MakeAmulet, "Make", "Amulet"},
{job_types.MakeScepter, "Make", "Scepter"},
{job_types.MakeCrown, "Make", "Crown"},
{job_types.MakeRing, "Make", "Ring"},
{job_types.MakeEarring, "Make", "Earring"},
{job_types.MakeBracelet, "Make", "Bracelet"},
{job_types.MakeGem, "Make Large", "Gem"},
}, mat_flags) }, mat_flags)
end end
@ -719,6 +730,7 @@ function collect_reactions()
end end
end end
-- Crafts
for _, mat in ipairs{ for _, mat in ipairs{
materials.wood, materials.wood,
materials.rock, materials.rock,
@ -732,7 +744,27 @@ function collect_reactions()
materials.pearl, materials.pearl,
materials.yarn, materials.yarn,
} do } do
material_reactions(result, {{job_types.MakeCrafts, "Make", "Crafts"}}, mat) material_reactions(result, {
{job_types.MakeCrafts, "Make", "Crafts"},
{job_types.MakeAmulet, "Make", "Amulet"},
{job_types.MakeBracelet, "Make", "Bracelet"},
{job_types.MakeEarring, "Make", "Earring"},
}, mat)
if not mat.cloth then
material_reactions(result, {
{job_types.MakeCrown, "Make", "Crown"},
{job_types.MakeFigurine, "Make", "Figurine"},
{job_types.MakeRing, "Make", "Ring"},
{job_types.MakeGem, "Make Large", "Gem"},
}, mat)
if not mat.short then
material_reactions(result, {
{job_types.MakeScepter, "Make", "Scepter"},
}, mat)
end
end
end end
-- Siege engine parts -- Siege engine parts