Apply mangos code style.

This commit is contained in:
VladimirMangos 2008-12-28 22:10:41 +03:00
parent 58a05b831a
commit dd65b8b840

View file

@ -5387,38 +5387,34 @@ bool Unit::HandleProcTriggerSpell(Unit *pVictim, uint32 damage, Aura* triggeredB
// Try handle uncnown trigger spells
if (sSpellStore.LookupEntry(trigger_spell_id)==NULL)
{
switch (auraSpellInfo->SpellFamilyName)
{
//=====================================================================
// Generic class
// ====================================================================
// .....
//=====================================================================
case SPELLFAMILY_GENERIC:
// if (auraSpellInfo->Id==59532) // Abandon Passengers on Poly
// if (auraSpellInfo->Id==54775) // Abandon Vehicle on Poly
// if (auraSpellInfo->Id==34082) // Advantaged State (DND)
//if (auraSpellInfo->Id==59532) // Abandon Passengers on Poly
//if (auraSpellInfo->Id==54775) // Abandon Vehicle on Poly
//if (auraSpellInfo->Id==34082) // Advantaged State (DND)
if (auraSpellInfo->Id == 23780) // Aegis of Preservation (Aegis of Preservation trinket)
trigger_spell_id = 23781;
// else if (auraSpellInfo->Id==43504) // Alterac Valley OnKill Proc Aura
// else if (auraSpellInfo->Id == 48876) // Beast's Mark
// {
// trigger_spell_id = 48877;
// }
// else if (auraSpellInfo->Id == 59237) // Beast's Mark
// {
// trigger_spell_id = 59233;
// }
// else if (auraSpellInfo->Id==46939) // Black Bow of the Betrayer
// {
// trigger_spell_id = 29471; // gain mana
// 27526; // drain mana if possible
// }
// else if (auraSpellInfo->Id==50844) // Blood Mirror
// else if (auraSpellInfo->Id==54476) // Blood Presence
// else if (auraSpellInfo->Id==50689) // Blood Presence (Rank 1)
// else if (auraSpellInfo->Id==37030) // Chaotic Temperament
// else if (auraSpellInfo->Id==52856) // Charge
//else if (auraSpellInfo->Id==43504) // Alterac Valley OnKill Proc Aura
//else if (auraSpellInfo->Id == 48876) // Beast's Mark
//{
// trigger_spell_id = 48877;
//}
//else if (auraSpellInfo->Id == 59237) // Beast's Mark
//{
// trigger_spell_id = 59233;
//}
//else if (auraSpellInfo->Id==46939) // Black Bow of the Betrayer
//{
// trigger_spell_id = 29471; // gain mana
// 27526; // drain mana if possible
//}
//else if (auraSpellInfo->Id==50844) // Blood Mirror
//else if (auraSpellInfo->Id==54476) // Blood Presence
//else if (auraSpellInfo->Id==50689) // Blood Presence (Rank 1)
//else if (auraSpellInfo->Id==37030) // Chaotic Temperament
//else if (auraSpellInfo->Id==52856) // Charge
else if (auraSpellInfo->Id==43820) // Charm of the Witch Doctor (Amani Charm of the Witch Doctor trinket)
{
// Pct value stored in dummy
@ -5426,41 +5422,40 @@ bool Unit::HandleProcTriggerSpell(Unit *pVictim, uint32 damage, Aura* triggeredB
target = pVictim;
break;
}
// else if (auraSpellInfo->Id==41248) // Consuming Strikes
// trigger_spell_id = 41249;
// else if (auraSpellInfo->Id==45205) // Copy Offhand Weapon
// else if (auraSpellInfo->Id==57594) // Copy Ranged Weapon
// else if (auraSpellInfo->Id==41054) // Copy Weapon
// trigger_spell_id = 41055;
// else if (auraSpellInfo->Id==45343) // Dark Flame Aura
// else if (auraSpellInfo->Id==47300) // Dark Flame Aura
//else if (auraSpellInfo->Id==41248) // Consuming Strikes
// trigger_spell_id = 41249;
//else if (auraSpellInfo->Id==45205) // Copy Offhand Weapon
//else if (auraSpellInfo->Id==57594) // Copy Ranged Weapon
//else if (auraSpellInfo->Id==41054) // Copy Weapon
// trigger_spell_id = 41055;
//else if (auraSpellInfo->Id==45343) // Dark Flame Aura
//else if (auraSpellInfo->Id==47300) // Dark Flame Aura
else if (auraSpellInfo->Id==57345) // Darkmoon Card: Greatness
{
uint32 stat = 0;
// strength
if (GetStat(STAT_STRENGTH) > stat){trigger_spell_id = 60229;stat = GetStat(STAT_STRENGTH);}
if (GetStat(STAT_STRENGTH) > stat) { trigger_spell_id = 60229;stat = GetStat(STAT_STRENGTH); }
// agility
if (GetStat(STAT_AGILITY) > stat){trigger_spell_id = 60233;stat = GetStat(STAT_AGILITY);}
if (GetStat(STAT_AGILITY) > stat) { trigger_spell_id = 60233;stat = GetStat(STAT_AGILITY); }
// intellect
if (GetStat(STAT_INTELLECT) > stat){trigger_spell_id = 60234;stat = GetStat(STAT_INTELLECT);}
if (GetStat(STAT_INTELLECT)> stat) { trigger_spell_id = 60234;stat = GetStat(STAT_INTELLECT);}
// spirit
if (GetStat(STAT_SPIRIT) > stat){trigger_spell_id = 60235;stat = GetStat(STAT_SPIRIT);}
if (GetStat(STAT_SPIRIT) > stat) { trigger_spell_id = 60235;stat = GetStat(STAT_SPIRIT); }
}
// else if (auraSpellInfo->Id==31255) // Deadly Swiftness (Rank 1)
// else if (auraSpellInfo->Id==5301) // Defensive State (DND)
// else if (auraSpellInfo->Id==13358) // Defensive State (DND)
// else if (auraSpellInfo->Id==16092) // Defensive State (DND)
// else if (auraSpellInfo->Id==24949) // Defensive State 2 (DND)
// else if (auraSpellInfo->Id==40329) // Demo Shout Sensor
// Desperate Defense (Stonescythe Whelp, Stonescythe Alpha, Stonescythe Ambusher)
else if (auraSpellInfo->Id == 33896)
//else if (auraSpellInfo->Id==31255) // Deadly Swiftness (Rank 1)
//else if (auraSpellInfo->Id==5301) // Defensive State (DND)
//else if (auraSpellInfo->Id==13358) // Defensive State (DND)
//else if (auraSpellInfo->Id==16092) // Defensive State (DND)
//else if (auraSpellInfo->Id==24949) // Defensive State 2 (DND)
//else if (auraSpellInfo->Id==40329) // Demo Shout Sensor
else if (auraSpellInfo->Id == 33896) // Desperate Defense (Stonescythe Whelp, Stonescythe Alpha, Stonescythe Ambusher)
trigger_spell_id = 33898;
// else if (auraSpellInfo->Id==18943) // Double Attack
// else if (auraSpellInfo->Id==19194) // Double Attack
// else if (auraSpellInfo->Id==19817) // Double Attack
// else if (auraSpellInfo->Id==19818) // Double Attack
// else if (auraSpellInfo->Id==22835) // Drunken Rage
// trigger_spell_id = 14822;
//else if (auraSpellInfo->Id==18943) // Double Attack
//else if (auraSpellInfo->Id==19194) // Double Attack
//else if (auraSpellInfo->Id==19817) // Double Attack
//else if (auraSpellInfo->Id==19818) // Double Attack
//else if (auraSpellInfo->Id==22835) // Drunken Rage
// trigger_spell_id = 14822;
/*
else if (auraSpellInfo->SpellIconID==191) // Elemental Response
{
@ -5470,7 +5465,8 @@ bool Unit::HandleProcTriggerSpell(Unit *pVictim, uint32 damage, Aura* triggeredB
case 34329:
case 34524:
case 34582:
case 36733:break;
case 36733:
break;
default:
sLog.outError("Unit::HandleProcTriggerSpell: Spell %u miss posibly Elemental Response",auraSpellInfo->Id);
return false;
@ -5478,33 +5474,35 @@ bool Unit::HandleProcTriggerSpell(Unit *pVictim, uint32 damage, Aura* triggeredB
//This generic aura self-triggers a different spell for each school of magic that lands on the wearer:
switch (procSpell->School)
{
case SPELL_SCHOOL_FIRE: trigger_spell_id = 34192;break;//Fire: 34192
case SPELL_SCHOOL_FROST: trigger_spell_id = 34193;break;//Frost: 34193
case SPELL_SCHOOL_ARCANE: trigger_spell_id = 34194;break;//Arcane: 34194
case SPELL_SCHOOL_NATURE: trigger_spell_id = 34195;break;//Nature: 34195
case SPELL_SCHOOL_SHADOW: trigger_spell_id = 34196;break;//Shadow: 34196
case SPELL_SCHOOL_HOLY: trigger_spell_id = 34197;break;//Holy: 34197
case SPELL_SCHOOL_NORMAL: trigger_spell_id = 34198;break;//Physical: 34198
case SPELL_SCHOOL_FIRE: trigger_spell_id = 34192; break;
case SPELL_SCHOOL_FROST: trigger_spell_id = 34193; break;
case SPELL_SCHOOL_ARCANE:trigger_spell_id = 34194; break;
case SPELL_SCHOOL_NATURE:trigger_spell_id = 34195; break;
case SPELL_SCHOOL_SHADOW:trigger_spell_id = 34196; break;
case SPELL_SCHOOL_HOLY: trigger_spell_id = 34197; break;
case SPELL_SCHOOL_NORMAL:trigger_spell_id = 34198; break;
default:
sLog.outError("Unit::HandleProcTriggerSpell: Spell %u Elemental Response wrong school",auraSpellInfo->Id);
return false;
}
}*/
// else if (auraSpellInfo->Id==40364) // Entangling Roots Sensor
// else if (auraSpellInfo->Id==33207) // Gossip NPC Periodic - Fidget
// else if (auraSpellInfo->Id==50051) // Ethereal Pet Aura
// else if (auraSpellInfo->Id==35321) // Gushing Wound
// else if (auraSpellInfo->Id==38363) // Gushing Wound
// else if (auraSpellInfo->Id==39215) // Gushing Wound
// else if (auraSpellInfo->Id==44527) // Hate Monster (Spar Buddy) (30 sec)
// else if (auraSpellInfo->Id==44819) // Hate Monster (Spar Buddy) (>30% Health)
// else if (auraSpellInfo->Id==44526) // Hate Monster (Spar) (30 sec)
// else if (auraSpellInfo->Id==44820) // Hate Monster (Spar) (<30%)
// else if (auraSpellInfo->Id==49059) // Horde, Hate Monster (Spar Buddy) (>30% Health)
// else if (auraSpellInfo->Id==40250) // Improved Duration
// else if (auraSpellInfo->Id==59288) // Infra-Green Shield
// else if (auraSpellInfo->Id==54072) // Knockback Ball Passive
else if (auraSpellInfo->Id==27522 || auraSpellInfo->Id==40336) // Mana Drain Trigger
}
*/
//else if (auraSpellInfo->Id==40364) // Entangling Roots Sensor
//else if (auraSpellInfo->Id==33207) // Gossip NPC Periodic - Fidget
//else if (auraSpellInfo->Id==50051) // Ethereal Pet Aura
//else if (auraSpellInfo->Id==35321) // Gushing Wound
//else if (auraSpellInfo->Id==38363) // Gushing Wound
//else if (auraSpellInfo->Id==39215) // Gushing Wound
//else if (auraSpellInfo->Id==44527) // Hate Monster (Spar Buddy) (30 sec)
//else if (auraSpellInfo->Id==44819) // Hate Monster (Spar Buddy) (>30% Health)
//else if (auraSpellInfo->Id==44526) // Hate Monster (Spar) (30 sec)
//else if (auraSpellInfo->Id==44820) // Hate Monster (Spar) (<30%)
//else if (auraSpellInfo->Id==49059) // Horde, Hate Monster (Spar Buddy) (>30% Health)
//else if (auraSpellInfo->Id==40250) // Improved Duration
//else if (auraSpellInfo->Id==59288) // Infra-Green Shield
//else if (auraSpellInfo->Id==54072) // Knockback Ball Passive
else if (auraSpellInfo->Id==27522 || auraSpellInfo->Id==40336)
// Mana Drain Trigger
{
// On successful melee or ranged attack gain $29471s1 mana and if possible drain $27526s1 mana from the target.
if (this && this->isAlive())
@ -5513,30 +5511,24 @@ bool Unit::HandleProcTriggerSpell(Unit *pVictim, uint32 damage, Aura* triggeredB
CastSpell(pVictim, 27526, true, castItem, triggeredByAura);
return true;
}
// else if (auraSpellInfo->Id==55580) // Mana Link
// else if (auraSpellInfo->Id==45903) // Offensive State
// else if (auraSpellInfo->Id==44326) // Pure Energy Passive
// else if (auraSpellInfo->Id==43453) // Rune Ward
// else if (auraSpellInfo->Id== 7137) // Shadow Charge (Rank 1)
// else if (auraSpellInfo->Id==36576) // Shaleskin (Shaleskin Flayer, Shaleskin Ripper) 30023 trigger
// else if (auraSpellInfo->Id==34783) // Spell Reflection
// else if (auraSpellInfo->Id==36096) // Spell Reflection
// else if (auraSpellInfo->Id==57587) // Steal Ranged ()
// else if (auraSpellInfo->Id==36207) // Steal Weapon
// else if (auraSpellInfo->Id== 7377) // Take Immune Periodic Damage <Not Working>
// else if (auraSpellInfo->Id==35205) // Vanish
// else if (auraSpellInfo->Id==42730) // Woe Strike
// else if (auraSpellInfo->Id==59735) // Woe Strike
// else if (auraSpellInfo->Id==46146) // [PH] Ahune Spanky Hands
//else if (auraSpellInfo->Id==55580) // Mana Link
//else if (auraSpellInfo->Id==45903) // Offensive State
//else if (auraSpellInfo->Id==44326) // Pure Energy Passive
//else if (auraSpellInfo->Id==43453) // Rune Ward
//else if (auraSpellInfo->Id== 7137) // Shadow Charge (Rank 1)
//else if (auraSpellInfo->Id==36576) // Shaleskin (Shaleskin Flayer, Shaleskin Ripper) 30023 trigger
//else if (auraSpellInfo->Id==34783) // Spell Reflection
//else if (auraSpellInfo->Id==36096) // Spell Reflection
//else if (auraSpellInfo->Id==57587) // Steal Ranged ()
//else if (auraSpellInfo->Id==36207) // Steal Weapon
//else if (auraSpellInfo->Id== 7377) // Take Immune Periodic Damage <Not Working>
//else if (auraSpellInfo->Id==35205) // Vanish
//else if (auraSpellInfo->Id==42730) // Woe Strike
//else if (auraSpellInfo->Id==59735) // Woe Strike
//else if (auraSpellInfo->Id==46146) // [PH] Ahune Spanky Hands
break;
//=====================================================================
// Mage
//=====================================================================
// Blazing Speed (Rank 1,2) trigger = 18350
//=====================================================================
case SPELLFAMILY_MAGE:
// Blazing Speed
if (auraSpellInfo->SpellIconID == 2127)
if (auraSpellInfo->SpellIconID == 2127) // Blazing Speed
{
switch (auraSpellInfo->Id)
{
@ -5550,25 +5542,10 @@ bool Unit::HandleProcTriggerSpell(Unit *pVictim, uint32 damage, Aura* triggeredB
}
}
break;
//=====================================================================
// Warrior
//=====================================================================
// Scent of Blood
//=====================================================================
case SPELLFAMILY_WARRIOR:
{
// Scent of Blood
if (auraSpellInfo->Id == 50421)
if (auraSpellInfo->Id == 50421) // Scent of Blood
trigger_spell_id = 50422;
}
break;
//=====================================================================
// Warlock
//=====================================================================
// Pyroclasm trigger = 18350
// Nether Protection trigger = 1206
// Drain Soul (Rank 1-5) trigger = 0
//=====================================================================
case SPELLFAMILY_WARLOCK:
{
// Pyroclasm
@ -5640,12 +5617,6 @@ bool Unit::HandleProcTriggerSpell(Unit *pVictim, uint32 damage, Aura* triggeredB
}
break;
}
//=====================================================================
// Priest
//=====================================================================
// Greater Heal Refund trigger = 18350
// Blessed Recovery (Rank 1-3) trigger = 18350
//=====================================================================
case SPELLFAMILY_PRIEST:
{
// Greater Heal Refund
@ -5668,13 +5639,6 @@ bool Unit::HandleProcTriggerSpell(Unit *pVictim, uint32 damage, Aura* triggeredB
}
break;
}
//=====================================================================
// Druid
// ====================================================================
// Druid Forms Trinket trigger = 18350
// Entangling Roots trigger = 30023
// Leader of the Pack trigger = 18350
//=====================================================================
case SPELLFAMILY_DRUID:
{
// Druid Forms Trinket
@ -5682,7 +5646,7 @@ bool Unit::HandleProcTriggerSpell(Unit *pVictim, uint32 damage, Aura* triggeredB
{
switch(m_form)
{
case 0: trigger_spell_id = 37344;break;
case FORM_NONE: trigger_spell_id = 37344;break;
case FORM_CAT: trigger_spell_id = 37341;break;
case FORM_BEAR:
case FORM_DIREBEAR: trigger_spell_id = 37340;break;
@ -5692,8 +5656,8 @@ bool Unit::HandleProcTriggerSpell(Unit *pVictim, uint32 damage, Aura* triggeredB
return false;
}
}
// else if (auraSpellInfo->Id==40363)// Entangling Roots ()
// trigger_spell_id = ????;
//else if (auraSpellInfo->Id==40363)// Entangling Roots ()
// trigger_spell_id = ????;
// Leader of the Pack
else if (auraSpellInfo->Id == 24932)
{
@ -5704,26 +5668,12 @@ bool Unit::HandleProcTriggerSpell(Unit *pVictim, uint32 damage, Aura* triggeredB
}
break;
}
//=====================================================================
// Hunter
// ====================================================================
// ......
//=====================================================================
case SPELLFAMILY_HUNTER:
break;
//=====================================================================
// Paladin
// ====================================================================
// Blessed Life trigger = 31934
// Healing Discount trigger = 18350
// Illumination (Rank 1-5) trigger = 18350
// Lightning Capacitor trigger = 18350
// Thunder Capacitor trigger = 18350
// Soul Preserver trigger = 18350
//=====================================================================
case SPELLFAMILY_PALADIN:
{
/* // Blessed Life
/*
// Blessed Life
if (auraSpellInfo->SpellIconID == 2137)
{
switch (auraSpellInfo->Id)
@ -5736,7 +5686,8 @@ bool Unit::HandleProcTriggerSpell(Unit *pVictim, uint32 damage, Aura* triggeredB
sLog.outError("Unit::HandleProcTriggerSpell: Spell %u miss posibly Blessed Life", auraSpellInfo->Id);
return false;
}
}*/
}
*/
// Healing Discount
if (auraSpellInfo->Id==37705)
{
@ -5826,13 +5777,6 @@ bool Unit::HandleProcTriggerSpell(Unit *pVictim, uint32 damage, Aura* triggeredB
}
break;
}
//=====================================================================
// Shaman
//====================================================================
// Lightning Shield trigger = 18350
// Mana Surge trigger = 18350
// Nature's Guardian (Rank 1-5) trigger = 18350
//=====================================================================
case SPELLFAMILY_SHAMAN:
{
// Lightning Shield (overwrite non existing triggered spell call in spell.dbc
@ -5840,17 +5784,28 @@ bool Unit::HandleProcTriggerSpell(Unit *pVictim, uint32 damage, Aura* triggeredB
{
switch(auraSpellInfo->Id)
{
case 324: trigger_spell_id = 26364; break; // Rank 1
case 325: trigger_spell_id = 26365; break; // Rank 2
case 905: trigger_spell_id = 26366; break; // Rank 3
case 945: trigger_spell_id = 26367; break; // Rank 4
case 8134: trigger_spell_id = 26369; break; // Rank 5
case 10431: trigger_spell_id = 26370; break; // Rank 6
case 10432: trigger_spell_id = 26363; break; // Rank 7
case 25469: trigger_spell_id = 26371; break; // Rank 8
case 25472: trigger_spell_id = 26372; break; // Rank 9
case 49280: trigger_spell_id = 49278; break; // Rank 10
case 49281: trigger_spell_id = 49279; break; // Rank 11
case 324: // Rank 1
trigger_spell_id = 26364; break;
case 325: // Rank 2
trigger_spell_id = 26365; break;
case 905: // Rank 3
trigger_spell_id = 26366; break;
case 945: // Rank 4
trigger_spell_id = 26367; break;
case 8134: // Rank 5
trigger_spell_id = 26369; break;
case 10431: // Rank 6
trigger_spell_id = 26370; break;
case 10432: // Rank 7
trigger_spell_id = 26363; break;
case 25469: // Rank 8
trigger_spell_id = 26371; break;
case 25472: // Rank 9
trigger_spell_id = 26372; break;
case 49280: // Rank 10
trigger_spell_id = 49278; break;
case 49281: // Rank 11
trigger_spell_id = 49279; break;
default:
sLog.outError("Unit::HandleProcTriggerSpell: Spell %u not handled in LShield", auraSpellInfo->Id);
return false;
@ -5890,12 +5845,6 @@ bool Unit::HandleProcTriggerSpell(Unit *pVictim, uint32 damage, Aura* triggeredB
}
break;
}
//=====================================================================
// Death Knight
//====================================================================
// Acclimation trigger = 1206
// Blood Presence trigger = 1206
//=====================================================================
case SPELLFAMILY_DEATHKNIGHT:
{
// Acclimation
@ -5929,10 +5878,10 @@ bool Unit::HandleProcTriggerSpell(Unit *pVictim, uint32 damage, Aura* triggeredB
}
break;
}
// default
default:
break;
}
}
// All ok. Check current trigger spell
SpellEntry const* triggerEntry = sSpellStore.LookupEntry(trigger_spell_id);