diff options
| author | Shauren <shauren.trinity@gmail.com> | 2011-02-03 22:20:40 +0100 |
|---|---|---|
| committer | Shauren <shauren.trinity@gmail.com> | 2011-02-03 22:20:40 +0100 |
| commit | c2b0bcbd6c8155812857523681cd787059cd9bf9 (patch) | |
| tree | b325612ecdddbb1235c676a862435c83374f95cf /src/server/scripts/Northrend | |
| parent | 7ea8bad07f64ed5886130fcc8016c0c72a32758e (diff) | |
Core/Instances: Implemented DungeonEncounter.dbc for creating completed encounters mask to use in packets
Core/Dungeon Finder: Implemented new way of giving random dungeon rewards, linked to DungeonEncounter.dbc
Diffstat (limited to 'src/server/scripts/Northrend')
3 files changed, 4 insertions, 12 deletions
diff --git a/src/server/scripts/Northrend/IcecrownCitadel/instance_icecrown_citadel.cpp b/src/server/scripts/Northrend/IcecrownCitadel/instance_icecrown_citadel.cpp index 758bb92a1aa..c739364d23d 100755 --- a/src/server/scripts/Northrend/IcecrownCitadel/instance_icecrown_citadel.cpp +++ b/src/server/scripts/Northrend/IcecrownCitadel/instance_icecrown_citadel.cpp @@ -395,16 +395,6 @@ class instance_icecrown_citadel : public InstanceMapScript return true; } - uint32 GetCompletedEncounterMask() const - { - uint32 mask = 0; - for (uint8 i = 0; i < MAX_ENCOUNTER; ++i) - if (GetBossState(i) == DONE) - mask |= 1 << i; - - return mask; - } - void SetData(uint32 type, uint32 data) { switch (type) diff --git a/src/server/scripts/Northrend/Nexus/Oculus/boss_eregos.cpp b/src/server/scripts/Northrend/Nexus/Oculus/boss_eregos.cpp index 73c933301f7..51b75f19f7e 100644 --- a/src/server/scripts/Northrend/Nexus/Oculus/boss_eregos.cpp +++ b/src/server/scripts/Northrend/Nexus/Oculus/boss_eregos.cpp @@ -139,7 +139,7 @@ public: Talk(SAY_AGGRO); } - + void DoAction(const int32 action) { if (action != ACTION_SET_NORMAL_EVENTS) @@ -157,7 +157,7 @@ public: if (summon->GetEntry() != NPC_PLANAR_ANOMALY) return; - + summon->CombatStop(true); summon->SetReactState(REACT_PASSIVE); summon->GetMotionMaster()->MoveRandom(100.0f); diff --git a/src/server/scripts/Northrend/VioletHold/instance_violet_hold.cpp b/src/server/scripts/Northrend/VioletHold/instance_violet_hold.cpp index 031bfa33bd9..a0d5eb3d173 100644 --- a/src/server/scripts/Northrend/VioletHold/instance_violet_hold.cpp +++ b/src/server/scripts/Northrend/VioletHold/instance_violet_hold.cpp @@ -315,11 +315,13 @@ public: switch(type) { case DATA_1ST_BOSS_EVENT: + UpdateEncounterState(ENCOUNTER_CREDIT_KILL_CREATURE, CREATURE_EREKEM, NULL); m_auiEncounter[0] = data; if (data == DONE) SaveToDB(); break; case DATA_2ND_BOSS_EVENT: + UpdateEncounterState(ENCOUNTER_CREDIT_KILL_CREATURE, CREATURE_MORAGG, NULL); m_auiEncounter[1] = data; if (data == DONE) SaveToDB(); |