Kitzunu
2021-01-10 14:27:55 +01:00
committed by GitHub
parent 7cf097eab2
commit da4edd547d
315 changed files with 3 additions and 729 deletions

View File

@@ -221,7 +221,6 @@ public:
stmt->setUInt32(0, delInfo.lowGuid);
if (PreparedQueryResult result = CharacterDatabase.Query(stmt))
sWorld->AddGlobalPlayerData(delInfo.lowGuid, delInfo.accountId, delInfo.name, (*result)[2].GetUInt8(), (*result)[0].GetUInt8(), (*result)[1].GetUInt8(), (*result)[3].GetUInt8(), 0, 0);
}
static void HandleCharacterLevel(Player* player, uint64 playerGuid, uint32 oldLevel, uint32 newLevel, ChatHandler* handler)

View File

@@ -14,7 +14,6 @@ public:
std::vector<ChatCommand> GetCommands() const override
{
static std::vector<ChatCommand> cheatCommandTable =
{
{ "god", SEC_GAMEMASTER, false, &HandleGodModeCheatCommand, "" },
@@ -25,13 +24,11 @@ public:
{ "status", SEC_GAMEMASTER, false, &HandleCheatStatusCommand, "" },
{ "taxi", SEC_GAMEMASTER, false, &HandleTaxiCheatCommand, "" },
{ "explore", SEC_GAMEMASTER, false, &HandleExploreCheatCommand, "" },
};
static std::vector<ChatCommand> commandTable =
{
{ "cheat", SEC_GAMEMASTER, false, nullptr, "", cheatCommandTable },
};
return commandTable;
}

View File

@@ -655,7 +655,6 @@ public:
if (!object)
{
handler->PSendSysMessage(LANG_COMMAND_OBJNOTFOUND, abs(guidLow));
handler->SetSentErrorMessage(true);
return false;

View File

@@ -1216,7 +1216,6 @@ public:
//Not a supported argument
return false;
}
static bool HandleLinkGraveCommand(ChatHandler* handler, char const* args)

View File

@@ -223,7 +223,6 @@ public:
static bool HandleWpUnLoadCommand(ChatHandler* handler, const char* /*args*/)
{
Creature* target = handler->getSelectedCreature();
if (!target)
@@ -877,7 +876,6 @@ public:
creature->DeleteFromDB();
creature->AddObjectToRemoveList();
}
} while (result2->NextRow());
if (hasError)

View File

@@ -92,7 +92,6 @@ public:
void UpdateAI(uint32 diff) override
{
if (!SummonedRend && HealthBelowPct(25))
{
DoCast(me, SPELL_SUMMON_REND);

View File

@@ -80,7 +80,6 @@ public:
DoMeleeAttackIfReady();
}
};
};
void AddSC_boss_highlordomokk()

View File

@@ -367,7 +367,6 @@ public:
void UpdateAI(uint32 diff) override
{
if (!UpdateVictim())
{
_events.Update(diff);
@@ -383,7 +382,6 @@ public:
if (Creature* Emberseer = me->FindNearestCreature(NPC_PYROGAURD_EMBERSEER, 30.0f, true))
DoCast(Emberseer, SPELL_ENCAGE_EMBERSEER);
break;
}
}
}

View File

@@ -87,7 +87,6 @@ public:
DoMeleeAttackIfReady();
}
};
};
void AddSC_boss_shadowvosh()

View File

@@ -238,7 +238,6 @@ public:
{
DoCast(player, SPELL_CHROMATIC_MUT_1);
}
}
}
}

View File

@@ -457,7 +457,6 @@ public:
me->GetCreatureListWithEntryInGrid(constructList, NPC_BONE_CONSTRUCT, 500.0f);
for (std::list<Creature*>::const_iterator itr = constructList.begin(); itr != constructList.end(); ++itr)
(*itr)->DespawnOrUnsummon();
}
else DespawnTimer -= diff;
@@ -575,7 +574,6 @@ public:
bool canDespawn;
uint32 DespawnTimer;
bool Phase3;
};
CreatureAI* GetAI(Creature* creature) const override

View File

@@ -254,7 +254,6 @@ public:
_hasSubmergedOnce = true;
_isBanished = true;
_emergeTimer = 90000;
}
else
{

View File

@@ -436,7 +436,6 @@ public:
OnEffectApply += AuraEffectApplyFn(spell_midnight_fixate_AuraScript::HandleEffectApply, EFFECT_0, SPELL_AURA_DUMMY, AURA_EFFECT_HANDLE_REAL);
OnEffectRemove += AuraEffectRemoveFn(spell_midnight_fixate_AuraScript::HandleEffectRemove, EFFECT_0, SPELL_AURA_DUMMY, AURA_EFFECT_HANDLE_REAL);
}
};
AuraScript* GetAuraScript() const override

View File

@@ -265,7 +265,6 @@ public:
GetCaster()->RemoveAurasDueToSpell(SPELL_VANISH);
GetCaster()->NearTeleportTo(pos.GetPositionX(), pos.GetPositionY(), pos.GetPositionZ(), target->GetOrientation());
}
}
void Register() override

View File

@@ -416,7 +416,6 @@ public:
}
}
};
};
class go_blackened_urn : public GameObjectScript

View File

