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

Helltweaks: improve lava river

Browse Source 
The lava river will now draw another river, until a certain
amount of map locations have been turned into lava, so you don't
get a teensy "river" made out of 2 lava pools.

Add a lua selection method to count the number of locations
in the selection.
This commit is contained in:
Pasi Kallinen
2023-01-30 17:07:40 +02:00
parent c7464e8aa5
commit 744d64487b
4 changed files with 91 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
src/nhlsel.c
View File

@@ -12,6 +12,7 @@ static struct selectionvar *l_selection_push_new(lua_State *);
/* lua_CFunction prototypes */
static int l_selection_new(lua_State *);
static int l_selection_clone(lua_State *);
static int l_selection_numpoints(lua_State *);
static int l_selection_getpoint(lua_State *);
static int l_selection_setpoint(lua_State *);
static int l_selection_filter_percent(lua_State *);
@@ -195,6 +196,27 @@ l_selection_setpoint(lua_State *L)
return 1;
}
/* local numpoints = selection.numpoints(sel); */
static int
l_selection_numpoints(lua_State *L)
{
struct selectionvar *sel = l_selection_check(L, 1);
coordxy x, y;
int ret = 0;
NhRect rect;
selection_getbounds(sel, &rect);
for (x = rect.lx; x <= rect.hx; x++)
for (y = rect.ly; y <= rect.hy; y++)
if (selection_getpoint(x, y, sel))
ret++;
lua_settop(L, 0);
lua_pushinteger(L, ret);
return 1;
}
/* local value = selection.get(sel, x, y); */
static int
l_selection_getpoint(lua_State *L)
@@ -911,6 +933,7 @@ static const struct luaL_Reg l_selection_methods[] = {
{ "clone", l_selection_clone },
{ "get", l_selection_getpoint },
{ "set", l_selection_setpoint },
{ "numpoints", l_selection_numpoints },
{ "negate", l_selection_not },
{ "percentage", l_selection_filter_percent },
{ "rndcoord", l_selection_rndcoord },