[crawl-ref-commits] master branch updated: 0.11-a0-84-g31fb67c

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

       via  31fb67cd0770a06c49ace4cf97d2849e40ca4aef (commit)
       via  c5408171337887a625f6be206a3ac08e586f73de (commit)
      from  b9d8210c14f234d3b609a5ca3b44507b8c61f190 (commit)

-----------------------------------------------------------------------
commit 31fb67cd0770a06c49ace4cf97d2849e40ca4aef
Author: David Lawrence Ramsey <dol...@us...>
Date:   Tue Jan 31 08:17:17 2012 -0600

    Fix tentacles reference for two-handed weapons with shields.
    
    If you need two tentacles to wield a weapon, three hands translates to
    six tentacles, not five.

commit c5408171337887a625f6be206a3ac08e586f73de
Author: David Lawrence Ramsey <dol...@us...>
Date:   Tue Jan 31 08:14:18 2012 -0600

    Generalize the bony plates check; anyone with level-3 tentacles has no arms.

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

Summary of changes:
 crawl-ref/source/item_use.cc |    2 +-
 crawl-ref/source/mutation.cc |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/crawl-ref/source/item_use.cc b/crawl-ref/source/item_use.cc
index 50a8354..8e4b856 100644
--- a/crawl-ref/source/item_use.cc
+++ b/crawl-ref/source/item_use.cc
@@ -813,7 +813,7 @@ bool do_wear_armour(int item, bool quiet)
     {
         if (!quiet)
         {
-            const char* how_many = you.has_tentacles(false) == 3 ? "five"
+            const char* how_many = you.has_tentacles(false) == 3 ? "six"
                                                                  : "three";
             mprf("You'd need %s %s to do that!", how_many,
                  you.hand_name(true).c_str());
diff --git a/crawl-ref/source/mutation.cc b/crawl-ref/source/mutation.cc
index 2966558..1b08ab7 100644
--- a/crawl-ref/source/mutation.cc
+++ b/crawl-ref/source/mutation.cc
@@ -1376,7 +1376,7 @@ bool mutate(mutation_type which_mutation, bool failMsg,
     case MUT_LARGE_BONE_PLATES:
         {
             const char *arms;
-            if (you.species == SP_OCTOPODE)
+            if (you.mutation[MUT_TENTACLES] >= 3)
                 arms = "tentacles";
             else if (you.species == SP_FELID)
                 arms = "legs";


-- 
Dungeon Crawl Stone Soup