Add consistency fixes for elven weapons:

* Since monster elves can get elven scimitars, and scimitars are long 
blades and better for the dexterous (both of which fit elves), allow 
elven scimitars to be randomly generated.  The chance is 1/5, falling 
through to the existing case of 1/2 for orcish ones, based on the chance 
for elven long swords and adjusted for scimitars' greater rarity.

* Since, aside from starting equipment for elf players, no elven axes 
show up, either randomly or on monster elves, the elven aptitudes for 
axes are almost as bad as those for the disallowed maces/flails, and 
axes are better for the strong (none of which fit elves), disallow elven 
axes.


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

2 files changed, 6 insertions, 1 deletions

diff --git a/crawl-ref/source/itemprop.cc b/crawl-ref/source/itemprop.cc
index 3d37186e8a..2bb580de93 100644
--- a/crawl-ref/source/itemprop.cc
+++ b/crawl-ref/source/itemprop.cc
@@ -670,8 +670,11 @@ void set_equip_race( item_def &item, unsigned long flags )
         switch (item.base_type)
         {
         case OBJ_WEAPONS:
-            if (weapon_skill(item) == SK_MACES_FLAILS)
+            if (weapon_skill(item) == SK_MACES_FLAILS
+                || weapon_skill(item) == SK_AXES)
+            {
                 return;
+            }
             break;
         case OBJ_ARMOUR:
             if (item.sub_type == ARM_SPLINT_MAIL
diff --git a/crawl-ref/source/makeitem.cc b/crawl-ref/source/makeitem.cc
index c28c5c760d..aa21dfa01c 100644
--- a/crawl-ref/source/makeitem.cc
+++ b/crawl-ref/source/makeitem.cc
@@ -1050,6 +1050,8 @@ static item_status_flag_type determine_weapon_race(const item_def& item,
             break;
 
         case WPN_SCIMITAR:
+            if (one_chance_in(5))
+                rc = ISFLAG_ELVEN;
             if (coinflip())
                 rc = ISFLAG_ORCISH;
             break;