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

@@ -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;
}
}
};

View File

@@ -889,7 +889,6 @@ public:
me->ToTempSummon()->DespawnOrUnsummon(1);
}
};
};
class npc_shadowy_mercenary : public CreatureScript

View File

@@ -166,7 +166,6 @@ public:
break;
}
NPC_TyrannusEventGUID = creature->GetGUID();
}
break;
case NPC_LORALEN:

View File

@@ -88,7 +88,6 @@ public:
}
else
{
events.RescheduleEvent(2, 2500);
}
}
@@ -1402,7 +1401,6 @@ public:
class spell_pos_slave_trigger_closestSpellScript : public SpellScript
{
PrepareSpellScript(spell_pos_slave_trigger_closestSpellScript);
void HandleDummy(SpellEffIndex /*effIndex*/)

View File

@@ -575,7 +575,6 @@ public:
_events.ScheduleEvent(EVENT_OUTRO_HORDE_1, 10000);
_events.ScheduleEvent(EVENT_OUTRO_HORDE_2, 18000);
_events.ScheduleEvent(EVENT_OUTRO_HORDE_3, 24000);*/
}
break;
case ACTION_EVADE:

View File

@@ -268,7 +268,6 @@ enum Events
EVENT_DESTROY_SOUL,
EVENT_TELEPORT_BACK,
EVENT_SOUL_RIP,
};
enum EventGroups
@@ -694,7 +693,6 @@ public:
me->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_IMMUNE_TO_PC);
me->SetReactState(REACT_PASSIVE);
me->SetStandState(UNIT_STAND_STATE_SIT);
}
bool CanAIAttack(Unit const* target) const override
@@ -828,7 +826,6 @@ public:
tirion->PlayDirectSound(17389);
}
}
}
else if (damage >= me->GetHealth())
damage = me->GetHealth() - 1;
@@ -2138,7 +2135,6 @@ public:
a->SetDuration(0);
if (GetCaster()->GetTypeId() == TYPEID_UNIT)
GetCaster()->ToCreature()->DespawnOrUnsummon(3000);
}
void Register() override

View File

@@ -1772,7 +1772,6 @@ public:
c->getThreatManager().resetAllAggro();
for (ThreatContainer::StorageType::const_iterator iter = me_tl.begin(); iter != me_tl.end(); ++iter)
c->getThreatManager().addThreat((*iter)->getTarget(), (*iter)->getThreat());
}
}
@@ -2990,7 +2989,6 @@ public:
else
break;
}
}
bool CanAIAttack(Unit const* target) const override

View File

@@ -455,7 +455,6 @@ public:
events.ScheduleEvent(EVENT_SPELL_HARVEST_SOUL, urand(5000, 15000));
events.ScheduleEvent(EVENT_TELEPORT, 20000);
events.ScheduleEvent(EVENT_CHECK_HEALTH, 1000);
}
waveCount++;

View File

@@ -217,7 +217,6 @@ public:
me->SetFloatValue(UNIT_FIELD_COMBATREACH, 2.0f + (0.00025f * sizeTimer));
}
};
};
class spell_grobbulus_poison : public SpellScriptLoader

View File

@@ -212,7 +212,6 @@ public:
pInstance->SetData(DATA_IMMORTAL_FAIL, 0);
return;
}
}
events.RepeatEvent(5000);
return;

View File

@@ -183,7 +183,6 @@ public:
go->SetGoState(GO_STATE_ACTIVE);
}
_justSpawned = false;
}
void EnterEvadeMode() override

View File

@@ -93,7 +93,6 @@ public:
if (GameObject* go = me->GetMap()->GetGameObject(pInstance->GetData64(DATA_MAEXXNA_GATE)))
go->SetGoState(GO_STATE_ACTIVE);
}
}
void EnterCombat(Unit* who) override

View File

@@ -173,7 +173,6 @@ public:
}
events.RepeatEvent(1000);
break;
}
DoMeleeAttackIfReady();

View File

@@ -268,7 +268,6 @@ public:
case EVENT_FLIGHT_START:
if (me->HealthBelowPct(11))
{
return;
}
events.RepeatEvent(45000);
@@ -369,7 +368,6 @@ public:
pInstance->SetData(DATA_HUNDRED_CLUB, 0);
return;
}
}
events.RepeatEvent(5000);
return;

View File

@@ -109,7 +109,6 @@ public:
sapphironAchievement = true;
heiganAchievement = true;
immortalAchievement = 1;
}
std::set<GameObject*> HeiganEruption[4];
@@ -909,7 +908,6 @@ public:
else
OUT_LOAD_INST_DATA_FAIL;
}
};
};
class boss_naxxramas_misc : public CreatureScript

View File

@@ -238,7 +238,6 @@ public:
GetUnitOwner()->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE);
GetUnitOwner()->SetControlled(true, UNIT_STATE_STUNNED);
GetUnitOwner()->ToCreature()->LoadEquipment(0, true);
}
void HandleRemove(AuraEffect const* /*aurEff*/, AuraEffectHandleModes /*mode*/)

