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

[11013] Implemented spell 34026 and bonus to it from talent 35029 and ranks

Browse source 
Signed-off-by: VladimirMangos <vladimir@getmangos.com>
This commit is contained in:
pasdVn 2011-01-15 12:55:20 +03:00 • committed by VladimirMangos
parent 1e8ca772b3
commit f9a6513d38
4 changed files with 102 additions and 47 deletions
Download patch file Download diff file Expand all files Collapse all files

116
src/game/SpellAuras.cpp
View file

@ -2117,14 +2117,12 @@ void Aura::HandleAuraDummy(bool apply, bool Real)
}
case SPELLFAMILY_HUNTER:
{
/* disabled until full implementation
switch(GetId())
{
case 34026: // Kill Command
target->CastSpell(target, 34027, true, NULL, this);
return;
}
*/
break;
}
case SPELLFAMILY_SHAMAN:
@ -8042,11 +8040,12 @@ m_permanent(false), m_isRemovedOnShapeLost(true), m_deleted(false), m_in_use(0)
break;
// some auras applied with max stack
case 24575: // Brittle Armor
case 24662: // Restless Strength
case 24659: // Unstable Power
case 24662: // Restless Strength
case 26464: // Mercurial Shield
case 34027: // Kill Command
case 55166: // Tidal Force
case 58914: // Kill Command (pet part)
case 71564: // Deadly Precision
m_stackAmount = m_spellProto->StackAmount;
break;
@ -8526,6 +8525,14 @@ void SpellAuraHolder::HandleSpellSpecificBoosts(bool apply)
return;
break;
}
case 58914: // Kill Command, pet aura
{
// need remove here becase dummy aura hamdler apply/unapply at stack changes
if (!apply)
if(Unit* caster = GetCaster())
caster->RemoveAurasDueToSpell(34027);
return;
}
case 71905: // Soul Fragment
{
if (!apply)
@ -8794,43 +8801,86 @@ void SpellAuraHolder::HandleSpellSpecificBoosts(bool apply)
break;
case SPELLFAMILY_HUNTER:
{
// The Beast Within and Bestial Wrath - immunity
if (GetId() == 19574 || GetId() == 34471)
switch (GetId())
{
spellId1 = 24395;
spellId2 = 24396;
spellId3 = 24397;
spellId4 = 26592;
}
// Freezing Trap Effect
else if (m_spellProto->SpellFamilyFlags & UI64LIT(0x0000000000000008))
{
if(!apply)
case 19574: // Bestial Wrath - immunity
case 34471: // The Beast Within - immunity
{
Unit *caster = GetCaster();
// Glyph of Freezing Trap
if (caster && caster->HasAura(56845))
spellId1 = 24395;
spellId2 = 24396;
spellId3 = 24397;
spellId4 = 26592;
break;
}
case 34027: // Kill Command, owner aura (spellmods)
{
if (apply)
{
cast_at_remove = true;
spellId1 = 61394;
if (m_target->HasAura(35029)) // Focused Fire, rank 1
spellId1 = 60110; // Kill Command, Focused Fire rank 1 bonus
else if (m_target->HasAura(35030)) // Focused Fire, rank 2
spellId1 = 60113; // Kill Command, Focused Fire rank 2 bonus
else
return;
}
else
{
spellId1 = 34026; // Kill Command, owner casting aura
spellId2 = 60110; // Kill Command, Focused Fire rank 1 bonus
spellId3 = 60113; // Kill Command, Focused Fire rank 2 bonus
if (Unit* pet = m_target->GetPet())
pet->RemoveAurasDueToSpell(58914); // Kill Command, pet aura
}
break;
}
case 35029: // Focused Fire, rank 1
{
if (apply && !m_target->HasAura(34027)) // Kill Command, owner casting aura
return;
spellId1 = 60110; // Kill Command, Focused Fire rank 1 bonus
break;
}
case 35030: // Focused Fire, rank 2
{
if (apply && !m_target->HasAura(34027)) // Kill Command, owner casting aura
return;
spellId1 = 60113; // Kill Command, Focused Fire rank 2 bonus
break;
}
default:
// Freezing Trap Effect
if (m_spellProto->SpellFamilyFlags & UI64LIT(0x0000000000000008))
{
if(!apply)
{
Unit *caster = GetCaster();
// Glyph of Freezing Trap
if (caster && caster->HasAura(56845))
{
cast_at_remove = true;
spellId1 = 61394;
}
else
return;
}
else
return;
}
// Aspect of the Dragonhawk dodge
else if (GetSpellProto()->SpellFamilyFlags2 & 0x00001000)
{
spellId1 = 61848;
// triggered spell have same category as main spell and cooldown
if (apply && m_target->GetTypeId()==TYPEID_PLAYER)
((Player*)m_target)->RemoveSpellCooldown(61848);
}
else
return;
}
else
return;
break;
}
// Aspect of the Dragonhawk dodge
else if (GetSpellProto()->SpellFamilyFlags2 & 0x00001000)
{
spellId1 = 61848;
// triggered spell have same category as main spell and cooldown
if (apply && m_target->GetTypeId()==TYPEID_PLAYER)
((Player*)m_target)->RemoveSpellCooldown(61848);
}
else
return;
break;
}
case SPELLFAMILY_PALADIN: