diff options
author | haranp <haranp@c06c8d41-db1a-0410-9941-cceddc491573> | 2007-07-26 11:47:35 +0000 |
---|---|---|
committer | haranp <haranp@c06c8d41-db1a-0410-9941-cceddc491573> | 2007-07-26 11:47:35 +0000 |
commit | 24936f8280fcee3d0503c66d9d1e117c3d279d6f (patch) | |
tree | f15affc2b9eeeceb086442da7714c865252cb6bf /crawl-ref/source/effects.cc | |
parent | dae15d11b2a27f9310bf49f0e421fd267f713f28 (diff) | |
download | crawl-ref-24936f8280fcee3d0503c66d9d1e117c3d279d6f.tar.gz crawl-ref-24936f8280fcee3d0503c66d9d1e117c3d279d6f.zip |
Added rod of venom [1701655]. Redid some braindead staff handling.
Breaks savefiles.
git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@1932 c06c8d41-db1a-0410-9941-cceddc491573
Diffstat (limited to 'crawl-ref/source/effects.cc')
-rw-r--r-- | crawl-ref/source/effects.cc | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/crawl-ref/source/effects.cc b/crawl-ref/source/effects.cc index bae43a8677..b213683e5d 100644 --- a/crawl-ref/source/effects.cc +++ b/crawl-ref/source/effects.cc @@ -1045,7 +1045,7 @@ static int find_acquirement_subtype(object_class_type class_wanted, case SK_EVOCATIONS: if (!one_chance_in(4)) - type_wanted = STAFF_SMITING + random2(10); + type_wanted = random_rod_subtype(); break; default: // invocations and leftover spell schools @@ -1073,16 +1073,15 @@ static int find_acquirement_subtype(object_class_type class_wanted, break; } - // Increased chance of getting spell staff for new or + // Increased chance of getting a rod for new or // non-spellcasters. -- bwr if (one_chance_in(20) || (spell_skills <= 1 // short on spells - && (type_wanted < STAFF_SMITING // already making one - || type_wanted >= STAFF_AIR) + && type_wanted < STAFF_SMITING && !one_chance_in(4))) { - type_wanted = (coinflip() ? STAFF_STRIKING - : STAFF_SMITING + random2(10)); + type_wanted = coinflip() ? STAFF_STRIKING : + random_rod_subtype(); } break; |