From 3efa9c9ed38a16b20b2af87babd6eb107ad1d8fa Mon Sep 17 00:00:00 2001 From: Ovahlord Date: Tue, 10 Oct 2023 21:41:00 +0200 Subject: [PATCH] Core/Achievements: implement ACHIEVEMENT_CRITERIA_ADDITIONAL_CONDITION_SOURCE_DRUNK_VALUE --- src/server/game/Achievements/AchievementMgr.cpp | 6 ++++++ src/server/game/DataStores/DBCEnums.h | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/src/server/game/Achievements/AchievementMgr.cpp b/src/server/game/Achievements/AchievementMgr.cpp index 115b34693f..eceb297785 100644 --- a/src/server/game/Achievements/AchievementMgr.cpp +++ b/src/server/game/Achievements/AchievementMgr.cpp @@ -2824,6 +2824,12 @@ bool AchievementMgr::AdditionalRequirementsSatisfied(AchievementCriteriaEntry switch (AchievementCriteriaAdditionalCondition(reqType)) { + case ACHIEVEMENT_CRITERIA_ADDITIONAL_CONDITION_SOURCE_DRUNK_VALUE: // 1 + { + if (referencePlayer->GetDrunkValue() < reqValue) + return false; + break; + } case ACHIEVEMENT_CRITERIA_ADDITIONAL_CONDITION_SOURCE_PLAYER_CONDITION: // 2 { PlayerConditionEntry const* playerCondition = sPlayerConditionStore.LookupEntry(reqValue); diff --git a/src/server/game/DataStores/DBCEnums.h b/src/server/game/DataStores/DBCEnums.h index a481971dd6..347fbf1f1f 100644 --- a/src/server/game/DataStores/DBCEnums.h +++ b/src/server/game/DataStores/DBCEnums.h @@ -122,7 +122,7 @@ enum AchievementCriteriaCondition enum AchievementCriteriaAdditionalCondition { - ACHIEVEMENT_CRITERIA_ADDITIONAL_CONDITION_SOURCE_DRUNK_VALUE = 1, // NYI + ACHIEVEMENT_CRITERIA_ADDITIONAL_CONDITION_SOURCE_DRUNK_VALUE = 1, ACHIEVEMENT_CRITERIA_ADDITIONAL_CONDITION_SOURCE_PLAYER_CONDITION = 2, ACHIEVEMENT_CRITERIA_ADDITIONAL_CONDITION_ITEM_LEVEL = 3, ACHIEVEMENT_CRITERIA_ADDITIONAL_CONDITION_TARGET_CREATURE_ENTRY = 4,