Core/Achievements: Implement more DBC achievement criteria conditions

2 files changed, 66 insertions, 12 deletions

diff --git a/src/server/game/Achievements/AchievementMgr.cpp b/src/server/game/Achievements/AchievementMgr.cpp
index b4fe39484e9..40a0be723fe 100755
--- a/src/server/game/Achievements/AchievementMgr.cpp
+++ b/src/server/game/Achievements/AchievementMgr.cpp
@@ -40,6 +40,7 @@
 #include "BattlegroundAB.h"
 #include "Map.h"
 #include "InstanceScript.h"
+#include "Group.h"
 
 namespace Trinity
 {
@@ -2016,7 +2017,7 @@ bool AchievementMgr::HasAchieved(uint32 achievementId) const
     return m_completedAchievements.find(achievementId) != m_completedAchievements.end();
 }
 
-bool AchievementMgr::CanUpdateCriteria(AchievementCriteriaEntry const* criteria, AchievementEntry const* achievement, uint64 /*miscValue1*/, uint64 /*miscValue2*/, Unit* unit)
+bool AchievementMgr::CanUpdateCriteria(AchievementCriteriaEntry const* criteria, AchievementEntry const* achievement, uint64 miscValue1, uint64 miscValue2, Unit* unit)
 {
     if (DisableMgr::IsDisabledFor(DISABLE_TYPE_ACHIEVEMENT_CRITERIA, criteria->ID, NULL))
         return false;
@@ -2096,6 +2097,59 @@ bool AchievementMgr::CanUpdateCriteria(AchievementCriteriaEntry const* criteria,
                     if (player->GetTeam() == GetPlayer()->GetTeam())
                         return false;
                 break;
+            case ACHIEVEMENT_CRITERIA_ADDITIONAL_CONDITION_TARGET_CREATURE_ENTRY:
+                if (!unit || !unit->ToCreature())
+                    return false;
+                if (unit->ToCreature()->GetEntry() != value)
+                    return false;
+                break;
+            case ACHIEVEMENT_CRITERIA_ADDITIONAL_CONDITION_SOURCE_HAS_AURA:
+                if (!GetPlayer()->HasAura(value))
+                    return false;
+                break;
+            case ACHIEVEMENT_CRITERIA_ADDITIONAL_CONDITION_TARGET_HAS_AURA:
+                if (!unit || !unit->HasAura(value))
+                    return false;
+            case ACHIEVEMENT_CRITERIA_ADDITIONAL_CONDITION_ITEM_QUALITY_MIN:
+                if (ItemTemplate const * itemProto = sObjectMgr->GetItemTemplate(miscValue1))
+                    if (itemProto->Quality < value)
+                        return false;
+                break;
+            case ACHIEVEMENT_CRITERIA_ADDITIONAL_CONDITION_ITEM_QUALITY_EQUALS:
+                if (ItemTemplate const * itemProto = sObjectMgr->GetItemTemplate(miscValue1))
+                    if (itemProto->Quality < value)
+                        return false;
+                break;
+            case ACHIEVEMENT_CRITERIA_ADDITIONAL_CONDITION_SOURCE_RACE:
+                if (GetPlayer()->getRace() != value)
+                    return false;
+                break;
+            case ACHIEVEMENT_CRITERIA_ADDITIONAL_CONDITION_SOURCE_CLASS:
+                if (GetPlayer()->getClass() != value)
+                    return false;
+                break;
+            case ACHIEVEMENT_CRITERIA_ADDITIONAL_CONDITION_TARGET_RACE:
+                if (!unit || !unit->ToPlayer())
+                    break;
+                if (unit->ToPlayer()->getRace() != value)
+                    return false;
+                break;
+            case ACHIEVEMENT_CRITERIA_ADDITIONAL_CONDITION_TARGET_CLASS:
+                if (!unit || !unit->ToPlayer())
+                    break;
+                if (unit->ToPlayer()->getClass() != value)
+                    return false;
+                break;
+            case ACHIEVEMENT_CRITERIA_ADDITIONAL_CONDITION_MAX_GROUP_MEMBERS:
+                if (GetPlayer()->GetGroup() && GetPlayer()->GetGroup()->GetMembersCount() >= value)
+                    return false;
+                break;
+            case ACHIEVEMENT_CRITERIA_ADDITIONAL_CONDITION_TARGET_CREATURE_TYPE:
+                if (!unit || !unit->ToCreature())
+                    return false;
+                if (unit->ToCreature()->GetCreatureType() != value)
+                    return false;
+                break;
             default:
                 break;
         }
diff --git a/src/server/game/DataStores/DBCEnums.h b/src/server/game/DataStores/DBCEnums.h
index 4888dadfcd6..b850aa0ef46 100755
--- a/src/server/game/DataStores/DBCEnums.h
+++ b/src/server/game/DataStores/DBCEnums.h
@@ -99,18 +99,18 @@ enum AchievementCriteriaAdditionalCondition
     ACHIEVEMENT_CRITERIA_ADDITIONAL_CONDITION_SOURCE_DRUNK_VALUE                = 1,    // NYI
     ACHIEVEMENT_CRITERIA_ADDITIONAL_CONDITION_UNK2                              = 2,
     ACHIEVEMENT_CRITERIA_ADDITIONAL_CONDITION_ITEM_LEVEL                        = 3,    // NYI
-    ACHIEVEMENT_CRITERIA_ADDITIONAL_CONDITION_TARGET_CREATURE_ENTRY             = 4,    // NYI
+    ACHIEVEMENT_CRITERIA_ADDITIONAL_CONDITION_TARGET_CREATURE_ENTRY             = 4,
     ACHIEVEMENT_CRITERIA_ADDITIONAL_CONDITION_TARGET_MUST_BE_PLAYER             = 5,
     ACHIEVEMENT_CRITERIA_ADDITIONAL_CONDITION_TARGET_MUST_BE_DEAD               = 6,
     ACHIEVEMENT_CRITERIA_ADDITIONAL_CONDITION_TARGET_MUST_BE_ENEMY              = 7,
-    ACHIEVEMENT_CRITERIA_ADDITIONAL_CONDITION_SOURCE_HAS_AURA                   = 8,    // NYI
+    ACHIEVEMENT_CRITERIA_ADDITIONAL_CONDITION_SOURCE_HAS_AURA                   = 8,
     ACHIEVEMENT_CRITERIA_ADDITIONAL_CONDITION_UNK9                              = 9,    // unused in 4.0.6a
-    ACHIEVEMENT_CRITERIA_ADDITIONAL_CONDITION_TARGET_HAS_AURA                   = 10,   // NYI
+    ACHIEVEMENT_CRITERIA_ADDITIONAL_CONDITION_TARGET_HAS_AURA                   = 10,
     ACHIEVEMENT_CRITERIA_ADDITIONAL_CONDITION_TARGET_MUST_BE_MOUNTED            = 11,
     ACHIEVEMENT_CRITERIA_ADDITIONAL_CONDITION_UNK12                             = 12,   // unused in 4.0.6a
     ACHIEVEMENT_CRITERIA_ADDITIONAL_CONDITION_UNK13                             = 13,   // unused in 4.0.6a
-    ACHIEVEMENT_CRITERIA_ADDITIONAL_CONDITION_ITEM_QUALITY_MIN                  = 14,   // NYI
-    ACHIEVEMENT_CRITERIA_ADDITIONAL_CONDITION_ITEM_QUALITY_EQUALS               = 15,   // NYI
+    ACHIEVEMENT_CRITERIA_ADDITIONAL_CONDITION_ITEM_QUALITY_MIN                  = 14,
+    ACHIEVEMENT_CRITERIA_ADDITIONAL_CONDITION_ITEM_QUALITY_EQUALS               = 15,
     ACHIEVEMENT_CRITERIA_ADDITIONAL_CONDITION_UNK16                             = 16,
     ACHIEVEMENT_CRITERIA_ADDITIONAL_CONDITION_SOURCE_AREA                       = 17,
     ACHIEVEMENT_CRITERIA_ADDITIONAL_CONDITION_SOURCE_ZONE                       = 18,
@@ -120,12 +120,12 @@ enum AchievementCriteriaAdditionalCondition
     ACHIEVEMENT_CRITERIA_ADDITIONAL_CONDITION_UNK22                             = 22,   // unused in 4.0.6a
     ACHIEVEMENT_CRITERIA_ADDITIONAL_CONDITION_UNK23                             = 23,   // unused in 4.0.6a
     ACHIEVEMENT_CRITERIA_ADDITIONAL_CONDITION_SOURCE_ARENA_TEAM_SIZE            = 24,   // NYI
-    ACHIEVEMENT_CRITERIA_ADDITIONAL_CONDITION_SOURCE_RACE                       = 25,   // NYI
-    ACHIEVEMENT_CRITERIA_ADDITIONAL_CONDITION_SOURCE_CLASS                      = 26,   // NYI
-    ACHIEVEMENT_CRITERIA_ADDITIONAL_CONDITION_TARGET_RACE                       = 27,   // NYI
-    ACHIEVEMENT_CRITERIA_ADDITIONAL_CONDITION_TARGET_CLASS                      = 28,   // NYI
-    ACHIEVEMENT_CRITERIA_ADDITIONAL_CONDITION_MAX_GROUP_MEMBERS                 = 29,   // NYI
-    ACHIEVEMENT_CRITERIA_ADDITIONAL_CONDITION_TARGET_CREATURE_TYPE              = 30,   // NYI
+    ACHIEVEMENT_CRITERIA_ADDITIONAL_CONDITION_SOURCE_RACE                       = 25,
+    ACHIEVEMENT_CRITERIA_ADDITIONAL_CONDITION_SOURCE_CLASS                      = 26,
+    ACHIEVEMENT_CRITERIA_ADDITIONAL_CONDITION_TARGET_RACE                       = 27,
+    ACHIEVEMENT_CRITERIA_ADDITIONAL_CONDITION_TARGET_CLASS                      = 28,
+    ACHIEVEMENT_CRITERIA_ADDITIONAL_CONDITION_MAX_GROUP_MEMBERS                 = 29,
+    ACHIEVEMENT_CRITERIA_ADDITIONAL_CONDITION_TARGET_CREATURE_TYPE              = 30,
     ACHIEVEMENT_CRITERIA_ADDITIONAL_CONDITION_UNK31                             = 31,   // unused in 4.0.6a
     ACHIEVEMENT_CRITERIA_ADDITIONAL_CONDITION_SOURCE_MAP                        = 32,
     ACHIEVEMENT_CRITERIA_ADDITIONAL_CONDITION_ITEM_CLASS                        = 33,   // NYI