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

more adjacent pit

Browse Source
This commit is contained in:
nhmall
2018-04-21 08:00:57 -04:00
parent 2ce0fbd571
commit 56ceea5a41
1 changed files with 13 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
src/trap.c
View File

@@ -1,4 +1,4 @@
/* NetHack 3.6 trap.c $NHDT-Date: 1514855666 2018/01/02 01:14:26 $ $NHDT-Branch: NetHack-3.6.0 $:$NHDT-Revision: 1.284 $ */ /* NetHack 3.6 trap.c $NHDT-Date: 1524312044 2018/04/21 12:00:44 $ $NHDT-Branch: NetHack-3.6.0 $:$NHDT-Revision: 1.290 $ */
/* Copyright (c) Stichting Mathematisch Centrum, Amsterdam, 1985. */ /* Copyright (c) Stichting Mathematisch Centrum, Amsterdam, 1985. */
/* NetHack may be freely redistributed. See license for details. */ /* NetHack may be freely redistributed. See license for details. */
@@ -854,7 +854,7 @@ unsigned trflags;
plunged = (trflags & TOOKPLUNGE) != 0, plunged = (trflags & TOOKPLUNGE) != 0,
viasitting = (trflags & VIASITTING) != 0, viasitting = (trflags & VIASITTING) != 0,
conj_pit = conjoined_pits(trap, t_at(u.ux0, u.uy0), TRUE), conj_pit = conjoined_pits(trap, t_at(u.ux0, u.uy0), TRUE),
adj_pit = (adj_nonconjoined_pit(trap) && t_at(u.ux0, u.uy0)); adj_pit = adj_nonconjoined_pit(trap);
int oldumort; int oldumort;
int steed_article = ARTICLE_THE; int steed_article = ARTICLE_THE;
@@ -1193,7 +1193,7 @@ unsigned trflags;
if (!steedintrap(trap, (struct obj *) 0)) { if (!steedintrap(trap, (struct obj *) 0)) {
if (ttype == SPIKED_PIT) { if (ttype == SPIKED_PIT) {
oldumort = u.umortality; oldumort = u.umortality;
losehp(Maybe_Half_Phys(rnd((conj_pit || adj_pit) ? 6 : 10)), losehp(Maybe_Half_Phys(rnd(conj_pit ? 4 : adj_pit ? 6 : 10)),
plunged plunged
? "deliberately plunged into a pit of iron spikes" ? "deliberately plunged into a pit of iron spikes"
: conj_pit ? "stepped into a pit of iron spikes" : conj_pit ? "stepped into a pit of iron spikes"
@@ -4920,16 +4920,17 @@ struct trap *trap;
boolean boolean
adj_nonconjoined_pit(adjtrap) adj_nonconjoined_pit(adjtrap)
struct trap *adjtrap; struct trap *adjtrap;
{ {
int idx; struct trap *trap_with_u = t_at(u.ux0, u.uy0);
struct trap *trap_with_u = t_at(u.ux, u.uy);
if (!trap_with_u || !(adjtrap->ttyp == PIT || adjtrap->ttyp == SPIKED_PIT)) if (trap_with_u && adjtrap && u.utrap && u.utraptype == TT_PIT &&
return FALSE; (trap_with_u->ttyp == PIT || trap_with_u->ttyp == SPIKED_PIT) &&
(adjtrap->ttyp == PIT || adjtrap->ttyp == SPIKED_PIT)) {
for (idx = 0; idx < 8; idx++) { int idx;
if (xdir[idx] == u.dx && ydir[idx] == u.dy) for (idx = 0; idx < 8; idx++) {
return TRUE; if (xdir[idx] == u.dx && ydir[idx] == u.dy)
return TRUE;
}
} }
return FALSE; return FALSE;
} }