Tab to Spaces and remove of trailing spaces
--HG-- branch : trunk
This commit is contained in:
@@ -18,7 +18,7 @@
|
||||
#include "forge_of_souls.h"
|
||||
|
||||
/*
|
||||
* TODO:
|
||||
* TODO:
|
||||
* - Fix Soul Storm spell and remove work around.
|
||||
*/
|
||||
|
||||
@@ -73,7 +73,7 @@ struct boss_bronjahmAI : public ScriptedAI
|
||||
|
||||
ScriptedInstance* pInstance;
|
||||
EventMap events;
|
||||
|
||||
|
||||
CombatPhases phase;
|
||||
|
||||
void Reset()
|
||||
@@ -133,7 +133,7 @@ struct boss_bronjahmAI : public ScriptedAI
|
||||
//Return since we have no target
|
||||
if (!UpdateVictim())
|
||||
return;
|
||||
|
||||
|
||||
events.Update(diff);
|
||||
|
||||
if (m_creature->hasUnitState(UNIT_STAT_CASTING))
|
||||
@@ -238,7 +238,7 @@ void AddSC_boss_bronjahm()
|
||||
newscript->Name = "boss_bronjahm";
|
||||
newscript->GetAI = &GetAI_boss_bronjahm;
|
||||
newscript->RegisterSelf();
|
||||
|
||||
|
||||
newscript = new Script;
|
||||
newscript->Name = "mob_corrupted_soul_fragment";
|
||||
newscript->GetAI = &GetAI_mob_corrupted_soul_fragment;
|
||||
|
||||
@@ -18,7 +18,7 @@
|
||||
#include "forge_of_souls.h"
|
||||
|
||||
/*
|
||||
* TODO:
|
||||
* TODO:
|
||||
* - Fix model id during unleash soul -> seems DB issue 36503 is missing (likewise 36504 is also missing).
|
||||
* - Fix outro npc movement
|
||||
*/
|
||||
@@ -86,11 +86,11 @@ enum eEnum
|
||||
DISPLAY_DESIRE = 30150,
|
||||
};
|
||||
|
||||
struct
|
||||
struct
|
||||
{
|
||||
uint32 entry[2];
|
||||
Position movePosition;
|
||||
} outroPositions[] =
|
||||
} outroPositions[] =
|
||||
{
|
||||
{ NPC_CHAMPION_1_ALLIANCE, NPC_CHAMPION_1_HORDE, { 5590.47, 2427.79, 705.935, 0.802851 } },
|
||||
{ NPC_CHAMPION_1_ALLIANCE, NPC_CHAMPION_1_HORDE, { 5593.59, 2428.34, 705.935, 0.977384 } },
|
||||
@@ -126,7 +126,7 @@ struct boss_devourer_of_soulsAI : public ScriptedAI
|
||||
}
|
||||
|
||||
bool bThreeFaceAchievement;
|
||||
|
||||
|
||||
ScriptedInstance* pInstance;
|
||||
EventMap events;
|
||||
|
||||
@@ -144,10 +144,10 @@ struct boss_devourer_of_soulsAI : public ScriptedAI
|
||||
m_creature->SetReactState(REACT_AGGRESSIVE);
|
||||
|
||||
events.Reset();
|
||||
|
||||
|
||||
bThreeFaceAchievement = true;
|
||||
uiMirroredSoulTarget = 0;
|
||||
|
||||
|
||||
if (pInstance)
|
||||
pInstance->SetData(DATA_DEVOURER_EVENT, NOT_STARTED);
|
||||
}
|
||||
@@ -175,7 +175,7 @@ struct boss_devourer_of_soulsAI : public ScriptedAI
|
||||
if (Aura *pAura = pPlayer->GetAura(SPELL_MIRRORED_SOUL))
|
||||
{
|
||||
int32 mirrorDamage = (uiDamage * 45)/100;
|
||||
m_creature->CastCustomSpell(pPlayer, 69034, &mirrorDamage, 0, 0, true);
|
||||
m_creature->CastCustomSpell(pPlayer, 69034, &mirrorDamage, 0, 0, true);
|
||||
// m_creature->DealDamage(pPlayer, (uiDamage * 45)/100, 0, SPELL_DIRECT_DAMAGE, SPELL_SCHOOL_MASK_SHADOW);
|
||||
}
|
||||
else
|
||||
@@ -288,7 +288,7 @@ struct boss_devourer_of_soulsAI : public ScriptedAI
|
||||
m_creature->SetOrientation(m_creature->GetAngle(pTarget));
|
||||
DoCast(m_creature, SPELL_WAILING_SOULS_BEAM);
|
||||
}
|
||||
|
||||
|
||||
beamAngle = m_creature->GetOrientation();
|
||||
|
||||
beamAngleDiff = PI/30.0f; // PI/2 in 15 sec = PI/30 per tick
|
||||
@@ -313,7 +313,7 @@ struct boss_devourer_of_soulsAI : public ScriptedAI
|
||||
beamAngle += beamAngleDiff;
|
||||
m_creature->SetOrientation(beamAngle);
|
||||
m_creature->StopMoving();
|
||||
|
||||
|
||||
DoCast(m_creature, SPELL_WAILING_SOULS);
|
||||
|
||||
if (--wailingSoulTick)
|
||||
|
||||
@@ -27,7 +27,7 @@ enum Spells
|
||||
SPELL_VEIL_OF_SHADOWS = 69633,
|
||||
SPELL_WAIL_OF_SOULS = 69148,
|
||||
H_SPELL_WAIL_OF_SOULS = 70210,
|
||||
|
||||
|
||||
//Soulguard Watchman
|
||||
SPELL_SHROUD_OF_RUNES = 69056,
|
||||
SPELL_UNHOLY_RAGE = 69053,
|
||||
@@ -43,7 +43,7 @@ enum Spells
|
||||
SPELL_RAISE_DEAD = 69562,
|
||||
SPELL_SHIELD_OF_BONES = 69069,
|
||||
H_SPELL_SHIELD_OF_BONES = 70207,
|
||||
|
||||
|
||||
//Soulguard Animator
|
||||
// Raise dead 69562
|
||||
SPELL_SHADOW_BOLT = 69068,
|
||||
@@ -155,7 +155,7 @@ struct npc_sylvanas_fosAI: public ScriptedAI
|
||||
}
|
||||
|
||||
ScriptedInstance* pInstance;
|
||||
|
||||
|
||||
EventMap events;
|
||||
Phase phase;
|
||||
|
||||
@@ -167,7 +167,7 @@ struct npc_sylvanas_fosAI: public ScriptedAI
|
||||
|
||||
void DoAction(const int32 actionId)
|
||||
{
|
||||
switch(actionId)
|
||||
switch(actionId)
|
||||
{
|
||||
case ACTION_INTRO:
|
||||
{
|
||||
@@ -251,7 +251,7 @@ struct npc_jaina_fosAI: public ScriptedAI
|
||||
}
|
||||
|
||||
ScriptedInstance* pInstance;
|
||||
|
||||
|
||||
EventMap events;
|
||||
Phase phase;
|
||||
|
||||
@@ -263,7 +263,7 @@ struct npc_jaina_fosAI: public ScriptedAI
|
||||
|
||||
void DoAction(const int32 actionId)
|
||||
{
|
||||
switch(actionId)
|
||||
switch(actionId)
|
||||
{
|
||||
case ACTION_INTRO:
|
||||
{
|
||||
|
||||
@@ -40,7 +40,7 @@ struct instance_forge_of_souls : public ScriptedInstance
|
||||
uiDevourer = 0;
|
||||
|
||||
uiTeamInInstance = 0;
|
||||
|
||||
|
||||
for (uint8 i = 0; i < MAX_ENCOUNTER; ++i)
|
||||
uiEncounter[i] = NOT_STARTED;
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user