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

rephrase some livelog messages

Browse Source 
From entrez:  rephrase the terse livelog messages so that they form
complete sentences.
This commit is contained in:
PatR
2022-07-08 18:24:36 -07:00
parent c536c6920d
commit 6249fa7e54
5 changed files with 29 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
src/eat.c
View File

@@ -537,21 +537,21 @@ eating_conducts(struct permonst *pd)
int ll_conduct = 0;
if (!u.uconduct.food++) {
livelog_printf(LL_CONDUCT, "ate for first time - %s",
livelog_printf(LL_CONDUCT, "ate for the first time - %s",
pd->pmnames[NEUTRAL]);
ll_conduct++;
}
if (!vegan(pd)) {
if (!u.uconduct.unvegan++ && !ll_conduct) {
livelog_printf(LL_CONDUCT,
"consumed animal products (%s) for first time",
"consumed animal products (%s) for the first time",
pd->pmnames[NEUTRAL]);
ll_conduct++;
}
}
if (!vegetarian(pd)) {
if (!u.uconduct.unvegetarian && !ll_conduct)
livelog_printf(LL_CONDUCT, "tasted meat (%s) for first time",
livelog_printf(LL_CONDUCT, "tasted meat (%s) for the first time",
pd->pmnames[NEUTRAL]);
violated_vegetarian();
}
@@ -1140,7 +1140,7 @@ cpostfx(int pm)
if (!u.uconduct.polyselfs++) /* you're changing form */
livelog_printf(LL_CONDUCT,
"changed form for first time by mimicking %s",
"changed form for the first time by mimicking %s",
Hallucination ? "an orange" : "a pile of gold");
You_cant("resist the temptation to mimic %s.",
Hallucination ? "an orange" : "a pile of gold");
@@ -1557,7 +1557,7 @@ consume_tin(const char *mesg)
*/
/* don't need vegetarian checks for spinach */
if (!u.uconduct.food++)
livelog_printf(LL_CONDUCT, "ate for first time (spinach)");
livelog_printf(LL_CONDUCT, "ate for the first time (spinach)");
if (!tin->cursed)
pline("This makes you feel like %s!",
/* "Swee'pea" is a character from the Popeye cartoons */
@@ -1754,14 +1754,14 @@ eatcorpse(struct obj *otmp)
if (!vegan(&mons[mnum]))
if (!u.uconduct.unvegan++) {
livelog_printf(LL_CONDUCT,
"consumed animal products for first time, by eating %s",
"consumed animal products for the first time, by eating %s",
an(food_xname(otmp, FALSE)));
ll_conduct++;
}
if (!vegetarian(&mons[mnum])) {
if (!u.uconduct.unvegetarian && !ll_conduct)
livelog_printf(LL_CONDUCT,
"tasted meat for first time, by eating %s",
"tasted meat for the first time, by eating %s",
an(food_xname(otmp, FALSE)));
violated_vegetarian();
}
@@ -2712,7 +2712,7 @@ doeat(void)
if (!u.uconduct.food++) {
ll_conduct++;
livelog_printf(LL_CONDUCT, "ate for first time (%s)",
livelog_printf(LL_CONDUCT, "ate for the first time (%s)",
food_xname(otmp, FALSE));
}
material = objects[otmp->otyp].oc_material;
@@ -2720,14 +2720,14 @@ doeat(void)
|| material == DRAGON_HIDE || material == WAX) {
if (!u.uconduct.unvegan++ && !ll_conduct) {
livelog_printf(LL_CONDUCT,
"consumed animal products for first time, by eating %s",
"consumed animal products for the first time, by eating %s",
an(food_xname(otmp, FALSE)));
ll_conduct++;
}
if (material != WAX) {
if (!u.uconduct.unvegetarian && !ll_conduct)
livelog_printf(LL_CONDUCT,
"tasted meat by-products for first time, by eating %s",
"tasted meat by-products for the first time, by eating %s",
an(food_xname(otmp, FALSE)));
violated_vegetarian();
}
@@ -2795,7 +2795,7 @@ doeat(void)
/* KMH, conduct */
if (!u.uconduct.food++) {
livelog_printf(LL_CONDUCT, "ate for first time - %s",
livelog_printf(LL_CONDUCT, "ate for the first time - %s",
food_xname(otmp, FALSE));
ll_conduct++;
}
@@ -2830,14 +2830,14 @@ doeat(void)
case FLESH:
if (!u.uconduct.unvegan++ && !ll_conduct) {
livelog_printf(LL_CONDUCT,
"consumed animal products for first time, by eating %s",
"consumed animal products for the first time, by eating %s",
an(food_xname(otmp, FALSE)));
ll_conduct++;
}
if (otmp->otyp != EGG) {
if (!u.uconduct.unvegetarian && !ll_conduct)
livelog_printf(LL_CONDUCT,
"tasted meat for first time, by eating %s",
"tasted meat for the first time, by eating %s",
an(food_xname(otmp, FALSE)));
violated_vegetarian();
@@ -2849,7 +2849,7 @@ doeat(void)
|| otmp->otyp == LUMP_OF_ROYAL_JELLY)
if (!u.uconduct.unvegan++ && !ll_conduct)
livelog_printf(LL_CONDUCT,
"consumed animal products (%s) for first time",
"consumed animal products (%s) for the first time",
food_xname(otmp, FALSE));
break;
}

3
src/engrave.c
View File

@@ -1074,7 +1074,8 @@ doengrave(void)
/* A single `x' is the traditional signature of an illiterate person */
if (len != 1 || (!index(ebuf, 'x') && !index(ebuf, 'X')))
if (!u.uconduct.literate++)
livelog_printf(LL_CONDUCT, "became literate by engraving \"%s\"", ebuf);
livelog_printf(LL_CONDUCT, "became literate by engraving \"%s\"",
ebuf);
/* Mix up engraving if surface or state of mind is unsound.
Note: this won't add or remove any spaces. */

6
src/minion.c
View File

@@ -331,14 +331,10 @@ demon_talk(register struct monst *mtmp)
if (!Deaf && ((offer = bribe(mtmp)) >= demand)) {
pline("%s vanishes, laughing about cowardly mortals.",
Amonnam(mtmp));
livelog_printf(LL_UMONST, "bribed %s with %ld %s for safe passage",
Amonnam(mtmp), offer, currency(offer));
} else if (offer > 0L
&& (long) rnd(5 * ACURR(A_CHA)) > (demand - offer)) {
pline("%s scowls at you menacingly, then vanishes.",
Amonnam(mtmp));
livelog_printf(LL_UMONST, "bribed %s with %ld %s for safe passage",
Amonnam(mtmp), offer, currency(offer));
} else {
pline("%s gets angry...", Amonnam(mtmp));
mtmp->mpeaceful = 0;
@@ -346,6 +342,8 @@ demon_talk(register struct monst *mtmp)
return 0;
}
}
livelog_printf(LL_UMONST, "bribed %s with %ld %s for safe passage",
Amonnam(mtmp), offer, currency(offer));
mongone(mtmp);
return 1;
}

16
src/pray.c
View File

@@ -830,7 +830,7 @@ gcrownu(void)
? "take lives"
: "steal souls");
verbalize("Thou art chosen to %s for My Glory!", what);
livelog_printf(LL_DIVINEGIFT, "chosen to %s for the Glory of %s",
livelog_printf(LL_DIVINEGIFT, "was chosen to %s for the Glory of %s",
what, u_gname());
break;
}
@@ -853,7 +853,7 @@ gcrownu(void)
/* not an artifact, but treat like one for this situation;
classify as a spoiler in case player hasn't IDed the book yet */
livelog_printf(LL_DIVINEGIFT | LL_ARTIFACT | LL_SPOILER,
"bestowed with %s", bbuf);
"was bestowed with %s", bbuf);
/* when getting a new book for known spell, enhance
currently wielded weapon rather than the book */
@@ -876,8 +876,8 @@ gcrownu(void)
if (obj && obj->oartifact == ART_EXCALIBUR) {
u.ugifts++;
livelog_printf(LL_DIVINEGIFT | LL_ARTIFACT,
"wielded %s transformed into %s",
lbuf, artiname(ART_EXCALIBUR));
"had %s wielded %s transformed into %s",
uhis(), lbuf, artiname(ART_EXCALIBUR));
}
}
/* acquire Excalibur's skill regardless of weapon or gift */
@@ -900,7 +900,8 @@ gcrownu(void)
dropy(obj);
u.ugifts++;
livelog_printf(LL_DIVINEGIFT | LL_ARTIFACT,
"bestowed with %s", artiname(ART_VORPAL_BLADE));
"was bestowed with %s",
artiname(ART_VORPAL_BLADE));
}
/* acquire Vorpal Blade's skill regardless of weapon or gift */
unrestrict_weapon_skill(P_LONG_SWORD);
@@ -925,7 +926,8 @@ gcrownu(void)
dropy(obj);
u.ugifts++;
livelog_printf(LL_DIVINEGIFT | LL_ARTIFACT,
"bestowed with %s", artiname(ART_STORMBRINGER));
"was bestowed with %s",
artiname(ART_STORMBRINGER));
}
/* acquire Stormbringer's skill regardless of weapon or gift */
unrestrict_weapon_skill(P_BROAD_SWORD);
@@ -1908,7 +1910,7 @@ dosacrifice(void)
u.ublesscnt = rnz(300 + (50 * nartifacts));
exercise(A_WIS, TRUE);
livelog_printf (LL_DIVINEGIFT | LL_ARTIFACT,
"bestowed with %s by %s",
"was bestowed with %s by %s",
artiname(otmp->oartifact),
align_gname(u.ualign.type));
/* make sure we can use this weapon */

5
src/read.c
View File

@@ -438,7 +438,7 @@ doread(void)
if (!u.uconduct.literate++)
livelog_printf(LL_CONDUCT, "became literate by reading %s",
(otyp == DUNCE_CAP) ? "a dunce cap"
: "a cornuthaum");
: "a cornuthaum");
/* yet another note: despite the fact that player will recognize
the object type, don't make it become a discovery for hero */
@@ -2659,8 +2659,7 @@ do_genocide(int how)
if (!(how & REALLY) && (ptr = rndmonst()) != 0)
break; /* remaining checks don't apply */
livelog_printf(LL_GENOCIDE,
"declined to perform genocide");
livelog_printf(LL_GENOCIDE, "declined to perform genocide");
return;
}