From 120df3353ede1b04c9612060e667e57fb1511945 Mon Sep 17 00:00:00 2001 From: Limestone Date: Sat, 30 Jul 2016 06:06:50 +0800 Subject: [PATCH] One Click Identify feature adjustments (#1463) - In Official, you can also use Novice Magnifiers - If you have both type of magnifiers in your inventory, it will always consume the normal magnifier first --- src/map/clif.c | 3 ++- src/map/itemdb.h | 1 + 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/src/map/clif.c b/src/map/clif.c index f06bba7b67..835fa54284 100644 --- a/src/map/clif.c +++ b/src/map/clif.c @@ -18657,7 +18657,8 @@ void clif_parse_Oneclick_Itemidentify(int fd, struct map_session_data *sd) { return; // Ignore the request - No magnifiers in inventory - if ((magnifier_idx = pc_search_inventory(sd, ITEMID_MAGNIFIER)) == -1) + if ((magnifier_idx = pc_search_inventory(sd, ITEMID_MAGNIFIER)) == -1 && + (magnifier_idx = pc_search_inventory(sd, ITEMID_NOVICE_MAGNIFIER)) == -1)) return; if (pc_delitem(sd, magnifier_idx, 1, 0, 0, LOG_TYPE_OTHER) != 0) // Deleting of magnifier failed, for whatever reason... diff --git a/src/map/itemdb.h b/src/map/itemdb.h index 418416f888..4c410e3117 100644 --- a/src/map/itemdb.h +++ b/src/map/itemdb.h @@ -106,6 +106,7 @@ enum item_itemid ITEMID_M_BERSERK_POTION = 12243, ITEMID_COMP_BATTLE_MANUAL = 12263, ITEMID_THICK_BATTLE_MANUAL = 12312, + ITEMID_NOVICE_MAGNIFIER = 12325, ITEMID_ANCILLA = 12333, ITEMID_DUN_TELE_SCROLL3 = 12352, ITEMID_REINS_OF_MOUNT = 12622,