mirror of
https://github.com/mangosfour/server.git
synced 2025-12-13 22:37:03 +00:00
Apply mangos code style.
This commit is contained in:
VladimirMangos
parent
58a05b831a
commit
dd65b8b840
1 changed files with 489 additions and 540 deletions
|
|
@ -5387,13 +5387,9 @@ 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
|
||||
|
|
@ -5452,8 +5448,7 @@ bool Unit::HandleProcTriggerSpell(Unit *pVictim, uint32 damage, Aura* triggeredB
|
|||
//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 == 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
|
||||
|
|
@ -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,18 +5474,19 @@ 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
|
||||
|
|
@ -5504,7 +5501,8 @@ bool Unit::HandleProcTriggerSpell(Unit *pVictim, uint32 damage, Aura* triggeredB
|
|||
//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==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())
|
||||
|
|
@ -5529,14 +5527,8 @@ bool Unit::HandleProcTriggerSpell(Unit *pVictim, uint32 damage, Aura* triggeredB
|
|||
//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;
|
||||
|
|
@ -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);
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue