diff options
| author | Raphael Langella <raphael.langella@gmail.com> | 2013-08-12 15:43:42 +0200 |
|---|---|---|
| committer | Raphael Langella <raphael.langella@gmail.com> | 2013-08-12 15:49:00 +0200 |
| commit | 40eb210485ae15fdf5be7e96104197e26b3fa5f6 (patch) | |
| tree | aa733e21ad970922b2df54b48ec35ad218da434f /crawl-ref/source/mon-chimera.cc | |
| parent | d993d8a94ebf88d624d434119000bc7293dafba9 (diff) | |
| download | crawl-ref-40eb210485ae15fdf5be7e96104197e26b3fa5f6.tar.gz crawl-ref-40eb210485ae15fdf5be7e96104197e26b3fa5f6.zip | |
Revert "Bye bye clinging."
Clinging might be a minor feature, but it's a distinguishing one, it's thematic
and it's working quite well.
Player/monster symmetry has never been a goal, so it seems dubious to invoke it
as the reason to throw away all the work that has been put into clinging. We
can always say that the player turns into a different kind of spider which is
unable to cling for some reason.
This reverts commit bdc56382eacf7af1b2330dc6444916d368741fec.
This reverts commit d689486464fcaaac025a6f469ab69674a2f4d173.
This reverts commit 1addaaf8ee92de5060fdb436f93251843abd2035.
Diffstat (limited to 'crawl-ref/source/mon-chimera.cc')
| -rw-r--r-- | crawl-ref/source/mon-chimera.cc | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/crawl-ref/source/mon-chimera.cc b/crawl-ref/source/mon-chimera.cc index 848efc66ab..98033bf470 100644 --- a/crawl-ref/source/mon-chimera.cc +++ b/crawl-ref/source/mon-chimera.cc @@ -138,7 +138,10 @@ void ghost_demon::_apply_chimera_part(monster* mon, monster_type part, else if (mons_flies(&dummy)) mon->props["chimera_wings"].get_int() = partnum; - if (dummy.is_jumpy() && !mon->props.exists("chimera_legs")) + // Check for a legs part. Jumpy behaviour (jumping spiders) should + // override normal clinging. + if (dummy.is_jumpy() + || (dummy.can_cling_to_walls() && !mon->props.exists("chimera_legs"))) { ev = dummy.ev; mon->props["chimera_legs"].get_int() = partnum; |