From 462f1d0bc01dd432004b74732c06baa9d8a7a00c Mon Sep 17 00:00:00 2001 From: Guilherme Menaldo Date: Sat, 1 Jun 2019 14:16:37 -0300 Subject: Add identifyidx script command Signed-off-by: Haru --- doc/script_commands.txt | 9 +++++++++ src/map/script.c | 35 +++++++++++++++++++++++++++++++++++ 2 files changed, 44 insertions(+) diff --git a/doc/script_commands.txt b/doc/script_commands.txt index 5cc3ea186..3d22914b9 100644 --- a/doc/script_commands.txt +++ b/doc/script_commands.txt @@ -3368,6 +3368,15 @@ cards or if it's signed. This will set a Hat Effect onto the player. The state field allows you to enable (true) or disable (false) the effect on the player. +--------------------------------------- + +*identifyidx() + +This will identify item at attached player's inventory index. + +Returns true if the item was identified, false otherwise. +Note: If the item was already identified, it returns false. + --------------------------------------- //===================================== 2.1 - End of Item-Related Commands diff --git a/src/map/script.c b/src/map/script.c index 35217a4d7..ba5412588 100644 --- a/src/map/script.c +++ b/src/map/script.c @@ -25515,6 +25515,39 @@ static BUILDIN(openrefineryui) return true; } +/** + * identifyidx(idx) + * Identifies item at idx. + * Returns true if item is identified, false otherwise. + */ +static BUILDIN(identifyidx) +{ + struct map_session_data *sd = script_rid2sd(st); + + if (sd == NULL) { + script_pushint(st, false); + return true; + } + + int idx = script_getnum(st, 2); + if (idx < 0 || idx >= sd->status.inventorySize) { + ShowError("buildin_identifyidx: Invalid inventory index (%d), expected a value between 0 and %d\n", idx, sd->status.inventorySize); + script_pushint(st, false); + return true; + } + + if (sd->status.inventory[idx].nameid <= 0 || sd->status.inventory[idx].identify != 0) { + script_pushint(st, false); + return true; + } + + sd->status.inventory[idx].identify = 1; + clif->item_identified(sd, idx, 0); + script_pushint(st, true); + + return true; +} + /** * Adds a built-in script function. * @@ -26275,6 +26308,8 @@ static void script_parse_builtin(void) BUILDIN_DEF(openrefineryui, ""), BUILDIN_DEF(setfavoriteitemidx, "ii"), BUILDIN_DEF(autofavoriteitem, "ii"), + + BUILDIN_DEF(identifyidx, "i"), }; int i, len = ARRAYLENGTH(BUILDIN); RECREATE(script->buildin, char *, script->buildin_count + len); // Pre-alloc to speed up -- cgit v1.2.3-60-g2f50 From 24c4d531b150863caed448fbbf4a9964dadbb63e Mon Sep 17 00:00:00 2001 From: Guilherme Menaldo Date: Sat, 1 Jun 2019 14:37:42 -0300 Subject: Add identify script command Signed-off-by: Haru --- doc/script_commands.txt | 9 +++++++++ src/map/script.c | 37 +++++++++++++++++++++++++++++++++++++ 2 files changed, 46 insertions(+) diff --git a/doc/script_commands.txt b/doc/script_commands.txt index 3d22914b9..567d0ad56 100644 --- a/doc/script_commands.txt +++ b/doc/script_commands.txt @@ -3370,6 +3370,15 @@ enable (true) or disable (false) the effect on the player. --------------------------------------- +*identify() + +This function identifies the first item in attached player's inventory. + +Returns -2 if an error happens, -1 if no unidentified was found. +Otherwise, returns the idx of the identified item. + +--------------------------------------- + *identifyidx() This will identify item at attached player's inventory index. diff --git a/src/map/script.c b/src/map/script.c index ba5412588..c1e210d27 100644 --- a/src/map/script.c +++ b/src/map/script.c @@ -25515,6 +25515,42 @@ static BUILDIN(openrefineryui) return true; } +/** + * identify() + * Identifies the first unidentified item on player's inventory. + * Returns -2 on error, -1 if no item to identify was found, identified idx otherwise. + */ +static BUILDIN(identify) +{ + struct map_session_data *sd = script_rid2sd(st); + + if (sd == NULL) { + script_pushint(st, -2); + return true; + } + + int itemid = script_getnum(st, 2); + if (itemdb->exists(itemid) == NULL) { + ShowError("buildin_identify: Invalid item ID (%d)\n", itemid); + script_pushint(st, -2); + return true; + } + + int idx = -1; + ARR_FIND(0, sd->status.inventorySize, idx, (sd->status.inventory[idx].nameid == itemid && sd->status.inventory[idx].identify == 0)); + + if (idx < 0 || idx >= sd->status.inventorySize) { + script_pushint(st, -1); + return true; + } + + sd->status.inventory[idx].identify = 1; + clif->item_identified(sd, idx, 0); + script_pushint(st, idx); + + return true; +} + /** * identifyidx(idx) * Identifies item at idx. @@ -26309,6 +26345,7 @@ static void script_parse_builtin(void) BUILDIN_DEF(setfavoriteitemidx, "ii"), BUILDIN_DEF(autofavoriteitem, "ii"), + BUILDIN_DEF(identify, "i"), BUILDIN_DEF(identifyidx, "i"), }; int i, len = ARRAYLENGTH(BUILDIN); -- cgit v1.2.3-60-g2f50 From b20054a678fc5a2786819e879f085e5dcf02c052 Mon Sep 17 00:00:00 2001 From: Guilherme Menaldo Date: Sat, 1 Jun 2019 14:47:24 -0300 Subject: Add identifyall atcommand Signed-off-by: Haru --- doc/atcommands.txt | 6 ++++++ src/map/atcommand.c | 28 ++++++++++++++++++++-------- 2 files changed, 26 insertions(+), 8 deletions(-) diff --git a/doc/atcommands.txt b/doc/atcommands.txt index 4acc30ae6..c909440a7 100644 --- a/doc/atcommands.txt +++ b/doc/atcommands.txt @@ -584,6 +584,12 @@ Opens the Identification window if any unappraised items are in your inventory. --------------------------------------- +@identifyall + +Identifies all unappraised items in your inventory. + +--------------------------------------- + @trade Opens the trade window with the specified player. diff --git a/src/map/atcommand.c b/src/map/atcommand.c index 3c454011f..a2db15f6c 100644 --- a/src/map/atcommand.c +++ b/src/map/atcommand.c @@ -6769,23 +6769,34 @@ ACMD(refreshall) } /*========================================== - * @identify + * @identify / @identifyall * => GM's magnifier. *------------------------------------------*/ ACMD(identify) { int num = 0; + bool identifyall = (strcmpi(info->command, "identifyall") == 0); - for (int i = 0; i < sd->status.inventorySize; i++) { - if(sd->status.inventory[i].nameid > 0 && sd->status.inventory[i].identify!=1){ - num++; + if (!identifyall) { + for (int i = 0; i < sd->status.inventorySize; i++) { + if (sd->status.inventory[i].nameid > 0 && sd->status.inventory[i].identify != 1) { + num++; + } } - } - if (num > 0) { - clif->item_identify_list(sd); } else { - clif->message(fd,msg_fd(fd,1238)); // There are no items to appraise. + for (int i = 0; i < sd->status.inventorySize; i++) { + if (sd->status.inventory[i].nameid > 0 && sd->status.inventory[i].identify != 1) { + skill->identify(sd, i); + num++; + } + } } + + if (num == 0) + clif->message(fd,msg_fd(fd,1238)); // There are no items to appraise. + else if (!identifyall) + clif->item_identify_list(sd); + return true; } @@ -10061,6 +10072,7 @@ static void atcommand_basecommands(void) ACMD_DEF(refresh), ACMD_DEF(refreshall), ACMD_DEF(identify), + ACMD_DEF2("identifyall", identify), ACMD_DEF(misceffect), ACMD_DEF(mobsearch), ACMD_DEF(cleanmap), -- cgit v1.2.3-60-g2f50