Mirror/TrinityCore
1
0
Fork 0
mirror of https://github.com/TrinityCore/TrinityCore.git synced 2026-01-15 23:20:36 +01:00
Code Issues Packages Projects Releases Wiki Activity

Core/Auction House: Fixed sorting in non-equipment categories

Browse Source
This commit is contained in:
Shauren
2020-06-18 10:57:26 +02:00
parent 6e62bf5a1e
commit 22a3cb4432
2 changed files with 32 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
src/server/game/AuctionHouse/AuctionHouseMgr.cpp
View File

@@ -280,11 +280,7 @@ private:
case AuctionHouseSortOrder::Name:
return left->FullName[_locale].compare(right->FullName[_locale]);
case AuctionHouseSortOrder::Level:
{
int32 leftLevel = !left->MaxBattlePetLevel ? left->RequiredLevel : left->MaxBattlePetLevel;
int32 rightLevel = !right->MaxBattlePetLevel ? right->RequiredLevel : right->MaxBattlePetLevel;
return leftLevel - rightLevel;
}
return int32(left->SortLevel) - int32(right->SortLevel);
default:
break;
}
@@ -335,10 +331,10 @@ private:
case AuctionHouseSortOrder::Level:
{
int32 leftLevel = !left->Items[0]->GetModifier(ITEM_MODIFIER_BATTLE_PET_SPECIES_ID)
? left->Items[0]->GetRequiredLevel()
? left->Bucket->SortLevel
: left->Items[0]->GetModifier(ITEM_MODIFIER_BATTLE_PET_LEVEL);
int32 rightLevel = !right->Items[0]->GetModifier(ITEM_MODIFIER_BATTLE_PET_SPECIES_ID)
? right->Items[0]->GetRequiredLevel()
? right->Bucket->SortLevel
: right->Items[0]->GetModifier(ITEM_MODIFIER_BATTLE_PET_LEVEL);
return leftLevel - rightLevel;
}
@@ -902,6 +898,33 @@ void AuctionHouseObject::AddAuction(CharacterDatabaseTransaction trans, AuctionP
bucket->ItemSubClass = itemTemplate->GetSubClass();
bucket->InventoryType = itemTemplate->GetInventoryType();
bucket->RequiredLevel = auction.Items[0]->GetRequiredLevel();
switch (itemTemplate->GetClass())
{
case ITEM_CLASS_WEAPON:
case ITEM_CLASS_ARMOR:
bucket->SortLevel = key.ItemLevel;
break;
case ITEM_CLASS_CONTAINER:
bucket->SortLevel = itemTemplate->GetContainerSlots();
break;
case ITEM_CLASS_GEM:
case ITEM_CLASS_ITEM_ENHANCEMENT:
bucket->SortLevel = itemTemplate->GetBaseItemLevel();
break;
case ITEM_CLASS_CONSUMABLE:
bucket->SortLevel = std::max<uint8>(1, bucket->RequiredLevel);
break;
case ITEM_CLASS_MISCELLANEOUS:
case ITEM_CLASS_BATTLE_PETS:
bucket->SortLevel = 1;
break;
case ITEM_CLASS_RECIPE:
bucket->SortLevel = itemTemplate->GetSubClass() != ITEM_SUBCLASS_BOOK ? itemTemplate->GetRequiredSkillRank() : itemTemplate->GetBaseRequiredLevel();
break;
default:
break;
}
for (LocaleConstant locale = LOCALE_enUS; locale < TOTAL_LOCALES; locale = LocaleConstant(locale + 1))
{
if (locale == LOCALE_none)
@@ -956,6 +979,7 @@ void AuctionHouseObject::AddAuction(CharacterDatabaseTransaction trans, AuctionP
bucket->MinBattlePetLevel = battlePetLevel;
bucket->MaxBattlePetLevel = std::max<uint8>(bucket->MaxBattlePetLevel, battlePetLevel);
bucket->SortLevel = bucket->MaxBattlePetLevel;
}
}

1
src/server/game/AuctionHouse/AuctionHouseMgr.h
View File

@@ -211,6 +211,7 @@ struct AuctionsBucketData
uint64 MinPrice = 0; // for sort
std::array<std::pair<uint32, uint32>, 4> ItemModifiedAppearanceId = { }; // for uncollected search
uint8 RequiredLevel = 0; // for usable search
uint8 SortLevel = 0;
uint8 MinBattlePetLevel = 0;
uint8 MaxBattlePetLevel = 0;
std::array<std::wstring, TOTAL_LOCALES> FullName = { };