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

Allow wizmode creating saddled and invisible monsters

Browse Source
This commit is contained in:
Pasi Kallinen
2016-02-05 16:58:13 +02:00
parent d7ae4a3e9d
commit 00935a11c8
1 changed files with 22 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/read.c
+22
View File
@@ -2362,22 +2362,34 @@ boolean
create_particular() create_particular()
{ {
char buf[BUFSZ], *bufp, monclass; char buf[BUFSZ], *bufp, monclass;
char *tmpp;
int which, tryct, i, firstchoice = NON_PM; int which, tryct, i, firstchoice = NON_PM;
struct permonst *whichpm = NULL; struct permonst *whichpm = NULL;
struct monst *mtmp; struct monst *mtmp;
boolean madeany = FALSE; boolean madeany = FALSE;
boolean maketame, makepeaceful, makehostile; boolean maketame, makepeaceful, makehostile;
boolean randmonst = FALSE; boolean randmonst = FALSE;
boolean saddled = FALSE;
boolean invisible = FALSE;
tryct = 5; tryct = 5;
do { do {
monclass = MAXMCLASSES; monclass = MAXMCLASSES;
which = urole.malenum; /* an arbitrary index into mons[] */ which = urole.malenum; /* an arbitrary index into mons[] */
maketame = makepeaceful = makehostile = FALSE; maketame = makepeaceful = makehostile = FALSE;
saddled = invisible = FALSE;
getlin("Create what kind of monster? [type the name or symbol]", buf); getlin("Create what kind of monster? [type the name or symbol]", buf);
bufp = mungspaces(buf); bufp = mungspaces(buf);
if (*bufp == '\033') if (*bufp == '\033')
return FALSE; return FALSE;
if ((tmpp = strstri(bufp, "saddled ")) != 0) {
saddled = TRUE;
memset(tmpp, ' ', sizeof("saddled ")-1);
}
if ((tmpp = strstri(bufp, "invisible ")) != 0) {
invisible = TRUE;
memset(tmpp, ' ', sizeof("invisible ")-1);
}
/* allow the initial disposition to be specified */ /* allow the initial disposition to be specified */
if (!strncmpi(bufp, "tame ", 5)) { if (!strncmpi(bufp, "tame ", 5)) {
bufp += 5; bufp += 5;
@@ -2443,6 +2455,16 @@ create_particular()
mtmp->mpeaceful = makepeaceful ? 1 : 0; mtmp->mpeaceful = makepeaceful ? 1 : 0;
set_malign(mtmp); set_malign(mtmp);
} }
if (saddled && can_saddle(mtmp) && !which_armor(mtmp, W_SADDLE)) {
struct obj *otmp = mksobj(SADDLE, TRUE, FALSE);
(void) mpickobj(mtmp, otmp);
mtmp->misc_worn_check |= W_SADDLE;
otmp->owornmask = W_SADDLE;
otmp->leashmon = mtmp->m_id;
update_mon_intrinsics(mtmp, otmp, TRUE, FALSE);
}
if (invisible)
mon_set_minvis(mtmp);
madeany = TRUE; madeany = TRUE;
/* in case we got a doppelganger instead of what was asked /* in case we got a doppelganger instead of what was asked
for, make it start out looking like what was asked for */ for, make it start out looking like what was asked for */