Add more consistency fixes for equipment. Disallow dwarven needles and

blowguns in set_equip_race(), as the former are useless without the 
latter, and dwarves don't make the former.  Also, disallow racial naga 
and centaur bardings, as they aren't generated randomly, and are useless 
to anyone but nagas and centaurs.  Finally, allow orcish robes and 
shields to be generated randomly; among monsters, orc wizards already 
get orcish robes, and, among players, orc fighters already start with 
orcish shields, and orcs are good with shields anyway.


git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@3032 c06c8d41-db1a-0410-9941-cceddc491573

1 files changed, 6 insertions, 2 deletions

diff --git a/crawl-ref/source/itemprop.cc b/crawl-ref/source/itemprop.cc
index 2ec3b99dfc..1bbb7861a4 100644
--- a/crawl-ref/source/itemprop.cc
+++ b/crawl-ref/source/itemprop.cc
@@ -697,8 +697,11 @@ void set_equip_race( item_def &item, unsigned long flags )
         switch (item.base_type)
         {
         case OBJ_WEAPONS:
-            if (weapon_skill(item) == SK_POLEARMS)
+            if (weapon_skill(item) == SK_POLEARMS
+                || item.sub_type == WPN_BLOWGUN)
+            {
                 return;
+            }
             break;
         case OBJ_ARMOUR:
             if (item.sub_type == ARM_ROBE
@@ -709,7 +712,8 @@ void set_equip_race( item_def &item, unsigned long flags )
             }
             break;
         case OBJ_MISSILES:
-            if (item.sub_type == MI_ARROW
+            if (item.sub_type == MI_NEEDLE
+                || item.sub_type == MI_ARROW
                 || item.sub_type == MI_JAVELIN)
             {
                 return;