diff options
Diffstat (limited to 'crawl-ref/source')
| -rw-r--r-- | crawl-ref/source/mon-util.cc | 8 | ||||
| -rw-r--r-- | crawl-ref/source/player.cc | 6 |
2 files changed, 14 insertions, 0 deletions
diff --git a/crawl-ref/source/mon-util.cc b/crawl-ref/source/mon-util.cc index 84c0bbdf60..925c4fa46f 100644 --- a/crawl-ref/source/mon-util.cc +++ b/crawl-ref/source/mon-util.cc @@ -7652,6 +7652,14 @@ void monsters::apply_enchantment(const mon_enchant &me) // Assumption: mons_res_fire has already been checked. case ENCH_STICKY_FLAME: { + if (grid_is_watery(grd(pos()))) + { + if (mons_near(this) && player_monster_visible(this)) + mprf("The flames covering %s go out.", + this->name(DESC_NOCAP_THE, false).c_str()); + del_ench(ENCH_STICKY_FLAME); + break; + } int dam = resist_adjust_damage(this, BEAM_FIRE, res_fire(), roll_dice(2, 4) - 1); diff --git a/crawl-ref/source/player.cc b/crawl-ref/source/player.cc index a6467a4c4b..111147c503 100644 --- a/crawl-ref/source/player.cc +++ b/crawl-ref/source/player.cc @@ -5581,6 +5581,12 @@ void dec_napalm_player() { if (you.duration[DUR_LIQUID_FLAMES] > 1) { + if (grid_is_watery(grd(you.pos()))) + { + mpr("The flames go out!", MSGCH_WARN); + you.duration[DUR_LIQUID_FLAMES] = 0; + return; + } you.duration[DUR_LIQUID_FLAMES]--; mpr("You are covered in liquid flames!", MSGCH_WARN); |