diff options
| author | Steve Melenchuk <smelenchuk@gmail.com> | 2014-06-03 10:29:37 -0600 |
|---|---|---|
| committer | Steve Melenchuk <smelenchuk@gmail.com> | 2014-06-03 10:29:37 -0600 |
| commit | b2ba46968251da1a6d78c01b168626d469f58a31 (patch) | |
| tree | 009411700a1224f5f36d78b7eea4a13b8c381519 /crawl-ref/source/dactions.cc | |
| parent | 536c3b657dc8efcc82d8eeb254ccdcf325eee2ac (diff) | |
| download | crawl-ref-b2ba46968251da1a6d78c01b168626d469f58a31.tar.gz crawl-ref-b2ba46968251da1a6d78c01b168626d469f58a31.zip | |
Time out friendly bribed monsters like neutral bribed monsters (dpeg).
Yes, this means they don't demand payment now and again, and stop
following you when the initial bribe expires.
Diffstat (limited to 'crawl-ref/source/dactions.cc')
| -rw-r--r-- | crawl-ref/source/dactions.cc | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/crawl-ref/source/dactions.cc b/crawl-ref/source/dactions.cc index 703aa9f4e1..958f386faf 100644 --- a/crawl-ref/source/dactions.cc +++ b/crawl-ref/source/dactions.cc @@ -132,10 +132,9 @@ bool mons_matches_daction(const monster* mon, daction_type act) case DACT_BRIBE_TIMEOUT: return mon->has_ench(ENCH_BRIBED) + || mon->has_ench(ENCH_PERMA_BRIBED) || mon->props.exists(GOZAG_BRIBE_KEY) - || !you_worship(GOD_GOZAG) - && (mon->has_ench(ENCH_PERMA_BRIBED) - || mon->props.exists(GOZAG_PERMABRIBE_KEY)); + || mon->props.exists(GOZAG_PERMABRIBE_KEY); case DACT_SET_BRIBES: return !testbits(mon->flags, MF_WAS_IN_VIEW); @@ -246,14 +245,11 @@ void apply_daction_to_mons(monster* mon, daction_type act, bool local, case DACT_BRIBE_TIMEOUT: mon->del_ench(ENCH_BRIBED); + mon->del_ench(ENCH_PERMA_BRIBED); if (mon->props.exists(GOZAG_BRIBE_KEY)) mon->props.erase(GOZAG_BRIBE_KEY); - if (!you_worship(GOD_GOZAG)) - { - mon->del_ench(ENCH_PERMA_BRIBED); if (mon->props.exists(GOZAG_PERMABRIBE_KEY)) mon->props.erase(GOZAG_PERMABRIBE_KEY); - } break; case DACT_SET_BRIBES: |