Fix hardmode achievement from Obsidiam Sanctum

Fix Flame Tsunami aura and visual effects

Author: Gyullo

--HG--
branch : trunk
This commit is contained in:
_manuel_
2010-03-26 23:16:22 -03:00
parent 2cb7a31512
commit ecba58c8f6
@@ -200,7 +200,6 @@ Locations TwilightEggsSarth[] =
{3257.41, 512.939 , 58.5432}, {3257.41, 512.939 , 58.5432},
{3231.04, 498.281 , 58.6439} {3231.04, 498.281 , 58.6439}
}; };
uint32 achievProgress;
/*###### /*######
## Boss Sartharion ## Boss Sartharion
@@ -235,6 +234,8 @@ struct boss_sartharionAI : public ScriptedAI
bool m_bHasCalledShadron; bool m_bHasCalledShadron;
bool m_bHasCalledVesperon; bool m_bHasCalledVesperon;
uint32 achievProgress;
void Reset() void Reset()
{ {
m_bIsBerserk = false; m_bIsBerserk = false;
@@ -289,9 +290,9 @@ struct boss_sartharionAI : public ScriptedAI
if (pInstance) if (pInstance)
{ {
if (achievProgress == 1) if (achievProgress >= 1)
pInstance->DoCompleteAchievement(RAID_MODE(ACHIEV_TWILIGHT_ASSIST,H_ACHIEV_TWILIGHT_ASSIST)); pInstance->DoCompleteAchievement(RAID_MODE(ACHIEV_TWILIGHT_ASSIST,H_ACHIEV_TWILIGHT_ASSIST));
else if (achievProgress == 2) else if (achievProgress >= 2)
pInstance->DoCompleteAchievement(RAID_MODE(ACHIEV_TWILIGHT_DUO,H_ACHIEV_TWILIGHT_DUO)); pInstance->DoCompleteAchievement(RAID_MODE(ACHIEV_TWILIGHT_DUO,H_ACHIEV_TWILIGHT_DUO));
else if (achievProgress == 3) else if (achievProgress == 3)
pInstance->DoCompleteAchievement(RAID_MODE(ACHIEV_TWILIGHT_ZONE,H_ACHIEV_TWILIGHT_ZONE)); pInstance->DoCompleteAchievement(RAID_MODE(ACHIEV_TWILIGHT_ZONE,H_ACHIEV_TWILIGHT_ZONE));
@@ -827,8 +828,8 @@ struct mob_tenebronAI : public dummy_dragonAI
void KilledUnit(Unit* pVictim) void KilledUnit(Unit* pVictim)
{ {
DoScriptText(RAND(SAY_TENEBRON_SLAY_1,SAY_TENEBRON_SLAY_2), m_creature); DoScriptText(RAND(SAY_TENEBRON_SLAY_1,SAY_TENEBRON_SLAY_2), m_creature);
if (pInstance->GetData(TYPE_SARTHARION_EVENT) == IN_PROGRESS) /*if (pInstance->GetData(TYPE_SARTHARION_EVENT) == IN_PROGRESS)
achievProgress = 1; achievProgress = 1;*/
} }
void UpdateAI(const uint32 uiDiff) void UpdateAI(const uint32 uiDiff)
@@ -914,8 +915,8 @@ struct mob_shadronAI : public dummy_dragonAI
void KilledUnit(Unit* pVictim) void KilledUnit(Unit* pVictim)
{ {
DoScriptText(RAND(SAY_SHADRON_SLAY_1,SAY_SHADRON_SLAY_2), m_creature); DoScriptText(RAND(SAY_SHADRON_SLAY_1,SAY_SHADRON_SLAY_2), m_creature);
if (pInstance->GetData(TYPE_SARTHARION_EVENT) == IN_PROGRESS) /*if (pInstance->GetData(TYPE_SARTHARION_EVENT) == IN_PROGRESS)
achievProgress = 2; achievProgress = 2;*/
} }
void UpdateAI(const uint32 uiDiff) void UpdateAI(const uint32 uiDiff)
@@ -998,8 +999,8 @@ struct mob_vesperonAI : public dummy_dragonAI
void KilledUnit(Unit* pVictim) void KilledUnit(Unit* pVictim)
{ {
DoScriptText(RAND(SAY_VESPERON_SLAY_1,SAY_VESPERON_SLAY_2), m_creature); DoScriptText(RAND(SAY_VESPERON_SLAY_1,SAY_VESPERON_SLAY_2), m_creature);
if (pInstance->GetData(TYPE_SARTHARION_EVENT) == IN_PROGRESS) /*if (pInstance->GetData(TYPE_SARTHARION_EVENT) == IN_PROGRESS)
achievProgress = 3; achievProgress = 3;*/
} }
void UpdateAI(const uint32 uiDiff) void UpdateAI(const uint32 uiDiff)
@@ -1260,12 +1261,15 @@ CreatureAI* GetAI_mob_twilight_eggs(Creature* pCreature)
return new mob_twilight_eggsAI(pCreature); return new mob_twilight_eggsAI(pCreature);
} }
// Flame Tzunami /*######
## Flame Tzunami
######*/
struct npc_flame_tsunamiAI : public ScriptedAI struct npc_flame_tsunamiAI : public ScriptedAI
{ {
npc_flame_tsunamiAI(Creature* pCreature) : ScriptedAI(pCreature) npc_flame_tsunamiAI(Creature* pCreature) : ScriptedAI(pCreature)
{ {
m_creature->HasAura(57492); m_creature->HasAura(SPELL_FLAME_TSUNAMI_DMG_AURA);
DoCast(m_creature, SPELL_FLAME_TSUNAMI);
} }
uint32 Tsunami_Timer; uint32 Tsunami_Timer;