pa/eqemu-server
2
0
Fork 0
mirror of https://github.com/EQEmu/Server.git synced 2025-12-12 01:11:29 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Added a new Client::MakeItemLink() method that uses Item_Struct instead of ItemInst. Changed the way that NPC::QueryLoot() builds its links.

Browse Source
This commit is contained in:
Uleat 2014-12-25 00:00:57 -05:00
parent 8522542ae2
commit 15fbb722eb
3 changed files with 68 additions and 58 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
zone/client.h
View File

@ -815,6 +815,7 @@ public:
void SetStats(uint8 type,int16 set_val); void SetStats(uint8 type,int16 set_val);
void IncStats(uint8 type,int16 increase_val); void IncStats(uint8 type,int16 increase_val);
void DropItem(int16 slot_id); void DropItem(int16 slot_id);
bool MakeItemLink(char* &ret_link, const Item_Struct* item, uint32 aug0=0, uint32 aug1=0, uint32 aug2=0, uint32 aug3=0, uint32 aug4=0, uint32 aug5=0);
bool MakeItemLink(char* &ret_link, const ItemInst* inst); bool MakeItemLink(char* &ret_link, const ItemInst* inst);
int GetItemLinkHash(const ItemInst* inst); int GetItemLinkHash(const ItemInst* inst);
void SendItemLink(const ItemInst* inst, bool sendtoall=false); void SendItemLink(const ItemInst* inst, bool sendtoall=false);

69
zone/inventory.cpp
View File

