summaryrefslogtreecommitdiffstats
path: root/crawl-ref/source/goditem.cc
diff options
context:
space:
mode:
authorChris Campbell <chriscampbell89@gmail.com>2012-10-22 23:03:22 +0100
committerChris Campbell <chriscampbell89@gmail.com>2012-10-22 23:03:22 +0100
commit34a185812fb52067e5bf1ada1dc07dbbdd114ce7 (patch)
treeab8f45e1211b3179cf8b9c12fc0dbec0851a3123 /crawl-ref/source/goditem.cc
parent45c217f696b4f2383b9f29ba82384efc9a3ebdd6 (diff)
downloadcrawl-ref-34a185812fb52067e5bf1ada1dc07dbbdd114ce7.tar.gz
crawl-ref-34a185812fb52067e5bf1ada1dc07dbbdd114ce7.zip
Fix *Rage weapons causing berserk on almost all attacks (#2649)
Previously *Rage weapons caused berserk 50% or more of the time, rendering them near-useless without clarity or stasis. ARTP_ANGRY is now the percentage chance of causing berserk, with a value of 1-9 on random artefacts (the same probability range as used by the berserkitis mutation). Players and monsters wearing the amulet of Bloodlust (or other *Rage equipment, should any of it come into existence) are also now handled correctly. The Wrath of Trog retains its intentional 50% chance of berserking, now handled through ARTP_ANGRY so it gets an autoinscription.
Diffstat (limited to 'crawl-ref/source/goditem.cc')
-rw-r--r--crawl-ref/source/goditem.cc4
1 files changed, 1 insertions, 3 deletions
diff --git a/crawl-ref/source/goditem.cc b/crawl-ref/source/goditem.cc
index 2e1d35c49c..072a98031e 100644
--- a/crawl-ref/source/goditem.cc
+++ b/crawl-ref/source/goditem.cc
@@ -332,9 +332,7 @@ bool is_hasty_item(const item_def& item)
{
const int item_brand = get_weapon_brand(item);
retval = (item_brand == SPWPN_SPEED
- || item.sub_type == WPN_QUICK_BLADE
- || is_unrandom_artefact(item)
- && item.special == UNRAND_TROG);
+ || item.sub_type == WPN_QUICK_BLADE);
}
break;
case OBJ_ARMOUR: