diff options
| author | j-p-e-g <j-p-e-g@c06c8d41-db1a-0410-9941-cceddc491573> | 2007-11-04 15:53:36 +0000 |
|---|---|---|
| committer | j-p-e-g <j-p-e-g@c06c8d41-db1a-0410-9941-cceddc491573> | 2007-11-04 15:53:36 +0000 |
| commit | 832060cd98c97e3bce6e2fe122b0a6a90fb042ed (patch) | |
| tree | 22326a8b66843e6e012cceb919683bfebdf8e05d /crawl-ref/source/mon-util.cc | |
| parent | a90b4adaf06986bbf6fcd0dce08b4b122d9b9e80 (diff) | |
| download | crawl-ref-832060cd98c97e3bce6e2fe122b0a6a90fb042ed.tar.gz crawl-ref-832060cd98c97e3bce6e2fe122b0a6a90fb042ed.zip | |
Nets that hold you cannot be destroyed by Ely's Destroy Weapon ability.
(Fix 1825520).
Monsters will be held in nets longer. Doesn't influence time needed to
destroy it, so ogres and such will still get out quickly. Needs more
testing, I guess.
Intelligent friendlies will try to avoid traps you (the player) know
about, and the chance for triggering known blade and net traps is
much lower. Also, friendly casters are much less likely to spam you with
"spells" if there are no enemies around.
git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@2749 c06c8d41-db1a-0410-9941-cceddc491573
Diffstat (limited to 'crawl-ref/source/mon-util.cc')
| -rw-r--r-- | crawl-ref/source/mon-util.cc | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/crawl-ref/source/mon-util.cc b/crawl-ref/source/mon-util.cc index 9f9cd74b41..06d4b5586a 100644 --- a/crawl-ref/source/mon-util.cc +++ b/crawl-ref/source/mon-util.cc @@ -1685,6 +1685,13 @@ mon_intel_type mons_intel(int mc) return (smc->intel); } +bool intelligent_ally(const monsters *monster) +{ + return (monster->attitude == ATT_FRIENDLY + && mons_intel(monster->type) >= I_NORMAL); +} + + int mons_power(int mc) { // for now, just return monster hit dice. @@ -5165,7 +5172,7 @@ int mon_enchant::calc_duration(const monsters *mons, cturn = std::max(100 / modded_speed(mons, 5), 3); break; case ENCH_HELD: - cturn = 90 / mod_speed(25, mons->speed); + cturn = 120 / mod_speed(25, mons->speed); break; case ENCH_POISON: cturn = 1000 * deg / mod_speed(125, mons->speed); @@ -5360,7 +5367,7 @@ std::string do_mon_str_replacements(const std::string &in_msg, sound_list[mons_shouts(monster->type)]); // The proper possessive for a word ending in an "s" is to - // put an appostraphe after the "s": "Chris" -> "Chris'", + // put an apostrophe after the "s": "Chris" -> "Chris'", // not "Chris" -> "Chris's". Stupid English language... msg = replace_all(msg, "s's", "s'"); |