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

Merge branch 'NetHack-3.7' of https://rodney.nethack.org:20040/git/NHsource into NetHack-3.7

Browse Source
This commit is contained in:
nhmall
2020-02-08 11:05:26 -05:00
parent ffd9eedb2c 0323eecbfe
commit 5116ad4eed
7 changed files with 58 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/cmd.c
View File

@@ -3835,17 +3835,13 @@ boolean doit;
add_herecmd_menuitem(win, dosit,
"Sit on the throne");
if ((u.ux == xupstair && u.uy == yupstair)
|| (u.ux == g.sstairs.sx && u.uy == g.sstairs.sy && g.sstairs.up)
|| (u.ux == xupladder && u.uy == yupladder)) {
if (On_stairs_up(u.ux, u.uy)) {
Sprintf(buf, "Go up the %s",
(u.ux == xupladder && u.uy == yupladder)
? "ladder" : "stairs");
add_herecmd_menuitem(win, doup, buf);
}
if ((u.ux == xdnstair && u.uy == ydnstair)
|| (u.ux == g.sstairs.sx && u.uy == g.sstairs.sy && !g.sstairs.up)
|| (u.ux == xdnladder && u.uy == ydnladder)) {
if (On_stairs_dn(u.ux, u.uy)) {
Sprintf(buf, "Go down the %s",
(u.ux == xupladder && u.uy == yupladder)
? "ladder" : "stairs");
@@ -3955,16 +3951,10 @@ int x, y, mod;
} else if (IS_THRONE(levl[u.ux][u.uy].typ)) {
cmd[0] = cmd_from_func(dosit);
return cmd;
} else if ((u.ux == xupstair && u.uy == yupstair)
|| (u.ux == g.sstairs.sx && u.uy == g.sstairs.sy
&& g.sstairs.up)
|| (u.ux == xupladder && u.uy == yupladder)) {
} else if (On_stairs_up(u.ux, u.uy)) {
cmd[0] = cmd_from_func(doup);
return cmd;
} else if ((u.ux == xdnstair && u.uy == ydnstair)
|| (u.ux == g.sstairs.sx && u.uy == g.sstairs.sy
&& !g.sstairs.up)
|| (u.ux == xdnladder && u.uy == ydnladder)) {
} else if (On_stairs_dn(u.ux, u.uy)) {
cmd[0] = cmd_from_func(dodown);
return cmd;
} else if ((o = vobj_at(u.ux, u.uy)) != 0) {

15
src/dig.c
View File

@@ -1635,6 +1635,7 @@ char *msg;
} else if (ltyp == IRONBARS) {
/* "set of iron bars" */
Strcpy(msg, "The bars go much deeper than your pit.");
return FALSE;
#if 0
} else if (is_lava(cc->x, cc->y)) {
} else if (is_ice(cc->x, cc->y)) {
@@ -1644,8 +1645,7 @@ char *msg;
} else if (IS_SINK(ltyp)) {
Strcpy(msg, "A tangled mass of plumbing remains below the sink.");
return FALSE;
} else if ((cc->x == xupladder && cc->y == yupladder) /* ladder up */
|| (cc->x == xdnladder && cc->y == ydnladder)) { /* " down */
} else if (On_ladder(cc->x, cc->y)) {
Strcpy(msg, "The ladder is unaffected.");
return FALSE;
} else {
@@ -1657,15 +1657,8 @@ char *msg;
supporting = "throne";
else if (IS_ALTAR(ltyp))
supporting = "altar";
else if ((cc->x == xupstair && cc->y == yupstair)
|| (cc->x == g.sstairs.sx && cc->y == g.sstairs.sy
&& g.sstairs.up))
/* "staircase up" */
supporting = "stairs";
else if ((cc->x == xdnstair && cc->y == ydnstair)
|| (cc->x == g.sstairs.sx && cc->y == g.sstairs.sy
&& !g.sstairs.up))
/* "staircase down" */
else if (On_stairs(cc->x, cc->y))
/* staircase up or down. On_ladder handled above. */
supporting = "stairs";
else if (ltyp == DRAWBRIDGE_DOWN /* "lowered drawbridge" */
|| ltyp == DBWALL) /* "raised drawbridge" */

9
src/dog.c
View File

@@ -755,17 +755,10 @@ register struct obj *obj;
return POISON;
if (obj->otyp == LUMP_OF_ROYAL_JELLY
&& mon->data == &mons[PM_KILLER_BEE]) {
struct monst *mtmp = 0;
struct monst *mtmp = find_pmmonst(PM_QUEEN_BEE);
/* if there's a queen bee on the level, don't eat royal jelly;
if there isn't, do eat it and grow into a queen */
if ((g.mvitals[PM_QUEEN_BEE].mvflags & G_GENOD) == 0)
for (mtmp = fmon; mtmp; mtmp = mtmp->nmon) {
if (DEADMONSTER(mtmp))
continue;
if (mtmp->data == &mons[PM_QUEEN_BEE])
break;
}
return !mtmp ? DOGFOOD : TABU;
}
if (!carni && !herbi)

26
src/dungeon.c
View File

@@ -1524,6 +1524,32 @@ xchar x, y;
|| (x == g.sstairs.sx && y == g.sstairs.sy));
}
boolean
On_ladder(x, y)
xchar x, y;
{
return (boolean) ((x == xdnladder && y == ydnladder)
|| (x == xupladder && y == yupladder));
}
boolean
On_stairs_up(x, y)
xchar x, y;
{
return ((x == xupstair && y == yupstair)
|| (x == g.sstairs.sx && y == g.sstairs.sy && g.sstairs.up)
|| (x == xupladder && y == yupladder));
}
boolean
On_stairs_dn(x, y)
xchar x, y;
{
return ((x == xdnstair && y == ydnstair)
|| (x == g.sstairs.sx && y == g.sstairs.sy && !g.sstairs.up)
|| (x == xdnladder && y == ydnladder));
}
boolean
Is_botlevel(lev)
d_level *lev;

27
src/monmove.c
View File

@@ -252,6 +252,23 @@ struct monst *mon;
}
}
struct monst *
find_pmmonst(pm)
int pm;
{
struct monst *mtmp = 0;
if ((g.mvitals[pm].mvflags & G_GENOD) == 0)
for (mtmp = fmon; mtmp; mtmp = mtmp->nmon) {
if (DEADMONSTER(mtmp))
continue;
if (mtmp->data == &mons[pm])
break;
}
return mtmp;
}
/* killer bee 'mon' is on a spot containing lump of royal jelly 'obj' and
will eat it if there is no queen bee on the level; return 1: mon died,
0: mon ate jelly and lived; -1: mon didn't eat jelly to use its move */
@@ -261,16 +278,8 @@ struct monst *mon;
struct obj *obj;
{
int m_delay;
struct monst *mtmp = 0;
struct monst *mtmp = find_pmmonst(PM_QUEEN_BEE);
/* find a queen bee */
if ((g.mvitals[PM_QUEEN_BEE].mvflags & G_GENOD) == 0)
for (mtmp = fmon; mtmp; mtmp = mtmp->nmon) {
if (DEADMONSTER(mtmp))
continue;
if (mtmp->data == &mons[PM_QUEEN_BEE])
break;
}
/* if there's no queen on the level, eat the royal jelly and become one */
if (!mtmp) {
m_delay = obj->blessed ? 3 : !obj->cursed ? 5 : 7;