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

Accessibility: pet message locations

Browse Source
This commit is contained in:
Pasi Kallinen
2024-12-14 15:00:43 +02:00
parent fd23463941
commit 4f37795f96
2 changed files with 24 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
src/dog.c
View File

@@ -791,8 +791,9 @@ keepdogs(
mdrop_special_objs(mtmp); /* drop Amulet */ mdrop_special_objs(mtmp); /* drop Amulet */
} else if (mtmp->meating || mtmp->mtrapped) { } else if (mtmp->meating || mtmp->mtrapped) {
if (canseemon(mtmp)) if (canseemon(mtmp))
pline("%s is still %s.", Monnam(mtmp), pline_xy(mtmp->mx, mtmp->my,
mtmp->meating ? "eating" : "trapped"); "%s is still %s.", Monnam(mtmp),
mtmp->meating ? "eating" : "trapped");
stay_behind = TRUE; stay_behind = TRUE;
} else if (mon_has_amulet(mtmp)) { } else if (mon_has_amulet(mtmp)) {
if (canseemon(mtmp)) if (canseemon(mtmp))
@@ -1127,7 +1128,7 @@ tamedog(
/* worst case, at least it'll be peaceful. */ /* worst case, at least it'll be peaceful. */
if (givemsg && !mtmp->mpeaceful && canspotmon(mtmp)) { if (givemsg && !mtmp->mpeaceful && canspotmon(mtmp)) {
pline("%s seems %s.", Monnam(mtmp), pline_xy(mtmp->mx, mtmp->my, "%s seems %s.", Monnam(mtmp),
Hallucination ? "really chill" : "more amiable"); Hallucination ? "really chill" : "more amiable");
givemsg = FALSE; /* don't give another message below */ givemsg = FALSE; /* don't give another message below */
} }
@@ -1162,8 +1163,9 @@ tamedog(
boolean big_corpse = boolean big_corpse =
(obj->otyp == CORPSE && ismnum(obj->corpsenm) (obj->otyp == CORPSE && ismnum(obj->corpsenm)
&& mons[obj->corpsenm].msize > mtmp->data->msize); && mons[obj->corpsenm].msize > mtmp->data->msize);
pline("%s catches %s%s", Monnam(mtmp), the(xname(obj)), pline_xy(mtmp->mx, mtmp->my,
!big_corpse ? "." : ", or vice versa!"); "%s catches %s%s", Monnam(mtmp), the(xname(obj)),
!big_corpse ? "." : ", or vice versa!");
} else if (cansee(mtmp->mx, mtmp->my)) } else if (cansee(mtmp->mx, mtmp->my))
pline("%s.", Tobjnam(obj, "stop")); pline("%s.", Tobjnam(obj, "stop"));
/* dog_eat expects a floor object */ /* dog_eat expects a floor object */
@@ -1223,7 +1225,7 @@ tamedog(
} }
if (givemsg && canspotmon(mtmp)) if (givemsg && canspotmon(mtmp))
pline("%s seems quite %s.", Monnam(mtmp), pline_xy(mtmp->mx, mtmp->my, "%s seems quite %s.", Monnam(mtmp),
Hallucination ? "approachable" : "friendly"); Hallucination ? "approachable" : "friendly");
newsym(mtmp->mx, mtmp->my); newsym(mtmp->mx, mtmp->my);
@@ -1270,11 +1272,13 @@ wary_dog(struct monst *mtmp, boolean was_dead)
if (!quietly && cansee(mtmp->mx, mtmp->my)) { if (!quietly && cansee(mtmp->mx, mtmp->my)) {
if (haseyes(gy.youmonst.data)) { if (haseyes(gy.youmonst.data)) {
if (haseyes(mtmp->data)) if (haseyes(mtmp->data))
pline("%s %s to look you in the %s.", Monnam(mtmp), pline_xy(mtmp->mx, mtmp->my,
mtmp->mpeaceful ? "seems unable" : "refuses", "%s %s to look you in the %s.", Monnam(mtmp),
body_part(EYE)); mtmp->mpeaceful ? "seems unable" : "refuses",
body_part(EYE));
else else
pline("%s avoids your gaze.", Monnam(mtmp)); pline_xy(mtmp->mx, mtmp->my,
"%s avoids your gaze.", Monnam(mtmp));
} }
} }
} else { } else {
@@ -1286,7 +1290,7 @@ wary_dog(struct monst *mtmp, boolean was_dead)
if (!mtmp->mtame) { if (!mtmp->mtame) {
if (!quietly && canspotmon(mtmp)) if (!quietly && canspotmon(mtmp))
pline("%s %s.", Monnam(mtmp), pline_xy(mtmp->mx, mtmp->my, "%s %s.", Monnam(mtmp),
mtmp->mpeaceful ? "is no longer tame" : "has become feral"); mtmp->mpeaceful ? "is no longer tame" : "has become feral");
newsym(mtmp->mx, mtmp->my); newsym(mtmp->mx, mtmp->my);
/* a life-saved monster might be leashed; /* a life-saved monster might be leashed;

16
src/dogmove.c
View File

@@ -283,9 +283,9 @@ dog_eat(struct monst *mtmp,
result won't be printed */ result won't be printed */
obj_name = distant_name(obj, doname); obj_name = distant_name(obj, doname);
if (tunnels(mtmp->data)) if (tunnels(mtmp->data))
pline("%s digs in.", noit_Monnam(mtmp)); pline_xy(mtmp->mx, mtmp->my, "%s digs in.", noit_Monnam(mtmp));
else else
pline("%s %s %s.", noit_Monnam(mtmp), pline_xy(mtmp->mx, mtmp->my, "%s %s %s.", noit_Monnam(mtmp),
devour ? "devours" : "eats", obj_name); devour ? "devours" : "eats", obj_name);
} else if (seeobj) { } else if (seeobj) {
obj_name = distant_name(obj, doname); obj_name = distant_name(obj, doname);
@@ -335,7 +335,7 @@ dog_starve(struct monst *mtmp)
if (mtmp->mleashed && mtmp != u.usteed) if (mtmp->mleashed && mtmp != u.usteed)
Your("leash goes slack."); Your("leash goes slack.");
else if (cansee(mtmp->mx, mtmp->my)) else if (cansee(mtmp->mx, mtmp->my))
pline("%s starves.", Monnam(mtmp)); pline_xy(mtmp->mx, mtmp->my, "%s starves.", Monnam(mtmp));
else else
You_feel("%s for a moment.", You_feel("%s for a moment.",
Hallucination ? "bummed" : "sad"); Hallucination ? "bummed" : "sad");
@@ -363,7 +363,8 @@ dog_hunger(struct monst *mtmp, struct edog *edog)
return TRUE; return TRUE;
} }
if (cansee(mtmp->mx, mtmp->my)) if (cansee(mtmp->mx, mtmp->my))
pline("%s is confused from hunger.", Monnam(mtmp)); pline_xy(mtmp->mx, mtmp->my,
"%s is confused from hunger.", Monnam(mtmp));
else if (couldsee(mtmp->mx, mtmp->my)) else if (couldsee(mtmp->mx, mtmp->my))
beg(mtmp); beg(mtmp);
else else
@@ -1263,8 +1264,8 @@ dog_move(
if (info[chi] & ALLOW_U) { if (info[chi] & ALLOW_U) {
if (mtmp->mleashed) { /* play it safe */ if (mtmp->mleashed) { /* play it safe */
pline("%s breaks loose of %s leash!", Monnam(mtmp), pline_xy(mtmp->mx, mtmp->my, "%s breaks loose of %s leash!",
mhis(mtmp)); Monnam(mtmp), mhis(mtmp));
m_unleash(mtmp, FALSE); m_unleash(mtmp, FALSE);
} }
(void) mattacku(mtmp); (void) mattacku(mtmp);
@@ -1288,7 +1289,8 @@ dog_move(
? vobj_at(nix, niy) : 0; ? vobj_at(nix, niy) : 0;
const char *what = o ? distant_name(o, doname) : something; const char *what = o ? distant_name(o, doname) : something;
pline("%s %s reluctantly %s %s.", noit_Monnam(mtmp), pline_xy(mtmp->mx, mtmp->my, "%s %s reluctantly %s %s.",
noit_Monnam(mtmp),
vtense((char *) 0, locomotion(mtmp->data, "step")), vtense((char *) 0, locomotion(mtmp->data, "step")),
(is_flyer(mtmp->data) || is_floater(mtmp->data)) ? "over" (is_flyer(mtmp->data) || is_floater(mtmp->data)) ? "over"
: "onto", : "onto",