diff options
| -rw-r--r-- | sql/updates/world/2014_04_26_01_world_game_event.sql | 21 | ||||
| -rw-r--r-- | src/server/game/Achievements/AchievementMgr.cpp | 6 | ||||
| -rw-r--r-- | src/server/game/Achievements/AchievementMgr.h | 7 |
3 files changed, 17 insertions, 17 deletions
diff --git a/sql/updates/world/2014_04_26_01_world_game_event.sql b/sql/updates/world/2014_04_26_01_world_game_event.sql index 949c9717326..7155b2b1719 100644 --- a/sql/updates/world/2014_04_26_01_world_game_event.sql +++ b/sql/updates/world/2014_04_26_01_world_game_event.sql @@ -1,6 +1,17 @@ -DELETE FROM `game_event` `eventEntry` IN (65,66,67,68); +DELETE FROM `game_event` WHERE `eventEntry` IN (65,66,67,68,69,70,71); INSERT INTO `game_event` (`eventEntry`, `start_time`, `end_time`, `occurence`, `length`, `holiday`, `description`, `world_event`, `announce`) VALUES -(65, '2011-11-20 00:01:00', '2011-12-03 23:59:00', 525600, 336, 467, 'WoW''s 7th Anniversary', 0, 2), -(66, '2012-11-18 00:01:00', '2012-12-01 23:59:00', 525600, 336, 484, 'WoW''s 8th Anniversary', 0, 2), -(67, '2013-11-18 00:01:00', '2013-12-01 23:59:00', 525600, 336, 0/*509*/, 'WoW''s 9th Anniversary', 0, 2), -(68, '2014-11-17 00:01:00', '2014-12-01 23:59:00', 525600, 336, 0/*514*/, 'WoW''s 10th Anniversary', 0, 2); +(65, '2008-11-23 00:01:00', '2008-11-23 23:59:00', 525600, 1440, 0, 'WoW''s 4th Anniversary', 0, 2), +(66, '2009-11-22 00:01:00', '2009-12-06 23:59:00', 525600, 10080, 0, 'WoW''s 5th Anniversary', 0, 2), +(67, '2010-11-30 00:01:00', '2010-12-14 23:59:00', 525600, 10080, 0, 'WoW''s 6th Anniversary', 0, 2), +(68, '2011-11-20 00:01:00', '2010-12-03 23:59:00', 525600, 10080, 467, 'WoW''s 7th Anniversary', 0, 2), +(69, '2012-11-18 00:01:00', '2012-12-01 23:59:00', 525600, 10080, 484, 'WoW''s 8th Anniversary', 0, 2), +(70, '2013-11-18 00:01:00', '2013-12-01 23:59:00', 525600, 10080, 0/*509*/, 'WoW''s 9th Anniversary', 0, 2), +(71, '2014-11-17 00:01:00', '2014-12-01 23:59:00', 525600, 10080, 0/*514*/, 'WoW''s 10th Anniversary', 0, 2); + +DELETE FROM `achievement_criteria_data` WHERE `criteria_id` IN (9058, 12562,16082,17804,18500); +INSERT INTO `achievement_criteria_data` (`criteria_id`, `type`, `value1`, `value2`, `ScriptName`) VALUES +(9058, 23, 65, 0, ''), -- WoW''s 4th Anniversary' +(12562, 23, 66, 0, ''), -- WoW''s 5th Anniversary +(16082, 23, 67, 0, ''), -- WoW''s 6th Anniversary +(17804, 16, 467, 0, ''), -- WoW''s 7th Anniversary +(18500, 16, 484, 0, ''); -- WoW''s 8th Anniversary diff --git a/src/server/game/Achievements/AchievementMgr.cpp b/src/server/game/Achievements/AchievementMgr.cpp index 2b047f81d59..07095b1f726 100644 --- a/src/server/game/Achievements/AchievementMgr.cpp +++ b/src/server/game/Achievements/AchievementMgr.cpp @@ -117,7 +117,6 @@ bool AchievementCriteriaData::IsValid(AchievementCriteriaEntry const* criteria) { case ACHIEVEMENT_CRITERIA_DATA_TYPE_NONE: case ACHIEVEMENT_CRITERIA_DATA_TYPE_INSTANCE_SCRIPT: - case ACHIEVEMENT_CRITERIA_DATA_TYPE_NTH_BIRTHDAY: return true; case ACHIEVEMENT_CRITERIA_DATA_TYPE_T_CREATURE: if (!creature.id || !sObjectMgr->GetCreatureTemplate(creature.id)) @@ -392,11 +391,6 @@ bool AchievementCriteriaData::Meets(uint32 criteria_id, Player const* source, Un return false; return pProto->ItemLevel >= equipped_item.item_level && pProto->Quality >= equipped_item.item_quality; } - case ACHIEVEMENT_CRITERIA_DATA_TYPE_NTH_BIRTHDAY: - return (IsHolidayActive(HOLIDAY_ANNIVERSARY_7_YEARS) || - IsHolidayActive(HOLIDAY_ANNIVERSARY_8_YEARS) || - IsEventActive(67 /*HOLIDAY_ANNIVERSARY_9_YEARS = 509*/) || - IsEventActive(68 /*HOLIDAY_ANNIVERSARY_10_YEARS = 514*/)); case ACHIEVEMENT_CRITERIA_DATA_TYPE_S_KNOWN_TITLE: { if (CharTitlesEntry const* titleInfo = sCharTitlesStore.LookupEntry(known_title.title_id)) diff --git a/src/server/game/Achievements/AchievementMgr.h b/src/server/game/Achievements/AchievementMgr.h index 30247d589b6..efb42fe693b 100644 --- a/src/server/game/Achievements/AchievementMgr.h +++ b/src/server/game/Achievements/AchievementMgr.h @@ -68,7 +68,7 @@ enum AchievementCriteriaDataType ACHIEVEMENT_CRITERIA_DATA_TYPE_S_EQUIPED_ITEM = 19, // item_level item_quality for equipped item in slot to check item level and quality ACHIEVEMENT_CRITERIA_DATA_TYPE_MAP_ID = 20, // map_id 0 player must be on map with id in map_id 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 + // REUSE ACHIEVEMENT_CRITERIA_DATA_TYPE_S_KNOWN_TITLE = 23, // title_id known (pvp) title, values from dbc ACHIEVEMENT_CRITERIA_DATA_TYPE_GAME_EVENT = 24, // game_event_id 0 @@ -160,11 +160,6 @@ struct AchievementCriteriaData { uint32 mapId; } map_id; - // ACHIEVEMENT_CRITERIA_DATA_TYPE_NTH_BIRTHDAY = 21 - struct - { - uint32 nth_birthday; - } birthday_login; // ACHIEVEMENT_CRITERIA_DATA_TYPE_KNOWN_TITLE = 22 struct { |