summaryrefslogtreecommitdiffstats
path: root/crawl-ref
diff options
context:
space:
mode:
authorJude Brown <bookofjude@users.sourceforge.net>2010-01-07 15:55:58 +1000
committerJude Brown <bookofjude@users.sourceforge.net>2010-01-07 15:55:58 +1000
commitd798e969ea1d09d9939c2bf43eaa99c7610a8a4a (patch)
tree77b134dd5c30592d38739e67b84aeb448fb7790b /crawl-ref
parent278d5e8a894b48f0773b7546e7b4be45048264b1 (diff)
downloadcrawl-ref-d798e969ea1d09d9939c2bf43eaa99c7610a8a4a.tar.gz
crawl-ref-d798e969ea1d09d9939c2bf43eaa99c7610a8a4a.zip
Fix bows of venom branding ammo permanently (#347).
The previous behaviour of venom weapons was to automatically brand the ammunition regardless. This meant that temporarily branded weapons (now using Poison Weapon) permanently branded the ammunition as such. Instead, now check for temporary brands; the behaviour will remain the same as before for permanent venom branded weapons.
Diffstat (limited to 'crawl-ref')
-rw-r--r--crawl-ref/source/item_use.cc3
1 files changed, 2 insertions, 1 deletions
diff --git a/crawl-ref/source/item_use.cc b/crawl-ref/source/item_use.cc
index 221da69184..9bf3ce6763 100644
--- a/crawl-ref/source/item_use.cc
+++ b/crawl-ref/source/item_use.cc
@@ -2107,7 +2107,8 @@ bool setup_missile_beam(const actor *agent, bolt &beam, item_def &item,
if (bow_brand == SPWPN_VENOM && ammo_brand != SPMSL_CURARE)
{
- if (ammo_brand == SPMSL_NORMAL)
+ // Don't perma-poison with a temp-branded weapon.
+ if (ammo_brand == SPMSL_NORMAL && !you.duration[DUR_WEAPON_BRAND])
item.special = SPMSL_POISONED;
poisoned = true;