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

Follow up to ffd16c2

Browse Source 
Thanks to @aleos89 for advices
This commit is contained in:
Jittapan Pluemsumran 2016-03-31 02:08:10 +07:00
parent ffd16c236e
commit 2a29ac0037
2 changed files with 14 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
doc/script_commands.txt
View File

@ -2642,14 +2642,14 @@ this is +10:
--------------------------------------- ---------------------------------------
*getequipweaponlv({<equipment slot>,<char_id>}) *getequipweaponlv(<equipment slot>{,<char_id>})
This function returns the weapon level for the weapon equipped in the specified This function returns the weapon level for the weapon equipped in the specified
equipment slot on the invoking character. For a list of equipment slots see equipment slot on the invoking character. For a list of equipment slots see
'getequipid'. 'getequipid'.
If no arguments are provided. Weapon level for the item calling this function If -1 is passed as <equipment slot> argument. Weapon level for the item calling this function,
assuming it is called by an item script will be returned. Otherwise, 0 will be returned. assuming it is called by an item script, will be returned. Otherwise, 0 will be returned.
Only EQI_HAND_L and EQI_HAND_R normally make sense, since only weapons have Only EQI_HAND_L and EQI_HAND_R normally make sense, since only weapons have
a weapon level. You can, however, probably, use this field for other equippable a weapon level. You can, however, probably, use this field for other equippable

19
src/map/script.c
View File

@ -8392,24 +8392,13 @@ BUILDIN_FUNC(getequiprefinerycnt)
* return (npc) * return (npc)
* x : weapon level * x : weapon level
* 0 : false * 0 : false
* getequipweaponlv({<equipment slot>,<char_id>}) * getequipweaponlv(<equipment slot>{,<char_id>})
*------------------------------------------*/ *------------------------------------------*/
BUILDIN_FUNC(getequipweaponlv) BUILDIN_FUNC(getequipweaponlv)
{ {
int i = -1, num; int i = -1, num;
TBL_PC *sd; TBL_PC *sd;
if (!script_hasdata(st, 2)) {
if ((sd = script_rid2sd(st)) != NULL && current_equip_item_index < MAX_INVENTORY && sd->inventory_data[current_equip_item_index])
{
script_pushint(st, sd->inventory_data[current_equip_item_index]->wlv);
}
else {
script_pushint(st, 0);
}
return SCRIPT_CMD_SUCCESS;
}
num = script_getnum(st, 2); num = script_getnum(st, 2);
if (!script_charid2sd(3, sd)) { if (!script_charid2sd(3, sd)) {
@ -8417,7 +8406,9 @@ BUILDIN_FUNC(getequipweaponlv)
return SCRIPT_CMD_FAILURE; return SCRIPT_CMD_FAILURE;
} }
if (num > 0 && num <= ARRAYLENGTH(equip)) if (num == -1)
i = current_equip_item_index;
else if (num > 0 && num <= ARRAYLENGTH(equip))
i = pc_checkequip(sd, equip[num - 1]); i = pc_checkequip(sd, equip[num - 1]);
if (i >= 0 && sd->inventory_data[i]) if (i >= 0 && sd->inventory_data[i])
script_pushint(st, sd->inventory_data[i]->wlv); script_pushint(st, sd->inventory_data[i]->wlv);
@ -21450,7 +21441,7 @@ struct script_function buildin_func[] = {
BUILDIN_DEF(getequipisequiped,"i?"), BUILDIN_DEF(getequipisequiped,"i?"),
BUILDIN_DEF(getequipisenableref,"i?"), BUILDIN_DEF(getequipisenableref,"i?"),
BUILDIN_DEF(getequiprefinerycnt,"i?"), BUILDIN_DEF(getequiprefinerycnt,"i?"),
BUILDIN_DEF(getequipweaponlv,"??"), BUILDIN_DEF(getequipweaponlv,"i?"),
BUILDIN_DEF(getequippercentrefinery,"i?"), BUILDIN_DEF(getequippercentrefinery,"i?"),
BUILDIN_DEF(successrefitem,"i??"), BUILDIN_DEF(successrefitem,"i??"),
BUILDIN_DEF(failedrefitem,"i?"), BUILDIN_DEF(failedrefitem,"i?"),