Merfolk (water/ice) elementalists join the Shoals guard.

1 files changed, 13 insertions, 0 deletions

diff --git a/crawl-ref/source/player.cc b/crawl-ref/source/player.cc
index 7ba87a20ff..8ebf0a0655 100644
--- a/crawl-ref/source/player.cc
+++ b/crawl-ref/source/player.cc
@@ -6452,6 +6452,12 @@ int player::res_elec() const
     return (player_res_electricity() * 2);
 }
 
+int player::res_water_drowning() const
+{
+    return (res_asphyx() ||
+            (you.species == SP_MERFOLK && !transform_changed_physiology()));
+}
+
 int player::res_asphyx() const
 {
     // The undead are immune to asphyxiation, or so we'll assume.
@@ -7049,6 +7055,13 @@ bool player::move_to_pos(const coord_def &c)
     return false;
 }
 
+void player::apply_location_effects(const coord_def &oldpos,
+                                    killer_type killer,
+                                    int killernum)
+{
+    move_player_to_grid(pos(), false, true, true, false);
+}
+
 void player::shiftto(const coord_def &c)
 {
     crawl_view.shift_player_to(c);