From b047730f0c88df6ab5d53aac6470a47aae2a7af3 Mon Sep 17 00:00:00 2001 From: zelgadis Date: Tue, 6 Jan 2009 01:37:30 +0000 Subject: 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 --- crawl-ref/source/traps.cc | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'crawl-ref/source/traps.cc') diff --git a/crawl-ref/source/traps.cc b/crawl-ref/source/traps.cc index 6176c1554b..7be9b3e3ed 100644 --- a/crawl-ref/source/traps.cc +++ b/crawl-ref/source/traps.cc @@ -37,6 +37,7 @@ REVISION("$Rev$"); #include "spells3.h" #include "spl-mis.h" #include "spl-util.h" +#include "state.h" #include "stuff.h" #include "terrain.h" #include "transfor.h" @@ -589,7 +590,7 @@ void trap_def::trigger(actor& triggerer, bool flat_footed) if (!you_know) this->hide(); - if (mons_wont_attack(m)) + if (mons_wont_attack(m) || crawl_state.arena) { MiscastEffect( m, ZOT_TRAP_MISCAST, SPTYP_RANDOM, 3, "the power of Zot" ); -- cgit v1.2.3-54-g00ecf