*Cleanup, better cast for Bear/Dire Bear part of Furor.
--HG-- branch : trunk
This commit is contained in:
@@ -3562,10 +3562,7 @@ void AuraEffect::HandleAuraModShapeshift(bool apply, bool Real, bool changeAmoun
|
|||||||
case FORM_BEAR:
|
case FORM_BEAR:
|
||||||
case FORM_DIREBEAR:
|
case FORM_DIREBEAR:
|
||||||
if (urand(0,99) < FurorChance)
|
if (urand(0,99) < FurorChance)
|
||||||
{
|
m_target->CastSpell(m_target, 17057, true);
|
||||||
int32 basePoints = 100; // Not sure if 100 is correct basePoints, maybe it should be 10?
|
|
||||||
m_target->CastCustomSpell(m_target, 17057, &basePoints, NULL, NULL, true, NULL, this);
|
|
||||||
}
|
|
||||||
default:
|
default:
|
||||||
{
|
{
|
||||||
uint32 newEnergy = std::min(m_target->GetPower(POWER_ENERGY), FurorChance);
|
uint32 newEnergy = std::min(m_target->GetPower(POWER_ENERGY), FurorChance);
|
||||||
|
|||||||
@@ -1606,8 +1606,8 @@ void Spell::EffectDummy(uint32 i)
|
|||||||
if (!unitTarget || !unitTarget->isAlive())
|
if (!unitTarget || !unitTarget->isAlive())
|
||||||
return;
|
return;
|
||||||
|
|
||||||
int hurt = 0;
|
uint32 hurt = 0;
|
||||||
int heal = 0;
|
uint32 heal = 0;
|
||||||
switch(m_spellInfo->Id)
|
switch(m_spellInfo->Id)
|
||||||
{
|
{
|
||||||
case 47540: hurt = 47758; heal = 47757; break;
|
case 47540: hurt = 47758; heal = 47757; break;
|
||||||
@@ -1674,7 +1674,7 @@ void Spell::EffectDummy(uint32 i)
|
|||||||
if (!pEnchant)
|
if (!pEnchant)
|
||||||
return;
|
return;
|
||||||
|
|
||||||
for (int s=0; s<3; s++)
|
for (uint8 s = 0; s < 3; ++s)
|
||||||
{
|
{
|
||||||
if(pEnchant->type[s] != ITEM_ENCHANTMENT_TYPE_COMBAT_SPELL)
|
if(pEnchant->type[s] != ITEM_ENCHANTMENT_TYPE_COMBAT_SPELL)
|
||||||
continue;
|
continue;
|
||||||
|
|||||||
@@ -14790,9 +14790,7 @@ void Unit::KnockbackFrom(float x, float y, float speedXY, float speedZ)
|
|||||||
}
|
}
|
||||||
|
|
||||||
if (!player)
|
if (!player)
|
||||||
{
|
|
||||||
GetMotionMaster()->MoveKnockbackFrom(x, y, speedXY, speedZ);
|
GetMotionMaster()->MoveKnockbackFrom(x, y, speedXY, speedZ);
|
||||||
}
|
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
float vcos, vsin;
|
float vcos, vsin;
|
||||||
|
|||||||
Reference in New Issue
Block a user