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

Merge branch 'NetHack-3.6.2'

Browse Source
This commit is contained in:
nhmall
2019-01-09 07:24:18 -05:00
parent 7eee5f3a1d 624aee7749
commit 58f2218c4e
39 changed files with 239 additions and 230 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/muse.c
View File

@@ -1,4 +1,4 @@
/* NetHack 3.6 muse.c $NHDT-Date: 1539804880 2018/10/17 19:34:40 $ $NHDT-Branch: keni-makedefsm $:$NHDT-Revision: 1.85 $ */
/* NetHack 3.6 muse.c $NHDT-Date: 1547025167 2019/01/09 09:12:47 $ $NHDT-Branch: NetHack-3.6.2-beta01 $:$NHDT-Revision: 1.92 $ */
/* Copyright (C) 1990 by Ken Arromdee */
/* NetHack may be freely redistributed. See license for details. */
@@ -458,7 +458,7 @@ struct monst *mtmp;
}
}
}
toot:
toot:
;
}
@@ -566,7 +566,7 @@ struct monst *mtmp;
g.m.has_defense = MUSE_SCR_CREATE_MONSTER;
}
}
botm:
botm:
return (boolean) !!g.m.has_defense;
#undef nomore
}
@@ -629,7 +629,7 @@ struct monst *mtmp;
mzapmsg(mtmp, otmp, TRUE);
otmp->spe--;
how = WAN_TELEPORTATION;
mon_tele:
mon_tele:
if (tele_restrict(mtmp)) { /* mysterious force... */
if (vismon && how) /* mentions 'teleport' */
makeknown(how);
@@ -867,7 +867,7 @@ struct monst *mtmp;
case MUSE_SSTAIRS:
m_flee(mtmp);
if (ledger_no(&u.uz) == 1) {
escape:
escape:
/* Monsters without the Amulet escape the dungeon and
* are gone for good when they leave up the up stairs.
* A monster with the Amulet would leave it behind
@@ -976,7 +976,7 @@ struct monst *mtmp;
if (is_animal(pm) || attacktype(pm, AT_EXPL) || mindless(mtmp->data)
|| pm->mlet == S_GHOST || pm->mlet == S_KOP)
return 0;
try_again:
try_again:
switch (rn2(8 + (difficulty > 3) + (difficulty > 6) + (difficulty > 8))) {
case 6:
case 9:
@@ -1772,7 +1772,7 @@ struct monst *mtmp;
(coord *) 0);
return 2;
} else {
skipmsg:
skipmsg:
if (vismon) {
pline("%s looks uneasy.", Monnam(mtmp));
if (!objects[POT_GAIN_LEVEL].oc_name_known
@@ -2354,7 +2354,7 @@ boolean by_you;
spells could toss pillar of fire at self--probably too suicidal] */
if (!mon->mcan && !mon->mspec_used
&& attacktype_fordmg(mptr, AT_BREA, AD_FIRE)) {
odummy = g.zeroobj; /* otyp == STRANGE_OBJECT */
odummy = cg.zeroobj; /* otyp == STRANGE_OBJECT */
return muse_unslime(mon, &odummy, (struct trap *) 0, by_you);
}
@@ -2393,7 +2393,7 @@ boolean by_you;
}
}
if (t && t->ttyp == FIRE_TRAP)
return muse_unslime(mon, &g.zeroobj, t, by_you);
return muse_unslime(mon, (struct obj *) &cg.zeroobj, t, by_you);
} /* MUSE */