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

[10890] Merge apply/remove cases for recently added dummy auras.

Browse source
This commit is contained in:
VladimirMangos 2010-12-18 16:03:42 +03:00
parent 781841baf1
commit 4302d925d6
2 changed files with 17 additions and 25 deletions
Download patch file Download diff file Expand all files Collapse all files

40
src/game/SpellAuras.cpp
View file

@ -2015,21 +2015,9 @@ void Aura::HandleAuraDummy(bool apply, bool Real)
if (roll_chance_i(20)) // backfire stun if (roll_chance_i(20)) // backfire stun
target->CastSpell(target, 51581, true, NULL, this); target->CastSpell(target, 51581, true, NULL, this);
return; return;
case 42515: // Jarl Beam
{
// aura animate dead (fainted) state for the duration, but we need to animate the death itself (correct way below?)
if (Unit* pCaster = GetCaster())
pCaster->SetFlag(UNIT_FIELD_FLAGS_2, UNIT_FLAG2_FEIGN_DEATH);
return;
}
case 43873: // Headless Horseman Laugh case 43873: // Headless Horseman Laugh
target->PlayDistanceSound(11965); target->PlayDistanceSound(11965);
return; return;
case 43874: // Scourge Mur'gul Camp: Force Shield Arcane Purple x3
target->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_OOC_NOT_ATTACKABLE);
target->addUnitState(UNIT_STAT_ROOT);
return;
case 46699: // Requires No Ammo case 46699: // Requires No Ammo
if (target->GetTypeId() == TYPEID_PLAYER) if (target->GetTypeId() == TYPEID_PLAYER)
// not use ammo and not allow use // not use ammo and not allow use
@ -2261,15 +2249,6 @@ void Aura::HandleAuraDummy(bool apply, bool Real)
target->CastSpell(target, 36731, true, NULL, this); target->CastSpell(target, 36731, true, NULL, this);
return; return;
} }
case 42515: // Jarl Beam
{
if (Unit* pCaster = GetCaster())
pCaster->RemoveFlag(UNIT_FIELD_FLAGS_2, UNIT_FLAG2_FEIGN_DEATH);
// Beam to Zelfrax
target->CastSpell(target, 42517, true);
return;
}
case 42517: // Beam to Zelfrax case 42517: // Beam to Zelfrax
{ {
// expecting target to be a dummy creature // expecting target to be a dummy creature
@ -2282,9 +2261,6 @@ void Aura::HandleAuraDummy(bool apply, bool Real)
return; return;
} }
case 43874: // Scourge Mur'gul Camp: Force Shield Arcane Purple x3
target->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_OOC_NOT_ATTACKABLE);
return;
case 44191: // Flame Strike case 44191: // Flame Strike
{ {
if (target->GetMap()->IsDungeon()) if (target->GetMap()->IsDungeon())
@ -2515,6 +2491,22 @@ void Aura::HandleAuraDummy(bool apply, bool Real)
} }
return; return;
} }
case 42515: // Jarl Beam
{
// aura animate dead (fainted) state for the duration, but we need to animate the death itself (correct way below?)
if (Unit* pCaster = GetCaster())
pCaster->ApplyModFlag(UNIT_FIELD_FLAGS_2, UNIT_FLAG2_FEIGN_DEATH, apply);
// Beam to Zelfrax at remove
if (!apply)
target->CastSpell(target, 42517, true);
return;
}
case 43874: // Scourge Mur'gul Camp: Force Shield Arcane Purple x3
target->ApplyModFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_OOC_NOT_ATTACKABLE, apply);
if (apply)
target->addUnitState(UNIT_STAT_ROOT);
return;
case 47178: // Plague Effect Self case 47178: // Plague Effect Self
target->SetFeared(apply, GetCasterGuid(), GetId()); target->SetFeared(apply, GetCasterGuid(), GetId());
return; return;

2
src/shared/revision_nr.h
View file

@ -1,4 +1,4 @@
#ifndef __REVISION_NR_H__ #ifndef __REVISION_NR_H__
#define __REVISION_NR_H__ #define __REVISION_NR_H__
#define REVISION_NR "10889" #define REVISION_NR "10890"
#endif // __REVISION_NR_H__ #endif // __REVISION_NR_H__