mangos-mirror/server
0
0
Fork 0
mirror of https://github.com/mangosfour/server.git synced 2025-12-15 01:37:00 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge commit 'origin/master' into 310

Browse source 
Conflicts:
	src/game/Player.cpp
This commit is contained in:
tomrus88 2009-05-06 09:40:35 +04:00
commit 6821c24268
27 changed files with 414 additions and 105 deletions
Download patch file Download diff file Expand all files Collapse all files

49
src/game/Pet.cpp
View file

@ -552,18 +552,26 @@ void Pet::Update(uint32 diff)
}
}
if(getPetType() != HUNTER_PET)
break;
//regenerate Focus
//regenerate focus for hunter pets or energy for deathknight's ghoul
if(m_regenTimer <= diff)
{
RegenerateFocus();
switch (getPowerType())
{
case POWER_FOCUS:
case POWER_ENERGY:
Regenerate(getPowerType());
break;
default:
break;
}
m_regenTimer = 4000;
}
else
m_regenTimer -= diff;
if(getPetType() != HUNTER_PET)
break;
if(m_happinessTimer <= diff)
{
LooseHappiness();
@ -580,22 +588,41 @@ void Pet::Update(uint32 diff)
Creature::Update(diff);
}
void Pet::RegenerateFocus()
void Pet::Regenerate(Powers power)
{
uint32 curValue = GetPower(POWER_FOCUS);
uint32 maxValue = GetMaxPower(POWER_FOCUS);
uint32 curValue = GetPower(power);
uint32 maxValue = GetMaxPower(power);
if (curValue >= maxValue)
return;
float addvalue = 24 * sWorld.getRate(RATE_POWER_FOCUS);
float addvalue = 0.0f;
switch (power)
{
case POWER_FOCUS:
{
// For hunter pets.
addvalue = 24 * sWorld.getRate(RATE_POWER_FOCUS);
break;
}
case POWER_ENERGY:
{
// For deathknight's ghoul.
addvalue = 20;
break;
}
default:
return;
}
// Apply modifiers (if any).
AuraList const& ModPowerRegenPCTAuras = GetAurasByType(SPELL_AURA_MOD_POWER_REGEN_PERCENT);
for(AuraList::const_iterator i = ModPowerRegenPCTAuras.begin(); i != ModPowerRegenPCTAuras.end(); ++i)
if ((*i)->GetModifier()->m_miscvalue == POWER_FOCUS)
if ((*i)->GetModifier()->m_miscvalue == power)
addvalue *= ((*i)->GetModifier()->m_amount + 100) / 100.0f;
ModifyPower(POWER_FOCUS, (int32)addvalue);
ModifyPower(power, (int32)addvalue);
}
void Pet::LooseHappiness()