Mirror/TrinityCore
1
0
Fork 0
mirror of https://github.com/TrinityCore/TrinityCore.git synced 2026-01-20 17:27:36 +01:00
Code Issues Packages Projects Releases Wiki Activity

Scripts/RubySanctum: Halion: Correctly spawn X-shaped flames.

Browse Source 
(cherry picked from commit a82e55f684)
This commit is contained in:
Warpten
2015-07-24 17:11:30 +02:00
committed by DDuarte
parent 633a9a4450
commit 8dd460c0d9
1 changed files with 5 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/server/scripts/Northrend/ChamberOfAspects/RubySanctum/boss_halion.cpp
View File

@@ -1005,7 +1005,6 @@ class npc_meteor_strike_initial : public CreatureScript
if (HalionAI* halionAI = CAST_AI(HalionAI, owner->AI()))
{
Position const* ownerPos = halionAI->GetMeteorStrikePosition();
// Adjust randomness between 0 and pi.
float randomAdjustment = frand(static_cast<float>(M_PI / 14), static_cast<float>(13 * M_PI / 14));
float angle[4];
angle[0] = me->GetAngle(ownerPos);
@@ -1087,13 +1086,12 @@ class npc_meteor_strike : public CreatureScript
void UpdateAI(uint32 diff) override
{
_events.Update(diff);
if (_events.ExecuteEvent() == EVENT_SPAWN_METEOR_FLAME)
{
Position pos = me->GetNearPosition(5.0f, 0.0f);
Position pos = me->GetNearPosition(5.0f, frand(static_cast<float>(-M_PI / 16), static_cast<float>(M_PI / 16)));
if (Creature* flame = me->SummonCreature(NPC_METEOR_STRIKE_FLAME, pos, TEMPSUMMON_TIMED_DESPAWN, 25000))
{
flame->SetOrientation(me->GetOrientation());
flame->AI()->SetGUID(GetGUID());
flame->AI()->DoAction(ACTION_SUMMON_FLAME);
}
@@ -1141,12 +1139,12 @@ class npc_meteor_strike_flame : public CreatureScript
if (!meteorStrike || meteorStrike->AI()->GetData(DATA_SPAWNED_FLAMES) > 5)
return;
me->SetOrientation(me->GetOrientation() + frand(static_cast<float>(-M_PI / 16), static_cast<float>(M_PI / 16)));
Position pos = me->GetNearPosition(5.0f, 0.0f);
Position pos = me->GetNearPosition(5.0f, frand(static_cast<float>(-M_PI / 16), static_cast<float>(M_PI / 16)));
if (Creature* flame = me->SummonCreature(NPC_METEOR_STRIKE_FLAME, pos, TEMPSUMMON_TIMED_DESPAWN, 25000))
{
flame->AI()->SetGUID(_rootOwnerGuid);
flame->AI()->DoAction(ACTION_SUMMON_FLAME);
meteorStrike->AI()->SetData(DATA_SPAWNED_FLAMES, 1);
}
}
@@ -1164,7 +1162,7 @@ class npc_meteor_strike_flame : public CreatureScript
private:
InstanceScript* _instance;
EventMap _events;
ObjectGuid _rootOwnerGuid = ObjectGuid::Empty;
ObjectGuid _rootOwnerGuid;
};
CreatureAI* GetAI(Creature* creature) const override