Mirror/TrinityCore
1
0
Fork 0
mirror of https://github.com/TrinityCore/TrinityCore.git synced 2026-01-21 09:44:45 +01:00
Code Issues Packages Projects Releases Wiki Activity

Core/Criteria: Add all values of CriteriaTreeFlags

Browse Source
This commit is contained in:
Shauren
2021-06-01 22:13:07 +02:00
parent 2629015011
commit 5543908e52
3 changed files with 20 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/server/game/Achievements/CriteriaHandler.cpp
View File

@@ -1102,8 +1102,8 @@ bool CriteriaHandler::IsCompletedCriteriaTree(CriteriaTree const* tree)
bool CriteriaHandler::CanUpdateCriteriaTree(Criteria const* criteria, CriteriaTree const* tree, Player* referencePlayer) const
{
if ((tree->Entry->Flags & CRITERIA_TREE_FLAG_HORDE_ONLY && referencePlayer->GetTeam() != HORDE) ||
(tree->Entry->Flags & CRITERIA_TREE_FLAG_ALLIANCE_ONLY && referencePlayer->GetTeam() != ALLIANCE))
if ((tree->Entry->GetFlags().HasFlag(CriteriaTreeFlags::HordeOnly) && referencePlayer->GetTeam() != HORDE) ||
(tree->Entry->GetFlags().HasFlag(CriteriaTreeFlags::AllianceOnly) && referencePlayer->GetTeam() != ALLIANCE))
{
TC_LOG_TRACE("criteria", "CriteriaHandler::CanUpdateCriteriaTree: (Id: %u Type %s CriteriaTree %u) Wrong faction",
criteria->ID, CriteriaMgr::GetCriteriaTypeString(criteria->Entry->Type), tree->Entry->ID);

2
src/server/game/DataStores/DB2Structure.h
View File

@@ -1136,6 +1136,8 @@ struct CriteriaTreeEntry
uint32 CriteriaID;
int32 OrderIndex;
int32 Flags;
EnumFlag<CriteriaTreeFlags> GetFlags() const { return static_cast<CriteriaTreeFlags>(Flags); }
};
struct CurrencyTypesEntry

23
src/server/game/DataStores/DBCEnums.h
View File

@@ -843,16 +843,25 @@ enum CriteriaTypes : uint8
#define CRITERIA_TYPE_TOTAL 230
enum CriteriaTreeFlags : uint16
enum class CriteriaTreeFlags : uint16
{
CRITERIA_TREE_FLAG_PROGRESS_BAR = 0x0001,
CRITERIA_TREE_FLAG_PROGRESS_IS_DATE = 0x0004,
CRITERIA_TREE_FLAG_SHOW_CURRENCY_ICON = 0x0008,
CRITERIA_TREE_FLAG_ALLIANCE_ONLY = 0x0200,
CRITERIA_TREE_FLAG_HORDE_ONLY = 0x0400,
CRITERIA_TREE_FLAG_SHOW_REQUIRED_COUNT = 0x0800
ProgressBar = 0x0001, // Progress Bar
DoNotDisplay = 0x0002, // Do Not Display
IsDate = 0x0004, // Is a Date
IsMoney = 0x0008, // Is Money
ToastOnComplete = 0x0010, // Toast on Complete
UseObjectsDescription = 0x0020, // Use Object's Description
ShowFactionSpecificChild = 0x0040, // Show faction specific child
DisplayAllChildren = 0x0080, // Display all children
AwardBonusRep = 0x0100, // Award Bonus Rep (Hack!!)
AllianceOnly = 0x0200, // Treat this criteria or block as Alliance
HordeOnly = 0x0400, // Treat this criteria or block as Horde
DisplayAsFraction = 0x0800, // Display as Fraction
IsForQuest = 0x1000 // Is For Quest
};
DEFINE_ENUM_FLAG(CriteriaTreeFlags);
enum CriteriaTreeOperator : uint8
{
CRITERIA_TREE_OPERATOR_SINGLE = 0,