Merge pull request #4982 from Gyx/4.x

Gyx 4.x update

src/server/game/Achievements/AchievementMgr.cpp

@@ -1449,14 +1449,6 @@ void AchievementMgr::UpdateAchievementCriteria(AchievementCriteriaTypes type, ui
                     continue;
                 SetCriteriaProgress(achievementCriteria, miscValue2, PROGRESS_ACCUMULATE);
                 break;
-            // std case: not exist in DBC, not triggered in code as result
-            case ACHIEVEMENT_CRITERIA_TYPE_HIGHEST_HEALTH:
-            case ACHIEVEMENT_CRITERIA_TYPE_HIGHEST_SPELLPOWER:
-            case ACHIEVEMENT_CRITERIA_TYPE_HIGHEST_ARMOR:
-            case ACHIEVEMENT_CRITERIA_TYPE_HIGHEST_POWER:
-            case ACHIEVEMENT_CRITERIA_TYPE_HIGHEST_STAT:
-            case ACHIEVEMENT_CRITERIA_TYPE_HIGHEST_RATING:
-                break;
             // FIXME: not triggered in code as result, need to implement
             case ACHIEVEMENT_CRITERIA_TYPE_COMPLETE_RAID:
             case ACHIEVEMENT_CRITERIA_TYPE_WIN_ARENA:
@@ -1644,9 +1636,6 @@ bool AchievementMgr::IsCompletedCriteria(AchievementCriteriaEntry const* achieve
         case ACHIEVEMENT_CRITERIA_TYPE_RECEIVE_EPIC_ITEM:
         case ACHIEVEMENT_CRITERIA_TYPE_ROLL_NEED:
         case ACHIEVEMENT_CRITERIA_TYPE_ROLL_GREED:
-        case ACHIEVEMENT_CRITERIA_TYPE_HIGHEST_HEALTH:
-        case ACHIEVEMENT_CRITERIA_TYPE_HIGHEST_SPELLPOWER:
-        case ACHIEVEMENT_CRITERIA_TYPE_HIGHEST_ARMOR:
         case ACHIEVEMENT_CRITERIA_TYPE_QUEST_ABANDONED:
         case ACHIEVEMENT_CRITERIA_TYPE_FLIGHT_PATHS_TAKEN:
         case ACHIEVEMENT_CRITERIA_TYPE_ACCEPTED_SUMMONINGS:

src/server/game/Achievements/AchievementMgr.h

@@ -59,7 +59,6 @@ enum AchievementCriteriaDataType
     ACHIEVEMENT_CRITERIA_DATA_TYPE_BG_LOSS_TEAM_SCORE  = 17, // min_score      max_score     player's team win bg and opposition team have team score in range
     ACHIEVEMENT_CRITERIA_DATA_INSTANCE_SCRIPT          = 18, // 0              0             maker instance script call for check current criteria requirements fit
     ACHIEVEMENT_CRITERIA_DATA_TYPE_S_EQUIPED_ITEM      = 19, // item_level     item_quality  for equipped item in slot to check item level and quality
-    MAX_ACHIEVEMENT_CRITERIA_DATA_TYPE,
     ACHIEVEMENT_CRITERIA_DATA_TYPE_S_PLAYER_CLASS_RACE = 21, // class_id       race_id
 };
 

src/server/game/DataStores/DBCEnums.h

@@ -193,6 +193,7 @@ enum AchievementCriteriaTypes
 {
     ACHIEVEMENT_CRITERIA_TYPE_KILL_CREATURE = 0,
     ACHIEVEMENT_CRITERIA_TYPE_WIN_BG = 1,
+    ACHIEVEMENT_CRITERIA_TYPE_UNK3 = 3, // struct { uint32 itemCount; }
     ACHIEVEMENT_CRITERIA_TYPE_REACH_LEVEL = 5,
     ACHIEVEMENT_CRITERIA_TYPE_REACH_SKILL_LEVEL = 7,
     ACHIEVEMENT_CRITERIA_TYPE_COMPLETE_ACHIEVEMENT = 8,
@@ -222,7 +223,6 @@ enum AchievementCriteriaTypes
     ACHIEVEMENT_CRITERIA_TYPE_LEARN_SPELL = 34,
     ACHIEVEMENT_CRITERIA_TYPE_HONORABLE_KILL = 35,
     ACHIEVEMENT_CRITERIA_TYPE_OWN_ITEM = 36,
-    // TODO: the archievements 1162 and 1163 requires a special rating which can't be found in the dbc
     ACHIEVEMENT_CRITERIA_TYPE_WIN_RATED_ARENA = 37,
     ACHIEVEMENT_CRITERIA_TYPE_HIGHEST_TEAM_RATING = 38,
     ACHIEVEMENT_CRITERIA_TYPE_HIGHEST_PERSONAL_RATING = 39,
@@ -279,12 +279,6 @@ enum AchievementCriteriaTypes
     ACHIEVEMENT_CRITERIA_TYPE_RECEIVE_EPIC_ITEM = 91,
     ACHIEVEMENT_CRITERIA_TYPE_ROLL_NEED = 93,
     ACHIEVEMENT_CRITERIA_TYPE_ROLL_GREED = 94,
-    ACHIEVEMENT_CRITERIA_TYPE_HIGHEST_HEALTH = 95,
-    ACHIEVEMENT_CRITERIA_TYPE_HIGHEST_POWER = 96,
-    ACHIEVEMENT_CRITERIA_TYPE_HIGHEST_STAT = 97,
-    ACHIEVEMENT_CRITERIA_TYPE_HIGHEST_SPELLPOWER = 98,
-    ACHIEVEMENT_CRITERIA_TYPE_HIGHEST_ARMOR = 99,
-    ACHIEVEMENT_CRITERIA_TYPE_HIGHEST_RATING = 100,
     ACHIEVEMENT_CRITERIA_TYPE_HIGHEST_HIT_DEALT = 101,
     ACHIEVEMENT_CRITERIA_TYPE_HIGHEST_HIT_RECEIVED = 102,
     ACHIEVEMENT_CRITERIA_TYPE_TOTAL_DAMAGE_RECEIVED = 103,
@@ -300,11 +294,12 @@ enum AchievementCriteriaTypes
     ACHIEVEMENT_CRITERIA_TYPE_EARN_HONORABLE_KILL = 113,
     ACHIEVEMENT_CRITERIA_TYPE_ACCEPTED_SUMMONINGS = 114,
     ACHIEVEMENT_CRITERIA_TYPE_EARN_ACHIEVEMENT_POINTS = 115,
+    ACHIEVEMENT_CRITERIA_TYPE_UNK118 = 118,
     ACHIEVEMENT_CRITERIA_TYPE_USE_LFD_TO_GROUP_WITH_PLAYERS = 119,
-    // 120 -
-    // 121 -
-    // 122 -
-    // 123 -
+    ACHIEVEMENT_CRITERIA_TYPE_UNK120 = 120,
+    ACHIEVEMENT_CRITERIA_TYPE_UNK121 = 121,
+    ACHIEVEMENT_CRITERIA_TYPE_UNK122 = 122,
+    ACHIEVEMENT_CRITERIA_TYPE_UNK123 = 123,
     ACHIEVEMENT_CRITERIA_TYPE_SPENT_GOLD_GUILD_REPAIRS = 124,
     ACHIEVEMENT_CRITERIA_TYPE_REACH_GUILD_LEVEL = 125,
     ACHIEVEMENT_CRITERIA_TYPE_CRAFT_ITEMS_GUILD = 126,
@@ -312,14 +307,21 @@ enum AchievementCriteriaTypes
     ACHIEVEMENT_CRITERIA_TYPE_BUY_GUILD_BANK_SLOTS = 128,
     ACHIEVEMENT_CRITERIA_TYPE_EARN_GUILD_ACHIEVEMENT_POINTS = 129,
     ACHIEVEMENT_CRITERIA_TYPE_WIN_RATED_BATTLEGROUND = 130,
-    // 131 -
     ACHIEVEMENT_CRITERIA_TYPE_REACH_BG_RATING = 132,
     ACHIEVEMENT_CRITERIA_TYPE_BUY_GUILD_TABARD = 133,
     ACHIEVEMENT_CRITERIA_TYPE_COMPLETE_QUESTS_GUILD = 134,
     ACHIEVEMENT_CRITERIA_TYPE_HONORABLE_KILLS_GUILD = 135,
     ACHIEVEMENT_CRITERIA_TYPE_KILL_CREATURE_TYPE_GUILD = 136,
-    // 0..136 => 137 criteria types total
-    ACHIEVEMENT_CRITERIA_TYPE_TOTAL = 137,
+    ACHIEVEMENT_CRITERIA_TYPE_UNK137 = 137,
+    ACHIEVEMENT_CRITERIA_TYPE_UNK138 = 138, //struct { Flag flag; uint32 count; } 1: Guild Dungeon, 2:Guild Challenge, 3:Guild battlefield
+    ACHIEVEMENT_CRITERIA_TYPE_UNK139 = 139, //struct { uint32 count; } Guild Challenge
+    ACHIEVEMENT_CRITERIA_TYPE_UNK140 = 140,
+    ACHIEVEMENT_CRITERIA_TYPE_UNK141 = 141,
+    ACHIEVEMENT_CRITERIA_TYPE_UNK142 = 142,
+    ACHIEVEMENT_CRITERIA_TYPE_UNK143 = 143,
+    ACHIEVEMENT_CRITERIA_TYPE_UNK144 = 144,
+    // 0..144 => 145 criteria types total
+    ACHIEVEMENT_CRITERIA_TYPE_TOTAL = 145,
 };
 
 enum AchievementCategory