View File

@@ -100,7 +100,6 @@ public:
pGo->UseDoorOrButton(0, false);
}
}
}
void KilledUnit(Unit* /*victim*/) override

View File

@@ -253,7 +253,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;

View File

@@ -209,7 +209,6 @@ public:
m_auiEncounter[i] = NOT_STARTED;
OUT_LOAD_INST_DATA_COMPLETE;
}
else
OUT_LOAD_INST_DATA_FAIL;

View File

@@ -179,7 +179,6 @@ public:
default:
break;
}
}
SendGossipMenuFor(player, TEXT_ID_START, creature->GetGUID());
return true;
@@ -223,7 +222,6 @@ public:
struct brann_bronzebeardAI : public npc_escortAI
{
brann_bronzebeardAI(Creature* c) : npc_escortAI(c), summons(me)
{
AbedneumGUID = MarnakGUID = KaddrakGUID = 0;
@@ -515,7 +513,6 @@ public:
}
case EVENT_GO_TO_SJONNIR:
{
if (GameObject* door = ObjectAccessor::GetGameObject(*me, pInstance->GetData64(GO_SJONNIR_DOOR)))
door->SetGoState(GO_STATE_ACTIVE);
SetEscortPaused(false);

View File

@@ -175,7 +175,6 @@ void RestoreAssemblyHealth(uint64 guid1, uint64 guid2, Creature* me)
if(Creature* cr2 = ObjectAccessor::GetCreature(*me, guid2))
if(cr2->IsAlive())
cr2->SetHealth(cr2->GetMaxHealth());
}
class boss_steelbreaker : public CreatureScript

View File

@@ -121,7 +121,6 @@ enum Texts
FLAME_LEVIATHAN_EMOTE_PURSUE,
FLAME_LEVIATHAN_EMOTE_OVERLOAD,
FLAME_LEVIATHAN_EMOTE_REPAIR
};
enum Sounds
@@ -1092,7 +1091,6 @@ public:
}
}
};
};
class npc_thorims_hammer : public CreatureScript

View File

@@ -1193,7 +1193,6 @@ public:
void HandleEffectPeriodic(AuraEffect const* /*aurEff*/)
{
if (Unit* target = GetTarget())
{
if (target->GetMapId() == 603)

View File

@@ -1055,7 +1055,6 @@ public:
events.ScheduleEvent(EVENT_SPELL_SHOCK_BLAST, 20000);
events.ScheduleEvent(EVENT_PROXIMITY_MINES_1, 6000);
break;
}
}
}
@@ -1677,7 +1676,6 @@ public:
DoZoneInCombat();
events.Reset();
events.ScheduleEvent(EVENT_SPELL_PLASMA_BALL, 0);
}
}
else if (id == 2 && !immobilized && Phase == 3) // magnetic core

View File

@@ -430,7 +430,6 @@ public:
if( npc_entry )
if (Creature* c = me->SummonCreature(npc_entry, x, y, 391.1f, j * M_PI / 2, TEMPSUMMON_CORPSE_TIMED_DESPAWN, 5000))
DoZoneInCombat(c);
}
}
break;

View File

@@ -391,7 +391,6 @@ public:
// Disabled by stunned state
DoMeleeAttackIfReady();
}
};
};

View File

@@ -368,7 +368,6 @@ public:
class AreaTrigger_at_celestial_planetarium_enterance : public AreaTriggerScript
{
public:
AreaTrigger_at_celestial_planetarium_enterance()
: AreaTriggerScript("at_celestial_planetarium_enterance")
{

View File

@@ -98,7 +98,6 @@ public:
}
}
};
};
class boss_keleseth : public CreatureScript
@@ -215,7 +214,6 @@ public:
DoMeleeAttackIfReady();
}
};
};
enum eSkeletonEnum
@@ -329,7 +327,6 @@ public:
DoMeleeAttackIfReady();
}
};
};
class spell_frost_tomb : public SpellScriptLoader

View File

@@ -371,7 +371,6 @@ public:
return false;
}
};
};
void AddSC_instance_utgarde_keep()

View File

@@ -183,7 +183,6 @@ public:
private:
bool _setData;
EventMap _events;
};
CreatureAI* GetAI(Creature* creature) const override

View File

@@ -167,7 +167,6 @@ public:
void DoAction(int32 param) override
{
if (param == ACTION_PHASE2)
{
SecondPhase = true;
@@ -306,7 +305,6 @@ public:
AchievementHitCount++;
if (AchievementHitCount >= 3 && m_pInstance)
m_pInstance->SetData(DATA_SKADI_ACHIEVEMENT, true);
}
}

View File

@@ -314,7 +314,6 @@ public:
events.RepeatEvent(15000);
break;
}
}
DoMeleeAttackIfReady();

View File

