From 82fa0cb1d1d28ae309754c0dbcd620c554f7f1d9 Mon Sep 17 00:00:00 2001
From: j-p-e-g <j-p-e-g@c06c8d41-db1a-0410-9941-cceddc491573>
Date: Mon, 22 Oct 2007 21:30:59 +0000
Subject: Changing screaming mutation to influence both frequency and volume of
 shouting -> yelling -> screaming. Reduced frequency of level 2 and 3 to make
 up for greater range. When paralysed, you are unable to scream.

Also cleaning up mutation listings.


git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@2517 c06c8d41-db1a-0410-9941-cceddc491573
---
 crawl-ref/source/player.cc | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

(limited to 'crawl-ref/source/player.cc')

diff --git a/crawl-ref/source/player.cc b/crawl-ref/source/player.cc
index 161d93a54d..4acec82a45 100644
--- a/crawl-ref/source/player.cc
+++ b/crawl-ref/source/player.cc
@@ -5587,6 +5587,9 @@ bool player::cannot_speak() const
     if (silenced(x_pos, y_pos))
         return (true);
 
+    if (you.duration[DUR_PARALYSIS])
+        return (true);
+        
     // No transform that prevents the player from speaking yet.
     return (false);
 }
@@ -5605,11 +5608,13 @@ std::string player::shout_verb() const
         return "squeak";
     case TRAN_AIR:
         return "__NONE";
-    default:
-        if (you.mutation[MUT_SCREAM])
-            return "scream";
-        else
+    default: // depends on SCREAM mutation
+        if (you.mutation[MUT_SCREAM] <= 1)
+            return "shout";
+        else if (you.mutation[MUT_SCREAM] == 2)
             return "yell";
+        else
+            return "scream";
     }
 }
 
-- 
cgit v1.2.3-54-g00ecf