Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4
This commit is contained in:
commit
3f3a32df34
218 files changed
+1060
-974
No files matched your search
@@ -593,7 +593,7 @@ class boss_taerar : public CreatureScript
|
||||
|
||||
uint32 count = sizeof(TaerarShadeSpells) / sizeof(uint32);
|
||||
for (uint32 i = 0; i < count; ++i)
|
||||
DoCast(me->GetVictim(), TaerarShadeSpells[i], true);
|
||||
DoCastVictim(TaerarShadeSpells[i], true);
|
||||
_shades += count;
|
||||
|
||||
DoCast(SPELL_SHADE);
|
||||
|
||||
@@ -131,7 +131,7 @@ public:
|
||||
if (healing)
|
||||
DoCast(me, info->Id);
|
||||
else
|
||||
DoCast(me->GetVictim(), info->Id);
|
||||
DoCastVictim(info->Id);
|
||||
|
||||
//Set our global cooldown
|
||||
globalCooldown = GENERIC_CREATURE_COOLDOWN;
|
||||
@@ -174,7 +174,7 @@ public:
|
||||
if (healing)
|
||||
DoCast(me, info->Id);
|
||||
else
|
||||
DoCast(me->GetVictim(), info->Id);
|
||||
DoCastVictim(info->Id);
|
||||
|
||||
//Set our global cooldown
|
||||
globalCooldown = GENERIC_CREATURE_COOLDOWN;
|
||||
|
||||
@@ -1130,7 +1130,7 @@ public:
|
||||
|
||||
if (me->isAttackReady())
|
||||
{
|
||||
DoCast(me->GetVictim(), SPELL_DEATHTOUCH, true);
|
||||
DoCastVictim(SPELL_DEATHTOUCH, true);
|
||||
me->resetAttackTimer();
|
||||
}
|
||||
}
|
||||
@@ -1674,7 +1674,7 @@ public:
|
||||
else
|
||||
spell = SPELL_CRIPPLING_POISON;
|
||||
|
||||
DoCast(me->GetVictim(), spell);
|
||||
DoCastVictim(spell);
|
||||
}
|
||||
|
||||
SpellTimer = VIPER_TIMER;
|
||||
@@ -1682,7 +1682,7 @@ public:
|
||||
else //Venomous Snake
|
||||
{
|
||||
if (urand(0, 2) == 0) //33% chance to cast
|
||||
DoCast(me->GetVictim(), SPELL_DEADLY_POISON);
|
||||
DoCastVictim(SPELL_DEADLY_POISON);
|
||||
SpellTimer = VENOMOUS_SNAKE_TIMER + (rand() % 5) * 100;
|
||||
}
|
||||
}
|
||||
@@ -2116,7 +2116,7 @@ public:
|
||||
|
||||
if (FireShield_Timer <= diff)
|
||||
{
|
||||
DoCast(me->GetVictim(), SPELL_FIRESHIELD);
|
||||
DoCastVictim(SPELL_FIRESHIELD);
|
||||
FireShield_Timer = 2 * IN_MILLISECONDS;
|
||||
}
|
||||
else
|
||||
@@ -2124,7 +2124,7 @@ public:
|
||||
|
||||
if (FireBlast_Timer <= diff)
|
||||
{
|
||||
DoCast(me->GetVictim(), SPELL_FIREBLAST);
|
||||
DoCastVictim(SPELL_FIREBLAST);
|
||||
FireBlast_Timer = 5000 + rand() % 15000; // 5-20 sec cd
|
||||
}
|
||||
else
|
||||
@@ -2132,7 +2132,7 @@ public:
|
||||
|
||||
if (FireNova_Timer <= diff)
|
||||
{
|
||||
DoCast(me->GetVictim(), SPELL_FIRENOVA);
|
||||
DoCastVictim(SPELL_FIRENOVA);
|
||||
FireNova_Timer = 5000 + rand() % 15000; // 5-20 sec cd
|
||||
}
|
||||
else
|
||||
@@ -2177,7 +2177,7 @@ public:
|
||||
|
||||
if (AngeredEarth_Timer <= diff)
|
||||
{
|
||||
DoCast(me->GetVictim(), SPELL_ANGEREDEARTH);
|
||||
DoCastVictim(SPELL_ANGEREDEARTH);
|
||||
AngeredEarth_Timer = 5000 + rand() % 15000; // 5-20 sec cd
|
||||
}
|
||||
else
|
||||
|
||||
Reference in new issue
Block a user