@@ -188,7 +188,6 @@ public:
case DATA_YMIRON_ACHIEVEMENT:
ymironAchievement = (bool)data;
return;
}
OUT_SAVE_INST_DATA;
@@ -229,7 +228,6 @@ public:
for (uint8 i = 0; i < MAX_ENCOUNTERS; ++i)
if (Encounters[i] == IN_PROGRESS)
Encounters[i] = NOT_STARTED;
}
else OUT_LOAD_INST_DATA_FAIL;
@@ -296,4 +294,4 @@ public:
void AddSC_instance_utgarde_pinnacle()
{
new instance_pinnacle();
}
}

View File

@@ -35,7 +35,6 @@ enum Events
EVENT_FROZEN_ORB_STALKER = 2,
EVENT_CAST_WHITEOUT = 3,
EVENT_CAST_WHITEOUT_GROUND_EFFECT = 4,
};
enum Misc

View File

@@ -197,9 +197,7 @@ public:
}
}
else phaseTimer -= diff;
}
};
CreatureAI* GetAI(Creature* creature) const override
@@ -296,7 +294,6 @@ public:
player->CastSpell(player, SPELL_SUMMON_WYRMREST_SKYTALON, true);
player->CastSpell(player, SPELL_WYRMREST_SKYTALON_RIDE_PERIODIC, true);
}
return true;
@@ -1270,7 +1267,6 @@ public:
return true;
}
};
enum BloodsporeRuination

View File

@@ -204,12 +204,10 @@ public:
if (!targetGUID)
if (Creature* pOrb = GetClosestCreatureWithEntry(me, NPC_TRANSITUS_SHIELD_DUMMY, 32.0f))
targetGUID = pOrb->GetGUID();
}
if (Creature* pOrb = ObjectAccessor::GetCreature(*me, targetGUID))
DoCast(pOrb, SPELL_TRANSITUS_SHIELD_BEAM);
}
};

View File

@@ -553,7 +553,6 @@ public:
void UpdateAI(uint32 diff) override
{
if (!sWorld->getBoolConfig(CONFIG_MINIGOB_MANABONK))
return;
@@ -620,7 +619,6 @@ public:
{
npc_dalaran_mageAI(Creature* creature) : ScriptedAI(creature)
{
}
uint32 CoC_Timer;
@@ -649,9 +647,9 @@ public:
void EnterCombat(Unit* /*who*/) override
{
}
void UpdateAI(uint32 diff) override
{
if (!UpdateVictim())
return;

View File

@@ -1008,7 +1008,6 @@ public:
}
c->ToCreature()->DespawnOrUnsummon(1);
}
}
break;
case 18: // summon vegard
@@ -1244,7 +1243,6 @@ public:
me->CastSpell(me, SPELL_SAC_EMERGE, true);
}
}
};
};

View File

@@ -21,7 +21,6 @@ enum qRedRocket
SPELL_TORPEDO_EXPLODE = 49290,
SPELL_ALLIANCE_TORPEDO_KILL_CREDIT = 49510,
SPELL_HORDE_TORPEDO_KILL_CREDIT = 49340,
};
class npc_riding_the_red_rocket : public CreatureScript

View File

@@ -1094,7 +1094,6 @@ public:
{
return new spell_switch_infragreen_bomber_station_SpellScript();
}
};
class spell_charge_shield_bomber : public SpellScriptLoader
@@ -1406,7 +1405,6 @@ public:
private:
EventMap events;
};
CreatureAI* GetAI(Creature* creature) const override
@@ -1457,7 +1455,6 @@ public:
who->CastSpell(who, SPELL_TRESPASSER_H, true);
else
who->CastSpell(who, SPELL_TRESPASSER_A, true);
}
};
@@ -1617,14 +1614,12 @@ public:
}
void MoveInLineOfSight(Unit* /*who*/) override { }
};
CreatureAI* GetAI(Creature* creature) const override
{
return new npc_tournament_training_dummyAI(creature);
}
};
// Battle for Crusaders' Pinnacle

View File

@@ -438,7 +438,6 @@ public:
}
else
Talk(2);
}
}
@@ -1029,7 +1028,6 @@ public:
private:
uint8 _counter;
};
AuraScript* GetAuraScript() const override

View File

@@ -159,7 +159,6 @@ public:
uint32 GetTaskAura(uint32 itemcode) { return AA_AURA_ID[itemcode % 100]; }
uint32 GetTaskItemEntry(uint32 itemcode) { return AA_ITEM_ENTRY[itemcode % 100]; }
const char* GetTaskItemName(uint32 itemcode) { return AA_ITEM_NAME[itemcode % 100]; }
};
bool OnQuestAccept(Player* player, Creature* creature, Quest const* quest) override
@@ -567,7 +566,6 @@ public:
playerGUID = 0;
EnterEvadeMode();
break;
}
if (me->getFaction() == 35 || me->HasUnitState(UNIT_STATE_CASTING | UNIT_STATE_STUNNED))