summaryrefslogtreecommitdiffstats
path: root/crawl-ref/source/mon-transit.cc
diff options
context:
space:
mode:
authorNeil Moore <neil@s-z.org>2013-12-11 11:31:09 -0500
committerNeil Moore <neil@s-z.org>2013-12-11 11:55:24 -0500
commit9d082e1e3572ccec114e975ef062d3be825c8631 (patch)
tree19e80d1bf278436dff4f1f51a6f127f28e45b51d /crawl-ref/source/mon-transit.cc
parent62711b3f9553f57460b8cdf1b5fdc0d36ab1f46c (diff)
downloadcrawl-ref-9d082e1e3572ccec114e975ef062d3be825c8631.tar.gz
crawl-ref-9d082e1e3572ccec114e975ef062d3be825c8631.zip
Allow non-adjacent non-religious followers to take stairs.
This allows abominations from Twisted Resurrection to follow you en masse, without the tedium of tf>tw...<tf>tw... etc. It also affects mercenaries and other stair-taking allies. TR is, despite changes in 0.10, still one of those spells that is overpowered but rarely-used because of tedium. Let's reduce the tedium, then nerf in other ways as necessary. Non-healing will be one part of the nerf, but we probably also need a cap on the total number of abominations.
Diffstat (limited to 'crawl-ref/source/mon-transit.cc')
-rw-r--r--crawl-ref/source/mon-transit.cc15
1 files changed, 3 insertions, 12 deletions
diff --git a/crawl-ref/source/mon-transit.cc b/crawl-ref/source/mon-transit.cc
index ab8aa44109..e9197325c8 100644
--- a/crawl-ref/source/mon-transit.cc
+++ b/crawl-ref/source/mon-transit.cc
@@ -393,18 +393,9 @@ static bool _tag_follower_at(const coord_def &pos, bool &real_follower)
return false;
}
- // Monsters that are not directly adjacent are subject to more
- // stringent checks.
- if ((pos - you.pos()).abs() > 2)
- {
- if (!fol->friendly())
- return false;
-
- // Undead will follow Yredelemnul worshippers, orcs will follow
- // Beogh worshippers, and plants will follow Fedhas worshippers.
- if (!_is_religious_follower(fol))
- return false;
- }
+ // Unfriendly monsters must be directly adjacent to follow.
+ if (!fol->friendly() && (pos - you.pos()).abs() > 2)
+ return false;
// Monsters that can't use stairs can still be marked as followers
// (though they'll be ignored for transit), so any adjacent real