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

Remember position of monster you hit with polearm

Browse Source 
If you hit a monster with a polearm, following polearm applications
will try to automatically suggest the monster's position
This commit is contained in:
Pasi Kallinen
2015-03-27 23:29:30 +02:00
parent 5c87641985
commit 5bb4a02ffe
8 changed files with 31 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/apply.c
View File

@@ -2539,6 +2539,7 @@ use_pole(obj)
int res = 0, typ, max_range, min_range, glyph;
coord cc;
struct monst *mtmp;
struct monst *hitm = context.polearm.hitmon;
/* Are you allowed to use the pole? */
if (u.uswallow) {
@@ -2553,8 +2554,13 @@ use_pole(obj)
/* Prompt for a location */
pline(where_to_hit);
cc.x = u.ux;
cc.y = u.uy;
if (hitm && !DEADMONSTER(hitm) && cansee(hitm->mx, hitm->my)) {
cc.x = hitm->mx;
cc.y = hitm->my;
} else {
cc.x = u.ux;
cc.y = u.uy;
}
if (getpos(&cc, TRUE, "the spot to hit") < 0)
return res; /* ESC; uses turn iff polearm became wielded */
@@ -2596,11 +2602,13 @@ use_pole(obj)
return res;
}
context.polearm.hitmon = NULL;
/* Attack the monster there */
bhitpos = cc;
if ((mtmp = m_at(bhitpos.x, bhitpos.y)) != (struct monst *)0) {
if (attack_checks(mtmp, uwep)) return res;
if (overexertion()) return 1; /* burn nutrition; maybe pass out */
context.polearm.hitmon = mtmp;
check_caitiff(mtmp);
notonhead = (bhitpos.x != mtmp->mx || bhitpos.y != mtmp->my);
(void) thitmonst(mtmp, uwep);