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

extended quest text formatting (trunk only)

Browse Source 
Add questpgr formatting codes to support pronouns for leader,
nemesis, deity, and artifact.
  %lh -> "he" or "she" for leader; %nh for nemesis; %dh for hero's god;
  %li -> "him" or "her"; likewise %ni, %di;
  %lj -> "his" or "her"; and %nj, %dj;
H, I, and J modifiers yield capitalized form of same.
  %oh -> "it" or "they" for artifact (Eyes of the Overworld is plural);
  %oi -> "it" or "them";
  %oj -> "its" or "their"; plus capitalization with uppercase modifiers.
Also, %O yields shortened artifact name ("the Foo" in place of "the Foo
of Bar").  These provide support for terser summary lines, but can also
be used in the regular quest text passages.

     A couple of nemeses don't specify gender.  The random choices need
to be made early so that the leaders' messages can get them right.  This
chooses during role initialization and then uses that result once the
corresponding monster is eventually created.  It does the same for leader
even though no current leader needs it, and for deity too.
This commit is contained in:
nethack.rankin
2009-04-07 02:19:54 +00:00
parent a86187b398
commit e205569714
5 changed files with 103 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/makemon.c
View File

@@ -984,6 +984,13 @@ register int mmflags;
if (is_female(ptr)) mtmp->female = TRUE;
else if (is_male(ptr)) mtmp->female = FALSE;
/* leader and nemesis gender is usually hardcoded in mons[],
but for ones which can be random, it has already been chosen
(in role_init(), for possible use by the quest pager code) */
else if (ptr->msound == MS_LEADER && quest_info(MS_LEADER) == mndx)
mtmp->female = quest_status.ldrgend;
else if (ptr->msound == MS_NEMESIS && quest_info(MS_NEMESIS) == mndx)
mtmp->female = quest_status.nemgend;
else mtmp->female = rn2(2); /* ignored for neuters */
if (In_sokoban(&u.uz) && !mindless(ptr)) /* know about traps here */

55
src/questpgr.c
View File

@@ -22,6 +22,7 @@ STATIC_DCL const char * NDECL(intermed);
STATIC_DCL const char * NDECL(neminame);
STATIC_DCL const char * NDECL(guardname);
STATIC_DCL const char * NDECL(homebase);
STATIC_DCL void FDECL(qtext_pronoun, (CHAR_P,CHAR_P));
STATIC_DCL struct qtmsg * FDECL(msg_in, (struct qtmsg *,int));
STATIC_DCL void FDECL(convert_arg, (CHAR_P));
STATIC_DCL void NDECL(convert_line);
@@ -213,6 +214,42 @@ homebase() /* return your role leader's location */
return(urole.homebase);
}
/* replace deity, leader, nemesis, or artifact name with pronoun;
overwrites cvt_buf[] */
STATIC_OVL void
qtext_pronoun(who, which)
char who, /* 'd' => deity, 'l' => leader, 'n' => nemesis, 'o' => artifact */
which; /* 'h'|'H'|'i'|'I'|'j'|'J' */
{
const char *pnoun;
int g;
char lwhich = lowc(which); /* H,I,J -> h,i,j */
/*
* Invalid subject (not d,l,n,o) yields neuter, singular result.
*
* For %o, treat all artifacts as neuter; some have plural names,
* which genders[] doesn't handle; cvt_buf[] already contains name
* and makesingular() understands how to handle "the foos of bar".
*/
if (who == 'o' && strcmpi(cvt_buf, makesingular(cvt_buf))) {
pnoun = (lwhich == 'h') ? "they" :
(lwhich == 'i') ? "them" :
(lwhich == 'j') ? "their" : "?";
} else {
g = (who == 'd') ? quest_status.godgend :
(who == 'l') ? quest_status.ldrgend :
(who == 'n') ? quest_status.nemgend : 2; /* default to neuter */
pnoun = (lwhich == 'h') ? genders[g].he :
(lwhich == 'i') ? genders[g].him :
(lwhich == 'j') ? genders[g].his : "?";
}
Strcpy(cvt_buf, pnoun);
/* capitalize for H,I,J */
if (lwhich != which) cvt_buf[0] = highc(cvt_buf[0]);
return;
}
STATIC_OVL struct qtmsg *
msg_in(qtm_list, msgnum)
struct qtmsg *qtm_list;
@@ -252,7 +289,15 @@ char c;
break;
case 'i': str = intermed();
break;
case 'O':
case 'o': str = the(artiname(urole.questarti));
if (c == 'O') {
/* shorten "the Foo of Bar" to "the Foo"
(buffer returned by the() is modifiable) */
char *p = strstri(str, " of ");
if (p) *p = '\0';
}
break;
case 'n': str = neminame();
break;
@@ -320,6 +365,16 @@ convert_line()
/* capitalize */
case 'C': cvt_buf[0] = highc(cvt_buf[0]);
break;
/* replace name with pronoun;
valid for %d, %l, %n, and %o */
case 'h': /* he/she */
case 'H': /* He/She */
case 'i': /* him/her */
case 'I':
case 'j': /* his/her */
case 'J': qtext_pronoun(*(c - 1), *c);
break;
/* pluralize */

