nchebrov/azerothcore-wotlk
1
0
Fork 0
mirror of https://github.com/mod-playerbots/azerothcore-wotlk.git synced 2026-01-21 12:47:07 +00:00
Code Issues Packages Projects Releases Wiki Activity

chore(Scripts/OnyxiasLair): Fix broken code style (#9367)

Browse Source
This commit is contained in:
Skjalf
2021-11-26 12:47:22 -03:00
committed by GitHub
parent 625b392ffe
commit 8fd713ac52
2 changed files with 124 additions and 82 deletions
Download Patch File Download Diff File Expand all files Collapse all files

150
src/server/scripts/Kalimdor/OnyxiasLair/boss_onyxia.cpp
View File

@@ -140,7 +140,7 @@ public:
{
events.Reset();
Phase = ph;
switch( ph )
switch (ph)
{
case 0:
break;
@@ -173,29 +173,40 @@ public:
whelpSpamTimer = 0;
bManyWhelpsAvailable = false;
if( m_pInstance )
if (m_pInstance)
{
m_pInstance->SetData(DATA_ONYXIA, NOT_STARTED);
m_pInstance->DoStopTimedAchievement(ACHIEVEMENT_TIMED_TYPE_EVENT, ACHIEV_TIMED_START_EVENT);
}
}
void JustDied(Unit* /*killer*/) override
{
m_pInstance->SetData(DATA_ONYXIA, DONE);
}
void MoveInLineOfSight(Unit* who) override
{
if( me->GetVictim() || me->GetDistance(who) > 30.0f )
if (me->GetVictim() || me->GetDistance(who) > 30.0f)
{
return;
}
if( who->GetTypeId() == TYPEID_PLAYER )
if (who->GetTypeId() == TYPEID_PLAYER)
{
AttackStart(who);
}
}
void DoAction(int32 param) override
{
switch( param )
switch (param)
{
case -1:
if( bManyWhelpsAvailable && m_pInstance )
if (bManyWhelpsAvailable && m_pInstance)
{
m_pInstance->SetData(DATA_WHELP_SUMMONED, 1);
}
break;
}
}
@@ -205,13 +216,13 @@ public:
me->GetMap()->ToInstanceMap()->PermBindAllPlayers();
}
void EnterCombat(Unit* /*who*/) override
void EnterCombat(Unit* /*who*/) override
{
Talk(SAY_AGGRO);
DoZoneInCombat();
SetPhase(1);
if( m_pInstance )
if (m_pInstance)
{
m_pInstance->SetData(DATA_ONYXIA, IN_PROGRESS);
m_pInstance->DoStopTimedAchievement(ACHIEVEMENT_TIMED_TYPE_EVENT, ACHIEV_TIMED_START_EVENT); // just in case at reset some players already left the instance
@@ -220,22 +231,18 @@ public:
BindPlayers();
}
void JustDied(Unit* /*killer*/) override
{
if( m_pInstance )
m_pInstance->SetData(DATA_ONYXIA, DONE);
}
void DamageTaken(Unit*, uint32& /*damage*/, DamageEffectType, SpellSchoolMask) override
{
switch( Phase )
switch (Phase)
{
case 1:
if( me->GetHealth() * 100 / me->GetMaxHealth() <= 65 )
if (me->GetHealth() * 100 / me->GetMaxHealth() <= 65)
{
SetPhase(2);
}
break;
case 2:
if( me->GetHealth() * 100 / me->GetMaxHealth() <= 40 )
if (me->GetHealth() * 100 / me->GetMaxHealth() <= 40)
{
me->InterruptNonMeleeSpells(false);
SetPhase(3);
@@ -246,11 +253,12 @@ public:
void JustSummoned(Creature* pSummoned) override
{
if( !pSummoned )
if (pSummoned->GetEntry() != NPC_ONYXIAN_WHELP && pSummoned->GetEntry() != NPC_ONYXIAN_LAIR_GUARD)
{
return;
if( pSummoned->GetEntry() != NPC_ONYXIAN_WHELP && pSummoned->GetEntry() != NPC_ONYXIAN_LAIR_GUARD )
return;
if( Unit* target = pSummoned->SelectNearestTarget(300.0f) )
}
if (Unit* target = pSummoned->SelectNearestTarget(300.0f))
{
pSummoned->AI()->AttackStart(target);
DoZoneInCombat(pSummoned);
@@ -259,12 +267,14 @@ public:
void MovementInform(uint32 type, uint32 id) override
{
if( type != POINT_MOTION_TYPE && type != EFFECT_MOTION_TYPE )
return;
if( id < 9 )
if (type != POINT_MOTION_TYPE && type != EFFECT_MOTION_TYPE)
{
if( id > 0 && Phase == 2 )
return;
}
if (id < 9)
{
if (id > 0 && Phase == 2)
{
me->SetFacingTo(OnyxiaMoveData[id].o);
me->SetSpeed(MOVE_RUN, 1.6f, false);
@@ -272,7 +282,9 @@ public:
events.ScheduleEvent(EVENT_SPELL_FIREBALL_FIRST, 1000);
}
}
else switch( id )
else
{
switch (id)
{
case 10:
me->SetFacingTo(OnyxiaMoveData[0].o);
@@ -293,16 +305,17 @@ public:
events.ScheduleEvent(EVENT_PHASE_3_ATTACK, 0);
break;
}
}
}
void HandleWhelpSpam(const uint32 diff)
{
if( whelpSpam )
if (whelpSpam)
{
if( whelpCount < 40 )
if (whelpCount < 40)
{
whelpSpamTimer -= diff;
if( whelpSpamTimer <= 0 )
if (whelpSpamTimer <= 0)
{
float angle = rand_norm() * 2 * M_PI;
float dist = rand_norm() * 4.0f;
@@ -323,18 +336,22 @@ public:
void UpdateAI(uint32 diff) override
{
if( !UpdateVictim() )
if (!UpdateVictim())
{
return;
}
events.Update(diff);
HandleWhelpSpam(diff);
if( me->HasUnitState(UNIT_STATE_CASTING) )
if (me->HasUnitState(UNIT_STATE_CASTING))
{
return;
}
DoMeleeAttackIfReady();
switch( events.ExecuteEvent() )
switch (events.ExecuteEvent())
{
case 0:
break;
@@ -422,7 +439,7 @@ public:
break;
case EVENT_SPELL_FIREBALL_FIRST:
{
if( Unit* v = SelectTarget(SELECT_TARGET_RANDOM, 0, 200.0f, true) )
if (Unit* v = SelectTarget(SELECT_TARGET_RANDOM, 0, 200.0f, true))
{
me->SetFacingToObject(v);
me->CastSpell(v, SPELL_FIREBALL, false);
@@ -433,34 +450,44 @@ public:
break;
case EVENT_SPELL_FIREBALL_SECOND:
{
if( Unit* v = SelectTarget(SELECT_TARGET_RANDOM, 0, 200.0f, true) )
if (Unit* v = SelectTarget(SELECT_TARGET_RANDOM, 0, 200.0f, true))
{
me->SetFacingToObject(v);
me->CastSpell(v, SPELL_FIREBALL, false);
}
uint8 rand = urand(0, 99);
if( rand < 33 )
if (rand < 33)
{
events.ScheduleEvent(EVENT_PHASE_2_STEP_CW, 4000);
else if( rand < 66 )
}
else if (rand < 66)
{
events.ScheduleEvent(EVENT_PHASE_2_STEP_ACW, 4000);
}
else
{
events.ScheduleEvent(EVENT_PHASE_2_STEP_ACROSS, 4000);
}
}
break;
case EVENT_PHASE_2_STEP_CW:
{
uint8 newWP = CurrentWP + 1;
if( newWP > 8 )
if (newWP > 8)
{
newWP = 1;
}
me->GetMotionMaster()->MovePoint(newWP, OnyxiaMoveData[newWP].x, OnyxiaMoveData[newWP].y, OnyxiaMoveData[newWP].z);
}
break;
case EVENT_PHASE_2_STEP_ACW:
{
uint8 newWP = CurrentWP - 1;
if( newWP < 1 )
if (newWP < 1)
{
newWP = 8;
}
me->GetMotionMaster()->MovePoint(newWP, OnyxiaMoveData[newWP].x, OnyxiaMoveData[newWP].y, OnyxiaMoveData[newWP].z);
}
break;
@@ -510,8 +537,10 @@ public:
break;
case EVENT_ERUPTION:
{
if( Creature* trigger = me->SummonCreature(12758, *me, TEMPSUMMON_TIMED_DESPAWN, 1000) )
if (Creature* trigger = me->SummonCreature(12758, *me, TEMPSUMMON_TIMED_DESPAWN, 1000))
{
trigger->CastSpell(trigger, 17731, false);
}
}
break;
case EVENT_SUMMON_WHELP:
@@ -528,9 +557,10 @@ public:
void SpellHitTarget(Unit* target, const SpellInfo* spell) override
{
if (target->GetTypeId() == TYPEID_PLAYER && spell->DurationEntry && spell->DurationEntry->ID == 328 && spell->Effects[EFFECT_1].TargetA.GetTarget() == 1 && (spell->Effects[EFFECT_1].Amplitude == 50 || spell->Effects[EFFECT_1].Amplitude == 215)) // Deep Breath
if (m_pInstance)
m_pInstance->SetData(DATA_DEEP_BREATH_FAILED, 1);
if (target->IsPlayer() && spell->DurationEntry && spell->DurationEntry->ID == 328 && spell->Effects[EFFECT_1].TargetA.GetTarget() == 1 && (spell->Effects[EFFECT_1].Amplitude == 50 || spell->Effects[EFFECT_1].Amplitude == 215)) // Deep Breath
{
m_pInstance->SetData(DATA_DEEP_BREATH_FAILED, 1);
}
}
};
};
@@ -558,24 +588,32 @@ public:
void MoveInLineOfSight(Unit* who) override
{
if( me->GetVictim() || me->GetDistance(who) > 20.0f )
if (me->GetVictim() || me->GetDistance(who) > 20.0f)
{
return;
}
if( who->GetTypeId() == TYPEID_PLAYER )
if (who->GetTypeId() == TYPEID_PLAYER)
{
AttackStart(who);
}
}
void UpdateAI(uint32 diff) override
{
if( !UpdateVictim() )
if (!UpdateVictim())
{
return;
}
events.Update(diff);
if( me->HasUnitState(UNIT_STATE_CASTING) )
if (me->HasUnitState(UNIT_STATE_CASTING))
{
return;
}
switch( events.ExecuteEvent() )
switch (events.ExecuteEvent())
{
case 0:
break;
@@ -585,7 +623,9 @@ public:
break;
case EVENT_OLG_SPELL_IGNITEWEAPON:
if (me->HasFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_DISARMED))
{
events.RepeatEvent(5000);
}
else
{
me->CastSpell(me, SPELL_OLG_IGNITEWEAPON, false);
@@ -595,9 +635,15 @@ public:
}
if (!me->HasUnitState(UNIT_STATE_CASTING) && me->isAttackReady())
{
if (me->HasFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_DISARMED))
{
if (me->HasAura(SPELL_OLG_IGNITEWEAPON))
{
me->RemoveAura(SPELL_OLG_IGNITEWEAPON);
}
}
}
DoMeleeAttackIfReady();
}
@@ -620,11 +666,15 @@ public:
void MoveInLineOfSight(Unit* who) override
{
if( me->GetVictim() || me->GetDistance(who) > 20.0f )
if (me->GetVictim() || me->GetDistance(who) > 20.0f)
{
return;
}
if( who->GetTypeId() == TYPEID_PLAYER )
if (who->GetTypeId() == TYPEID_PLAYER)
{
AttackStart(who);
}
}
};
};

56
src/server/scripts/Kalimdor/OnyxiasLair/instance_onyxias_lair.cpp
View File

@@ -19,6 +19,11 @@
#include "ScriptedCreature.h"
#include "onyxias_lair.h"
ObjectData const creatureData[] =
{
{ NPC_ONYXIA, DATA_ONYXIA }
};
class instance_onyxias_lair : public InstanceMapScript
{
public:
@@ -33,7 +38,6 @@ public:
{
instance_onyxias_lair_InstanceMapScript(Map* pMap) : InstanceScript(pMap) {Initialize();};
ObjectGuid m_uiOnyxiasGUID;
uint32 m_auiEncounter[MAX_ENCOUNTER];
std::string str_data;
uint16 ManyWhelpsCounter;
@@ -45,56 +49,53 @@ public:
memset(&m_auiEncounter, 0, sizeof(m_auiEncounter));
ManyWhelpsCounter = 0;
bDeepBreath = true;
LoadObjectData(creatureData, nullptr);
}
bool IsEncounterInProgress() const override
void OnCreatureCreate(Creature* creature) override
{
for( uint8 i = 0; i < MAX_ENCOUNTER; ++i )
if( m_auiEncounter[i] == IN_PROGRESS )
return true;
return false;
}
void OnCreatureCreate(Creature* pCreature) override
{
switch( pCreature->GetEntry() )
switch (creature->GetEntry())
{
case NPC_ONYXIA:
m_uiOnyxiasGUID = pCreature->GetGUID();
break;
case NPC_ONYXIAN_WHELP:
case NPC_ONYXIAN_LAIR_GUARD:
minions.push_back(pCreature->GetGUID());
minions.push_back(creature->GetGUID());
break;
}
InstanceScript::OnCreatureCreate(creature);
}
void OnGameObjectCreate(GameObject* go) override
{
switch( go->GetEntry() )
switch (go->GetEntry())
{
case GO_WHELP_SPAWNER:
go->CastSpell((Unit*)nullptr, 17646);
if( Creature* onyxia = instance->GetCreature(m_uiOnyxiasGUID) )
if (Creature* onyxia = GetCreature(DATA_ONYXIA))
{
onyxia->AI()->DoAction(-1);
}
break;
}
}
void SetData(uint32 uiType, uint32 uiData) override
{
switch(uiType)
switch (uiType)
{
case DATA_ONYXIA:
m_auiEncounter[0] = uiData;
ManyWhelpsCounter = 0;
bDeepBreath = true;
if( uiData == NOT_STARTED )
if(uiData == NOT_STARTED)
{
for (ObjectGuid const& guid : minions)
{
if (Creature* c = instance->GetCreature(guid))
{
c->DespawnOrUnsummon();
}
}
minions.clear();
}
break;
@@ -107,12 +108,14 @@ public:
}
if (uiType < MAX_ENCOUNTER && uiData == DONE)
{
SaveToDB();
}
}
uint32 GetData(uint32 uiType) const override
{
switch(uiType)
switch (uiType)
{
case DATA_ONYXIA:
return m_auiEncounter[0];
@@ -121,17 +124,6 @@ public:
return 0;
}
ObjectGuid GetGuidData(uint32 uiData) const override
{
switch (uiData)
{
case DATA_ONYXIA:
return m_uiOnyxiasGUID;
}
return ObjectGuid::Empty;
}
std::string GetSaveData() override
{
OUT_SAVE_INST_DATA;