summaryrefslogtreecommitdiffstats
path: root/crawl-ref/source/religion.cc
diff options
context:
space:
mode:
authordolorous <dolorous@c06c8d41-db1a-0410-9941-cceddc491573>2009-05-06 17:47:45 +0000
committerdolorous <dolorous@c06c8d41-db1a-0410-9941-cceddc491573>2009-05-06 17:47:45 +0000
commitaaaf25173613a29674b9e86c0cd871c888749639 (patch)
treeee6abd8754aed992a1b0f7e2b3894ab4673d984e /crawl-ref/source/religion.cc
parentdc09560ed3f01a349766baf0a2cfc016041f9a6b (diff)
downloadcrawl-ref-aaaf25173613a29674b9e86c0cd871c888749639.tar.gz
crawl-ref-aaaf25173613a29674b9e86c0cd871c888749639.zip
Make Trog's Hand grant both regeneration and magic resistance.
git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@9741 c06c8d41-db1a-0410-9941-cceddc491573
Diffstat (limited to 'crawl-ref/source/religion.cc')
-rw-r--r--crawl-ref/source/religion.cc13
1 files changed, 11 insertions, 2 deletions
diff --git a/crawl-ref/source/religion.cc b/crawl-ref/source/religion.cc
index 03b797ac8b..751154dfdd 100644
--- a/crawl-ref/source/religion.cc
+++ b/crawl-ref/source/religion.cc
@@ -249,7 +249,7 @@ const char* god_gain_power_messages[NUM_GODS][MAX_GOD_ABILITIES] =
"" },
// Trog
{ "go berserk at will",
- "call upon Trog for regeneration",
+ "call upon Trog for regeneration and magic resistance",
"",
"call in reinforcements",
"" },
@@ -335,7 +335,7 @@ const char* god_lose_power_messages[NUM_GODS][MAX_GOD_ABILITIES] =
"" },
// Trog
{ "go berserk at will",
- "call upon Trog for regeneration",
+ "call upon Trog for regeneration and magic resistance",
"",
"call in reinforcements",
"" },
@@ -879,6 +879,15 @@ static void _inc_penance(god_type god, int val)
// Orcish bonuses don't apply under penance.
if (god == GOD_BEOGH)
you.redraw_armour_class = true;
+ // Neither does Trog's regeneration or magic resistance.
+ else if (god == GOD_TROG)
+ {
+ if (you.duration[DUR_REGENERATION]
+ && you.attribute[ATTR_DIVINE_REGENERATION])
+ {
+ remove_regen(true);
+ }
+ }
// Neither does Zin's divine stamina.
else if (god == GOD_ZIN)
{