nchebrov/azerothcore-wotlk
1
0
Fork 0
mirror of https://github.com/mod-playerbots/azerothcore-wotlk.git synced 2026-02-14 16:03:45 +00:00
Code Issues Packages Projects Releases Wiki Activity

Refactor(Core/Gossip): Replacing old macros with new (#1338)

Browse Source 
* Correct support new macro
This commit is contained in:
Kargatum
2019-03-25 21:10:57 +07:00
committed by GitHub
parent 4abe082190
commit b6cb9247ba
99 changed files with 2840 additions and 2775 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1103
src/server/scripts/Events/brewfest.cpp
View File

File diff suppressed because it is too large Load Diff

28
src/server/scripts/Events/hallows_end.cpp
View File

@@ -362,7 +362,7 @@ public:
struct npc_costumed_orphan_matronAI : public ScriptedAI
{
npc_costumed_orphan_matronAI(Creature *c) : ScriptedAI(c)
npc_costumed_orphan_matronAI(Creature *c) : ScriptedAI(c)
{
}
@@ -370,7 +370,7 @@ public:
bool allowQuest;
uint64 horseGUID;
void Reset()
void Reset() override
{
eventStarted = 0;
allowQuest = false;
@@ -402,7 +402,7 @@ public:
}
}
void DoAction(int32 param)
void DoAction(int32 param) override
{
if (param == ACTION_START_EVENT)
{
@@ -420,7 +420,7 @@ public:
}
}
uint32 GetData(uint32 param) const
uint32 GetData(uint32 param) const override
{
if (param == DATA_ALLOW_START)
return allowQuest;
@@ -428,7 +428,7 @@ public:
return 0;
}
void UpdateAI(uint32 diff)
void UpdateAI(uint32 diff) override
{
if (eventStarted)
{
@@ -442,7 +442,7 @@ public:
}
};
bool OnGossipHello(Player* player, Creature* creature)
bool OnGossipHello(Player* player, Creature* creature) override
{
QuestRelationBounds pObjectQR = sObjectMgr->GetCreatureQuestRelationBounds(creature->GetEntry());
QuestRelationBounds pObjectQIR = sObjectMgr->GetCreatureQuestInvolvedRelationBounds(creature->GetEntry());
@@ -494,7 +494,7 @@ public:
return true;
}
bool OnQuestAccept(Player* /*player*/, Creature* creature, Quest const* quest)
bool OnQuestAccept(Player* /*player*/, Creature* creature, Quest const* quest) override
{
if ((quest->GetQuestId() == QUEST_LET_THE_FIRES_COME_A || quest->GetQuestId() == QUEST_LET_THE_FIRES_COME_H) && !creature->AI()->GetData(DATA_ALLOW_START))
creature->AI()->DoAction(ACTION_START_EVENT);
@@ -502,7 +502,7 @@ public:
return true;
}
CreatureAI* GetAI(Creature* pCreature) const
CreatureAI* GetAI(Creature* pCreature) const override
{
return new npc_costumed_orphan_matronAI (pCreature);
}
@@ -921,7 +921,7 @@ class boss_headless_horseman : public CreatureScript
for (std::list<Creature*>::iterator itr = unitList.begin(); itr != unitList.end(); ++itr)
(*itr)->ToCreature()->DespawnOrUnsummon(500);
Map::PlayerList const& players = me->GetMap()->GetPlayers();
if (!players.isEmpty() && players.begin()->GetSource() && players.begin()->GetSource()->GetGroup())
sLFGMgr->FinishDungeon(players.begin()->GetSource()->GetGroup()->GetGUID(), 285, me->FindMap());
@@ -962,7 +962,7 @@ class boss_headless_horseman : public CreatureScript
events.CancelEvent(EVENT_HORSEMAN_CONFLAGRATION);
events.CancelEvent(EVENT_SUMMON_PUMPKIN);
me->MonsterYell("Here's my body, fit and pure! Now, your blackened souls I'll cure!", LANG_UNIVERSAL, 0);
if (phase == 1)
events.ScheduleEvent(EVENT_HORSEMAN_CONFLAGRATION, 6000);
else if (phase == 2)
@@ -980,7 +980,7 @@ class boss_headless_horseman : public CreatureScript
{
me->SetUInt32Value(UNIT_FIELD_FLAGS, 0);
me->StopMoving();
me->SetInCombatWithZone();
inFight = true;
events.ScheduleEvent(EVENT_HORSEMAN_FOLLOW, 500);
@@ -1036,7 +1036,7 @@ class boss_headless_horseman : public CreatureScript
phase = 0;
inFight = false;
health = 0;
me->SetDisableGravity(true);
me->SetSpeed(MOVE_WALK, 5.0f, true);
}
@@ -1253,7 +1253,7 @@ class boss_headless_horseman_head : public CreatureScript
damage = 0;
me->RemoveAllAuras();
me->CastSpell(me, SPELL_HEAD_DAMAGED_INFO, true);
me->CastSpell(me, SPELL_THROW_HEAD_BACK, true);
me->CastSpell(me, SPELL_THROW_HEAD_BACK, true);
if (Unit* owner = GetOwner())
owner->RemoveAura(SPELL_HORSEMAN_IMMUNITY);
}
@@ -1377,7 +1377,7 @@ void AddSC_event_hallows_end_scripts()
new spell_hallows_end_put_costume("spell_hallows_end_leper_costume", SPELL_LEPER_GNOME_COSTUME_MALE, SPELL_LEPER_GNOME_COSTUME_FEMALE);
new spell_hallows_end_put_costume("spell_hallows_end_ghost_costume", SPELL_GHOST_COSTUME_MALE, SPELL_GHOST_COSTUME_FEMALE);
new spell_hallows_end_put_costume("spell_hallows_end_ninja_costume", SPELL_NINJA_COSTUME_MALE, SPELL_NINJA_COSTUME_FEMALE);
// Quests
new npc_hallows_end_train_fire();