@@ -195,7 +195,6 @@ public:
clearweapons();
positions.clear();
instance->HandleGameObject(instance->GetData64(DATA_GO_NETHER_DOOR), true);
}
void clearweapons()
@@ -439,7 +438,6 @@ public:
DoMeleeAttackIfReady();
}
};
};
@@ -455,7 +453,6 @@ public:
struct prince_axesAI : public ScriptedAI
{
prince_axesAI(Creature* creature) : ScriptedAI(creature)
{
Initialize();

View File

@@ -132,7 +132,6 @@ public:
instance->SetData(DATA_ARAN, DONE);
instance->HandleGameObject(instance->GetData64(DATA_GO_LIBRARY_DOOR), true);
}
void EnterCombat(Unit* /*who*/) override
@@ -142,7 +141,6 @@ public:
instance->SetData(DATA_ARAN, IN_PROGRESS);
instance->HandleGameObject(instance->GetData64(DATA_GO_LIBRARY_DOOR), false);
DoZoneInCombat();
}
void FlameWreathEffect()
@@ -570,7 +568,6 @@ public:
{
water_elementalAI(Creature* creature) : ScriptedAI(creature)
{
}
uint32 CastTimer;

View File

@@ -555,12 +555,10 @@ public:
default:
return 2000;
}
}
void UpdateAI(uint32 diff) override
{
if (YellTimer <= diff)
{
if (EventStarted)
@@ -587,7 +585,6 @@ public:
}
}
};
};
void AddSC_karazhan()

View File

@@ -385,7 +385,6 @@ struct boss_priestess_lackey_commonAI : public ScriptedAI
RecalculateThreat();
events.ScheduleEvent(EVENT_HELPER_RESET_THREAT, urand(8000, 10000));
break;
}
}
};
@@ -520,7 +519,6 @@ public:
struct boss_ellris_duskhallowAI : public boss_priestess_lackey_commonAI
{
boss_ellris_duskhallowAI(Creature* creature) : boss_priestess_lackey_commonAI(creature, AI_TYPE_RANGED) { }
void EnterCombat(Unit* who) override

View File

@@ -911,7 +911,6 @@ public:
return false;
}
};
/*####
@@ -974,7 +973,6 @@ public:
miner->DisappearAndDie();
}
};
};
/*####
@@ -1120,7 +1118,6 @@ public:
npc_escortAI::UpdateAI(diff);
}
};
};
/*######
@@ -1158,7 +1155,6 @@ public:
return true;
}
};
void AddSC_the_scarlet_enclave_c1()

View File

@@ -138,7 +138,6 @@ public:
++speechCounter;
DoCastAOE(SPELL_THREAT_PULSE, true);
}
else
speechTimer -= diff;
@@ -149,7 +148,6 @@ public:
CombatAI::UpdateAI(diff);
}
};
};
/*######
@@ -479,7 +477,6 @@ public:
DoMeleeAttackIfReady();
}
};
};
//Koltira & Valroth- Breakout
@@ -568,7 +565,6 @@ public:
killer->CastSpell(me, SPELL_SUMMON_VALROTH_REMAINS, true);
}
};
};
/*######

View File

@@ -112,7 +112,6 @@ public:
else FlyBackTimer -= diff;
}
};
};
void AddSC_the_scarlet_enclave()

View File

@@ -187,7 +187,6 @@ public:
OnEffectApply += AuraEffectApplyFn(spell_scholomance_fixate_AuraScript::HandleEffectApply, EFFECT_0, SPELL_AURA_DUMMY, AURA_EFFECT_HANDLE_REAL);
OnEffectRemove += AuraEffectRemoveFn(spell_scholomance_fixate_AuraScript::HandleEffectRemove, EFFECT_0, SPELL_AURA_DUMMY, AURA_EFFECT_HANDLE_REAL);
}
};
AuraScript* GetAuraScript() const override

View File

@@ -97,7 +97,6 @@ public:
private:
uint32 _encounters[MAX_ENCOUNTERS];
};
};
class spell_shadowfang_keep_haunting_spirits : public SpellScriptLoader

View File

@@ -137,7 +137,6 @@ public:
baron->AI()->Talk(SAY_BARON_GUARD_DEAD);
if (GameObject* gate = instance->GetGameObject(_zigguratDoorsGUID5))
gate->SetGoState(GO_STATE_ACTIVE);
}
}

View File

@@ -508,7 +508,6 @@ public:
class AreaTrigger_at_sunwell_madrigosa : public AreaTriggerScript
{
public:
AreaTrigger_at_sunwell_madrigosa() : AreaTriggerScript("at_sunwell_madrigosa") {}
bool OnTrigger(Player* player, AreaTrigger const* /*trigger*/) override

View File

@@ -483,7 +483,6 @@ public:
class AreaTrigger_at_sunwell_eredar_twins : public AreaTriggerScript
{
public:
AreaTrigger_at_sunwell_eredar_twins() : AreaTriggerScript("at_sunwell_eredar_twins") {}
bool OnTrigger(Player* player, AreaTrigger const* /*trigger*/) override

View File

@@ -364,7 +364,6 @@ public:
case EVENT_LAND_FIGHT:
me->GetMotionMaster()->MovePoint(POINT_GROUND, 1500.0f, 552.8f, 26.52f, false, true);
break;
}
if (!me->HasUnitMovementFlag(MOVEMENTFLAG_DISABLE_GRAVITY))

