From 20de84ea5290c7f9326e216814424cfd2230575e Mon Sep 17 00:00:00 2001 From: Jude Brown Date: Thu, 31 Dec 2009 23:04:44 +1000 Subject: 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. --- crawl-ref/source/effects.cc | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'crawl-ref/source/effects.cc') 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. -- cgit v1.2.3-54-g00ecf