18
src/server/scripts/Events/midsummer.cpp
View File

@@ -21,9 +21,9 @@ class go_midsummer_bonfire : public GameObjectScript
public:
go_midsummer_bonfire() : GameObjectScript("go_midsummer_bonfire") { }
bool OnGossipSelect(Player* player, GameObject* /*go*/, uint32 /*sender*/, uint32 /*action*/)
bool OnGossipSelect(Player* player, GameObject* /*go*/, uint32 /*sender*/, uint32 /*action*/) override
{
player->CLOSE_GOSSIP_MENU();
CloseGossipMenuFor(player);
// we know that there is only one gossip.
player->CastSpell(player, SPELL_STAMP_OUT_BONFIRE, true);
return true;
@@ -37,7 +37,7 @@ class npc_midsummer_bonfire : public CreatureScript
struct npc_midsummer_bonfireAI : public ScriptedAI
{
npc_midsummer_bonfireAI(Creature* c) : ScriptedAI(c)
npc_midsummer_bonfireAI(Creature* c) : ScriptedAI(c)
{
me->IsAIEnabled = true;
goGUID = 0;
@@ -47,7 +47,7 @@ class npc_midsummer_bonfire : public CreatureScript
me->RemoveGameObject(go, false);
}
}
uint64 goGUID;
void SpellHit(Unit*, SpellInfo const* spellInfo)
@@ -86,7 +86,7 @@ class npc_midsummer_torch_target : public CreatureScript
struct npc_midsummer_torch_targetAI : public ScriptedAI
{
npc_midsummer_torch_targetAI(Creature* c) : ScriptedAI(c)
npc_midsummer_torch_targetAI(Creature* c) : ScriptedAI(c)
{
teleTimer = 0;
startTimer = 1;
@@ -114,7 +114,7 @@ class npc_midsummer_torch_target : public CreatureScript
{
return seer->GetGUID() == playerGUID;
}
void SpellHit(Unit* caster, SpellInfo const* spellInfo)
{
if (posVec.empty())
@@ -273,7 +273,7 @@ public:
class spell_midsummer_ribbon_pole_AuraScript : public AuraScript
{
PrepareAuraScript(spell_midsummer_ribbon_pole_AuraScript)
void HandleEffectPeriodic(AuraEffect const * /*aurEff*/)
{
PreventDefaultAction();
@@ -340,7 +340,7 @@ public:
}
uint64 torchGUID;
void HandleEffectApply(AuraEffect const* /*aurEff*/, AuraEffectHandleModes /*mode*/)
{
Unit* ar = GetTarget();
@@ -573,4 +573,4 @@ void AddSC_event_midsummer_scripts()
new spell_midsummer_torch_quest();
new spell_midsummer_fling_torch();
new spell_midsummer_juggling_torch();
}
}