View File

@@ -619,7 +619,6 @@ public:
me->CastSpell(me, SPELL_ARMAGEDDON_PERIODIC, true);
events.ScheduleEvent(EVENT_SPELL_ARMAGEDDON, phase == PHASE_SACRIFICE ? 20000 : 40000);
break;
}
DoMeleeAttackIfReady();

View File

@@ -363,7 +363,6 @@ public:
DoMeleeAttackIfReady();
}
};
CreatureAI* GetAI(Creature* creature) const override

View File

@@ -114,7 +114,6 @@ enum Spells
// Koragg
SPELL_COLD_STARE = 43593,
SPELL_MIGHTY_BLOW = 43592
};
#define ORIENT 1.5696f
@@ -237,7 +236,6 @@ struct boss_hexlord_addAI : public ScriptedAI
class boss_hexlord_malacrass : public CreatureScript
{
public:
boss_hexlord_malacrass()
: CreatureScript("boss_hexlord_malacrass")
{
@@ -507,7 +505,6 @@ public:
class boss_thurg : public CreatureScript
{
public:
boss_thurg()
: CreatureScript("boss_thurg")
{
@@ -515,7 +512,6 @@ public:
struct boss_thurgAI : public boss_hexlord_addAI
{
boss_thurgAI(Creature* creature) : boss_hexlord_addAI(creature) { }
uint32 bloodlust_timer;
@@ -707,7 +703,6 @@ struct boss_gazakrothAI : public boss_hexlord_addAI
class boss_lord_raadan : public CreatureScript
{
public:
boss_lord_raadan()
: CreatureScript("boss_lord_raadan")
{
@@ -726,7 +721,6 @@ public:
thunderclap_timer = 13000;
boss_hexlord_addAI::Reset();
}
void UpdateAI(uint32 diff) override
{
@@ -760,7 +754,6 @@ public:
class boss_darkheart : public CreatureScript
{
public:
boss_darkheart()
: CreatureScript("boss_darkheart")
{
@@ -802,7 +795,6 @@ public:
class boss_slither : public CreatureScript
{
public:
boss_slither()
: CreatureScript("boss_slither")
{
@@ -861,7 +853,6 @@ public:
class boss_fenstalker : public CreatureScript
{
public:
boss_fenstalker()
: CreatureScript("boss_fenstalker")
{
@@ -877,7 +868,6 @@ public:
{
volatileinf_timer = 15000;
boss_hexlord_addAI::Reset();
}
void UpdateAI(uint32 diff) override
{
@@ -905,7 +895,6 @@ public:
class boss_koragg : public CreatureScript
{
public:
boss_koragg()
: CreatureScript("boss_koragg")
{
@@ -923,7 +912,6 @@ public:
coldstare_timer = 15000;
mightyblow_timer = 10000;
boss_hexlord_addAI::Reset();
}
void UpdateAI(uint32 diff) override
{

View File

@@ -99,7 +99,6 @@ float hatcherway[2][5][3] =
class boss_janalai : public CreatureScript
{
public:
boss_janalai()
: CreatureScript("boss_janalai")
{
@@ -444,7 +443,6 @@ public:
class npc_janalai_firebomb : public CreatureScript
{
public:
npc_janalai_firebomb()
: CreatureScript("npc_janalai_firebomb")
{
@@ -480,7 +478,6 @@ public:
class npc_janalai_hatcher : public CreatureScript
{
public:
npc_janalai_hatcher()
: CreatureScript("npc_janalai_hatcher")
{
@@ -598,7 +595,6 @@ public:
}
else
me->DisappearAndDie();
}
else WaitTimer -= diff;
}
@@ -614,7 +610,6 @@ public:
class npc_janalai_hatchling : public CreatureScript
{
public:
npc_janalai_hatchling()
: CreatureScript("npc_janalai_hatchling")
{
@@ -697,7 +692,6 @@ public:
}
}
};
};
void AddSC_boss_janalai()

View File

@@ -64,13 +64,11 @@ enum Talks
SAY_DEATH,
SAY_NALORAKK_EVENT1, // Unimplemented
SAY_NALORAKK_EVENT2 // Unimplemented
};
class boss_nalorakk : public CreatureScript
{
public:
boss_nalorakk()
: CreatureScript("boss_nalorakk")
{
@@ -339,7 +337,6 @@ public:
inMove = false;
return;
}
}
}

View File

@@ -114,7 +114,6 @@ static TransformStruct Transform[4] =
class boss_zuljin : public CreatureScript
{
public:
boss_zuljin()
: CreatureScript("boss_zuljin")
{
@@ -560,7 +559,6 @@ public:
class npc_zuljin_vortex : public CreatureScript
{
public:
npc_zuljin_vortex()
: CreatureScript("npc_zuljin_vortex")
{

View File

@@ -392,7 +392,6 @@ public:
return 0;
}
};
InstanceScript* GetInstanceScript(InstanceMap* map) const override

View File

@@ -117,7 +117,6 @@ enum ForestFrog
class npc_forest_frog : public CreatureScript
{
public:
npc_forest_frog() : CreatureScript("npc_forest_frog") { }
struct npc_forest_frogAI : public ScriptedAI
@@ -584,7 +583,6 @@ enum Weapons
class npc_harrison_jones : public CreatureScript
{
public:
npc_harrison_jones() : CreatureScript("npc_harrison_jones")
{
}

View File

@@ -175,7 +175,6 @@ public:
class npc_healing_ward : public CreatureScript
{
public:
npc_healing_ward()
: CreatureScript("npc_healing_ward")
{
@@ -227,7 +226,6 @@ public:
class npc_shade_of_jindo : public CreatureScript
{
public:
npc_shade_of_jindo()
: CreatureScript("npc_shade_of_jindo")
{
@@ -249,7 +247,6 @@ public:
void UpdateAI(uint32 diff) override
{
//ShadowShock_Timer
if (ShadowShock_Timer <= diff)
{

View File

@@ -105,7 +105,6 @@ public:
{
if (me->GetPositionZ() > 140.0f)
{
killCount = 0;
events.ScheduleEvent(EVENT_CHECK_START, 1000);
if (Creature* speaker = ObjectAccessor::GetCreature(*me, instance->GetData64(NPC_VILEBRANCH_SPEAKER)))
@@ -175,7 +174,6 @@ public:
{
me->SetHomePosition(PosMandokir[0]);
instance->SetBossState(DATA_MANDOKIR, NOT_STARTED);
}
}
}

View File

@@ -400,7 +400,6 @@ public:
class npc_zealot_zath : public CreatureScript
{
public:
npc_zealot_zath()
: CreatureScript("npc_zealot_zath")
{

View File

@@ -45,7 +45,6 @@ enum CreatureIds
NPC_OHGAN = 14988, // Mandokir Event
NPC_VILEBRANCH_SPEAKER = 11391, // Mandokir Event
NPC_CHAINED_SPIRT = 15117 // Mandokir Event
};
enum GameobjectIds

View File

@@ -132,7 +132,6 @@ public:
{
return new npc_ranger_lilathaAI(creature);
}
};
void AddSC_ghostlands()

View File

@@ -761,7 +761,6 @@ public:
sayer->MonsterSay("SOMEONE TRY THIS SUPER BREW!", LANG_UNIVERSAL, 0);
//sayer->CastSpell(sayer, SPELL_CREATE_SUPER_BREW, true);
sayer->SummonCreature(NPC_SUPER_BREW_TRIGGER, sayer->GetPositionX() + 15 * cos(sayer->GetOrientation()), sayer->GetPositionY() + 15 * sin(sayer->GetOrientation()), sayer->GetPositionZ(), 0.0f, TEMPSUMMON_TIMED_OR_CORPSE_DESPAWN, 30000);
}
else
{
@@ -1325,7 +1324,6 @@ public:
else
target->CastSpell(target, SPELL_RAM_FATIGUE, true);
}
}
void HandleEffectRemove(AuraEffect const* /*aurEff*/, AuraEffectHandleModes /*mode*/)
@@ -1632,7 +1630,6 @@ public:
else if ((cr = caster->FindNearestCreature(NPC_NORMAL_GORDOK, 40.0f)))
cr->CastSpell(caster, SPELL_THROW_MUG_TO_PLAYER, true);
}
}
void Register() override

View File

@@ -218,7 +218,6 @@ public:
int8 phase;
uint64 playerGUID;
uint64 orphanGUID;
};
CreatureAI* GetAI(Creature* creature) const override
@@ -404,7 +403,6 @@ public:
uint8 phase;
uint64 playerGUID;
uint64 orphanGUID;
};
CreatureAI* GetAI(Creature* creature) const override
@@ -492,7 +490,6 @@ public:
int8 phase;
uint64 playerGUID;
uint64 orphanGUID;
};
CreatureAI* GetAI(Creature* creature) const override
@@ -579,7 +576,6 @@ public:
int8 phase;
uint64 playerGUID;
uint64 orphanGUID;
};
CreatureAI* GetAI(Creature* creature) const override
@@ -675,7 +671,6 @@ public:
int8 phase;
uint64 playerGUID;
uint64 orphanGUID;
};
CreatureAI* GetAI(Creature* creature) const override
@@ -835,7 +830,6 @@ public:
uint32 timer;
uint64 playerGUID;
uint64 orphanGUID;
};
CreatureAI* GetAI(Creature* creature) const override

View File

@@ -69,7 +69,6 @@ public:
go->SendCustomAnim(1);
}
}
}
};
@@ -230,7 +229,6 @@ public:
caster->CastSpell(caster, SPELL_APPLY_DIGUISE, true);
caster->setFaction(88);
}
}
void OnRemove(AuraEffect const* /*aurEff*/, AuraEffectHandleModes /*mode*/)

View File

@@ -325,7 +325,6 @@ public:
{
switch (passSpell)
{
case SPELL_PASS_TURKEY:
return SPELL_VISUAL_BOUNCE_TURKEY;
case SPELL_PASS_STUFFING:
@@ -342,7 +341,6 @@ public:
{
switch (passSpell)
{
case SPELL_PASS_TURKEY:
return SPELL_VISUAL_THROW_TURKEY;
case SPELL_PASS_STUFFING:

View File

@@ -161,7 +161,6 @@ public:
DoMeleeAttackIfReady();
}
};
};
class npc_towering_infernal : public CreatureScript
@@ -245,7 +244,6 @@ public:
DoMeleeAttackIfReady();
}
};
};
void AddSC_boss_anetheron()

View File

@@ -168,7 +168,6 @@ public:
DoMeleeAttackIfReady();
}
};
};
class npc_lesser_doomguard : public CreatureScript
@@ -265,7 +264,6 @@ public:
DoMeleeAttackIfReady();
}
};
};
void AddSC_boss_azgalor()

View File

@@ -152,7 +152,6 @@ public:
DoMeleeAttackIfReady();
}
};
};
class spell_mark_of_kazrogal : public SpellScriptLoader

