Mirror/TrinityCore
1
0
Fork 0
mirror of https://github.com/TrinityCore/TrinityCore.git synced 2026-01-16 07:30:42 +01:00
Code Issues Packages Projects Releases Wiki Activity

Scripts/Ulduar: Fixed infinite loop in Brightleaf's encounter (Freya's Elder) and fixed Unstable Sun Beam

Browse Source 
Signed-off-by: Machiavelli <machiavelli.trinity@gmail.com>
This commit is contained in:
Lopin
2011-06-10 20:40:42 +02:00
committed by Machiavelli
parent c19dd5b8f9
commit 60388f3907
2 changed files with 9 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
sql/updates/world/2011_06_10_03_world_misc.sql Normal file
View File

@@ -0,0 +1 @@
UPDATE `creature_template` SET `flags_extra`=`flags_extra`|128 WHERE `entry`=33050; -- Set trigger flag for Unstable Sun Beam

15
src/server/scripts/Northrend/Ulduar/ulduar/boss_freya.cpp
View File

@@ -94,7 +94,7 @@ enum FreyaSpells
SPELL_FLUX_PLUS = 62251,
SPELL_FLUX_MINUS = 62252,
SPELL_SOLAR_FLARE = 62240,
SPELL_UNSTABLE_SUNBEAM = 62207, // Trigger 62211
SPELL_UNSTABLE_SUN_BEAM_SUMMON = 62207, // Trigger 62221
// Stack Removing of Attuned to Nature
SPELL_REMOVE_25STACK = 62521,
@@ -147,6 +147,7 @@ enum FreyaSpells
SPELL_SUMMON_NATURE_BOMB = 64606,
// Unstable Sun Beam
SPELL_UNSTABLE_SUN_BEAM = 62211,
SPELL_UNSTABLE_ENERGY = 62217,
SPELL_PHOTOSYNTHESIS = 62209,
SPELL_UNSTABLE_SUN_BEAM_TRIGGERED = 62243,
@@ -738,8 +739,8 @@ class boss_elder_brightleaf : public CreatureScript
case EVENT_UNSTABLE_SUN_BEAM:
Position pos;
me->GetRandomNearPosition(pos, 20.0f);
me->SummonCreature(NPC_UNSTABLE_SUN_BEAM, pos.GetPositionX(), pos.GetPositionY(), pos.GetPositionZ(), 0);
events.ScheduleEvent(EVENT_UNSTABLE_SUN_BEAM, urand(7000, 15000));
me->CastSpell(me, SPELL_UNSTABLE_SUN_BEAM_SUMMON, true);
events.ScheduleEvent(EVENT_UNSTABLE_SUN_BEAM, urand(10000, 15000));
break;
case EVENT_SOLAR_FLARE:
{
@@ -755,7 +756,7 @@ class boss_elder_brightleaf : public CreatureScript
me->AddAura(SPELL_FLUX_AURA, me);
if (Aura* Flux = me->GetAura(SPELL_FLUX_AURA))
Flux->SetStackAmount(urand(1, 8));
events.ScheduleEvent(EVENT_FLUX, 5000);
events.ScheduleEvent(EVENT_FLUX, 7500);
break;
}
}
@@ -1459,10 +1460,10 @@ class npc_unstable_sun_beam : public CreatureScript
{
npc_unstable_sun_beamAI(Creature* creature) : Scripted_NoMovementAI(creature)
{
despawnTimer = 10000;
despawnTimer = urand(7000, 12000);
instance = me->GetInstanceScript();
DoCast(me, SPELL_PHOTOSYNTHESIS);
DoCast(me, SPELL_UNSTABLE_SUNBEAM);
DoCast(me, SPELL_UNSTABLE_SUN_BEAM);
me->SetReactState(REACT_PASSIVE);
}
@@ -1485,7 +1486,7 @@ class npc_unstable_sun_beam : public CreatureScript
{
if (target && spell->Id == SPELL_UNSTABLE_ENERGY)
{
target->RemoveAurasDueToSpell(SPELL_UNSTABLE_SUNBEAM);
target->RemoveAurasDueToSpell(SPELL_UNSTABLE_SUN_BEAM);
target->RemoveAurasDueToSpell(SPELL_UNSTABLE_SUN_BEAM_TRIGGERED);
}
}