diff options
author | Nicholas Feinberg <pleasingfung@gmail.com> | 2014-06-17 00:01:05 -0700 |
---|---|---|
committer | Nicholas Feinberg <pleasingfung@gmail.com> | 2014-06-17 21:19:36 -0700 |
commit | c06e81946b46ccecb06569b5fca87d507619642e (patch) | |
tree | 523e608ada7ed22556e3bea1250d48d2f356d323 /crawl-ref/source/monster.cc | |
parent | 6f04e5fe9d0966441777763468e6cc9f75b804c9 (diff) | |
download | crawl-ref-c06e81946b46ccecb06569b5fca87d507619642e.tar.gz crawl-ref-c06e81946b46ccecb06569b5fca87d507619642e.zip |
Replace randomly-generate teleport traps with 1-shot versions
Diffstat (limited to 'crawl-ref/source/monster.cc')
-rw-r--r-- | crawl-ref/source/monster.cc | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/crawl-ref/source/monster.cc b/crawl-ref/source/monster.cc index ca386578f0..d7a3fe06a4 100644 --- a/crawl-ref/source/monster.cc +++ b/crawl-ref/source/monster.cc @@ -4488,7 +4488,8 @@ bool monster::is_trap_safe(const coord_def& where, bool just_check) const } // Friendlies will try not to be parted from you. - if (intelligent_ally(this) && trap.type == TRAP_TELEPORT + if (intelligent_ally(this) && (trap.type == TRAP_TELEPORT + || trap.type == TRAP_TELEPORT_PERMANENT) && player_knows_trap && mons_near(this)) { return false; |