Mirror/TrinityCore
1
0
Fork 0
mirror of https://github.com/TrinityCore/TrinityCore.git synced 2026-01-25 19:31:59 +01:00
Code Issues Packages Projects Releases Wiki Activity

Core/Criteria: Implemented LearnHeirloom and LearnAnyHeirloom criteria types (#29976)

Browse Source 
(cherry picked from commit eaa76f0eb2)

# Conflicts:
#	src/server/game/DataStores/DBCEnums.h
This commit is contained in:
Antonio Martín Berti
2024-05-12 13:01:35 -03:00
committed by Ovahlord
parent 43cb963df6
commit f157d935c4
3 changed files with 10 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -550,6 +550,7 @@ void CriteriaHandler::UpdateCriteria(CriteriaType type, uint64 miscValue1 /*= 0*
case CriteriaType::DefeatDungeonEncounter:
case CriteriaType::PlaceGarrisonBuilding:
case CriteriaType::ActivateAnyGarrisonBuilding:
case CriteriaType::LearnAnyHeirloom:
case CriteriaType::HonorLevelIncrease:
case CriteriaType::PrestigeLevelIncrease:
case CriteriaType::LearnAnyTransmogInSlot:
@@ -674,6 +675,7 @@ void CriteriaHandler::UpdateCriteria(CriteriaType type, uint64 miscValue1 /*= 0*
case CriteriaType::EnterArea:
case CriteriaType::LeaveArea:
case CriteriaType::RecruitGarrisonFollower:
case CriteriaType::LearnHeirloom:
case CriteriaType::ActivelyReachLevel:
case CriteriaType::CollectTransmogSetFromGroup:
case CriteriaType::EnterTopLevelArea:
@@ -812,7 +814,6 @@ void CriteriaHandler::UpdateCriteria(CriteriaType type, uint64 miscValue1 /*= 0*
case CriteriaType::LevelChangedForGarrisonFollower:
case CriteriaType::LearnToy:
case CriteriaType::LearnAnyToy:
case CriteriaType::LearnAnyHeirloom:
case CriteriaType::FindResearchObject:
case CriteriaType::ExhaustAnyResearchSite:
case CriteriaType::CompleteInternalCriteria:
@@ -1205,6 +1206,8 @@ bool CriteriaHandler::IsCompletedCriteria(Criteria const* criteria, uint64 requi
case CriteriaType::BattlePetReachLevel:
case CriteriaType::ActivelyEarnPetLevel:
case CriteriaType::DefeatDungeonEncounter:
case CriteriaType::LearnHeirloom:
case CriteriaType::LearnAnyHeirloom:
case CriteriaType::LearnAnyTransmogInSlot:
case CriteriaType::ParagonLevelIncreaseWithFaction:
case CriteriaType::PlayerHasEarnedHonor:

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

@@ -689,8 +689,8 @@ enum class CriteriaType : int16
LearnToy = 185, /*NYI*/ // Learn Toy "{Item}"
LearnAnyToy = 186, /*NYI*/ // Learn Any Toy
QualityUpgradedForGarrisonFollower = 187, /*NYI*/ // Garrison Follower: Quality Upgraded
LearnHeirloom = 188, /*NYI*/ // Learn Heirloom "{Item}"
LearnAnyHeirloom = 189, /*NYI*/ // Learn Any Heirloom
LearnHeirloom = 188, // Learn Heirloom "{Item}"
LearnAnyHeirloom = 189, // Learn Any Heirloom
EarnArtifactXP = 190, /*NYI*/ // Earn Artifact XP
AnyArtifactPowerRankPurchased = 191, /*NYI*/ // Artifact Power Ranks Purchased
LearnTransmog = 192, /*NYI*/ // Learn Transmog "{ItemModifiedAppearance}"

4
src/server/game/Entities/Player/CollectionMgr.cpp
View File

@@ -237,7 +237,11 @@ void CollectionMgr::LoadHeirlooms()
void CollectionMgr::AddHeirloom(uint32 itemId, uint32 flags)
{
if (UpdateAccountHeirlooms(itemId, flags))
{
_owner->GetPlayer()->UpdateCriteria(CriteriaType::LearnHeirloom, itemId);
_owner->GetPlayer()->UpdateCriteria(CriteriaType::LearnAnyHeirloom, 1);
_owner->GetPlayer()->AddHeirloom(itemId, flags);
}
}
void CollectionMgr::UpgradeHeirloom(uint32 itemId, int32 castItem)