nchebrov/azerothcore-wotlk
1
0
Fork 0
mirror of https://github.com/mod-playerbots/azerothcore-wotlk.git synced 2026-01-18 19:35:42 +00:00
Code Issues Packages Projects Releases Wiki Activity

feat(CI/Codestyle): added codestyle check (#3668)

Browse Source
This commit is contained in:
Kargatum
2021-01-09 17:59:50 +07:00
committed by GitHub
parent 57aa46244d
commit ea93a5c1a1
400 changed files with 238 additions and 748 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheChampion/boss_argent_challenge.cpp
View File

@@ -423,7 +423,7 @@ public:
case EVENT_MEMORY_SCALE:
me->SetObjectScale(1.0f);
events.ScheduleEvent(EVENT_MEMORY_START_ATTACK, 5000);
break;
case EVENT_MEMORY_START_ATTACK:
me->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE);
@@ -463,7 +463,6 @@ public:
}
};
enum ArgentSoldierSpells
{
// monk

5
src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheChampion/boss_black_knight.cpp
View File

@@ -84,7 +84,6 @@ enum Models
MODEL_GHOST = 21300
};
class boss_black_knight : public CreatureScript
{
public:
@@ -239,7 +238,7 @@ public:
if( pInstance && !summons.empty() )
if( Creature* ghoul = pInstance->instance->GetCreature(*summons.begin()) )
ghoul->MonsterYell("[Zombie] .... . Brains ....", LANG_UNIVERSAL, 0);
break;
case EVENT_SPELL_PLAGUE_STRIKE:
if( me->GetVictim() )
@@ -449,7 +448,7 @@ public:
if (me->GetDistance(target) > 5.0f && me->GetDistance(target) < 30.0f)
{
me->CastSpell(target, SPELL_LEAP, false);
break;
}
events.RepeatEvent(1000);

6
src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheChampion/boss_grand_champions.cpp
View File

@@ -711,7 +711,7 @@ public:
me->GetMotionMaster()->MovePoint(7, *mount);
events.RepeatEvent(200);
break;
}
}
}
break;
case EVENT_MOUNT_CHARGE:
@@ -829,7 +829,7 @@ public:
/****************** HUNTER ******************/
case EVENT_HUNTER_SPELL_DISENGAGE:
break;
case EVENT_HUNTER_SPELL_LIGHTNING_ARROWS:
me->CastSpell((Unit*)NULL, SPELL_LIGHTNING_ARROWS, false);
@@ -918,7 +918,7 @@ public:
}
break;
case EVENT_WARRIOR_SPELL_ROLLING_THROW:
break;
/*************** WARRIOR END ****************/
}

2
src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheChampion/instance_trial_of_the_champion.cpp
View File

@@ -962,7 +962,7 @@ public:
{
if( Creature* tirion = instance->GetCreature(NPC_TirionGUID) )
tirion->AI()->Talk(TEXT_GRATZ_SLAIN_CHAMPIONS);
HandleGameObject(GO_EnterGateGUID, true);
}
break;

9
src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_anubarak_trial.cpp
View File

