In arena mode, make mons_friendly() and mons_wont_attack() always return false,

with mons_friendly_real() and monst_wont_attack_real() having the old behaviour
of ignoring arena mode.  Remove all special casing of
"mons_friendly(mon) && !crawl_state.arena", instead using mons_friendly_real()
and mons_wont_attack_real() in the monster code which distinguishes friend from
foe.  Might be a bit buggy.

Make Zot traps affect all monsters in arena mode, and never the player.


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

1 files changed, 2 insertions, 1 deletions

diff --git a/crawl-ref/source/arena.cc b/crawl-ref/source/arena.cc
index e436af3be6..074f99518b 100644
--- a/crawl-ref/source/arena.cc
+++ b/crawl-ref/source/arena.cc
@@ -106,7 +106,7 @@ namespace arena
             if (!mon->alive())
                 continue;
 
-            const bool friendly = mons_friendly(mon);
+            const bool friendly = mons_friendly_real(mon);
             // Set target to the opposite faction's home base.
             mon->target = friendly ? place_b : place_a;
         }
@@ -570,6 +570,7 @@ namespace arena
                 delay(Options.arena_delay);
                 mesclr();
                 dump_messages();
+                ASSERT(you.pet_target == MHITNOT);
             }
             viewwindow(true, false);
         }