diff options
| author | j-p-e-g <j-p-e-g@c06c8d41-db1a-0410-9941-cceddc491573> | 2007-09-05 20:48:05 +0000 |
|---|---|---|
| committer | j-p-e-g <j-p-e-g@c06c8d41-db1a-0410-9941-cceddc491573> | 2007-09-05 20:48:05 +0000 |
| commit | 6608eef87f00996c9a9757692e5bb26c25cb35ac (patch) | |
| tree | 2de83c7449ff009dc929eaaa50982619726c9adc /crawl-ref/source/spl-cast.cc | |
| parent | 88fd21a557af9d87d660e896023b7e8788ea915f (diff) | |
| download | crawl-ref-6608eef87f00996c9a9757692e5bb26c25cb35ac.tar.gz crawl-ref-6608eef87f00996c9a9757692e5bb26c25cb35ac.zip | |
Added a message when Condensation Shield is extended
(inspired by BR 1763077) and removed double levitation
extension if flying. Also, rods don't give the surge
message anymore as spell enhancers are ignored anyway.
Added message to show when a weapon of reaching is being
used. (FR 1781922)
git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@2058 c06c8d41-db1a-0410-9941-cceddc491573
Diffstat (limited to 'crawl-ref/source/spl-cast.cc')
| -rw-r--r-- | crawl-ref/source/spl-cast.cc | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/crawl-ref/source/spl-cast.cc b/crawl-ref/source/spl-cast.cc index f05b6712b1..e9fd5b564e 100644 --- a/crawl-ref/source/spl-cast.cc +++ b/crawl-ref/source/spl-cast.cc @@ -880,13 +880,16 @@ spret_type your_spells( spell_type spell, int powc, bool allow_fail ) return (SPRET_ABORT); } } - + + // enhancers only matter for calc_spell_power() and spell_fail() + // not sure about this: is it flavour or misleading? + if (powc == 0 || allow_fail) + surge_power(spell); + // Added this so that the passed in powc can have meaning -- bwr if (powc == 0) powc = calc_spell_power( spell, true ); - surge_power(spell); - if (allow_fail) { int spfl = random2avg(100, 3); @@ -1185,7 +1188,8 @@ spret_type your_spells( spell_type spell, int powc, bool allow_fail ) summon_small_mammals(powc); //jmf: hmm, that's definitely *plural* ;-) break; - case SPELL_ABJURATION_I: //jmf: why not group with SPELL_ABJURATION_II? + case SPELL_ABJURATION_I: + case SPELL_ABJURATION_II: abjuration(powc); break; @@ -1373,10 +1377,6 @@ spret_type your_spells( spell_type spell, int powc, bool allow_fail ) summon_ice_beast_etc(powc, MONS_DAEVA); break; - case SPELL_ABJURATION_II: - abjuration(powc); - break; - // Remember that most holy spells above don't yet use powc! case SPELL_TWISTED_RESURRECTION: |