summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--crawl-ref/source/itemprop.cc1
-rw-r--r--crawl-ref/source/makeitem.cc7
2 files changed, 7 insertions, 1 deletions
diff --git a/crawl-ref/source/itemprop.cc b/crawl-ref/source/itemprop.cc
index d9cdaee706..87dd33ee89 100644
--- a/crawl-ref/source/itemprop.cc
+++ b/crawl-ref/source/itemprop.cc
@@ -635,7 +635,6 @@ void set_equip_race( item_def &item, unsigned long flags )
|| item.sub_type == WPN_LAJATANG
|| item.sub_type == WPN_SLING
|| item.sub_type == WPN_KNIFE
- || item.sub_type == WPN_WHIP
|| item.sub_type == WPN_QUARTERSTAFF
|| item.sub_type == WPN_DEMON_BLADE
|| item.sub_type == WPN_DEMON_WHIP
diff --git a/crawl-ref/source/makeitem.cc b/crawl-ref/source/makeitem.cc
index a790e647aa..ded5a80b87 100644
--- a/crawl-ref/source/makeitem.cc
+++ b/crawl-ref/source/makeitem.cc
@@ -979,6 +979,13 @@ static item_status_flag_type determine_weapon_race(const item_def& item,
rc = ISFLAG_ORCISH;
break;
+ case WPN_WHIP:
+ if (one_chance_in(4))
+ rc = ISFLAG_ORCISH;
+ if (one_chance_in(4))
+ rc = ISFLAG_ELVEN;
+ break;
+
case WPN_MACE:
case WPN_FLAIL:
case WPN_SPIKED_FLAIL: