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

some reformatting (3 of 4)

Browse Source
This commit is contained in:
PatR
2024-09-05 15:55:24 -07:00
parent aa043f0ddf
commit cc1066b1ff
19 changed files with 244 additions and 169 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/mhitu.c
View File

@@ -657,10 +657,11 @@ mattacku(struct monst *mtmp)
if (!canspotmon(mtmp))
map_invisible(mtmp->mx, mtmp->my);
if (!youseeit)
pline("%s %s!", Something, (likes_gold(mtmp->data)
&& gy.youmonst.mappearance == GOLD_PIECE)
? "tries to pick you up"
: "disturbs you");
pline("%s %s!", Something,
(likes_gold(mtmp->data)
&& gy.youmonst.mappearance == GOLD_PIECE)
? "tries to pick you up"
: "disturbs you");
else /* see note about m_monnam() above */
pline("Wait, %s! That %s is really %s named %s!", m_monnam(mtmp),
mimic_obj_name(&gy.youmonst),
@@ -1089,7 +1090,8 @@ magic_negation(struct monst *mon)
protection is too easy); it confers minimum mc 1 instead of 0 */
if ((is_you && ((HProtection && u.ublessed > 0) || u.uspellprot))
/* aligned priests and angels have innate intrinsic Protection */
|| (mon->data == &mons[PM_ALIGNED_CLERIC] || is_minion(mon->data)))
|| (mon->data == &mons[PM_ALIGNED_CLERIC]
|| is_minion(mon->data)))
mc = 1;
}
return mc;
@@ -1866,7 +1868,7 @@ mdamageu(struct monst *mtmp, int n)
int
could_seduce(
struct monst *magr, struct monst *mdef,
struct attack *mattk) /* non-Null: current atk; Null: general capability */
struct attack *mattk) /* non-Null: current atk; Null: genrl capability */
{
struct permonst *pagr;
boolean agrinvis, defperc;
@@ -1994,7 +1996,7 @@ doseduce(struct monst *mon)
/* confirmation prompt when charisma is high bypassed if deaf */
if (!Deaf && rn2(20) < ACURR(A_CHA)) {
(void) safe_qbuf(qbuf, "\"That ",
" looks pretty. Would you wear it for me?\"",
" looks pretty. Would you wear it for me?\"",
ring, xname, simpleonames, "ring");
makeknown(RIN_ADORNMENT);
SetVoice(mon, 0, 80, 0);
@@ -2250,7 +2252,7 @@ mayberem(struct monst *mon,
if (Deaf) {
pline("%s takes off your %s.", seducer, str);
} else if (rn2(20) < ACURR(A_CHA)) {
SetVoice(mon, 0, 80, 0); /* y_n a.k.a. yn_function is set up for this */
SetVoice(mon, 0, 80, 0); /* y_n aka yn_function is set up for this */
Sprintf(qbuf, "\"Shall I remove your %s, %s?\"", str,
(!rn2(2) ? "lover" : !rn2(2) ? "dear" : "sweetheart"));
if (y_n(qbuf) == 'n')