diff options
| author | Robert Burnham <burnhamrobertp@gmail.com> | 2011-04-26 08:47:05 -0500 |
|---|---|---|
| committer | Robert Burnham <burnhamrobertp@gmail.com> | 2011-04-26 08:47:05 -0500 |
| commit | 809ea63fb87708fcb763492e2da99188679ed0f4 (patch) | |
| tree | de25799e8538d30d4eb5dcfa37a7bc328ea491c3 /crawl-ref/source/attitude-change.cc | |
| parent | 77b621a0ace27951fc2f24ab357f69430bcbfd67 (diff) | |
| parent | 96f00b85b9271dade59c577353651eca1e88e0cd (diff) | |
| download | crawl-ref-809ea63fb87708fcb763492e2da99188679ed0f4.tar.gz crawl-ref-809ea63fb87708fcb763492e2da99188679ed0f4.zip | |
Merge branch 'master' into unified_combat_control
Conflicts:
crawl-ref/source/actor.cc
crawl-ref/source/delay.cc
crawl-ref/source/directn.cc
crawl-ref/source/directn.h
crawl-ref/source/fight.cc
crawl-ref/source/files.cc
crawl-ref/source/mon-act.cc
crawl-ref/source/monster.cc
crawl-ref/source/mpr.h
crawl-ref/source/player.cc
crawl-ref/source/shopping.cc
Diffstat (limited to 'crawl-ref/source/attitude-change.cc')
| -rw-r--r-- | crawl-ref/source/attitude-change.cc | 19 |
1 files changed, 12 insertions, 7 deletions
diff --git a/crawl-ref/source/attitude-change.cc b/crawl-ref/source/attitude-change.cc index cc2856a52b..f9caf5a354 100644 --- a/crawl-ref/source/attitude-change.cc +++ b/crawl-ref/source/attitude-change.cc @@ -1,6 +1,7 @@ -/* - * Summary: Monster attitude changing due to religion. - */ +/** + * @file + * @brief Monster attitude changing due to religion. +**/ #include "AppHdr.h" @@ -191,7 +192,7 @@ bool yred_slaves_abandon_you() // During penance, followers get a saving throw. if (random2((you.piety - you.penance[GOD_YREDELEMNUL]) / 18) - + random2(you.skills[SK_INVOCATIONS] - 6) + + random2(you.skill(SK_INVOCATIONS) - 6) > random2(hd) + hd + random2(5)) { continue; @@ -249,7 +250,7 @@ bool beogh_followers_abandon_you() // During penance, followers get a saving throw. if (random2((you.piety - you.penance[GOD_BEOGH]) / 18) - + random2(you.skills[SK_INVOCATIONS] - 6) + + random2(you.skill(SK_INVOCATIONS) - 6) > random2(hd) + hd + random2(5)) { continue; @@ -324,7 +325,9 @@ void good_god_holy_attitude_change(monster* holy) _print_good_god_holy_being_speech(true, "reaction", holy, MSGCH_FRIEND_ENCHANT); - if (!one_chance_in(3)) + if (!one_chance_in(3) + && holy->can_speak() + && holy->type != MONS_MENNAS) // Mennas is mute and only has visual speech _print_good_god_holy_being_speech(true, "speech", holy, MSGCH_TALK); } @@ -354,7 +357,9 @@ void good_god_holy_fail_attitude_change(monster* holy) _print_good_god_holy_being_speech(false, "reaction", holy, MSGCH_FRIEND_ENCHANT); - if (!one_chance_in(3)) + if (!one_chance_in(3) + && holy->can_speak() + && holy->type != MONS_MENNAS) // Mennas is mute and only has visual speech _print_good_god_holy_being_speech(false, "speech", holy, MSGCH_TALK); } |