pa/eqemu-server
2
0
Fork 0
mirror of https://github.com/EQEmu/Server.git synced 2026-05-16 22:58:34 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

[Items] Allow any bag type 51 to be used for Trader (#1392)

Browse Source 
* Allow any bag type 51 to be used for Trader

Most commonly this would allow the different color satchels to be used in Trader mode.
PEQ database has 1 item (Yellow Trader's Satchel Token - 35037) marked as type 51, but otherwise only the proper bags are already set.
Bonus of removing the hard-coded ID from source.

* Updated

Fixed where I missed it in a couple more spots too.

* Update bonuses.cpp
This commit is contained in:
Kurt Gilpin
2021-06-13 18:06:58 -05:00
committed by GitHub
parent bcb0e43d13
commit 45eea666a1
2 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
zone/bonuses.cpp
+3 -3
View File
@@ -3382,10 +3382,10 @@ bool Client::CalcItemScale(uint32 slot_x, uint32 slot_y) {
if (Trader)
if (i >= EQ::invbag::GENERAL_BAGS_BEGIN && i <= EQ::invbag::GENERAL_BAGS_END) {
EQ::ItemInstance* parent_item = m_inv.GetItem(EQ::InventoryProfile::CalcSlotId(i));
if (parent_item && parent_item->GetItem()->ID == 17899) // trader satchel
if (parent_item && parent_item->GetItem()->BagType == EQ::item::BagTypeTradersSatchel)
continue;
}
bool update_slot = false;
if(inst->IsScaling())
{
@@ -3468,7 +3468,7 @@ bool Client::DoItemEnterZone(uint32 slot_x, uint32 slot_y) {
if (Trader)
if (i >= EQ::invbag::GENERAL_BAGS_BEGIN && i <= EQ::invbag::GENERAL_BAGS_END) {
EQ::ItemInstance* parent_item = m_inv.GetItem(EQ::InventoryProfile::CalcSlotId(i));
if (parent_item && parent_item->GetItem()->ID == 17899) // trader satchel
if (parent_item && parent_item->GetItem()->BagType == EQ::item::BagTypeTradersSatchel)
continue;
}