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

Fix: gender, historicity of stoned monster statue

Browse Source 
The way statues of stoned unique monsters were marked as "historic" was
not changed when mkcorpstat flags were updated in 04a8ddc, resulting in
unique statues which were no longer marked as historic and were instead
marked as female.

While fixing that, also use the gender-related mkcorpstat flags to
assign the gender of a stoned monster to the resulting statue.
This commit is contained in:
Michael Meyer
2021-12-02 18:45:57 -05:00
committed by PatR
parent 6ae05df1c3
commit 4b20ed6211
1 changed files with 9 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/mon.c
View File

@@ -2695,6 +2695,7 @@ monstone(struct monst* mdef)
if ((int) mdef->data->msize > MZ_TINY
|| !rn2(2 + ((int) (mdef->data->geno & G_FREQ) > 2))) {
unsigned corpstatflags = CORPSTAT_NONE;
oldminvent = 0;
/* some objects may end up outside the statue */
while ((obj = mdef->minvent) != 0) {
@@ -2719,7 +2720,14 @@ monstone(struct monst* mdef)
/* defer statue creation until after inventory removal
so that saved monster traits won't retain any stale
item-conferred attributes */
otmp = mkcorpstat(STATUE, mdef, mdef->data, x, y, CORPSTAT_NONE);
if (mdef->female)
corpstatflags |= CORPSTAT_FEMALE;
else if (!is_neuter(mdef->data))
corpstatflags |= CORPSTAT_MALE;
/* Archeologists should not break unique statues */
if (mdef->data->geno & G_UNIQ)
corpstatflags |= CORPSTAT_HISTORIC;
otmp = mkcorpstat(STATUE, mdef, mdef->data, x, y, corpstatflags);
if (has_mgivenname(mdef))
otmp = oname(otmp, MGIVENNAME(mdef));
while ((obj = oldminvent) != 0) {
@@ -2727,9 +2735,6 @@ monstone(struct monst* mdef)
obj->nobj = 0; /* avoid merged-> obfree-> dealloc_obj-> panic */
(void) add_to_container(otmp, obj);
}
/* Archeologists should not break unique statues */
if (mdef->data->geno & G_UNIQ)
otmp->spe = 1;
otmp->owt = weight(otmp);
} else
otmp = mksobj_at(ROCK, x, y, TRUE, FALSE);