View File

@@ -148,7 +148,6 @@ public:
DoMeleeAttackIfReady();
}
};
};
void AddSC_boss_rage_winterchill()

View File

@@ -112,7 +112,6 @@ public:
return ai;
}
};
class npc_thrall : public CreatureScript
@@ -193,7 +192,6 @@ public:
return ai;
}
};
class npc_tyrande_whisperwind : public CreatureScript
@@ -239,7 +237,6 @@ public:
SendGossipMenuFor(player, 907, creature->GetGUID());
return true;
}
};
void AddSC_hyjal()

View File

@@ -476,7 +476,6 @@ void hyjalAI::SummonCreature(uint32 entry, float Base[4][3])
default:
creature = me->SummonCreature(entry, SpawnLoc[0], SpawnLoc[1], SpawnLoc[2], 0, TEMPSUMMON_TIMED_OR_DEAD_DESPAWN, 120000);
break;
}
if (creature)
@@ -706,7 +705,6 @@ void hyjalAI::UpdateAI(uint32 diff)
HideNearPos(5037.76f, -1889.71f);
for (uint8 i = 0; i < 92; ++i)//summon fires
me->SummonGameObject(GO_ROARING_FLAME, AllianceFirePos[i][0], AllianceFirePos[i][1], AllianceFirePos[i][2], AllianceFirePos[i][3], AllianceFirePos[i][4], AllianceFirePos[i][5], AllianceFirePos[i][6], AllianceFirePos[i][7], 0);
}
else me->SetVisible(true);
break;
@@ -719,7 +717,6 @@ void hyjalAI::UpdateAI(uint32 diff)
HideNearPos(5542.2f, -2629.36f);
for (uint8 i = 0; i < 65; ++i)//summon fires
me->SummonGameObject(GO_ROARING_FLAME, HordeFirePos[i][0], HordeFirePos[i][1], HordeFirePos[i][2], HordeFirePos[i][3], HordeFirePos[i][4], HordeFirePos[i][5], HordeFirePos[i][6], HordeFirePos[i][7], 0);
}
else me->SetVisible(true);
break;

