diff options
| author | Chris Campbell <chriscampbell89@gmail.com> | 2014-04-09 17:41:13 +0100 |
|---|---|---|
| committer | Chris Campbell <chriscampbell89@gmail.com> | 2014-04-09 17:55:18 +0100 |
| commit | f14b194d65fcea22da142024ae67792f1fa5b310 (patch) | |
| tree | c880466b5c6ba34e7aaf1e906ad06f5620b50174 /crawl-ref/source/traps.cc | |
| parent | 62b11cb347c864cbab3e8c65a5250c8c8f2cf771 (diff) | |
| download | crawl-ref-f14b194d65fcea22da142024ae67792f1fa5b310.tar.gz crawl-ref-f14b194d65fcea22da142024ae67792f1fa5b310.zip | |
Adjust some trap disarming messages
Diffstat (limited to 'crawl-ref/source/traps.cc')
| -rw-r--r-- | crawl-ref/source/traps.cc | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/crawl-ref/source/traps.cc b/crawl-ref/source/traps.cc index 6bd6cc9a18..7a4c123533 100644 --- a/crawl-ref/source/traps.cc +++ b/crawl-ref/source/traps.cc @@ -1156,12 +1156,14 @@ void disarm_trap(const coord_def& where) break; case DNGN_TRAP_TELEPORT: case DNGN_TRAP_ZOT: - case DNGN_PASSAGE_OF_GOLUBRIA: // not a trap, FIXME - mpr("You can't disarm that trap."); + mpr("You can't disarm magical traps."); + return; + case DNGN_PASSAGE_OF_GOLUBRIA: + mpr("You can't disarm passages of Golubria."); return; case DNGN_TRAP_SHAFT: // Only shafts for now. - mpr("You can't disarm a shaft."); + mpr("You can't disarm shafts."); return; default: break; @@ -1189,7 +1191,7 @@ void disarm_trap(const coord_def& where) mpr("You failed to disarm the trap."); if (random2(you.dex()) <= 5 + random2(5 + trap.difficulty())) { - if ((trap.type == TRAP_NET || trap.type==TRAP_WEB) + if ((trap.type == TRAP_NET || trap.type == TRAP_WEB) && trap.pos != you.pos()) { if (coinflip()) |