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

Instance variable work check-point.

Browse Source
This commit is contained in:
Bart House
2018-11-23 04:49:51 -08:00
parent 244a473a19
commit 8e316df117
17 changed files with 171 additions and 139 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
src/weapon.c
View File

@@ -387,8 +387,6 @@ static NEARDATA const int pwep[] = { HALBERD, BARDICHE, SPETUM,
BEC_DE_CORBIN, FAUCHARD, PARTISAN,
LANCE };
static struct obj *propellor;
/* select a ranged weapon for the monster */
struct obj *
select_rwep(mtmp)
@@ -401,7 +399,7 @@ register struct monst *mtmp;
char mlet = mtmp->data->mlet;
propellor = &zeroobj;
iv.propellor = &zeroobj;
Oselect(EGG); /* cockatrice egg */
if (mlet == S_KOP) /* pies are first choice for Kops */
Oselect(CREAM_PIE);
@@ -433,7 +431,7 @@ register struct monst *mtmp;
|| !mon_hates_silver(mtmp))) {
if ((otmp = oselect(mtmp, pwep[i])) != 0
&& (otmp == mwep || !mweponly)) {
propellor = otmp; /* force the monster to wield it */
iv.propellor = otmp; /* force the monster to wield it */
return otmp;
}
}
@@ -454,41 +452,41 @@ register struct monst *mtmp;
for (otmp = mtmp->minvent; otmp; otmp = otmp->nobj)
if (otmp->oclass == GEM_CLASS
&& (otmp->otyp != LOADSTONE || !otmp->cursed)) {
propellor = m_carrying(mtmp, SLING);
iv.propellor = m_carrying(mtmp, SLING);
return otmp;
}
}
/* KMH -- This belongs here so darts will work */
propellor = &zeroobj;
iv.propellor = &zeroobj;
prop = (objects[rwep[i]]).oc_skill;
if (prop < 0) {
switch (-prop) {
case P_BOW:
propellor = (oselect(mtmp, YUMI));
if (!propellor)
propellor = (oselect(mtmp, ELVEN_BOW));
if (!propellor)
propellor = (oselect(mtmp, BOW));
if (!propellor)
propellor = (oselect(mtmp, ORCISH_BOW));
iv.propellor = (oselect(mtmp, YUMI));
if (!iv.propellor)
iv.propellor = (oselect(mtmp, ELVEN_BOW));
if (!iv.propellor)
iv.propellor = (oselect(mtmp, BOW));
if (!iv.propellor)
iv.propellor = (oselect(mtmp, ORCISH_BOW));
break;
case P_SLING:
propellor = (oselect(mtmp, SLING));
iv.propellor = (oselect(mtmp, SLING));
break;
case P_CROSSBOW:
propellor = (oselect(mtmp, CROSSBOW));
iv.propellor = (oselect(mtmp, CROSSBOW));
}
if ((otmp = MON_WEP(mtmp)) && mwelded(otmp) && otmp != propellor
if ((otmp = MON_WEP(mtmp)) && mwelded(otmp) && otmp != iv.propellor
&& mtmp->weapon_check == NO_WEAPON_WANTED)
propellor = 0;
iv.propellor = 0;
}
/* propellor = obj, propellor to use
* propellor = &zeroobj, doesn't need a propellor
* propellor = 0, needed one and didn't have one
*/
if (propellor != 0) {
if (iv.propellor != 0) {
/* Note: cannot use m_carrying for loadstones, since it will
* always select the first object of a type, and maybe the
* monster is carrying two but only the first is unthrowable.
@@ -635,7 +633,7 @@ register struct monst *mon;
break;
case NEED_RANGED_WEAPON:
(void) select_rwep(mon);
obj = propellor;
obj = iv.propellor;
break;
case NEED_PICK_AXE:
obj = m_carrying(mon, PICK_AXE);