diff options
author | pubby <pubby8@gmail.com> | 2013-11-10 16:54:11 +0000 |
---|---|---|
committer | Chris Campbell <chriscampbell89@gmail.com> | 2013-11-10 16:54:23 +0000 |
commit | 82cd9f861486d27ebc2b1097e127c7a20221393e (patch) | |
tree | dae0080e1ff9d6142975e8c5e2d5c029226b42be /crawl-ref/source/spl-goditem.cc | |
parent | 343fe796a6c99ae5962ea31b0c9afe6142ac922d (diff) | |
download | crawl-ref-82cd9f861486d27ebc2b1097e127c7a20221393e.tar.gz crawl-ref-82cd9f861486d27ebc2b1097e127c7a20221393e.zip |
Give Trog's Hand its own duration.
Trog's hand was using DUR_REGENERAITON, and setting
ATTR_DIVINE_REGENERATION to true to specify it was the god ability and
not the spell.
This was silly, so this commit gives trog's hand its own duration:
DUR_TROGS_HAND.
This also fixes a very minor bug: previously if you had trog's hand
active and you tried to cast regen, you got penance but the spell was
immediately canceled. Other duration spells were not canceled.
Diffstat (limited to 'crawl-ref/source/spl-goditem.cc')
-rw-r--r-- | crawl-ref/source/spl-goditem.cc | 10 |
1 files changed, 1 insertions, 9 deletions
diff --git a/crawl-ref/source/spl-goditem.cc b/crawl-ref/source/spl-goditem.cc index 2964825af6..00693137de 100644 --- a/crawl-ref/source/spl-goditem.cc +++ b/crawl-ref/source/spl-goditem.cc @@ -405,7 +405,7 @@ void antimagic() DUR_SLAYING, DUR_STEALTH, DUR_MAGIC_SHIELD, DUR_PETRIFIED, DUR_LIQUEFYING, DUR_DARKNESS, DUR_SHROUD_OF_GOLUBRIA, DUR_DISJUNCTION, DUR_SENTINEL_MARK, - DUR_ANTIMAGIC /*!*/, + DUR_ANTIMAGIC /*!*/, DUR_REGENERATION, }; bool need_msg = false; @@ -417,14 +417,6 @@ void antimagic() need_msg = true; } - // Don't dispel divine regeneration. - if (you.duration[DUR_REGENERATION] > 0 - && !you.attribute[ATTR_DIVINE_REGENERATION]) - { - you.duration[DUR_REGENERATION] = 1; - need_msg = true; - } - if (you.duration[DUR_TELEPORT] > 0) { you.duration[DUR_TELEPORT] = 0; |