diff options
| author | Nicholas Feinberg <pleasingfung@gmail.com> | 2014-07-12 20:16:45 -0700 |
|---|---|---|
| committer | Nicholas Feinberg <pleasingfung@gmail.com> | 2014-07-13 00:33:57 -0700 |
| commit | 9b6b733bccd0de2af35eb6c28e94e4708a92004d (patch) | |
| tree | 30400b1991c700b09fff5dc4644dc43a2c693121 /crawl-ref/source/describe.cc | |
| parent | 3663d864c83a72c7cf624617e9a9a5b8b5deaf6a (diff) | |
| download | crawl-ref-9b6b733bccd0de2af35eb6c28e94e4708a92004d.tar.gz crawl-ref-9b6b733bccd0de2af35eb6c28e94e4708a92004d.zip | |
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.
Diffstat (limited to 'crawl-ref/source/describe.cc')
| -rw-r--r-- | crawl-ref/source/describe.cc | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/crawl-ref/source/describe.cc b/crawl-ref/source/describe.cc index 6f848ba368..b41eea483e 100644 --- a/crawl-ref/source/describe.cc +++ b/crawl-ref/source/describe.cc @@ -853,7 +853,7 @@ static string _describe_weapon(const item_def &item, bool verbose) if (verbose) { - switch (weapon_skill(item)) + switch (item_attack_skill(item)) { case SK_POLEARMS: description += "\n\nIt can be evoked to extend its reach."; @@ -897,8 +897,8 @@ static string _describe_weapon(const item_def &item, bool verbose) "particularly susceptible opponents."; if (damtype == DVORP_SLICING || damtype == DVORP_CHOPPING) { - description += " Big, fiery blades are also staple armaments " - "of hydra-hunters."; + description += " Big, fiery blades are also staple " + "armaments of hydra-hunters."; } } break; @@ -1045,8 +1045,7 @@ static string _describe_weapon(const item_def &item, bool verbose) { description += "\n\nThis weapon falls into the"; - const skill_type skill = - is_range_weapon(item)? range_skill(item) : weapon_skill(item); + const skill_type skill = item_attack_skill(item); description += make_stringf(" '%s' category. ", |