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

@@ -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()