summaryrefslogtreecommitdiffstats
path: root/crawl-ref/source/effects.cc
diff options
context:
space:
mode:
authorj-p-e-g <j-p-e-g@c06c8d41-db1a-0410-9941-cceddc491573>2007-10-22 21:30:59 +0000
committerj-p-e-g <j-p-e-g@c06c8d41-db1a-0410-9941-cceddc491573>2007-10-22 21:30:59 +0000
commit82fa0cb1d1d28ae309754c0dbcd620c554f7f1d9 (patch)
tree0d267bfac0bd5bb88e60060e030fe60608064aff /crawl-ref/source/effects.cc
parentaa1ef7b743654c99bca7b4dfc6f7d7bfd50307a0 (diff)
downloadcrawl-ref-82fa0cb1d1d28ae309754c0dbcd620c554f7f1d9.tar.gz
crawl-ref-82fa0cb1d1d28ae309754c0dbcd620c554f7f1d9.zip
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
Diffstat (limited to 'crawl-ref/source/effects.cc')
-rw-r--r--crawl-ref/source/effects.cc15
1 files changed, 10 insertions, 5 deletions
diff --git a/crawl-ref/source/effects.cc b/crawl-ref/source/effects.cc
index 8cf3b45865..6c18ebf4cc 100644
--- a/crawl-ref/source/effects.cc
+++ b/crawl-ref/source/effects.cc
@@ -1702,7 +1702,7 @@ void yell(bool force)
std::string cap_shout = shout_verb;
cap_shout[0] = toupper(cap_shout[0]);
- int noise_level = 12;
+ int noise_level = 12; // "shout"
// Tweak volume for different kinds of vocalisation.
if (shout_verb == "roar")
@@ -1713,6 +1713,10 @@ void yell(bool force)
noise_level = 4;
else if (shout_verb == "__NONE")
noise_level = 0;
+ else if (shout_verb == "yell")
+ noise_level = 14;
+ else if (shout_verb == "scream")
+ noise_level = 16;
if (silenced(you.x_pos, you.y_pos) || you.cannot_speak())
noise_level = 0;
@@ -1721,10 +1725,11 @@ void yell(bool force)
{
if (force)
{
- if (shout_verb == "__NONE")
- mpr("You must scream but have no lips!");
+ if (shout_verb == "__NONE" || you.paralysed())
+ mprf("You feel a strong urge to %s, but you are unable to make a sound!",
+ shout_verb == "__NONE" ? "scream" : shout_verb.c_str());
else
- mprf("A %s rips itself from your lips, but you make no sound!",
+ mprf("You feel a %s rip itself from your throat, but you make no sound!",
shout_verb.c_str());
}
else
@@ -1735,7 +1740,7 @@ void yell(bool force)
if (force)
{
- mprf("A %s rips itself from your lips!", shout_verb.c_str());
+ mprf("A %s rips itself from your throat!", shout_verb.c_str());
noisy( noise_level, you.x_pos, you.y_pos );
return;
}