-/* NetHack 3.6 makemon.c $NHDT-Date: 1449269917 2015/12/04 22:58:37 $ $NHDT-Branch: NetHack-3.6.0 $:$NHDT-Revision: 1.105 $ */
+/* NetHack 3.6 makemon.c $NHDT-Date: 1556150377 2019/04/24 23:59:37 $ $NHDT-Branch: NetHack-3.6.2-beta01 $:$NHDT-Revision: 1.134 $ */
/* Copyright (c) Stichting Mathematisch Centrum, Amsterdam, 1985. */
+/*-Copyright (c) Robert Patrick Rankin, 2012. */
/* NetHack may be freely redistributed. See license for details. */
+/* JNetHack Copyright */
+/* (c) Issei Numata, Naoki Hamada, Shigehiro Miyashita, 1994-2000 */
+/* For 3.4-, Copyright (c) SHIRAKATA Kentaro, 2002-2019 */
+/* JNetHack may be freely redistributed. See license for details. */
+
#include "hack.h"
#include <ctype.h>
-STATIC_VAR NEARDATA struct monst zeromonst;
-
/* this assumes that a human quest leader or nemesis is an archetype
of the corresponding role; that isn't so for some roles (tourist
for instance) but is for the priests and monks we use it for... */
STATIC_DCL int FDECL(align_shift, (struct permonst *));
STATIC_DCL boolean FDECL(mk_gen_ok, (int, int, int));
STATIC_DCL boolean FDECL(wrong_elem_type, (struct permonst *));
-STATIC_DCL void FDECL(m_initgrp, (struct monst *, int, int, int));
+STATIC_DCL void FDECL(m_initgrp, (struct monst *, int, int, int, int));
STATIC_DCL void FDECL(m_initthrow, (struct monst *, int, int));
STATIC_DCL void FDECL(m_initweap, (struct monst *));
STATIC_DCL void FDECL(m_initinv, (struct monst *));
-STATIC_DCL boolean FDECL(makemon_rnd_goodpos, (struct monst *, unsigned, coord *));
-
-extern const int monstr[];
+STATIC_DCL boolean FDECL(makemon_rnd_goodpos, (struct monst *,
+ unsigned, coord *));
-#define m_initsgrp(mtmp, x, y) m_initgrp(mtmp, x, y, 3)
-#define m_initlgrp(mtmp, x, y) m_initgrp(mtmp, x, y, 10)
-#define toostrong(monindx, lev) (monstr[monindx] > lev)
-#define tooweak(monindx, lev) (monstr[monindx] < lev)
+#define m_initsgrp(mtmp, x, y, mmf) m_initgrp(mtmp, x, y, 3, mmf)
+#define m_initlgrp(mtmp, x, y, mmf) m_initgrp(mtmp, x, y, 10, mmf)
+#define toostrong(monindx, lev) (mons[monindx].difficulty > lev)
+#define tooweak(monindx, lev) (mons[monindx].difficulty < lev)
boolean
is_home_elemental(ptr)
/* make a group just like mtmp */
STATIC_OVL void
-m_initgrp(mtmp, x, y, n)
-register struct monst *mtmp;
-register int x, y, n;
+m_initgrp(mtmp, x, y, n, mmflags)
+struct monst *mtmp;
+int x, y, n, mmflags;
{
coord mm;
register int cnt = rnd(n);
* smaller group.
*/
if (enexto(&mm, mm.x, mm.y, mtmp->data)) {
- mon = makemon(mtmp->data, mm.x, mm.y, NO_MM_FLAGS);
+ mon = makemon(mtmp->data, mm.x, mm.y, (mmflags | MM_NOGRP));
if (mon) {
mon->mpeaceful = FALSE;
mon->mavenge = 0;
} else if (mm == PM_NINJA) { /* extra quest villains */
(void) mongets(mtmp, rn2(4) ? SHURIKEN : DART);
(void) mongets(mtmp, rn2(4) ? SHORT_SWORD : AXE);
+ } else if (ptr->msound == MS_GUARDIAN) {
+ /* quest "guardians" */
+ switch (mm) {
+ case PM_STUDENT:
+ case PM_ATTENDANT:
+ case PM_ABBOT:
+ case PM_ACOLYTE:
+ case PM_GUIDE:
+ case PM_APPRENTICE:
+ if (rn2(2))
+ (void) mongets(mtmp, rn2(3) ? DAGGER : KNIFE);
+ if (rn2(5))
+ (void) mongets(mtmp, rn2(3) ? LEATHER_JACKET
+ : LEATHER_CLOAK);
+ if (rn2(3))
+ (void) mongets(mtmp, rn2(3) ? LOW_BOOTS : HIGH_BOOTS);
+ if (rn2(3))
+ (void) mongets(mtmp, POT_HEALING);
+ break;
+ case PM_CHIEFTAIN:
+ case PM_PAGE:
+ case PM_ROSHI:
+ case PM_WARRIOR:
+ (void) mongets(mtmp, rn2(3) ? LONG_SWORD : SHORT_SWORD);
+ (void) mongets(mtmp, rn2(3) ? CHAIN_MAIL : LEATHER_ARMOR);
+ if (rn2(2))
+ (void) mongets(mtmp, rn2(2) ? LOW_BOOTS : HIGH_BOOTS);
+ if (!rn2(3))
+ (void) mongets(mtmp, LEATHER_CLOAK);
+ if (!rn2(3)) {
+ (void) mongets(mtmp, BOW);
+ m_initthrow(mtmp, ARROW, 12);
+ }
+ break;
+ case PM_HUNTER:
+ (void) mongets(mtmp, rn2(3) ? SHORT_SWORD : DAGGER);
+ if (rn2(2))
+ (void) mongets(mtmp, rn2(2) ? LEATHER_JACKET
+ : LEATHER_ARMOR);
+ (void) mongets(mtmp, BOW);
+ m_initthrow(mtmp, ARROW, 12);
+ break;
+ case PM_THUG:
+ (void) mongets(mtmp, CLUB);
+ (void) mongets(mtmp, rn2(3) ? DAGGER : KNIFE);
+ if (rn2(2))
+ (void) mongets(mtmp, LEATHER_GLOVES);
+ (void) mongets(mtmp, rn2(2) ? LEATHER_JACKET : LEATHER_ARMOR);
+ break;
+ case PM_NEANDERTHAL:
+ (void) mongets(mtmp, CLUB);
+ (void) mongets(mtmp, LEATHER_ARMOR);
+ break;
+ }
}
break;
else if (mac < 10 && rn2(2))
mac += 1 + mongets(mtmp, LEATHER_CLOAK);
- if (ptr != &mons[PM_GUARD] && ptr != &mons[PM_WATCHMAN]
- && ptr != &mons[PM_WATCH_CAPTAIN]) {
+ nhUse(mac); /* suppress 'dead increment' from static analyzer */
+
+ if (ptr == &mons[PM_WATCH_CAPTAIN]) {
+ ; /* better weapon rather than extra gear here */
+ } else if (ptr == &mons[PM_WATCHMAN]) {
+ if (rn2(3)) /* most watchmen carry a whistle */
+ (void) mongets(mtmp, TIN_WHISTLE);
+ } else if (ptr == &mons[PM_GUARD]) {
+ /* if hero teleports out of a vault while being confronted
+ by the vault's guard, there is a shrill whistling sound,
+ so guard evidently carries a cursed whistle */
+ otmp = mksobj(TIN_WHISTLE, TRUE, FALSE);
+ curse(otmp);
+ (void) mpickobj(mtmp, otmp);
+ } else { /* soldiers and their officers */
if (!rn2(3))
(void) mongets(mtmp, K_RATION);
if (!rn2(2))
(void) mongets(mtmp, C_RATION);
if (ptr != &mons[PM_SOLDIER] && !rn2(3))
(void) mongets(mtmp, BUGLE);
- } else if (ptr == &mons[PM_WATCHMAN] && rn2(3))
- (void) mongets(mtmp, TIN_WHISTLE);
+ }
} else if (ptr == &mons[PM_SHOPKEEPER]) {
(void) mongets(mtmp, SKELETON_KEY);
switch (rn2(4)) {
/* MAJOR fall through ... */
case 0:
(void) mongets(mtmp, WAN_MAGIC_MISSILE);
+ /*FALLTHRU*/
case 1:
(void) mongets(mtmp, POT_EXTRA_HEALING);
+ /*FALLTHRU*/
case 2:
(void) mongets(mtmp, POT_HEALING);
+ /*FALLTHRU*/
case 3:
(void) mongets(mtmp, WAN_STRIKING);
}
break;
case S_QUANTMECH:
if (!rn2(20)) {
+ struct obj *catcorpse;
+
otmp = mksobj(LARGE_BOX, FALSE, FALSE);
- otmp->spe = 1; /* flag for special box */
- otmp->owt = weight(otmp);
+ /* we used to just set the flag, which resulted in weight()
+ treating the box as being heavier by the weight of a cat;
+ now we include a cat corpse that won't rot; when opening or
+ disclosing the box's contents, the corpse might be revived,
+ otherwise it's given a rot timer; weight is now ordinary */
+ if ((catcorpse = mksobj(CORPSE, TRUE, FALSE)) != 0) {
+ otmp->spe = 1; /* flag for special SchroedingersBox */
+ set_corpsenm(catcorpse, PM_HOUSECAT);
+ (void) stop_timer(ROT_CORPSE, obj_to_any(catcorpse));
+ add_to_container(otmp, catcorpse);
+ otmp->owt = weight(otmp);
+ }
(void) mpickobj(mtmp, otmp);
}
break;
m2->mx = mm.x;
m2->my = mm.y;
+ m2->mundetected = 0;
+ m2->mtrapped = 0;
m2->mcloned = 1;
m2->minvent = (struct obj *) 0; /* objects don't clone */
m2->mleashed = FALSE;
/* Max HP the same, but current HP halved for both. The caller
* might want to override this by halving the max HP also.
* When current HP is odd, the original keeps the extra point.
+ * We know original has more than 1 HP, so both end up with at least 1.
*/
m2->mhpmax = mon->mhpmax;
m2->mhp = mon->mhp / 2;
result = (((int) mvitals[mndx].born < lim) && !gone) ? TRUE : FALSE;
/* if it's unique, don't ever make it again */
- if (mons[mndx].geno & G_UNIQ)
+ if ((mons[mndx].geno & G_UNIQ) && mndx != PM_HIGH_PRIEST)
mvitals[mndx].mvflags |= G_EXTINCT;
if (mvitals[mndx].born < 255 && tally
}
}
} else {
- gotgood:
+ gotgood:
cc->x = nx;
cc->y = ny;
return TRUE;
newemin(mtmp);
if (mmflags & MM_EDOG)
newedog(mtmp);
-
+ if (mmflags & MM_ASLEEP)
+ mtmp->msleeping = 1;
mtmp->nmon = fmon;
fmon = mtmp;
mtmp->m_id = context.ident++;
if (!mtmp->m_id)
mtmp->m_id = context.ident++; /* ident overflowed */
- set_mon_data(mtmp, ptr, 0);
+ set_mon_data(mtmp, ptr); /* mtmp->data = ptr; */
if (ptr->msound == MS_LEADER && quest_info(MS_LEADER) == mndx)
quest_status.leader_m_id = mtmp->m_id;
mtmp->mnum = mndx;
if (mndx == PM_VLAD_THE_IMPALER)
mitem = CANDELABRUM_OF_INVOCATION;
mtmp->cham = NON_PM; /* default is "not a shapechanger" */
- if ((mcham = pm_to_cham(mndx)) != NON_PM) {
+ if (!Protection_from_shape_changers
+ && (mcham = pm_to_cham(mndx)) != NON_PM) {
/* this is a shapechanger after all */
- if (Protection_from_shape_changers
- || mndx == PM_VLAD_THE_IMPALER) {
- ; /* stuck in its natural form (NON_PM) */
- } else {
- mtmp->cham = mcham;
- /* Note: shapechanger's initial form used to be
- chosen here with rndmonst(), yielding a monster
- which was appropriate to the level's difficulty
- but ignored the changer's usual type selection
- so would be inappropriate for vampshifters.
+ mtmp->cham = mcham;
+ /* Vlad stays in his normal shape so he can carry the Candelabrum */
+ if (mndx != PM_VLAD_THE_IMPALER
+ /* Note: shapechanger's initial form used to be chosen here
+ with rndmonst(), yielding a monster which was appropriate
+ to the level's difficulty but ignoring the changer's usual
+ type selection, so was inappropriate for vampshifters.
Let newcham() pick the shape. */
- if (newcham(mtmp, (struct permonst *) 0, FALSE, FALSE))
- allow_minvent = FALSE;
- }
+ && newcham(mtmp, (struct permonst *) 0, FALSE, FALSE))
+ allow_minvent = FALSE;
} else if (mndx == PM_WIZARD_OF_YENDOR) {
mtmp->iswiz = TRUE;
context.no_of_wizards++;
: eminp->renegade;
}
set_malign(mtmp); /* having finished peaceful changes */
- if (anymon) {
+ if (anymon && !(mmflags & MM_NOGRP)) {
if ((ptr->geno & G_SGROUP) && rn2(2)) {
- m_initsgrp(mtmp, mtmp->mx, mtmp->my);
+ m_initsgrp(mtmp, mtmp->mx, mtmp->my, mmflags);
} else if (ptr->geno & G_LGROUP) {
if (rn2(3))
- m_initlgrp(mtmp, mtmp->mx, mtmp->my);
+ m_initlgrp(mtmp, mtmp->mx, mtmp->my, mmflags);
else
- m_initsgrp(mtmp, mtmp->mx, mtmp->my);
+ m_initsgrp(mtmp, mtmp->mx, mtmp->my, mmflags);
}
}
m_initweap(mtmp); /* equip with weapons / armor */
m_initinv(mtmp); /* add on a few special items incl. more armor */
m_dowear(mtmp, TRUE);
+
+ if (!rn2(100) && is_domestic(ptr)
+ && can_saddle(mtmp) && !which_armor(mtmp, W_SADDLE)) {
+ struct obj *otmp = mksobj(SADDLE, TRUE, FALSE);
+ put_saddle_on_mon(otmp, mtmp);
+ }
+
} else {
/* no initial inventory is allowed */
if (mtmp->minvent)
mtmp->mstrategy |= STRAT_APPEARMSG;
}
+ if (allow_minvent && migrating_objs)
+ deliver_obj_to_mon(mtmp, 1, DF_NONE); /* in case of waiting items */
+
if (!in_mklev)
newsym(mtmp->mx, mtmp->my); /* make sure the mon shows up */
mbirth_limit(mndx)
int mndx;
{
+ /* There is an implicit limit of 4 for "high priest of <deity>",
+ * but aligned priests can grow into high priests, thus they aren't
+ * really limited to 4, so leave the default amount in place for them.
+ */
+
/* assert(MAXMONNO < 255); */
return (mndx == PM_NAZGUL ? 9 : mndx == PM_ERINYS ? 3 : MAXMONNO);
}
rndmonst_state.mchoices[mndx] = 0;
if (tooweak(mndx, minmlev) || toostrong(mndx, maxmlev))
continue;
- if (upper && !isupper(def_monsyms[(int) (ptr->mlet)].sym))
+ if (upper && !isupper((uchar) def_monsyms[(int) ptr->mlet].sym))
continue;
if (elemlevel && wrong_elem_type(ptr))
continue;
}
/* Make one of the multiple types of a given monster class.
- * The second parameter specifies a special casing bit mask
- * to allow the normal genesis masks to be deactivated.
- * Returns Null if no monsters in that class can be made.
- */
+ The second parameter specifies a special casing bit mask
+ to allow the normal genesis masks to be deactivated.
+ Returns Null if no monsters in that class can be made. */
struct permonst *
mkclass(class, spc)
char class;
int spc;
{
+ return mkclass_aligned(class, spc, A_NONE);
+}
+
+/* mkclass() with alignment restrictions; used by ndemon() */
+struct permonst *
+mkclass_aligned(class, spc, atyp)
+char class;
+int spc;
+aligntyp atyp;
+{
register int first, last, num = 0;
+ int k, nums[SPECIAL_PM + 1]; /* +1: insurance for final return value */
int maxmlev, mask = (G_NOGEN | G_UNIQ) & ~spc;
+ (void) memset((genericptr_t) nums, 0, sizeof nums);
maxmlev = level_difficulty() >> 1;
if (class < 1 || class >= MAXMCLASSES) {
impossible("mkclass called with bad class!");
return (struct permonst *) 0;
}
/* Assumption #1: monsters of a given class are contiguous in the
- * mons[] array.
+ * mons[] array. Player monsters and quest denizens
+ * are an exception; mkclass() won't pick them.
+ * SPECIAL_PM is long worm tail and separates the
+ * regular monsters from the exceptions.
*/
for (first = LOW_PM; first < SPECIAL_PM; first++)
if (mons[first].mlet == class)
break;
- if (first == SPECIAL_PM)
+ if (first == SPECIAL_PM) {
+ impossible("mkclass found no class %d monsters", class);
return (struct permonst *) 0;
+ }
- for (last = first; last < SPECIAL_PM && mons[last].mlet == class; last++)
+ /* Assumption #2: monsters of a given class are presented in ascending
+ * order of strength.
+ */
+ for (last = first; last < SPECIAL_PM && mons[last].mlet == class; last++) {
+ if (atyp != A_NONE && sgn(mons[last].maligntyp) != sgn(atyp))
+ continue;
if (mk_gen_ok(last, G_GONE, mask)) {
- /* consider it */
+ /* consider it; don't reject a toostrong() monster if we
+ don't have anything yet (num==0) or if it is the same
+ (or lower) difficulty as preceding candidate (non-zero
+ 'num' implies last > first so mons[last-1] is safe);
+ sometimes accept it even if high difficulty */
if (num && toostrong(last, maxmlev)
- && monstr[last] != monstr[last - 1] && rn2(2))
+ && mons[last].difficulty > mons[last - 1].difficulty
+ && rn2(2))
break;
- num += mons[last].geno & G_FREQ;
+ if ((k = (mons[last].geno & G_FREQ)) > 0) {
+ /* skew towards lower value monsters at lower exp. levels
+ (this used to be done in the next loop, but that didn't
+ work well when multiple species had the same level and
+ were followed by one that was past the bias threshold;
+ cited example was sucubus and incubus, where the bias
+ against picking the next demon resulted in incubus
+ being picked nearly twice as often as sucubus);
+ we need the '+1' in case the entire set is too high
+ level (really low level hero) */
+ nums[last] = k + 1 - (adj_lev(&mons[last]) > (u.ulevel * 2));
+ num += nums[last];
+ }
}
+ }
if (!num)
return (struct permonst *) 0;
- /* Assumption #2: monsters of a given class are presented in ascending
- * order of strength.
- */
- for (num = rnd(num); num > 0; first++)
- if (mk_gen_ok(first, G_GONE, mask)) {
- /* skew towards lower value monsters at lower exp. levels */
- num -= mons[first].geno & G_FREQ;
- if (num && adj_lev(&mons[first]) > (u.ulevel * 2)) {
- /* but not when multiple monsters are same level */
- if (mons[first].mlevel != mons[first + 1].mlevel)
- num--;
- }
- }
- first--; /* correct an off-by-one error */
+ /* the hard work has already been done; 'num' should hit 0 before
+ first reaches last (which is actually one past our last candidate) */
+ for (num = rnd(num); first < last; first++)
+ if ((num -= nums[first]) <= 0)
+ break;
- return &mons[first];
+ return nums[first] ? &mons[first] : (struct permonst *) 0;
}
/* like mkclass(), but excludes difficulty considerations; used when
struct monst *mtmp, *victim;
{
int oldtype, newtype, max_increase, cur_increase, lev_limit, hp_threshold;
+ unsigned fem;
struct permonst *ptr = mtmp->data;
/* monster died after killing enemy but before calling this function */
/* currently possible if killing a gas spore */
- if (mtmp->mhp <= 0)
+ if (DEADMONSTER(mtmp))
return (struct permonst *) 0;
/* note: none of the monsters with special hit point calculations
if ((int) ++mtmp->m_lev >= mons[newtype].mlevel && newtype != oldtype) {
ptr = &mons[newtype];
+ /* new form might force gender change */
+ fem = is_male(ptr) ? 0 : is_female(ptr) ? 1 : mtmp->female;
+
if (mvitals[newtype].mvflags & G_GENOD) { /* allow G_EXTINCT */
if (canspotmon(mtmp))
-#if 0 /*JP*/
+#if 0 /*JP:T*/
pline("As %s grows up into %s, %s %s!", mon_nam(mtmp),
an(ptr->mname), mhe(mtmp),
nonliving(ptr) ? "expires" : "dies");
ptr->mname,
nonliving(ptr) ? "\8fÁ\82¦\82Ä" : "\8e\80\82ñ\82Å");
#endif
- set_mon_data(mtmp, ptr, -1); /* keep mvitals[] accurate */
+ set_mon_data(mtmp, ptr); /* keep mvitals[] accurate */
mondied(mtmp);
return (struct permonst *) 0;
} else if (canspotmon(mtmp)) {
#if 0 /*JP*/
- pline("%s %s %s.", Monnam(mtmp),
- humanoid(ptr) ? "becomes" : "grows up into",
- an(ptr->mname));
-#else
+ char buf[BUFSZ];
+
+ /* 3.6.1:
+ * Temporary (?) hack to fix growing into opposite gender.
+ */
+ Sprintf(buf, "%s%s",
+ /* deal with female gnome becoming a gnome lord */
+ (mtmp->female && !fem) ? "male "
+ /* or a male gnome becoming a gnome lady
+ (can't happen with 3.6.0 mons[], but perhaps
+ slightly less sexist if prepared for it...) */
+ : (fem && !mtmp->female) ? "female " : "",
+ ptr->mname);
+ pline("%s %s %s.", upstart(y_monnam(mtmp)),
+ (fem != mtmp->female) ? "changes into"
+ : humanoid(ptr) ? "becomes"
+ : "grows up into",
+ an(buf));
+#else /* \93ú\96{\8cê\82Å\82Í\82Æ\82è\82 \82¦\82¸\82»\82±\82Ü\82Å\82Í\82µ\82È\82¢ */
pline("%s\82Í%s\82É%s\81D", Monnam(mtmp),
ptr->mname,
humanoid(ptr) ? "\82È\82Á\82½" : "\90¬\92·\82µ\82½");
#endif
}
- set_mon_data(mtmp, ptr, 1); /* preserve intrinsics */
+ set_mon_data(mtmp, ptr);
newsym(mtmp->mx, mtmp->my); /* color may change */
lev_limit = (int) mtmp->m_lev; /* never undo increment */
+
+ mtmp->female = fem; /* gender might be changing */
}
+
/* sanity checks */
if ((int) mtmp->m_lev > lev_limit) {
mtmp->m_lev--; /* undo increment */
struct obj *otmp;
int mx, my;
- if (!mtmp)
+ if (!mtmp || Protection_from_shape_changers)
return;
mx = mtmp->mx;
my = mtmp->my;
appear = Is_rogue_level(&u.uz) ? S_hwall : S_hcdoor;
else
appear = Is_rogue_level(&u.uz) ? S_vwall : S_vcdoor;
- if (!mtmp->minvis || See_invisible)
- block_point(mx, my); /* vision */
} else if (level.flags.is_maze_lev && !In_sokoban(&u.uz) && rn2(2)) {
ap_type = M_AP_OBJECT;
appear = STATUE;
} else if (roomno < 0 && !t_at(mx, my)) {
ap_type = M_AP_OBJECT;
appear = BOULDER;
- if (!mtmp->minvis || See_invisible)
- block_point(mx, my); /* vision */
} else if (rt == ZOO || rt == VAULT) {
ap_type = M_AP_OBJECT;
appear = GOLD_PIECE;
}
} else {
s_sym = syms[rn2((int) sizeof(syms))];
- assign_sym:
+ assign_sym:
if (s_sym == MAXOCLASSES || s_sym == MAXOCLASSES + 1) {
ap_type = M_AP_FURNITURE;
appear = (s_sym == MAXOCLASSES) ? S_upstair : S_dnstair;
}
mtmp->m_ap_type = ap_type;
mtmp->mappearance = appear;
- if (ap_type == M_AP_OBJECT && (appear == STATUE || appear == CORPSE
- || appear == FIGURINE || appear == EGG)) {
+ /* when appearing as an object based on a monster type, pick a shape */
+ if (ap_type == M_AP_OBJECT
+ && (appear == STATUE || appear == FIGURINE
+ || appear == CORPSE || appear == EGG || appear == TIN)) {
+ int mndx = rndmonnum(),
+ nocorpse_ndx = (mvitals[mndx].mvflags & G_NOCORPSE) != 0;
+
+ if (appear == CORPSE && nocorpse_ndx)
+ mndx = rn1(PM_WIZARD - PM_ARCHEOLOGIST + 1, PM_ARCHEOLOGIST);
+ else if ((appear == EGG && !can_be_hatched(mndx))
+ || (appear == TIN && nocorpse_ndx))
+ mndx = NON_PM; /* revert to generic egg or empty tin */
+
newmcorpsenm(mtmp);
- MCORPSENM(mtmp) = rndmonnum();
- if (appear == EGG && !can_be_hatched(MCORPSENM(mtmp)))
- MCORPSENM(mtmp) = NON_PM; /* revert to generic egg */
+ MCORPSENM(mtmp) = mndx;
}
+
+ if (does_block(mx, my, &levl[mx][my]))
+ block_point(mx, my);
}
/* release monster from bag of tricks; return number of monsters created */
impossible("bad bag o' tricks");
} else if (bag->spe < 1) {
/* if tipping known empty bag, give normal empty container message */
+/*JP
pline1((tipping && bag->cknown) ? "It's empty." : nothing_happens);
+*/
+ pline1((tipping && bag->cknown) ? "\82»\82ê\82Í\8bó\82¾\81D" : nothing_happens);
/* now known to be empty if sufficiently discovered */
if (bag->dknown && objects[bag->otyp].oc_name_known)
bag->cknown = 1;
if (bag->dknown)
makeknown(BAG_OF_TRICKS);
} else if (!tipping) {
+/*JP
pline1(!moncount ? nothing_happens : "Nothing seems to happen.");
+*/
+ pline1(!moncount ? nothing_happens : "\89½\82à\8bN\82«\82È\82©\82Á\82½\82æ\82¤\82¾\81D");
}
}
return moncount;
OSDN Git Service
