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

Automatically find monster to target with polearm

Browse Source 
If there's only one suitable monster within range, automatically
suggest it for targeting with the polearm
This commit is contained in:
Pasi Kallinen
2015-03-28 00:32:54 +02:00
parent 5bb4a02ffe
commit 13645dcd2a
1 changed files with 37 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

51
src/apply.c
View File

@@ -2531,6 +2531,28 @@ static const char
cant_see_spot[] = "won't hit anything if you can't see that spot.", cant_see_spot[] = "won't hit anything if you can't see that spot.",
cant_reach[] = "can't reach that spot from here."; cant_reach[] = "can't reach that spot from here.";
/* find pos of monster in range, if only one monster */
boolean
find_poleable_mon(pos, min_range, max_range)
coord *pos;
int min_range, max_range;
{
struct monst *mtmp;
struct monst *selmon = NULL;
for (mtmp = fmon; mtmp; mtmp = mtmp->nmon)
if (mtmp && !DEADMONSTER(mtmp) && !mtmp->mtame &&
cansee(mtmp->mx, mtmp->my) &&
distu(mtmp->mx, mtmp->my) <= max_range &&
distu(mtmp->mx, mtmp->my) >= min_range) {
if (selmon) return FALSE;
selmon = mtmp;
}
if (!selmon) return FALSE;
pos->x = selmon->mx;
pos->y = selmon->my;
return TRUE;
}
/* Distance attacks by pole-weapons */ /* Distance attacks by pole-weapons */
STATIC_OVL int STATIC_OVL int
use_pole(obj) use_pole(obj)
@@ -2552,20 +2574,7 @@ use_pole(obj)
} }
/* assert(obj == uwep); */ /* assert(obj == uwep); */
/* Prompt for a location */ /*
pline(where_to_hit);
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 */
glyph = glyph_at(cc.x, cc.y);
/*
* Calculate allowable range (pole's reach is always 2 steps): * Calculate allowable range (pole's reach is always 2 steps):
* unskilled and basic: orthogonal direction, 4..4; * unskilled and basic: orthogonal direction, 4..4;
* skilled: as basic, plus knight's jump position, 4..5; * skilled: as basic, plus knight's jump position, 4..5;
@@ -2585,6 +2594,20 @@ use_pole(obj)
if (typ == P_NONE || P_SKILL(typ) <= P_BASIC) max_range = 4; if (typ == P_NONE || P_SKILL(typ) <= P_BASIC) max_range = 4;
else if (P_SKILL(typ) == P_SKILLED) max_range = 5; else if (P_SKILL(typ) == P_SKILLED) max_range = 5;
else max_range = 8; /* (P_SKILL(typ) >= P_EXPERT) */ else max_range = 8; /* (P_SKILL(typ) >= P_EXPERT) */
/* Prompt for a location */
pline(where_to_hit);
if (hitm && !DEADMONSTER(hitm) && cansee(hitm->mx, hitm->my)) {
cc.x = hitm->mx;
cc.y = hitm->my;
} else if (!find_poleable_mon(&cc, min_range, max_range)) {
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 */
glyph = glyph_at(cc.x, cc.y);
if (distu(cc.x, cc.y) > max_range) { if (distu(cc.x, cc.y) > max_range) {
pline("Too far!"); pline("Too far!");
return (res); return (res);