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

Add assistance to fire-command

Browse Source 
Allows the fire-command to autowield a launcher; it will now
do either swapweapon or wield an appropriate launcher, if you
have ammo quivered.

This assistance can be turned off with the fireassist boolean option.

Adds a rudimentary command queue, which allows the code to add keys
or extended commands into the queue, and they're executed as if
the user did them.  Time passes normally when doing the queue,
and the queue will get cleared if hero is interrupted.
This commit is contained in:
Pasi Kallinen
2021-06-09 09:02:31 +03:00
parent f6e60c7516
commit 76f77ee0cc
15 changed files with 253 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
src/dothrow.c
View File

@@ -11,6 +11,7 @@ static int throw_obj(struct obj *, int);
static boolean ok_to_throw(int *);
static int throw_ok(struct obj *);
static void autoquiver(void);
static struct obj *find_launcher(struct obj *);
static int gem_accept(struct monst *, struct obj *);
static void tmiss(struct obj *, struct monst *, boolean);
static int throw_gold(struct obj *);
@@ -399,6 +400,23 @@ autoquiver(void)
return;
}
/* look through hero inventory for launcher matching ammo,
avoiding known cursed items. Returns NULL if no match. */
static struct obj *
find_launcher(struct obj *ammo)
{
struct obj *otmp;
if (!ammo)
return (struct obj *)0;
for (otmp = g.invent; otmp; otmp = otmp->nobj)
if (ammo_and_launcher(ammo, otmp) && !(otmp->cursed && otmp->bknown))
return otmp;
return (struct obj *)0;
}
/* f command -- fire: throw from the quiver */
int
dofire(void)
@@ -454,6 +472,28 @@ dofire(void)
}
}
if (uquiver && iflags.fireassist) {
struct obj *olauncher;
/* Try to find a launcher */
if (ammo_and_launcher(uquiver, uwep)) {
/* Do nothing, already wielding a launcher */
} else if (ammo_and_launcher(uquiver, uswapwep)) {
/* swap weapons and retry fire */
cmdq_add_ec(doswapweapon);
cmdq_add_ec(dofire);
return 0;
} else if ((olauncher = find_launcher(obj)) != 0) {
/* wield launcher, retry fire */
if (uwep && !flags.pushweapon)
cmdq_add_ec(doswapweapon);
cmdq_add_ec(dowield);
cmdq_add_key(olauncher->invlet);
cmdq_add_ec(dofire);
return 0;
}
}
return obj ? throw_obj(obj, shotlimit) : 0;
}