-/* NetHack 3.6 do.c $NHDT-Date: 1548978604 2019/01/31 23:50:04 $ $NHDT-Branch: NetHack-3.6.2-beta01 $:$NHDT-Revision: 1.189 $ */
+/* NetHack 3.6 do.c $NHDT-Date: 1576638499 2019/12/18 03:08:19 $ $NHDT-Branch: NetHack-3.6 $:$NHDT-Revision: 1.198 $ */
/* Copyright (c) Stichting Mathematisch Centrum, Amsterdam, 1985. */
/*-Copyright (c) Derek S. Ray, 2015. */
/* NetHack may be freely redistributed. See license for details. */
/* JNetHack Copyright */
/* (c) Issei Numata, Naoki Hamada, Shigehiro Miyashita, 1994-2000 */
-/* For 3.4-, Copyright (c) SHIRAKATA Kentaro, 2002-2019 */
+/* For 3.4-, Copyright (c) SHIRAKATA Kentaro, 2002-2020 */
/* JNetHack may be freely redistributed. See license for details. */
#include "hack.h"
Strcpy(whobuf, "\82 \82È\82½");
if (u.usteed)
Strcpy(whobuf, y_monnam(u.usteed));
-#if 0 /*JP*/
+#if 0 /*JP:T*/
pline("%s %s %s into the %s.", upstart(whobuf),
vtense(whobuf, "push"), the(xname(otmp)), what);
#else
if (!fills_up || !pushing) { /* splashing occurs */
if (!u.uinwater) {
if (pushing ? !Blind : cansee(rx, ry)) {
-#if 0 /*JP*/
+#if 0 /*JP:T*/
There("is a large splash as %s %s the %s.",
the(xname(otmp)), fills_up ? "fills" : "falls into",
what);
struct trap *t;
struct monst *mtmp;
struct obj *otmp;
+#if 0 /*JP*//*unused*/
boolean tseen;
int ttyp = NO_TRAP;
+#endif
if (obj->where != OBJ_FREE)
panic("flooreffects: obj not free");
return TRUE;
} else if (obj->otyp == BOULDER && (t = t_at(x, y)) != 0
&& (is_pit(t->ttyp) || is_hole(t->ttyp))) {
+#if 0 /*JP*/
ttyp = t->ttyp;
tseen = t->tseen ? TRUE : FALSE;
+#endif
if (((mtmp = m_at(x, y)) && mtmp->mtrapped)
|| (u.utrap && u.ux == x && u.uy == y)) {
if (*verb && (cansee(x, y) || distu(x, y) == 0))
-#if 0 /*JP*/
+#if 0 /*JP:T*/
pline("%s boulder %s into the pit%s.",
Blind ? "A" : "The",
vtense((const char *) 0, verb),
since trapped target is a sitting duck */
int damage, dieroll = 1;
- /* 3.6.2: this was calling hmon() unconditionally
+ /* As of 3.6.2: this was calling hmon() unconditionally
so always credited/blamed the hero but the boulder
might have been thrown by a giant or launched by
a rolling boulder trap triggered by a monster or
mtmp->mhp -= damage;
if (DEADMONSTER(mtmp)) {
if (canspotmon(mtmp))
-#if 0 /*JP*/
+#if 0 /*JP:T*/
pline("%s is %s!", Monnam(mtmp),
(nonliving(mtmp->data)
|| is_vampshifter(mtmp))
*/
You_hear("\91«\8c³\82Å\89½\82©\82ª\8dÓ\82¯\82é\89¹\82ð\95·\82¢\82½\81D");
} else if (!Blind && cansee(x, y)) {
-#if 0 /*JP*/
+#if 0 /*JP:T*/
pline_The("boulder %s%s.",
(ttyp == TRAPDOOR && !tseen)
? "triggers and " : "",
}
return water_damage(obj, NULL, FALSE) == ER_DESTROYED;
} else if (u.ux == x && u.uy == y && (t = t_at(x, y)) != 0
- && uteetering_at_seen_pit(t)) {
+ && (uteetering_at_seen_pit(t) || uescaped_shaft(t))) {
if (Blind && !Deaf)
/*JP
You_hear("%s tumble downwards.", the(xname(obj)));
You_hear("%s\82ª\89º\82Ì\95û\82Ö\93]\82ª\82Á\82Ä\82¢\82\89¹\82ð\95·\82¢\82½\81D", xname(obj));
else
#if 0 /*JP*/
- pline("%s %s into %s pit.", The(xname(obj)),
- otense(obj, "tumble"), the_your[t->madeby_u]);
+ pline("%s %s into %s %s.", The(xname(obj)),
+ otense(obj, "tumble"), the_your[t->madeby_u],
+ is_pit(t->ttyp) ? "pit" : "hole");
#else
- pline("%s\82Í%s\97\8e\82Æ\82µ\8c\8a\82É\93]\82ª\82è\82¨\82¿\82½\81D", xname(obj),
+ pline("%s\82Í%s\8c\8a\82É\93]\82ª\82è\82¨\82¿\82½\81D", xname(obj),
set_you[t->madeby_u]);
#endif
} else if (obj->globby) {
}
if (obj->blessed || obj->cursed) {
-#if 0 /*JP*/
+#if 0 /*JP:T*/
There("is %s flash as %s %s the altar.",
an(hcolor(obj->blessed ? NH_AMBER : NH_BLACK)), doname(obj),
otense(obj, "hit"));
#else
pline("%s\82ª\8dÕ\92d\82É\90G\82ê\82é\82Æ%s\8cõ\82Á\82½\81D",
doname(obj),
- jconj_adj(hcolor(obj->blessed ? NH_AMBER : NH_BLACK)));
+ hcolor_adv(obj->blessed ? NH_AMBER : NH_BLACK));
#endif
if (!Hallucination)
- obj->bknown = 1;
+ obj->bknown = 1; /* ok to bypass set_bknown() */
} else {
/*JP
pline("%s %s on the altar.", Doname2(obj), otense(obj, "land"));
*/
pline("%s\82ð\8dÕ\92d\82Ì\8fã\82É\92u\82¢\82½\81D", Doname2(obj));
if (obj->oclass != COIN_CLASS)
- obj->bknown = 1;
+ obj->bknown = 1; /* ok to bypass set_bknown() */
}
}
{
uchar sym = S_sink;
boolean sinklooted;
+ int algn;
if (levl[u.ux][u.uy].typ != SINK)
return;
case 2:
sym = S_altar;
levl[u.ux][u.uy].typ = ALTAR;
- levl[u.ux][u.uy].altarmask = Align2amask(rn2((int) A_LAWFUL + 2) - 1);
+ /* 3.6.3: this used to pass 'rn2(A_LAWFUL + 2) - 1' to
+ Align2amask() but that evaluates its argument more than once */
+ algn = rn2(3) - 1; /* -1 (A_Cha) or 0 (A_Neu) or +1 (A_Law) */
+ levl[u.ux][u.uy].altarmask = ((Inhell && rn2(3)) ? AM_NONE
+ : Align2amask(algn));
break;
case 3:
sym = S_room;
if (otmp != uball && otmp != uchain
&& !obj_resists(otmp, 1, 99)) {
if (!Blind) {
-#if 0 /*JP*/
+#if 0 /*JP:T*/
pline("Suddenly, %s %s from the sink!", doname(otmp),
otense(otmp, "vanish"));
#else
pline("\8ew\97Ö\82ª\94r\90\85\8cû\82ð\82·\82é\82è\82Æ\94ð\82¯\82é\82Ì\82ð\8c©\82½\81I");
break;
case RIN_SEE_INVISIBLE:
-#if 0 /*JP*/
+#if 0 /*JP:T*/
You_see("some %s in the sink.",
Hallucination ? "oxygen molecules" : "air");
#else
hcolor((obj->spe < 0) ? NH_BLACK : NH_SILVER));
#else
pline("\97¬\82µ\91ä\82Í\88ê\8fu%s\8bP\82¢\82½\81D",
- jconj_adj(hcolor((obj->spe < 0) ? NH_BLACK : NH_SILVER)));
+ hcolor_adv((obj->spe < 0) ? NH_BLACK : NH_SILVER));
#endif
break;
case RIN_WARNING:
/*JP
pline_The("sink glows %s for a moment.", hcolor(NH_WHITE));
*/
- pline("\97¬\82µ\91ä\82Í\88ê\8fu%s\8bP\82¢\82½\81D", jconj_adj(hcolor(NH_WHITE)));
+ pline("\97¬\82µ\91ä\82Í\88ê\8fu%s\8bP\82¢\82½\81D", hcolor_adv(NH_WHITE));
break;
case RIN_TELEPORT_CONTROL:
/*JP: "beam aboard" \82Í\83X\83^\81[\83g\83\8c\83b\83N\82Ì\81u\93]\91\97\81v*/
if (!strcmp(word, "throw") && obj->quan > 1L)
obj->corpsenm = 1;
#endif
-#if 0 /*JP*/
+#if 0 /*JP:T*/
pline("For some reason, you cannot %s%s the stone%s!", word,
obj->corpsenm ? " any of" : "", plur(obj->quan));
#else
#endif
}
obj->corpsenm = 0; /* reset */
- obj->bknown = 1;
+ set_bknown(obj, 1);
return FALSE;
}
if (obj->otyp == LEASH && obj->leashmon != 0) {
/* doname can call s_suffix, reusing its buffer */
Strcpy(monbuf, s_suffix(mon_nam(u.ustuck)));
onam_p = is_unpaid(obj) ? yobjnam(obj, (char *) 0) : doname(obj);
-#if 0 /*JP*/
+#if 0 /*JP:T*/
You("drop %s into %s %s.", onam_p, monbuf,
mbodypart(u.ustuck, STOMACH));
#else
bypass_objlist(invent, FALSE);
} else {
/* should coordinate with perm invent, maybe not show worn items */
-#if 0 /*JP*/
+#if 0 /*JP:T*/
n = query_objlist("What would you like to drop?", &invent,
(USE_INVLET | INVORDER_SORT), &pick_list, PICK_ANY,
all_categories ? allow_all : allow_category);
*/
You("%s\82Ì\92\86\82É\95\82\82¢\82Ä\82¢\82é\81D", surface(u.ux, u.uy));
else if (Is_waterlevel(&u.uz))
-#if 0 /*JP*/
+#if 0 /*JP:T*/
You("are floating in %s.",
is_pool(u.ux, u.uy) ? "the water" : "a bubble of air");
#else
#endif
return 0; /* didn't move */
}
+
+ if (Upolyd && ceiling_hider(&mons[u.umonnum]) && u.uundetected) {
+ u.uundetected = 0;
+ if (Flying) { /* lurker above */
+/*JP
+ You("fly out of hiding.");
+*/
+ You("\89B\82ê\82é\82Ì\82ð\82â\82ß\82Ä\94ò\82Ñ\8fo\82µ\82½\81D");
+ } else { /* piercer */
+/*JP
+ You("drop to the %s.", surface(u.ux, u.uy));
+*/
+ You("%s\82É\97\8e\82¿\82½\81D", surface(u.ux, u.uy));
+ if (is_pool_or_lava(u.ux, u.uy)) {
+ pooleffects(FALSE);
+ } else {
+ (void) pickup(1);
+ if ((trap = t_at(u.ux, u.uy)) != 0)
+ dotrap(trap, TOOKPLUNGE);
+ }
+ }
+ return 1; /* came out of hiding; might need '>' again to go down */
+ }
+
if (!stairs_down && !ladder_down) {
trap = t_at(u.ux, u.uy);
- if (trap && uteetering_at_seen_pit(trap)) {
+ if (trap && (uteetering_at_seen_pit(trap) || uescaped_shaft(trap))) {
dotrap(trap, TOOKPLUNGE);
return 1;
} else if (!trap || !is_hole(trap->ttyp)
}
if (trap) {
+#if 0 /*JP*/
const char *down_or_thru = trap->ttyp == HOLE ? "down" : "through";
+#endif
#if 0 /*JP*/
const char *actn = Flying ? "fly" : locomotion(youmonst.data, "jump");
#else
if (youmonst.data->msize >= MZ_HUGE) {
char qbuf[QBUFSZ];
-#if 0 /*JP*/
+#if 0 /*JP:T*/
You("don't fit %s easily.", down_or_thru);
Sprintf(qbuf, "Try to squeeze %s?", down_or_thru);
#else
return 0;
}
}
-#if 0 /*JP*/
+#if 0 /*JP:T*/
You("%s %s the %s.", actn, down_or_thru,
trap->ttyp == HOLE ? "hole" : "trap door");
#else
return 0;
}
if (u.ustuck) {
-#if 0 /*JP*/
+#if 0 /*JP:T*/
You("are %s, and cannot go up.",
!u.uswallow ? "being held" : is_animal(u.ustuck->data)
? "swallowed"
}
if (near_capacity() > SLT_ENCUMBER) {
/* No levitation check; inv_weight() already allows for it */
-#if 0 /*JP*/
+#if 0 /*JP:T*/
Your("load is too heavy to climb the %s.",
levl[u.ux][u.uy].typ == STAIRS ? "stairs" : "ladder");
#else
}
savelev(fd, ledger_no(&u.uz),
cant_go_back ? FREE_SAVE : (WRITE_SAVE | FREE_SAVE));
+ /* air bubbles and clouds are saved in game-state rather than with the
+ level they're used on; in normal play, you can't leave and return
+ to any endgame level--bubbles aren't needed once you move to the
+ next level so used to be discarded when the next special level was
+ loaded; but in wizard mode you can leave and return, and since they
+ aren't saved with the level and restored upon return (new ones are
+ created instead), we need to discard them to avoid a memory leak;
+ so bubbles are now discarded as we leave the level they're used on */
+ if (Is_waterlevel(&u.uz) || Is_airlevel(&u.uz))
+ save_waterlevel(-1, FREE_SAVE);
bclose(fd);
if (cant_go_back) {
/* discard unreachable levels; keep #0 */
reseed_random(rn2_on_display_rng);
minit(); /* ZEROCOMP */
getlev(fd, hackpid, new_ledger, FALSE);
+ /* when in wizard mode, it is possible to leave from and return to
+ any level in the endgame; above, we discarded bubble/cloud info
+ when leaving Plane of Water or Air so recreate some now */
+ if (Is_waterlevel(&u.uz) || Is_airlevel(&u.uz))
+ restore_waterlevel(-1);
(void) nhclose(fd);
oinit(); /* reassign level dependent obj probabilities */
}
reglyph_darkroom();
+ u.uinwater = 0;
/* do this prior to level-change pline messages */
vision_reset(); /* clear old level's line-of-sight */
vision_full_recalc = 0; /* don't let that reenable vision yet */
selftouch("\97\8e\82¿\82È\82ª\82ç\81C\82 \82È\82½\82Í");
} else { /* ordinary descent */
if (flags.verbose)
-#if 0 /*JP*/
+#if 0 /*JP:T*/
You("%s.", at_ladder ? "climb down the ladder"
: "descend the stairs");
#else
"You feel like you've been here before.",
*/
"\91O\82É\82±\82±\82É\97\88\82½\82±\82Æ\82ª\82 \82é\82æ\82¤\82È\8bC\82ª\82µ\82½\81D",
-#if 0 /*JP*/
+#if 0 /*JP:T*/
"This place %s familiar...", 0 /* no message */
#else
"\82±\82Ì\8fê\8f\8a\82Í\89ù\82©\82µ\82¢\81D\81D\81D", 0 /* no message */
"You are surrounded by twisty little passages, all alike.",
*/
"\82 \82È\82½\82Í\82Ü\82ª\82è\82\82Ë\82Á\82½\92Ê\98H\82É\82©\82±\82Ü\82ê\82Ä\82¢\82½\81D\81D\81D",
-#if 0 /*JP*/
+#if 0 /*JP:T*/
"Gee, this %s like uncle Conan's place...", 0 /* no message */
#else
"\83Q\81[\81I\83R\83i\83\93\82¨\82¶\82³\82ñ\82Ì\8fê\8f\8a\82É\8e\97\82Ä\82¢\82é\81D\81D\81D", 0 /* no message */
where = corpse->where;
is_uwep = (corpse == uwep);
chewed = (corpse->oeaten != 0);
-#if 0 /*JP*/
+#if 0 /*JP:T*/
Strcpy(cname, corpse_xname(corpse,
chewed ? "bite-covered" : (const char *) 0,
CXN_SINGULAR));
case OBJ_FLOOR:
if (cansee(mtmp->mx, mtmp->my))
-#if 0 /*JP*/
+#if 0 /*JP:T*/
pline("%s rises from the dead!",
chewed ? Adjmonnam(mtmp, "bite-covered")
: Monnam(mtmp));
case OBJ_MINVENT: /* probably a nymph's */
if (cansee(mtmp->mx, mtmp->my)) {
if (canseemon(mcarry))
-#if 0 /*JP*/
+#if 0 /*JP:T*/
pline("Startled, %s drops %s as it revives!",
mon_nam(mcarry), an(cname));
#else
cname, mon_nam(mcarry), cname);
#endif
else
-#if 0 /*JP*/
+#if 0 /*JP:T*/
pline("%s suddenly appears!",
chewed ? Adjmonnam(mtmp, "bite-covered")
: Monnam(mtmp));
yname(container));
} else if (container_where == OBJ_INVENT && container) {
Strcpy(sackname, an(xname(container)));
-#if 0 /*JP*/
+#if 0 /*JP:T*/
pline("%s %s out of %s in your pack!",
Blind ? Something : Amonnam(mtmp),
locomotion(mtmp->data, "writhes"), sackname);
*/
pline("%s\82Í\8fÁ\82¦\82½\81D", monname);
else if (!notice_it && canseemon(mtmp))
-#if 0 /*JP*/
+#if 0 /*JP:T*/
pline("%s appears.", Monnam(mtmp)); /* not pre-rloc monname */
#else
pline("%s\82ª\8c»\82ê\82½\81D", Monnam(mtmp)); /* not pre-rloc monname */
#endif
else if (notice_it && dist2(mtmp->mx, mtmp->my, x, y) > 2)
-#if 0 /*JP*/
+#if 0 /*JP:T*/
pline("%s teleports.", monname); /* saw it and still see it */
#else
pline("%s\82Í\8fu\8aÔ\88Ú\93®\82µ\82½\81D", monname); /* saw it and still see it */
before the final stages and that calls us (how==2) to cure
wounded legs, but we want to suppress the feel better message */
if (!u.usteed && how != 2) {
-#if 0 /*JP*/
+#if 0 /*JP:T*/
const char *legs = body_part(LEG);
if ((EWounded_legs & BOTH_SIDES) == BOTH_SIDES)
OSDN Git Service
