-/* NetHack 3.6 detect.c $NHDT-Date: 1544437284 2018/12/10 10:21:24 $ $NHDT-Branch: NetHack-3.6.2-beta01 $:$NHDT-Revision: 1.91 $ */
+/* NetHack 3.6 detect.c $NHDT-Date: 1575245054 2019/12/02 00:04:14 $ $NHDT-Branch: NetHack-3.6 $:$NHDT-Revision: 1.100 $ */
/* Copyright (c) Stichting Mathematisch Centrum, Amsterdam, 1985. */
/*-Copyright (c) Robert Patrick Rankin, 2018. */
/* 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"
*/
"\82 \82È\82½\82Í\8f«\97\88\82Ì\8co\8dÏ\8fó\8bµ\82ª\90S\94z\82É\82È\82Á\82½\81D");
else if (steedgold)
-#if 0 /*JP*/
+#if 0 /*JP:T*/
Sprintf(buf, "You feel interested in %s financial situation.",
s_suffix(x_monnam(u.usteed,
u.usteed->mtame ? ARTICLE_YOUR
You("%s\82Ì\8aÔ\82É\8bà\89Ý\82ª\97\8e\82¿\82Ä\82¢\82é\82±\82Æ\82É\8bC\82ª\82Â\82¢\82½\81D", body_part(FOOT));
return 0;
-outgoldmap:
+ outgoldmap:
cls();
(void) unconstrain_map();
}
if (sobj) {
if (sobj->blessed) {
-#if 0 /*JP*/
+#if 0 /*JP:T*/
Your("%s %s to tingle and you smell %s.", body_part(NOSE),
u.uedibility ? "continues" : "starts", what);
#else
}
/* Special boulder symbol check - does the class symbol happen
- * to match iflags.bouldersym which is a user-defined?
+ * to match showsyms[SYM_BOULDER + SYM_OFF_X] which is user-defined.
* If so, that means we aren't sure what they really wanted to
* detect. Rather than trump anything, show both possibilities.
* We can exclude checking the buried obj chain for boulders below.
*/
sym = class ? def_oc_syms[class].sym : 0;
- if (sym && iflags.bouldersym && sym == iflags.bouldersym)
+ if (sym && showsyms[SYM_BOULDER + SYM_OFF_X] && sym == showsyms[SYM_BOULDER + SYM_OFF_X])
boulder = ROCK_CLASS;
if (Hallucination || (Confusion && class == SCROLL_CLASS))
Your("%s\82Í\82Þ\82¸\82Þ\82¸\82µ\82½\81D", makeplural(body_part(TOE)));
return 0;
-outtrapmap:
+ outtrapmap:
cls();
(void) unconstrain_map();
/*JP
return "far away";
*/
- return "\82Í\82é\82©\94Þ\95û\82É";
+ return "\82Í\82é\82©\94Þ\95û\82É";
else
/*JP
return "far below";
*/
- return "\82Í\82é\82©\89º\95û\82É";
+ return "\82Í\82é\82©\89º\95û\82É";
else if (ll < -1)
if (!indun)
/*JP
return "away below you";
*/
- return "\82¸\82Á\82Æ\89º\95û\82É";
+ return "\82¸\82Á\82Æ\89º\95û\82É";
else
/*JP
return "below you";
*/
- return "\89º\95û\82É";
+ return "\89º\95û\82É";
else if (!indun)
/*JP
return "in the distance";
*/
- return "\89\93\82\82É";
+ return "\89\93\82\82É";
else
/*JP
return "just below";
*/
- return "\90^\89º\82É";
+ return "\90^\89º\82É";
} else if (ll > 0) {
if (ll > (8 + rn2(3)))
if (!indun)
/*JP
return "far away";
*/
- return "\82Í\82é\82©\94Þ\95û\82É";
+ return "\82Í\82é\82©\94Þ\95û\82É";
else
/*JP
return "far above";
*/
- return "\82Í\82é\82©\8fã\95û\82É";
+ return "\82Í\82é\82©\8fã\95û\82É";
else if (ll > 1)
if (!indun)
/*JP
return "away above you";
*/
- return "\82¸\82Á\82Æ\8fã\95û\82É";
+ return "\82¸\82Á\82Æ\8fã\95û\82É";
else
/*JP
return "above you";
*/
- return "\8fã\95û\82É";
+ return "\8fã\95û\82É";
else if (!indun)
/*JP
return "in the distance";
*/
- return "\89\93\82\82É";
+ return "\89\93\82\82É";
else
/*JP
return "just above";
*/
- return "\90^\8fã\82É";
+ return "\90^\8fã\82É";
} else if (!indun)
/*JP
return "in the distance";
*/
- return "\89\93\82\82É";
+ return "\89\93\82\82É";
else
/*JP
return "near you";
*/
- return "\8bß\82\82É";
+ return "\8bß\82\82É";
}
static const struct {
You("\8cu\8cõ\8aâ\82Ì\8fã\82ð\8bà\8b\9b\82ª\89j\82¢\82Å\82¢\82é\82Ì\82ð\8c©\82½\81D");
break;
case 5:
-#if 0 /*JP*/
+#if 0 /*JP:T*/
You_see(
"tiny snowflakes spinning around a miniature farmhouse.");
#else
ret = object_detect((struct obj *) 0, class);
else if ((class = def_char_to_monclass(ch)) != MAXMCLASSES)
ret = monster_detect((struct obj *) 0, class);
- else if (iflags.bouldersym && (ch == iflags.bouldersym))
+ else if (showsyms[SYM_BOULDER + SYM_OFF_X]
+ && (ch == showsyms[SYM_BOULDER + SYM_OFF_X]))
ret = object_detect((struct obj *) 0, ROCK_CLASS);
else
switch (ch) {
if (!level.flags.hero_memory || unconstrained) {
flush_screen(1); /* flush temp screen */
/* browse_map() instead of display_nhwindow(WIN_MAP, TRUE) */
-#if 0 /*JP*/
+#if 0 /*JP:T*/
browse_map(TER_DETECT | TER_MAP | TER_TRP | TER_OBJ,
"anything of interest");
#else
* Unlike when casting the spell, it is much too intrustive when
* in the midst of walking around or combatting monsters.
*
- * For 3.6.2, show terrain, then object, then monster like regular
+ * As of 3.6.2, show terrain, then object, then monster like regular
* map updating, except in this case the map locations get marked
* as seen from every direction rather than just from direction of
* hero. Skilled spell marks revealed objects as 'seen up close'
continue;
newglyph = glyph_at(zx, zy);
if (glyph_is_monster(newglyph)
- && glyph_to_mon(newglyph) != PM_LONG_WORM_TAIL)
- map_invisible(zx, zy);
+ && glyph_to_mon(newglyph) != PM_LONG_WORM_TAIL) {
+ /* map_invisible() was unconditional here but that made
+ remembered objects be forgotten for the case where a
+ monster is immediately redrawn by see_monsters() */
+ if ((mtmp = m_at(zx, zy)) == 0 || !canspotmon(mtmp))
+ map_invisible(zx, zy);
+ }
}
see_monsters();
lev->doormask = newmask;
}
+/* find something at one location; it should find all somethings there
+ since it is used for magical detection rather than physical searching */
STATIC_PTR void
findone(zx, zy, num)
int zx, zy;
register struct trap *ttmp;
register struct monst *mtmp;
+ /*
+ * This used to use if/else-if/else-if/else/end-if but that only
+ * found the first hidden thing at the location. Two hidden things
+ * at the same spot is uncommon, but it's possible for an undetected
+ * monster to be hiding at the location of an unseen trap.
+ */
+
if (levl[zx][zy].typ == SDOOR) {
cvt_sdoor_to_door(&levl[zx][zy]); /* .typ = DOOR */
magic_map_background(zx, zy, 0);
magic_map_background(zx, zy, 0);
newsym(zx, zy);
(*(int *) num)++;
- } else if ((ttmp = t_at(zx, zy)) != 0) {
- if (!ttmp->tseen && ttmp->ttyp != STATUE_TRAP) {
- ttmp->tseen = 1;
- newsym(zx, zy);
- (*(int *) num)++;
- }
- } else if ((mtmp = m_at(zx, zy)) != 0) {
+ }
+
+ if ((ttmp = t_at(zx, zy)) != 0 && !ttmp->tseen
+ /* [shouldn't successful 'find' reveal and activate statue traps?] */
+ && ttmp->ttyp != STATUE_TRAP) {
+ ttmp->tseen = 1;
+ newsym(zx, zy);
+ (*(int *) num)++;
+ }
+
+ if ((mtmp = m_at(zx, zy)) != 0
+ /* brings hidden monster out of hiding even if already sensed */
+ && (!canspotmon(mtmp) || mtmp->mundetected || M_AP_TYPE(mtmp))) {
if (M_AP_TYPE(mtmp)) {
seemimic(mtmp);
(*(int *) num)++;
- }
- if (mtmp->mundetected
- && (is_hider(mtmp->data) || mtmp->data->mlet == S_EEL)) {
+ } else if (mtmp->mundetected && (is_hider(mtmp->data)
+ || hides_under(mtmp->data)
+ || mtmp->data->mlet == S_EEL)) {
mtmp->mundetected = 0;
newsym(zx, zy);
(*(int *) num)++;
*/
b_trapped("\94à", 0);
else
-#if 0 /*JP*/
+#if 0 /*JP:T*/
Norep("You %s an explosion!",
cansee(zx, zy) ? "see" : (!Deaf ? "hear"
: "feel the shock of"));
/* The "Hallucination ||" is to preserve 3.6.1 behaviour, but this
behaviour might need a rework in the hallucination case
- (e.g. to not prompt if any trap glyph appears on the
- square). */
+ (e.g. to not prompt if any trap glyph appears on the square). */
if (Hallucination ||
levl[trap->tx][trap->ty].glyph !=
trap_to_glyph(trap, rn2_on_display_rng)) {
if (M_AP_TYPE(mtmp)) {
seemimic(mtmp);
found_something = TRUE;
- } else if (!canspotmon(mtmp)) {
- if (mtmp->mundetected
- && (is_hider(mtmp->data) || mtmp->data->mlet == S_EEL)) {
+ } else {
+ /* this used to only be executed if a !canspotmon() test passed
+ but that failed to bring sensed monsters out of hiding */
+ found_something = !canspotmon(mtmp);
+ if (mtmp->mundetected && (is_hider(mtmp->data)
+ || hides_under(mtmp->data)
+ || mtmp->data->mlet == S_EEL)) {
if (via_warning) {
-#if 0 /*JP*/
+#if 0 /*JP:T*/
Your("warning senses cause you to take a second %s.",
Blind ? "to check nearby" : "look close by");
#else
display_nhwindow(WIN_MESSAGE, FALSE); /* flush messages */
}
mtmp->mundetected = 0;
+ found_something = TRUE;
}
newsym(x, y);
- found_something = TRUE;
}
if (found_something) {
if (!canspotmon(mtmp)) {
map_invisible(x, y);
/*JP
- You_feel("an unseen monster!");
+ You_feel("an unseen monster!");
*/
- You("\8c©\82¦\82È\82¢\89ö\95¨\82Ì\8bC\94z\82ð\8a´\82¶\82½\81I");
+ You("\8c©\82¦\82È\82¢\89ö\95¨\82Ì\8bC\94z\82ð\8a´\82¶\82½\81I");
} else if (!sensemon(mtmp)) {
#if 0 /*JP:T*/
You("find %s.", mtmp->mtame ? y_monnam(mtmp) : a_monnam(mtmp));
glyph = reveal_terrain_getglyph(x, y, FALSE, u.uswallow,
default_glyph, subset);
- (void) mapglyph(glyph, &ch, &color, &special, x, y);
+ (void) mapglyph(glyph, &ch, &color, &special, x, y, 0);
buf[x - 1] = ch;
if (ch != ' ') {
blankrow = FALSE;
/* allow player to move cursor around and get autodescribe feedback
based on what is visible now rather than what is on 'real' map */
which_subset |= TER_MAP; /* guarantee non-zero */
+/*JP
browse_map(which_subset, "anything of interest");
+*/
+ browse_map(which_subset, "\8aÖ\90S\82Ì\82 \82é\82à\82Ì");
reconstrain_map();
docrt(); /* redraw the screen, restoring regular map */
OSDN Git Service
