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

fix #H6925 - being trapped vs Levitation/Flying

Browse Source 
Make being trapped in/on/over floor block Levitation and Flying, the
way that being inside solid rock already does, and the way levitating
blocks flight.

Blocked levitation still provides enhanced carrying capacity since
magic is attempting to make the hero's body be bouyant.  I think that
that is appropriate but am not completely convinced.

One thing that almost certainly needs fixing is digging a hole when
trapped in the floor or tethered to a buried iron ball, where the
first part of digactualhole() releases the hero from being trapped.
If being released re-enables blocked levitation, the further stages
of digging might not make sense in some circumstances.

I recently realized that being held by a grabbing monster is similar
to being trapped so should also interfere with levitation and flying.
Nothing here attempts to address that.

Save files change, but in a compatible fashion unless trapped at the
time of saving.  If someone saves while trapped prior to this patch,
then applies it and restores, the game will behave as if the patch
wasn't in place--until escape from trap is achieved.  (Not verified.)
This commit is contained in:
PatR
2018-09-30 01:06:59 -07:00
parent 00dfed5b3a
commit 3e19858edd
20 changed files with 330 additions and 149 deletions
Download Patch File Download Diff File Expand all files Collapse all files

225
src/trap.c
View File

@@ -805,10 +805,12 @@ struct trap *trap;
{
boolean isyou = (mtmp == &youmonst);
struct permonst *mptr = mtmp->data;
if (amorphous(mptr) || is_whirly(mptr) || flaming(mptr)
|| unsolid(mptr) || mptr == &mons[PM_GELATINOUS_CUBE]) {
xchar x = trap->tx;
xchar y = trap->ty;
if (flaming(mptr) || acidic(mptr)) {
if (domsg) {
if (isyou)
@@ -825,9 +827,9 @@ struct trap *trap;
return TRUE;
}
if (domsg) {
if (isyou)
if (isyou) {
You("flow through %s spider web.", a_your[trap->madeby_u]);
else {
} else {
pline("%s flows through %s spider web.", Monnam(mtmp),
a_your[trap->madeby_u]);
seetrap(trap);
@@ -853,6 +855,37 @@ struct trap *trap;
return otmp;
}
void
set_utrap(tim, typ)
unsigned tim, typ;
{
u.utrap = tim;
/* FIXME:
* utraptype==0 is bear trap rather than 'none'; we probably ought
* to change that but can't do so until save file compatability is
* able to be broken.
*/
u.utraptype = tim ? typ : 0;
float_vs_flight(); /* maybe block Lev and/or Fly */
}
void
reset_utrap(msg)
boolean msg;
{
boolean was_Lev = (Levitation != 0), was_Fly = (Flying != 0);
set_utrap(0, 0);
if (msg) {
if (!was_Lev && Levitation)
float_up();
if (!was_Fly && Flying)
You("can fly.");
}
}
void
dotrap(trap, trflags)
register struct trap *trap;
@@ -1042,13 +1075,12 @@ unsigned trflags;
A_Your[trap->madeby_u]);
break;
}
u.utrap = rn1(4, 4);
u.utraptype = TT_BEARTRAP;
set_utrap((unsigned) rn1(4, 4), TT_BEARTRAP);
if (u.usteed) {
pline("%s bear trap closes on %s %s!", A_Your[trap->madeby_u],
s_suffix(mon_nam(u.usteed)), mbodypart(u.usteed, FOOT));
if (thitm(0, u.usteed, (struct obj *) 0, dmg, FALSE))
u.utrap = 0; /* steed died, hero not trapped */
reset_utrap(TRUE); /* steed died, hero not trapped */
} else {
pline("%s bear trap closes on your %s!", A_Your[trap->madeby_u],
body_part(FOOT));
@@ -1191,8 +1223,12 @@ unsigned trflags;
} else
You("%s %s!", conj_pit ? "step" : "land", predicament);
}
u.utrap = rn1(6, 2);
u.utraptype = TT_PIT;
/* FIXME:
* if hero gets killed here, setting u.utrap in advance will
* show "you were trapped in a pit" during disclosure's display
* of enlightenment, but hero is dying *before* becoming trapped.
*/
set_utrap((unsigned) rn1(6, 2), TT_PIT);
if (!steedintrap(trap, (struct obj *) 0)) {
if (ttype == SPIKED_PIT) {
oldumort = u.umortality;
@@ -1286,11 +1322,13 @@ unsigned trflags;
}
You("%s %s spider web!", verbbuf, a_your[trap->madeby_u]);
}
u.utraptype = TT_WEB;
/* time will be adjusted below */
set_utrap(1, TT_WEB);
/* Time stuck in the web depends on your/steed strength. */
{
register int str = ACURR(A_STR);
int tim, str = ACURR(A_STR);
/* If mounted, the steed gets trapped. Use mintrap
* to do all the work. If mtrapped is set as a result,
@@ -1312,32 +1350,34 @@ unsigned trflags;
if (strongmonst(u.usteed->data))
str = 17;
} else {
reset_utrap(FALSE);
break;
}
webmsgok = FALSE; /* mintrap printed the messages */
}
if (str <= 3)
u.utrap = rn1(6, 6);
tim = rn1(6, 6);
else if (str < 6)
u.utrap = rn1(6, 4);
tim = rn1(6, 4);
else if (str < 9)
u.utrap = rn1(4, 4);
tim = rn1(4, 4);
else if (str < 12)
u.utrap = rn1(4, 2);
tim = rn1(4, 2);
else if (str < 15)
u.utrap = rn1(2, 2);
tim = rn1(2, 2);
else if (str < 18)
u.utrap = rnd(2);
tim = rnd(2);
else if (str < 69)
u.utrap = 1;
tim = 1;
else {
u.utrap = 0;
tim = 0;
if (webmsgok)
You("tear through %s web!", a_your[trap->madeby_u]);
deltrap(trap);
newsym(u.ux, u.uy); /* get rid of trap symbol */
}
set_utrap((unsigned) tim, TT_WEB);
}
break;
@@ -2767,16 +2807,34 @@ float_up()
context.botl = TRUE;
if (u.utrap) {
if (u.utraptype == TT_PIT) {
u.utrap = 0;
reset_utrap(FALSE);
You("float up, out of the pit!");
vision_full_recalc = 1; /* vision limits change */
fill_pit(u.ux, u.uy);
} else if (u.utraptype == TT_INFLOOR) {
} else if (u.utraptype == TT_LAVA /* molten lava */
|| u.utraptype == TT_INFLOOR) { /* solidified lava */
Your("body pulls upward, but your %s are still stuck.",
makeplural(body_part(LEG)));
} else {
You("float up, only your %s is still stuck.", body_part(LEG));
} else if (u.utraptype == TT_BURIEDBALL) { /* tethered */
coord cc;
cc.x = u.ux, cc.y = u.uy;
/* caveat: this finds the first buried iron ball within
one step of the specified location, not necessarily the
buried [former] uball at the original anchor point */
(void) buried_ball(&cc);
/* being chained to the floor blocks levitation from floating
above that floor but not from enhancing carrying capacity */
You("feel lighter, but your %s is still chained to the %s.",
body_part(LEG),
IS_ROOM(levl[cc.x][cc.y].typ) ? "floor" : "ground");
} else if (u.utraptype == WEB) {
You("float up slightly, but you are still stuck in the web.");
} else { /* bear trap */
You("float up slightly, but your %s is still stuck.",
body_part(LEG));
}
/* when still trapped, float_vs_flight() below will block levitation */
#if 0
} else if (Is_waterlevel(&u.uz)) {
pline("It feels as though you've lost some weight.");
@@ -2795,8 +2853,7 @@ float_up()
} else {
You("start to float in the air!");
}
if (u.usteed && !is_floater(u.usteed->data)
&& !is_flyer(u.usteed->data)) {
if (u.usteed && !is_floater(u.usteed->data) && !is_flyer(u.usteed->data)) {
if (Lev_at_will) {
pline("%s magically floats up!", Monnam(u.usteed));
} else {
@@ -2806,7 +2863,7 @@ float_up()
}
if (Flying)
You("are no longer able to control your flight.");
BFlying |= I_SPECIAL;
float_vs_flight(); /* set BFlying, also BLevitation if still trapped */
/* levitation gives maximum carrying capacity, so encumbrance
state might be reduced */
(void) encumber_msg();
@@ -2841,16 +2898,29 @@ long hmask, emask; /* might cancel timeout */
if (Levitation)
return 0; /* maybe another ring/potion/boots */
if (BLevitation) {
/* Levitation is blocked, so hero is not actually floating
hence shouldn't have float_down effects and feedback */
float_vs_flight(); /* before nomul() rather than after */
/* if blocked by terrain, we haven't actually been levitating so
we don't give any end-of-levitation feedback or side-effects,
but if blocking is solely due to being trapped in/on floor,
do give some feedback but skip other float_down() effects */
boolean trapped = (BLevitation == I_SPECIAL);
float_vs_flight();
if (trapped && u.utrap) /* u.utrap => paranoia */
You("are no longer trying to float up from the %s.",
(u.utraptype == TT_BEARTRAP) ? "trap's jaws"
: (u.utraptype == TT_WEB) ? "web"
: (u.utraptype == TT_BURIEDBALL) ? "chain"
: (u.utraptype == TT_LAVA) ? "lava"
: "ground"); /* TT_INFLOOR */
(void) encumber_msg(); /* carrying capacity might have changed */
return 0;
}
context.botl = TRUE;
nomul(0); /* stop running or resting */
if (BFlying) {
/* controlled flight no longer overridden by levitation */
BFlying &= ~I_SPECIAL;
float_vs_flight(); /* clears BFlying & I_SPECIAL
* unless hero is stuck in floor */
if (Flying) {
You("have stopped levitating and are now flying.");
(void) encumber_msg(); /* carrying capacity might have changed */
@@ -2981,7 +3051,7 @@ climb_pit()
if (Passes_walls) {
/* marked as trapped so they can pick things up */
You("ascend from the pit.");
u.utrap = 0;
reset_utrap(FALSE);
fill_pit(u.ux, u.uy);
vision_full_recalc = 1; /* vision limits change */
} else if (!rn2(2) && sobj_at(BOULDER, u.ux, u.uy)) {
@@ -2993,10 +3063,11 @@ climb_pit()
/* eg fell in pit, then poly'd to a flying monster;
or used '>' to deliberately enter it */
You("%s from the pit.", Flying ? "fly" : "climb");
u.utrap = 0;
reset_utrap(FALSE);
fill_pit(u.ux, u.uy);
vision_full_recalc = 1; /* vision limits change */
} else if (!(--u.utrap)) {
reset_utrap(FALSE);
You("%s to the edge of the pit.",
(Sokoban && Levitation)
? "struggle against the air currents and float"
@@ -3887,7 +3958,7 @@ boolean bury_it;
}
newsym(ttmp->tx, ttmp->ty);
if (u.utrap && ttmp->tx == u.ux && ttmp->ty == u.uy)
u.utrap = 0;
reset_utrap(TRUE);
deltrap(ttmp);
}
@@ -4506,51 +4577,80 @@ struct monst *mon;
boolean *noticed; /* set to true iff hero notices the effect; */
{ /* otherwise left with its previous value intact */
struct trap *t;
char buf[BUFSZ];
const char *trapdescr, *which;
char buf[BUFSZ], whichbuf[20];
const char *trapdescr = 0, *which = 0;
boolean ishero = (mon == &youmonst);
if (!mon)
return FALSE;
if (mon == u.usteed)
ishero = TRUE;
t = t_at(ishero ? u.ux : mon->mx, ishero ? u.uy : mon->my);
/* if no trap here or it's not a holding trap, we're done */
if (!t || (t->ttyp != BEAR_TRAP && t->ttyp != WEB))
return FALSE;
trapdescr = defsyms[trap_to_defsym(t->ttyp)].explanation;
which = t->tseen ? the_your[t->madeby_u]
: index(vowels, *trapdescr) ? "an" : "a";
t = t_at(ishero ? u.ux : mon->mx, ishero ? u.uy : mon->my);
if (ishero && u.utrap) { /* all u.utraptype values are holding traps */
which = "";
switch (u.utraptype) {
case TT_LAVA:
trapdescr = "molten lava";
break;
case TT_INFLOOR:
/* solidified lava, so not "floor" even if within a room */
trapdescr = "ground";
break;
case TT_BURIEDBALL:
trapdescr = "your anchor";
break;
case TT_BEARTRAP:
case TT_PIT:
case TT_WEB:
trapdescr = 0; /* use defsyms[].explanation */
break;
default:
/* lint suppression in case 't' is unexpectedly Null
or u.utraptype has new value we don't know about yet */
trapdescr = "trap";
break;
}
} else {
/* if no trap here or it's not a holding trap, we're done */
if (!t || (t->ttyp != BEAR_TRAP && t->ttyp != WEB))
return FALSE;
}
if (!trapdescr)
trapdescr = defsyms[trap_to_defsym(t->ttyp)].explanation;
if (!which)
which = t->tseen ? the_your[t->madeby_u]
: index(vowels, *trapdescr) ? "an" : "a";
if (*which)
which = strcat(strcpy(whichbuf, which), " ");
if (ishero) {
if (!u.utrap)
return FALSE;
u.utrap = 0; /* released regardless of type */
*noticed = TRUE;
/* give message only if trap was the expected type */
if (u.utraptype == TT_BEARTRAP || u.utraptype == TT_WEB) {
if (u.usteed)
Sprintf(buf, "%s is", noit_Monnam(u.usteed));
else
Strcpy(buf, "You are");
pline("%s released from %s %s.", buf, which, trapdescr);
}
if (u.usteed)
Sprintf(buf, "%s is", noit_Monnam(u.usteed));
else
Strcpy(buf, "You are");
pline("%s released from %s%s.", buf, which, trapdescr);
reset_utrap(TRUE);
} else {
if (!mon->mtrapped)
return FALSE;
mon->mtrapped = 0;
if (canspotmon(mon)) {
*noticed = TRUE;
pline("%s is released from %s %s.", Monnam(mon), which,
pline("%s is released from %s%s.", Monnam(mon), which,
trapdescr);
} else if (cansee(t->tx, t->ty) && t->tseen) {
*noticed = TRUE;
if (t->ttyp == WEB)
pline("%s is released from %s %s.", Something, which,
pline("%s is released from %s%s.", Something, which,
trapdescr);
else /* BEAR_TRAP */
pline("%s %s opens.", upstart(strcpy(buf, which)), trapdescr);
pline("%s%s opens.", upstart(strcpy(buf, which)), trapdescr);
}
/* might pacify monster if adjacent */
if (rn2(2) && distu(mon->mx, mon->my) <= 2)
@@ -5002,8 +5102,8 @@ register struct trap *ttmp;
register struct monst *mtmp;
if (ttmp->tx == u.ux && ttmp->ty == u.uy) {
u.utrap = 0;
u.utraptype = 0;
if (u.utraptype != TT_BURIEDBALL)
reset_utrap(TRUE);
} else if ((mtmp = m_at(ttmp->tx, ttmp->ty)) != 0) {
mtmp->mtrapped = 0;
}
@@ -5211,12 +5311,11 @@ lava_effects()
boil_away = !Fire_resistance;
/* if not fire resistant, sink_into_lava() will quickly be fatal;
hero needs to escape immediately */
u.utrap = rn1(4, 4) + ((boil_away ? 2 : rn1(4, 12)) << 8);
u.utraptype = TT_LAVA;
set_utrap((unsigned) (rn1(4, 4) + ((boil_away ? 2 : rn1(4, 12)) << 8)),
TT_LAVA);
You("sink into the %s%s!", hliquid("lava"),
!boil_away
? ", but it only burns slightly"
: " and are about to be immolated");
!boil_away ? ", but it only burns slightly"
: " and are about to be immolated");
if (u.uhp > 1)
losehp(!boil_away ? 1 : (u.uhp / 2), lava_killer,
KILLED_BY); /* lava damage */
@@ -5238,7 +5337,7 @@ sink_into_lava()
if (!u.utrap || u.utraptype != TT_LAVA) {
; /* do nothing; this shouldn't happen */
} else if (!is_lava(u.ux, u.uy)) {
u.utrap = 0; /* this shouldn't happen either */
reset_utrap(FALSE); /* this shouldn't happen either */
} else if (!u.uinvulnerable) {
/* ordinarily we'd have to be fire resistant to survive long
enough to become stuck in lava, but it can happen without
@@ -5255,8 +5354,10 @@ sink_into_lava()
burn_away_slime(); /* add insult to injury? */
done(DISSOLVED);
/* can only get here via life-saving; try to get away from lava */
u.utrap = 0;
(void) safe_teleds(TRUE);
reset_utrap(TRUE);
/* levitation or flight have become unblocked, otherwise Tport */
if (!Levitation && !Flying)
(void) safe_teleds(TRUE);
} else if (!u.umoved) {
/* can't fully turn into slime while in lava, but might not
have it be burned away until you've come awfully close */