[crawl-ref-commits] master branch updated: 0.21-a0-84-g85d6d27

[<gi...@cr...>]

       via  85d6d27d4c04dd879824d0057879b32aae023901 (commit)
       via  1e75fd560e9dc0fdbbcd2582cdd81ae3ed69bdc2 (commit)
      from  db847824025579f73089239663d45ccdfaf5a913 (commit)

-----------------------------------------------------------------------
commit 85d6d27d4c04dd879824d0057879b32aae023901
Author: kenranunderscore <joh...@gm...>
Date:   Thu Jun 22 02:47:15 2017 +0200

    Print a better message when an attempted blink is not possible

commit 1e75fd560e9dc0fdbbcd2582cdd81ae3ed69bdc2
Author: kenranunderscore <joh...@gm...>
Date:   Thu Jun 22 02:32:51 2017 +0200

    Tree form now fully suppresses the blink and teleportitis mutations

-----------------------------------------------------------------------

Summary of changes:
 crawl-ref/source/mutation.cc | 6 ++++++
 crawl-ref/source/player.cc   | 3 ++-
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/crawl-ref/source/mutation.cc b/crawl-ref/source/mutation.cc
index 9cd2702..135dd47 100644
--- a/crawl-ref/source/mutation.cc
+++ b/crawl-ref/source/mutation.cc
@@ -368,6 +368,12 @@ mutation_activity_type mutation_activity_level(mutation_type mut)
     if (you.form == transformation::blade_hands && mut == MUT_PAWS)
         return mutation_activity_type::INACTIVE;
 
+    if (you.form == transformation::tree
+        && (mut == MUT_BLINK || mut == MUT_TELEPORT))
+    {
+        return mutation_activity_type::INACTIVE;
+    }
+
     if (you_worship(GOD_DITHMENOS) && mut == MUT_IGNITE_BLOOD)
         return mutation_activity_type::INACTIVE;
 
diff --git a/crawl-ref/source/player.cc b/crawl-ref/source/player.cc
index 8c4c949..33a4bb3 100644
--- a/crawl-ref/source/player.cc
+++ b/crawl-ref/source/player.cc
@@ -6322,7 +6322,8 @@ string player::no_tele_reason(bool calc_unid, bool blinking) const
     if (problems.empty())
         return ""; // no problem
 
-    return make_stringf("You cannot teleport because you are %s.",
+    return make_stringf("You cannot %s because you are %s.",
+                        blinking ? "blink" : "teleport",
                         comma_separated_line(problems.begin(),
                                              problems.end()).c_str());
 }


-- 
Dungeon Crawl Stone Soup