Skip to content

Turn cancelled bags of holding into sacks #626

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Vivit-R wants to merge 1 commit into
base: NetHack-3.7
Choose a base branch
from
Open

Turn cancelled bags of holding into sacks #626

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 8 additions & 5 deletions src/pickup.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2224,14 +2224,12 @@ loot_mon(struct monst *mtmp, int *passed_info, boolean *prev_loot)
static boolean
mbag_explodes(struct obj *obj, int depthin)
{
/* these won't cause an explosion when they're empty */
if ((obj->otyp == WAN_CANCELLATION || obj->otyp == BAG_OF_TRICKS)
&& obj->spe <= 0)
/* won't cause an explosion when it's empty */
if (obj->otyp == BAG_OF_TRICKS && obj->spe <= 0)
return FALSE;

/* odds: 1/1, 2/2, 3/4, 4/8, 5/16, 6/32, 7/64, 8/128, 9/128, 10/128,... */
if ((Is_mbag(obj) || obj->otyp == WAN_CANCELLATION)
&& (rn2(1 << (depthin > 7 ? 7 : depthin)) <= depthin))
if (Is_mbag(obj) && (rn2(1 << (depthin > 7 ? 7 : depthin)) <= depthin))
return TRUE;
else if (Has_contents(obj)) {
struct obj *otmp;
Expand Down Expand Up @@ -2426,6 +2424,11 @@ in_container(struct obj *obj)

losehp(d(6, 6), "magical explosion", KILLED_BY_AN);
g.current_container = 0; /* baggone = TRUE; */
} else if (Is_mbag(g.current_container) &&
obj->otyp == WAN_CANCELLATION && obj->spe > 0) {
/* cancel bag because wand of cancellation was inserted */
cancel_item(g.current_container);
obj->spe--;
}

if (g.current_container) {
Expand Down
7 changes: 7 additions & 0 deletions src/zap.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1214,6 +1214,13 @@ cancel_item(struct obj *obj)
obj->odiluted = 0; /* same as any other water */
}
break;
case TOOL_CLASS:
/* A BoH turns into a sack when cancelled. (The same thing
happens to the bag when a wand of cancellation is placed
into it.) */
if (otyp = BAG_OF_HOLDING)
obj->otyp = SACK;
break;
}
}
/* cancelling a troll's corpse prevents it from reviving (on its own;
Expand Down