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

Fix: monster gender could not actually be specified in lua files

Browse Source 
Noticed when I tried to create a male monster of a species that permits
both males and females (i.e. not a single-gender or neuter species),
half the time the monster ended up female anyway. This was because
get_table_montype picks a random monster gender for such species, and
lspo_monster just sets it to that, making it impossible to deliberately
have a monster of a certain gender.

This fixes that by defaulting the "female" table argument to random
instead of false, and then checking to see whether the level file set it
to something other than random. If so, it uses that value.

I debated whether this should allow a level designer to make a monster
of a gender that conflicts with their species, such as a male nymph, but
erred on the side of respecting the species. So attempting to specify a
male nymph, etc. will still result in a female one.
This commit is contained in:
copperwater
2022-04-05 07:55:06 -04:00
committed by PatR
parent 093f7452af
commit d196b37b39
1 changed files with 13 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/sp_lev.c
View File

@@ -3109,7 +3109,7 @@ lspo_monster(lua_State *L)
tmpmons.appear = 0;
tmpmons.appear_as.str = (char *) 0;
tmpmons.sp_amask = get_table_align(L);
tmpmons.female = get_table_boolean_opt(L, "female", FALSE);
tmpmons.female = get_table_boolean_opt(L, "female", BOOL_RANDOM);
tmpmons.invis = get_table_boolean_opt(L, "invisible", FALSE);
tmpmons.cancelled = get_table_boolean_opt(L, "cancelled", FALSE);
tmpmons.revived = get_table_boolean_opt(L, "revived", FALSE);
@@ -3152,8 +3152,19 @@ lspo_monster(lua_State *L)
get_table_xy_or_coord(L, &mx, &my);
tmpmons.id = get_table_montype(L, &mgend);
if (mgend != NEUTRAL)
/* get_table_montype will return a random gender if the species isn't
* all-male or all-female; if the level designer specified a certain
* gender, override that random one now, unless it *is* a one-gender
* species, in which case don't override (don't permit creation of a
* male nymph or female Nazgul, etc.) */
if (mgend != NEUTRAL
&& (tmpmons.female == BOOL_RANDOM || is_female(&mons[tmpmons.id])
|| is_male(&mons[tmpmons.id])))
tmpmons.female = mgend;
/* safety net - if find_montype did not find a gender for this species
* (should cause a lua error anyway) */
if (tmpmons.female == BOOL_RANDOM)
tmpmons.female = 0;
tmpmons.class = get_table_monclass(L);