diff options
| author | Robert Burnham <burnhamrobertp@gmail.com> | 2011-11-16 02:42:54 -0600 |
|---|---|---|
| committer | Robert Burnham <burnhamrobertp@gmail.com> | 2011-11-16 02:42:54 -0600 |
| commit | e1dcbbafa2eb2c7bb835d65077ecc4f0766ff427 (patch) | |
| tree | 19995900b074d2904215f19a239cf6170a952700 /crawl-ref/source/exclude.cc | |
| parent | 05ad5fe5c1167a70d345122b9780e1353561bf8b (diff) | |
| parent | 38c8921e3e497a7e0626216a724e1524b9edd78e (diff) | |
| download | crawl-ref-e1dcbbafa2eb2c7bb835d65077ecc4f0766ff427.tar.gz crawl-ref-e1dcbbafa2eb2c7bb835d65077ecc4f0766ff427.zip | |
Merge branch 'master' into unified_combat_control
Conflicts:
crawl-ref/source/fight.cc
crawl-ref/source/mon-stuff.cc
crawl-ref/source/player-stats.cc
One of the more significant changes resulting from this merge is
that the new minotaur_retaliation which is supposed to have a max
occurrence of once per monster attack round simply has a chance
per monster attack (regardless of whether we're in the same
effective attack round) which increases based on effective_attack_num
which lends to the possibility of multiple retaliations.
Diffstat (limited to 'crawl-ref/source/exclude.cc')
| -rw-r--r-- | crawl-ref/source/exclude.cc | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/crawl-ref/source/exclude.cc b/crawl-ref/source/exclude.cc index b328c6624a..116fd301f9 100644 --- a/crawl-ref/source/exclude.cc +++ b/crawl-ref/source/exclude.cc @@ -72,6 +72,10 @@ void set_auto_exclude(const monster* mon) if (!is_map_persistent()) return; + // Something of a speed hack, but some vaults have a TON of plants. + if (mon->type == MONS_PLANT) + return; + if (_need_auto_exclude(mon) && !is_exclude_root(mon->pos())) { int rad = _get_full_exclusion_radius(); |