diff options
| author | Adam Borowski <kilobyte@angband.pl> | 2013-01-06 23:00:25 +0100 |
|---|---|---|
| committer | Adam Borowski <kilobyte@angband.pl> | 2013-01-06 23:00:25 +0100 |
| commit | 53fb3a225c386f26a5bdb0c796ca20604c0f1a08 (patch) | |
| tree | e68c5c912df4920e99af2ff4979bfb72c086e215 /crawl-ref/source/actor.cc | |
| parent | 9540ac70afa4f7d559d44f9d936399c121b0dda7 (diff) | |
| download | crawl-ref-53fb3a225c386f26a5bdb0c796ca20604c0f1a08.tar.gz crawl-ref-53fb3a225c386f26a5bdb0c796ca20604c0f1a08.zip | |
Handle slight resistance to acid vs immunity.
Implemented as a multi-level resists, as three values is just that (and rRot
is another that allows resistance vs immunity).
Monster yellow draconians get degraded to rAcid+, to match players.
This also fixes rAcid not applying to passive damage when attacking jellies.
Diffstat (limited to 'crawl-ref/source/actor.cc')
| -rw-r--r-- | crawl-ref/source/actor.cc | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/crawl-ref/source/actor.cc b/crawl-ref/source/actor.cc index b8705ec519..91cdbe7b70 100644 --- a/crawl-ref/source/actor.cc +++ b/crawl-ref/source/actor.cc @@ -431,10 +431,11 @@ int actor::apply_ac(int damage, int max_damage, ac_type ac_rule, bool actor_slime_wall_immune(const actor *act) { - return (act->is_player()? - you.religion == GOD_JIYVA && !you.penance[GOD_JIYVA] - : act->res_acid() == 3); + return + act->is_player() && you.religion == GOD_JIYVA && !you.penance[GOD_JIYVA] + || act->res_acid() == 3; } + /** * Accessor method to the clinging member. * |