diff options
| -rw-r--r-- | sql/updates/world/2014_04_26_01_world_game_event.sql | 6 | ||||
| -rw-r--r-- | src/server/game/Achievements/AchievementMgr.cpp | 17 | ||||
| -rw-r--r-- | src/server/game/World/World.cpp | 2 | ||||
| -rw-r--r-- | src/server/game/World/World.h | 1 | ||||
| -rw-r--r-- | src/server/worldserver/worldserver.conf.dist | 9 |
5 files changed, 10 insertions, 25 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 new file mode 100644 index 00000000000..949c9717326 --- /dev/null +++ b/sql/updates/world/2014_04_26_01_world_game_event.sql @@ -0,0 +1,6 @@ +DELETE FROM `game_event` `eventEntry` IN (65,66,67,68); +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); diff --git a/src/server/game/Achievements/AchievementMgr.cpp b/src/server/game/Achievements/AchievementMgr.cpp index 5ff10804516..55b913f5414 100644 --- a/src/server/game/Achievements/AchievementMgr.cpp +++ b/src/server/game/Achievements/AchievementMgr.cpp @@ -380,19 +380,10 @@ bool AchievementCriteriaData::Meets(uint32 criteria_id, Player const* source, Un return pProto->ItemLevel >= equipped_item.item_level && pProto->Quality >= equipped_item.item_quality; } case ACHIEVEMENT_CRITERIA_DATA_TYPE_NTH_BIRTHDAY: - { - time_t birthday_start = time_t(sWorld->getIntConfig(CONFIG_BIRTHDAY_TIME)); - - tm birthday_tm; - ACE_OS::localtime_r(&birthday_start, &birthday_tm); - - // exactly N birthday - birthday_tm.tm_year += birthday_login.nth_birthday; - - time_t birthday = mktime(&birthday_tm); - time_t now = sWorld->GetGameTime(); - return now <= birthday + DAY && now >= 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/World/World.cpp b/src/server/game/World/World.cpp index a5725676571..a9507b174b6 100644 --- a/src/server/game/World/World.cpp +++ b/src/server/game/World/World.cpp @@ -1297,8 +1297,6 @@ void World::LoadConfigSettings(bool reload) m_int_configs[CONFIG_PACKET_SPOOF_BANDURATION] = sConfigMgr->GetIntDefault("PacketSpoof.BanDuration", 86400); - m_int_configs[CONFIG_BIRTHDAY_TIME] = sConfigMgr->GetIntDefault("BirthdayTime", 1222964635); - // call ScriptMgr if we're reloading the configuration if (reload) sScriptMgr->OnConfigLoad(reload); diff --git a/src/server/game/World/World.h b/src/server/game/World/World.h index 121b19f4b33..ebfd8c1112a 100644 --- a/src/server/game/World/World.h +++ b/src/server/game/World/World.h @@ -347,7 +347,6 @@ enum WorldIntConfigs CONFIG_BG_REWARD_LOSER_HONOR_LAST, CONFIG_BG_REWARD_WINNER_CONQUEST_FIRST, CONFIG_BG_REWARD_WINNER_CONQUEST_LAST, - CONFIG_BIRTHDAY_TIME, INT_CONFIG_VALUE_COUNT }; diff --git a/src/server/worldserver/worldserver.conf.dist b/src/server/worldserver/worldserver.conf.dist index 4caaba48089..12d25d98b19 100644 --- a/src/server/worldserver/worldserver.conf.dist +++ b/src/server/worldserver/worldserver.conf.dist @@ -1042,15 +1042,6 @@ AccountInstancesPerHour = 5 Account.PasswordChangeSecurity = 0 # -# BirthdayTime -# Description: Set to date of project's birth in UNIX time. By default the date when TrinityCore was started (Thu Oct 2, 2008) -# Default: 1222964635 -# -# - -BirthdayTime = 1222964635 - -# ################################################################################################### ################################################################################################### |