Merge branch 'master' into dwants

Conflicts:
	crawl-ref/source/dat/des/variable/mini_monsters.des
	crawl-ref/source/enum.h
	crawl-ref/source/itemprop.cc
	crawl-ref/source/main.cc
	crawl-ref/source/mutation-data.h
	crawl-ref/source/mutation.cc
	crawl-ref/source/newgame.cc
	crawl-ref/source/ng-restr.cc
	crawl-ref/source/rltiles/dc-player.txt
	crawl-ref/source/spl-selfench.cc
	crawl-ref/source/throw.cc
	crawl-ref/source/tilepick-p.cc
	crawl-ref/source/wiz-you.cc

1 files changed, 12 insertions, 24 deletions

diff --git a/crawl-ref/source/spl-selfench.cc b/crawl-ref/source/spl-selfench.cc
index ca38672bbb..584da89fda 100644
--- a/crawl-ref/source/spl-selfench.cc
+++ b/crawl-ref/source/spl-selfench.cc
@@ -201,13 +201,6 @@ spret_type cast_swiftness(int power, bool fail)
         return SPRET_ABORT;
     }
 
-    if (you.in_water() || you.liquefied_ground())
-    {
-        mprf("The %s foams!", you.in_water() ? "water"
-                                             : "liquid ground");
-        return SPRET_ABORT;
-    }
-
     if (!you.duration[DUR_SWIFTNESS] && player_movement_speed() <= 6)
     {
         mpr("You can't move any more quickly.");
@@ -216,10 +209,20 @@ spret_type cast_swiftness(int power, bool fail)
 
     fail_check();
 
+    if (you.in_liquid())
+    {
+        // Hint that the player won't be faster until they leave the liquid.
+        mprf("The %s foams!", you.in_water() ? "water"
+                            : you.in_lava()  ? "lava"
+                                             : "liquid ground");
+    }
+
     // [dshaligram] Removed the on-your-feet bit.  Sounds odd when
     // you're flying, for instance.
     you.increase_duration(DUR_SWIFTNESS, 20 + random2(power), 100,
-                          "You feel quick.");
+                          you.in_liquid()
+                              ? "You feel like you could be quicker."
+                              : "You feel quick.");
     did_god_conduct(DID_HASTY, 8, true);
 
     return SPRET_SUCCESS;
@@ -227,23 +230,8 @@ spret_type cast_swiftness(int power, bool fail)
 
 spret_type cast_fly(int power, bool fail)
 {
-    if (you.form == TRAN_TREE)
-    {
-        mpr("Your roots keep you in place.", MSGCH_WARN);
-        return SPRET_ABORT;
-    }
-
-    if (you.liquefied_ground())
-    {
-        mpr("Such puny magic can't pull you from the ground!", MSGCH_WARN);
+    if (!flight_allowed())
         return SPRET_ABORT;
-    }
-
-    if (you.duration[DUR_GRASPING_ROOTS])
-    {
-        mpr("The grasping roots prevent you from becoming airborne.", MSGCH_WARN);
-        return SPRET_ABORT;
-    }
 
     fail_check();
     const int dur_change = 25 + random2(power) + random2(power);