Don't apply god conducts in monster_die() while in arena mode. In partiuclar,

this prevents TSO from smiting the player when the friendly faction kills an
angel or daeva.

Assert in god_speaks() and did_god_conduct() if called during arena mode.


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

1 files changed, 7 insertions, 1 deletions

diff --git a/crawl-ref/source/monstuff.cc b/crawl-ref/source/monstuff.cc
index 4b18876eac..028140ed04 100644
--- a/crawl-ref/source/monstuff.cc
+++ b/crawl-ref/source/monstuff.cc
@@ -1174,6 +1174,9 @@ void monster_die(monsters *monster, killer_type killer,
                     mpr("That felt strangely unrewarding.");
             }
 
+            if (crawl_state.arena)
+                break;
+
             // killing triggers tutorial lesson
             _tutorial_inspect_kill();
 
@@ -1326,6 +1329,9 @@ void monster_die(monsters *monster, killer_type killer,
                                        MDAM_DEAD);
             }
 
+            if (crawl_state.arena)
+                break;
+
             // No piety loss if god gifts killed by other monsters.
             // Also, dancing weapons aren't really friendlies.
             if (mons_friendly(monster)
@@ -1562,7 +1568,7 @@ void monster_die(monsters *monster, killer_type killer,
         }
     }
 
-    if (!mons_reset)
+    if (!mons_reset && !crawl_state.arena)
     {
         you.kills->record_kill(monster, killer, pet_kill);