Mirror/TrinityCore
1
0
Fork 0
mirror of https://github.com/TrinityCore/TrinityCore.git synced 2026-01-21 01:37:37 +01:00
Code Issues Packages Projects Releases Wiki Activity

Core/Scripts: simplified npc_pet_trainer gossip script

Browse Source 
This is what the script changes should have been in PR #17746
(also updates issue #14719 with a correct solution).

- remove OnGossipHello() to use DB conditions
- replace OnGossipSelect() with sGossipSelect()
- focus script on the confirming gossip option
- let the other gossip menus be handled in DB

(cherry picked from commit a475033c76)
This commit is contained in:
tkrokli
2016-09-17 05:20:40 +02:00
committed by joschiwald
parent 953eef9761
commit e4e1f4152f
1 changed files with 12 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files

56
src/server/scripts/World/npcs_special.cpp
View File

@@ -1776,14 +1776,8 @@ class npc_wormhole : public CreatureScript
enum PetTrainer
{
MENU_ID_PET_TRAINING = 4783,
MENU_ID_PET_UNLEARN = 6520,
NPC_TEXT_PET_FAMILIES = 13474,
NPC_TEXT_PET_TRAINING = 5838,
NPC_TEXT_UNLEARN = 7722,
OPTION_ID_HOW_DO_I_TRAIN = 0,
OPTION_ID_UNTRAIN_MY_PET = 1,
OPTION_ID_PLEASE_DO = 0,
OPTION_ID_PLEASE_DO = 0
};
class npc_pet_trainer : public CreatureScript
@@ -1791,49 +1785,23 @@ class npc_pet_trainer : public CreatureScript
public:
npc_pet_trainer() : CreatureScript("npc_pet_trainer") { }
bool OnGossipHello(Player* player, Creature* creature) /*override*/
struct npc_pet_trainerAI : public ScriptedAI
{
ClearGossipMenuFor(player);
npc_pet_trainerAI(Creature* creature) : ScriptedAI(creature) { }
if (creature->IsQuestGiver())
player->PrepareQuestMenu(creature->GetGUID());
if (player->GetPet() && player->GetPet()->getPetType() == HUNTER_PET)
void sGossipSelect(Player* player, uint32 menuId, uint32 gossipListId) override
{
AddGossipItemFor(player, MENU_ID_PET_TRAINING, OPTION_ID_HOW_DO_I_TRAIN, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 1);
AddGossipItemFor(player, MENU_ID_PET_TRAINING, OPTION_ID_UNTRAIN_MY_PET, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 2);
SendGossipMenuFor(player, NPC_TEXT_PET_TRAINING, creature->GetGUID());
if (menuId == MENU_ID_PET_UNLEARN && gossipListId == OPTION_ID_PLEASE_DO)
{
player->ResetPetTalents();
CloseGossipMenuFor(player);
}
}
else
{
AddGossipItemFor(player, MENU_ID_PET_TRAINING, OPTION_ID_HOW_DO_I_TRAIN, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 1);
SendGossipMenuFor(player, NPC_TEXT_PET_TRAINING, creature->GetGUID());
}
return true;
}
};
bool OnGossipSelect(Player* player, Creature* creature, uint32 /*sender*/, uint32 action) /*override*/
CreatureAI* GetAI(Creature* creature) const override
{
ClearGossipMenuFor(player);
switch (action)
{
case GOSSIP_ACTION_INFO_DEF + 1:
SendGossipMenuFor(player, NPC_TEXT_PET_FAMILIES, creature->GetGUID());
break;
case GOSSIP_ACTION_INFO_DEF + 2:
{
AddGossipItemFor(player, MENU_ID_PET_UNLEARN, OPTION_ID_PLEASE_DO, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 3);
SendGossipMenuFor(player, NPC_TEXT_UNLEARN, creature->GetGUID());
}
break;
case GOSSIP_ACTION_INFO_DEF + 3:
{
player->ResetPetTalents();
CloseGossipMenuFor(player);
}
break;
}
return true;
return new npc_pet_trainerAI(creature);
}
};