diff options
| author | SnapperRy <snapperryen@gmail.com> | 2016-08-24 20:24:14 +0200 |
|---|---|---|
| committer | SnapperRy <snapperryen@gmail.com> | 2016-08-24 20:24:14 +0200 |
| commit | 0d2ef2ac7155cedead2c7a7cafcd937a4e1dcd99 (patch) | |
| tree | 1a7a76ea2b43405627ca55255f4bb2fbded59974 | |
| parent | 0be073dacff97bc5ae5215368e28356a03b7767d (diff) | |
Core/Achievements: improve mergeability between branches
| -rw-r--r-- | sql/updates/world/3.3.5/2016_08_24_11_world.sql | 2 | ||||
| -rw-r--r-- | src/server/game/Achievements/AchievementMgr.h | 5 |
2 files changed, 5 insertions, 2 deletions
diff --git a/sql/updates/world/3.3.5/2016_08_24_11_world.sql b/sql/updates/world/3.3.5/2016_08_24_11_world.sql new file mode 100644 index 00000000000..e7f1e081f61 --- /dev/null +++ b/sql/updates/world/3.3.5/2016_08_24_11_world.sql @@ -0,0 +1,2 @@ +-- +UPDATE `achievement_criteria_data` SET `type`=25 WHERE `criteria_id` IN (4768, 4769, 4770, 4771, 4772, 4773, 4774, 4775, 4776, 4777, 4778, 4779, 4780, 4781, 4782, 4783, 4784, 4785, 4786, 6140, 6141, 6142); diff --git a/src/server/game/Achievements/AchievementMgr.h b/src/server/game/Achievements/AchievementMgr.h index 21ff1b234d8..75eb118fab0 100644 --- a/src/server/game/Achievements/AchievementMgr.h +++ b/src/server/game/Achievements/AchievementMgr.h @@ -71,10 +71,11 @@ enum AchievementCriteriaDataType ACHIEVEMENT_CRITERIA_DATA_TYPE_S_PLAYER_CLASS_RACE = 21, // class_id race_id ACHIEVEMENT_CRITERIA_DATA_TYPE_NTH_BIRTHDAY = 22, // N login on day of N-th Birthday ACHIEVEMENT_CRITERIA_DATA_TYPE_S_KNOWN_TITLE = 23, // title_id known (pvp) title, values from dbc - ACHIEVEMENT_CRITERIA_DATA_TYPE_S_ITEM_QUALITY = 24 // item_quality + // ACHIEVEMENT_CRITERIA_DATA_TYPE_GAME_EVENT = 24, // 7.x only + ACHIEVEMENT_CRITERIA_DATA_TYPE_S_ITEM_QUALITY = 25 // item_quality }; -#define MAX_ACHIEVEMENT_CRITERIA_DATA_TYPE 25 // maximum value in AchievementCriteriaDataType enum +#define MAX_ACHIEVEMENT_CRITERIA_DATA_TYPE 26 // maximum value in AchievementCriteriaDataType enum struct AchievementCriteriaData { |