diff options
| author | dshaligram <dshaligram@c06c8d41-db1a-0410-9941-cceddc491573> | 2007-03-08 20:52:08 +0000 |
|---|---|---|
| committer | dshaligram <dshaligram@c06c8d41-db1a-0410-9941-cceddc491573> | 2007-03-08 20:52:08 +0000 |
| commit | bb28231c541ca917387a4eb3f1318d8782c06fdb (patch) | |
| tree | dac423f8bb97693e8e05fef5c420f0cfa66fc395 /crawl-ref/source | |
| parent | b31338b60aefb79b5d31e7bd1e3573c5965047e3 (diff) | |
| download | crawl-ref-bb28231c541ca917387a4eb3f1318d8782c06fdb.tar.gz crawl-ref-bb28231c541ca917387a4eb3f1318d8782c06fdb.zip | |
Fixed jellies not getting acid damage (Erik).
git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@995 c06c8d41-db1a-0410-9941-cceddc491573
Diffstat (limited to 'crawl-ref/source')
| -rw-r--r-- | crawl-ref/source/fight.cc | 5 | ||||
| -rw-r--r-- | crawl-ref/source/mon-data.h | 2 |
2 files changed, 6 insertions, 1 deletions
diff --git a/crawl-ref/source/fight.cc b/crawl-ref/source/fight.cc index 835bdee2d8..8d02e0d622 100644 --- a/crawl-ref/source/fight.cc +++ b/crawl-ref/source/fight.cc @@ -508,6 +508,8 @@ bool melee_attack::player_attack() if (player_check_monster_died()) return (true); + player_sustain_passive_damage(); + if (damage_done < 1) no_damage_message = make_stringf("You %s %s.", @@ -2609,7 +2611,10 @@ void melee_attack::splash_monster_with_acid(int strength) void melee_attack::splash_defender_with_acid(int strength) { if (defender->atype() == ACT_PLAYER) + { + mpr("You are splashed with acid!"); splash_with_acid(strength); + } else splash_monster_with_acid(strength); } diff --git a/crawl-ref/source/mon-data.h b/crawl-ref/source/mon-data.h index c52a17913c..5e3a0b23f5 100644 --- a/crawl-ref/source/mon-data.h +++ b/crawl-ref/source/mon-data.h @@ -558,7 +558,7 @@ M_SEE_INVIS | M_SPLITS | M_AMPHIBIOUS | M_ACID_SPLASH, MR_RES_POISON | MR_RES_ASPHYX, 0, 13, MONS_JELLY, MONS_JELLY, MH_NATURAL, -3, - { {AT_HIT, AF_PLAIN, 8}, {AT_NONE, AF_PLAIN, 0}, {AT_NONE, AF_PLAIN, 0}, {AT_NONE, AF_PLAIN, 0} }, + { {AT_HIT, AF_ACID, 8}, {AT_NONE, AF_PLAIN, 0}, {AT_NONE, AF_PLAIN, 0}, {AT_NONE, AF_PLAIN, 0} }, { 3, 5, 5, 0 }, 0, 2, 9, 7, MST_NO_SPELLS, CE_NOCORPSE, Z_NOZOMBIE, S_SILENT, I_PLANT, MONUSE_EATS_ITEMS, SIZE_MEDIUM |