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

Rolling boulder launch coordinates

Browse Source 
Allow defining rolling boulder launching location in special level
lua scripts:

 des.trap({ type="rolling boulder", coord={7, 5}, launchfrom={-2, -2} });

launchfrom is relative to the trap coord.
This commit is contained in:
Pasi Kallinen
2022-03-12 18:34:40 +02:00
parent 625571062e
commit 4be6fb0df9
3 changed files with 21 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/sp_lev.c
View File

@@ -4123,6 +4123,16 @@ lspo_trap(lua_State *L)
tmptrap.type = get_table_traptype_opt(L, "type", -1);
tmptrap.spider_on_web = get_table_boolean_opt(L, "spider_on_web", 1);
tmptrap.seen = get_table_boolean_opt(L, "seen", FALSE);
lua_getfield(L, -1, "launchfrom");
if (lua_type(L, -1) == LUA_TTABLE) {
int lx = -1, ly = -1;
get_coord(L, -1, &lx, &ly);
lua_pop(L, 1);
g.launchplace.x = lx;
g.launchplace.y = ly;
}
}
if (tmptrap.type == NO_TRAP)
@@ -4134,6 +4144,7 @@ lspo_trap(lua_State *L)
tmptrap.coord = SP_COORD_PACK(x, y);
create_trap(&tmptrap, g.coder->croom);
g.launchplace.x = g.launchplace.y = 0;
return 0;
}

8
src/trap.c
View File

@@ -3030,6 +3030,14 @@ find_random_launch_coord(struct trap *ttmp, coord *cc)
if (!ttmp || !cc)
return FALSE;
bcc.x = ttmp->tx + g.launchplace.x;
bcc.y = ttmp->ty + g.launchplace.y;
if (isok(bcc.x, bcc.y) && linedup(ttmp->tx, ttmp->ty, bcc.x, bcc.y, 1)) {
cc->x = bcc.x;
cc->y = bcc.y;
return TRUE;
}
if (ttmp->ttyp == ROLLING_BOULDER_TRAP)
mindist = 2;
distance = rn1(5, 4); /* 4..8 away */