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

Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4

Browse Source 
Conflicts:
	src/server/game/Entities/Unit/Unit.cpp
	src/server/game/Entities/Unit/Unit.h
	src/server/game/Handlers/PetHandler.cpp
	src/server/game/Spells/Spell.cpp
	src/server/game/Spells/Spell.h
This commit is contained in:
Vincent-Michael
2013-08-14 16:52:13 +02:00
parent c8b722e4a4 5890f95f7c
commit 11ecb9c633
10 changed files with 313 additions and 83 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/server/scripts/EasternKingdoms/BaradinHold/boss_occuthar.cpp
View File

@@ -23,9 +23,9 @@
enum Spells
{
SPELL_SEARING_SHADOWS = 96913,
SPEll_FOCUSED_FIRE_FIRST_DAMAGE = 97212,
SPEll_FOCUSED_FIRE_TRIGGER = 96872,
SPEll_FOCUSED_FIRE_VISUAL = 96886,
SPELL_FOCUSED_FIRE_FIRST_DAMAGE = 97212,
SPELL_FOCUSED_FIRE_TRIGGER = 96872,
SPELL_FOCUSED_FIRE_VISUAL = 96886,
SPELL_FOCUSED_FIRE = 96884,
SPELL_EYES_OF_OCCUTHAR = 96920,
SPELL_GAZE_OF_OCCUTHAR = 96942,
@@ -95,7 +95,7 @@ class boss_occuthar : public CreatureScript
for (uint8 i = 0; i < MAX_OCCUTHAR_VEHICLE_SEATS; ++i)
{
if (Unit* vehicle = _vehicle->GetPassenger(i))
vehicle->CastSpell(summon, SPEll_FOCUSED_FIRE_VISUAL);
vehicle->CastSpell(summon, SPELL_FOCUSED_FIRE_VISUAL);
}
}
}
@@ -119,7 +119,7 @@ class boss_occuthar : public CreatureScript
events.ScheduleEvent(EVENT_SEARING_SHADOWS, 25 * IN_MILLISECONDS);
break;
case EVENT_FOCUSED_FIRE:
DoCastAOE(SPEll_FOCUSED_FIRE_TRIGGER, true);
DoCastAOE(SPELL_FOCUSED_FIRE_TRIGGER, true);
events.ScheduleEvent(EVENT_FOCUSED_FIRE, 15 * IN_MILLISECONDS);
break;
case EVENT_EYES_OF_OCCUTHAR:
@@ -180,7 +180,7 @@ class npc_eyestalk : public CreatureScript
if (_events.ExecuteEvent() == EVENT_FOCUSED_FIRE_FIRST_DAMAGE)
{
DoCastAOE(SPEll_FOCUSED_FIRE_FIRST_DAMAGE);
DoCastAOE(SPELL_FOCUSED_FIRE_FIRST_DAMAGE);
if (++_damageCount < 2)
_events.ScheduleEvent(EVENT_FOCUSED_FIRE_FIRST_DAMAGE, 1 * IN_MILLISECONDS);
}