sindoring/moonwell-core
1
0
Fork 0
Code Issues Pull Requests 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
src/server/scripts/Northrend/AzjolNerub/ahnkahet/boss_elder_nadox.cpp
-1
View File
@@ -234,7 +234,6 @@ public:
{
npc_ahnkahar_nerubianAI(Creature* c) : ScriptedAI(c) { }
uint32 uiSprintTimer;
void Reset() override
{
src/server/scripts/Northrend/AzjolNerub/ahnkahet/boss_jedoga_shadowseeker.cpp
-1
View File
@@ -6,7 +6,6 @@
#include "ScriptedCreature.h"
#include "ahnkahet.h"
enum Yells
{
TEXT_AGGRO = 0,
src/server/scripts/Northrend/CMakeLists.txt
+1 -1
View File
@@ -1,4 +1,4 @@
# Copyright (C)
# Copyright (C)
#
# This file is free software; as a special exception the author gives
# unlimited permission to copy and/or distribute it, with or without
src/server/scripts/Northrend/ChamberOfAspects/ObsidianSanctum/boss_sartharion.cpp
+1 -1
View File
@@ -656,7 +656,7 @@ public:
}
void RespawnDragons(bool checkCombat)
{
{
for (uint8 i = 0; i < MAX_DRAGONS; ++i)
{
if (instance->GetBossState(dragons[i]) == DONE)
src/server/scripts/Northrend/ChamberOfAspects/RubySanctum/boss_halion.cpp
-2
View File
@@ -13,7 +13,6 @@
#include "ruby_sanctum.h"
#include "Player.h"
enum Texts
{
// Shared
@@ -1466,7 +1465,6 @@ public:
}
};
void AddSC_boss_halion()
{
new boss_halion();
src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheChampion/boss_argent_challenge.cpp
+1 -2
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
src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheChampion/boss_black_knight.cpp
+2 -3
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);
src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheChampion/boss_grand_champions.cpp
+3 -3
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 ****************/
}
src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheChampion/instance_trial_of_the_champion.cpp
+1 -1
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;
src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_anubarak_trial.cpp
+4 -5
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);
src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_faction_champions.cpp
+2 -2
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() )
src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_lord_jaraxxus.cpp
+2 -3
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;
}
src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_northrend_beasts.cpp
+6 -10
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();
src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_twin_valkyr.cpp
+3 -3
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;
}
src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/instance_trial_of_the_crusader.cpp
+32 -32
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;
}
}
}
src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/trial_of_the_crusader.h
-1
View File
@@ -361,7 +361,6 @@ enum eAchievementCriteria
ACHIEV_CRITERIA_REALM_FIRST_GRAND_CRUSADER = 12350,
};
enum euiWorldStates
{
UPDATE_STATE_UI_SHOW = 4390,
src/server/scripts/Northrend/FrozenHalls/ForgeOfSouls/boss_bronjahm.cpp
+1 -7
View File
@@ -159,7 +159,7 @@ public:
me->CastSpell(me, SPELL_SOULSTORM, false);
me->CastSpell(me, SPELL_TELEPORT_VISUAL, true);
me->CastSpell(me, SPELL_SOULSTORM_VISUAL, true);
break;
}
@@ -198,7 +198,6 @@ public:
}
};
class npc_fos_corrupted_soul_fragment : public CreatureScript
{
public:
@@ -251,7 +250,6 @@ public:
}
};
class spell_bronjahm_magic_bane : public SpellScriptLoader
{
public:
@@ -289,7 +287,6 @@ public:
}
};
class spell_bronjahm_soulstorm_channel_ooc : public SpellScriptLoader
{
public:
@@ -317,7 +314,6 @@ public:
}
};
class spell_bronjahm_soulstorm_visual : public SpellScriptLoader
{
public:
@@ -361,7 +357,6 @@ public:
}
};
class spell_bronjahm_soulstorm_targeting : public SpellScriptLoader
{
public:
@@ -388,7 +383,6 @@ public:
}
};
void AddSC_boss_bronjahm()
{
new boss_bronjahm();
src/server/scripts/Northrend/FrozenHalls/ForgeOfSouls/boss_devourer_of_souls.cpp
-2
View File
@@ -294,7 +294,6 @@ public:
}
};
class spell_wailing_souls_periodic : public SpellScriptLoader
{
public:
@@ -359,7 +358,6 @@ public:
}
};
void AddSC_boss_devourer_of_souls()
{
new boss_devourer_of_souls();
src/server/scripts/Northrend/FrozenHalls/ForgeOfSouls/forge_of_souls.cpp
+8 -10
View File
@@ -72,7 +72,7 @@ public:
case 0:
break;
case 1:
if (me->GetEntry() == NPC_JAINA_PART1)
{
Talk(SAY_JAINA_INTRO_1);
@@ -85,7 +85,7 @@ public:
}
break;
case 2:
if (me->GetEntry() == NPC_JAINA_PART1)
{
Talk(SAY_JAINA_INTRO_2);
@@ -98,7 +98,7 @@ public:
}
break;
case 3:
if (me->GetEntry() == NPC_JAINA_PART1)
{
Talk(SAY_JAINA_INTRO_3);
@@ -111,7 +111,7 @@ public:
}
break;
case 4:
if (me->GetEntry() == NPC_JAINA_PART1)
{
Talk(SAY_JAINA_INTRO_4);
@@ -124,7 +124,7 @@ public:
}
break;
case 5:
if (me->GetEntry() == NPC_JAINA_PART1)
{
Talk(SAY_JAINA_INTRO_5);
@@ -137,7 +137,7 @@ public:
}
break;
case 6:
if (me->GetEntry() == NPC_JAINA_PART1)
{
Talk(SAY_JAINA_INTRO_6);
@@ -149,7 +149,7 @@ public:
}
break;
case 7:
if (me->GetEntry() == NPC_JAINA_PART1)
{
Talk(SAY_JAINA_INTRO_7);
@@ -157,7 +157,7 @@ public:
}
break;
case 8:
if (me->GetEntry() == NPC_JAINA_PART1)
{
Talk(SAY_JAINA_INTRO_8);
@@ -210,7 +210,6 @@ public:
}
};
class npc_fos_leader_second : public CreatureScript
{
public:
@@ -243,7 +242,6 @@ public:
}
};
class spell_shield_of_bones : public SpellScriptLoader
{
public:
src/server/scripts/Northrend/FrozenHalls/PitOfSaron/boss_forgemaster_garfrost.cpp
+1 -1
View File
@@ -244,7 +244,7 @@ public:
me->GetMotionMaster()->MoveJump(northForgePos.GetPositionX(), northForgePos.GetPositionY(), northForgePos.GetPositionZ(), 25.0f, 15.0f, 0);
else if (phase == 2)
me->GetMotionMaster()->MoveJump(southForgePos.GetPositionX(), southForgePos.GetPositionY(), southForgePos.GetPositionZ(), 25.0f, 15.0f, 0);
break;
case EVENT_SPELL_CHILLING_WAVE:
me->CastSpell(me->GetVictim(), SPELL_CHILLING_WAVE, false);
src/server/scripts/Northrend/FrozenHalls/PitOfSaron/boss_krickandick.cpp
+12 -13
View File
@@ -202,7 +202,7 @@ public:
me->SetReactState(REACT_AGGRESSIVE);
if (!UpdateVictim())
return;
break;
case EVENT_SPECIAL:
switch(urand(0, 2))
@@ -315,7 +315,7 @@ public:
c->AI()->Reset();
}
}
events.RescheduleEvent(1, 3000);
break;
case 1:
@@ -335,7 +335,7 @@ public:
if (Creature* c = pInstance->instance->GetCreature(pInstance->GetData64(DATA_GUARD_1_GUID + i)))
c->DespawnOrUnsummon();
}
events.RescheduleEvent(2, 7000);
break;
case 2:
@@ -350,12 +350,12 @@ public:
if (Creature* c = pInstance->instance->GetCreature(pInstance->GetData64(DATA_LEADER_FIRST_GUID)))
c->AI()->Talk(c->GetEntry() == NPC_JAINA_PART1 ? SAY_JAINA_KRICK_1 : SAY_SYLVANAS_KRICK_1);
}
events.RescheduleEvent(3, 6500);
break;
case 3:
Talk(SAY_OUTRO_KRICK_2);
events.RescheduleEvent(4, 17000);
break;
case 4:
@@ -366,12 +366,12 @@ public:
if (Creature* c = pInstance->instance->GetCreature(pInstance->GetData64(DATA_LEADER_FIRST_GUID)))
c->AI()->Talk(c->GetEntry() == NPC_JAINA_PART1 ? SAY_JAINA_KRICK_2 : SAY_SYLVANAS_KRICK_2);
}
events.RescheduleEvent(5, 6500);
break;
case 5:
Talk(SAY_OUTRO_KRICK_3);
events.RescheduleEvent(6, 6500);
break;
case 6:
@@ -381,7 +381,7 @@ public:
c->SetFacingToObject(me);
c->AI()->Talk(SAY_TYRANNUS_KRICK_1);
}
events.RescheduleEvent(7, 4000);
break;
case 7:
@@ -392,12 +392,11 @@ public:
me->SendMovementFlagUpdate();
me->GetMotionMaster()->MoveTakeoff(0, me->GetPositionX(), me->GetPositionY(), me->GetPositionZ() + 9.0f, 0.5f * 7.0f);
events.RescheduleEvent(8, 2000);
break;
case 8:
Talk(SAY_OUTRO_KRICK_4);
events.RescheduleEvent(9, 1500);
break;
case 9:
@@ -415,14 +414,14 @@ public:
me->RemoveAllAuras();
me->GetMotionMaster()->MoveFall(0, true);
events.RescheduleEvent(10, 5000);
break;
case 10:
if (pInstance)
if (Creature* c = pInstance->instance->GetCreature(pInstance->GetData64(DATA_TYRANNUS_EVENT_GUID)))
c->AI()->Talk(SAY_TYRANNUS_KRICK_2);
events.RescheduleEvent(11, 9000);
break;
case 11:
@@ -438,7 +437,7 @@ public:
}
me->setActive(false);
Unit::Kill(me, me);
break;
}
}
src/server/scripts/Northrend/FrozenHalls/PitOfSaron/boss_scourgelord_tyrannus.cpp
+2 -2
View File
@@ -146,7 +146,7 @@ public:
if (me->IsWithinMeleeRange(me->GetVictim()))
{
me->CastSpell(me->GetVictim(), SPELL_FORCEFUL_SMASH, false);
events.RescheduleEvent(EVENT_SPELL_UNHOLY_POWER, 1000);
break;
}
@@ -156,7 +156,7 @@ public:
Talk(SAY_SMASH);
Talk(EMOTE_SMASH);
me->CastSpell(me, SPELL_UNHOLY_POWER, false);
events.ScheduleEvent(EVENT_SPELL_FORCEFUL_SMASH, urand(40000, 48000));
break;
case EVENT_SPELL_OVERLORDS_BRAND:
src/server/scripts/Northrend/FrozenHalls/PitOfSaron/pit_of_saron.cpp
+27 -27
View File
@@ -88,7 +88,7 @@ public:
}
else
{
events.RescheduleEvent(2, 2500);
}
}
@@ -100,14 +100,14 @@ public:
c->setActive(true);
c->AI()->Talk(SAY_TYRANNUS_INTRO_1);
}
events.RescheduleEvent(3, 7000);
break;
case 3:
if (pInstance)
if (Creature* c = pInstance->instance->GetCreature(pInstance->GetData64(DATA_TYRANNUS_EVENT_GUID)))
c->AI()->Talk(SAY_TYRANNUS_INTRO_2);
events.RescheduleEvent(4, 14000);
break;
case 4:
@@ -148,19 +148,19 @@ public:
}
}
}
events.RescheduleEvent(5, 1);
break;
case 5:
Talk(me->GetEntry() == NPC_JAINA_PART1 ? SAY_JAINA_INTRO_1 : SAY_SYLVANAS_INTRO_1);
events.RescheduleEvent(6, 1000);
break;
case 6:
if (pInstance)
if (Creature* c = pInstance->instance->GetCreature(pInstance->GetData64(DATA_TYRANNUS_EVENT_GUID)))
c->AI()->Talk(SAY_TYRANNUS_INTRO_3);
events.RescheduleEvent(7, 5000);
break;
case 7:
@@ -190,14 +190,14 @@ public:
c->GetMotionMaster()->MoveTakeoff(0, c->GetPositionX() + dist * cos(angle), c->GetPositionY() + dist * sin(angle), c->GetPositionZ() + 6.0f + (float)urand(0, 4), 1.5f + frand(0.0f, 1.5f));
}
}
events.RescheduleEvent(8, 7000);
break;
case 8:
if (pInstance)
if (Creature* c = pInstance->instance->GetCreature(pInstance->GetData64(DATA_TYRANNUS_EVENT_GUID)))
c->CastSpell(c, 69753, false);
events.RescheduleEvent(9, 400);
break;
case 9:
@@ -211,12 +211,12 @@ public:
c->RemoveAllAuras();
c->GetMotionMaster()->MoveFall(0, true);
}
events.RescheduleEvent(10, 1000);
break;
case 10:
Talk(me->GetEntry() == NPC_JAINA_PART1 ? SAY_JAINA_INTRO_2 : SAY_SYLVANAS_INTRO_2);
events.RescheduleEvent(11, 1000);
break;
case 11:
@@ -232,7 +232,7 @@ public:
c->SendMovementFlagUpdate();
c->CastSpell(c, 69350, true);
}
events.RescheduleEvent(12, 2000);
break;
case 12:
@@ -253,7 +253,7 @@ public:
c->SetReactState(REACT_PASSIVE);
}
}
events.RescheduleEvent(13, 3000);
break;
case 13:
@@ -273,7 +273,7 @@ public:
c->SetHomePosition(me->GetPositionX() + dist * cos(angle), me->GetPositionY() + dist * sin(angle), me->GetPositionZ(), 0.0f);
}
}
events.RescheduleEvent(14, 2000);
break;
case 14:
@@ -292,7 +292,7 @@ public:
c->CastSpell(c, 70513, false);
}
}
events.RescheduleEvent(15, 2000);
break;
case 15:
@@ -308,7 +308,7 @@ public:
c->CastSpell(c, 70464, false);
}
}
events.RescheduleEvent(16, 3000);
break;
case 16:
@@ -333,13 +333,13 @@ public:
}
pInstance->SetData(DATA_INSTANCE_PROGRESS, INSTANCE_PROGRESS_FINISHED_INTRO);
}
events.RescheduleEvent(17, 5000);
break;
case 17:
me->setActive(false);
Talk(me->GetEntry() == NPC_JAINA_PART1 ? SAY_JAINA_INTRO_5 : SAY_SYLVANAS_INTRO_4);
break;
}
@@ -548,12 +548,12 @@ public:
case 2:
if (Creature* c = me->SummonCreature(NPC_TYRANNUS_VOICE, me->GetPositionX(), me->GetPositionY(), me->GetPositionZ() - 10.0f, me->GetOrientation(), TEMPSUMMON_TIMED_DESPAWN, 1))
c->AI()->Talk(SAY_TYRANNUS_GARFROST);
events.RescheduleEvent(3, 4000);
break;
case 3:
Talk(SAY_GENERAL_GARFROST);
break;
}
}
@@ -1222,26 +1222,26 @@ public:
c->SetHover(true);
c->GetMotionMaster()->MovePoint(0, TSSindragosaPos2);
}
break;
case 2:
if (pInstance)
if (Creature* c = pInstance->instance->GetCreature(pInstance->GetData64(DATA_MARTIN_OR_GORKUN_GUID)))
c->AI()->Talk(SAY_GENERAL_OUTRO_2);
events.RescheduleEvent(3, me->GetEntry() == NPC_JAINA_PART2 ? 7000 : 8000);
break;
case 3:
Talk(me->GetEntry() == NPC_JAINA_PART2 ? SAY_JAINA_OUTRO_1 : SAY_SYLVANAS_OUTRO_1);
me->CastSpell(me, me->GetEntry() == NPC_JAINA_PART2 ? SPELL_TELEPORT_JAINA_VISUAL : SPELL_TELEPORT_SYLVANAS_VISUAL, true);
events.RescheduleEvent(4, 2000);
break;
case 4:
me->CastSpell(me, me->GetEntry() == NPC_JAINA_PART2 ? SPELL_TELEPORT_JAINA : SPELL_TELEPORT_SYLVANAS, true);
if (GameObject* barrier = me->SummonGameObject(203005, 1055.49f, 115.03f, 628.15f, 2.08f, 0.0f, 0.0f, 0.0f, 0.0f, 86400, false))
barrierGUID = barrier->GetGUID();
events.RescheduleEvent(5, 1500);
break;
case 5:
@@ -1251,7 +1251,7 @@ public:
if (Creature* c = pInstance->instance->GetCreature(pInstance->GetData64(DATA_SINDRAGOSA_GUID)))
c->CastSpell(x->GetPositionX(), x->GetPositionY(), x->GetPositionZ(), SPELL_SINDRAGOSA_FROST_BOMB_POS, true);
}
events.RescheduleEvent(6, 5000);
events.RescheduleEvent(10, 2000);
break;
@@ -1259,7 +1259,7 @@ public:
if (pInstance)
if (Creature* c = pInstance->instance->GetCreature(pInstance->GetData64(DATA_SINDRAGOSA_GUID)))
c->GetMotionMaster()->MovePoint(0, TSSindragosaPos1);
events.RescheduleEvent(7, 4500);
break;
case 7:
@@ -1269,7 +1269,7 @@ public:
if (GameObject* barrier = pInstance->instance->GetGameObject(barrierGUID))
barrier->Delete();
barrierGUID = 0;
events.RescheduleEvent(8, 2000);
break;
case 8:
@@ -1278,7 +1278,7 @@ public:
case 10:
if (Creature* x = pInstance->instance->GetCreature(pInstance->GetData64(DATA_MARTIN_OR_GORKUN_GUID)))
x->AI()->DoAction(3);
break;
}
}
src/server/scripts/Northrend/Gundrak/boss_drakkari_colossus.cpp
-1
View File
@@ -301,7 +301,6 @@ public:
break;
}
DoMeleeAttackIfReady();
}
};
src/server/scripts/Northrend/IcecrownCitadel/boss_lady_deathwhisper.cpp
-1
View File
@@ -467,7 +467,6 @@ public:
minrange = summon->GetExactDist(p);
}
summon->ToTempSummon()->DespawnOrUnsummon(30000);
}
else
src/server/scripts/Northrend/IcecrownCitadel/boss_lord_marrowgar.cpp
-1
View File
@@ -43,7 +43,6 @@ enum Spells
SPELL_COLDFLAME_SUMMON = 69147,
};
enum Events
{
EVENT_ENABLE_BONE_SLICE = 1,
src/server/scripts/Northrend/IcecrownCitadel/boss_professor_putricide.cpp
-1
View File
@@ -1265,7 +1265,6 @@ public:
}
}
targets.remove_if(acore::UnitAuraCheck(true, sSpellMgr->GetSpellIdForDifficulty(SPELL_UNBOUND_PLAGUE, GetCaster())));
acore::Containers::RandomResizeList(targets, 1);
}
src/server/scripts/Northrend/IcecrownCitadel/boss_rotface.cpp
-1
View File
@@ -856,7 +856,6 @@ public:
}
};
class npc_precious_icc : public CreatureScript
{
public:
src/server/scripts/Northrend/IcecrownCitadel/boss_sindragosa.cpp
-3
View File
@@ -1225,7 +1225,6 @@ public:
unitList = targetList;
}
void Register() override
{
OnObjectAreaTargetSelect += SpellObjectAreaTargetSelectFn(spell_sindragosa_ice_tomb_SpellScript::FilterTargets, EFFECT_1, TARGET_UNIT_DEST_AREA_ENEMY);
@@ -1372,8 +1371,6 @@ public:
}
};
class npc_spinestalker : public CreatureScript
{
public:
src/server/scripts/Northrend/IcecrownCitadel/boss_the_lich_king.cpp
-7
View File
@@ -358,7 +358,6 @@ void SendPacketToPlayers(WorldPacket const* data, Unit* source)
player->GetSession()->SendPacket(data);
}
struct ShadowTrapLKTargetSelector : public acore::unary_function<Unit*, bool>
{
public:
@@ -385,8 +384,6 @@ private:
float _maxDist;
};
struct NonTankLKTargetSelector : public acore::unary_function<Unit*, bool>
{
public:
@@ -421,7 +418,6 @@ private:
uint32 _exclude2;
};
struct DefileTargetSelector : public acore::unary_function<Unit*, bool>
{
public:
@@ -612,7 +608,6 @@ private:
bool _reverse;
};
class boss_the_lich_king : public CreatureScript
{
public:
@@ -1459,7 +1454,6 @@ public:
}
break;
case EVENT_OUTRO_LK_TALK_1:
if (Creature* theLichKing = ObjectAccessor::GetCreature(*me, _instance->GetData64(DATA_THE_LICH_KING)))
{
@@ -1627,7 +1621,6 @@ public:
me->CastSpell((Unit*)NULL, SPELL_JUMP, false);
break;
default:
break;
}
src/server/scripts/Northrend/IcecrownCitadel/icecrown_citadel.cpp
-2
View File
@@ -2346,7 +2346,6 @@ public:
}
};
// pussywizard below:
class spell_icc_web_wrap : public SpellScriptLoader
@@ -3462,7 +3461,6 @@ public:
events.ScheduleEvent(EVENT_SUMMON_BROODLING, 10000 + i * 350);
}
void SummonBroodling()
{
float dist = frand(18.0f, 39.0f);
src/server/scripts/Northrend/IcecrownCitadel/instance_icecrown_citadel.cpp
+1 -2
View File
@@ -1607,7 +1607,6 @@ public:
<< ColdflameJetsState << ' ' << BloodQuickeningState << ' ' << BloodQuickeningMinutes << ' ' << WeeklyQuestId10 << ' ' << PutricideEventProgress << ' '
<< uint32(LichKingHeroicAvailable ? 1 : 0) << ' ' << BloodPrinceTrashCount << ' ' << uint32(IsBuffAvailable ? 1 : 0);
OUT_SAVE_INST_DATA_COMPLETE;
return saveStream.str();
}
@@ -1871,7 +1870,7 @@ public:
break;
}
}
void SetPositionTraps(GameObject* go)
{
std::vector<Position> trapPositions;
src/server/scripts/Northrend/Naxxramas/boss_anubrekhan.cpp
+1 -2
View File
@@ -190,7 +190,7 @@ public:
}
case EVENT_SPELL_BERSERK:
me->CastSpell(me, SPELL_BERSERK, true);
break;
}
@@ -203,4 +203,3 @@ void AddSC_boss_anubrekhan()
{
new boss_anubrekhan();
}
src/server/scripts/Northrend/Naxxramas/boss_four_horsemen.cpp
+1 -3
View File
@@ -89,8 +89,6 @@ const uint32 TABLE_SPELL_PUNISH[4] = {SPELL_ZELIEK_CONDEMNATION, SPELL_BLAUMEUX_
const uint32 TABLE_SPELL_SECONDARY_10[4] = {SPELL_ZELIEK_HOLY_WRATH_10, SPELL_BLAUMEUX_VOID_ZONE_10, 0, 0};
const uint32 TABLE_SPELL_SECONDARY_25[4] = {SPELL_ZELIEK_HOLY_WRATH_25, SPELL_BLAUMEUX_VOID_ZONE_25, 0, 0};
const Position WaypointPositions[12] =
{
// Thane waypoints
@@ -310,7 +308,7 @@ public:
case EVENT_BERSERK:
Talk(SAY_SPECIAL);
me->CastSpell(me, SPELL_BERSERK, true);
return;
case EVENT_SPELL_PRIMARY:
Talk(SAY_TAUNT);
src/server/scripts/Northrend/Naxxramas/boss_gluth.cpp
+1 -2
View File
@@ -166,7 +166,7 @@ public:
{
case EVENT_SPELL_BERSERK:
me->CastSpell(me, SPELL_BERSERK, true);
break;
case EVENT_SPELL_ENRAGE:
Talk(EMOTE_ENRAGE);
@@ -263,4 +263,3 @@ void AddSC_boss_gluth()
new boss_gluth();
new spell_gluth_decimate();
}
src/server/scripts/Northrend/Naxxramas/boss_gothik.cpp
+6 -6
View File
@@ -389,15 +389,15 @@ public:
{
case EVENT_INTRO_2:
Talk(SAY_INTRO_2);
break;
case EVENT_INTRO_3:
Talk(SAY_INTRO_3);
break;
case EVENT_INTRO_4:
Talk(SAY_INTRO_4);
break;
case EVENT_SPELL_SHADOW_BOLT:
me->CastSpell(me->GetVictim(), RAID_MODE(SPELL_SHADOW_BOLT_10, SPELL_SHADOW_BOLT_25), false);
@@ -429,7 +429,7 @@ public:
go->SetGoState(GO_STATE_ACTIVE);
events.CancelEvent(EVENT_TELEPORT);
break;
}
events.RepeatEvent(1000);
@@ -455,7 +455,7 @@ public:
events.ScheduleEvent(EVENT_SPELL_HARVEST_SOUL, urand(5000, 15000));
events.ScheduleEvent(EVENT_TELEPORT, 20000);
events.ScheduleEvent(EVENT_CHECK_HEALTH, 1000);
}
waveCount++;
@@ -471,7 +471,7 @@ public:
gateOpened = true;
Talk(EMOTE_GATE_OPENED);
}
break;
}
src/server/scripts/Northrend/Naxxramas/boss_grobbulus.cpp
+1 -1
View File
@@ -148,7 +148,7 @@ public:
break;
case EVENT_SPELL_BERSERK:
me->CastSpell(me, SPELL_BERSERK, true);
break;
case EVENT_SPELL_SLIME_SPRAY:
Talk(EMOTE_SLIME);
src/server/scripts/Northrend/Naxxramas/boss_kelthuzad.cpp
+2 -3
View File
@@ -277,7 +277,7 @@ public:
go->SetPhaseMask(2, true);
}
}
break;
case EVENT_SUMMON_SOLDIER:
if (Creature* cr = me->SummonCreature(NPC_SOLDIER_OF_THE_FROZEN_WASTES, SummonPositions[urand(0, 5)], TEMPSUMMON_CORPSE_TIMED_DESPAWN, 20000))
@@ -527,7 +527,7 @@ public:
if (me->HealthBelowPct(35))
{
me->CastSpell(me, SPELL_FRENZY, true);
break;
}
events.RepeatEvent(1000);
@@ -618,7 +618,6 @@ public:
}
};
void AddSC_boss_kelthuzad()
{
new boss_kelthuzad();
src/server/scripts/Northrend/Naxxramas/boss_loatheb.cpp
+1 -1
View File
@@ -140,7 +140,7 @@ public:
break;
case EVENT_SPELL_BERSERK:
me->CastSpell(me, SPELL_BERSERK, true);
break;
}
src/server/scripts/Northrend/Naxxramas/boss_maexxna.cpp
+1 -3
View File
@@ -169,7 +169,7 @@ public:
if (me->GetHealthPct() < 30)
{
me->CastSpell(me, RAID_MODE(SPELL_FRENZY_10, SPELL_FRENZY_25), true);
break;
}
@@ -198,7 +198,6 @@ public:
};
};
class boss_maexxna_webwrap : public CreatureScript
{
public:
@@ -236,4 +235,3 @@ void AddSC_boss_maexxna()
new boss_maexxna();
new boss_maexxna_webwrap();
}
src/server/scripts/Northrend/Naxxramas/boss_patchwerk.cpp
+2 -2
View File
@@ -157,7 +157,7 @@ public:
Talk(EMOTE_BERSERK);
me->CastSpell(me, SPELL_BERSERK, true);
events.ScheduleEvent(EVENT_SPELL_SLIME_BOLT, 2000);
break;
case EVENT_SPELL_SLIME_BOLT:
me->CastSpell(me, SPELL_SLIME_BOLT, false);
@@ -168,7 +168,7 @@ public:
{
Talk(EMOTE_ENRAGE);
me->CastSpell(me, SPELL_FRENZY, true);
break;
}
events.RepeatEvent(1000);
src/server/scripts/Northrend/Naxxramas/boss_razuvious.cpp
-1
View File
@@ -27,7 +27,6 @@ enum Spells
SPELL_BLOOD_STRIKE = 61696,
};
enum Events
{
EVENT_SPELL_UNBALANCING_STRIKE = 1,
src/server/scripts/Northrend/Naxxramas/boss_sapphiron.cpp
+3 -3
View File
@@ -238,7 +238,7 @@ public:
{
case EVENT_BERSERK:
Talk(EMOTE_ENRAGE);
me->CastSpell(me, SPELL_BERSERK, true);
me->CastSpell(me, SPELL_BERSERK, true);
return;
case EVENT_SPELL_CLEAVE:
me->CastSpell(me->GetVictim(), SPELL_CLEAVE, false);
@@ -268,7 +268,7 @@ public:
case EVENT_FLIGHT_START:
if (me->HealthBelowPct(11))
{
return;
}
events.RepeatEvent(45000);
@@ -352,7 +352,7 @@ public:
me->SetDisableGravity(false);
me->SetHover(false);
events.ScheduleEvent(EVENT_GROUND, 1500);
return;
case EVENT_GROUND:
src/server/scripts/Northrend/Naxxramas/boss_thaddius.cpp
+3 -3
View File
@@ -262,7 +262,7 @@ public:
StartEvent();
break;
case EVENT_THADDIUS_START_2:
Talk(SAY_AGGRO);
me->SetReactState(REACT_AGGRESSIVE);
me->SetControlled(false, UNIT_STATE_STUNNED);
@@ -276,7 +276,7 @@ public:
return;
case EVENT_THADDIUS_SPELL_BERSERK:
me->CastSpell(me, SPELL_BERSERK, true);
break;
case EVENT_THADDIUS_SPELL_CHAIN_LIGHTNING:
me->CastSpell(me->GetVictim(), RAID_MODE(SPELL_CHAIN_LIGHTNING_10, SPELL_CHAIN_LIGHTNING_25), false);
@@ -288,7 +288,7 @@ public:
break;
case EVENT_ACTIVATE_BALL_LIGHTNING:
ballLightningEnabled = true;
break;
}
src/server/scripts/Northrend/Naxxramas/instance_naxxramas.cpp
+1 -2
View File
@@ -620,7 +620,6 @@ public:
_horsemanTimer = 0;
}
if (!InstanceScript::SetBossState(bossId, state))
return false;
@@ -822,7 +821,7 @@ public:
if (Creature* kelthuzad = instance->GetCreature(_kelthuzadGUID))
kelthuzad->AI()->Talk(_currentWingTaunt);
++_currentWingTaunt;
break;
}
}
src/server/scripts/Northrend/Naxxramas/naxxramas.h
-1
View File
@@ -161,4 +161,3 @@ enum NXEvents
};
#endif
src/server/scripts/Northrend/Nexus/EyeOfEternity/boss_malygos.cpp
+2 -13
View File
@@ -181,7 +181,6 @@ enum MalygosLightOverrides
LIGHT_OBSCURE_ARCANE_RUNES = 1825,
};
class boss_malygos : public CreatureScript
{
public:
@@ -378,7 +377,7 @@ public:
case EVENT_BERSERK:
me->CastSpell(me, SPELL_BERSERK, true);
Talk(EMOTE_BERSERK);
break;
case EVENT_INTRO_MOVE_CENTER:
{
@@ -537,7 +536,7 @@ public:
}
case EVENT_VORTEX_LAND_0:
me->GetMotionMaster()->MoveLand(MI_POINT_VORTEX_LAND, CenterPos, 7.0f);
break;
case EVENT_VORTEX_LAND_1:
{
@@ -842,7 +841,6 @@ public:
};
};
#define VORTEX_DEFAULT_DIFF 250
#define VORTEX_TRAVEL_TIME 3000
//#define VORTEX_RADIUS 25.0f
@@ -945,7 +943,6 @@ public:
};
};
class npc_power_spark : public CreatureScript
{
public:
@@ -1042,7 +1039,6 @@ public:
};
};
class npc_nexus_lord : public CreatureScript
{
public:
@@ -1136,7 +1132,6 @@ public:
};
};
class npc_scion_of_eternity : public CreatureScript
{
public:
@@ -1211,7 +1206,6 @@ public:
};
};
class npc_hover_disk : public CreatureScript
{
public:
@@ -1354,7 +1348,6 @@ public:
};
};
class npc_alexstrasza : public CreatureScript
{
public:
@@ -1412,7 +1405,6 @@ public:
};
};
class npc_eoe_wyrmrest_skytalon : public CreatureScript
{
public:
@@ -1449,7 +1441,6 @@ public:
};
};
class go_the_focusing_iris : public GameObjectScript
{
public:
@@ -1467,7 +1458,6 @@ public:
}
};
class spell_eoe_ph3_surge_of_power : public SpellScriptLoader
{
public:
@@ -1525,7 +1515,6 @@ public:
}
};
void AddSC_boss_malygos()
{
new boss_malygos();
src/server/scripts/Northrend/Nexus/Oculus/boss_drakos.cpp
+1 -1
View File
@@ -161,7 +161,7 @@ public:
float angle = rand_norm() * 2 * M_PI;
me->SummonCreature(NPC_UNSTABLE_SPHERE, me->GetPositionX() + 5.0f * cos(angle), me->GetPositionY() + 5.0f * sin(angle), me->GetPositionZ(), 0.0f, TEMPSUMMON_TIMED_DESPAWN, 18000);
}
break;
}
}
src/server/scripts/Northrend/Nexus/Oculus/instance_oculus.cpp
-1
View File
@@ -221,7 +221,6 @@ public:
return 0;
}
std::string GetSaveData() override
{
OUT_SAVE_INST_DATA;
src/server/scripts/Northrend/Ulduar/HallsOfLightning/boss_bjarngrim.cpp
-1
View File
@@ -419,7 +419,6 @@ public:
};
};
void AddSC_boss_bjarngrim()
{
new boss_bjarngrim();
src/server/scripts/Northrend/Ulduar/HallsOfLightning/instance_halls_of_lightning.cpp
-1
View File
@@ -180,7 +180,6 @@ public:
return saveStream.str();
}
void Load(const char* in) override
{
if (!in)
src/server/scripts/Northrend/Ulduar/HallsOfStone/boss_krystallus.cpp
-1
View File
@@ -165,7 +165,6 @@ public:
};
};
class spell_krystallus_shatter : public SpellScriptLoader
{
public:
src/server/scripts/Northrend/Ulduar/HallsOfStone/brann_bronzebeard.cpp
-1
View File
@@ -497,7 +497,6 @@ public:
me->SetUInt32Value(UNIT_NPC_FLAGS, UNIT_NPC_FLAG_GOSSIP | UNIT_NPC_FLAG_QUESTGIVER);
// Spawn Chest and quest credit
if (Player* plr = SelectTargetFromPlayerList(200.0f))
{
src/server/scripts/Northrend/Ulduar/HallsOfStone/instance_halls_of_stone.cpp
-1
View File
@@ -119,7 +119,6 @@ public:
}
}
void OnCreatureCreate(Creature* creature) override
{
switch(creature->GetEntry())
src/server/scripts/Northrend/Ulduar/Ulduar/boss_algalon_the_observer.cpp
-1
View File
@@ -2,7 +2,6 @@
* Originally written by Xinef - Copyright (C) 2016+ AzerothCore <www.azerothcore.org>, released under GNU AGPL v3 license: https://github.com/azerothcore/azerothcore-wotlk/blob/master/LICENSE-AGPL3
*/
#include "ObjectMgr.h"
#include "ScriptMgr.h"
#include "ScriptedCreature.h"
src/server/scripts/Northrend/Ulduar/Ulduar/boss_assembly_of_iron.cpp
-2
View File
@@ -66,7 +66,6 @@ enum AssemblySpells
#define SPELL_LIGHTNING_WHIRL RAID_MODE(SPELL_LIGHTNING_WHIRL_10, SPELL_LIGHTNING_WHIRL_25)
#define SPELL_LIGHTNING_TENDRILS RAID_MODE(SPELL_LIGHTNING_TENDRILS_10, SPELL_LIGHTNING_TENDRILS_25)
enum eEnums
{
// Steelbreaker
@@ -831,7 +830,6 @@ public:
};
};
class spell_shield_of_runes : public SpellScriptLoader
{
public:
src/server/scripts/Northrend/Ulduar/Ulduar/boss_flame_leviathan.cpp
-2
View File
@@ -1669,7 +1669,6 @@ public:
}
}
void HandleScript(SpellEffIndex /*eff*/)
{
Creature* target = GetHitCreature();
@@ -2027,7 +2026,6 @@ public:
}
};
class spell_demolisher_ride_vehicle : public SpellScriptLoader
{
public:
src/server/scripts/Northrend/Ulduar/Ulduar/boss_freya.cpp
-2
View File
@@ -42,7 +42,6 @@ enum FreyaSpells
SPELL_UNSTABLE_SUN_FREYA_DAMAGE_25 = 62865,
SPELL_UNSTABLE_SUN_VISUAL = 62216,
// ELDERS
SPELL_DRAINED_OF_POWER = 62467,
SPELL_STONEBARK_ESSENCE = 62483,
@@ -1055,7 +1054,6 @@ public:
};
};
class boss_freya_healthy_spore : public CreatureScript
{
public:
src/server/scripts/Northrend/Ulduar/Ulduar/boss_general_vezax.cpp
-1
View File
@@ -94,7 +94,6 @@ enum VezaxEvents
#define TEXT_VEZAX_DEATH "Oh, what horrors await...."
#define TEXT_VEZAX_HARDMODE "Behold, now! Terror, absolute!"
class boss_vezax : public CreatureScript
{
public:
src/server/scripts/Northrend/Ulduar/Ulduar/boss_hodir.cpp
-1
View File
@@ -363,7 +363,6 @@ public:
}
}
void UpdateAI(uint32 diff) override
{
if (addSpawnTimer <= diff)
src/server/scripts/Northrend/Ulduar/Ulduar/boss_ignis.cpp
-1
View File
@@ -76,7 +76,6 @@ enum eEvents
EVENT_GRAB,
};
class npc_ulduar_iron_construct : public CreatureScript
{
public:
src/server/scripts/Northrend/Ulduar/Ulduar/boss_kologarn.cpp
-1
View File
@@ -635,7 +635,6 @@ public:
};
};
// predicate function to select non main tank target
class StoneGripTargetSelector : public acore::unary_function<Unit*, bool>
{
src/server/scripts/Northrend/Ulduar/Ulduar/boss_mimiron.cpp
-9
View File
@@ -71,7 +71,6 @@ enum SpellData
SPELL_SLEEP = 64394,
};
enum NPCs
{
//NPC_MIMIRON = 33350,
@@ -87,7 +86,6 @@ enum NPCs
NPC_MAGNETIC_CORE = 34068,
};
enum GOs
{
//GO_MIMIRON_ELEVATOR = 194749,
@@ -98,7 +96,6 @@ enum GOs
// pads: 194740-48
};
enum HardMode
{
SPELL_EMERGENCY_MODE = 64582,
@@ -130,7 +127,6 @@ enum HardMode
SPELL_ENTER_VEHICLE_4 = 63316,
};
enum EVENTS
{
// Mimiron:
@@ -203,7 +199,6 @@ enum EVENTS
EVENT_EMERGENCY_BOT_ATTACK = 70,
};
enum SOUNDS
{
SOUND_TANK_INTRO = 15611,
@@ -227,7 +222,6 @@ enum SOUNDS
SOUND_TANK_HARD_INTRO = 15629,
};
#define SPELL_NAPALM_SHELL RAID_MODE(SPELL_NAPALM_SHELL_10, SPELL_NAPALM_SHELL_25)
#define SPELL_PLASMA_BLAST RAID_MODE(SPELL_PLASMA_BLAST_10, SPELL_PLASMA_BLAST_25)
#define SPELL_MINE_EXPLOSION RAID_MODE(SPELL_MINE_EXPLOSION_10, SPELL_MINE_EXPLOSION_25)
@@ -236,7 +230,6 @@ enum SOUNDS
#define SPELL_HAND_PULSE_L RAID_MODE(SPELL_HAND_PULSE_10_L, SPELL_HAND_PULSE_25_L)
#define SPELL_FROST_BOMB_EXPLOSION RAID_MODE(SPELL_FROST_BOMB_EXPLOSION_10, SPELL_FROST_BOMB_EXPLOSION_25)
#define TEXT_AGGRO "Oh, my! I wasn't expecting company! The workshop is such a mess! How embarrassing!"
#define TEXT_BERSERK "Oh, my! It would seem that we are out of time, my friends!"
#define TEXT_HARDMODE "Now why would you go and do something like that? Didn't you see the sign that said 'DO NOT PUSH THIS BUTTON!'? How will we finish testing with the self-destruct mechanism active?"
@@ -274,8 +267,6 @@ enum ComputerTalks
TALK_COMPUTER_ZERO = 12,
};
#define GetMimiron() ObjectAccessor::GetCreature(*me, pInstance->GetData64(TYPE_MIMIRON))
#define GetLMK2() ObjectAccessor::GetCreature(*me, pInstance->GetData64(DATA_MIMIRON_LEVIATHAN_MKII))
#define GetVX001() ObjectAccessor::GetCreature(*me, pInstance->GetData64(DATA_MIMIRON_VX001))
src/server/scripts/Northrend/Ulduar/Ulduar/boss_razorscale.cpp
-1
View File
@@ -70,7 +70,6 @@
#define TEXT_DEEP_BREATH "Razorscale takes a deep breath..."
#define TEXT_GROUNDED_PERMANENTLY "Razorscale grounded permanently!"
#define CORDS_GROUND 588.0f, -166.0f, 391.1f
#define CORDS_AIR 588.0f, -178.0f, 490.0f
#define REPAIR_POINTS 25
src/server/scripts/Northrend/Ulduar/Ulduar/boss_thorim.cpp
-1
View File
@@ -301,7 +301,6 @@ const Position Middle = {2134.68f, -263.13f, 419.44f, M_PI * 1.5f};
const uint32 RollTable[3] = { 32877, 32878, 32876 };
class boss_thorim : public CreatureScript
{
public:
src/server/scripts/Northrend/Ulduar/Ulduar/boss_xt002.cpp
-2
View File
@@ -95,7 +95,6 @@ enum Misc
{
HEART_VEHICLE_SEAT = 0,
ACTION_AWAKEN_HEART = -5,
ACTION_HIDE_HEART = -4,
ACTION_HEART_BROKEN = -3,
@@ -106,7 +105,6 @@ enum Misc
DATA_XT002_GRAVITY_ACHIEV = 51,
};
class boss_xt002 : public CreatureScript
{
public:
src/server/scripts/Northrend/Ulduar/Ulduar/boss_yoggsaron.cpp
-5
View File
@@ -285,7 +285,6 @@ enum Misc
ACTION_ILLUSION_ICECROWN = 2,
ACTION_ILLUSION_STORMWIND = 3,
EVENT_PHASE_ONE = 1,
EVENT_PHASE_TWO = 2,
EVENT_PHASE_THREE = 3,
@@ -319,7 +318,6 @@ static LocationsXY yoggPortalLoc[] =
const Position Middle = {1980.28f, -25.5868f, 329.397f, M_PI * 1.5f};
class boss_yoggsaron_sara : public CreatureScript
{
public:
@@ -1975,7 +1973,6 @@ public:
};
};
class boss_yoggsaron_llane : public CreatureScript
{
public:
@@ -2534,7 +2531,6 @@ public:
{
PrepareAuraScript(spell_yogg_saron_protective_gaze_AuraScript);
void CalculateAmount(AuraEffect const* /*aurEff*/, int32& amount, bool& /*canBeRecalculated*/)
{
// Set absorbtion amount to unlimited
@@ -2967,7 +2963,6 @@ private:
uint8 const _requiredIllusion;
};
class achievement_yogg_saron_kiss_and_make_up : public AchievementCriteriaScript
{
public:
src/server/scripts/Northrend/Ulduar/Ulduar/instance_ulduar.cpp
-3
View File
@@ -101,7 +101,6 @@ public:
uint64 m_keepersgateGUID;
uint64 m_keepersGossipGUID[4];
void Initialize() override
{
// Bosses
@@ -1017,7 +1016,6 @@ public:
OUT_LOAD_INST_DATA_COMPLETE;
}
void Update(uint32 diff) override
{
if (_events.Empty())
@@ -1139,7 +1137,6 @@ const Position vehiclePositions[30] =
{119.8f, -112.37f, 409.803f, 0.0f},
};
void instance_ulduar::instance_ulduar_InstanceMapScript::SpawnLeviathanEncounterVehicles(uint8 mode)
{
if (!_leviathanVehicles.empty())
src/server/scripts/Northrend/Ulduar/Ulduar/ulduar.cpp
-1
View File
@@ -411,7 +411,6 @@ public:
}
};
void AddSC_ulduar()
{
new npc_ulduar_keeper();
src/server/scripts/Northrend/Ulduar/Ulduar/ulduar.h
-2
View File
@@ -139,7 +139,6 @@ enum UlduarNPCs
NPC_SALVAGED_DEMOLISHER_TURRET = 33167,
NPC_BRANN_BASE_CAMP = 33579,
// Algalon the Observer
NPC_BRANN_BRONZBEARD_ALG = 34064,
NPC_AZEROTH = 34246,
@@ -252,7 +251,6 @@ enum UlduarMisc
ACTION_TOWER_OF_FLAMES_DESTROYED = 3,
ACTION_TOWER_OF_LIFE_DESTROYED = 4,
// Algalon the Observer
WORLD_STATE_ALGALON_DESPAWN_TIMER = 4131,
WORLD_STATE_ALGALON_TIMER_ENABLED = 4132,
src/server/scripts/Northrend/VaultOfArchavon/boss_archavon.cpp
+2 -3
View File
@@ -125,7 +125,7 @@ class boss_archavon : public CreatureScript
{
DoCast(target, SPELL_ROCK_SHARDS);
}
events.RepeatEvent(15000);
break;
case EVENT_CHOKING_CLOUD:
@@ -133,7 +133,7 @@ class boss_archavon : public CreatureScript
{
DoCast(target, RAID_MODE(SPELL_CRUSHING_LEAP_10, SPELL_CRUSHING_LEAP_25), true); //10y ~ 80y, ignore range
}
events.RepeatEvent(30000);
break;
case EVENT_STOMP:
@@ -216,7 +216,6 @@ class spell_archavon_rock_shards : public SpellScriptLoader
}
};
void AddSC_boss_archavon()
{
new boss_archavon();
src/server/scripts/Northrend/VaultOfArchavon/boss_toravon.cpp
-2
View File
@@ -36,7 +36,6 @@ enum Events
EVENT_CAST_WHITEOUT = 3,
EVENT_CAST_WHITEOUT_GROUND_EFFECT = 4,
};
enum Misc
@@ -45,7 +44,6 @@ enum Misc
NPC_FROZEN_ORB_STALKER = 38461,
};
class boss_toravon : public CreatureScript
{
public:
src/server/scripts/Northrend/VaultOfArchavon/vault_of_archavon.h
-1
View File
@@ -25,7 +25,6 @@ enum Data
DATA_STONED = 5,
};
enum AchievementCriteriaIds
{
CRITERIA_EARTH_WIND_FIRE_10 = 12018,
src/server/scripts/Northrend/VioletHold/boss_cyanigosa.cpp
+1 -2
View File
@@ -94,7 +94,6 @@ public:
}
}
void UpdateAI(uint32 diff) override
{
if (!UpdateVictim())
@@ -119,7 +118,7 @@ public:
break;
case EVENT_UNROOT:
me->SetControlled(false, UNIT_STATE_ROOT);
break;
case EVENT_SPELL_BLIZZARD:
if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0, 45.0f, true))
src/server/scripts/Northrend/VioletHold/boss_erekem.cpp
-2
View File
@@ -34,7 +34,6 @@ enum Yells
SAY_BOTH_ADDS_KILLED = 5
};
enum eEvents
{
EVENT_SPELL_BLOODLUST = 1,
@@ -220,7 +219,6 @@ enum eGuardEvents
EVENT_SPELL_STRIKE
};
class npc_erekem_guard : public CreatureScript
{
public:
src/server/scripts/Northrend/VioletHold/boss_ichoron.cpp
-2
View File
@@ -291,8 +291,6 @@ public:
};
};
class npc_ichor_globule : public CreatureScript
{
public:
src/server/scripts/Northrend/VioletHold/violet_hold.cpp
-3
View File
@@ -542,8 +542,6 @@ public:
};
};
class npc_azure_binder : public CreatureScript
{
public:
@@ -1162,7 +1160,6 @@ public:
}
};
class go_violet_hold_gate_lever : public GameObjectScript
{
public:
src/server/scripts/Northrend/zone_borean_tundra.cpp
-1
View File
@@ -85,7 +85,6 @@ public:
}
};
// Theirs
/*######
## npc_sinkhole_kill_credit
src/server/scripts/Northrend/zone_dalaran.cpp
-1
View File
@@ -711,7 +711,6 @@ public:
};
};
class npc_dalaran_warrior : public CreatureScript
{
public:
src/server/scripts/Northrend/zone_dragonblight.cpp
-4
View File
@@ -261,7 +261,6 @@ public:
}
};
enum hourglass
{
NPC_FUTURE_HOURGLASS = 27840,
@@ -338,7 +337,6 @@ public:
Player* getSummoner() { return ObjectAccessor::GetPlayer(*me, summonerGUID); }
Creature* getFuture() { return ObjectAccessor::GetCreature(*me, futureGUID); }
uint32 randEntry()
{
return NPC_INFINITE_ASSAILANT + urand(0, 2);
@@ -1384,8 +1382,6 @@ public:
};
};
// Theirs
/*#####
src/server/scripts/Northrend/zone_grizzly_hills.cpp
-2
View File
@@ -72,7 +72,6 @@ public:
}
};
// Theirs
/*######
@@ -305,7 +304,6 @@ public:
void MoveInLineOfSight(Unit* /*who*/) override { }
void UpdateAI(uint32 /*diff*/) override
{
if (!UpdateVictim())
src/server/scripts/Northrend/zone_howling_fjord.cpp
-1
View File
@@ -136,7 +136,6 @@ public:
}
};
// Theirs
/*######
## npc_apothecary_hanes
src/server/scripts/Northrend/zone_icecrown.cpp
-3
View File
@@ -1033,7 +1033,6 @@ enum infraGreenBomberQuests
SPELL_WAITING_FOR_A_BOMBER = 59563,
SPELL_FLIGHT_ORDERS = 61281,
EVENT_TAKE_PASSENGER = 1,
EVENT_START_FLIGHT = 2,
EVENT_CHECK_PATH_REGEN_HEALTH_BURN_DAMAGE = 3,
@@ -1416,7 +1415,6 @@ public:
}
};
// Theirs
/*######
## npc_guardian_pavilion
@@ -1755,7 +1753,6 @@ public:
void MoveInLineOfSight(Unit* /*who*/) override { }
void JustSummoned(Creature* Summoned) override
{
Summons.Summon(Summoned);
src/server/scripts/Northrend/zone_sholazar_basin.cpp
-2
View File
@@ -260,7 +260,6 @@ public:
}
};
/******
quest Still At It (12644)
******/
@@ -540,7 +539,6 @@ public:
}
};
// Theirs
/*######
## npc_vekjik
src/server/scripts/Northrend/zone_storm_peaks.cpp
-1
View File
@@ -684,7 +684,6 @@ public:
};
};
// Theirs
/*######
## npc_roxi_ramrocket
src/server/scripts/Northrend/zone_wintergrasp.cpp
-2
View File
@@ -759,7 +759,6 @@ public:
(go->GetUInt32Value(GAMEOBJECT_FACTION) == WintergraspFaction[TEAM_ALLIANCE] && passenger->getRaceMask() & RACEMASK_ALLIANCE));
}
Creature* IsValidVehicle(Creature* cVeh)
{
if (!cVeh->HasAura(SPELL_VEHICLE_TELEPORT))
@@ -1036,7 +1035,6 @@ public:
}
};
////////////////////////////////////////////////
/////// ACHIEVEMENTs
////////////////////////////////////////////////
src/server/scripts/Northrend/zone_zuldrak.cpp
-4
View File
@@ -31,7 +31,6 @@ const char* AA_ITEM_NAME[24] = {"Crystallized Hogsnot", "Ghoul Drool", "Trollb
"Frozen Spider Ichor", "Prismatic Mojo", "Raptor Claw"
};
class npc_finklestein : public CreatureScript
{
public:
@@ -744,7 +743,6 @@ public:
}
};
// Theirs
/*####
## npc_released_offspring_harkoa
@@ -894,8 +892,6 @@ public:
}
};
enum StormCloud
{
STORM_COULD = 29939,