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

dwarf + pick-axe feedback

Browse Source 
When you see a dwarf wield a pick-axe,
|The dwarf wields a pick-axe!
avoid the exclamation point if that dwarf just intends to dig.
|The dwarf wields a pick-axe.
This commit is contained in:
PatR
2022-07-29 16:11:35 -07:00
parent 34db0b0dd3
commit a6d85f9d36
1 changed files with 6 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/weapon.c
+6 -1
View File
@@ -746,6 +746,7 @@ int
mon_wield_item(struct monst *mon) mon_wield_item(struct monst *mon)
{ {
struct obj *obj; struct obj *obj;
boolean exclaim = TRUE; /* assume mon is planning to attack */
/* This case actually should never happen */ /* This case actually should never happen */
if (mon->weapon_check == NO_WEAPON_WANTED) if (mon->weapon_check == NO_WEAPON_WANTED)
@@ -763,12 +764,14 @@ mon_wield_item(struct monst *mon)
/* KMH -- allow other picks */ /* KMH -- allow other picks */
if (!obj && !which_armor(mon, W_ARMS)) if (!obj && !which_armor(mon, W_ARMS))
obj = m_carrying(mon, DWARVISH_MATTOCK); obj = m_carrying(mon, DWARVISH_MATTOCK);
exclaim = FALSE; /* mon is just planning to dig */
break; break;
case NEED_AXE: case NEED_AXE:
/* currently, only 2 types of axe */ /* currently, only 2 types of axe */
obj = m_carrying(mon, BATTLE_AXE); obj = m_carrying(mon, BATTLE_AXE);
if (!obj || which_armor(mon, W_ARMS)) if (!obj || which_armor(mon, W_ARMS))
obj = m_carrying(mon, AXE); obj = m_carrying(mon, AXE);
exclaim = FALSE;
break; break;
case NEED_PICK_OR_AXE: case NEED_PICK_OR_AXE:
/* prefer pick for fewer switches on most levels */ /* prefer pick for fewer switches on most levels */
@@ -780,6 +783,7 @@ mon_wield_item(struct monst *mon)
if (!obj) if (!obj)
obj = m_carrying(mon, AXE); obj = m_carrying(mon, AXE);
} }
exclaim = FALSE;
break; break;
default: default:
impossible("weapon_check %d for %s?", mon->weapon_check, impossible("weapon_check %d for %s?", mon->weapon_check,
@@ -829,7 +833,8 @@ mon_wield_item(struct monst *mon)
if (canseemon(mon)) { if (canseemon(mon)) {
boolean newly_welded; boolean newly_welded;
pline("%s wields %s!", Monnam(mon), doname(obj)); pline("%s wields %s%c", Monnam(mon), doname(obj),
exclaim ? '!' : '.');
/* 3.6.3: mwelded() predicate expects the object to have its /* 3.6.3: mwelded() predicate expects the object to have its
W_WEP bit set in owormmask, but the pline here and for W_WEP bit set in owormmask, but the pline here and for
artifact_light don't want that because they'd have '(weapon artifact_light don't want that because they'd have '(weapon