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

playing music while impaired

Browse Source 
Newsgroup discussion mentioned that it was possible to open the castle
drawbridge with musical notes even while confused.  There was already
some handling for confusion:  improvisation treats magical instruments
as their mundane equivalents.  This takes if farther:  when stunned
or confused or hallucinating you'll always improvise instead of being
given a chance to choose notes.  Being stunned now behaves the same
as being confused in regards to magical instruments (possibly/probably
it should prevent playing music altogether).  Hallucination gives
different feedback at start but still allows magical playing.
This commit is contained in:
PatR
2017-12-28 15:40:11 -08:00
parent 6857372f45
commit 860cdf6625
2 changed files with 83 additions and 56 deletions
Download Patch File Download Diff File Expand all files Collapse all files
doc/fixes36.1
+1
View File
@@ -493,6 +493,7 @@ hero poly'd into paper or straw golem reverts to human if burned up even when
hero polymorphed into form which can't wear armor via 'W' (eliciting "don't hero polymorphed into form which can't wear armor via 'W' (eliciting "don't
even bother") could wear it via 'P' even bother") could wear it via 'P'
make multi-shot missiles fired by monsters be less verbose when they miss make multi-shot missiles fired by monsters be less verbose when they miss
can no longer play controlled notes on musical instrument if impaired
Fixes to Post-3.6.0 Problems that Were Exposed Via git Repository Fixes to Post-3.6.0 Problems that Were Exposed Via git Repository
src/music.c
+82 -56
View File
@@ -1,4 +1,4 @@
/* NetHack 3.6 music.c $NHDT-Date: 1452660194 2016/01/13 04:43:14 $ $NHDT-Branch: NetHack-3.6.0 $:$NHDT-Revision: 1.42 $ */ /* NetHack 3.6 music.c $NHDT-Date: 1514504228 2017/12/28 23:37:08 $ $NHDT-Branch: NetHack-3.6.0 $:$NHDT-Revision: 1.46 $ */
/* Copyright (c) 1989 by Jean-Christophe Collet */ /* Copyright (c) 1989 by Jean-Christophe Collet */
/* NetHack may be freely redistributed. See license for details. */ /* NetHack may be freely redistributed. See license for details. */
@@ -6,7 +6,7 @@
* This file contains the different functions designed to manipulate the * This file contains the different functions designed to manipulate the
* musical instruments and their various effects. * musical instruments and their various effects.
* *
* Actually the list of instruments / effects is : * The list of instruments / effects is :
* *
* (wooden) flute may calm snakes if player has enough dexterity * (wooden) flute may calm snakes if player has enough dexterity
* magic flute may put monsters to sleep: area of effect depends * magic flute may put monsters to sleep: area of effect depends
@@ -450,8 +450,7 @@ STATIC_OVL int
do_improvisation(instr) do_improvisation(instr)
struct obj *instr; struct obj *instr;
{ {
int damage, do_spec = !Confusion; int damage, mode, do_spec = !(Stunned || Confusion);
#if defined(MAC) || defined(AMIGA) || defined(VPIX_MUSIC) || defined(PCMUSIC)
struct obj itmp; struct obj itmp;
itmp = *instr; itmp = *instr;
@@ -476,23 +475,55 @@ struct obj *instr;
#ifdef PCMUSIC #ifdef PCMUSIC
pc_speaker(&itmp, "C"); pc_speaker(&itmp, "C");
#endif #endif
#endif /* MAC || AMIGA || VPIX_MUSIC || PCMUSIC */
if (!do_spec) #define PLAY_NORMAL 0
#define PLAY_STUNNED 1
#define PLAY_CONFUSED 2
#define PLAY_HALLU 4
mode = PLAY_NORMAL;
if (Stunned)
mode |= PLAY_STUNNED;
if (Confusion)
mode |= PLAY_CONFUSED;
if (Hallucination)
mode |= PLAY_HALLU;
switch (mode) {
case PLAY_NORMAL:
You("start playing %s.", yname(instr));
break;
case PLAY_STUNNED:
You("produce an obnoxious droning sound.");
break;
case PLAY_CONFUSED:
You("produce a raucous noise.");
break;
case PLAY_HALLU:
You("produce a kaleidoscopic display of floating butterfiles.");
break;
/* TODO? give some or all of these combinations their own feedback;
hallucination ones should reference senses other than hearing... */
case PLAY_STUNNED | PLAY_CONFUSED:
case PLAY_STUNNED | PLAY_HALLU:
case PLAY_CONFUSED | PLAY_HALLU:
case PLAY_STUNNED | PLAY_CONFUSED | PLAY_HALLU:
default:
pline("What you produce is quite far from music..."); pline("What you produce is quite far from music...");
else break;
You("start playing %s.", the(xname(instr))); }
#undef PLAY_NORMAL
#undef PLAY_STUNNED
#undef PLAY_CONFUSED
#undef PLAY_HALLU
switch (instr->otyp) { switch (itmp.otyp) { /* note: itmp.otyp might differ from instr->otyp */
case MAGIC_FLUTE: /* Make monster fall asleep */ case MAGIC_FLUTE: /* Make monster fall asleep */
if (do_spec && instr->spe > 0) { consume_obj_charge(instr, TRUE);
consume_obj_charge(instr, TRUE);
You("produce %s music.", Hallucination ? "piped" : "soft"); You("produce %s music.", Hallucination ? "piped" : "soft");
put_monsters_to_sleep(u.ulevel * 5); put_monsters_to_sleep(u.ulevel * 5);
exercise(A_DEX, TRUE); exercise(A_DEX, TRUE);
break; break;
} /* else FALLTHRU */
case WOODEN_FLUTE: /* May charm snakes */ case WOODEN_FLUTE: /* May charm snakes */
do_spec &= (rn2(ACURR(A_DEX)) + u.ulevel > 25); do_spec &= (rn2(ACURR(A_DEX)) + u.ulevel > 25);
pline("%s.", Tobjnam(instr, do_spec ? "trill" : "toot")); pline("%s.", Tobjnam(instr, do_spec ? "trill" : "toot"));
@@ -502,66 +533,59 @@ struct obj *instr;
break; break;
case FIRE_HORN: /* Idem wand of fire */ case FIRE_HORN: /* Idem wand of fire */
case FROST_HORN: /* Idem wand of cold */ case FROST_HORN: /* Idem wand of cold */
if (do_spec && instr->spe > 0) { consume_obj_charge(instr, TRUE);
consume_obj_charge(instr, TRUE);
if (!getdir((char *) 0)) { if (!getdir((char *) 0)) {
pline("%s.", Tobjnam(instr, "vibrate")); pline("%s.", Tobjnam(instr, "vibrate"));
break;
} else if (!u.dx && !u.dy && !u.dz) {
if ((damage = zapyourself(instr, TRUE)) != 0) {
char buf[BUFSZ];
Sprintf(buf, "using a magical horn on %sself", uhim());
losehp(damage, buf, KILLED_BY); /* fire or frost damage */
}
} else {
buzz((instr->otyp == FROST_HORN) ? AD_COLD - 1 : AD_FIRE - 1,
rn1(6, 6), u.ux, u.uy, u.dx, u.dy);
}
makeknown(instr->otyp);
break; break;
} /* else FALLTHRU */ } else if (!u.dx && !u.dy && !u.dz) {
if ((damage = zapyourself(instr, TRUE)) != 0) {
char buf[BUFSZ];
Sprintf(buf, "using a magical horn on %sself", uhim());
losehp(damage, buf, KILLED_BY); /* fire or frost damage */
}
} else {
buzz((instr->otyp == FROST_HORN) ? AD_COLD - 1 : AD_FIRE - 1,
rn1(6, 6), u.ux, u.uy, u.dx, u.dy);
}
makeknown(instr->otyp);
break;
case TOOLED_HORN: /* Awaken or scare monsters */ case TOOLED_HORN: /* Awaken or scare monsters */
You("produce a frightful, grave sound."); You("produce a frightful, grave sound.");
awaken_monsters(u.ulevel * 30); awaken_monsters(u.ulevel * 30);
exercise(A_WIS, FALSE); exercise(A_WIS, FALSE);
break; break;
case BUGLE: /* Awaken & attract soldiers */ case BUGLE: /* Awaken & attract soldiers */
You("extract a loud noise from %s.", the(xname(instr))); You("extract a loud noise from %s.", yname(instr));
awaken_soldiers(&youmonst); awaken_soldiers(&youmonst);
exercise(A_WIS, FALSE); exercise(A_WIS, FALSE);
break; break;
case MAGIC_HARP: /* Charm monsters */ case MAGIC_HARP: /* Charm monsters */
if (do_spec && instr->spe > 0) { consume_obj_charge(instr, TRUE);
consume_obj_charge(instr, TRUE);
pline("%s very attractive music.", Tobjnam(instr, "produce")); pline("%s very attractive music.", Tobjnam(instr, "produce"));
charm_monsters((u.ulevel - 1) / 3 + 1); charm_monsters((u.ulevel - 1) / 3 + 1);
exercise(A_DEX, TRUE); exercise(A_DEX, TRUE);
break; break;
} /* else FALLTHRU */
case WOODEN_HARP: /* May calm Nymph */ case WOODEN_HARP: /* May calm Nymph */
do_spec &= (rn2(ACURR(A_DEX)) + u.ulevel > 25); do_spec &= (rn2(ACURR(A_DEX)) + u.ulevel > 25);
pline("%s %s.", The(xname(instr)), pline("%s %s.", Yname2(instr),
do_spec ? "produces a lilting melody" : "twangs"); do_spec ? "produces a lilting melody" : "twangs");
if (do_spec) if (do_spec)
calm_nymphs(u.ulevel * 3); calm_nymphs(u.ulevel * 3);
exercise(A_DEX, TRUE); exercise(A_DEX, TRUE);
break; break;
case DRUM_OF_EARTHQUAKE: /* create several pits */ case DRUM_OF_EARTHQUAKE: /* create several pits */
if (do_spec && instr->spe > 0) { consume_obj_charge(instr, TRUE);
consume_obj_charge(instr, TRUE);
You("produce a heavy, thunderous rolling!"); You("produce a heavy, thunderous rolling!");
pline_The("entire %s is shaking around you!", pline_The("entire %s is shaking around you!", generic_lvl_desc());
generic_lvl_desc()); do_earthquake((u.ulevel - 1) / 3 + 1);
do_earthquake((u.ulevel - 1) / 3 + 1); /* shake up monsters in a much larger radius... */
/* shake up monsters in a much larger radius... */ awaken_monsters(ROWNO * COLNO);
awaken_monsters(ROWNO * COLNO); makeknown(DRUM_OF_EARTHQUAKE);
makeknown(DRUM_OF_EARTHQUAKE); break;
break;
} /* else FALLTHRU */
case LEATHER_DRUM: /* Awaken monsters */ case LEATHER_DRUM: /* Awaken monsters */
You("beat a deafening row!"); You("beat a deafening row!");
awaken_monsters(u.ulevel * 40); awaken_monsters(u.ulevel * 40);
@@ -571,7 +595,7 @@ struct obj *instr;
break; break;
default: default:
impossible("What a weird instrument (%d)!", instr->otyp); impossible("What a weird instrument (%d)!", instr->otyp);
break; return 0;
} }
return 2; /* That takes time */ return 2; /* That takes time */
} }
@@ -598,11 +622,13 @@ struct obj *instr;
You("are incapable of playing %s.", the(distant_name(instr, xname))); You("are incapable of playing %s.", the(distant_name(instr, xname)));
return 0; return 0;
} }
if (instr->otyp != LEATHER_DRUM && instr->otyp != DRUM_OF_EARTHQUAKE) { if (instr->otyp != LEATHER_DRUM && instr->otyp != DRUM_OF_EARTHQUAKE
&& !(Stunned || Confusion || Hallucination)) {
c = ynq("Improvise?"); c = ynq("Improvise?");
if (c == 'q') if (c == 'q')
goto nevermind; goto nevermind;
} }
if (c == 'n') { if (c == 'n') {
if (u.uevent.uheard_tune == 2) if (u.uevent.uheard_tune == 2)
c = ynq("Play the passtune?"); c = ynq("Play the passtune?");