summaryrefslogtreecommitdiffstats
path: root/crawl-ref/source/dat/lua
diff options
context:
space:
mode:
authorj-p-e-g <j-p-e-g@c06c8d41-db1a-0410-9941-cceddc491573>2008-06-16 21:31:23 +0000
committerj-p-e-g <j-p-e-g@c06c8d41-db1a-0410-9941-cceddc491573>2008-06-16 21:31:23 +0000
commita3b6953864e93bab790e1de9ffa0092fd8383d2b (patch)
tree4be6142f31cf07ab24687473592d2df897f75c00 /crawl-ref/source/dat/lua
parent1e6ed3ddb747d9ac3e8d6b0b6944277006a160f0 (diff)
downloadcrawl-ref-a3b6953864e93bab790e1de9ffa0092fd8383d2b.tar.gz
crawl-ref-a3b6953864e93bab790e1de9ffa0092fd8383d2b.zip
Fix randart jewellery always named "of Bugginess".
Fix pickup.lua trying to find a butcher tool if the wielded edged weapon happens to be cursed. git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@5889 c06c8d41-db1a-0410-9941-cceddc491573
Diffstat (limited to 'crawl-ref/source/dat/lua')
-rw-r--r--crawl-ref/source/dat/lua/pickup.lua5
1 files changed, 5 insertions, 0 deletions
diff --git a/crawl-ref/source/dat/lua/pickup.lua b/crawl-ref/source/dat/lua/pickup.lua
index a07f82e21c..29bac13e3e 100644
--- a/crawl-ref/source/dat/lua/pickup.lua
+++ b/crawl-ref/source/dat/lua/pickup.lua
@@ -11,6 +11,11 @@ local function can_butcher(it, name)
return false
end
+ -- If we're already wielding a weapon capable of butchering, okay.
+ if item.equipped(it) then
+ return true
+ end
+
-- Don't make the user wield a known cursed weapon.
if item.cursed(it) then
return false