diff options
| author | Pete Hurst <pete@streamuniverse.tv> | 2013-07-01 16:18:11 +0100 |
|---|---|---|
| committer | Pete Hurst <pete@streamuniverse.tv> | 2013-07-02 00:56:47 +0100 |
| commit | 109bb7a77d1532ac36f51bf6a43e0c6a1fb42f0c (patch) | |
| tree | 1c4e0c8d64b300f613f8ed778be5f719af6d0c17 /crawl-ref/source/shout.cc | |
| parent | fade5f17480620885cc6dbc293b24331ed84df9b (diff) | |
| download | crawl-ref-109bb7a77d1532ac36f51bf6a43e0c6a1fb42f0c.tar.gz crawl-ref-109bb7a77d1532ac36f51bf6a43e0c6a1fb42f0c.zip | |
Make chimera more talkative
Causes the three heads to announce themselves when the chimera
is released; gives you a flavourful hint as to what the components
are without specifically checking.
Diffstat (limited to 'crawl-ref/source/shout.cc')
| -rw-r--r-- | crawl-ref/source/shout.cc | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/crawl-ref/source/shout.cc b/crawl-ref/source/shout.cc index 9f39039175..4917fba485 100644 --- a/crawl-ref/source/shout.cc +++ b/crawl-ref/source/shout.cc @@ -69,8 +69,11 @@ void handle_monster_shouts(monster* mons, bool force) // Chimera can take a random shout type from any of their // three components if (mons->type == MONS_CHIMERA) - s_type = mons_shouts(random_chimera_part(mons), false); - + { + monster_type acting = mons->ghost->acting_part != MONS_NO_MONSTER + ? mons->ghost->acting_part : random_chimera_part(mons); + s_type = mons_shouts(acting, false); + } // Silent monsters can give noiseless "visual shouts" if the // player can see them, in which case silence isn't checked for. // Muted monsters can't shout at all. |