@@ -691,7 +691,7 @@ public:
me->CastSpell(me, SPELL_EXPOSE_WEAKNESS, true);
me->CastSpell(me, SPELL_SPIDER_FRENZY, true);
me->CastSpell(me, SPELL_SUBMERGE, false);
events.DelayEvents(15000);
events.RescheduleEvent(EVENT_EMERGE, 10000);
}
@@ -704,7 +704,7 @@ public:
me->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE);
me->CastSpell(me, SPELL_EMERGE, false);
me->RemoveAura(SPELL_SUBMERGE);
events.RescheduleEvent(EVENT_SUBMERGE, 30000);
break;
}
@@ -813,12 +813,12 @@ public:
break;
case 1:
me->CastSpell(me, SPELL_SPIKE_SPEED2, true);
events.RescheduleEvent(2, 7000);
break;
case 2:
me->CastSpell(me, SPELL_SPIKE_SPEED3, true);
break;
case 3:
Reset();
@@ -940,7 +940,6 @@ public:
}
}
void Register() override
{
AfterHit += SpellHitFn(spell_gen_leeching_swarm_dmg_SpellScript::HandleAfterHit);

4
src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_faction_champions.cpp
View File

@@ -967,7 +967,7 @@ public:
break;
case EVENT_SPELL_SUMMON_FELHUNTER:
DoSummon(35465, *me);
break;
case EVENT_SPELL_HELLFIRE:
if( EnemiesInRange(9.0f) >= 3 )
@@ -1258,7 +1258,7 @@ public:
break;
case EVENT_SPELL_CALL_PET:
DoSummon(35610, *me);
break;
case EVENT_SPELL_AIMED_SHOT:
if( me->GetVictim() )

5
src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_lord_jaraxxus.cpp
View File

@@ -76,7 +76,6 @@ enum JaraxxusEvents
EVENT_SPELL_MISTRESS_KISS,
};
class boss_jaraxxus : public CreatureScript
{
public:
@@ -234,14 +233,14 @@ public:
Talk(EMOTE_NETHER_PORTAL);
Talk(SAY_MISTRESS_OF_PAIN);
me->CastSpell((Unit*)NULL, SPELL_SUMMON_NETHER_PORTAL, false);
events.RescheduleEvent(EVENT_SUMMON_VOLCANO, 60000);
break;
case EVENT_SUMMON_VOLCANO:
Talk(EMOTE_INFERNAL_ERUPTION);
Talk(SAY_INFERNAL_ERUPTION);
me->CastSpell((Unit*)NULL, SPELL_SUMMON_VOLCANO, false);
events.RescheduleEvent(EVENT_SUMMON_NETHER_PORTAL, 60000);
break;
}

16
src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_northrend_beasts.cpp
View File

@@ -150,7 +150,7 @@ public:
case EVENT_SPELL_SNOBOLLED:
if( t->GetTypeId() == TYPEID_PLAYER )
me->CastSpell((Unit*)NULL, SPELL_SNOBOLLED, true);
break;
case EVENT_SPELL_BATTER:
if( t->GetTypeId() == TYPEID_PLAYER )
@@ -400,7 +400,6 @@ public:
};
};
/***********
** ACIDMAW AND DREADSCALE
***********/
@@ -582,7 +581,7 @@ struct boss_jormungarAI : public ScriptedAI
me->UpdatePosition(Locs[LOC_CENTER].GetPositionX() + cos(angle)*dist, Locs[LOC_CENTER].GetPositionY() + sin(angle)*dist, me->GetPositionZ(), me->GetOrientation(), true);
me->StopMovingOnCurrentPos();
DoResetThreat();
events.RescheduleEvent(EVENT_EMERGE, 6000);
}
break;
@@ -684,7 +683,6 @@ public:
}
};
CreatureAI* GetAI(Creature* creature) const override
{
return new boss_acidmawAI(creature);
@@ -716,7 +714,6 @@ public:
}
};
/***********
** ICEHOWL
***********/
@@ -892,7 +889,7 @@ public:
case EVENT_SPELL_MASSIVE_CRASH:
me->GetMotionMaster()->Clear();
me->CastSpell((Unit*)NULL, SPELL_MASSIVE_CRASH, false);
events.RescheduleEvent(EVENT_GAZE, 2000);
break;
case EVENT_GAZE:
@@ -914,7 +911,7 @@ public:
me->GetMotionMaster()->MovementExpired();
me->SetReactState(REACT_AGGRESSIVE);
}
break;
case EVENT_JUMP_BACK:
{
@@ -963,7 +960,7 @@ public:
me->GetMotionMaster()->MoveCharge(destX, destY, destZ + 1.0f, 65.0f);
me->SetUInt64Value(UNIT_FIELD_TARGET, 0);
events.RescheduleEvent(EVENT_CHECK_TRAMPLE_PLAYERS, 100);
break;
case EVENT_CHECK_TRAMPLE_PLAYERS:
if( DoTrampleIfValid() )
@@ -982,7 +979,7 @@ public:
break;
case EVENT_REFRESH_POSITION:
//me->SetFacingTo(me->GetOrientation());
break;
}
@@ -1025,7 +1022,6 @@ public:
};
};
void AddSC_boss_northrend_beasts()
{
new boss_gormok();

6
src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_twin_valkyr.cpp
View File

@@ -288,7 +288,7 @@ struct boss_twin_valkyrAI : public ScriptedAI
twin->CastSpell(twin, SPELL_BERSERK, true);
twin->AI()->Talk(SAY_BERSERK);
}
break;
case EVENT_SUMMON_BALLS_1:
case EVENT_SUMMON_BALLS_2:
@@ -306,7 +306,7 @@ struct boss_twin_valkyrAI : public ScriptedAI
if( Creature* ball = me->SummonCreature((i % 2) ? NPC_CONCENTRATED_DARK : NPC_CONCENTRATED_LIGHT, Locs[LOC_CENTER].GetPositionX() + cos(angle) * 47.0f, Locs[LOC_CENTER].GetPositionY() + sin(angle) * 47.0f, Locs[LOC_CENTER].GetPositionZ() + 1.5f, 0.0f, TEMPSUMMON_CORPSE_TIMED_DESPAWN, 1500) )
boss_twin_valkyrAI::JustSummoned(ball);
}
switch( eventId )
{
case EVENT_SUMMON_BALLS_1:
@@ -448,7 +448,7 @@ struct boss_twin_valkyrAI : public ScriptedAI
break;
case EVENT_REMOVE_DUAL_WIELD:
me->SetCanDualWield(false);
break;
}