36
src/role.c
View File

@@ -1578,6 +1578,7 @@ void
role_init()
{
int alignmnt;
struct permonst *pm;
/* Strip the role letter out of the player name.
* This is included for backwards compatibility.
@@ -1623,25 +1624,36 @@ role_init()
/* Fix up the quest leader */
if (urole.ldrnum != NON_PM) {
mons[urole.ldrnum].msound = MS_LEADER;
mons[urole.ldrnum].mflags2 |= (M2_PEACEFUL);
mons[urole.ldrnum].mflags3 |= M3_CLOSE;
mons[urole.ldrnum].maligntyp = alignmnt * 3;
pm = &mons[urole.ldrnum];
pm->msound = MS_LEADER;
pm->mflags2 |= (M2_PEACEFUL);
pm->mflags3 |= M3_CLOSE;
pm->maligntyp = alignmnt * 3;
/* if gender is random, we choose it now instead of waiting
until the leader monster is created */
quest_status.ldrgend = is_neuter(pm) ? 2 : is_female(pm) ? 1 :
is_male(pm) ? 0 : (rn2(100) < 50);
}
/* Fix up the quest guardians */
if (urole.guardnum != NON_PM) {
mons[urole.guardnum].mflags2 |= (M2_PEACEFUL);
mons[urole.guardnum].maligntyp = alignmnt * 3;
pm = &mons[urole.guardnum];
pm->mflags2 |= (M2_PEACEFUL);
pm->maligntyp = alignmnt * 3;
}
/* Fix up the quest nemesis */
if (urole.neminum != NON_PM) {
mons[urole.neminum].msound = MS_NEMESIS;
mons[urole.neminum].mflags2 &= ~(M2_PEACEFUL);
mons[urole.neminum].mflags2 |= (M2_NASTY|M2_STALK|M2_HOSTILE);
mons[urole.neminum].mflags3 &= ~(M3_CLOSE);
mons[urole.neminum].mflags3 |= M3_WANTSARTI | M3_WAITFORU;
pm = &mons[urole.neminum];
pm->msound = MS_NEMESIS;
pm->mflags2 &= ~(M2_PEACEFUL);
pm->mflags2 |= (M2_NASTY|M2_STALK|M2_HOSTILE);
pm->mflags3 &= ~(M3_CLOSE);
pm->mflags3 |= M3_WANTSARTI | M3_WAITFORU;
/* if gender is random, we choose it now instead of waiting
until the nemesis monster is created */
quest_status.nemgend = is_neuter(pm) ? 2 : is_female(pm) ? 1 :
is_male(pm) ? 0 : (rn2(100) < 50);
}
/* Fix up the god names */
@@ -1655,6 +1667,8 @@ role_init()
urole.ngod = roles[flags.pantheon].ngod;
urole.cgod = roles[flags.pantheon].cgod;
}
/* 0 or 1; no gods are neuter, nor is gender randomized */
quest_status.godgend = !strcmpi(align_gtitle(alignmnt), "goddess");
/* Fix up infravision */
if (mons[urace.malenum].mflags3 & M3_INFRAVISION) {