Rework Zin's Vitalisation to be simpler, based mostly on dploog's

suggestions.  Note that divine robustness is no longer available from 
Zin, but the code for it is still in place, since it can be adopted 
later for Elyvilon.


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

1 files changed, 1 insertions, 20 deletions

diff --git a/crawl-ref/source/religion.cc b/crawl-ref/source/religion.cc
index e80b7ec868..bbf6fc2972 100644
--- a/crawl-ref/source/religion.cc
+++ b/crawl-ref/source/religion.cc
@@ -768,19 +768,9 @@ 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 Zin's vitalisation chaining, divine robustness,
-        // or divine stamina.
+        // Neither does Zin's divine stamina.
         else if (god == GOD_ZIN)
         {
-            if (you.duration[DUR_VITALISATION_CHAIN])
-            {
-                mpr("Your power of vitalisation disappears!");
-                you.duration[DUR_VITALISATION_CHAIN] = 0;
-            }
-
-            if (you.duration[DUR_DIVINE_ROBUSTNESS])
-                remove_divine_robustness();
-
             if (you.duration[DUR_DIVINE_STAMINA])
                 remove_divine_stamina();
         }
@@ -4863,15 +4853,6 @@ void excommunication(god_type new_god)
         break;
 
     case GOD_ZIN:
-        if (you.duration[DUR_VITALISATION_CHAIN])
-        {
-            mpr("Your power of vitalisation disappears!");
-            you.duration[DUR_VITALISATION_CHAIN] = 0;
-        }
-
-        if (you.duration[DUR_DIVINE_ROBUSTNESS])
-            remove_divine_robustness();
-
         if (you.duration[DUR_DIVINE_STAMINA])
             remove_divine_stamina();