@ -1027,7 +1027,7 @@ void Client::MoveItemCharges(ItemInst &from, int16 to_slot, uint8 type)
} }
} }
bool Client::MakeItemLink(char* &ret_link, const ItemInst *inst) { bool Client::MakeItemLink(char* &ret_link, const Item_Struct *item, uint32 aug0, uint32 aug1, uint32 aug2, uint32 aug3, uint32 aug4, uint32 aug5) {
//we're sending back the entire "link", minus the null characters & item name //we're sending back the entire "link", minus the null characters & item name
//that way, we can use it for regular links & Task links //that way, we can use it for regular links & Task links
//note: initiator needs to pass us ret_link //note: initiator needs to pass us ret_link
@ -1040,10 +1040,9 @@ bool Client::MakeItemLink(char* &ret_link, const ItemInst *inst) {
http://eqitems.13th-floor.org/phpBB2/viewtopic.php?p=510#510 http://eqitems.13th-floor.org/phpBB2/viewtopic.php?p=510#510
*/ */
if (!inst) //have to have an item to make the link if (!item) //have to have an item to make the link
return false; return false;
const Item_Struct* item = inst->GetItem();
//format: //format:
//0 itemid aug1 aug2 aug3 aug4 aug5 evolving? loregroup evolved level hash //0 itemid aug1 aug2 aug3 aug4 aug5 evolving? loregroup evolved level hash
//0 00000 00000 00000 00000 00000 00000 0 0000 0 00000000 //0 00000 00000 00000 00000 00000 00000 0 0000 0 00000000
@ -1057,16 +1056,18 @@ bool Client::MakeItemLink(char* &ret_link, const ItemInst *inst) {
//int hash = GetItemLinkHash(inst); //eventually this will work (currently crashes zone), but for now we'll skip the extra overhead //int hash = GetItemLinkHash(inst); //eventually this will work (currently crashes zone), but for now we'll skip the extra overhead
if (GetClientVersion() >= EQClientRoF2) if (GetClientVersion() >= EQClientRoF2)
{ {
MakeAnyLenString(&ret_link, "%1X" "%05X" "%05X" "%05X" "%05X" "%05X" "%05X" "%05X" "%01X" "%1X" "%04X" "%1X" "%05X" "%08X", MakeAnyLenString(&ret_link, "%1X" "%05X" "%05X" "%05X" "%05X" "%05X" "%05X" "%05X" "%1X" "%1X" "%04X" "%1X" "%05X" "%08X",
0, 0,
item->ID, item->ID,
inst->GetAugmentItemID(0), aug0,
inst->GetAugmentItemID(1), aug1,
inst->GetAugmentItemID(2), aug2,
inst->GetAugmentItemID(3), aug3,
inst->GetAugmentItemID(4), aug4,
inst->GetAugmentItemID(5), aug5,
//0, this, or below, needs to be activated..not sure which yet
evolving, evolving,
//0, this, or above, needs to be activated..not sure which yet
loregroup, loregroup,
evolvedlevel, evolvedlevel,
0, 0,
@ -1078,12 +1079,12 @@ bool Client::MakeItemLink(char* &ret_link, const ItemInst *inst) {
MakeAnyLenString(&ret_link, "%1X" "%05X" "%05X" "%05X" "%05X" "%05X" "%05X" "%05X" "%1X" "%04X" "%1X" "%05X" "%08X", MakeAnyLenString(&ret_link, "%1X" "%05X" "%05X" "%05X" "%05X" "%05X" "%05X" "%05X" "%1X" "%04X" "%1X" "%05X" "%08X",
0, 0,
item->ID, item->ID,
inst->GetAugmentItemID(0), aug0,
inst->GetAugmentItemID(1), aug1,
inst->GetAugmentItemID(2), aug2,
inst->GetAugmentItemID(3), aug3,
inst->GetAugmentItemID(4), aug4,
inst->GetAugmentItemID(5), aug5,
evolving, evolving,
loregroup, loregroup,
evolvedlevel, evolvedlevel,
@ -1096,11 +1097,11 @@ bool Client::MakeItemLink(char* &ret_link, const ItemInst *inst) {
MakeAnyLenString(&ret_link, "%1X" "%05X" "%05X" "%05X" "%05X" "%05X" "%05X" "%1X" "%04X" "%1X" "%05X" "%08X", MakeAnyLenString(&ret_link, "%1X" "%05X" "%05X" "%05X" "%05X" "%05X" "%05X" "%1X" "%04X" "%1X" "%05X" "%08X",
0, 0,
item->ID, item->ID,
inst->GetAugmentItemID(0), aug0,
inst->GetAugmentItemID(1), aug1,
inst->GetAugmentItemID(2), aug2,
inst->GetAugmentItemID(3), aug3,
inst->GetAugmentItemID(4), aug4,
evolving, evolving,
loregroup, loregroup,
evolvedlevel, evolvedlevel,
@ -1113,11 +1114,11 @@ bool Client::MakeItemLink(char* &ret_link, const ItemInst *inst) {
MakeAnyLenString(&ret_link, "%1X" "%05X" "%05X" "%05X" "%05X" "%05X" "%05X" "%1X" "%04X" "%1X" "%08X", MakeAnyLenString(&ret_link, "%1X" "%05X" "%05X" "%05X" "%05X" "%05X" "%05X" "%1X" "%04X" "%1X" "%08X",
0, 0,
item->ID, item->ID,
inst->GetAugmentItemID(0), aug0,
inst->GetAugmentItemID(1), aug1,
inst->GetAugmentItemID(2), aug2,
inst->GetAugmentItemID(3), aug3,
inst->GetAugmentItemID(4), aug4,
evolving, evolving,
loregroup, loregroup,
evolvedlevel, evolvedlevel,
@ -1128,6 +1129,22 @@ bool Client::MakeItemLink(char* &ret_link, const ItemInst *inst) {
return true; return true;
} }
bool Client::MakeItemLink(char* &ret_link, const ItemInst *inst) {
if (!inst)
return false;
return MakeItemLink(
ret_link,
inst->GetItem(),
inst->GetAugmentItemID(0),
inst->GetAugmentItemID(1),
inst->GetAugmentItemID(2),
inst->GetAugmentItemID(3),
inst->GetAugmentItemID(4),
inst->GetAugmentItemID(5)
);
}
int Client::GetItemLinkHash(const ItemInst* inst) { int Client::GetItemLinkHash(const ItemInst* inst) {
//pre-Titanium: http://eqitems.13th-floor.org/phpBB2/viewtopic.php?t=70&postdays=0&postorder=asc //pre-Titanium: http://eqitems.13th-floor.org/phpBB2/viewtopic.php?t=70&postdays=0&postorder=asc
//Titanium: http://eqitems.13th-floor.org/phpBB2/viewtopic.php?t=145 //Titanium: http://eqitems.13th-floor.org/phpBB2/viewtopic.php?t=145

42
zone/npc.cpp
View File

@ -500,36 +500,28 @@ void NPC::ClearItemList() {
itemlist.clear(); itemlist.clear();
} }
void NPC::QueryLoot(Client* to) { void NPC::QueryLoot(Client* to)
int x = 0; {
to->Message(0, "Coin: %ip %ig %is %ic", platinum, gold, silver, copper); to->Message(0, "Coin: %ip %ig %is %ic", platinum, gold, silver, copper);
ItemList::iterator cur,end; int x = 0;
cur = itemlist.begin(); for(ItemList::iterator cur = itemlist.begin(); cur != itemlist.end(); ++cur, ++x) {
end = itemlist.end();
for(; cur != end; ++cur) {
const Item_Struct* item = database.GetItem((*cur)->item_id); const Item_Struct* item = database.GetItem((*cur)->item_id);
if (item) if (item == nullptr) {
if (to->GetClientVersion() >= EQClientRoF2)
{
to->Message(0, "minlvl: %i maxlvl: %i %i: %c%06X00000000000000000000000000000000000000000000000000%s%c", (*cur)->min_level, (*cur)->max_level, (int)item->ID, 0x12, item->ID, item->Name, 0x12);
}
else if (to->GetClientVersion() >= EQClientRoF)
{
to->Message(0, "minlvl: %i maxlvl: %i %i: %c%06X0000000000000000000000000000000000000000000000000%s%c",(*cur)->min_level, (*cur)->max_level, (int) item->ID,0x12, item->ID, item->Name, 0x12);
}
else if (to->GetClientVersion() >= EQClientSoF)
{
to->Message(0, "minlvl: %i maxlvl: %i %i: %c%06X00000000000000000000000000000000000000000000%s%c",(*cur)->min_level, (*cur)->max_level, (int) item->ID,0x12, item->ID, item->Name, 0x12);
}
else
{
to->Message(0, "minlvl: %i maxlvl: %i %i: %c%06X000000000000000000000000000000000000000%s%c",(*cur)->min_level, (*cur)->max_level, (int) item->ID,0x12, item->ID, item->Name, 0x12);
}
else
LogFile->write(EQEMuLog::Error, "Database error, invalid item"); LogFile->write(EQEMuLog::Error, "Database error, invalid item");
x++; continue;
} }
char* itemLinkCore = nullptr;
std::string itemLink;
to->MakeItemLink(itemLinkCore, item);
itemLink = (itemLinkCore ? StringFormat("%c%s%s%c", 0x12, itemLinkCore, item->Name, 0x12) : "null");
to->Message(0, "%s, ID: %u, Level: (min: , max: )", itemLink.c_str(), item->ID, (*cur)->min_level, (*cur)->max_level);
safe_delete_array(itemLinkCore);
}
to->Message(0, "%i items on %s.", x, GetName()); to->Message(0, "%i items on %s.", x, GetName());
} }