Skip to content

Commit 4202277

Browse files
XfurrySchmoozerd
Xfurry
authored and
Schmoozerd
committed
[2062] Cleanup Sunwell instance scripts
Squashed commit of the following: * Update copyrights * Fix doors * Basic cleanup Signed-off-by: Schmoozerd <[email protected]>
1 parent a69a028 commit 4202277

File tree

4 files changed

+364
-325
lines changed

4 files changed

+364
-325
lines changed

‎scripts/eastern_kingdoms/sunwell_plateau/boss_kalecgos.cpp‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -126,7 +126,7 @@ struct MANGOS_DLL_DECL boss_kalecgosAI : public ScriptedAI
126126
if (m_pInstance)
127127
{
128128
// Reset Sathrovarr too
129-
if (Creature* pSath = m_pInstance->instance->GetCreature(m_pInstance->GetData64(DATA_SATHROVARR)))
129+
if (Creature* pSath = m_pInstance->instance->GetCreature(m_pInstance->GetData64(NPC_SATHROVARR)))
130130
{
131131
if (pSath->isAlive() && pSath->getVictim())
132132
pSath->AI()->EnterEvadeMode();
@@ -209,7 +209,7 @@ struct MANGOS_DLL_DECL boss_kalecgosAI : public ScriptedAI
209209
if (!m_pInstance)
210210
return;
211211

212-
if (Creature* pSathrovarr = m_pInstance->instance->GetCreature(m_pInstance->GetData64(DATA_SATHROVARR)))
212+
if (Creature* pSathrovarr = m_pInstance->instance->GetCreature(m_pInstance->GetData64(NPC_SATHROVARR)))
213213
{
214214
if (pSathrovarr->isAlive())
215215
{
@@ -218,7 +218,7 @@ struct MANGOS_DLL_DECL boss_kalecgosAI : public ScriptedAI
218218
}
219219
}
220220

221-
if (Creature* pKalec = m_pInstance->instance->GetCreature(m_pInstance->GetData64(DATA_KALECGOS_HUMAN)))
221+
if (Creature* pKalec = m_pInstance->instance->GetCreature(m_pInstance->GetData64(NPC_KALECGOS_HUMAN)))
222222
{
223223
pKalec->DeleteThreatList();
224224
pKalec->SetVisibility(VISIBILITY_OFF);
@@ -252,7 +252,7 @@ struct MANGOS_DLL_DECL boss_kalecgosAI : public ScriptedAI
252252

253253
if (!m_bEnraged && m_creature->GetHealthPercent() < 10.0f)
254254
{
255-
if (Creature* pSathrovarr = m_creature->GetMap()->GetCreature(m_pInstance->GetData64(DATA_SATHROVARR)))
255+
if (Creature* pSathrovarr = m_creature->GetMap()->GetCreature(m_pInstance->GetData64(NPC_SATHROVARR)))
256256
{
257257
if (pSathrovarr->isAlive())
258258
pSathrovarr->CastSpell(pSathrovarr, SPELL_CRAZED_RAGE, true);
@@ -378,7 +378,7 @@ struct MANGOS_DLL_DECL boss_sathrovarrAI : public ScriptedAI
378378
if (!m_pInstance)
379379
return;
380380

381-
if (Creature* pKalec = m_creature->GetMap()->GetCreature(m_pInstance->GetData64(DATA_KALECGOS_HUMAN)))
381+
if (Creature* pKalec = m_creature->GetMap()->GetCreature(m_pInstance->GetData64(NPC_KALECGOS_HUMAN)))
382382
{
383383
m_creature->AddThreat(pKalec, 10000000.0f);
384384
pKalec->AddThreat(m_creature, 10000000.0f);
@@ -400,7 +400,7 @@ struct MANGOS_DLL_DECL boss_sathrovarrAI : public ScriptedAI
400400

401401
m_pInstance->SetData(DATA_SET_SPECTRAL_CHECK, 5000);
402402

403-
if (Creature* pKalecgos = m_pInstance->instance->GetCreature(m_pInstance->GetData64(DATA_KALECGOS_DRAGON)))
403+
if (Creature* pKalecgos = m_pInstance->instance->GetCreature(m_pInstance->GetData64(NPC_KALECGOS_DRAGON)))
404404
{
405405
if (boss_kalecgosAI* pKalecgosAI = dynamic_cast<boss_kalecgosAI*>(pKalecgos->AI()))
406406
{
@@ -423,7 +423,7 @@ struct MANGOS_DLL_DECL boss_sathrovarrAI : public ScriptedAI
423423

424424
if (!m_bEnraged && m_creature->GetHealthPercent() < 10.0f)
425425
{
426-
if (Creature* pKalecgos = m_creature->GetMap()->GetCreature(m_pInstance->GetData64(DATA_KALECGOS_DRAGON)))
426+
if (Creature* pKalecgos = m_creature->GetMap()->GetCreature(m_pInstance->GetData64(NPC_KALECGOS_DRAGON)))
427427
{
428428
if (pKalecgos->isAlive())
429429
pKalecgos->CastSpell(pKalecgos, SPELL_CRAZED_RAGE, true);

0 commit comments

Comments
 (0)