server/mangos
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Enhance ".send items" commands by adding possibility ton add enchant to sent items (#174)

Browse Source 
Co-authored-by: Necrovoice <91923816+Necrovoice@users.noreply.github.com>
This commit is contained in:
Elmsroth 2022-01-09 01:36:37 +01:00 committed by GitHub
parent b92a318a98
commit d8877d6e0c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 32 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
src/game/ChatCommands/MailCommands.cpp
View File

@ -127,7 +127,7 @@ bool ChatHandler::HandleSendMassMailCommand(char* args)
bool ChatHandler::HandleSendItemsHelper(MailDraft& draft, char* args) bool ChatHandler::HandleSendItemsHelper(MailDraft& draft, char* args)
{ {
// format: "subject text" "mail text" item1[:count1] item2[:count2] ... item12[:count12] // format: "subject text" "mail text" item1[:count1][:enchant1] item2[:count2][:enchant2] ... item12[:count12][:enchant12]
char* msgSubject = ExtractQuotedArg(&args); char* msgSubject = ExtractQuotedArg(&args);
if (!msgSubject) if (!msgSubject)
{ {
@ -141,9 +141,9 @@ bool ChatHandler::HandleSendItemsHelper(MailDraft& draft, char* args)
} }
// extract items // extract items
typedef std::pair<uint32, uint32> ItemPair; typedef std::tuple<uint32, uint32, uint32> ItemToSend;
typedef std::list< ItemPair > ItemPairs; typedef std::list< ItemToSend > ItemsToSend;
ItemPairs items; ItemsToSend items;
// get from tail next item str // get from tail next item str
while (char* itemStr = ExtractArg(&args)) while (char* itemStr = ExtractArg(&args))
@ -151,13 +151,22 @@ bool ChatHandler::HandleSendItemsHelper(MailDraft& draft, char* args)
// parse item str // parse item str
uint32 item_id = 0; uint32 item_id = 0;
uint32 item_count = 1; uint32 item_count = 1;
if (sscanf(itemStr, "%u:%u", &item_id, &item_count) != 2) uint32 item_enchant_id = 0;
// Try with item1[:count1][:enchant1] format
if (sscanf(itemStr, "%u:%u:%u", &item_id, &item_count, &item_enchant_id) == 0)
{ {
if (sscanf(itemStr, "%u", &item_id) != 1) // Try perhaps with item1[:count1]
if (sscanf(itemStr, "%u:%u", &item_id, &item_count) == 0)
{ {
return false; // Try at least with item1 - if not a integer >0 then => error
if (sscanf(itemStr, "%u", &item_id) == 0)
{
return false;
}
} }
} }
if (!item_id) if (!item_id)
{ {
PSendSysMessage(LANG_COMMAND_ITEMIDINVALID, item_id); PSendSysMessage(LANG_COMMAND_ITEMIDINVALID, item_id);
@ -180,13 +189,16 @@ bool ChatHandler::HandleSendItemsHelper(MailDraft& draft, char* args)
return false; return false;
} }
while (item_count > item_proto->GetMaxStackSize()) uint32 max_items_count = item_proto->GetMaxStackSize();
uint32 remaining_items_count = item_count;
while (remaining_items_count > max_items_count)
{ {
items.push_back(ItemPair(item_id, item_proto->GetMaxStackSize())); items.push_back(ItemToSend(item_id, max_items_count, item_enchant_id));
item_count -= item_proto->GetMaxStackSize(); remaining_items_count -= max_items_count;
} }
items.push_back(ItemPair(item_id, item_count)); items.push_back(ItemToSend(item_id, remaining_items_count, item_enchant_id));
if (items.size() > MAX_MAIL_ITEMS) if (items.size() > MAX_MAIL_ITEMS)
{ {
@ -199,10 +211,16 @@ bool ChatHandler::HandleSendItemsHelper(MailDraft& draft, char* args)
// fill mail // fill mail
draft.SetSubjectAndBody(msgSubject, msgText); draft.SetSubjectAndBody(msgSubject, msgText);
for (ItemPairs::const_iterator itr = items.begin(); itr != items.end(); ++itr) for (ItemsToSend::iterator itr = items.begin(); itr != items.end(); ++itr)
{ {
if (Item* item = Item::CreateItem(itr->first, itr->second, m_session ? m_session->GetPlayer() : 0)) uint32 item_id = std::get<0>(*itr);
uint32 item_count = std::get<1>(*itr);
if (Item* item = Item::CreateItem(item_id, item_count, m_session ? m_session->GetPlayer() : 0))
{ {
uint32 item_enchant_id = std::get<2>(*itr);
if (item_enchant_id) {
item->SetEnchantment(PERM_ENCHANTMENT_SLOT, item_enchant_id, 0, 0);
}
item->SaveToDB(); // save for prevent lost at next mail load, if send fail then item will deleted item->SaveToDB(); // save for prevent lost at next mail load, if send fail then item will deleted
draft.AddItem(item); draft.AddItem(item);
} }
@ -213,7 +231,7 @@ bool ChatHandler::HandleSendItemsHelper(MailDraft& draft, char* args)
bool ChatHandler::HandleSendItemsCommand(char* args) bool ChatHandler::HandleSendItemsCommand(char* args)
{ {
// format: name "subject text" "mail text" item1[:count1] item2[:count2] ... item12[:count12] // format: "subject text" "mail text" item1[:count1][:enchant1] item2[:count2][:enchant2] ... item12[:count12][:enchant12]
Player* receiver; Player* receiver;
ObjectGuid receiver_guid; ObjectGuid receiver_guid;
std::string receiver_name; std::string receiver_name;