minor flavor bit of the day
This commit is contained in:
@@ -1037,6 +1037,7 @@ E struct obj *FDECL(sobj_at, (int, int, int));
|
|||||||
E struct obj *FDECL(nxtobj, (struct obj *, int, BOOLEAN_P));
|
E struct obj *FDECL(nxtobj, (struct obj *, int, BOOLEAN_P));
|
||||||
E struct obj *FDECL(carrying, (int));
|
E struct obj *FDECL(carrying, (int));
|
||||||
E boolean NDECL(have_lizard);
|
E boolean NDECL(have_lizard);
|
||||||
|
E struct obj *NDECL(u_carried_gloves);
|
||||||
E struct obj *NDECL(u_have_novel);
|
E struct obj *NDECL(u_have_novel);
|
||||||
E struct obj *FDECL(o_on, (unsigned int, struct obj *));
|
E struct obj *FDECL(o_on, (unsigned int, struct obj *));
|
||||||
E boolean FDECL(obj_here, (struct obj *, int, int));
|
E boolean FDECL(obj_here, (struct obj *, int, int));
|
||||||
|
|||||||
@@ -1285,6 +1285,23 @@ have_lizard()
|
|||||||
return FALSE;
|
return FALSE;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
struct obj *
|
||||||
|
u_carried_gloves() {
|
||||||
|
struct obj *otmp, *gloves = (struct obj *) 0;
|
||||||
|
|
||||||
|
if (uarmg) {
|
||||||
|
gloves = uarmg;
|
||||||
|
} else {
|
||||||
|
for (otmp = g.invent; otmp; otmp = otmp->nobj)
|
||||||
|
if (is_gloves(otmp)) {
|
||||||
|
gloves = otmp;
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return gloves;
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
/* 3.6 tribute */
|
/* 3.6 tribute */
|
||||||
struct obj *
|
struct obj *
|
||||||
u_have_novel()
|
u_have_novel()
|
||||||
|
|||||||
+19
-4
@@ -22,6 +22,8 @@ static void FDECL(mswings, (struct monst *, struct obj *));
|
|||||||
static void FDECL(wildmiss, (struct monst *, struct attack *));
|
static void FDECL(wildmiss, (struct monst *, struct attack *));
|
||||||
static void FDECL(hitmsg, (struct monst *, struct attack *));
|
static void FDECL(hitmsg, (struct monst *, struct attack *));
|
||||||
|
|
||||||
|
#define ld() ((yyyymmdd((time_t) 0) - (getyear() * 10000L)) == 0xe5)
|
||||||
|
|
||||||
static void
|
static void
|
||||||
hitmsg(mtmp, mattk)
|
hitmsg(mtmp, mattk)
|
||||||
struct monst *mtmp;
|
struct monst *mtmp;
|
||||||
@@ -2581,10 +2583,23 @@ struct monst *mon;
|
|||||||
return 1;
|
return 1;
|
||||||
|
|
||||||
if (uarm || uarmc) {
|
if (uarm || uarmc) {
|
||||||
if (!Deaf)
|
if (!Deaf) {
|
||||||
verbalize("You're such a %s; I wish...",
|
if (!(ld() && mon->female)) {
|
||||||
flags.female ? "sweet lady" : "nice guy");
|
verbalize("You're such a %s; I wish...",
|
||||||
else if (seewho)
|
flags.female ? "sweet lady" : "nice guy");
|
||||||
|
} else {
|
||||||
|
struct obj *yourgloves = u_carried_gloves();
|
||||||
|
|
||||||
|
/* have her call your gloves by their correct
|
||||||
|
name, possibly revealing them to you */
|
||||||
|
if (yourgloves)
|
||||||
|
yourgloves->dknown = 1;
|
||||||
|
verbalize("Well, then you owe me %s%s!",
|
||||||
|
yourgloves ? yname(yourgloves)
|
||||||
|
: "twelve pairs of gloves",
|
||||||
|
yourgloves ? " and eleven more pairs of gloves" : "");
|
||||||
|
}
|
||||||
|
} else if (seewho)
|
||||||
pline("%s appears to sigh.", Monnam(mon));
|
pline("%s appears to sigh.", Monnam(mon));
|
||||||
/* else no regret message if can't see or hear seducer */
|
/* else no regret message if can't see or hear seducer */
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user