diff options
| author | Warpten <vertozor@gmail.com> | 2015-07-24 17:11:30 +0200 |
|---|---|---|
| committer | DDuarte <dnpd.dd@gmail.com> | 2015-07-25 16:59:43 +0100 |
| commit | 8dd460c0d99eefa8f0cdce16143297d44aaf3ccc (patch) | |
| tree | 0c18e16e4df2cc3ca987fa5b5159bda5f26b5b67 /src | |
| parent | 633a9a4450fc024e3ecd4a2d7db4933838387446 (diff) | |
Scripts/RubySanctum: Halion: Correctly spawn X-shaped flames.
(cherry picked from commit a82e55f6841284a68c4bb2500e342a591cb59c7a)
Diffstat (limited to 'src')
| -rw-r--r-- | src/server/scripts/Northrend/ChamberOfAspects/RubySanctum/boss_halion.cpp | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/src/server/scripts/Northrend/ChamberOfAspects/RubySanctum/boss_halion.cpp b/src/server/scripts/Northrend/ChamberOfAspects/RubySanctum/boss_halion.cpp index a4a0b46ceb7..57c906b2d72 100644 --- a/src/server/scripts/Northrend/ChamberOfAspects/RubySanctum/boss_halion.cpp +++ b/src/server/scripts/Northrend/ChamberOfAspects/RubySanctum/boss_halion.cpp @@ -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 |