1 files changed, 38 insertions, 10 deletions

diff --git a/src/map/atcommand.c b/src/map/atcommand.c
index 0a1fd6da3..9ed56545c 100644
--- a/src/map/atcommand.c
+++ b/src/map/atcommand.c
@@ -2718,7 +2718,7 @@ ACMD(makeegg)
 		sd->catch_target_class = pet->db[pet_id].class_;
 		intif->create_pet(
 						 sd->status.account_id, sd->status.char_id,
-						 (short)pet->db[pet_id].class_, (short)mob->db(pet->db[pet_id].class_)->lv,
+						 pet->db[pet_id].class_, mob->db(pet->db[pet_id].class_)->lv,
 						 pet->db[pet_id].EggID, 0, (short)pet->db[pet_id].intimate,
 						 100, 0, 1, pet->db[pet_id].jname);
 	} else {
@@ -5277,18 +5277,43 @@ ACMD(follow)
 }
 
 /*==========================================
- * @dropall by [MouseJstr]
- * Drop all your possession on the ground
+ * @dropall by [MouseJstr] and [Xantara]
+ * Drop all your possession on the ground based on item type
  *------------------------------------------*/
 ACMD(dropall)
 {
+	int type = -1;
+	int count = 0;
+
+	if (message[0] != '\0') {
+		type = atoi(message);
+		if (!((type >= IT_HEALING && type <= IT_DELAYCONSUME) || type == IT_CASH || type == -1)) {
+			clif->message(fd, msg_fd(fd, 1500));
+			clif->message(fd, msg_fd(fd, 1501));
+			return false;
+		}
+	}
+
 	for (int i = 0; i < sd->status.inventorySize; i++) {
 		if (sd->status.inventory[i].amount) {
-			if(sd->status.inventory[i].equip != 0)
-				pc->unequipitem(sd, i, PCUNEQUIPITEM_RECALC|PCUNEQUIPITEM_FORCE);
-			pc->dropitem(sd,  i, sd->status.inventory[i].amount);
+			struct item_data *item_data = itemdb->exists(sd->status.inventory[i].nameid);
+			if (item_data == NULL) {
+				ShowWarning("Non-existant item %d on dropall list (account_id: %d, char_id: %d)\n", sd->status.inventory[i].nameid, sd->status.account_id, sd->status.char_id);
+				continue;
+			}
+			if (!pc->candrop(sd, &sd->status.inventory[i]))
+				continue;
+			if (type == -1 || type == item_data->type) {
+				if (sd->status.inventory[i].equip != 0)
+					pc->unequipitem(sd, i, PCUNEQUIPITEM_RECALC | PCUNEQUIPITEM_FORCE);
+				count += sd->status.inventory[i].amount;
+				pc->dropitem(sd, i, sd->status.inventory[i].amount);
+			}
 		}
 	}
+
+	sprintf(atcmd_output, msg_fd(fd, 1502), count); // %d items are dropped!
+	clif->message(fd, atcmd_output);
 	return true;
 }
 
@@ -7669,9 +7694,9 @@ ACMD(fakename)
 		if (sd->fakename[0])
 		{
 			sd->fakename[0] = '\0';
-			clif->charnameack(0, &sd->bl);
+			clif->blname_ack(0, &sd->bl);
 			if( sd->disguise )
-				clif->charnameack(sd->fd, &sd->bl);
+				clif->blname_ack(sd->fd, &sd->bl);
 			clif->message(sd->fd, msg_fd(fd,1307)); // Returned to real name.
 			return true;
 		}
@@ -7687,9 +7712,9 @@ ACMD(fakename)
 	}
 
 	safestrncpy(sd->fakename, message, sizeof(sd->fakename));
-	clif->charnameack(0, &sd->bl);
+	clif->blname_ack(0, &sd->bl);
 	if (sd->disguise) // Another packet should be sent so the client updates the name for sd
-		clif->charnameack(sd->fd, &sd->bl);
+		clif->blname_ack(sd->fd, &sd->bl);
 	clif->message(sd->fd, msg_fd(fd,1310)); // Fake name enabled.
 
 	return true;
@@ -10716,6 +10741,9 @@ void atcommand_defaults(void)
 {
 	atcommand = &atcommand_s;
 
+	atcommand->atcmd_output = &atcmd_output;
+	atcommand->atcmd_player_name = &atcmd_player_name;
+
 	atcommand->db = NULL;
 	atcommand->alias_db = NULL;