diff options
| -rw-r--r-- | crawl-ref/source/fight.cc | 13 | ||||
| -rw-r--r-- | crawl-ref/source/player.cc | 3 |
2 files changed, 8 insertions, 8 deletions
diff --git a/crawl-ref/source/fight.cc b/crawl-ref/source/fight.cc index a8de265865..4523166154 100644 --- a/crawl-ref/source/fight.cc +++ b/crawl-ref/source/fight.cc @@ -2674,10 +2674,13 @@ void melee_attack::wasp_paralyse_defender() if (attacker->id() == MONS_YELLOW_WASP) paralyse_roll += 3; - if (!defender->res_poison() && one_chance_in(paralyse_roll)) - defender->paralyse( roll_dice(1, 3) ); - else - defender->slow_down( roll_dice(1, 3) ); + if (defender->res_poison() <= 0) + { + if (one_chance_in(paralyse_roll)) + defender->paralyse( roll_dice(1, 3) ); + else + defender->slow_down( roll_dice(1, 3) ); + } } void melee_attack::splash_monster_with_acid(int strength) @@ -2845,7 +2848,7 @@ void melee_attack::mons_apply_attack_flavour(const mon_attack_def &attk) case AF_CONFUSE: if (attk.type == AT_SPORE) { - if (defender->res_poison()) + if (defender->res_poison() > 0) break; if (--atk->hit_dice <= 0) diff --git a/crawl-ref/source/player.cc b/crawl-ref/source/player.cc index 836b7d877f..c4b9f89af1 100644 --- a/crawl-ref/source/player.cc +++ b/crawl-ref/source/player.cc @@ -5089,9 +5089,6 @@ int player::holiness() const if (is_undead) return (MH_UNDEAD); - if (species == SP_DEMONSPAWN) - return (MH_DEMONIC); - return (MH_NATURAL); } |