Allow nurses heal attack when wielding a non-weapon/weaptool
This matches the nurses' hitting behavior with their chatting messages. Chatting to them suggested that the heal attack would happen but the check in mhitu.c was just for wielding anything. This opens up the possibility of a YAFM in MS_NURSE when wielding something that allos the heal attack to proceed. But I couldn't come up with a good one.
This commit is contained in:
@@ -157,6 +157,7 @@ monster or object detection found semi-dead vault guard at <0,0> while
|
||||
monsters on level; likewise object detection and guard's minvent
|
||||
squadprob[] in mkroom.c was defined with 5 elements but initialized only 4
|
||||
resulting in giant ants sometimes
|
||||
allow nurses heal attack when wielding a non-weapon/weaptool
|
||||
|
||||
|
||||
Fixes to 3.7.0-x Problems that Were Exposed Via git Repository
|
||||
|
||||
@@ -1508,7 +1508,9 @@ register struct attack *mattk;
|
||||
hitmsg(mtmp, mattk);
|
||||
break;
|
||||
}
|
||||
if (!uwep && !uarmu && !uarm && !uarmc
|
||||
/* weapon check should match the one in sounds.c for MS_NURSE */
|
||||
if (!(uwep && (uwep->oclass == WEAPON_CLASS || is_weptool(uwep)))
|
||||
&& !uarmu && !uarm && !uarmc
|
||||
&& !uarms && !uarmg && !uarmf && !uarmh) {
|
||||
boolean goaway = FALSE;
|
||||
|
||||
|
||||
Reference in New Issue
Block a user