diff options
Diffstat (limited to 'crawl-ref')
-rw-r--r-- | crawl-ref/source/fight.cc | 2 | ||||
-rw-r--r-- | crawl-ref/source/mon-util.cc | 9 |
2 files changed, 3 insertions, 8 deletions
diff --git a/crawl-ref/source/fight.cc b/crawl-ref/source/fight.cc index 5df150ac6b..a9771cead0 100644 --- a/crawl-ref/source/fight.cc +++ b/crawl-ref/source/fight.cc @@ -2952,7 +2952,7 @@ bool melee_attack::apply_damage_brand() emit_nodmg_hit_message(); const int hdcheck = - (defender->holiness() == MH_NATURAL? random2(30) : random2(22)); + (defender->holiness() == MH_NATURAL ? random2(30) : random2(22)); if (mons_class_is_confusable(defender->id()) && hdcheck >= defender->get_experience_level()) diff --git a/crawl-ref/source/mon-util.cc b/crawl-ref/source/mon-util.cc index 8a58871767..822c8d3de2 100644 --- a/crawl-ref/source/mon-util.cc +++ b/crawl-ref/source/mon-util.cc @@ -1404,14 +1404,9 @@ int mons_res_negative_energy(const monsters *mon) { const mon_holy_type holiness = mons_holiness(mon); - if (mons_is_unholy(mon) - || holiness == MH_NONLIVING - || holiness == MH_PLANT + if (holiness != MH_NATURAL || mon->type == MONS_SHADOW_DRAGON - || mon->type == MONS_DEATH_DRAKE - // TSO protects his warriors' life force - || mon->type == MONS_ANGEL - || mon->type == MONS_DAEVA) + || mon->type == MONS_DEATH_DRAKE) { return (3); // to match the value for players } |