Don't give Lugonu piety for kills in the Abyss

Lugonu expects worshippers to spend their time more productively by spreading
chaos outside the Abyss.

1 files changed, 36 insertions, 12 deletions

diff --git a/crawl-ref/source/godconduct.cc b/crawl-ref/source/godconduct.cc
index 1fe75885cd..45eafb8567 100644
--- a/crawl-ref/source/godconduct.cc
+++ b/crawl-ref/source/godconduct.cc
@@ -353,13 +353,15 @@ 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;
 
@@ -382,11 +384,13 @@ 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;
 
@@ -408,13 +412,15 @@ 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;
 
@@ -538,13 +544,15 @@ 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;
 
@@ -569,11 +577,13 @@ 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;
 
@@ -606,10 +616,12 @@ 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;
 
@@ -627,11 +639,13 @@ 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;
@@ -647,10 +661,12 @@ 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;
@@ -666,9 +682,11 @@ 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;
@@ -684,10 +702,12 @@ 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 :
@@ -704,10 +724,12 @@ 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;
@@ -723,11 +745,13 @@ 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 :