diff options
| author | Darshan Shaligram <dshaligram@users.sourceforge.net> | 2009-12-29 20:24:07 +0530 |
|---|---|---|
| committer | Darshan Shaligram <dshaligram@users.sourceforge.net> | 2009-12-29 20:24:07 +0530 |
| commit | 43d86ff397acfe79b6699845ae4e2ec9a8e485d0 (patch) | |
| tree | 72a76a5ed900aa4ab9465bef1cbd0d7807bbbccd /crawl-ref/source/fight.cc | |
| parent | 3f8334b021c123a371f0dfe8062c3a84eebba673 (diff) | |
| parent | 8efdaf11a28299dda120a8afe78702686a6e2a47 (diff) | |
| download | crawl-ref-43d86ff397acfe79b6699845ae4e2ec9a8e485d0.tar.gz crawl-ref-43d86ff397acfe79b6699845ae4e2ec9a8e485d0.zip | |
Merge branch 'shoals++'
Diffstat (limited to 'crawl-ref/source/fight.cc')
| -rw-r--r-- | crawl-ref/source/fight.cc | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/crawl-ref/source/fight.cc b/crawl-ref/source/fight.cc index c88ca09f3b..0df1de443c 100644 --- a/crawl-ref/source/fight.cc +++ b/crawl-ref/source/fight.cc @@ -2161,6 +2161,8 @@ static bool is_boolean_resist(beam_type flavour) case BEAM_ELECTRICITY: case BEAM_MIASMA: // rotting case BEAM_NAPALM: + case BEAM_WATER: // water asphyxiation damage, + // bypassed by being water inhabitant. return (true); default: return (false); @@ -2173,6 +2175,11 @@ static inline int get_resistible_fraction(beam_type flavour) { switch (flavour) { + // Drowning damage from water is resistible by being a water thing, or + // otherwise asphyx resistant. + case BEAM_WATER: + return (40); + // Assume ice storm and throw icicle are mostly solid. case BEAM_ICE: return (25); |