diff options
| author | Steve Melenchuk <smelenchuk@gmail.com> | 2014-05-06 17:21:48 -0600 |
|---|---|---|
| committer | Steve Melenchuk <smelenchuk@gmail.com> | 2014-05-07 18:23:33 -0600 |
| commit | 6701b1f0ae42f5a218786a2aec37a9fc3d6091bc (patch) | |
| tree | dfa29c69a40700f9c9cb411b84d08d7870830341 /crawl-ref/source/travel.cc | |
| parent | bf2d24ebf9c19c79d838329c2fc342501ff77856 (diff) | |
| download | crawl-ref-6701b1f0ae42f5a218786a2aec37a9fc3d6091bc.tar.gz crawl-ref-6701b1f0ae42f5a218786a2aec37a9fc3d6091bc.zip | |
Replace Q cloud displacement with cloud immunity (Bloax, elliptic).
Because getting trampled into your own clouds is terrible.
Also disables this when under penance, which was an oversight for the
former.
Diffstat (limited to 'crawl-ref/source/travel.cc')
| -rw-r--r-- | crawl-ref/source/travel.cc | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/crawl-ref/source/travel.cc b/crawl-ref/source/travel.cc index a74e01ebe7..d7dfabdcff 100644 --- a/crawl-ref/source/travel.cc +++ b/crawl-ref/source/travel.cc @@ -202,13 +202,12 @@ static inline bool _is_safe_cloud(const coord_def& c) if (ctype == CLOUD_NONE) return true; - // We can also safely run through smoke, or displace our own clouds if + // We can also safely run through smoke, or any of our own clouds if // following Qazlal. return !is_damaging_cloud(ctype, true) || you_worship(GOD_QAZLAL) - && YOU_KILL(env.map_knowledge(c).cloudinfo()->killer) - && (!adjacent(c, you.pos()) - || env.map_knowledge(you.pos()).cloud() == CLOUD_NONE); + && !player_under_penance() + && YOU_KILL(env.map_knowledge(c).cloudinfo()->killer); } // Returns an estimate for the time needed to cross this feature. @@ -4103,8 +4102,8 @@ bool runrest::run_should_stop() const if (tcell.cloud() != CLOUD_NONE && (!you_worship(GOD_QAZLAL) - || !YOU_KILL(tcell.cloudinfo()->killer) - || env.map_knowledge(you.pos()).cloud() != CLOUD_NONE)) + || player_under_penance() + || !YOU_KILL(tcell.cloudinfo()->killer))) { return true; } |