Mirroristas/rathena
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Added script command getunits (#3389)

Browse Source 
* Closes #3159.
* Adds script commands getunits, getmapunits, and getareaunits.
* Replacement for script commands getusers, getmapusers, getareausers. (In a future commit)
Thanks to @sader1992, @Atemo, and @anacondaqq!
This commit is contained in:
Sader Fawall
2018-10-10 16:33:01 +02:00
committed by Aleos
parent 2e9319afda
commit 10e7035beb
4 changed files with 204 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

87
src/map/script.cpp
View File

@@ -11059,6 +11059,90 @@ BUILDIN_FUNC(getareausers)
return SCRIPT_CMD_SUCCESS;
}
/*==========================================
* getunits(<type>{,<array_variable>[<first value>]})
* getmapunits(<type>,<"map name">{,<array_variable>[<first value>]})
* getareaunits(<type>,<"map name">,<x1>,<y1>,<x2>,<y2>{,<array_variable>[<first value>]})
*------------------------------------------*/
BUILDIN_FUNC(getunits)
{
struct block_list *bl = NULL;
struct map_session_data *sd = NULL;
struct script_data *data = NULL;
char *command = (char *)script_getfuncname(st);
const char *str;
const char *name;
int type = script_getnum(st, 2);
int size = 0;
int32 idx, id;
int16 m = 0, x0 = 0, y0 = 0, x1 = 0, y1 = 0;
struct s_mapiterator *iter = mapit_alloc(MAPIT_NORMAL, bl_type(type));
if (!strcmp(command, "getmapunits"))
{
str = script_getstr(st, 3);
if ((m = map_mapname2mapid(str)) < 0) {
script_pushint(st, -1);
st->state = END;
ShowWarning("buildin_%s: Unknown map '%s'.\n", command, str);
return SCRIPT_CMD_FAILURE;
}
if (script_hasdata(st, 4))
data = script_getdata(st, 4);
}
else if (!strcmp(command, "getareaunits"))
{
str = script_getstr(st, 3);
if ((m = map_mapname2mapid(str)) < 0) {
script_pushint(st, -1);
st->state = END;
ShowWarning("buildin_%s: Unknown map '%s'.\n", command, str);
return SCRIPT_CMD_FAILURE;
}
x0 = script_getnum(st, 4);
y0 = script_getnum(st, 5);
x1 = script_getnum(st, 6);
y1 = script_getnum(st, 7);
if (script_hasdata(st, 8))
data = script_getdata(st, 8);
}
else
{
if (script_hasdata(st, 3))
data = script_getdata(st, 3);
}
if (data)
{
if (!data_isreference(data))
{
ShowError("buildin_%s: not a variable\n", command);
script_reportdata(data);
st->state = END;
return SCRIPT_CMD_FAILURE;
}
id = reference_getid(data);
idx = reference_getindex(data);
name = reference_getname(data);
}
for (bl = (struct block_list*)mapit_first(iter); mapit_exists(iter); bl = (struct block_list*)mapit_next(iter))
{
if (!m || (m == bl->m && !x0 && !y0 && !x1 && !y1) || (bl->m == m && (bl->x >= x0 && bl->y <= y0) && (bl->x <= x1 && bl->y >= y1)))
{
if (data)
set_reg(st, sd, reference_uid(id, idx + size), name, (is_string_variable(name) ? (void*)status_get_name(bl) : (void*)__64BPRTSIZE(bl->id)), reference_getref(data));
size++;
}
}
mapit_free(iter);
script_pushint(st, size);
return SCRIPT_CMD_SUCCESS;
}
/*==========================================
*------------------------------------------*/
static int buildin_getareadropitem_sub(struct block_list *bl,va_list ap)
@@ -24029,6 +24113,9 @@ struct script_function buildin_func[] = {
BUILDIN_DEF(getmapguildusers,"si"),
BUILDIN_DEF(getmapusers,"s"),
BUILDIN_DEF(getareausers,"siiii"),
BUILDIN_DEF(getunits, "i?"),
BUILDIN_DEF2(getunits, "getmapunits", "is?"),
BUILDIN_DEF2(getunits, "getareaunits", "isiiii?"),
BUILDIN_DEF(getareadropitem,"siiiiv"),
BUILDIN_DEF(enablenpc,"s"),
BUILDIN_DEF(disablenpc,"s"),