diff options
| author | Maks Szokalski <42069493+illunix@users.noreply.github.com> | 2020-09-10 16:57:11 +0200 |
|---|---|---|
| committer | Shauren <shauren.trinity@gmail.com> | 2022-02-05 22:18:19 +0100 |
| commit | bc04acb72652882290cef49b2055d3cf1ab12f36 (patch) | |
| tree | b430b10375254570eb8c4c9ed802066ba0c14b96 /src/server/scripts/World | |
| parent | 013c9b2cb7404a6d03443eb39f49622dcc99a7fa (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/World')
| -rw-r--r-- | src/server/scripts/World/go_scripts.cpp | 46 | ||||
| -rw-r--r-- | src/server/scripts/World/npc_innkeeper.cpp | 4 | ||||
| -rw-r--r-- | src/server/scripts/World/npc_professions.cpp | 20 | ||||
| -rw-r--r-- | src/server/scripts/World/npcs_special.cpp | 16 |
4 files changed, 43 insertions, 43 deletions
diff --git a/src/server/scripts/World/go_scripts.cpp b/src/server/scripts/World/go_scripts.cpp index a5bd5a56b46..51fdae16168 100644 --- a/src/server/scripts/World/go_scripts.cpp +++ b/src/server/scripts/World/go_scripts.cpp @@ -67,7 +67,7 @@ public: { go_gilded_brazierAI(GameObject* go) : GameObjectAI(go) { } - bool GossipHello(Player* player) override + bool OnGossipHello(Player* player) override { if (me->GetGoType() == GAMEOBJECT_TYPE_GOOBER) { @@ -101,7 +101,7 @@ public: go_tablet_of_the_sevenAI(GameObject* go) : GameObjectAI(go) { } /// @todo use gossip option ("Transcript the Tablet") instead, if Trinity adds support. - bool GossipHello(Player* player) override + bool OnGossipHello(Player* player) override { if (me->GetGoType() != GAMEOBJECT_TYPE_QUESTGIVER) return true; @@ -148,7 +148,7 @@ public: { go_ethereum_prisonAI(GameObject* go) : GameObjectAI(go) { } - bool GossipHello(Player* player) override + bool OnGossipHello(Player* player) override { me->UseDoorOrButton(); int Random = rand32() % (sizeof(NpcPrisonEntry) / sizeof(uint32)); @@ -208,7 +208,7 @@ public: { go_ethereum_stasisAI(GameObject* go) : GameObjectAI(go) { } - bool GossipHello(Player* player) override + bool OnGossipHello(Player* player) override { me->UseDoorOrButton(); int Random = rand32() % (sizeof(NpcStasisEntry) / sizeof(uint32)); @@ -244,7 +244,7 @@ public: { go_resonite_caskAI(GameObject* go) : GameObjectAI(go) { } - bool GossipHello(Player* /*player*/) override + bool OnGossipHello(Player* /*player*/) override { if (me->GetGoType() == GAMEOBJECT_TYPE_GOOBER) me->SummonCreature(NPC_GOGGEROC, 0.0f, 0.0f, 0.0f, 0.0f, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 5min); @@ -279,7 +279,7 @@ public: { go_southfury_moonstoneAI(GameObject* go) : GameObjectAI(go) { } - bool GossipHello(Player* player) override + bool OnGossipHello(Player* player) override { //implicitTarget=48 not implemented as of writing this code, and manual summon may be just ok for our purpose //player->CastSpell(player, SPELL_SUMMON_RIZZLE, false); @@ -318,7 +318,7 @@ public: { go_tele_to_dalaran_crystalAI(GameObject* go) : GameObjectAI(go) { } - bool GossipHello(Player* player) override + bool OnGossipHello(Player* player) override { if (player->GetQuestRewardStatus(QUEST_TELE_CRYSTAL_FLAG)) return false; @@ -347,7 +347,7 @@ public: { go_tele_to_violet_standAI(GameObject* go) : GameObjectAI(go) { } - bool GossipHello(Player* player) override + bool OnGossipHello(Player* player) override { if (player->GetQuestRewardStatus(QUEST_LEARN_LEAVE_RETURN) || player->GetQuestStatus(QUEST_LEARN_LEAVE_RETURN) == QUEST_STATUS_INCOMPLETE) return false; @@ -392,7 +392,7 @@ public: { go_matrix_punchographAI(GameObject* go) : GameObjectAI(go) { } - bool GossipHello(Player* player) override + bool OnGossipHello(Player* player) override { switch (me->GetEntry()) { @@ -455,7 +455,7 @@ public: { go_scourge_cageAI(GameObject* go) : GameObjectAI(go) { } - bool GossipHello(Player* player) override + bool OnGossipHello(Player* player) override { me->UseDoorOrButton(); if (Creature* pNearestPrisoner = me->FindNearestCreature(NPC_SCOURGE_PRISONER, 5.0f, true)) @@ -493,7 +493,7 @@ public: { go_arcane_prisonAI(GameObject* go) : GameObjectAI(go) { } - bool GossipHello(Player* player) override + bool OnGossipHello(Player* player) override { if (player->GetQuestStatus(QUEST_PRISON_BREAK) == QUEST_STATUS_INCOMPLETE) { @@ -530,7 +530,7 @@ public: { go_blood_filled_orbAI(GameObject* go) : GameObjectAI(go) { } - bool GossipHello(Player* player) override + bool OnGossipHello(Player* player) override { if (me->GetGoType() == GAMEOBJECT_TYPE_GOOBER) player->SummonCreature(NPC_ZELEMAR, -369.746f, 166.759f, -21.50f, 5.235f, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 30s); @@ -561,7 +561,7 @@ public: { go_table_thekaAI(GameObject* go) : GameObjectAI(go) { } - bool GossipHello(Player* player) override + bool OnGossipHello(Player* player) override { if (player->GetQuestStatus(QUEST_SPIDER_GOLD) == QUEST_STATUS_INCOMPLETE) player->AreaExploredOrEventHappens(QUEST_SPIDER_GOLD); @@ -592,7 +592,7 @@ class go_soulwell : public GameObjectScript { } - bool GossipHello(Player* player) override + bool OnGossipHello(Player* player) override { Unit* owner = me->GetOwner(); if (!owner || owner->GetTypeId() != TYPEID_PLAYER || !player->IsInSameRaidWith(owner->ToPlayer())) @@ -635,7 +635,7 @@ public: { go_amberpine_outhouseAI(GameObject* go) : GameObjectAI(go) { } - bool GossipHello(Player* player) override + bool OnGossipHello(Player* player) override { QuestStatus status = player->GetQuestStatus(QUEST_DOING_YOUR_DUTY); if (status == QUEST_STATUS_INCOMPLETE || status == QUEST_STATUS_COMPLETE || status == QUEST_STATUS_REWARDED) @@ -649,7 +649,7 @@ public: return true; } - 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); @@ -702,7 +702,7 @@ public: { go_hive_podAI(GameObject* go) : GameObjectAI(go) { } - bool GossipHello(Player* player) override + bool OnGossipHello(Player* player) override { player->SendLoot(me->GetGUID(), LOOT_CORPSE); me->SummonCreature(NPC_HIVE_AMBUSHER, me->GetPositionX() + 1, me->GetPositionY(), me->GetPositionZ(), me->GetAbsoluteAngle(player), TEMPSUMMON_TIMED_OR_DEAD_DESPAWN, 1min); @@ -726,7 +726,7 @@ class go_massive_seaforium_charge : public GameObjectScript { go_massive_seaforium_chargeAI(GameObject* go) : GameObjectAI(go) { } - bool GossipHello(Player* /*player*/) override + bool OnGossipHello(Player* /*player*/) override { me->SetLootState(GO_JUST_DEACTIVATED); return true; @@ -759,7 +759,7 @@ class go_veil_skith_cage : public GameObjectScript { go_veil_skith_cageAI(GameObject* go) : GameObjectAI(go) { } - bool GossipHello(Player* player) override + bool OnGossipHello(Player* player) override { me->UseDoorOrButton(); if (player->GetQuestStatus(QUEST_MISSING_FRIENDS) == QUEST_STATUS_INCOMPLETE) @@ -806,7 +806,7 @@ public: { go_frostblade_shrineAI(GameObject* go) : GameObjectAI(go) { } - bool GossipHello(Player* player) override + bool OnGossipHello(Player* player) override { me->UseDoorOrButton(10); if (!player->HasAura(SPELL_RECENT_MEDITATION)) @@ -845,7 +845,7 @@ public: { go_midsummer_bonfireAI(GameObject* go) : GameObjectAI(go) { } - bool GossipSelect(Player* player, uint32 /*menuId*/, uint32 /*gossipListId*/) override + bool OnGossipSelect(Player* player, uint32 /*menuId*/, uint32 /*gossipListId*/) override { player->CastSpell(player, STAMP_OUT_BONFIRE_QUEST_COMPLETE, true); CloseGossipMenuFor(player); @@ -884,7 +884,7 @@ public: { go_midsummer_ribbon_poleAI(GameObject* go) : GameObjectAI(go) { } - bool GossipHello(Player* player) override + bool OnGossipHello(Player* player) override { if (Creature* creature = me->FindNearestCreature(NPC_POLE_RIBBON_BUNNY, 10.0f)) { @@ -1471,4 +1471,4 @@ void AddSC_go_scripts() new go_darkmoon_faire_music(); new go_pirate_day_music(); new go_bells(); -} +}
\ No newline at end of file diff --git a/src/server/scripts/World/npc_innkeeper.cpp b/src/server/scripts/World/npc_innkeeper.cpp index 280de56ceb2..81c8dc93548 100644 --- a/src/server/scripts/World/npc_innkeeper.cpp +++ b/src/server/scripts/World/npc_innkeeper.cpp @@ -60,7 +60,7 @@ public: { npc_innkeeperAI(Creature* creature) : ScriptedAI(creature) { } - bool GossipHello(Player* player) override + bool OnGossipHello(Player* player) override { if (IsHolidayActive(HOLIDAY_HALLOWS_END) && !player->HasAura(SPELL_TRICK_OR_TREATED)) { @@ -109,7 +109,7 @@ public: return true; } - 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); diff --git a/src/server/scripts/World/npc_professions.cpp b/src/server/scripts/World/npc_professions.cpp index eb4ede9bad9..6a7895d38a9 100644 --- a/src/server/scripts/World/npc_professions.cpp +++ b/src/server/scripts/World/npc_professions.cpp @@ -438,7 +438,7 @@ public: return (player->HasSpell(S_TRANSMUTE) || player->HasSpell(S_ELIXIR) || player->HasSpell(S_POTION)); } - bool GossipHello(Player* player) override + bool OnGossipHello(Player* player) override { if (me->IsQuestGiver()) player->PrepareQuestMenu(me->GetGUID()); @@ -564,7 +564,7 @@ public: } } - bool GossipSelect(Player* player, uint32 /*menuId*/, uint32 gossipListId) override + bool OnGossipSelect(Player* player, uint32 /*menuId*/, uint32 gossipListId) override { uint32 const sender = player->PlayerTalkClass->GetGossipOptionSender(gossipListId); uint32 const action = player->PlayerTalkClass->GetGossipOptionAction(gossipListId); @@ -615,7 +615,7 @@ public: return (player->HasSpell(S_HAMMER) || player->HasSpell(S_AXE) || player->HasSpell(S_SWORD)); } - bool GossipHello(Player* player) override + bool OnGossipHello(Player* player) override { if (me->IsQuestGiver()) player->PrepareQuestMenu(me->GetGUID()); @@ -806,7 +806,7 @@ public: } } - bool GossipSelect(Player* player, uint32 /*menuId*/, uint32 gossipListId) override + bool OnGossipSelect(Player* player, uint32 /*menuId*/, uint32 gossipListId) override { uint32 const sender = player->PlayerTalkClass->GetGossipOptionSender(gossipListId); uint32 const action = player->PlayerTalkClass->GetGossipOptionAction(gossipListId); @@ -888,7 +888,7 @@ public: return res; } - bool GossipHello(Player* player) override + bool OnGossipHello(Player* player) override { uint32 npcTextId = 0; std::string gossipItem; @@ -928,7 +928,7 @@ public: return true; } - bool GossipSelect(Player* player, uint32 /*menuId*/, uint32 gossipListId) override + bool OnGossipSelect(Player* player, uint32 /*menuId*/, uint32 gossipListId) override { uint32 const sender = player->PlayerTalkClass->GetGossipOptionSender(gossipListId); uint32 const action = player->PlayerTalkClass->GetGossipOptionAction(gossipListId); @@ -978,7 +978,7 @@ public: { npc_prof_leatherAI(Creature* creature) : ScriptedAI(creature) { } - bool GossipHello(Player* player) override + bool OnGossipHello(Player* player) override { if (me->IsQuestGiver()) player->PrepareQuestMenu(me->GetGUID()); @@ -1066,7 +1066,7 @@ public: } } - bool GossipSelect(Player* player, uint32 /*menuId*/, uint32 gossipListId) override + bool OnGossipSelect(Player* player, uint32 /*menuId*/, uint32 gossipListId) override { uint32 const sender = player->PlayerTalkClass->GetGossipOptionSender(gossipListId); uint32 const action = player->PlayerTalkClass->GetGossipOptionAction(gossipListId); @@ -1113,7 +1113,7 @@ public: return (player->HasSpell(S_MOONCLOTH) || player->HasSpell(S_SHADOWEAVE) || player->HasSpell(S_SPELLFIRE)); } - bool GossipHello(Player* player) override + bool OnGossipHello(Player* player) override { if (me->IsQuestGiver()) player->PrepareQuestMenu(me->GetGUID()); @@ -1240,7 +1240,7 @@ public: } } - bool GossipSelect(Player* player, uint32 /*menuId*/, uint32 gossipListId) override + bool OnGossipSelect(Player* player, uint32 /*menuId*/, uint32 gossipListId) override { uint32 const sender = player->PlayerTalkClass->GetGossipOptionSender(gossipListId); uint32 const action = player->PlayerTalkClass->GetGossipOptionAction(gossipListId); diff --git a/src/server/scripts/World/npcs_special.cpp b/src/server/scripts/World/npcs_special.cpp index 26026076a84..7ded28f0e5d 100644 --- a/src/server/scripts/World/npcs_special.cpp +++ b/src/server/scripts/World/npcs_special.cpp @@ -277,13 +277,13 @@ public: } } - void QuestAccept(Player* /*player*/, Quest const* quest) override + void OnQuestAccept(Player* /*player*/, Quest const* quest) override { if (quest->GetQuestId() == QUEST_CLUCK) Reset(); } - 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_CLUCK) Reset(); @@ -742,7 +742,7 @@ public: void JustEngagedWith(Unit* /*who*/) override { } - void QuestAccept(Player* player, Quest const* quest) override + void OnQuestAccept(Player* player, Quest const* quest) override { if ((quest->GetQuestId() == 6624) || (quest->GetQuestId() == 6622)) BeginEvent(player); @@ -1603,7 +1603,7 @@ class npc_wormhole : public CreatureScript Initialize(); } - bool GossipHello(Player* player) override + bool OnGossipHello(Player* player) override { if (me->IsSummon()) { @@ -1625,7 +1625,7 @@ class npc_wormhole : public CreatureScript return true; } - 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); @@ -1692,7 +1692,7 @@ public: { npc_experienceAI(Creature* creature) : ScriptedAI(creature) { } - bool GossipHello(Player* player) override + bool OnGossipHello(Player* player) override { if (player->HasPlayerFlag(PLAYER_FLAGS_NO_XP_GAIN)) // not gaining XP { @@ -1707,7 +1707,7 @@ public: return true; } - 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); @@ -2381,7 +2381,7 @@ public: }); } - bool GossipSelect(Player* player, uint32 /*menuId*/, uint32 gossipListId) override + bool OnGossipSelect(Player* player, uint32 /*menuId*/, uint32 gossipListId) override { switch (gossipListId) { |
