diff options
| author | Neil Moore <neil@s-z.org> | 2014-02-02 09:43:18 -0500 |
|---|---|---|
| committer | Steve Melenchuk <smelenchuk@gmail.com> | 2014-03-04 11:22:50 -0700 |
| commit | 126f6a084b6fafc38d2244781a6a36fe11105842 (patch) | |
| tree | ba917a418f48dcadbff88345924ad0425624c2a8 /crawl-ref/source/godconduct.cc | |
| parent | 69b86a6357921c8460511a6a90b35254938e966c (diff) | |
| download | crawl-ref-126f6a084b6fafc38d2244781a6a36fe11105842.tar.gz crawl-ref-126f6a084b6fafc38d2244781a6a36fe11105842.zip | |
No Dith piety for killing shadows (dialectric)
Not including invisible creatures because that might encourage the
player to try to find a way to backlight them.
(cherry picked from commit 6f4b78644d708b3478e6ad795d29c83d276024f1)
Conflicts:
crawl-ref/source/godconduct.cc
Diffstat (limited to 'crawl-ref/source/godconduct.cc')
| -rw-r--r-- | crawl-ref/source/godconduct.cc | 24 |
1 files changed, 24 insertions, 0 deletions
diff --git a/crawl-ref/source/godconduct.cc b/crawl-ref/source/godconduct.cc index e90906aff6..21945953c4 100644 --- a/crawl-ref/source/godconduct.cc +++ b/crawl-ref/source/godconduct.cc @@ -337,6 +337,12 @@ bool did_god_conduct(conduct_type thing_done, int level, bool known, case GOD_BEOGH: case GOD_LUGONU: case GOD_DITHMENOS: + if (you_worship(GOD_DITHMENOS) + && mons_class_flag(victim->type, M_SHADOW)) + { + break; + } + if (god_hates_attacking_friend(you.religion, victim)) break; @@ -365,6 +371,12 @@ bool did_god_conduct(conduct_type thing_done, int level, bool known, case GOD_BEOGH: case GOD_LUGONU: case GOD_DITHMENOS: + if (you_worship(GOD_DITHMENOS) + && mons_class_flag(victim->type, M_SHADOW)) + { + break; + } + if (god_hates_attacking_friend(you.religion, victim)) break; @@ -394,6 +406,12 @@ bool did_god_conduct(conduct_type thing_done, int level, bool known, case GOD_BEOGH: case GOD_LUGONU: case GOD_DITHMENOS: + if (you_worship(GOD_DITHMENOS) + && mons_class_flag(victim->type, M_SHADOW)) + { + break; + } + if (god_hates_attacking_friend(you.religion, victim)) break; @@ -525,6 +543,12 @@ bool did_god_conduct(conduct_type thing_done, int level, bool known, case GOD_BEOGH: case GOD_LUGONU: case GOD_DITHMENOS: + if (you_worship(GOD_DITHMENOS) + && mons_class_flag(victim->type, M_SHADOW)) + { + break; + } + if (god_hates_attacking_friend(you.religion, victim)) break; |