josh/TCPlayerbotCore
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Scripts/Ulduar/Freya: Fix chest spawning when completing the encounter properly (in addition to spawn support when abusing .die for testing purposes)

Browse Source
This commit is contained in:
Machiavelli
2011-11-14 20:49:46 +01:00
parent 210be7d0d1
commit 28102c5683
1 changed files with 25 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/server/scripts/Northrend/Ulduar/Ulduar/boss_freya.cpp
+25 -25
View File
@@ -321,35 +321,12 @@ class boss_freya : public CreatureScript
DoScriptText(RAND(SAY_SLAY_1, SAY_SLAY_2), me);
}
void DamageTaken(Unit* /*who*/, uint32& damage)
void DamageTaken(Unit* who, uint32& damage)
{
if (damage >= me->GetHealth())
{
damage = 0;
DoScriptText(SAY_DEATH, me);
me->SetReactState(REACT_PASSIVE);
_JustDied();
me->RemoveAllAuras();
me->AttackStop();
me->setFaction(35);
me->DeleteThreatList();
me->CombatStop(true);
me->DespawnOrUnsummon(7500);
me->CastSpell(me, SPELL_KNOCK_ON_WOOD_CREDIT, true);
Creature* Elder[3];
for (uint8 n = 0; n < 3; ++n)
{
Elder[n] = ObjectAccessor::GetCreature(*me, instance->GetData64(BOSS_BRIGHTLEAF + n));
if (Elder[n] && Elder[n]->isAlive())
{
Elder[n]->RemoveAllAuras();
Elder[n]->AttackStop();
Elder[n]->CombatStop(true);
Elder[n]->DeleteThreatList();
Elder[n]->GetAI()->DoAction(ACTION_ELDER_FREYA_KILLED);
}
}
JustDied(who);
}
}
@@ -625,7 +602,30 @@ class boss_freya : public CreatureScript
me->CastSpell((Unit*)NULL, summonSpell[me->GetMap()->GetDifficulty()][elderCount], true);
DoScriptText(SAY_DEATH, me);
me->SetReactState(REACT_PASSIVE);
_JustDied();
me->RemoveAllAuras();
me->AttackStop();
me->setFaction(35);
me->DeleteThreatList();
me->CombatStop(true);
me->DespawnOrUnsummon(7500);
me->CastSpell(me, SPELL_KNOCK_ON_WOOD_CREDIT, true);
Creature* Elder[3];
for (uint8 n = 0; n < 3; ++n)
{
Elder[n] = ObjectAccessor::GetCreature(*me, instance->GetData64(BOSS_BRIGHTLEAF + n));
if (Elder[n] && Elder[n]->isAlive())
{
Elder[n]->RemoveAllAuras();
Elder[n]->AttackStop();
Elder[n]->CombatStop(true);
Elder[n]->DeleteThreatList();
Elder[n]->GetAI()->DoAction(ACTION_ELDER_FREYA_KILLED);
}
}
}
void JustSummoned(Creature* summoned)