Core/Criteria: Implemented AnyArtifactPowerRankPurchased criteria type (#29979)

This commit is contained in:
Antonio Martín Berti
2024-05-12 18:06:04 +02:00
committed by GitHub
parent eaa76f0eb2
commit a0c1ed975a
3 changed files with 5 additions and 3 deletions
@@ -595,6 +595,7 @@ void CriteriaHandler::UpdateCriteria(CriteriaType type, uint64 miscValue1 /*= 0*
case CriteriaType::HighestDamageTaken: case CriteriaType::HighestDamageTaken:
case CriteriaType::HighestHealCast: case CriteriaType::HighestHealCast:
case CriteriaType::HighestHealReceived: case CriteriaType::HighestHealReceived:
case CriteriaType::AnyArtifactPowerRankPurchased:
case CriteriaType::AzeriteLevelReached: case CriteriaType::AzeriteLevelReached:
SetCriteriaProgress(criteria, miscValue1, referencePlayer, PROGRESS_HIGHEST); SetCriteriaProgress(criteria, miscValue1, referencePlayer, PROGRESS_HIGHEST);
break; break;
@@ -836,7 +837,6 @@ void CriteriaHandler::UpdateCriteria(CriteriaType type, uint64 miscValue1 /*= 0*
case CriteriaType::EnterAreaTriggerWithActionSet: case CriteriaType::EnterAreaTriggerWithActionSet:
case CriteriaType::StartGarrisonMission: case CriteriaType::StartGarrisonMission:
case CriteriaType::QualityUpgradedForGarrisonFollower: case CriteriaType::QualityUpgradedForGarrisonFollower:
case CriteriaType::AnyArtifactPowerRankPurchased:
case CriteriaType::CompleteResearchGarrisonTalent: case CriteriaType::CompleteResearchGarrisonTalent:
case CriteriaType::RecruitAnyGarrisonTroop: case CriteriaType::RecruitAnyGarrisonTroop:
case CriteriaType::CompleteAnyWorldQuest: case CriteriaType::CompleteAnyWorldQuest:
@@ -1210,6 +1210,8 @@ bool CriteriaHandler::IsCompletedCriteria(Criteria const* criteria, uint64 requi
case CriteriaType::DefeatDungeonEncounter: case CriteriaType::DefeatDungeonEncounter:
case CriteriaType::LearnHeirloom: case CriteriaType::LearnHeirloom:
case CriteriaType::LearnAnyHeirloom: case CriteriaType::LearnAnyHeirloom:
case CriteriaType::EarnArtifactXP:
case CriteriaType::AnyArtifactPowerRankPurchased:
case CriteriaType::LearnAnyTransmogInSlot: case CriteriaType::LearnAnyTransmogInSlot:
case CriteriaType::ParagonLevelIncreaseWithFaction: case CriteriaType::ParagonLevelIncreaseWithFaction:
case CriteriaType::PlayerHasEarnedHonor: case CriteriaType::PlayerHasEarnedHonor:
@@ -1221,7 +1223,6 @@ bool CriteriaHandler::IsCompletedCriteria(Criteria const* criteria, uint64 requi
case CriteriaType::BuyItemsFromVendors: case CriteriaType::BuyItemsFromVendors:
case CriteriaType::SellItemsToVendors: case CriteriaType::SellItemsToVendors:
case CriteriaType::GainLevels: case CriteriaType::GainLevels:
case CriteriaType::EarnArtifactXP:
return progress->Counter >= requiredAmount; return progress->Counter >= requiredAmount;
case CriteriaType::EarnAchievement: case CriteriaType::EarnAchievement:
case CriteriaType::CompleteQuest: case CriteriaType::CompleteQuest:
+1 -1
View File
@@ -692,7 +692,7 @@ enum class CriteriaType : int16
LearnHeirloom = 188, // Learn Heirloom "{Item}" LearnHeirloom = 188, // Learn Heirloom "{Item}"
LearnAnyHeirloom = 189, // Learn Any Heirloom LearnAnyHeirloom = 189, // Learn Any Heirloom
EarnArtifactXP = 190, // Earn Artifact XP EarnArtifactXP = 190, // Earn Artifact XP
AnyArtifactPowerRankPurchased = 191, /*NYI*/ // Artifact Power Ranks Purchased AnyArtifactPowerRankPurchased = 191, // Artifact Power Ranks Purchased
LearnTransmog = 192, /*NYI*/ // Learn Transmog "{ItemModifiedAppearance}" LearnTransmog = 192, /*NYI*/ // Learn Transmog "{ItemModifiedAppearance}"
LearnAnyTransmog = 193, /*NYI*/ // Learn Any Transmog LearnAnyTransmog = 193, /*NYI*/ // Learn Any Transmog
HonorLevelIncrease = 194, // (Player) honor level increase HonorLevelIncrease = 194, // (Player) honor level increase
@@ -152,6 +152,7 @@ void WorldSession::HandleArtifactAddPower(WorldPackets::Artifact::ArtifactAddPow
artifact->InitArtifactPowers(artifact->GetTemplate()->GetArtifactID(), uint8(i)); artifact->InitArtifactPowers(artifact->GetTemplate()->GetArtifactID(), uint8(i));
artifact->SetModifier(ITEM_MODIFIER_ARTIFACT_TIER, artifactTier); artifact->SetModifier(ITEM_MODIFIER_ARTIFACT_TIER, artifactTier);
_player->UpdateCriteria(CriteriaType::AnyArtifactPowerRankPurchased, totalPurchasedArtifactPower);
} }
void WorldSession::HandleArtifactSetAppearance(WorldPackets::Artifact::ArtifactSetAppearance& artifactSetAppearance) void WorldSession::HandleArtifactSetAppearance(WorldPackets::Artifact::ArtifactSetAppearance& artifactSetAppearance)