2 files changed, 92 insertions, 8 deletions

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),
diff --git a/src/map/script.c b/src/map/script.c
index 35217a4d7..c1e210d27 100644
--- a/src/map/script.c
+++ b/src/map/script.c
@@ -25516,6 +25516,75 @@ static BUILDIN(openrefineryui)
 }
 
 /**
+ * identify(<item id>)
+ * Identifies the first unidentified <item id> 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.
+ * 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.
  *
  * @param buildin Script function data
@@ -26275,6 +26344,9 @@ static void script_parse_builtin(void)
 		BUILDIN_DEF(openrefineryui, ""),
 		BUILDIN_DEF(setfavoriteitemidx, "ii"),
 		BUILDIN_DEF(autofavoriteitem, "ii"),
+
+		BUILDIN_DEF(identify, "i"),
+		BUILDIN_DEF(identifyidx, "i"),
 	};
 	int i, len = ARRAYLENGTH(BUILDIN);
 	RECREATE(script->buildin, char *, script->buildin_count + len); // Pre-alloc to speed up