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

buried punishment ball

Browse Source 
Prevent burying a ball from ending your punishment.

When you bury the ball, internally NetHack Punishment
ceases, but a new trap type of TT_BURIEDBALL  immediately
kicks in (acting similar to TT_INFLOOR in some ways).
You can eventually work the ball free (or teleport, etc.),
but that will just return you back to normal Punishment.
This commit is contained in:
nethack.allison
2003-03-11 03:40:17 +00:00
parent 9fe995d2a3
commit 176d31c980
14 changed files with 198 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/polyself.c
View File

@@ -524,9 +524,15 @@ int mntmp;
(is_pool(u.ux,u.uy) || is_lava(u.ux,u.uy))) ||
(Underwater && !Swimming))
spoteffects(TRUE);
if (Passes_walls && u.utrap && u.utraptype == TT_INFLOOR) {
if (Passes_walls && u.utrap &&
(u.utraptype == TT_INFLOOR || u.utraptype == TT_BURIEDBALL)) {
u.utrap = 0;
pline_The("rock seems to no longer trap you.");
if (u.utraptype == TT_INFLOOR)
pline_The("rock seems to no longer trap you.");
else {
pline_The("buried ball is no longer bound to you.");
buried_ball_to_freedom();
}
} else if (likes_lava(youmonst.data) && u.utrap && u.utraptype == TT_LAVA) {
u.utrap = 0;
pline_The("lava now feels soothing.");
@@ -535,6 +541,9 @@ int mntmp;
if (Punished) {
You("slip out of the iron chain.");
unpunish();
} else if (u.utrap && u.utraptype == TT_BURIEDBALL) {
You("slip free of the buried ball and chain.");
buried_ball_to_freedom();
}
}
if (u.utrap && (u.utraptype == TT_WEB || u.utraptype == TT_BEARTRAP) &&
@@ -771,6 +780,11 @@ int
doremove()
{
if (!Punished) {
if (u.utrap && u.utraptype == TT_BURIEDBALL) {
pline_The("ball and chain are buried firmly in the %s.",
surface(u.ux, u.uy));
return(0);
}
You("are not chained to anything!");
return(0);
}