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

Merge pull request #7854 from Gacko/utgarde

Browse Source 
Core: Utgarde Keep - Last corrections
This commit is contained in:
Nay
2012-09-23 07:47:10 -07:00
parent 5faa9d37b4 2da0af9595
commit 6576d1a93c
1 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/server/scripts/Northrend/UtgardeKeep/UtgardeKeep/boss_ingvar_the_plunderer.cpp
+7 -6
View File
@@ -154,7 +154,7 @@ public:
DoScriptText(YELL_DEAD_1, me);
}
if (events.GetPhaseMask() & PHASE_EVENT)
if (events.GetPhaseMask() & (1 << PHASE_EVENT))
damage = 0;
}
@@ -209,7 +209,7 @@ public:
void UpdateAI(const uint32 diff)
{
if (!UpdateVictim() && !(events.GetPhaseMask() & PHASE_EVENT))
if (!UpdateVictim() && !(events.GetPhaseMask() & (1 << PHASE_EVENT)))
return;
events.Update(diff);
@@ -235,7 +235,7 @@ public:
events.ScheduleEvent(EVENT_ENRAGE, urand(7,14)*IN_MILLISECONDS, 0, PHASE_HUMAN);
break;
case EVENT_SMASH:
DoCastVictim(SPELL_SMASH);
DoCastAOE(SPELL_SMASH);
events.ScheduleEvent(EVENT_SMASH, urand(12,16)*IN_MILLISECONDS, 0, PHASE_HUMAN);
break;
case EVENT_JUST_TRANSFORMED:
@@ -402,7 +402,8 @@ public:
enum eShadowAxe
{
SPELL_SHADOW_AXE_DAMAGE = 42750,
H_SPELL_SHADOW_AXE_DAMAGE = 59719
H_SPELL_SHADOW_AXE_DAMAGE = 59719,
POINT_TARGET = 28
};
class mob_ingvar_throw_dummy : public CreatureScript
@@ -427,7 +428,7 @@ public:
{
float x, y, z;
target->GetPosition(x, y, z);
me->GetMotionMaster()->MoveCharge(x, y, z, 42.0f, 28);
me->GetMotionMaster()->MoveCharge(x, y, z, 42.0f, POINT_TARGET);
target->DisappearAndDie();
}
else
@@ -438,7 +439,7 @@ public:
void MovementInform(uint32 type, uint32 id)
{
if (type == POINT_MOTION_TYPE && id == 28)
if (type == EFFECT_MOTION_TYPE && id == POINT_TARGET)
{
DoCast(me, SPELL_SHADOW_AXE_DAMAGE);
me->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_DISABLE_MOVE);