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

Allow some makemon flags in lua monster creation

Browse Source 
Also document the des.monster hash parameter values.
This commit is contained in:
Pasi Kallinen
2021-06-24 14:38:01 +03:00
parent 8dfe963652
commit 3ddb2a91c7
3 changed files with 48 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/sp_lev.c
View File

@@ -1865,7 +1865,7 @@ create_monster(monster* m, struct mkroom* croom)
else if (PM_ARCHEOLOGIST <= m->id && m->id <= PM_WIZARD)
mtmp = mk_mplayer(pm, x, y, FALSE);
else
mtmp = makemon(pm, x, y, NO_MM_FLAGS);
mtmp = makemon(pm, x, y, m->mm_flags);
if (mtmp) {
x = mtmp->mx, y = mtmp->my; /* sanity precaution */
@@ -3047,6 +3047,7 @@ lspo_monster(lua_State *L)
tmpmons.seentraps = 0;
tmpmons.has_invent = 0;
tmpmons.waiting = 0;
tmpmons.mm_flags = NO_MM_FLAGS;
if (argc == 1 && lua_type(L, 1) == LUA_TSTRING) {
const char *paramstr = luaL_checkstring(L, 1);
@@ -3114,6 +3115,17 @@ lspo_monster(lua_State *L)
tmpmons.seentraps = 0; /* TODO: list of trap names to bitfield */
tmpmons.has_invent = 0;
if (!get_table_int_opt(L, "tail", 1))
tmpmons.mm_flags |= MM_NOTAIL;
if (!get_table_int_opt(L, "group", 1))
tmpmons.mm_flags |= MM_NOGRP;
if (get_table_int_opt(L, "adjacentok", 0))
tmpmons.mm_flags |= MM_ADJACENTOK;
if (get_table_int_opt(L, "ignorewater", 0))
tmpmons.mm_flags |= MM_IGNOREWATER;
if (!get_table_int_opt(L, "countbirth", 1))
tmpmons.mm_flags |= MM_NOCOUNTBIRTH;
mappear = get_table_str_opt(L, "appear_as", NULL);
if (mappear) {
if (!strncmp("obj:", mappear, 4)) {