64
src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/instance_trial_of_the_crusader.cpp
View File

@@ -609,7 +609,7 @@ public:
{
if( Creature* c = instance->GetCreature(NPC_VarianGUID) )
c->AI()->Talk(SAY_STAGE_0_03a);
events.RescheduleEvent(EVENT_SCENE_003, 5000);
}
break;
@@ -617,7 +617,7 @@ public:
{
if( Creature* c = instance->GetCreature(NPC_GarroshGUID) )
c->AI()->Talk(SAY_STAGE_0_03h);
events.RescheduleEvent(EVENT_SCENE_004, 8000);
}
break;
@@ -630,7 +630,7 @@ public:
c->AI()->Talk(SAY_STAGE_0_02);
HandleGameObject(GO_MainGateGUID, true);
HandleGameObject(GO_EnterGateGUID, false);
events.RescheduleEvent(EVENT_SUMMON_GORMOK, 1000);
if (instance->IsHeroic())
{
@@ -653,14 +653,14 @@ public:
if( Creature* c = instance->GetCreature(NPC_IcehowlGUID) )
if (c->IsAlive())
c->CastSpell(c, 26662, true);
break;
case EVENT_SUMMON_GORMOK:
{
if( Creature* c = instance->GetCreature(NPC_TirionGUID) )
if( Creature* gormok = c->SummonCreature(NPC_GORMOK, Locs[LOC_BEHIND_GATE].GetPositionX(), Locs[LOC_BEHIND_GATE].GetPositionY(), Locs[LOC_BEHIND_GATE].GetPositionZ(), Locs[LOC_BEHIND_GATE].GetOrientation(), TEMPSUMMON_CORPSE_TIMED_DESPAWN, 30000) )
gormok->GetMotionMaster()->MovePoint(0, Locs[LOC_GATE_FRONT].GetPositionX(), Locs[LOC_GATE_FRONT].GetPositionY(), Locs[LOC_GATE_FRONT].GetPositionZ());
events.RescheduleEvent(EVENT_GORMOK_ATTACK, 10000);
events.RescheduleEvent(EVENT_CLOSE_GATE, 6000);
}
@@ -686,7 +686,7 @@ public:
northrendBeastsMask |= 16;
if( Creature* c = instance->GetCreature(NPC_TirionGUID) )
c->AI()->Talk(SAY_STAGE_0_04);
events.RescheduleEvent(EVENT_OPEN_GATE, 3000);
events.RescheduleEvent(EVENT_SUMMON_ACIDMAW_AND_DREADSCALE, 4000);
break;
@@ -700,16 +700,16 @@ public:
if( Creature* acidmaw = c->SummonCreature(NPC_ACIDMAW, Locs[LOC_ACIDMAW].GetPositionX(), Locs[LOC_ACIDMAW].GetPositionY(), Locs[LOC_ACIDMAW].GetPositionZ(), Locs[LOC_ACIDMAW].GetOrientation(), TEMPSUMMON_MANUAL_DESPAWN) )
acidmaw->AddAura(53421, acidmaw);
}
events.RescheduleEvent(EVENT_SCENE_005_2, 4000);
break;
}
case EVENT_SCENE_005_2:
{
if( Creature* dreadscale = instance->GetCreature(NPC_DreadscaleGUID) )
dreadscale->GetMotionMaster()->MovePoint(0, Locs[LOC_DREADSCALE].GetPositionX(), Locs[LOC_DREADSCALE].GetPositionY(), Locs[LOC_DREADSCALE].GetPositionZ());
events.RescheduleEvent(EVENT_ACIDMAW_AND_DREADSCALE_ATTACK, 7000);
break;
}
@@ -747,7 +747,7 @@ public:
northrendBeastsMask |= 32;
if( Creature* c = instance->GetCreature(NPC_TirionGUID) )
c->AI()->Talk(SAY_STAGE_0_05);
events.RescheduleEvent(EVENT_OPEN_GATE, 2000);
events.RescheduleEvent(EVENT_SUMMON_ICEHOWL, 3000);
break;
@@ -757,7 +757,7 @@ public:
if( Creature* c = instance->GetCreature(NPC_TirionGUID) )
if( Creature* icehowl = c->SummonCreature(NPC_ICEHOWL, Locs[LOC_BEHIND_GATE].GetPositionX(), Locs[LOC_BEHIND_GATE].GetPositionY(), Locs[LOC_BEHIND_GATE].GetPositionZ(), Locs[LOC_BEHIND_GATE].GetOrientation(), TEMPSUMMON_CORPSE_TIMED_DESPAWN, 630000000) )
icehowl->GetMotionMaster()->MovePoint(0, Locs[LOC_GATE_FRONT].GetPositionX(), Locs[LOC_GATE_FRONT].GetPositionY(), Locs[LOC_GATE_FRONT].GetPositionZ());
events.RescheduleEvent(EVENT_ICEHOWL_ATTACK, 10000);
events.RescheduleEvent(EVENT_CLOSE_GATE, 6000);
break;
@@ -813,7 +813,7 @@ public:
HandleGameObject(GO_MainGateGUID, false);
if( Creature* c = instance->GetCreature(NPC_FizzlebangGUID) )
c->AI()->Talk(SAY_STAGE_1_02);
events.RescheduleEvent(EVENT_SCENE_103, 11000);
break;
}
@@ -826,7 +826,7 @@ public:
if( Creature* trigger = c->SummonCreature(NPC_PURPLE_GROUND, Locs[LOC_CENTER].GetPositionX(), Locs[LOC_CENTER].GetPositionY(), Locs[LOC_CENTER].GetPositionZ(), Locs[LOC_CENTER].GetOrientation(), TEMPSUMMON_MANUAL_DESPAWN) )
NPC_PurpleGroundGUID = trigger->GetGUID();
}
events.RescheduleEvent(EVENT_SCENE_104, 5000);
break;
}
@@ -843,7 +843,7 @@ public:
}
c->HandleEmoteCommand(EMOTE_STATE_SPELL_PRECAST);
}
events.RescheduleEvent(EVENT_SUMMON_JARAXXUS, 5000);
break;
}
@@ -856,7 +856,7 @@ public:
c->HandleEmoteCommand(EMOTE_STATE_NONE);
c->AI()->Talk(SAY_STAGE_1_04);
}
events.RescheduleEvent(EVENT_SCENE_105, 3000);
break;
}
@@ -870,7 +870,7 @@ public:
if( Creature* c = instance->GetCreature(NPC_PortalGUID) )
c->DespawnOrUnsummon();
NPC_PortalGUID = 0;
events.RescheduleEvent(EVENT_SCENE_106, 10000);
break;
}
@@ -878,7 +878,7 @@ public:
{
if( Creature* c = instance->GetCreature(NPC_JaraxxusGUID) )
c->AI()->Talk(SAY_STAGE_1_05);
events.RescheduleEvent(EVENT_SCENE_107, 5000);
break;
}
@@ -886,7 +886,7 @@ public:
{
if( Creature* c = instance->GetCreature(NPC_FizzlebangGUID) )
c->AI()->Talk(SAY_STAGE_1_06);
events.RescheduleEvent(EVENT_SCENE_108, 800);
break;
}
@@ -902,7 +902,7 @@ public:
Unit::Kill(f, f);
}
}
events.RescheduleEvent(EVENT_SCENE_109, 5000);
break;
}
@@ -912,7 +912,7 @@ public:
c->SetFacingTo(3 * M_PI / 2);
if( Creature* c = instance->GetCreature(NPC_TirionGUID) )
c->AI()->Talk(SAY_STAGE_1_07);
events.RescheduleEvent(EVENT_JARAXXUS_ATTACK, 6000);
break;
}
@@ -936,7 +936,7 @@ public:
{
if( Creature* c = instance->GetCreature(NPC_TirionGUID) )
c->AI()->Talk(SAY_STAGE_1_08);
events.RescheduleEvent(EVENT_SCENE_111, 18000);
break;
}
@@ -944,7 +944,7 @@ public:
{
if( Creature* c = instance->GetCreature(NPC_GarroshGUID) )
c->AI()->Talk(SAY_STAGE_1_09);
events.RescheduleEvent(EVENT_SCENE_112, 9000);
break;
}
@@ -952,7 +952,7 @@ public:
{
if( Creature* c = instance->GetCreature(NPC_VarianGUID) )
c->AI()->Talk(SAY_STAGE_1_10);
events.RescheduleEvent(EVENT_SCENE_113, 5000);
break;
}
@@ -963,7 +963,7 @@ public:
if( Creature* c = instance->GetCreature(NPC_BarrettGUID) )
c->SetFlag(UNIT_NPC_FLAGS, UNIT_NPC_FLAG_GOSSIP);
break;
}
}
case EVENT_SCENE_201:
{
// move Jaraxxus to side, can't remove corpse because of loot!
@@ -976,7 +976,7 @@ public:
if( Creature* c = instance->GetCreature(NPC_TirionGUID) )
c->AI()->Talk(SAY_STAGE_2_01);
events.RescheduleEvent(EVENT_SCENE_202, 9000);
break;
}
@@ -1009,7 +1009,7 @@ public:
{
if( Creature* c = instance->GetCreature(NPC_TirionGUID) )
c->AI()->Talk(SAY_STAGE_2_03);
events.RescheduleEvent(EVENT_SCENE_204, 5000);
break;
}
@@ -1027,7 +1027,7 @@ public:
c->AI()->Talk(SAY_STAGE_2_04a);
events.RescheduleEvent(EVENT_SCENE_205, 5000);
}
events.RescheduleEvent(EVENT_SUMMON_CHAMPIONS, 2500);
break;
}
@@ -1137,7 +1137,7 @@ public:
if( Creature* c = instance->GetCreature(NPC_BarrettGUID) )
c->SetFlag(UNIT_NPC_FLAGS, UNIT_NPC_FLAG_GOSSIP);
break;
}
}
case EVENT_SCENE_301:
{
if( Creature* c = instance->GetCreature(NPC_TirionGUID) )
@@ -1165,7 +1165,7 @@ public:
if( Creature* t = c->SummonCreature(NPC_DARKBANE, Locs[LOC_VALKYR_LEFT].GetPositionX(), Locs[LOC_VALKYR_LEFT].GetPositionY(), Locs[LOC_VALKYR_LEFT].GetPositionZ(), Locs[LOC_VALKYR_LEFT].GetOrientation(), TEMPSUMMON_CORPSE_TIMED_DESPAWN, 630000000) )
t->GetMotionMaster()->MovePoint(0, Locs[LOC_VALKYR_DEST_LEFT].GetPositionX(), Locs[LOC_VALKYR_DEST_LEFT].GetPositionY(), Locs[LOC_VALKYR_DEST_LEFT].GetPositionZ());
}
events.RescheduleEvent(EVENT_SCENE_304, 6250);
break;
}
@@ -1302,7 +1302,7 @@ public:
break;
}
case EVENT_SCENE_407:
{
if( Creature* c = instance->GetCreature(NPC_LichKingGUID) )
@@ -1336,7 +1336,7 @@ public:
InstanceProgress = INSTANCE_PROGRESS_ANUB_ARAK;
SpawnAnubArak();
}
events.RescheduleEvent(EVENT_SCENE_410, 2000);
break;
}
@@ -1412,7 +1412,7 @@ public:
}
break;
}
}
}

1
src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/trial_of_the_crusader.h
View File

@@ -361,7 +361,6 @@ enum eAchievementCriteria
ACHIEV_CRITERIA_REALM_FIRST_GRAND_CRUSADER = 12350,
};
enum euiWorldStates
{
UPDATE_STATE_UI_SHOW = 4390,