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

Lua: accept different params for gold function

Browse Source
This commit is contained in:
Pasi Kallinen
2020-02-26 17:57:47 +02:00
parent 7a54edf91f
commit 816079c8dd
2 changed files with 26 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
src/sp_lev.c
View File

@@ -3935,11 +3935,15 @@ lua_State *L;
return 0; return 0;
} }
/* gold(500, 3,5); */
/* gold(500, {5, 6}); */
/* gold({ amount = 500, x = 2, y = 5 });*/ /* gold({ amount = 500, x = 2, y = 5 });*/
/* gold(); */
int int
lspo_gold(L) lspo_gold(L)
lua_State *L; lua_State *L;
{ {
int argc = lua_gettop(L);
schar x, y; schar x, y;
long amount; long amount;
long gcoord; long gcoord;
@@ -3947,16 +3951,31 @@ lua_State *L;
create_des_coder(); create_des_coder();
lcheck_param_table(L); if (argc == 3) {
amount = luaL_checkinteger(L, 1);
x = gx = luaL_checkinteger(L, 2);
y = gy = luaL_checkinteger(L, 2);
} else if (argc == 2 && lua_type(L, 2) == LUA_TTABLE) {
amount = luaL_checkinteger(L, 1);
get_coord(L, 2, &gx, &gy);
x = gx;
y = gy;
} else if (argc == 0 || (argc == 1 && lua_type(L, 1) == LUA_TTABLE)) {
lcheck_param_table(L);
x = gx = get_table_int_opt(L, "x", -1); amount = get_table_int_opt(L, "amount", -1);
y = gy = get_table_int_opt(L, "y", -1); x = gx = get_table_int_opt(L, "x", -1);
y = gy = get_table_int_opt(L, "y", -1);
} else {
nhl_error(L, "Wrong parameters");
return 0;
}
if (x == -1 && y == -1) if (x == -1 && y == -1)
gcoord = SP_COORD_PACK_RANDOM(0); gcoord = SP_COORD_PACK_RANDOM(0);
else else
gcoord = SP_COORD_PACK(gx, gy); gcoord = SP_COORD_PACK(gx, gy);
amount = get_table_int_opt(L, "amount", -1);
get_location_coord(&x, &y, DRY, g.coder->croom, gcoord); get_location_coord(&x, &y, DRY, g.coder->croom, gcoord);
if (amount < 0) if (amount < 0)
amount = rnd(200); amount = rnd(200);

3
test/test_des.lua
View File

@@ -211,6 +211,9 @@ end
function test_gold() function test_gold()
des.gold({ amount = 999, x = 40, y = 07 }); des.gold({ amount = 999, x = 40, y = 07 });
des.gold();
des.gold(666, 41,07);
des.gold(123, {42,07});
end end
function test_trap() function test_trap()