From f4c98b5c1ff17fc786adafb369c2beb6ed007d30 Mon Sep 17 00:00:00 2001 From: haranp Date: Wed, 4 Feb 2009 21:55:51 +0000 Subject: Don't consider user options when deciding monster behaviour and when giving a bonus for escaping nets due to dangerous monsters nearby. Don't give a bonus to escaping nets if nondangerous monsters (allies, plants, etc.) are nearby. git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@8896 c06c8d41-db1a-0410-9941-cceddc491573 --- crawl-ref/source/traps.cc | 4 ++-- crawl-ref/source/view.cc | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/crawl-ref/source/traps.cc b/crawl-ref/source/traps.cc index e9d1bc7ec9..cf559ee079 100644 --- a/crawl-ref/source/traps.cc +++ b/crawl-ref/source/traps.cc @@ -911,8 +911,8 @@ static int damage_or_escape_net(int hold) if (x_chance_in_y(player_evasion(), 20)) escape++; - // Monsters around you add urgency. - if (!i_feel_safe()) + // Dangerous monsters around you add urgency. + if (there_are_monsters_nearby(true)) { damage++; escape++; diff --git a/crawl-ref/source/view.cc b/crawl-ref/source/view.cc index cc58ba7711..d79ba45247 100644 --- a/crawl-ref/source/view.cc +++ b/crawl-ref/source/view.cc @@ -3968,7 +3968,7 @@ bool mon_enemies_around(const monsters *monster) { // Additionally, if an ally is nearby and *you* have a foe, // consider it as the ally's enemy too. - return (mons_near(monster) && !i_feel_safe()); + return (mons_near(monster) && there_are_monsters_nearby(true)); } else { -- cgit v1.2.3-54-g00ecf