diff options
| author | dshaligram <dshaligram@c06c8d41-db1a-0410-9941-cceddc491573> | 2006-11-22 09:32:37 +0000 |
|---|---|---|
| committer | dshaligram <dshaligram@c06c8d41-db1a-0410-9941-cceddc491573> | 2006-11-22 09:32:37 +0000 |
| commit | a640078f8a44d88f47559c3cf4cc883b11d4d70c (patch) | |
| tree | 452bef661460b08dc4948a207fe535f411b117f0 /crawl-ref/source/abl-show.cc | |
| parent | 1c7c5a0668701f48c72cb7ea20d567a7baca7847 (diff) | |
| download | crawl-ref-a640078f8a44d88f47559c3cf4cc883b11d4d70c.tar.gz crawl-ref-a640078f8a44d88f47559c3cf4cc883b11d4d70c.zip | |
[1599832] Machine gun acid spit forever.
git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@455 c06c8d41-db1a-0410-9941-cceddc491573
Diffstat (limited to 'crawl-ref/source/abl-show.cc')
| -rw-r--r-- | crawl-ref/source/abl-show.cc | 14 |
1 files changed, 9 insertions, 5 deletions
diff --git a/crawl-ref/source/abl-show.cc b/crawl-ref/source/abl-show.cc index d321365e74..c2fdb422a3 100644 --- a/crawl-ref/source/abl-show.cc +++ b/crawl-ref/source/abl-show.cc @@ -570,7 +570,8 @@ bool activate_ability(void) case ABIL_BREATHE_POWER: case ABIL_BREATHE_STICKY_FLAME: case ABIL_BREATHE_STEAM: - if (you.duration[DUR_BREATH_WEAPON]) + if (you.duration[DUR_BREATH_WEAPON] + && abil.ability != ABIL_SPIT_ACID) { canned_msg(MSG_CANNOT_DO_YET); return (false); @@ -636,11 +637,14 @@ bool activate_ability(void) } - you.duration[DUR_BREATH_WEAPON] = - 3 + random2(4) + random2(30 - you.experience_level) / 2; + if (abil.ability != ABIL_SPIT_ACID) + { + you.duration[DUR_BREATH_WEAPON] = + 3 + random2(4) + random2(30 - you.experience_level) / 2; - if (Curr_abil[abil_used].which == ABIL_BREATHE_STEAM) - you.duration[DUR_BREATH_WEAPON] /= 2; + if (Curr_abil[abil_used].which == ABIL_BREATHE_STEAM) + you.duration[DUR_BREATH_WEAPON] /= 2; + } break; case ABIL_EVOKE_BLINK: // randarts |