Removed all my commits for today, this is hack? really? okey

--HG--
branch : trunk
This commit is contained in:
n0n4m3
2010-01-13 19:11:46 +03:00
parent edeb6bf284
commit f7ad3aefc8
9 changed files with 36 additions and 51 deletions
+1 -20
View File
@@ -498,10 +498,7 @@ void Pet::setDeathState(DeathState s) // overwrite virtual
void Pet::Update(uint32 diff)
{
if (m_removed) // pet already removed, just wait in remove queue, no updates
return;
if (m_loading)
if(m_removed) // pet already removed, just wait in remove queue, no updates
return;
switch( m_deathState )
@@ -972,22 +969,6 @@ bool Guardian::InitStatsForLevel(uint8 petlevel)
SetBaseWeaponDamage(BASE_ATTACK, MAXDAMAGE, float(petlevel * 4 + petlevel));
break;
}
case 19833: //Snake Trap - Venomous Snake
{
SetCreateHealth(uint32(107 * (petlevel - 40) * 0.025f));
SetCreateMana(0);
SetBaseWeaponDamage(BASE_ATTACK, MINDAMAGE, float((petlevel / 2) - 25));
SetBaseWeaponDamage(BASE_ATTACK, MAXDAMAGE, float((petlevel / 2) - 18));
break;
}
case 19921: //Snake Trap - Viper
{
SetCreateHealth(uint32(107 * (petlevel - 40) * 0.025f));
SetCreateMana(0);
SetBaseWeaponDamage(BASE_ATTACK, MINDAMAGE, float(petlevel / 2 - 10));
SetBaseWeaponDamage(BASE_ATTACK, MAXDAMAGE, float(petlevel / 2));
break;
}
case 31216: // Mirror Image
{
SetBonusDamage(int32(m_owner->SpellBaseDamageBonus(SPELL_SCHOOL_MASK_FROST) * 0.33f));