Explicitly require manual abandon of Ru for Spiteful

Also clean up some messaging
Floodkiller · Feb 17, 2020 · 3c1e247 · 3c1e247
1 parent b1f2826
commit 3c1e247
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 2 deletions.
diff --git a/crawl-ref/source/ability.cc b/crawl-ref/source/ability.cc
@@ -3104,7 +3104,7 @@ static spret_type _do_ability(const ability_def& abil, bool fail)
     case ABIL_RENOUNCE_RELIGION:
         fail_check();
         if (you.pledge == PLEDGE_SPITEFUL && you.piety < 160 
-            && you.religion == GOD_RU)
+            && you.religion == GOD_RU && !you.attribute[ATTR_SPITEFUL])
         {
             mpr("Your pledge won't allow you to renounce Ru until you become Ru's champion.");
             return SPRET_ABORT;
@@ -3122,7 +3122,7 @@ static spret_type _do_ability(const ability_def& abil, bool fail)
             else
             {
                 excommunication(true);
-                if (you.pledge == PLEDGE_SPITEFUL)
+                if (you.pledge == PLEDGE_SPITEFUL && !you.attribute[ATTR_SPITEFUL])
                 {
                     you.attribute[ATTR_SPITEFUL] = 1;
                     mpr("You accomplish your pledge, allowing you to freely roam the dungeon!");

diff --git a/crawl-ref/source/god-prayer.cc b/crawl-ref/source/god-prayer.cc
@@ -78,6 +78,12 @@ static god_type _altar_identify_ecumenical_altar()
 
 static bool _pray_ecumenical_altar()
 {
+    if (you.pledge == PLEDGE_SPITEFUL && !you.attribute[ATTR_SPITEFUL])
+    {
+        mpr("You cannot worship a new god until you have abandoned Ru once before!");
+        return false;
+    }
+
     if (yesno("You cannot tell which god this altar belongs to. Convert to "
               "them anyway?", false, 'n'))
     {

diff --git a/crawl-ref/source/religion.cc b/crawl-ref/source/religion.cc
@@ -3083,6 +3083,12 @@ bool player_can_join_god(god_type which_god)
     if (you.species == SP_PROMETHEAN || you.pledge == PLEDGE_BRUTE_FORCE)
         return false;
 
+    if (you.pledge == PLEDGE_SPITEFUL && !you.attribute[ATTR_SPITEFUL])
+    {
+        mpr("You cannot worship a new god until you have abandoned Ru once before!");
+        return false;
+    }
+
     if (you.pledge == PLEDGE_CHAOS)
     {
         mpr("Nice try, Xom isn't letting you go that easily!");