summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authordshaligram <dshaligram@c06c8d41-db1a-0410-9941-cceddc491573>2006-10-28 05:45:09 +0000
committerdshaligram <dshaligram@c06c8d41-db1a-0410-9941-cceddc491573>2006-10-28 05:45:09 +0000
commit5271ddc2d412a097afdc6153af39fd7d9bb06428 (patch)
tree73cff568f00787f4d598a2cee1ee6bf22adf9285
parent54d424b82ba5b91a3fd567f97a186de2eca9dd3f (diff)
downloadcrawl-ref-5271ddc2d412a097afdc6153af39fd7d9bb06428.tar.gz
crawl-ref-5271ddc2d412a097afdc6153af39fd7d9bb06428.zip
[1586069] Removed special treatment for yellow draconians - they had no bwpn delay for spitting acid. Also reduced the timeout for breath weapons.
git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/branches/stone_soup@294 c06c8d41-db1a-0410-9941-cceddc491573
-rw-r--r--crawl-ref/source/abl-show.cc14
1 files changed, 4 insertions, 10 deletions
diff --git a/crawl-ref/source/abl-show.cc b/crawl-ref/source/abl-show.cc
index 4773c0e15f..100e3923b7 100644
--- a/crawl-ref/source/abl-show.cc
+++ b/crawl-ref/source/abl-show.cc
@@ -106,7 +106,7 @@ static const struct ability_def Ability_List[] =
{ ABIL_BREATHE_STEAM, "Breathe Steam", 0, 0, 75, 0, ABFLAG_BREATH },
// Handled with breath weapons, but doesn't cause a breathing delay
- { ABIL_SPIT_ACID, "Spit Acid", 0, 0, 125, 0, ABFLAG_NONE },
+ { ABIL_SPIT_ACID, "Spit Acid", 0, 0, 125, 0, ABFLAG_BREATH },
{ ABIL_FLY, "Fly", 3, 0, 100, 0, ABFLAG_NONE },
{ ABIL_SUMMON_MINOR_DEMON, "Summon Minor Demon", 3, 3, 75, 0, ABFLAG_NONE },
@@ -573,8 +573,7 @@ bool activate_ability(void)
case ABIL_BREATHE_POWER:
case ABIL_BREATHE_STICKY_FLAME:
case ABIL_BREATHE_STEAM:
- if (you.duration[DUR_BREATH_WEAPON]
- && Curr_abil[abil_used].which != ABIL_SPIT_ACID)
+ if (you.duration[DUR_BREATH_WEAPON])
{
canned_msg(MSG_CANNOT_DO_YET);
return (false);
@@ -640,16 +639,11 @@ bool activate_ability(void)
}
- if (Curr_abil[abil_used].which != ABIL_SPIT_ACID)
- {
- you.duration[DUR_BREATH_WEAPON] = 3 + random2(5)
- + random2(30 - you.experience_level);
- }
+ 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;
- }
break;
case ABIL_EVOKE_BLINK: // randarts