josh/TCPlayerbotCore
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

*Fix Incanter's Absorption.

Browse Source 
*Fix Devastate and Improved Fear- by Lightguard.
*Fix Glyph of devastate.
*Add spell coeficient-by cccyril.

--HG--
branch : trunk
This commit is contained in:
QAston
2009-03-08 01:16:57 +01:00
parent bbd030032e
commit 63b4a12251
5 changed files with 117 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files
sql/updates/1725_world.sql
+5
View File
@@ -0,0 +1,5 @@
-- Faerie fire
INSERT INTO `spell_bonus_data` (`entry`, `direct_bonus`, `dot_bonus`, `ap_bonus`, `comments`) VALUES
('60089', '0', '0', '0.05', 'Druid - Faerie Fire (Bear Form)');
-- Glyph of Devastate
INSERT INTO `spell_proc_event` VALUES (58388, 0x00, 4, 0x00000040, 0x00000000, 0x00000000, 0x00000110, 0x00000000, 0.000000, 0.000000, 0);
src/game/SpellAuras.cpp
+24 -6
View File
@@ -945,15 +945,18 @@ void Aura::_RemoveAura()
AuraSlotEntry *entry = m_target->GetVisibleAura(slot);
if (entry)
{
entry->m_slotAuras[GetEffIndex()]=NULL; //unregister aura
for(uint8 i = 0; i < 3; ++i) //check slot for more auras of the spell
// we have more auras, do not clear slot
if (entry->m_slotAuras[GetEffIndex()]==this)
{
if(entry->m_slotAuras[i])
entry->m_slotAuras[GetEffIndex()]=NULL; //unregister aura
for(uint8 i = 0; i < 3; ++i) //check slot for more auras of the spell
{
lastaura = false;
break;
if(entry->m_slotAuras[i])
{
lastaura = false;
break;
}
}
}
}
@@ -3112,6 +3115,21 @@ void Aura::HandleModFear(bool apply, bool Real)
//m_target->SetFeared(apply, GetCasterGUID(), GetId());
m_target->SetControlled(apply, UNIT_STAT_FLEEING);
// Improved Fear
if(!apply && m_spellProto->SpellFamilyName == SPELLFAMILY_WARLOCK)
{
Unit* caster = GetCaster();
if(!caster || caster->GetTypeId() != TYPEID_PLAYER)
return;
uint32 spell_id = 0;
if(caster->HasAura(53754, 0))
spell_id = 60946;
else if(caster->HasAura(53759, 0))
spell_id = 60947;
if(spell_id)
m_target->CastSpell(m_target, spell_id, true);
}
}
void Aura::HandleFeignDeath(bool apply, bool Real)
src/game/SpellEffects.cpp
+8 -2
View File
@@ -4332,9 +4332,12 @@ void Spell::SpellDamageWeaponDmg(uint32 i)
case SPELLFAMILY_WARRIOR:
{
// Devastate bonus and sunder armor refresh
if(m_spellInfo->SpellVisual[0] == 671 && m_spellInfo->SpellIconID == 1508)
if(m_spellInfo->SpellFamilyFlags[1] & 0x40)
{
if (m_caster->GetTypeId()!=TYPEID_PLAYER)
return;
uint32 stack = 0;
int32 maxStack = 0;
Unit::AuraList const& list = unitTarget->GetAurasByType(SPELL_AURA_MOD_RESISTANCE);
for(Unit::AuraList::const_iterator itr=list.begin();itr!=list.end();++itr)
{
@@ -4345,6 +4348,9 @@ void Spell::SpellDamageWeaponDmg(uint32 i)
{
(*itr)->RefreshAura();
stack = (*itr)->GetStackAmount();
maxStack = proto->StackAmount;
((Player*)m_caster)->ApplySpellMod(proto->Id, SPELLMOD_CHARGES, maxStack, this);
break;
}
}
@@ -4358,7 +4364,7 @@ void Spell::SpellDamageWeaponDmg(uint32 i)
}
}
if(stack < 5)
if(stack < maxStack)
{
// get highest rank of the Sunder Armor spell
const PlayerSpellMap& sp_list = ((Player*)m_caster)->GetSpellMap();
src/game/SpellMgr.cpp
-2
View File
@@ -1296,8 +1296,6 @@ bool SpellMgr::canStackSpellRanks(SpellEntry const *spellInfo)
bool SpellMgr::IsNoStackSpellDueToSpell(uint32 spellId_1, uint32 spellId_2, bool sameCaster) const
{
//if(spellId_1 == spellId_2) // auras due to the same spell
// return false;
SpellEntry const *spellInfo_1 = sSpellStore.LookupEntry(spellId_1);
SpellEntry const *spellInfo_2 = sSpellStore.LookupEntry(spellId_2);
src/game/Unit.cpp
+80 -20
View File
@@ -1887,7 +1887,7 @@ void Unit::CalcAbsorbResist(Unit *pVictim,SpellSchoolMask schoolMask, DamageEffe
*resist = 0;
int32 RemainingDamage = damage - *resist;
int32 TotalAbsorb = RemainingDamage;
// Get unit state (need for some absorb check)
uint32 unitflag = pVictim->GetUInt32Value(UNIT_FIELD_FLAGS);
// Reflect damage spells (not cast any damage spell in aura lookup)
@@ -1908,7 +1908,7 @@ void Unit::CalcAbsorbResist(Unit *pVictim,SpellSchoolMask schoolMask, DamageEffe
// Max Amount can be absorbed by this aura
int32 currentAbsorb = mod->m_amount;
// Found empty aura (umpossible but..)
// Found empty aura (impossible but..)
if (currentAbsorb <=0)
{
existExpired = true;
@@ -2092,21 +2092,6 @@ void Unit::CalcAbsorbResist(Unit *pVictim,SpellSchoolMask schoolMask, DamageEffe
if (RemainingDamage < currentAbsorb)
currentAbsorb = RemainingDamage;
AuraList const& AbsIgnoreAurasAb = GetAurasByType(SPELL_AURA_MOD_TARGET_ABILITY_ABSORB_SCHOOL);
for(AuraList::const_iterator j = AbsIgnoreAurasAb.begin();j != AbsIgnoreAurasAb.end(); ++j)
{
if( (*j)->GetModifier()->m_miscvalue & (*i)->GetModifier()->m_miscvalue
&& (*j)->isAffectedOnSpell(spellInfo))
currentAbsorb= int32(float(currentAbsorb) * (float(100-(*j)->GetModifier()->m_amount)/100.0f));
}
AuraList const& AbsIgnoreAuras = GetAurasByType(SPELL_AURA_MOD_TARGET_ABSORB_SCHOOL);
for(AuraList::const_iterator j = AbsIgnoreAuras.begin();j != AbsIgnoreAuras.end(); ++j)
{
if( (*j)->GetModifier()->m_miscvalue & (*i)->GetModifier()->m_miscvalue)
currentAbsorb= int32(float(currentAbsorb) * (float(100-(*j)->GetModifier()->m_amount)/100.0f));
}
RemainingDamage -= currentAbsorb;
// Reduce shield amount
@@ -2227,7 +2212,51 @@ void Unit::CalcAbsorbResist(Unit *pVictim,SpellSchoolMask schoolMask, DamageEffe
}
}
TotalAbsorb -= RemainingDamage;
// TODO: School should be checked for absorbing auras or for attacks?
int32 auraAbsorbMod = GetMaxPositiveAuraModifier(SPELL_AURA_MOD_TARGET_ABSORB_SCHOOL);
AuraList const& AbsIgnoreAurasAb = GetAurasByType(SPELL_AURA_MOD_TARGET_ABILITY_ABSORB_SCHOOL);
for(AuraList::const_iterator i = AbsIgnoreAurasAb.begin();i != AbsIgnoreAurasAb.end(); ++i)
{
if ((*i)->GetModifier()->m_amount > auraAbsorbMod
&& (*i)->isAffectedOnSpell(spellInfo))
auraAbsorbMod = (*i)->GetModifier()->m_amount;
}
RemainingDamage += auraAbsorbMod * TotalAbsorb / 100;
// Ignore absorb - add reduced amount again to damage
RemainingDamage += auraAbsorbMod * TotalAbsorb / 100;
*absorb = damage - RemainingDamage - *resist;
if (*absorb)
{
// Incanter's Absorption
AuraList const& DummmyAuras = pVictim->GetAurasByType(SPELL_AURA_DUMMY);
for(AuraList::const_iterator i = DummmyAuras.begin(); i != DummmyAuras.end(); ++i)
{
SpellEntry const* spellInfo = (*i)->GetSpellProto();
if (spellmgr.GetFirstSpellInChain(spellInfo->Id) == 44394)
{
int32 total_dmg=0;
AuraList const& ignore = GetAurasByType(SPELL_AURA_MOD_DAMAGE_DONE);
for(AuraList::const_iterator j = ignore.begin(); i != ignore.end(); ++i)
{
if ((*j)->GetId()!=44413)
continue;
total_dmg += (*j)->GetModifier()->m_miscvalue;
}
int32 spell_dmg = int32(*absorb * (*i)->GetModifier()->m_amount / 100);
// Do not apply more auras if more than 5% hp
if(total_dmg+spell_dmg > int32(GetMaxHealth() * 5 / 100))
break;
pVictim->CastCustomSpell(pVictim, 44413, &spell_dmg, NULL, NULL, false);
break;
}
}
}
}
void Unit::AttackerStateUpdate (Unit *pVictim, WeaponAttackType attType, bool extra )
@@ -3707,7 +3736,8 @@ bool Unit::AddAura(Aura *Aur)
if (i != m_Auras.end())
{
// passive and persistent auras can stack with themselves any number of times
if (!Aur->IsPassive() && !Aur->IsPersistent())
// hack for Incanter's Absorption
if (!Aur->IsPassive() && !Aur->IsPersistent() && aurSpellInfo->Id!=44396)
{
for(AuraMap::iterator i2 = m_Auras.lower_bound(spair); i2 != m_Auras.upper_bound(spair); ++i2)
{
@@ -3746,8 +3776,8 @@ bool Unit::AddAura(Aura *Aur)
break;
}
if(stop)
break;
if(stop)
break;
}
}
}
@@ -5309,6 +5339,36 @@ bool Unit::HandleDummyAuraProc(Unit *pVictim, uint32 damage, Aura* triggeredByAu
triggered_spell_id = 22858;
break;
}
// Glyph of Devastate
if(dummySpell->Id==58388)
{
// get highest rank of the Sunder Armor spell
if (GetTypeId()!=TYPEID_PLAYER)
return false;
const PlayerSpellMap& sp_list = ((Player*)this)->GetSpellMap();
for (PlayerSpellMap::const_iterator itr = sp_list.begin(); itr != sp_list.end(); ++itr)
{
// only highest rank is shown in spell book, so simply check if shown in spell book
if(!itr->second->active || itr->second->disabled || itr->second->state == PLAYERSPELL_REMOVED)
continue;
SpellEntry const *spellInfo = sSpellStore.LookupEntry(itr->first);
if (!spellInfo)
continue;
if (spellInfo->SpellFamilyFlags.IsEqual(SPELLFAMILYFLAG_WARRIOR_SUNDERARMOR)
&& spellInfo->SpellFamilyName == SPELLFAMILY_WARRIOR)
{
triggered_spell_id = spellInfo->Id;
break;
}
}
if (!triggered_spell_id)
return false;
for (int32 value = CalculateSpellDamage(dummySpell, 0 , dummySpell->EffectBasePoints[0], pVictim);value>0;value--)
CastSpell(target,triggered_spell_id,true);
return true;
}
// Second Wind
if (dummySpell->SpellIconID == 1697)
{