Removed tabs. Closed issue 397 and 171.
--HG-- branch : trunk
This commit is contained in:
+1
-2
@@ -981,11 +981,10 @@ bool Guardian::InitStatsForLevel(uint8 petlevel)
|
|||||||
if (!pInfo)
|
if (!pInfo)
|
||||||
SetCreateHealth(30*petlevel);
|
SetCreateHealth(30*petlevel);
|
||||||
|
|
||||||
float dmg_multiplier = 0.3f;
|
float dmg_multiplier = 0.3f;
|
||||||
if (HasAura(63271)) // Glyph of Feral Spirit
|
if (HasAura(63271)) // Glyph of Feral Spirit
|
||||||
dmg_multiplier = 0.6f;
|
dmg_multiplier = 0.6f;
|
||||||
|
|
||||||
|
|
||||||
SetBonusDamage(int32(m_owner->GetTotalAttackPowerValue(BASE_ATTACK) * dmg_multiplier));
|
SetBonusDamage(int32(m_owner->GetTotalAttackPowerValue(BASE_ATTACK) * dmg_multiplier));
|
||||||
|
|
||||||
SetBaseWeaponDamage(BASE_ATTACK, MINDAMAGE,float((petlevel * 4 - petlevel) + (m_owner->GetTotalAttackPowerValue(BASE_ATTACK) * dmg_multiplier)));
|
SetBaseWeaponDamage(BASE_ATTACK, MINDAMAGE,float((petlevel * 4 - petlevel) + (m_owner->GetTotalAttackPowerValue(BASE_ATTACK) * dmg_multiplier)));
|
||||||
|
|||||||
@@ -3289,14 +3289,14 @@ void Spell::SendLoot(uint64 guid, LootType loottype)
|
|||||||
gameObjTarget->TriggeringLinkedGameObject(trapEntry,m_caster);
|
gameObjTarget->TriggeringLinkedGameObject(trapEntry,m_caster);
|
||||||
return;
|
return;
|
||||||
|
|
||||||
case GAMEOBJECT_TYPE_GOOBER:
|
case GAMEOBJECT_TYPE_GOOBER:
|
||||||
// goober_scripts can be triggered if the player don't have the quest
|
// goober_scripts can be triggered if the player don't have the quest
|
||||||
if (gameObjTarget->GetGOInfo()->goober.eventId)
|
if (gameObjTarget->GetGOInfo()->goober.eventId)
|
||||||
{
|
{
|
||||||
sLog.outDebug("Goober ScriptStart id %u for GO %u",gameObjTarget->GetGOInfo()->goober.eventId,gameObjTarget->GetDBTableGUIDLow());
|
sLog.outDebug("Goober ScriptStart id %u for GO %u",gameObjTarget->GetGOInfo()->goober.eventId,gameObjTarget->GetDBTableGUIDLow());
|
||||||
player->GetMap()->ScriptsStart(sEventScripts, gameObjTarget->GetGOInfo()->goober.eventId, player, gameObjTarget);
|
player->GetMap()->ScriptsStart(sEventScripts, gameObjTarget->GetGOInfo()->goober.eventId, player, gameObjTarget);
|
||||||
gameObjTarget->EventInform(gameObjTarget->GetGOInfo()->goober.eventId);
|
gameObjTarget->EventInform(gameObjTarget->GetGOInfo()->goober.eventId);
|
||||||
}
|
}
|
||||||
gameObjTarget->Use(m_caster);
|
gameObjTarget->Use(m_caster);
|
||||||
return;
|
return;
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user