nethack-gwaa-kiwi/nethack
1
0
Fork 0
Code Pull Requests Activity

whistle use while polymorphed

Browse Source 
Restrict poly'd whistle use to monsters that can blow a whistle.  The
restriction includes those that make no sound (or just buzz, which is a
wing-thing) and are either breathless, tiny (eg ants), headless or water
natives.  Searching monst.c, this appeared to provide a reasonable set of
restrictions.  There are a couple cases one might quibble about if someone
feels like refining this further.
This commit is contained in:
cohrs
2004-01-26 23:19:36 +00:00
parent 89022d94fd
commit 661f91009b
2 changed files with 12 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
doc/fixes35.0
View File

@@ -55,6 +55,7 @@ player polymorphed as a ceiling hider cannot reach the floor, but
automatically unhide on #sit
trappers do not hide on the ceiling
non-magical whistles do not work underwater
try to restrict whistle use to monsters that can blow a whistle
Platform- and/or Interface-Specific Fixes

14
src/apply.c
View File

@@ -389,7 +389,11 @@ STATIC_OVL void
use_whistle(obj)
struct obj *obj;
{
if(Underwater) {
if ((is_silent(youmonst.data) || youmonst.data->msound == MS_BUZZ) &&
(breathless(youmonst.data) || verysmall(youmonst.data) ||
!has_head(youmonst.data) || youmonst.data->mlet == S_EEL)) {
You("are incapable of using the whistle.");
} else if(Underwater) {
You("blow bubbles through %s.", yname(obj));
} else {
You(whistle_str, obj->cursed ? "shrill" : "high");
@@ -403,13 +407,17 @@ struct obj *obj;
{
register struct monst *mtmp, *nextmon;
/* it's magic! it works underwater too (at a higher pitch) */
if(obj->cursed && !rn2(2)) {
if ((is_silent(youmonst.data) || youmonst.data->msound == MS_BUZZ) &&
(breathless(youmonst.data) || verysmall(youmonst.data) ||
!has_head(youmonst.data) || youmonst.data->mlet == S_EEL)) {
You("are incapable of using the whistle.");
} else if (obj->cursed && !rn2(2)) {
You("produce a %shigh-pitched humming noise.",
Underwater ? "very " : "");
wake_nearby();
} else {
int pet_cnt = 0;
/* it's magic! it works underwater too (at a higher pitch) */
You(whistle_str, Hallucination ? "normal" :
Underwater ? "strange, high-pitched" : "strange");
for(mtmp = fmon; mtmp; mtmp = nextmon) {