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

fix #H4597 - sitting on level teleport trap

Browse Source 
During #sit:  "You sit down.  You step on a level teleporter."
Switch to alternate phrasing for #sit.

Webs and polymorph traps had similar issues.
This commit is contained in:
PatR
2016-12-08 17:22:59 -08:00
parent 9b725218bb
commit 2655910a0f
6 changed files with 33 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/sit.c
View File

@@ -113,7 +113,7 @@ dosit()
}
} else {
You("sit down.");
dotrap(trap, 0);
dotrap(trap, VIASITTING);
}
} else if (Underwater || Is_waterlevel(&u.uz)) {
if (Is_waterlevel(&u.uz))

16
src/teleport.c
View File

@@ -872,12 +872,20 @@ struct trap *trap;
}
void
level_tele_trap(trap)
level_tele_trap(trap, trflags)
struct trap *trap;
unsigned trflags;
{
You("%s onto a level teleport trap!",
Levitation ? (const char *) "float"
: locomotion(youmonst.data, "step"));
char verbbuf[BUFSZ];
if ((trflags & VIASITTING) != 0)
Strcpy(verbbuf, "trigger"); /* follows "You sit down." */
else
Sprintf(verbbuf, "%s onto",
Levitation ? (const char *) "float"
: locomotion(youmonst.data, "step"));
You("%s a level teleport trap!", verbbuf);
if (Antimagic) {
shieldeff(u.ux, u.uy);
}

19
src/trap.c
View File

@@ -850,6 +850,7 @@ unsigned trflags;
webmsgok = (trflags & NOWEBMSG) == 0,
forcebungle = (trflags & FORCEBUNGLE) != 0,
plunged = (trflags & TOOKPLUNGE) != 0,
viasitting = (trflags & VIASITTING) != 0,
adj_pit = conjoined_pits(trap, t_at(u.ux0, u.uy0), TRUE);
int oldumort;
int steed_article = ARTICLE_THE;
@@ -1237,7 +1238,7 @@ unsigned trflags;
case LEVEL_TELEP:
seetrap(trap);
level_tele_trap(trap);
level_tele_trap(trap, trflags);
break;
case WEB: /* Our luckless player has stumbled into a web. */
@@ -1253,7 +1254,7 @@ unsigned trflags;
if (webmsgok) {
char verbbuf[BUFSZ];
if (forcetrap) {
if (forcetrap || viasitting) {
Strcpy(verbbuf, "are caught by");
} else if (u.usteed) {
Sprintf(verbbuf, "lead %s into",
@@ -1382,15 +1383,17 @@ unsigned trflags;
char verbbuf[BUFSZ];
seetrap(trap);
if (u.usteed)
Sprintf(verbbuf, "lead %s",
if (viasitting)
Strcpy(verbbuf, "trigger"); /* follows "You sit down." */
else if (u.usteed)
Sprintf(verbbuf, "lead %s onto",
x_monnam(u.usteed, steed_article, (char *) 0,
SUPPRESS_SADDLE, FALSE));
else
Sprintf(verbbuf, "%s", Levitation
? (const char *) "float"
: locomotion(youmonst.data, "step"));
You("%s onto a polymorph trap!", verbbuf);
Sprintf(verbbuf, "%s onto",
Levitation ? (const char *) "float"
: locomotion(youmonst.data, "step"));
You("%s a polymorph trap!", verbbuf);
if (Antimagic || Unchanging) {
shieldeff(u.ux, u.uy);
You_feel("momentarily different.");