summaryrefslogtreecommitdiffstats
path: root/crawl-ref
diff options
context:
space:
mode:
authordolorous <dolorous@c06c8d41-db1a-0410-9941-cceddc491573>2009-09-18 15:59:13 +0000
committerdolorous <dolorous@c06c8d41-db1a-0410-9941-cceddc491573>2009-09-18 15:59:13 +0000
commit17fbf0ea44bb9faf52bc8b8a13c8b45dec68e7aa (patch)
treebbea20b94df85f3dffa5f7d25d623b2a72617799 /crawl-ref
parent878fa9a7fad84e09f58beaddd3bcfd3107a9938e (diff)
downloadcrawl-ref-17fbf0ea44bb9faf52bc8b8a13c8b45dec68e7aa.tar.gz
crawl-ref-17fbf0ea44bb9faf52bc8b8a13c8b45dec68e7aa.zip
For flavor, add a gurgling sound, and make (very) ugly things use it.
git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@10715 c06c8d41-db1a-0410-9941-cceddc491573
Diffstat (limited to 'crawl-ref')
-rw-r--r--crawl-ref/source/dat/database/shout.txt8
-rw-r--r--crawl-ref/source/mon-data.h4
-rw-r--r--crawl-ref/source/mon-util.cc2
-rw-r--r--crawl-ref/source/mon-util.h1
-rw-r--r--crawl-ref/source/view.cc3
5 files changed, 16 insertions, 2 deletions
diff --git a/crawl-ref/source/dat/database/shout.txt b/crawl-ref/source/dat/database/shout.txt
index 5e8c0e3408..235c3bb9db 100644
--- a/crawl-ref/source/dat/database/shout.txt
+++ b/crawl-ref/source/dat/database/shout.txt
@@ -90,6 +90,14 @@ __MOAN seen
SOUND:@The_monster@ gives a chilling moan.
%%%%
+__GURGLE seen
+
+SOUND:@The_monster@ gurgles horribly!
+%%%%
+__GURGLE unseen
+
+SOUND:You hear a horrible gurgling sound!
+%%%%
__WHINE unseen
SOUND:You hear an irritating high-pitched whine.
diff --git a/crawl-ref/source/mon-data.h b/crawl-ref/source/mon-data.h
index 0d46a78547..d0d24c270a 100644
--- a/crawl-ref/source/mon-data.h
+++ b/crawl-ref/source/mon-data.h
@@ -1363,7 +1363,7 @@ static monsterentry mondata[] = {
600, 10, MONS_UGLY_THING, MONS_UGLY_THING, MH_NATURAL, -3,
{ {AT_HIT, AF_PLAIN, 12}, AT_NO_ATK, AT_NO_ATK, AT_NO_ATK },
{ 8, 3, 5, 0 },
- 3, 10, MST_NO_SPELLS, CE_CONTAMINATED, Z_SMALL, S_ROAR, I_ANIMAL,
+ 3, 10, MST_NO_SPELLS, CE_CONTAMINATED, Z_SMALL, S_GURGLE, I_ANIMAL,
HT_AMPHIBIOUS_LAND, 10, DEFAULT_ENERGY, MONUSE_OPEN_DOORS, MONEAT_NOTHING, SIZE_MEDIUM
},
@@ -1374,7 +1374,7 @@ static monsterentry mondata[] = {
750, 10, MONS_UGLY_THING, MONS_VERY_UGLY_THING, MH_NATURAL, -3,
{ {AT_HIT, AF_PLAIN, 17}, AT_NO_ATK, AT_NO_ATK, AT_NO_ATK },
{ 12, 3, 5, 0 },
- 4, 10, MST_NO_SPELLS, CE_MUTAGEN_RANDOM, Z_BIG, S_ROAR, I_ANIMAL,
+ 4, 10, MST_NO_SPELLS, CE_MUTAGEN_RANDOM, Z_BIG, S_GURGLE, I_ANIMAL,
HT_AMPHIBIOUS_LAND, 10, DEFAULT_ENERGY, MONUSE_OPEN_DOORS, MONEAT_NOTHING, SIZE_LARGE
},
diff --git a/crawl-ref/source/mon-util.cc b/crawl-ref/source/mon-util.cc
index 155851710e..c2d755fb99 100644
--- a/crawl-ref/source/mon-util.cc
+++ b/crawl-ref/source/mon-util.cc
@@ -806,6 +806,7 @@ int get_shout_noise_level(const shout_type shout)
return 4;
case S_SOFT:
return 6;
+ case S_GURGLE:
case S_LOUD:
return 10;
case S_SHOUT2:
@@ -8935,6 +8936,7 @@ std::string do_mon_str_replacements(const std::string &in_msg,
"screeches",
"buzzes",
"moans",
+ "gurgles",
"whines",
"croaks",
"growls",
diff --git a/crawl-ref/source/mon-util.h b/crawl-ref/source/mon-util.h
index 55d7a72bd8..7c1664294d 100644
--- a/crawl-ref/source/mon-util.h
+++ b/crawl-ref/source/mon-util.h
@@ -259,6 +259,7 @@ enum shout_type
S_SCREECH, // screech
S_BUZZ, // buzz
S_MOAN, // moan
+ S_GURGLE, // gurgle
S_WHINE, // irritating whine (mosquitos)
S_CROAK, // frog croak
S_GROWL, // for bears
diff --git a/crawl-ref/source/view.cc b/crawl-ref/source/view.cc
index fa46b023f5..66c3f4911c 100644
--- a/crawl-ref/source/view.cc
+++ b/crawl-ref/source/view.cc
@@ -1141,6 +1141,9 @@ void handle_monster_shouts(monsters* monster, bool force)
case S_MOAN:
default_msg_key = "__MOAN";
break;
+ case S_GURGLE:
+ default_msg_key = "__GURGLE";
+ break;
case S_WHINE:
default_msg_key = "__WHINE";
break;