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, 0 deletions

diff --git a/crawl-ref/source/mon-util.h b/crawl-ref/source/mon-util.h
index 7ce3388565..f2d7fcb60c 100644
--- a/crawl-ref/source/mon-util.h
+++ b/crawl-ref/source/mon-util.h
@@ -738,10 +738,12 @@ bool mons_atts_aligned(mon_attitude_type fr1, mon_attitude_type fr2);
  * *********************************************************************** */
 size_type mons_size(const monsters *m);
 bool mons_friendly(const monsters *m);
+bool mons_friendly_real(const monsters *m);
 bool mons_neutral(const monsters *m);
 bool mons_good_neutral(const monsters *m);
 bool mons_is_pacified(const monsters *m);
 bool mons_wont_attack(const monsters *m);
+bool mons_wont_attack_real(const monsters *m);
 bool mons_att_wont_attack(mon_attitude_type fr);
 mon_attitude_type mons_attitude(const monsters *m);