When placed under penance or excommunicated by Zin, remove divine

stamina.  Also, consolidate the routines for removing Zin's divine 
robustness, Zin's divine stamina, and TSO's divine shield.


git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@5059 c06c8d41-db1a-0410-9941-cceddc491573

1 files changed, 2 insertions, 15 deletions

diff --git a/crawl-ref/source/acr.cc b/crawl-ref/source/acr.cc
index 4170989d79..b322622834 100644
--- a/crawl-ref/source/acr.cc
+++ b/crawl-ref/source/acr.cc
@@ -3066,23 +3066,10 @@ static void _decrement_durations()
     reduce_revitalisation_chain(1);
 
     if (_decrement_a_duration(DUR_DIVINE_ROBUSTNESS))
-    {
-        mpr("Your divine robustness fades.", MSGCH_DURATION);
-        you.attribute[ATTR_DIVINE_ROBUSTNESS] = 0;
-        calc_hp();
-    }
+        remove_divine_robustness();
 
     if (_decrement_a_duration(DUR_DIVINE_STAMINA))
-    {
-        mpr("Your divine stamina fades.", MSGCH_DURATION);
-        modify_stat(STAT_STRENGTH, -you.attribute[ATTR_DIVINE_STAMINA],
-                    true, "Zin's divine stamina running out");
-        modify_stat(STAT_INTELLIGENCE, -you.attribute[ATTR_DIVINE_STAMINA],
-                    true, "Zin's divine stamina running out");
-        modify_stat(STAT_DEXTERITY, -you.attribute[ATTR_DIVINE_STAMINA],
-                    true, "Zin's divine stamina running out");
-        you.attribute[ATTR_DIVINE_STAMINA] = 0;
-    }
+        remove_divine_stamina();
 }
 
 static void _check_banished()