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

Updated unitskilluseid and unitskillusepos script commands (#7684)

Browse Source 
* Added the parameter 'ignore_range' to ignore the skill range defined in skill_db.yml
This commit is contained in:
Atemo
2023-04-07 01:09:44 +02:00
committed by GitHub
parent fff69b0cfd
commit db5874d677
4 changed files with 32 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/map/script.cpp
View File

@@ -19920,6 +19920,7 @@ BUILDIN_FUNC(unitskilluseid)
casttime = ( script_hasdata(st,6) ? script_getnum(st,6) : 0 );
bool cancel = ( script_hasdata(st,7) ? script_getnum(st,7) > 0 : skill_get_castcancel(skill_id) );
int msg_id = (script_hasdata(st, 8) ? script_getnum(st, 8) : 0);
bool ignore_range = (script_hasdata(st, 9) ? script_getnum(st, 9) > 0 : false);
if(script_rid2bl(2,bl)){
if (msg_id > 0) {
@@ -19937,7 +19938,7 @@ BUILDIN_FUNC(unitskilluseid)
else
status_calc_npc(((TBL_NPC*)bl), SCO_NONE);
}
unit_skilluse_id2(bl, target_id, skill_id, skill_lv, (casttime * 1000) + skill_castfix(bl, skill_id, skill_lv), cancel);
unit_skilluse_id2(bl, target_id, skill_id, skill_lv, (casttime * 1000) + skill_castfix(bl, skill_id, skill_lv), cancel, ignore_range);
}
return SCRIPT_CMD_SUCCESS;
@@ -19974,6 +19975,7 @@ BUILDIN_FUNC(unitskillusepos)
casttime = ( script_hasdata(st,7) ? script_getnum(st,7) : 0 );
bool cancel = ( script_hasdata(st,8) ? script_getnum(st,8) > 0 : skill_get_castcancel(skill_id) );
int msg_id = (script_hasdata(st, 9) ? script_getnum(st, 9) : 0);
bool ignore_range = (script_hasdata(st, 10) ? script_getnum(st, 10) > 0 : false);
if(script_rid2bl(2,bl)){
if (msg_id > 0) {
@@ -19991,7 +19993,7 @@ BUILDIN_FUNC(unitskillusepos)
else
status_calc_npc(((TBL_NPC*)bl), SCO_NONE);
}
unit_skilluse_pos2(bl, skill_x, skill_y, skill_id, skill_lv, (casttime * 1000) + skill_castfix(bl, skill_id, skill_lv), cancel);
unit_skilluse_pos2(bl, skill_x, skill_y, skill_id, skill_lv, (casttime * 1000) + skill_castfix(bl, skill_id, skill_lv), cancel, ignore_range);
}
return SCRIPT_CMD_SUCCESS;
@@ -22890,9 +22892,9 @@ BUILDIN_FUNC(npcskill)
status_calc_npc(nd, SCO_NONE);
if (skill_get_inf(skill_id)&INF_GROUND_SKILL)
unit_skilluse_pos2(&nd->bl, sd->bl.x, sd->bl.y, skill_id, skill_level,0,0);
unit_skilluse_pos2(&nd->bl, sd->bl.x, sd->bl.y, skill_id, skill_level,0,0,true);
else
unit_skilluse_id2(&nd->bl, sd->bl.id, skill_id, skill_level,0,0);
unit_skilluse_id2(&nd->bl, sd->bl.id, skill_id, skill_level,0,0,true);
return SCRIPT_CMD_SUCCESS;
}
@@ -27385,8 +27387,8 @@ struct script_function buildin_func[] = {
BUILDIN_DEF(unitstopattack,"i"),
BUILDIN_DEF(unitstopwalk,"i?"),
BUILDIN_DEF(unittalk,"is?"),
BUILDIN_DEF(unitskilluseid,"ivi????"), // originally by Qamera [Celest]
BUILDIN_DEF(unitskillusepos,"iviii???"), // [Celest]
BUILDIN_DEF(unitskilluseid,"ivi?????"), // originally by Qamera [Celest]
BUILDIN_DEF(unitskillusepos,"iviii????"), // [Celest]
// <--- [zBuffer] List of unit control commands
BUILDIN_DEF(sleep,"i"),
BUILDIN_DEF(sleep2,"i"),