summaryrefslogtreecommitdiffstats
path: root/crawl-ref/source/effects.cc
diff options
context:
space:
mode:
authorJude Brown <bookofjude@users.sourceforge.net>2009-12-31 23:04:44 +1000
committerJude Brown <bookofjude@users.sourceforge.net>2009-12-31 23:21:12 +1000
commit20de84ea5290c7f9326e216814424cfd2230575e (patch)
tree3a8ec83cdddd583b9a1f437eb248c132d554b261 /crawl-ref/source/effects.cc
parentb194faa1f7e53d81bac6f42c404790ff2b620385 (diff)
downloadcrawl-ref-20de84ea5290c7f9326e216814424cfd2230575e.tar.gz
crawl-ref-20de84ea5290c7f9326e216814424cfd2230575e.zip
Subsume Darts skill into Throwing.
Instances where Darts skill was previously check (such as blow guns, throwing of darts, etc), now check the throwing skill instead. This causes a few problems: * missile acquirement is possibly skewed now * aptitudes are now wrong, and should be adjusted This doesn't include code to compensate for large monsters that used to have a good throwing skills and bad dart skills now using the lower throwing skill, and vice versa, but it's a major start. TAG_MAJOR_VERSION was bumped in the previous commit. Hopefully I haven't broken anything too major, but if so, the commit can be reverted.
Diffstat (limited to 'crawl-ref/source/effects.cc')
-rw-r--r--crawl-ref/source/effects.cc6
1 files changed, 3 insertions, 3 deletions
diff --git a/crawl-ref/source/effects.cc b/crawl-ref/source/effects.cc
index 802653a456..f43c3843ed 100644
--- a/crawl-ref/source/effects.cc
+++ b/crawl-ref/source/effects.cc
@@ -1381,7 +1381,7 @@ static int _acquirement_weapon_subtype()
int count = 0;
int skill = SK_FIGHTING;
- for (int i = SK_SHORT_BLADES; i <= SK_DARTS; i++)
+ for (int i = SK_SHORT_BLADES; i <= SK_CROSSBOWS; i++)
{
if (is_invalid_skill(i))
continue;
@@ -1452,7 +1452,7 @@ static missile_type _acquirement_missile_subtype()
int count = 0;
int skill = SK_THROWING;
- for (int i = SK_SLINGS; i <= SK_DARTS; i++)
+ for (int i = SK_SLINGS; i <= SK_THROWING; i++)
{
if (you.skills[i])
{
@@ -1478,7 +1478,7 @@ static missile_type _acquirement_missile_subtype()
: MI_DART);
break;
- case SK_DARTS:
+ case SK_THROWING:
// Assuming that blowgun in inventory means that they
// may want needles for it (but darts might also be
// wanted). Maybe expand this... see above comment.