diff options
| author | Maks Szokalski <42069493+illunix@users.noreply.github.com> | 2020-09-10 16:57:11 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-09-10 16:57:11 +0200 |
| commit | 41188eb535e445b73909659980257da2939e4be4 (patch) | |
| tree | 7c4efaa1a9d2478447624ab13c2e101dbbc4e4a4 /src/server/scripts/Outland | |
| parent | feaaa595cae735bb6093b24a88562c27b2723cfe (diff) | |
Add "On" to some gossip methods in AI (#25415)
* Add "On" to some methods
* Update npc_innkeeper.cpp
* Update zone_borean_tundra.cpp
Diffstat (limited to 'src/server/scripts/Outland')
14 files changed, 22 insertions, 22 deletions
diff --git a/src/server/scripts/Outland/BlackTemple/boss_illidan.cpp b/src/server/scripts/Outland/BlackTemple/boss_illidan.cpp index 916598b6f01..1f9bdfd41a5 100644 --- a/src/server/scripts/Outland/BlackTemple/boss_illidan.cpp +++ b/src/server/scripts/Outland/BlackTemple/boss_illidan.cpp @@ -1063,7 +1063,7 @@ struct npc_akama_illidan : public ScriptedAI _isTeleportToMinions = false; } - bool GossipSelect(Player* player, uint32 /*menuId*/, uint32 gossipListId) override + bool OnGossipSelect(Player* player, uint32 /*menuId*/, uint32 gossipListId) override { if (gossipListId == GOSSIP_START_INTRO) { diff --git a/src/server/scripts/Outland/BlackTemple/boss_shade_of_akama.cpp b/src/server/scripts/Outland/BlackTemple/boss_shade_of_akama.cpp index e05890b004e..47e3b10ebdb 100644 --- a/src/server/scripts/Outland/BlackTemple/boss_shade_of_akama.cpp +++ b/src/server/scripts/Outland/BlackTemple/boss_shade_of_akama.cpp @@ -533,7 +533,7 @@ struct npc_akama_shade : public ScriptedAI shade->AI()->EnterEvadeMode(EVADE_REASON_OTHER); } - 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/Outland/BlackTemple/boss_warlord_najentus.cpp b/src/server/scripts/Outland/BlackTemple/boss_warlord_najentus.cpp index c8e4a1cc8ad..0b59044f955 100644 --- a/src/server/scripts/Outland/BlackTemple/boss_warlord_najentus.cpp +++ b/src/server/scripts/Outland/BlackTemple/boss_warlord_najentus.cpp @@ -181,7 +181,7 @@ struct go_najentus_spine : public GameObjectAI { go_najentus_spine(GameObject* go) : GameObjectAI(go), _instance(go->GetInstanceScript()) { } - bool GossipHello(Player* player) override + bool OnGossipHello(Player* player) override { if (!_instance) return false; diff --git a/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_lurker_below.cpp b/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_lurker_below.cpp index f3a0663dd69..415d8abc69c 100644 --- a/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_lurker_below.cpp +++ b/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_lurker_below.cpp @@ -458,7 +458,7 @@ class go_strange_pool : public GameObjectScript InstanceScript* instance; - bool GossipHello(Player* player) override + bool OnGossipHello(Player* player) override { // 25% if (!urand(0, 3)) diff --git a/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/instance_serpent_shrine.cpp b/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/instance_serpent_shrine.cpp index 2ce2d1ba329..345a7a71ccc 100644 --- a/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/instance_serpent_shrine.cpp +++ b/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/instance_serpent_shrine.cpp @@ -73,7 +73,7 @@ class go_bridge_console : public GameObjectScript InstanceScript* instance; - bool GossipHello(Player* /*player*/) override + bool OnGossipHello(Player* /*player*/) override { if (instance) instance->SetData(DATA_CONTROL_CONSOLE, DONE); diff --git a/src/server/scripts/Outland/CoilfangReservoir/SteamVault/instance_steam_vault.cpp b/src/server/scripts/Outland/CoilfangReservoir/SteamVault/instance_steam_vault.cpp index 5cae7b20774..4521591cbaa 100644 --- a/src/server/scripts/Outland/CoilfangReservoir/SteamVault/instance_steam_vault.cpp +++ b/src/server/scripts/Outland/CoilfangReservoir/SteamVault/instance_steam_vault.cpp @@ -29,7 +29,7 @@ struct go_main_chambers_access_panel : public GameObjectAI { go_main_chambers_access_panel(GameObject* go) : GameObjectAI(go), _instance(go->GetInstanceScript()) { } - bool GossipHello(Player* /*player*/) override + bool OnGossipHello(Player* /*player*/) override { if (Creature* controller = _instance->GetCreature(DATA_DOOR_CONTROLLER)) controller->AI()->Talk(CONTROLLER_TEXT_ACESS_USED); diff --git a/src/server/scripts/Outland/CoilfangReservoir/TheSlavePens/boss_ahune.cpp b/src/server/scripts/Outland/CoilfangReservoir/TheSlavePens/boss_ahune.cpp index 4db1d11d9c6..5b3cd1f7523 100644 --- a/src/server/scripts/Outland/CoilfangReservoir/TheSlavePens/boss_ahune.cpp +++ b/src/server/scripts/Outland/CoilfangReservoir/TheSlavePens/boss_ahune.cpp @@ -600,7 +600,7 @@ public: { go_ahune_ice_stoneAI(GameObject* go) : GameObjectAI(go), _instance(go->GetInstanceScript()) { } - bool GossipSelect(Player* player, uint32 /*menuId*/, uint32 /*gossipListId*/) override + bool OnGossipSelect(Player* player, uint32 /*menuId*/, uint32 /*gossipListId*/) override { ClearGossipMenuFor(player); diff --git a/src/server/scripts/Outland/HellfireCitadel/BloodFurnace/boss_broggok.cpp b/src/server/scripts/Outland/HellfireCitadel/BloodFurnace/boss_broggok.cpp index 8653254d5f0..ad4a4ab0d35 100644 --- a/src/server/scripts/Outland/HellfireCitadel/BloodFurnace/boss_broggok.cpp +++ b/src/server/scripts/Outland/HellfireCitadel/BloodFurnace/boss_broggok.cpp @@ -254,7 +254,7 @@ class go_broggok_lever : public GameObjectScript InstanceScript* instance; - bool GossipHello(Player* /*player*/) override + bool OnGossipHello(Player* /*player*/) override { if (instance->GetBossState(DATA_BROGGOK) != DONE && instance->GetBossState(DATA_BROGGOK) != IN_PROGRESS) { diff --git a/src/server/scripts/Outland/HellfireCitadel/MagtheridonsLair/boss_magtheridon.cpp b/src/server/scripts/Outland/HellfireCitadel/MagtheridonsLair/boss_magtheridon.cpp index 3cf19773fef..77b097cde57 100644 --- a/src/server/scripts/Outland/HellfireCitadel/MagtheridonsLair/boss_magtheridon.cpp +++ b/src/server/scripts/Outland/HellfireCitadel/MagtheridonsLair/boss_magtheridon.cpp @@ -475,7 +475,7 @@ public: { go_manticron_cubeAI(GameObject* go) : GameObjectAI(go) { } - bool GossipHello(Player* player) override + bool OnGossipHello(Player* player) override { if (player->HasAura(SPELL_MIND_EXHAUSTION) || player->HasAura(SPELL_SHADOW_GRASP)) return true; diff --git a/src/server/scripts/Outland/zone_blades_edge_mountains.cpp b/src/server/scripts/Outland/zone_blades_edge_mountains.cpp index 383211f604a..282ec59ce7d 100644 --- a/src/server/scripts/Outland/zone_blades_edge_mountains.cpp +++ b/src/server/scripts/Outland/zone_blades_edge_mountains.cpp @@ -259,7 +259,7 @@ public: { go_legion_obeliskAI(GameObject* go) : GameObjectAI(go) { } - bool GossipHello(Player* player) override + bool OnGossipHello(Player* player) override { if (player->GetQuestStatus(QUEST_YOURE_FIRED) == QUEST_STATUS_INCOMPLETE) { @@ -850,7 +850,7 @@ class go_simon_cluster : public GameObjectScript { go_simon_clusterAI(GameObject* go) : GameObjectAI(go) { } - bool GossipHello(Player* player) override + bool OnGossipHello(Player* player) override { if (Creature* bunny = me->FindNearestCreature(NPC_SIMON_BUNNY, 12.0f, true)) bunny->AI()->SetData(me->GetEntry(), 0); @@ -886,14 +886,14 @@ class go_apexis_relic : public GameObjectScript { go_apexis_relicAI(GameObject* go) : GameObjectAI(go) { } - bool GossipHello(Player* player) override + bool OnGossipHello(Player* player) override { player->PrepareGossipMenu(me, me->GetGOInfo()->questgiver.gossipID); player->SendPreparedGossip(me); return true; } - bool GossipSelect(Player* player, uint32 /*menuId*/, uint32 /*gossipListId*/) override + bool OnGossipSelect(Player* player, uint32 /*menuId*/, uint32 /*gossipListId*/) override { CloseGossipMenuFor(player); diff --git a/src/server/scripts/Outland/zone_hellfire_peninsula.cpp b/src/server/scripts/Outland/zone_hellfire_peninsula.cpp index e260d129344..b796bbc528c 100644 --- a/src/server/scripts/Outland/zone_hellfire_peninsula.cpp +++ b/src/server/scripts/Outland/zone_hellfire_peninsula.cpp @@ -279,7 +279,7 @@ public: summoned->AI()->AttackStart(me); } - void QuestAccept(Player* player, Quest const* quest) override + void OnQuestAccept(Player* player, Quest const* quest) override { if (quest->GetQuestId() == QUEST_ROAD_TO_FALCON_WATCH) { @@ -522,7 +522,7 @@ public: } } - bool GossipHello(Player* player) override + bool OnGossipHello(Player* player) override { if (success) player->KilledMonsterCredit(NPC_COLONEL_JULES, ObjectGuid::Empty); @@ -577,7 +577,7 @@ public: me->SetFlag(UNIT_NPC_FLAGS, UNIT_NPC_FLAG_GOSSIP); } - bool GossipSelect(Player* player, uint32 /*menuId*/, uint32 gossipListId) override + bool OnGossipSelect(Player* player, uint32 /*menuId*/, uint32 gossipListId) override { ClearGossipMenuFor(player); switch (gossipListId) @@ -914,7 +914,7 @@ public: DoMeleeAttackIfReady(); } - bool GossipSelect(Player* player, uint32 /*menuId*/, uint32 /*gossipListId*/) override + bool OnGossipSelect(Player* player, uint32 /*menuId*/, uint32 /*gossipListId*/) override { CloseGossipMenuFor(player); me->StopMoving(); diff --git a/src/server/scripts/Outland/zone_nagrand.cpp b/src/server/scripts/Outland/zone_nagrand.cpp index 0686e27c8a2..6067f4cd24b 100644 --- a/src/server/scripts/Outland/zone_nagrand.cpp +++ b/src/server/scripts/Outland/zone_nagrand.cpp @@ -201,7 +201,7 @@ public: DoMeleeAttackIfReady(); } - void QuestAccept(Player* player, Quest const* quest) override + void OnQuestAccept(Player* player, Quest const* quest) override { if (quest->GetQuestId() == QUEST_TOTEM_KARDASH_H) { @@ -395,7 +395,7 @@ public: DoMeleeAttackIfReady(); } - void QuestAccept(Player* player, Quest const* quest) override + void OnQuestAccept(Player* player, Quest const* quest) override { if (quest->GetQuestId() == QUEST_TOTEM_KARDASH_A) { diff --git a/src/server/scripts/Outland/zone_shadowmoon_valley.cpp b/src/server/scripts/Outland/zone_shadowmoon_valley.cpp index dc9b5e79471..2e8c5669cbb 100644 --- a/src/server/scripts/Outland/zone_shadowmoon_valley.cpp +++ b/src/server/scripts/Outland/zone_shadowmoon_valley.cpp @@ -714,7 +714,7 @@ public: } } - void QuestAccept(Player* player, Quest const* quest) override + void OnQuestAccept(Player* player, Quest const* quest) override { if (quest->GetQuestId() == QUEST_ESCAPE_COILSCAR) { @@ -1346,7 +1346,7 @@ public: { go_crystal_prisonAI(GameObject* go) : GameObjectAI(go) { } - void QuestAccept(Player* player, Quest const* quest) override + void OnQuestAccept(Player* player, Quest const* quest) override { if (quest->GetQuestId() == QUEST_BATTLE_OF_THE_CRIMSON_WATCH) { diff --git a/src/server/scripts/Outland/zone_terokkar_forest.cpp b/src/server/scripts/Outland/zone_terokkar_forest.cpp index 43189392c53..2967ffc4448 100644 --- a/src/server/scripts/Outland/zone_terokkar_forest.cpp +++ b/src/server/scripts/Outland/zone_terokkar_forest.cpp @@ -242,7 +242,7 @@ public: } } - void QuestAccept(Player* player, Quest const* quest) override + void OnQuestAccept(Player* player, Quest const* quest) override { if (quest->GetQuestId() == ESCAPE_FROM_FIREWING_POINT_H || quest->GetQuestId() == ESCAPE_FROM_FIREWING_POINT_A) { |
