"no monster to remove" for steed knockback

Reported directly to devteam, mounted hero whose steed got hit
for knockback effect triggered impossible "no monster to remove".

In addition to fixing that, this makes a knockback attempt at a
hero who is stuck to a cursed saddle knock the hero and steed back
instead of knocking the hero out of the saddle.

mhurtle_step() should be able to use u.ux0,u.uy0 to update the
hero's old location after moving the hero in order to move the
steed, but the value was different from what was expected and the
map showed stale steed symbol when I used that.  I'm not sure what
is going on there; saving u.ux,u.uy before moving the hero worked
as intended so I didn't pursue it.

diff --git a/doc/fixes3-7-0.txt b/doc/fixes3-7-0.txt
index 7601c87cab72dfbba89945fde9a7eee1832774f3..4acfaef45fec07d9f8feb9cf9088f159a91271a7 100644 (file)
--- a/doc/fixes3-7-0.txt
+++ b/doc/fixes3-7-0.txt
@@ -1,4 +1,4 @@
-HDT-Branch: NetHack-3.7 $:$NHDT-Revision: 1.1048 $ $NHDT-Date: 1664739714 2022/10/02 19:41:54 $
+HDT-Branch: NetHack-3.7 $:$NHDT-Revision: 1.1049 $ $NHDT-Date: 1664966382 2022/10/05 10:39:42 $
 
 General Fixes and Modified Features
 -----------------------------------
@@ -1406,6 +1406,8 @@ tipping contents of one container directly into another allowed transferring
        wands of cancellation and bags of holding or tricks that were inside
        a sack, box, or chest into a bag of holding without blowing it up
 prevent random traps from being created inside the shops in the tourist quest
+if hero's steed got hit by knockback effect, impossible "no monster to remove"
+       would occur (plus more warnings if 'sanity_check' was On)
 
 curses: 'msg_window' option wasn't functional for curses unless the binary
        also included tty support

diff --git a/src/dothrow.c b/src/dothrow.c
index bdf78ef5c8fed645195533a85625508a9b3eaa49..2f159d5700da11054daea9def62471e0baab4aff 100644 (file)
--- a/src/dothrow.c
+++ b/src/dothrow.c
@@ -1,4 +1,4 @@
-/* NetHack 3.7 dothrow.c       $NHDT-Date: 1645298658 2022/02/19 19:24:18 $  $NHDT-Branch: NetHack-3.7 $:$NHDT-Revision: 1.217 $ */
+/* NetHack 3.7 dothrow.c       $NHDT-Date: 1664966382 2022/10/05 10:39:42 $  $NHDT-Branch: NetHack-3.7 $:$NHDT-Revision: 1.249 $ */
 /* Copyright (c) Stichting Mathematisch Centrum, Amsterdam, 1985. */
 /*-Copyright (c) Robert Patrick Rankin, 2013. */
 /* NetHack may be freely redistributed.  See license for details. */
@@ -955,10 +955,22 @@ mhurtle_step(genericptr_t arg, coordxy x, coordxy y)
         && m_in_out_region(mon, x, y)) {
         int res;
 
-        remove_monster(mon->mx, mon->my);
-        newsym(mon->mx, mon->my);
-        place_monster(mon, x, y);
-        newsym(mon->mx, mon->my);
+        if (mon != u.usteed) {
+            remove_monster(mon->mx, mon->my);
+            newsym(mon->mx, mon->my);
+            place_monster(mon, x, y);
+            newsym(mon->mx, mon->my);
+        } else {
+            /* steed is hurtling, move hero which will also move steed */
+            coordxy oldx = u.ux, oldy = u.uy;
+
+            u_on_newpos(x, y);
+            /* for some reason u.ux0,u.uy0 haven't been reliable here */
+            newsym(oldx, oldy); /* update old position */
+            vision_recalc(0); /* new location => different lines of sight */
+        }
+        flush_screen(1);
+        delay_output();
         set_apparxy(mon);
         if (is_waterwall(x, y))
             return FALSE;
@@ -967,9 +979,6 @@ mhurtle_step(genericptr_t arg, coordxy x, coordxy y)
             || res == Trap_Caught_Mon
             || res == Trap_Moved_Mon)
             return FALSE;
