diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/server/scripts/Northrend/Ulduar/ulduar/instance_ulduar.cpp | 70 | ||||
| -rw-r--r-- | src/server/scripts/Northrend/Ulduar/ulduar/ulduar.h | 44 |
2 files changed, 62 insertions, 52 deletions
diff --git a/src/server/scripts/Northrend/Ulduar/ulduar/instance_ulduar.cpp b/src/server/scripts/Northrend/Ulduar/ulduar/instance_ulduar.cpp index b91b0f350a3..3c96a613cc8 100644 --- a/src/server/scripts/Northrend/Ulduar/ulduar/instance_ulduar.cpp +++ b/src/server/scripts/Northrend/Ulduar/ulduar/instance_ulduar.cpp @@ -79,6 +79,7 @@ class instance_ulduar : public InstanceMapScript uint32 TeamInInstance; uint32 HodirRareCacheData; uint8 elderCount; + bool conSpeedAtory; std::set<uint64> mRubbleSpawns; @@ -86,37 +87,38 @@ class instance_ulduar : public InstanceMapScript { SetBossNumber(MAX_ENCOUNTER); LoadDoorData(doorData); - IgnisGUID = 0; - RazorscaleGUID = 0; - RazorscaleController = 0; - ExpeditionCommanderGUID = 0; - XT002GUID = 0; - KologarnGUID = 0; - LeftArmGUID = 0; - RightArmGUID = 0; - AuriayaGUID = 0; - MimironGUID = 0; - HodirGUID = 0; - ThorimGUID = 0; - FreyaGUID = 0; - VezaxGUID = 0; - YoggSaronGUID = 0; - AlgalonGUID = 0; - KologarnChestGUID = 0; - KologarnBridgeGUID = 0; - KologarnChestGUID = 0; - ThorimChestGUID = 0; - HodirRareCacheGUID = 0; - HodirChestGUID = 0; - FreyaChestGUID = 0; - LeviathanGateGUID = 0; - VezaxDoorGUID = 0; - HodirDoorGUID = 0; - HodirIceDoorGUID = 0; - ArchivumDoorGUID = 0; - TeamInInstance = 0; - HodirRareCacheData = 0; - elderCount = 0; + IgnisGUID = 0; + RazorscaleGUID = 0; + RazorscaleController = 0; + ExpeditionCommanderGUID = 0; + XT002GUID = 0; + KologarnGUID = 0; + LeftArmGUID = 0; + RightArmGUID = 0; + AuriayaGUID = 0; + MimironGUID = 0; + HodirGUID = 0; + ThorimGUID = 0; + FreyaGUID = 0; + VezaxGUID = 0; + YoggSaronGUID = 0; + AlgalonGUID = 0; + KologarnChestGUID = 0; + KologarnBridgeGUID = 0; + KologarnChestGUID = 0; + ThorimChestGUID = 0; + HodirRareCacheGUID = 0; + HodirChestGUID = 0; + FreyaChestGUID = 0; + LeviathanGateGUID = 0; + VezaxDoorGUID = 0; + HodirDoorGUID = 0; + HodirIceDoorGUID = 0; + ArchivumDoorGUID = 0; + TeamInInstance = 0; + HodirRareCacheData = 0; + elderCount = 0; + conSpeedAtory = false; memset(Encounter, 0, sizeof(Encounter)); memset(XTToyPileGUIDs, 0, sizeof(XTToyPileGUIDs)); @@ -484,6 +486,12 @@ class instance_ulduar : public InstanceMapScript case DATA_KNOCK_ON_WOOD_ACHIEVEMENTS: elderCount = data; break; + case DATA_CON_SPEED_ATORY_ACHIEVEMENT: + if (!conSpeedAtory) + { + DoStartTimedAchievement(ACHIEVEMENT_TIMED_TYPE_EVENT, CRITERIA_CON_SPEED_ATORY); + conSpeedAtory = true; + } default: break; } diff --git a/src/server/scripts/Northrend/Ulduar/ulduar/ulduar.h b/src/server/scripts/Northrend/Ulduar/ulduar/ulduar.h index f902c33f938..9c32378440a 100644 --- a/src/server/scripts/Northrend/Ulduar/ulduar/ulduar.h +++ b/src/server/scripts/Northrend/Ulduar/ulduar/ulduar.h @@ -160,37 +160,39 @@ enum UlduarTowerEvents enum UlduarAchievementCriteriaIds { // Flame Leviathan - CRITERIA_UNBROKEN_10 = 10044, - CRITERIA_UNBROKEN_25 = 10045, - CRITERIA_SHUTOUT_10 = 10054, - CRITERIA_SHUTOUT_25 = 10055, - CRITERIA_3_CAR_GARAGE_CHOPPER_10 = 10046, - CRITERIA_3_CAR_GARAGE_SIEGE_10 = 10047, - CRITERIA_3_CAR_GARAGE_DEMOLISHER_10 = 10048, - CRITERIA_3_CAR_GARAGE_CHOPPER_25 = 10049, - CRITERIA_3_CAR_GARAGE_SIEGE_25 = 10050, - CRITERIA_3_CAR_GARAGE_DEMOLISHER_25 = 10051, + CRITERIA_UNBROKEN_10 = 10044, + CRITERIA_UNBROKEN_25 = 10045, + CRITERIA_SHUTOUT_10 = 10054, + CRITERIA_SHUTOUT_25 = 10055, + CRITERIA_3_CAR_GARAGE_CHOPPER_10 = 10046, + CRITERIA_3_CAR_GARAGE_SIEGE_10 = 10047, + CRITERIA_3_CAR_GARAGE_DEMOLISHER_10 = 10048, + CRITERIA_3_CAR_GARAGE_CHOPPER_25 = 10049, + CRITERIA_3_CAR_GARAGE_SIEGE_25 = 10050, + CRITERIA_3_CAR_GARAGE_DEMOLISHER_25 = 10051, // Ignis - CRITERIA_HOT_POCKET_10 = 10430, - CRITERIA_HOT_POCKET_25 = 10431, + CRITERIA_HOT_POCKET_10 = 10430, + CRITERIA_HOT_POCKET_25 = 10431, // Razorscale - CRITERIA_QUICK_SHAVE_10 = 10062, - CRITERIA_QUICK_SHAVE_25 = 10063, + CRITERIA_QUICK_SHAVE_10 = 10062, + CRITERIA_QUICK_SHAVE_25 = 10063, // Freya - CRITERIA_KNOCK_ON_WOOD_10 = 10447, - CRITERIA_KNOCK_ON_WOOD_25 = 10459, - CRITERIA_KNOCK_KNOCK_ON_WOOD_10 = 10448, - CRITERIA_KNOCK_KNOCK_ON_WOOD_25 = 10460, - CRITERIA_KNOCK_KNOCK_KNOCK_ON_WOOD_10 = 10449, - CRITERIA_KNOCK_KNOCK_KNOCK_ON_WOOD_25 = 10461, + CRITERIA_KNOCK_ON_WOOD_10 = 10447, + CRITERIA_KNOCK_ON_WOOD_25 = 10459, + CRITERIA_KNOCK_KNOCK_ON_WOOD_10 = 10448, + CRITERIA_KNOCK_KNOCK_ON_WOOD_25 = 10460, + CRITERIA_KNOCK_KNOCK_KNOCK_ON_WOOD_10 = 10449, + CRITERIA_KNOCK_KNOCK_KNOCK_ON_WOOD_25 = 10461, + CRITERIA_CON_SPEED_ATORY = 21597, // Timed achievement }; enum UlduarAchievementData { - DATA_KNOCK_ON_WOOD_ACHIEVEMENTS = 1, + DATA_KNOCK_ON_WOOD_ACHIEVEMENTS = 1, + DATA_CON_SPEED_ATORY_ACHIEVEMENT = 2, }; template<class AI> |