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

Apply a wielded polearm with fire-command

Browse Source 
Wield a polearm and use 'f'ire to automatically hit with it,
if there's a single valid target.
With fireassist-option, will swapweapon to a polearm.
This only applies if quiver is empty and autoquiver is off.
This commit is contained in:
Pasi Kallinen
2021-12-29 19:40:23 +02:00
parent 3536ede5bd
commit fa41d5fe66
6 changed files with 38 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
src/dothrow.c
View File

@@ -417,7 +417,7 @@ find_launcher(struct obj *ammo)
return (struct obj *)0;
}
/* f command -- fire: throw from the quiver */
/* f command -- fire: throw from the quiver or use wielded polearm */
int
dofire(void)
{
@@ -445,8 +445,21 @@ dofire(void)
if (!flags.autoquiver) {
if (uwep && AutoReturn(uwep, uwep->owornmask))
obj = uwep;
else
You("have no ammunition readied.");
else {
/* if we're wielding a polearm, apply it */
if (uwep && is_pole(uwep))
return use_pole(uwep, TRUE);
else if (iflags.fireassist
&& uswapwep && is_pole(uswapwep)
&& !(uswapwep->cursed && uswapwep->bknown)) {
/* we have a known not-cursed polearm as swap weapon.
swap to it and retry */
cmdq_add_ec(doswapweapon);
cmdq_add_ec(dofire);
return 0;
} else
You("have no ammunition readied.");
}
} else {
autoquiver();
if ((obj = uquiver) == 0)