View File

@@ -135,7 +135,6 @@ float AllianceOverrunWP[55][3] = //waypoints in the alliance base used in the en
{5180.41f, -2121.87f, 1292.62f}, //52 garg target3
{5088.68f, -2432.04f, 1441.73f}, //53 garg target4
{5111.26f, -2454.73f, 1449.63f}//54 garg target5
};
float HordeOverrunWP[21][3] = //waypoints in the horde base used in the end in the cleaning wave
@@ -622,7 +621,6 @@ public:
DoMeleeAttackIfReady();
}
};
};
class npc_ghoul : public CreatureScript
@@ -723,7 +721,6 @@ public:
DoMeleeAttackIfReady();
}
};
};
class npc_necromancer : public CreatureScript
@@ -849,7 +846,6 @@ public:
DoMeleeAttackIfReady();
}
};
};
class npc_banshee : public CreatureScript
@@ -953,7 +949,6 @@ public:
DoMeleeAttackIfReady();
}
};
};
class npc_crypt_fiend : public CreatureScript
@@ -1041,7 +1036,6 @@ public:
DoMeleeAttackIfReady();
}
};
};
class npc_fel_stalker : public CreatureScript
@@ -1129,7 +1123,6 @@ public:
DoMeleeAttackIfReady();
}
};
};
class npc_frost_wyrm : public CreatureScript
@@ -1459,7 +1452,6 @@ public:
DoMeleeAttackIfReady();
}
};
};
void AddSC_hyjal_trash()

View File

@@ -275,7 +275,6 @@ public:
SaveToDB();
OUT_SAVE_INST_DATA_COMPLETE;
}
}
uint32 GetData(uint32 type) const override

View File

@@ -139,7 +139,6 @@ public:
Talk(SAY_SLAY);
}
};
};
void AddSC_boss_epoch()

View File

@@ -145,7 +145,6 @@ public:
DoMeleeAttackIfReady();
}
};
};
void AddSC_boss_infinite_corruptor()

View File

@@ -155,7 +155,6 @@ public:
DoMeleeAttackIfReady();
}
};
};
void AddSC_boss_mal_ganis()

View File

@@ -101,7 +101,6 @@ public:
DoMeleeAttackIfReady();
}
};
};
void AddSC_boss_meathook()

View File

@@ -145,7 +145,6 @@ public:
DoMeleeAttackIfReady();
}
};
};
class spell_boss_salramm_steal_flesh : public SpellScriptLoader

View File

