浏览代码

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
Limestone 9 年之前
父节点
当前提交
120df3353e
共有 2 个文件被更改,包括 3 次插入1 次删除
  1. 2 1
      src/map/clif.c
  2. 1 0
      src/map/itemdb.h

+ 2 - 1
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...

+ 1 - 0
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,