Browse Source

itemsearch updated

Fixed #26 - /itemsearch (broker search) now displays item id in paranthesis name (id)

https://cdn.discordapp.com/attachments/603677936582918189/685839069061971983/unknown.png
Image 4 years ago
parent
commit
e18194d7d2
2 changed files with 33 additions and 16 deletions
  1. 24 15
      EQ2/source/WorldServer/Commands/Commands.cpp
  2. 9 1
      EQ2/source/WorldServer/client.cpp

+ 24 - 15
EQ2/source/WorldServer/Commands/Commands.cpp

@@ -3548,22 +3548,31 @@ void Commands::Process(int32 index, EQ2_16BitString* command_parms, Client* clie
 			break;
 										}
 		case COMMAND_ITEMSEARCH:{
-			PacketStruct* packet = configReader.getStruct("WS_StartBroker", client->GetVersion());
-			if(packet){
-				packet->setDataByName("spawn_id", client->GetPlayer()->GetIDWithPlayerSpawn(client->GetPlayer()));
-				//packet->setDataByName("unknown", 1);
-				packet->setDataByName("unknown2", 5, 0); 
-				packet->setDataByName("unknown2", 20, 1);
-				packet->setDataByName("unknown2", 58, 3);
-				packet->setDataByName("unknown2", 40, 4);
-				client->QueuePacket(packet->serialize());
-				PacketStruct* packet2 = configReader.getStruct("WS_BrokerBags", client->GetVersion());
-				if(packet2){
-					packet2->setDataByName("char_id", client->GetCharacterID());
-					client->QueuePacket(packet2->serialize()); //send this for now, needed to properly clear data
-					safe_delete(packet2);
+
+
+			if (sep && sep->arg[0])
+			{
+
+			}
+			else
+			{
+				PacketStruct* packet = configReader.getStruct("WS_StartBroker", client->GetVersion());
+				if (packet) {
+					packet->setDataByName("spawn_id", client->GetPlayer()->GetIDWithPlayerSpawn(client->GetPlayer()));
+					//packet->setDataByName("unknown", 1);
+					packet->setDataByName("unknown2", 5, 0);
+					packet->setDataByName("unknown2", 20, 1);
+					packet->setDataByName("unknown2", 58, 3);
+					packet->setDataByName("unknown2", 40, 4);
+					client->QueuePacket(packet->serialize());
+					PacketStruct* packet2 = configReader.getStruct("WS_BrokerBags", client->GetVersion());
+					if (packet2) {
+						packet2->setDataByName("char_id", client->GetCharacterID());
+						client->QueuePacket(packet2->serialize()); //send this for now, needed to properly clear data
+						safe_delete(packet2);
+					}
+					safe_delete(packet);
 				}
-				safe_delete(packet);
 			}
 			break;
 		}

+ 9 - 1
EQ2/source/WorldServer/client.cpp

@@ -6913,7 +6913,15 @@ void Client::SearchStore(int32 page){
 					else
 						packet->setArrayDataByName("quantity", item->stack_count, i);
 					packet->setArrayDataByName("stack_size", item->stack_count, i);
-					packet->setArrayDataByName("item_name", item->name.c_str(), i);
+
+
+					std::string tmpStr("");
+					tmpStr.append(item->name.c_str());
+					tmpStr.append(" (");
+					tmpStr.append(std::to_string(item->details.item_id));
+					tmpStr.append(")");
+
+					packet->setArrayDataByName("item_name", tmpStr.c_str(), i);
 					packet->setArrayDataByName("req_level", item->generic_info.adventure_default_level, i);
 					//QueuePacket(item->serialize(GetVersion(), false, GetPlayer()));
 				}