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

bag of tricks, horn of plenty, #tip (trunk only)

Browse Source 
<Someone> reported that he applied an unID'd bag and it became
discovered as a bag of tricks even though a spellbook appeared on the floor
next to him rather than having a monster show up (the monster was a mimic).
Suppress the bag discovery unless you can see or sense a monster appear.
(This doesn't really achieve much for most players, who'll recognize the
bag because they know that only one type of container doesn't prompt to
take things out and/or put things in, but I think it does make sense.)

     While mucking with bag of tricks I decided that to be consistent with
the behavior of other containers, the #tip command should release all the
monsters in the bag instead of just one.

     And after doing that, I realized that horn of plenty ought to behave
much the same, so #tip will operate on it now.  However, it won't be listed
as a likely candidate in the "which item?" prompt unless/until it has been
discovered.  (Attempting to empty any other type of horn yields "nothing
happens", same as for a horn of plenty with no charges left.)  Emptying a
horn of plenty in a shop can be extremely verbose, but I don't think that
qualifies as a bug and don't currently have any plans to alter it.
This commit is contained in:
nethack.rankin
2006-06-18 05:20:36 +00:00
parent e79a41ccb6
commit 58137a608a
8 changed files with 138 additions and 62 deletions
Download Patch File Download Diff File Expand all files Collapse all files

43
src/makemon.c
View File

@@ -1,4 +1,4 @@
/* SCCS Id: @(#)makemon.c 3.5 2006/04/14 */
/* SCCS Id: @(#)makemon.c 3.5 2006/06/17 */
/* Copyright (c) Stichting Mathematisch Centrum, Amsterdam, 1985. */
/* NetHack may be freely redistributed. See license for details. */
@@ -1805,28 +1805,47 @@ assign_sym:
mtmp->mappearance = appear;
}
/* release a monster from a bag of tricks */
void
bagotricks(bag)
/* release a monster from a bag of tricks; return number of monsters created */
int
bagotricks(bag, tipping)
struct obj *bag;
boolean tipping; /* caller emptying entire contents; affects shop handling */
{
int moncount = 0;
if (!bag || bag->otyp != BAG_OF_TRICKS) {
impossible("bad bag o' tricks");
} else if (bag->spe < 1) {
pline(nothing_happens);
/* now known to be empty if sufficiently discovered */
if (bag->dknown && objects[bag->otyp].oc_name_known) bag->cknown = 1;
} else {
boolean gotone = FALSE;
int cnt = 1;
struct monst *mtmp;
boolean sawone = FALSE;
int creatcnt = 1;
consume_obj_charge(bag, TRUE);
consume_obj_charge(bag, !tipping);
if (!rn2(23)) cnt += rn1(7, 1);
while (cnt-- > 0) {
if (makemon((struct permonst *)0, u.ux, u.uy, NO_MM_FLAGS))
gotone = TRUE;
if (!rn2(23)) creatcnt += rnd(7);
do {
mtmp = makemon((struct permonst *)0, u.ux, u.uy, NO_MM_FLAGS);
if (mtmp) {
++moncount;
if (canspotmon(mtmp)) sawone = TRUE;
}
} while (--creatcnt > 0);
if (sawone) {
/* don't set contents-known flag if we just used last charge
(such suppression doesn't actually gain us much since
player can now deduce that the bag has become empty) */
if (bag->spe > 0) bag->cknown = 1;
if (bag->dknown) makeknown(BAG_OF_TRICKS);
} else {
/* #tip while blind can trigger this successive times */
Norep("Nothing seems to happen.");
}
if (gotone) makeknown(BAG_OF_TRICKS);
}
return moncount;
}
/*makemon.c*/