@@ -647,7 +647,6 @@ public:
SetEscortPaused(true);
eventInRun = true;
break;
}
}
@@ -1427,7 +1426,6 @@ public:
arthas->AI()->Reset();
}
player->NearTeleportTo(LeaderIntroPos2.GetPositionX(), LeaderIntroPos2.GetPositionY(), LeaderIntroPos2.GetPositionZ(), LeaderIntroPos2.GetOrientation());
}
}

View File

@@ -166,7 +166,6 @@ public:
else if (Creature* arthas = instance->GetCreature(_arthasGUID))
Reposition(arthas);
return;
}
if (type == DATA_ARTHAS_EVENT)
@@ -256,7 +255,6 @@ public:
if (instance->IsHeroic() && _infiniteGUID)
if (Creature* cr = instance->GetCreature(_infiniteGUID))
cr->AI()->DoAction(ACTION_RUN_OUT_OF_TIME);
}
else if (div > divAfter)
{

View File

@@ -198,13 +198,11 @@ public:
me->CastSpell(me, SPELL_CONSECRATION, false);
events.ScheduleEvent(EVENT_SPELL_CONSECRATION, 20000);
break;
}
DoMeleeAttackIfReady();
}
};
};
void AddSC_boss_captain_skarloc()

View File

@@ -104,7 +104,6 @@ public:
DoMeleeAttackIfReady();
}
};
};
void AddSC_boss_epoch_hunter()

View File

@@ -150,7 +150,6 @@ public:
EventMap events;
Movement::PointsArray pathPoints;
};
};
void AddSC_boss_lieutenant_drake()

View File

@@ -22,7 +22,6 @@ const Position thrallPositions[THRALL_POSITIONS_COUNT] =
{2062.9f, 229.93f, 64.454f, 2.45f}, // After Captain Skarloc death
{2486.91f, 626.356f, 58.0761f, 0.0f}, // Arrived at Tarren Mill
{2660.47f, 659.223f, 62.0f, 5.78f} // Taretha Met
};
class instance_old_hillsbrad : public InstanceMapScript
@@ -339,7 +338,6 @@ public:
EventMap _events;
};
};
void AddSC_instance_old_hillsbrad()

View File

@@ -174,7 +174,6 @@ enum Events
EVENT_THRALL_TALK_6 = 90,
EVENT_THRALL_RUN_AWAY = 91,
EVENT_TARETHA_TALK_2 = 92
};
class npc_thrall_old_hillsbrad : public CreatureScript
@@ -898,7 +897,6 @@ public:
void AttackStart(Unit*) override { }
void MoveInLineOfSight(Unit*) override { }
};
};
void AddSC_old_hillsbrad()

View File

@@ -72,7 +72,6 @@ enum MiscIds
INSTANCE_POSITIONS_COUNT = 3,
THRALL_POSITIONS_COUNT = 5
};
#endif

View File

@@ -339,7 +339,6 @@ public:
protected:
EventMap Events;
};
};
void AddSC_instance_the_black_morass()

View File

@@ -246,7 +246,6 @@ public:
cr->AI()->Talk(SAY_ORCS_ANSWER);
}
break;
}
}

View File

@@ -91,7 +91,6 @@ public:
}
}
break;
}
SaveToDB();

View File

@@ -122,7 +122,6 @@ public:
DoMeleeAttackIfReady();
}
};
};
class boss_vem : public CreatureScript
@@ -214,7 +213,6 @@ public:
DoMeleeAttackIfReady();
}
};
};
class boss_yauj : public CreatureScript
@@ -326,7 +324,6 @@ public:
DoMeleeAttackIfReady();
}
};
};
void AddSC_bug_trio()

View File

@@ -438,7 +438,6 @@ public:
}
}
};
};
class boss_cthun : public CreatureScript
@@ -891,7 +890,6 @@ public:
}
}
};
};
class npc_eye_tentacle : public CreatureScript
@@ -969,7 +967,6 @@ public:
else MindflayTimer -= diff;
}
};
};
class npc_claw_tentacle : public CreatureScript
@@ -1083,7 +1080,6 @@ public:
DoMeleeAttackIfReady();
}
};
};
class npc_giant_claw_tentacle : public CreatureScript
@@ -1207,7 +1203,6 @@ public:
DoMeleeAttackIfReady();
}
};
};
class npc_giant_eye_tentacle : public CreatureScript
@@ -1273,7 +1268,6 @@ public:
else BeamTimer -= diff;
}
};
};
class npc_giant_flesh_tentacle : public CreatureScript
@@ -1301,7 +1295,6 @@ public:
summoner->GetAI()->DoAction(ACTION_FLESH_TENTACLE_KILLED);
}
};
};
//GetAIs

View File

@@ -202,7 +202,6 @@ public:
DoMeleeAttackIfReady();
}
};
};
void AddSC_boss_fankriss()

View File

@@ -141,7 +141,6 @@ public:
DoMeleeAttackIfReady();
}
};
};
void AddSC_boss_huhuran()

View File

@@ -131,7 +131,6 @@ public:
DoMeleeAttackIfReady();
}
};
};
void AddSC_boss_ouro()

View File

@@ -68,7 +68,6 @@ public:
AggroReset = false;
Enraged = false;
EnragedHard = false;
}
void EnterCombat(Unit* /*who*/) override
@@ -175,7 +174,6 @@ public:
}
}
};
};
class npc_sartura_royal_guard : public CreatureScript
@@ -296,7 +294,6 @@ public:
DoMeleeAttackIfReady();
}
};
};
void AddSC_boss_sartura()