-
-        flush_screen(1);
-        delay_output();
         return TRUE;
     }
     if ((mtmp = m_at(x, y)) != 0) {

diff --git a/src/uhitm.c b/src/uhitm.c
index cb369e0f372a06235d4b9804d5650bd17bdb2849..ea6449e6777961b5e7f1e513d6683808d3f91ac4 100644 (file)
--- a/src/uhitm.c
+++ b/src/uhitm.c
@@ -1,4 +1,4 @@
-/* NetHack 3.7 uhitm.c $NHDT-Date: 1664837605 2022/10/03 22:53:25 $  $NHDT-Branch: NetHack-3.7 $:$NHDT-Revision: 1.364 $ */
+/* NetHack 3.7 uhitm.c $NHDT-Date: 1664966387 2022/10/05 10:39:47 $  $NHDT-Branch: NetHack-3.7 $:$NHDT-Revision: 1.365 $ */
 /* Copyright (c) Stichting Mathematisch Centrum, Amsterdam, 1985. */
 /*-Copyright (c) Robert Patrick Rankin, 2012. */
 /* NetHack may be freely redistributed.  See license for details. */
@@ -4611,13 +4611,23 @@ mhitm_knockback(
     int *hitflags,        /* modified if magr or mdef dies */
     boolean weapon_used)  /* True: via weapon hit */
 {
+    struct obj *otmp;
     boolean u_agr = (magr == &g.youmonst);
     boolean u_def = (mdef == &g.youmonst);
+    boolean was_u = FALSE;
 
     /* 1/6 chance of attack knocking back a monster */
     if (rn2(6))
         return FALSE;
 
+    /* if hero is stuck to a cursed saddle, knock the steed back */
+    if (u_def && u.usteed
+        && (otmp = which_armor(u.usteed, W_SADDLE)) != 0 && otmp->cursed) {
+        mdef = u.usteed;
+        was_u = TRUE;
+        u_def = FALSE;
+    }
+
     /* monsters must be alive */
     if ((!u_agr && DEADMONSTER(magr))
         || (!u_def && DEADMONSTER(mdef)))
@@ -4650,22 +4660,23 @@ mhitm_knockback(
 
     /* give the message */
     if (u_def || canseemon(mdef)) {
+        char magrbuf[BUFSZ], mdefbuf[BUFSZ];
         boolean dosteed = u_def && u.usteed;
 
+        Strcpy(magrbuf, u_agr ? "You" : Monnam(magr));
+        Strcpy(mdefbuf, (u_def || was_u) ? "you" : y_monnam(mdef));
+        if (was_u)
+            Snprintf(eos(mdefbuf), sizeof mdefbuf - strlen(mdefbuf),
+                     " and %s", y_monnam(u.usteed));
         /*
          * uhitm: You knock the gnome back with a powerful blow!
          * mhitu: The red dragon knocks you back with a forceful blow!
          * mhitm: The fire giant knocks the gnome back with a forceful strike!
-         *
-         * TODO?  if saddle is cursed, knock both hero and steed back?
          */
-        pline("%s knock%s %s %s with a %s %s!",
-              u_agr ? "You" : Monnam(magr),
-              u_agr ? "" : "s",
-              u_def ? "you" : y_monnam(mdef),
+        pline("%s %s %s %s with a %s %s!",
+              magrbuf, vtense(magrbuf, "knock"), mdefbuf,
               dosteed ? "out of your saddle" : "back",
-              rn2(2) ? "forceful" : "powerful",
-              rn2(2) ? "blow" : "strike");
+              rn2(2) ? "forceful" : "powerful", rn2(2) ? "blow" : "strike");
     } else if (u_agr) {
         /* hero knocks unseen foe back; noticed by touch */
         You("knock %s back!", some_mon_nam(mdef));
@@ -4678,6 +4689,7 @@ mhitm_knockback(
         else
             hurtle(u.ux - magr->mx, u.uy - magr->my, rnd(2), FALSE);
 
+        set_apparxy(magr); /* update magr's idea of where you are */
         if (!rn2(4))
             make_stunned((HStun & TIMEOUT) + (long) rnd(2) + 1L, TRUE);
     } else {
@@ -4685,10 +4697,15 @@ mhitm_knockback(
         coordxy y = u_agr ? u.uy : magr->my;
 
         mhurtle(mdef, mdef->mx - x, mdef->my - y, rnd(2));
-        if (DEADMONSTER(mdef))
+        if (DEADMONSTER(mdef) && !was_u) {
             *hitflags |= MM_DEF_DIED;
-        else if (!rn2(4))
+        } else if (!rn2(4)) {
             mdef->mstun = 1;
+            /* if steed and hero were knocked back, update attacker's idea
+               of where hero is */
+            if (mdef == u.usteed)
+                set_apparxy(magr);
+        }
     }
     if (!u_agr) {
         if (DEADMONSTER(magr))