gamelog: hit with wielded weapon for first time

Reordering "killed for the first time" and "hit with a wielded weapon
for the first time" was done by moving the latter to hmon().  Hitting
with an applied polearm also gave the first-hit message since it
bypassed the routine that had been doing so.  But the throwing code
that handles applied polearms calls hmon() for damage, so after that
reordering, the first-hit log message became duplicated if triggered
by polearm usage.

Also, fix a quibble with the wizard mode conduct message given after
never-hit-with-wielded-weapon conduct has been broken.  The message
said "used a wielded weapon N times" when it meant "hit with a wielded
weapon N times".  "Used" is misleading if that wielded weapon happens
to be a pick-axe, so change the message to say "hit with".
This commit is contained in:
PatR
2022-02-19 11:24:28 -08:00
parent 70dafd658d
commit e972d0b965
3 changed files with 14 additions and 8 deletions

View File

@@ -1,4 +1,4 @@
NHDT-Branch: NetHack-3.7 $:$NHDT-Revision: 1.799 $ $NHDT-Date: 1645223893 2022/02/18 22:38:13 $
NHDT-Branch: NetHack-3.7 $:$NHDT-Revision: 1.806 $ $NHDT-Date: 1645298657 2022/02/19 19:24:17 $
General Fixes and Modified Features
-----------------------------------
@@ -1028,6 +1028,9 @@ when trapeffect_selector() returns 2 to caller mintrap(), meant to signify
returns that value too
have com_pager() check for failed nhl_init(); probably can't actually happen
because the program would never get that far if lua init was failing
rearranging first-kill and first-hit gamelog messages to get hit before kill
ordering resulted in "hit with a wielded weapon for first time" being
given twice if that hit was delivered via applied polearm
curses: 'msg_window' option wasn't functional for curses unless the binary
also included tty support