Mirror/TrinityCore
1
0
Fork 0
mirror of https://github.com/TrinityCore/TrinityCore.git synced 2026-02-06 08:59:11 +01:00
Code Issues Packages Projects Releases Wiki Activity

Core/Scripts/DB: remove hardcoded text from npc_beaten_corpse (#16907)

Browse Source 
- remove hardcoded text from script npc_beaten_corpse
- remove OnGossipHello() hook, gossip text moved to DB
- use sGossipSelect() hook instead of OnGossipSelect()
- add npc_text 3557 and 3558 as text_id to gossip_menu
- add gossip_menu_option 2871 to NPC 10668 Beaten Corpse
- add condition for gossip_menu_option 2871 in Quest ID 4921

Tested on 4 different characters/classes, male & female.
Thanks to joschiwald for the sGossipSelect() script change.
This commit is contained in:
Trond B Krokli
2016-05-02 22:22:17 +02:00
committed by Aokromes
parent 28caabfdda
commit 737d61e9ab
2 changed files with 40 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

45
src/server/scripts/Kalimdor/zone_the_barrens.cpp
View File

@@ -38,38 +38,37 @@ EndContentData */
## npc_beaten_corpse
######*/
#define GOSSIP_CORPSE "Examine corpse in detail..."
enum BeatenCorpse
{
QUEST_LOST_IN_BATTLE = 4921
GOSSIP_OPTION_ID_BEATEN_CORPSE = 0,
GOSSIP_MENU_OPTION_INSPECT_BODY = 2871
};
class npc_beaten_corpse : public CreatureScript
{
public:
npc_beaten_corpse() : CreatureScript("npc_beaten_corpse") { }
public:
npc_beaten_corpse() : CreatureScript("npc_beaten_corpse") { }
bool OnGossipSelect(Player* player, Creature* creature, uint32 /*sender*/, uint32 action) override
{
player->PlayerTalkClass->ClearMenus();
if (action == GOSSIP_ACTION_INFO_DEF +1)
struct npc_beaten_corpseAI : public ScriptedAI
{
player->SEND_GOSSIP_MENU(3558, creature->GetGUID());
player->TalkedToCreature(creature->GetEntry(), creature->GetGUID());
npc_beaten_corpseAI(Creature* creature) : ScriptedAI(creature)
{
}
void sGossipSelect(Player* player, uint32 menuId, uint32 gossipListId) override
{
if (menuId == GOSSIP_MENU_OPTION_INSPECT_BODY && gossipListId == GOSSIP_OPTION_ID_BEATEN_CORPSE)
{
player->CLOSE_GOSSIP_MENU();
player->TalkedToCreature(me->GetEntry(), me->GetGUID());
}
}
};
CreatureAI* GetAI(Creature* creature) const override
{
return new npc_beaten_corpseAI(creature);
}
return true;
}
bool OnGossipHello(Player* player, Creature* creature) override
{
if (player->GetQuestStatus(QUEST_LOST_IN_BATTLE) == QUEST_STATUS_INCOMPLETE || player->GetQuestStatus(QUEST_LOST_IN_BATTLE) == QUEST_STATUS_COMPLETE)
player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_CORPSE, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+1);
player->SEND_GOSSIP_MENU(3557, creature->GetGUID());
return true;
}
};
/*######