aboutsummaryrefslogtreecommitdiff
path: root/src/server/scripts/EasternKingdoms
diff options
context:
space:
mode:
authorMaks Szokalski <42069493+illunix@users.noreply.github.com>2020-09-10 16:57:11 +0200
committerShauren <shauren.trinity@gmail.com>2022-02-05 22:18:19 +0100
commitbc04acb72652882290cef49b2055d3cf1ab12f36 (patch)
treeb430b10375254570eb8c4c9ed802066ba0c14b96 /src/server/scripts/EasternKingdoms
parent013c9b2cb7404a6d03443eb39f49622dcc99a7fa (diff)
Add "On" to some gossip methods in AI (#25415)
* Add "On" to some methods * Update npc_innkeeper.cpp * Update zone_borean_tundra.cpp (cherry picked from commit 41188eb535e445b73909659980257da2939e4be4)
Diffstat (limited to 'src/server/scripts/EasternKingdoms')
-rw-r--r--src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockDepths/blackrock_depths.cpp8
-rw-r--r--src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockDepths/boss_coren_direbrew.cpp2
-rw-r--r--src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockDepths/boss_tomb_of_seven.cpp8
-rw-r--r--src/server/scripts/EasternKingdoms/BlackrockMountain/BlackwingLair/boss_chromaggus.cpp2
-rw-r--r--src/server/scripts/EasternKingdoms/BlackrockMountain/BlackwingLair/boss_nefarian.cpp2
-rw-r--r--src/server/scripts/EasternKingdoms/BlackrockMountain/BlackwingLair/boss_razorgore.cpp2
-rw-r--r--src/server/scripts/EasternKingdoms/BlackrockMountain/BlackwingLair/boss_vaelastrasz.cpp2
-rw-r--r--src/server/scripts/EasternKingdoms/BlackrockMountain/MoltenCore/boss_majordomo_executus.cpp2
-rw-r--r--src/server/scripts/EasternKingdoms/Gnomeregan/gnomeregan.cpp2
-rw-r--r--src/server/scripts/EasternKingdoms/Karazhan/boss_nightbane.cpp2
-rw-r--r--src/server/scripts/EasternKingdoms/Karazhan/bosses_opera.cpp2
-rw-r--r--src/server/scripts/EasternKingdoms/Karazhan/karazhan.cpp4
-rw-r--r--src/server/scripts/EasternKingdoms/MagistersTerrace/magisters_terrace.cpp4
-rw-r--r--src/server/scripts/EasternKingdoms/ScarletEnclave/chapter1.cpp8
-rw-r--r--src/server/scripts/EasternKingdoms/ScarletEnclave/chapter2.cpp4
-rw-r--r--src/server/scripts/EasternKingdoms/ScarletEnclave/chapter5.cpp4
-rw-r--r--src/server/scripts/EasternKingdoms/ScarletMonastery/boss_headless_horseman.cpp4
-rw-r--r--src/server/scripts/EasternKingdoms/Scholomance/boss_kirtonos_the_herald.cpp2
-rw-r--r--src/server/scripts/EasternKingdoms/ShadowfangKeep/boss_apothecary_hummel.cpp4
-rw-r--r--src/server/scripts/EasternKingdoms/ShadowfangKeep/shadowfang_keep.cpp4
-rw-r--r--src/server/scripts/EasternKingdoms/Stratholme/stratholme.cpp2
-rw-r--r--src/server/scripts/EasternKingdoms/SunkenTemple/sunken_temple.cpp2
-rw-r--r--src/server/scripts/EasternKingdoms/SunwellPlateau/boss_kalecgos.cpp2
-rw-r--r--src/server/scripts/EasternKingdoms/SunwellPlateau/boss_kiljaeden.cpp2
-rw-r--r--src/server/scripts/EasternKingdoms/Uldaman/boss_archaedas.cpp2
-rw-r--r--src/server/scripts/EasternKingdoms/Uldaman/uldaman.cpp2
-rw-r--r--src/server/scripts/EasternKingdoms/ZulAman/zulaman.cpp2
-rw-r--r--src/server/scripts/EasternKingdoms/zone_hinterlands.cpp2
-rw-r--r--src/server/scripts/EasternKingdoms/zone_isle_of_queldanas.cpp2
-rw-r--r--src/server/scripts/EasternKingdoms/zone_tol_barad.cpp2
-rw-r--r--src/server/scripts/EasternKingdoms/zone_undercity.cpp2
31 files changed, 47 insertions, 47 deletions
diff --git a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockDepths/blackrock_depths.cpp b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockDepths/blackrock_depths.cpp
index 9454cfb01c7..a5b68d42ffa 100644
--- a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockDepths/blackrock_depths.cpp
+++ b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockDepths/blackrock_depths.cpp
@@ -40,7 +40,7 @@ class go_shadowforge_brazier : public GameObjectScript
InstanceScript* instance;
- bool GossipHello(Player* /*player*/) override
+ bool OnGossipHello(Player* /*player*/) override
{
if (instance->GetData(TYPE_LYCEUM) == IN_PROGRESS)
instance->SetData(TYPE_LYCEUM, DONE);
@@ -451,7 +451,7 @@ class npc_lokhtos_darkbargainer : public CreatureScript
{
npc_lokhtos_darkbargainerAI(Creature* creature) : ScriptedAI(creature) { }
- bool GossipSelect(Player* player, uint32 /*menuId*/, uint32 gossipListId) override
+ bool OnGossipSelect(Player* player, uint32 /*menuId*/, uint32 gossipListId) override
{
uint32 const action = player->PlayerTalkClass->GetGossipOptionAction(gossipListId);
@@ -467,7 +467,7 @@ class npc_lokhtos_darkbargainer : public CreatureScript
return true;
}
- bool GossipHello(Player* player) override
+ bool OnGossipHello(Player* player) override
{
if (me->IsQuestGiver())
player->PrepareQuestMenu(me->GetGUID());
@@ -600,7 +600,7 @@ public:
EscortAI::UpdateAI(diff);
}
- void QuestReward(Player* /*player*/, Quest const* quest, LootItemType /*type*/, uint32 /*item*/) override
+ void OnQuestReward(Player* /*player*/, Quest const* quest, LootItemType /*type*/, uint32 /*item*/) override
{
if (instance->GetData(TYPE_BAR) == DONE || instance->GetData(TYPE_BAR) == SPECIAL)
return;
diff --git a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockDepths/boss_coren_direbrew.cpp b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockDepths/boss_coren_direbrew.cpp
index 20f6d96c8a4..c03cc6f21ca 100644
--- a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockDepths/boss_coren_direbrew.cpp
+++ b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockDepths/boss_coren_direbrew.cpp
@@ -118,7 +118,7 @@ struct boss_coren_direbrew : public BossAI
{
boss_coren_direbrew(Creature* creature) : BossAI(creature, DATA_COREN) { }
- bool GossipSelect(Player* player, uint32 menuId, uint32 gossipListId) override
+ bool OnGossipSelect(Player* player, uint32 menuId, uint32 gossipListId) override
{
if (menuId != GOSSIP_ID)
return false;
diff --git a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockDepths/boss_tomb_of_seven.cpp b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockDepths/boss_tomb_of_seven.cpp
index 3a4a192d4df..cecee57cb37 100644
--- a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockDepths/boss_tomb_of_seven.cpp
+++ b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockDepths/boss_tomb_of_seven.cpp
@@ -60,7 +60,7 @@ class boss_gloomrel : public CreatureScript
InstanceScript* instance;
- bool GossipSelect(Player* player, uint32 /*menuId*/, uint32 gossipListId) override
+ bool OnGossipSelect(Player* player, uint32 /*menuId*/, uint32 gossipListId) override
{
uint32 const action = player->PlayerTalkClass->GetGossipOptionAction(gossipListId);
ClearGossipMenuFor(player);
@@ -87,7 +87,7 @@ class boss_gloomrel : public CreatureScript
return true;
}
- bool GossipHello(Player* player) override
+ bool OnGossipHello(Player* player) override
{
if (player->GetQuestRewardStatus(QUEST_SPECTRAL_CHALICE) == 1 && player->GetSkillValue(SKILL_MINING) >= DATA_SKILLPOINT_MIN && !player->HasSpell(SPELL_SMELT_DARK_IRON))
AddGossipItemFor(player, GossipOptionIcon::None, GOSSIP_ITEM_TEACH_1, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 1);
@@ -229,7 +229,7 @@ class boss_doomrel : public CreatureScript
DoMeleeAttackIfReady();
}
- bool GossipSelect(Player* player, uint32 /*menuId*/, uint32 gossipListId) override
+ bool OnGossipSelect(Player* player, uint32 /*menuId*/, uint32 gossipListId) override
{
uint32 const action = player->PlayerTalkClass->GetGossipOptionAction(gossipListId);
ClearGossipMenuFor(player);
@@ -253,7 +253,7 @@ class boss_doomrel : public CreatureScript
return true;
}
- bool GossipHello(Player* player) override
+ bool OnGossipHello(Player* player) override
{
AddGossipItemFor(player, GOSSIP_MENU_CHALLENGE, GOSSIP_MENU_ID_CHALLENGE, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 1);
SendGossipMenuFor(player, 2601, me->GetGUID());
diff --git a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackwingLair/boss_chromaggus.cpp b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackwingLair/boss_chromaggus.cpp
index 84646fe8bb9..6cf53b2e6ef 100644
--- a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackwingLair/boss_chromaggus.cpp
+++ b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackwingLair/boss_chromaggus.cpp
@@ -306,7 +306,7 @@ class go_chromaggus_lever : public GameObjectScript
{
go_chromaggus_leverAI(GameObject* go) : GameObjectAI(go), _instance(go->GetInstanceScript()) { }
- bool GossipHello(Player* player) override
+ bool OnGossipHello(Player* player) override
{
if (_instance->GetBossState(DATA_CHROMAGGUS) != DONE && _instance->GetBossState(DATA_CHROMAGGUS) != IN_PROGRESS)
{
diff --git a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackwingLair/boss_nefarian.cpp b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackwingLair/boss_nefarian.cpp
index 89cfa1de524..e8e406c302f 100644
--- a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackwingLair/boss_nefarian.cpp
+++ b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackwingLair/boss_nefarian.cpp
@@ -374,7 +374,7 @@ public:
}
}
- bool GossipSelect(Player* player, uint32 menuId, uint32 gossipListId) override
+ bool OnGossipSelect(Player* player, uint32 menuId, uint32 gossipListId) override
{
if (menuId == GOSSIP_ID && gossipListId == GOSSIP_OPTION_ID)
{
diff --git a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackwingLair/boss_razorgore.cpp b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackwingLair/boss_razorgore.cpp
index e36416d4d5f..740339afd6a 100644
--- a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackwingLair/boss_razorgore.cpp
+++ b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackwingLair/boss_razorgore.cpp
@@ -181,7 +181,7 @@ class go_orb_of_domination : public GameObjectScript
InstanceScript* instance;
- bool GossipHello(Player* player) override
+ bool OnGossipHello(Player* player) override
{
if (instance->GetData(DATA_EGG_EVENT) != DONE)
{
diff --git a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackwingLair/boss_vaelastrasz.cpp b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackwingLair/boss_vaelastrasz.cpp
index 9477162c0fb..68a35ebb93d 100644
--- a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackwingLair/boss_vaelastrasz.cpp
+++ b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackwingLair/boss_vaelastrasz.cpp
@@ -222,7 +222,7 @@ public:
DoMeleeAttackIfReady();
}
- bool GossipSelect(Player* player, uint32 menuId, uint32 gossipListId) override
+ bool OnGossipSelect(Player* player, uint32 menuId, uint32 gossipListId) override
{
if (menuId == GOSSIP_ID && gossipListId == 0)
{
diff --git a/src/server/scripts/EasternKingdoms/BlackrockMountain/MoltenCore/boss_majordomo_executus.cpp b/src/server/scripts/EasternKingdoms/BlackrockMountain/MoltenCore/boss_majordomo_executus.cpp
index e2fdd2154f2..2d43e9ddb3f 100644
--- a/src/server/scripts/EasternKingdoms/BlackrockMountain/MoltenCore/boss_majordomo_executus.cpp
+++ b/src/server/scripts/EasternKingdoms/BlackrockMountain/MoltenCore/boss_majordomo_executus.cpp
@@ -195,7 +195,7 @@ class boss_majordomo : public CreatureScript
}
}
- bool GossipSelect(Player* player, uint32 menuId, uint32 gossipListId) override
+ bool OnGossipSelect(Player* player, uint32 menuId, uint32 gossipListId) override
{
if (menuId == MENU_OPTION_YOU_CHALLENGED_US && gossipListId == OPTION_ID_YOU_CHALLENGED_US)
{
diff --git a/src/server/scripts/EasternKingdoms/Gnomeregan/gnomeregan.cpp b/src/server/scripts/EasternKingdoms/Gnomeregan/gnomeregan.cpp
index 1bd12a1837b..993db0a6dbc 100644
--- a/src/server/scripts/EasternKingdoms/Gnomeregan/gnomeregan.cpp
+++ b/src/server/scripts/EasternKingdoms/Gnomeregan/gnomeregan.cpp
@@ -129,7 +129,7 @@ public:
}
}
- bool GossipSelect(Player* player, uint32 /*menuId*/, uint32 gossipListId) override
+ bool OnGossipSelect(Player* player, uint32 /*menuId*/, uint32 gossipListId) override
{
if (gossipListId == 0)
{
diff --git a/src/server/scripts/EasternKingdoms/Karazhan/boss_nightbane.cpp b/src/server/scripts/EasternKingdoms/Karazhan/boss_nightbane.cpp
index 5c7482871ed..7f78d2383ee 100644
--- a/src/server/scripts/EasternKingdoms/Karazhan/boss_nightbane.cpp
+++ b/src/server/scripts/EasternKingdoms/Karazhan/boss_nightbane.cpp
@@ -428,7 +428,7 @@ class go_blackened_urn : public GameObjectScript
InstanceScript* instance;
- bool GossipHello(Player* /*player*/) override
+ bool OnGossipHello(Player* /*player*/) override
{
if (me->HasFlag(GO_FLAG_IN_USE))
return false;
diff --git a/src/server/scripts/EasternKingdoms/Karazhan/bosses_opera.cpp b/src/server/scripts/EasternKingdoms/Karazhan/bosses_opera.cpp
index 5143fec5720..6942bd46368 100644
--- a/src/server/scripts/EasternKingdoms/Karazhan/bosses_opera.cpp
+++ b/src/server/scripts/EasternKingdoms/Karazhan/bosses_opera.cpp
@@ -821,7 +821,7 @@ class npc_grandmother : public CreatureScript
{
npc_grandmotherAI(Creature* creature) : ScriptedAI(creature) { }
- bool GossipSelect(Player* player, uint32 menuId, uint32 gossipListId) override
+ bool OnGossipSelect(Player* player, uint32 menuId, uint32 gossipListId) override
{
if (menuId == OPTION_WHAT_PHAT_LEWTS_YOU_HAVE && gossipListId == 0)
{
diff --git a/src/server/scripts/EasternKingdoms/Karazhan/karazhan.cpp b/src/server/scripts/EasternKingdoms/Karazhan/karazhan.cpp
index a19a76c561c..e9eac223c52 100644
--- a/src/server/scripts/EasternKingdoms/Karazhan/karazhan.cpp
+++ b/src/server/scripts/EasternKingdoms/Karazhan/karazhan.cpp
@@ -335,7 +335,7 @@ public:
}
}
- bool GossipSelect(Player* player, uint32 /*menuId*/, uint32 gossipListId) override
+ bool OnGossipSelect(Player* player, uint32 /*menuId*/, uint32 gossipListId) override
{
uint32 const action = player->PlayerTalkClass->GetGossipOptionAction(gossipListId);
ClearGossipMenuFor(player);
@@ -371,7 +371,7 @@ public:
return true;
}
- bool GossipHello(Player* player) override
+ bool OnGossipHello(Player* player) override
{
// Check for death of Moroes and if opera event is not done already
if (instance->GetBossState(DATA_MOROES) == DONE && instance->GetBossState(DATA_OPERA_PERFORMANCE) != DONE)
diff --git a/src/server/scripts/EasternKingdoms/MagistersTerrace/magisters_terrace.cpp b/src/server/scripts/EasternKingdoms/MagistersTerrace/magisters_terrace.cpp
index d7092d7a9da..4eec707d18f 100644
--- a/src/server/scripts/EasternKingdoms/MagistersTerrace/magisters_terrace.cpp
+++ b/src/server/scripts/EasternKingdoms/MagistersTerrace/magisters_terrace.cpp
@@ -107,7 +107,7 @@ public:
}
}
- bool GossipSelect(Player* player, uint32 /*menuId*/, uint32 gossipListId) override
+ bool OnGossipSelect(Player* player, uint32 /*menuId*/, uint32 gossipListId) override
{
uint32 const action = player->PlayerTalkClass->GetGossipOptionAction(gossipListId);
ClearGossipMenuFor(player);
@@ -137,7 +137,7 @@ public:
return true;
}
- bool GossipHello(Player* player) override
+ bool OnGossipHello(Player* player) override
{
if (me->IsQuestGiver())
player->PrepareQuestMenu(me->GetGUID());
diff --git a/src/server/scripts/EasternKingdoms/ScarletEnclave/chapter1.cpp b/src/server/scripts/EasternKingdoms/ScarletEnclave/chapter1.cpp
index 08404f919fa..68f79008b5c 100644
--- a/src/server/scripts/EasternKingdoms/ScarletEnclave/chapter1.cpp
+++ b/src/server/scripts/EasternKingdoms/ScarletEnclave/chapter1.cpp
@@ -332,7 +332,7 @@ class go_acherus_soul_prison : public GameObjectScript
{
go_acherus_soul_prisonAI(GameObject* go) : GameObjectAI(go) { }
- bool GossipHello(Player* player) override
+ bool OnGossipHello(Player* player) override
{
if (Creature* anchor = me->FindNearestCreature(29521, 15))
{
@@ -651,7 +651,7 @@ public:
CombatAI::UpdateAI(uiDiff);
}
- bool GossipSelect(Player* player, uint32 /*menuId*/, uint32 gossipListId) override
+ bool OnGossipSelect(Player* player, uint32 /*menuId*/, uint32 gossipListId) override
{
uint32 const action = player->PlayerTalkClass->GetGossipOptionAction(gossipListId);
ClearGossipMenuFor(player);
@@ -674,7 +674,7 @@ public:
return true;
}
- bool GossipHello(Player* player) override
+ bool OnGossipHello(Player* player) override
{
if (player->GetQuestStatus(QUEST_DEATH_CHALLENGE) == QUEST_STATUS_INCOMPLETE && me->IsFullHealth())
{
@@ -797,7 +797,7 @@ public:
{
npc_salanar_the_horsemanAI(Creature* creature) : ScriptedAI(creature) { }
- bool GossipSelect(Player* player, uint32 menuId, uint32 gossipListId) override
+ bool OnGossipSelect(Player* player, uint32 menuId, uint32 gossipListId) override
{
if (menuId == GOSSIP_SALANAR_MENU && gossipListId == GOSSIP_SALANAR_OPTION)
{
diff --git a/src/server/scripts/EasternKingdoms/ScarletEnclave/chapter2.cpp b/src/server/scripts/EasternKingdoms/ScarletEnclave/chapter2.cpp
index 5d78d732c11..3e5f1f3654e 100644
--- a/src/server/scripts/EasternKingdoms/ScarletEnclave/chapter2.cpp
+++ b/src/server/scripts/EasternKingdoms/ScarletEnclave/chapter2.cpp
@@ -109,7 +109,7 @@ struct npc_koltira_deathweaver : public ScriptedAI
_eventGossip = false;
}
- bool GossipHello(Player* player) override
+ bool OnGossipHello(Player* player) override
{
ObjectGuid const guid = me->GetGUID();
_playerGUID = player->GetGUID();
@@ -127,7 +127,7 @@ struct npc_koltira_deathweaver : public ScriptedAI
return false;
}
- void QuestAccept(Player* /* player */, Quest const* quest) override
+ void OnQuestAccept(Player* /* player */, Quest const* quest) override
{
if (quest->GetQuestId() == QUEST_BLOODY_BREAKOUT)
{
diff --git a/src/server/scripts/EasternKingdoms/ScarletEnclave/chapter5.cpp b/src/server/scripts/EasternKingdoms/ScarletEnclave/chapter5.cpp
index 00d6b58788c..3fe223f99de 100644
--- a/src/server/scripts/EasternKingdoms/ScarletEnclave/chapter5.cpp
+++ b/src/server/scripts/EasternKingdoms/ScarletEnclave/chapter5.cpp
@@ -1613,7 +1613,7 @@ public:
}
}
- bool GossipSelect(Player* player, uint32 /*menuId*/, uint32 gossipListId) override
+ bool OnGossipSelect(Player* player, uint32 /*menuId*/, uint32 gossipListId) override
{
uint32 const action = player->PlayerTalkClass->GetGossipOptionAction(gossipListId);
ClearGossipMenuFor(player);
@@ -1628,7 +1628,7 @@ public:
return true;
}
- bool GossipHello(Player* player) override
+ bool OnGossipHello(Player* player) override
{
if (me->IsQuestGiver())
player->PrepareQuestMenu(me->GetGUID());
diff --git a/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_headless_horseman.cpp b/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_headless_horseman.cpp
index eebe379b8c7..2349733716a 100644
--- a/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_headless_horseman.cpp
+++ b/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_headless_horseman.cpp
@@ -898,7 +898,7 @@ struct go_loosely_turned_soil : public GameObjectAI
{
go_loosely_turned_soil(GameObject* go) : GameObjectAI(go), instance(go->GetInstanceScript()) { }
- bool GossipHello(Player* player) override
+ bool OnGossipHello(Player* player) override
{
if (instance->GetBossState(DATA_HORSEMAN_EVENT) == IN_PROGRESS || player->GetQuestStatus(QUEST_CALL_THE_HEADLESS_HORSEMAN) != QUEST_STATUS_COMPLETE)
return true;
@@ -906,7 +906,7 @@ struct go_loosely_turned_soil : public GameObjectAI
return false;
}
- void QuestReward(Player* player, Quest const* /*quest*/, LootItemType /*type*/, uint32 /*opt*/) override
+ void OnQuestReward(Player* player, Quest const* /*quest*/, LootItemType /*type*/, uint32 /*opt*/) override
{
if (instance->GetBossState(DATA_HORSEMAN_EVENT) == IN_PROGRESS)
return;
diff --git a/src/server/scripts/EasternKingdoms/Scholomance/boss_kirtonos_the_herald.cpp b/src/server/scripts/EasternKingdoms/Scholomance/boss_kirtonos_the_herald.cpp
index 99f4b1887fb..39b658f700e 100644
--- a/src/server/scripts/EasternKingdoms/Scholomance/boss_kirtonos_the_herald.cpp
+++ b/src/server/scripts/EasternKingdoms/Scholomance/boss_kirtonos_the_herald.cpp
@@ -286,7 +286,7 @@ class go_brazier_of_the_herald : public GameObjectScript
{
go_brazier_of_the_heraldAI(GameObject* go) : GameObjectAI(go) { }
- bool GossipHello(Player* player) override
+ bool OnGossipHello(Player* player) override
{
me->UseDoorOrButton();
me->PlayDirectSound(SOUND_SCREECH, nullptr);
diff --git a/src/server/scripts/EasternKingdoms/ShadowfangKeep/boss_apothecary_hummel.cpp b/src/server/scripts/EasternKingdoms/ShadowfangKeep/boss_apothecary_hummel.cpp
index b218f8a116c..af4f39f8140 100644
--- a/src/server/scripts/EasternKingdoms/ShadowfangKeep/boss_apothecary_hummel.cpp
+++ b/src/server/scripts/EasternKingdoms/ShadowfangKeep/boss_apothecary_hummel.cpp
@@ -100,7 +100,7 @@ class boss_apothecary_hummel : public CreatureScript
{
boss_apothecary_hummelAI(Creature* creature) : BossAI(creature, DATA_APOTHECARY_HUMMEL), _deadCount(0), _isDead(false) { }
- bool GossipSelect(Player* player, uint32 menuId, uint32 gossipListId) override
+ bool OnGossipSelect(Player* player, uint32 menuId, uint32 gossipListId) override
{
if (menuId == GOSSIP_MENU_HUMMEL && gossipListId == GOSSIP_OPTION_START)
{
@@ -266,7 +266,7 @@ class boss_apothecary_hummel : public CreatureScript
DoMeleeAttackIfReady();
}
- void QuestReward(Player* /*player*/, Quest const* quest, LootItemType /*type*/, uint32 /*opt*/) override
+ void OnQuestReward(Player* /*player*/, Quest const* quest, LootItemType /*type*/, uint32 /*opt*/) override
{
if (quest->GetQuestId() == QUEST_YOUVE_BEEN_SERVED)
DoAction(ACTION_START_EVENT);
diff --git a/src/server/scripts/EasternKingdoms/ShadowfangKeep/shadowfang_keep.cpp b/src/server/scripts/EasternKingdoms/ShadowfangKeep/shadowfang_keep.cpp
index 66855e5c182..e577cb40d4f 100644
--- a/src/server/scripts/EasternKingdoms/ShadowfangKeep/shadowfang_keep.cpp
+++ b/src/server/scripts/EasternKingdoms/ShadowfangKeep/shadowfang_keep.cpp
@@ -116,7 +116,7 @@ public:
void Reset() override { }
void JustEngagedWith(Unit* /*who*/) override { }
- bool GossipSelect(Player* player, uint32 /*menuId*/, uint32 gossipListId) override
+ bool OnGossipSelect(Player* player, uint32 /*menuId*/, uint32 gossipListId) override
{
uint32 const action = player->PlayerTalkClass->GetGossipOptionAction(gossipListId);
ClearGossipMenuFor(player);
@@ -128,7 +128,7 @@ public:
return true;
}
- bool GossipHello(Player* player) override
+ bool OnGossipHello(Player* player) override
{
if (instance->GetData(TYPE_FREE_NPC) != DONE && instance->GetData(TYPE_RETHILGORE) == DONE)
AddGossipItemFor(player, Player::GetDefaultGossipMenuForSource(me), 0, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 1);
diff --git a/src/server/scripts/EasternKingdoms/Stratholme/stratholme.cpp b/src/server/scripts/EasternKingdoms/Stratholme/stratholme.cpp
index d2b3b6e9329..bb32a41ba0e 100644
--- a/src/server/scripts/EasternKingdoms/Stratholme/stratholme.cpp
+++ b/src/server/scripts/EasternKingdoms/Stratholme/stratholme.cpp
@@ -58,7 +58,7 @@ class go_gauntlet_gate : public GameObjectScript
InstanceScript* instance;
- bool GossipHello(Player* player) override
+ bool OnGossipHello(Player* player) override
{
if (instance->GetData(TYPE_BARON_RUN) != NOT_STARTED)
return false;
diff --git a/src/server/scripts/EasternKingdoms/SunkenTemple/sunken_temple.cpp b/src/server/scripts/EasternKingdoms/SunkenTemple/sunken_temple.cpp
index a873b421e0e..d09f974bda0 100644
--- a/src/server/scripts/EasternKingdoms/SunkenTemple/sunken_temple.cpp
+++ b/src/server/scripts/EasternKingdoms/SunkenTemple/sunken_temple.cpp
@@ -74,7 +74,7 @@ class go_atalai_statue : public GameObjectScript
InstanceScript* instance;
- bool GossipHello(Player* /*player*/) override
+ bool OnGossipHello(Player* /*player*/) override
{
instance->SetData(EVENT_STATE, me->GetEntry());
return false;
diff --git a/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_kalecgos.cpp b/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_kalecgos.cpp
index 8b3a9de81a9..92fd5fdb021 100644
--- a/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_kalecgos.cpp
+++ b/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_kalecgos.cpp
@@ -586,7 +586,7 @@ class go_kalecgos_spectral_rift : public GameObjectScript
{
go_kalecgos_spectral_riftAI(GameObject* go) : GameObjectAI(go) { }
- bool GossipHello(Player* player) override
+ bool OnGossipHello(Player* player) override
{
if (!player->HasAura(SPELL_SPECTRAL_EXHAUSTION))
player->CastSpell(player, SPELL_SPECTRAL_REALM_TRIGGER, true);
diff --git a/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_kiljaeden.cpp b/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_kiljaeden.cpp
index 3f4c5dcb1f9..f5dd7b3300e 100644
--- a/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_kiljaeden.cpp
+++ b/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_kiljaeden.cpp
@@ -379,7 +379,7 @@ class go_orb_of_the_blue_flight : public GameObjectScript
InstanceScript* instance;
- bool GossipHello(Player* player) override
+ bool OnGossipHello(Player* player) override
{
if (me->GetFaction() == FACTION_FRIENDLY)
{
diff --git a/src/server/scripts/EasternKingdoms/Uldaman/boss_archaedas.cpp b/src/server/scripts/EasternKingdoms/Uldaman/boss_archaedas.cpp
index cd806150d53..d65071ee5d7 100644
--- a/src/server/scripts/EasternKingdoms/Uldaman/boss_archaedas.cpp
+++ b/src/server/scripts/EasternKingdoms/Uldaman/boss_archaedas.cpp
@@ -406,7 +406,7 @@ class go_altar_of_archaedas : public GameObjectScript
InstanceScript* instance;
- bool GossipHello(Player* player) override
+ bool OnGossipHello(Player* player) override
{
player->CastSpell(player, SPELL_BOSS_OBJECT_VISUAL, false);
diff --git a/src/server/scripts/EasternKingdoms/Uldaman/uldaman.cpp b/src/server/scripts/EasternKingdoms/Uldaman/uldaman.cpp
index 032187105c6..166898c8213 100644
--- a/src/server/scripts/EasternKingdoms/Uldaman/uldaman.cpp
+++ b/src/server/scripts/EasternKingdoms/Uldaman/uldaman.cpp
@@ -48,7 +48,7 @@ class go_keystone_chamber : public GameObjectScript
InstanceScript* instance;
- bool GossipHello(Player* /*player*/) override
+ bool OnGossipHello(Player* /*player*/) override
{
instance->SetData(DATA_IRONAYA_SEAL, IN_PROGRESS); //door animation and save state.
return false;
diff --git a/src/server/scripts/EasternKingdoms/ZulAman/zulaman.cpp b/src/server/scripts/EasternKingdoms/ZulAman/zulaman.cpp
index f566e25fb72..bb525f0d645 100644
--- a/src/server/scripts/EasternKingdoms/ZulAman/zulaman.cpp
+++ b/src/server/scripts/EasternKingdoms/ZulAman/zulaman.cpp
@@ -101,7 +101,7 @@ class npc_voljin_zulaman : public CreatureScript
_gongCount = 0;
}
- bool GossipSelect(Player* player, uint32 menuId, uint32 gossipListId) override
+ bool OnGossipSelect(Player* player, uint32 menuId, uint32 gossipListId) override
{
if (_instance->GetData(DATA_ZULAMAN_STATE) != NOT_STARTED)
return true;
diff --git a/src/server/scripts/EasternKingdoms/zone_hinterlands.cpp b/src/server/scripts/EasternKingdoms/zone_hinterlands.cpp
index 8eba38bc3e9..1005b361b95 100644
--- a/src/server/scripts/EasternKingdoms/zone_hinterlands.cpp
+++ b/src/server/scripts/EasternKingdoms/zone_hinterlands.cpp
@@ -71,7 +71,7 @@ public:
summoned->GetMotionMaster()->MovePoint(0, me->GetPositionX(), me->GetPositionY(), me->GetPositionZ());
}
- void QuestAccept(Player* player, Quest const* quest) override
+ void OnQuestAccept(Player* player, Quest const* quest) override
{
if (quest->GetQuestId() == QUEST_RESQUE_OOX_09)
{
diff --git a/src/server/scripts/EasternKingdoms/zone_isle_of_queldanas.cpp b/src/server/scripts/EasternKingdoms/zone_isle_of_queldanas.cpp
index 71065322dc1..8bddc6d6708 100644
--- a/src/server/scripts/EasternKingdoms/zone_isle_of_queldanas.cpp
+++ b/src/server/scripts/EasternKingdoms/zone_isle_of_queldanas.cpp
@@ -126,7 +126,7 @@ struct npc_thalorien_dawnseeker : public ScriptedAI
{
}
- bool GossipSelect(Player* player, uint32 menuId, uint32 /*gossipListId*/) override
+ bool OnGossipSelect(Player* player, uint32 menuId, uint32 /*gossipListId*/) override
{
if (menuId == MENU_EXAMINE_REMAINS)
{
diff --git a/src/server/scripts/EasternKingdoms/zone_tol_barad.cpp b/src/server/scripts/EasternKingdoms/zone_tol_barad.cpp
index b8fe8a65f3f..f1146f0a60e 100644
--- a/src/server/scripts/EasternKingdoms/zone_tol_barad.cpp
+++ b/src/server/scripts/EasternKingdoms/zone_tol_barad.cpp
@@ -55,7 +55,7 @@ class npc_tb_spirit_guide : public CreatureScript
DoCast(me, SPELL_CHANNEL_SPIRIT_HEAL);
}
- bool GossipSelect(Player* player, uint32 /*menuId*/, uint32 gossipListId) override
+ bool OnGossipSelect(Player* player, uint32 /*menuId*/, uint32 gossipListId) override
{
player->PlayerTalkClass->SendCloseGossip();
diff --git a/src/server/scripts/EasternKingdoms/zone_undercity.cpp b/src/server/scripts/EasternKingdoms/zone_undercity.cpp
index e223f81fe83..41e1942865b 100644
--- a/src/server/scripts/EasternKingdoms/zone_undercity.cpp
+++ b/src/server/scripts/EasternKingdoms/zone_undercity.cpp
@@ -236,7 +236,7 @@ public:
DoMeleeAttackIfReady();
}
- void QuestReward(Player* player, Quest const* quest, LootItemType /*type*/, uint32 /*opt*/) override
+ void OnQuestReward(Player* player, Quest const* quest, LootItemType /*type*/, uint32 /*opt*/) override
{
if (quest->GetQuestId() == QUEST_JOURNEY_TO_UNDERCITY)
SetGUID(player->GetGUID(), GUID_EVENT_INVOKER);