View File

@@ -452,7 +452,6 @@ public:
DoMeleeAttackIfReady();
}
};
};
class boss_veklor : public CreatureScript
@@ -580,7 +579,6 @@ public:
}
}
};
};
void AddSC_boss_twinemperors()

View File

@@ -167,7 +167,6 @@ public:
}
}
};
};
void AddSC_instance_temple_of_ahnqiraj()

View File

@@ -293,7 +293,6 @@ public:
uint8 waveId;
public:
bool _isBrazierExtinguished;
};
CreatureAI* GetAI(Creature* creature) const override

View File

@@ -54,7 +54,6 @@ enum Caravan
NPC_LESSER_INFERNAL = 4676,
NPC_DOOMWARDER = 4677,
NPC_NETHER = 4684,
};
class npc_cork_gizelton : public CreatureScript
@@ -376,7 +375,6 @@ public:
case 282:
events.ScheduleEvent(EVENT_RESTART_ESCORT, 1000);
break;
}
}
@@ -429,7 +427,6 @@ enum DyingKodo
SPELL_KODO_KOMBO_PLAYER_BUFF = 18172,
SPELL_KODO_KOMBO_DESPAWN_BUFF = 18377,
SPELL_KODO_KOMBO_GOSSIP = 18362
};
class npc_aged_dying_ancient_kodo : public CreatureScript
@@ -498,7 +495,6 @@ public:
{
return new npc_aged_dying_ancient_kodoAI(creature);
}
};
/*######

View File

@@ -66,7 +66,6 @@ public:
return true;
}
};
/*######
@@ -107,7 +106,6 @@ public:
return true;
}
};
/*######
@@ -184,7 +182,6 @@ public:
}
}
};
};
/*######
@@ -298,7 +295,6 @@ public:
DoMeleeAttackIfReady();
}
};
};
enum SpellScripts

View File

@@ -54,7 +54,6 @@ public:
SendGossipMenuFor(player, 2433, creature->GetGUID());
return true;
}
};
/*######
@@ -101,7 +100,6 @@ public:
if (npc_escortAI* pEscortAI = CAST_AI(npc_oox22fe::npc_oox22feAI, creature->AI()))
pEscortAI->Start(true, false, player->GetGUID());
}
return true;
}
@@ -168,7 +166,6 @@ public:
summoned->AI()->AttackStart(me);
}
};
};
enum GordunniTrap

View File

@@ -92,7 +92,6 @@ public:
}
return true;
}
};
/*######
@@ -150,7 +149,6 @@ public:
return true;
}
};
/*######
@@ -207,7 +205,6 @@ public:
}
return true;
}
};
/*######
@@ -531,7 +528,6 @@ public:
EventOnWait = false;
break;
}
}
else if (EventOnWait) EventTimer -= diff;
}
@@ -544,7 +540,6 @@ public:
EventOnWait = true;
}
};
};
/*####

View File

@@ -116,7 +116,6 @@ public:
}
}
};
};
/*######

View File

@@ -140,7 +140,6 @@ public:
return true;
}
};
/*####
@@ -384,7 +383,6 @@ static WaveData WavesInfo[5] =
{12, 38, 15414, 0, 0, 24000, 0}, // Qiraji Wasps
{ 6, 50, 15422, 0, 0, 24000, 0}, // Qiraji Tanks
{15, 15, 15423, 0, 0, 24000, 0} // Kaldorei Soldier
};
struct SpawnSpells
@@ -723,7 +721,6 @@ public:
EnterEvadeMode();
}
};
};
/*######
@@ -840,7 +837,6 @@ public:
DoMeleeAttackIfReady();
}
};
};
/*#####
@@ -989,7 +985,6 @@ public:
EnterEvadeMode();
};
};
};
void npc_qiraj_war_spawn::npc_qiraj_war_spawnAI::JustDied(Unit* /*slayer*/)
@@ -1002,7 +997,6 @@ void npc_qiraj_war_spawn::npc_qiraj_war_spawnAI::JustDied(Unit* /*slayer*/)
if (Creature* mob = ObjectAccessor::GetCreature(*me, MobGUID))
if (npc_anachronos_quest_trigger::npc_anachronos_quest_triggerAI* triggerAI = CAST_AI(npc_anachronos_quest_trigger::npc_anachronos_quest_triggerAI, mob->AI()))
triggerAI->LiveCounter();
};
/*#####
@@ -1067,7 +1061,6 @@ public:
}
return true;
}
};
/*###

View File

@@ -44,7 +44,6 @@ public:
{
CloseGossipMenuFor(player);
creature->CastSpell(player, 6766, false);
}
if (action == GOSSIP_ACTION_INFO_DEF + 2)
{
@@ -74,7 +73,6 @@ public:
return true;
}
};
/*######
@@ -153,7 +151,6 @@ public:
{
return new npc_kaya_flathoofAI(creature);
}
};
/*######

View File

@@ -136,7 +136,6 @@ public:
DoMeleeAttackIfReady();
}
};
};
/*######
@@ -269,7 +268,6 @@ public:
npc_escortAI::UpdateAI(diff);
}
};
};
/*######
@@ -315,7 +313,6 @@ public:
return true;
}
};
/*######
@@ -379,7 +376,6 @@ public:
return true;
}
};
/*######
@@ -632,7 +628,6 @@ public:
DoMeleeAttackIfReady();
}
};
};
void AddSC_tanaris()

View File

@@ -62,7 +62,6 @@ public:
SendGossipMenuFor(player, 3557, creature->GetGUID());
return true;
}
};
/*######
@@ -160,7 +159,6 @@ public:
}
}
};
};
/*######
@@ -262,7 +260,6 @@ public:
}
}
};
};
/*#####
@@ -485,7 +482,6 @@ public:
}
}
};
};
/*#####
@@ -649,7 +645,6 @@ public:
{
return new npc_wizzlecrank_shredderAI(creature);
}
};
void AddSC_the_barrens()

View File

@@ -114,7 +114,6 @@ public:
me->SummonCreature(NPC_GRIM_BANDIT, BanditLoc[i + AmbushId], TEMPSUMMON_TIMED_OR_DEAD_DESPAWN, 60000);
}
};
};
/*######
@@ -310,7 +309,6 @@ public:
DoMeleeAttackIfReady();
}
};
};
enum PantherCage
@@ -368,7 +366,6 @@ public:
DoMeleeAttackIfReady();
}
};
};
void AddSC_thousand_needles()

View File

@@ -735,7 +735,6 @@ public:
default:
return nullptr;
}
}
void UpdateEscortAI(uint32 diff) override

View File

@@ -180,7 +180,6 @@ public:
Talk(SAY_HADRONOX_EMOTE);
me->GetMotionMaster()->MoveCharge(hadronoxSteps[eventId - 1].GetPositionX(), hadronoxSteps[eventId - 1].GetPositionY(), hadronoxSteps[eventId - 1].GetPositionZ(), 10.0f, 0, NULL, true);
break;
}
DoMeleeAttackIfReady();

View File

@@ -51,7 +51,6 @@ public:
if (Creature* hadronox = instance->GetCreature(_hadronoxGUID))
hadronox->AI()->JustSummoned(creature);
break;
}
}

View File

@@ -134,7 +134,6 @@ public:
me->SummonCreature(NPC_INITIATE, 366.861f, -721.702f, -16.1797f, 5.65409f);
me->SummonCreature(NPC_INITIATE, 362.343f, -718.019f, -16.1797f, 5.51665f);
me->SummonCreature(NPC_INITIATE, 358.906f, -714.357f, -16.1797f, 5.35957f);
}
}

View File

@@ -243,7 +243,6 @@ public:
m_auiEncounter[i] = NOT_STARTED;
spheres = data5;
}
else OUT_LOAD_INST_DATA_FAIL;
@@ -283,7 +282,6 @@ public:
if (!PlayerList.empty())
caster->CastSpell(acore::Containers::SelectRandomContainerElement(PlayerList), caster->GetMap()->IsHeroic() ? SPELL_SHADOW_SICKLE_H : SPELL_SHADOW_SICKLE, true);
}
}

View File

@@ -101,7 +101,6 @@ public:
if (Creature* halion = instance->GetCreature(HalionGUID))
halion->AI()->JustSummoned(creature);
break;
}
}

View File

@@ -145,7 +145,6 @@ public:
me->SetFlag(UNIT_FIELD_FLAGS_2, UNIT_FLAG2_FEIGN_DEATH);
me->SetFlag(UNIT_DYNAMIC_FLAGS, UNIT_DYNFLAG_DEAD);
me->AddUnitState(UNIT_STATE_DIED);
}
}
@@ -362,7 +361,6 @@ public:
{
npc_escortAI::UpdateAI(uiDiff);
}
};
CreatureAI* GetAI(Creature* pCreature) const override

View File

@@ -245,7 +245,6 @@ public:
for( uint8 i = 0; i < MAX_ENCOUNTER; ++i )
if( m_auiEncounter[i] == IN_PROGRESS )
m_auiEncounter[i] = NOT_STARTED;
}
else
OUT_LOAD_INST_DATA_FAIL;
@@ -743,7 +742,6 @@ public:
pAdd->GetMotionMaster()->MoveFollow(pBoss, 2.0f, (i + 1)*M_PI / 2);
pAdd->SetReactState(REACT_PASSIVE);
}
}
if (!shortver)

View File

@@ -1987,7 +1987,6 @@ public:
DoMeleeAttackIfReady();
}
};
};
enum eEnhShamanSpells
@@ -2114,7 +2113,6 @@ public:
events.RepeatEvent(30000);
EventMapGCD(events, 1500);
break;
}
DoMeleeAttackIfReady();
@@ -2362,7 +2360,6 @@ public:
me->DespawnOrUnsummon();
}
};
};
enum eHunterPetSpells

View File

@@ -347,7 +347,6 @@ public:
me->DespawnOrUnsummon();
}
};
};
class npc_mistress_of_pain : public CreatureScript
@@ -429,7 +428,6 @@ public:
me->DespawnOrUnsummon();
}
};
};
class spell_toc25_mistress_kiss : public SpellScriptLoader

View File

@@ -240,7 +240,6 @@ public:
else
timer -= diff;
}
}
};

Some files were not shown because too many files have changed in this diff Show More