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

pull request #914 - attacks against 'thin air'

Browse Source 
Pull request from entrez:  hand-to-hand attack directed at an unseen
displacer beast could give strange feedback if it and hero swapped
places.
This commit is contained in:
PatR
2022-10-29 15:16:09 -07:00
parent 99a93fe50b 671f68fe98
commit 7c8afb3228
1 changed files with 8 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/hack.c
View File

@@ -1906,7 +1906,7 @@ domove_fight_empty(coordxy x, coordxy y)
/* specifying 'F' with no monster wastes a turn */ /* specifying 'F' with no monster wastes a turn */
if (g.context.forcefight if (g.context.forcefight
/* remembered an 'I' && didn't use a move command */ /* remembered an 'I' && didn't use a move command */
|| (glyph_is_invisible(glyph) && !g.context.nopick)) { || (glyph_is_invisible(glyph) && !m_at(x, y) && !g.context.nopick)) {
struct obj *boulder = 0; struct obj *boulder = 0;
boolean explo = (Upolyd && attacktype(g.youmonst.data, AT_EXPL)), boolean explo = (Upolyd && attacktype(g.youmonst.data, AT_EXPL)),
solid = (off_edge || (!accessible(x, y) solid = (off_edge || (!accessible(x, y)
@@ -2444,6 +2444,9 @@ domove_core(void)
} }
if (displaceu && mtmp) { if (displaceu && mtmp) {
boolean noticed_it = (canspotmon(mtmp) || glyph_is_invisible(glyph)
|| glyph_is_warning(glyph));
remove_monster(u.ux, u.uy); remove_monster(u.ux, u.uy);
place_monster(mtmp, u.ux0, u.uy0); place_monster(mtmp, u.ux0, u.uy0);
newsym(u.ux, u.uy); newsym(u.ux, u.uy);
@@ -2451,7 +2454,10 @@ domove_core(void)
/* monst still knows where hero is */ /* monst still knows where hero is */
mtmp->mux = u.ux, mtmp->muy = u.uy; mtmp->mux = u.ux, mtmp->muy = u.uy;
pline("%s swaps places with you...", Monnam(mtmp)); pline("%s swaps places with you...",
!noticed_it ? Something : Monnam(mtmp));
if (!canspotmon(mtmp))
map_invisible(u.ux0, u.uy0);
/* monster chose to swap places; hero doesn't get any credit /* monster chose to swap places; hero doesn't get any credit
or blame if something bad happens to it */ or blame if something bad happens to it */
g.context.mon_moving = 1; g.context.mon_moving = 1;