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

Add Garden themeroom

Browse Source 
Contains some wood nymphs and fountains, and the room walls are trees.

Adds a new lua hook for themeroom generation, "post_level_generate",
which is called last when generating the level.
This commit is contained in:
Pasi Kallinen
2024-04-20 19:24:28 +03:00
parent 59bd1ce687
commit a429eed984
2 changed files with 82 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
src/mklev.c
View File

@@ -22,6 +22,7 @@ staticfn int mkinvk_check_wall(coordxy x, coordxy y);
staticfn void mk_knox_portal(coordxy, coordxy);
staticfn void makevtele(void);
staticfn void fill_ordinary_room(struct mkroom *, boolean) NONNULLARG1;
staticfn void themerooms_post_level_generate(void);
staticfn void makelevel(void);
staticfn boolean bydoor(coordxy, coordxy);
staticfn void mktrap_victim(struct trap *);
@@ -333,11 +334,6 @@ makerooms(void)
lua_getglobal(themes, "post_themerooms_generate");
nhl_pcall_handle(themes, 0, 0, "makerooms-3", NHLpa_panic);
iflags.in_lua = gi.in_mk_themerooms = FALSE;
wallification(1, 0, COLNO - 1, ROWNO - 1);
free(gc.coder);
gc.coder = NULL;
lua_gc(themes, LUA_GCCOLLECT);
}
}
@@ -1076,6 +1072,29 @@ fill_ordinary_room(
}
}
staticfn void
themerooms_post_level_generate(void)
{
lua_State *themes = (lua_State *) gl.luathemes[u.uz.dnum];
/* themes should already be loaded by makerooms();
* if not, we don't run this either */
if (!themes)
return;
reset_xystart_size();
iflags.in_lua = gi.in_mk_themerooms = TRUE;
gt.themeroom_failed = FALSE;
lua_getglobal(themes, "post_level_generate");
nhl_pcall_handle(themes, 0, 0, "post_level_generate", NHLpa_panic);
iflags.in_lua = gi.in_mk_themerooms = FALSE;
wallification(1, 0, COLNO - 1, ROWNO - 1);
free(gc.coder);
gc.coder = NULL;
lua_gc(themes, LUA_GCCOLLECT);
}
staticfn void
makelevel(void)
{
@@ -1241,6 +1260,8 @@ makelevel(void)
fill_special_room(&gr.rooms[i]);
}
themerooms_post_level_generate();
if (gl.luacore && nhcb_counts[NHCB_LVL_ENTER]) {
lua_getglobal(gl.luacore, "nh_callback_run");
lua_pushstring(gl.luacore, nhcb_name[NHCB_LVL_ENTER]);