Refactor weapon_skill()

This function was misleadingly named (it only provided the skill
used for melee weapons, not ranged weapons), and incomplete;
code along the lines of "is_ranged_weapon(*it) ? range_skill(*it)
: weapon_skill(*it)" was scattered in about half a dozen different
functions. I've corrected both of those problems (renaming weapon_
skill() to melee_skill() and adding item_weapon_skill()), and also
possibly fixed two bugs in the process - an l_you.cc function that
claimed to provide the skill used for the starting weapon (but
actually only gave the melee skill), and unrand creation code that
checked if a potential unrand swap used the same (melee) skill as
the weapon type being generated.

1 files changed, 1 insertions, 3 deletions

diff --git a/crawl-ref/source/acquire.cc b/crawl-ref/source/acquire.cc
index 25fb7a1906..6661f3b1dc 100644
--- a/crawl-ref/source/acquire.cc
+++ b/crawl-ref/source/acquire.cc
@@ -463,9 +463,7 @@ static int _acquirement_weapon_subtype(bool divine, int & /*quantity*/)
     // 0% or 100% in the above formula.  At skill 25 that's *3.5 .
     for (int i = 0; i < NUM_WEAPONS; ++i)
     {
-        int wskill = range_skill(OBJ_WEAPONS, i);
-        if (wskill == SK_THROWING)
-            wskill = weapon_skill(OBJ_WEAPONS, i);
+        const int wskill = item_attack_skill(OBJ_WEAPONS, i);
 
         if (wskill != skill)
             continue;