diff options
| author | Shmuale Mark <shm.mark@gmail.com> | 2014-06-16 19:36:36 -0400 |
|---|---|---|
| committer | Shmuale Mark <shm.mark@gmail.com> | 2014-06-17 09:58:02 -0400 |
| commit | 1137a02fa7c1675c1248b5ae20f10b8970c92166 (patch) | |
| tree | fbf7e682313d9d66b25b15a6d1a4742d090f1ba8 /crawl-ref/source/attack.cc | |
| parent | 23e621cf06427b00683233e8294cf439f15b4d27 (diff) | |
| download | crawl-ref-1137a02fa7c1675c1248b5ae20f10b8970c92166.tar.gz crawl-ref-1137a02fa7c1675c1248b5ae20f10b8970c92166.zip | |
Make profane servitors ignore holy wrath, like holy energy (#7089).
Diffstat (limited to 'crawl-ref/source/attack.cc')
| -rw-r--r-- | crawl-ref/source/attack.cc | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/crawl-ref/source/attack.cc b/crawl-ref/source/attack.cc index 33f2d09f48..2996988f4d 100644 --- a/crawl-ref/source/attack.cc +++ b/crawl-ref/source/attack.cc @@ -940,11 +940,8 @@ brand_type attack::random_chaos_brand() susceptible = false; break; case SPWPN_HOLY_WRATH: - if (defender->holiness() != MH_UNDEAD - && defender->holiness() != MH_DEMONIC) - { + if (!defender->holy_wrath_susceptible()) susceptible = false; - } break; case SPWPN_CONFUSE: if (defender->holiness() == MH_NONLIVING @@ -1675,7 +1672,7 @@ bool attack::apply_damage_brand(const char *what) break; case SPWPN_HOLY_WRATH: - if (defender->undead_or_demonic()) + if (defender->holy_wrath_susceptible()) special_damage = 1 + (random2(damage_done * 15) / 10); if (special_damage && defender_visible) |