Simplify Lugonu's no-piety, fix banishment giving piety in the Abyss.

(With newnewabyss, you can pull people deeper.)

1 files changed, 14 insertions, 37 deletions

diff --git a/crawl-ref/source/godconduct.cc b/crawl-ref/source/godconduct.cc
index 45eafb8567..941f7feb9f 100644
--- a/crawl-ref/source/godconduct.cc
+++ b/crawl-ref/source/godconduct.cc
@@ -55,7 +55,8 @@ bool did_god_conduct(conduct_type thing_done, int level, bool known,
 
     bool retval = false;
 
-    if (you.religion != GOD_NO_GOD && you.religion != GOD_XOM)
+    if (you.religion != GOD_NO_GOD && you.religion != GOD_XOM
+        && (you.religion != GOD_LUGONU || !player_in_branch(BRANCH_ABYSS)))
     {
         int piety_change = 0;
         int piety_denom = 1;
@@ -353,15 +354,13 @@ bool did_god_conduct(conduct_type thing_done, int level, bool known,
                 }
                 break;
 
-            case GOD_LUGONU:    // No piety from Abyss denizens.
-                if (player_in_branch(BRANCH_ABYSS))
-                    break;
             case GOD_KIKUBAAQUDGHA:
             case GOD_YREDELEMNUL:
             case GOD_VEHUMET:
             case GOD_MAKHLEB:
             case GOD_TROG:
             case GOD_BEOGH:
+            case GOD_LUGONU:
                 if (god_hates_attacking_friend(you.religion, victim))
                     break;
 
@@ -384,13 +383,11 @@ bool did_god_conduct(conduct_type thing_done, int level, bool known,
         case DID_KILL_UNDEAD:
             switch (you.religion)
             {
-            case GOD_LUGONU:    // No piety from Abyss denizens.
-                if (player_in_branch(BRANCH_ABYSS))
-                    break;
             case GOD_SHINING_ONE:
             case GOD_VEHUMET:
             case GOD_MAKHLEB:
             case GOD_BEOGH:
+            case GOD_LUGONU:
                 if (god_hates_attacking_friend(you.religion, victim))
                     break;
 
@@ -412,15 +409,13 @@ bool did_god_conduct(conduct_type thing_done, int level, bool known,
         case DID_KILL_DEMON:
             switch (you.religion)
             {
-            case GOD_LUGONU:    // No piety from Abyss denizens.
-                if (player_in_branch(BRANCH_ABYSS))
-                    break;
             case GOD_SHINING_ONE:
             case GOD_VEHUMET:
             case GOD_MAKHLEB:
             case GOD_TROG:
             case GOD_KIKUBAAQUDGHA:
             case GOD_BEOGH:
+            case GOD_LUGONU:
                 if (god_hates_attacking_friend(you.religion, victim))
                     break;
 
@@ -544,15 +539,13 @@ bool did_god_conduct(conduct_type thing_done, int level, bool known,
                 retval = true;
                 break;
 
-            case GOD_LUGONU:    // No piety from Abyss denizens.
-                if (player_in_branch(BRANCH_ABYSS))
-                    break;
             case GOD_YREDELEMNUL:
             case GOD_KIKUBAAQUDGHA:
             case GOD_TROG:
             case GOD_VEHUMET:
             case GOD_MAKHLEB:
             case GOD_BEOGH:
+            case GOD_LUGONU:
                 if (god_hates_attacking_friend(you.religion, victim))
                     break;
 
@@ -577,13 +570,11 @@ bool did_god_conduct(conduct_type thing_done, int level, bool known,
         case DID_HOLY_KILLED_BY_UNDEAD_SLAVE:
             switch (you.religion)
             {
-            case GOD_LUGONU:    // No piety from Abyss denizens.
-                if (player_in_branch(BRANCH_ABYSS))
-                    break;
             case GOD_YREDELEMNUL:
             case GOD_KIKUBAAQUDGHA:
             case GOD_MAKHLEB:
             case GOD_BEOGH:
+            case GOD_LUGONU:
                 if (god_hates_attacking_friend(you.religion, victim))
                     break;
 
@@ -616,12 +607,10 @@ bool did_god_conduct(conduct_type thing_done, int level, bool known,
                 retval = true;
                 break;
 
-            case GOD_LUGONU:    // No piety from Abyss denizens.
-                if (player_in_branch(BRANCH_ABYSS))
-                    break;
             case GOD_TROG:
             case GOD_MAKHLEB:
             case GOD_BEOGH:
+            case GOD_LUGONU:
                 if (god_hates_attacking_friend(you.religion, victim))
                     break;
 
@@ -639,13 +628,11 @@ bool did_god_conduct(conduct_type thing_done, int level, bool known,
         case DID_LIVING_KILLED_BY_UNDEAD_SLAVE:
             switch (you.religion)
             {
-            case GOD_LUGONU:    // No piety from Abyss denizens.
-                if (player_in_branch(BRANCH_ABYSS))
-                    break;
             case GOD_YREDELEMNUL:
             case GOD_KIKUBAAQUDGHA:
             case GOD_MAKHLEB:
             case GOD_BEOGH:
+            case GOD_LUGONU:
                 simple_god_message(" accepts your slave's kill.");
                 retval = true;
                 piety_denom = level + 10 - you.experience_level/3;
@@ -661,12 +648,10 @@ bool did_god_conduct(conduct_type thing_done, int level, bool known,
         case DID_LIVING_KILLED_BY_SERVANT:
             switch (you.religion)
             {
-            case GOD_LUGONU:    // No piety from Abyss denizens.
-                if (player_in_branch(BRANCH_ABYSS))
-                    break;
             case GOD_MAKHLEB:
             case GOD_TROG:
             case GOD_BEOGH:
+            case GOD_LUGONU:
                 simple_god_message(" accepts your collateral kill.");
                 retval = true;
                 piety_denom = level + 10 - you.experience_level/3;
@@ -682,11 +667,9 @@ bool did_god_conduct(conduct_type thing_done, int level, bool known,
         case DID_UNDEAD_KILLED_BY_UNDEAD_SLAVE:
             switch (you.religion)
             {
-            case GOD_LUGONU:    // No piety from Abyss denizens.
-                if (player_in_branch(BRANCH_ABYSS))
-                    break;
             case GOD_MAKHLEB:
             case GOD_BEOGH:
+            case GOD_LUGONU:
                 simple_god_message(" accepts your slave's kill.");
                 retval = true;
                 piety_denom = level + 10 - you.experience_level/3;
@@ -702,12 +685,10 @@ bool did_god_conduct(conduct_type thing_done, int level, bool known,
         case DID_UNDEAD_KILLED_BY_SERVANT:
             switch (you.religion)
             {
-            case GOD_LUGONU:    // No piety from Abyss denizens.
-                if (player_in_branch(BRANCH_ABYSS))
-                    break;
             case GOD_SHINING_ONE:
             case GOD_MAKHLEB:
             case GOD_BEOGH:
+            case GOD_LUGONU:
                 simple_god_message(" accepts your collateral kill.");
                 retval = true;
                 piety_denom = level + 10 - (is_good_god(you.religion) ? 0 :
@@ -724,12 +705,10 @@ bool did_god_conduct(conduct_type thing_done, int level, bool known,
         case DID_DEMON_KILLED_BY_UNDEAD_SLAVE:
             switch (you.religion)
             {
-            case GOD_LUGONU:    // No piety from Abyss denizens.
-                if (player_in_branch(BRANCH_ABYSS))
-                    break;
             case GOD_KIKUBAAQUDGHA:
             case GOD_MAKHLEB:
             case GOD_BEOGH:
+            case GOD_LUGONU:
                 simple_god_message(" accepts your slave's kill.");
                 retval = true;
                 piety_denom = level + 10 - you.experience_level/3;
@@ -745,13 +724,11 @@ bool did_god_conduct(conduct_type thing_done, int level, bool known,
         case DID_DEMON_KILLED_BY_SERVANT:
             switch (you.religion)
             {
-            case GOD_LUGONU:    // No piety from Abyss denizens.
-                if (player_in_branch(BRANCH_ABYSS))
-                    break;
             case GOD_SHINING_ONE:
             case GOD_MAKHLEB:
             case GOD_TROG:
             case GOD_BEOGH:
+            case GOD_LUGONU:
                 simple_god_message(" accepts your collateral kill.");
                 retval = true;
                 piety_denom = level + 10 - (is_good_god(you.religion) ? 0 :