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

Core/Scripts: npc_wormhole #define text moved to DB (#17805)

Browse Source 
Another core script hardcoded text removal:
- removed #define text from script
- added the text to gossip_menu_option
- added and renamed enum to match DB entries
- minor additional adjustments and comments

Closes #6841
(cherry picked from commit 8a0990376d)
This commit is contained in:
tkrokli
2016-08-23 13:30:27 +02:00
committed by joschiwald
parent 7e57e9a91b
commit d8befaf68b
2 changed files with 34 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
sql/updates/world/master/2017_02_18_10_world_2016_08_23_04_world.sql Normal file
View File

@@ -0,0 +1,10 @@
-- NPC ID / entry 35646 Wormhole (summoned by item 48933 Wormhole Generator: Northrend)
DELETE FROM `gossip_menu_option` WHERE `menu_id`= 10668;
INSERT INTO `gossip_menu_option` (`menu_id`,`id`,`option_icon`,`option_text`,`OptionBroadcastTextID`,`option_id`,`npc_option_npcflag`,`action_menu_id`,`action_poi_id`,`box_coded`,`box_money`,`box_text`,`BoxBroadcastTextID`,`VerifiedBuild`) VALUES
(10668, 0, 0, 'Borean Tundra', 35939, 1, 1, 0, 0, 0, 0, '', 0, 0),
(10668, 1, 0, 'Howling Fjord', 35943, 1, 1, 0, 0, 0, 0, '', 0, 0),
(10668, 2, 0, 'Sholazar Basin', 35940, 1, 1, 0, 0, 0, 0, '', 0, 0),
(10668, 3, 0, 'Icecrown', 35941, 1, 1, 0, 0, 0, 0, '', 0, 0),
(10668, 4, 0, 'Storm Peaks', 35942, 1, 1, 0, 0, 0, 0, '', 0, 0),
(10668, 5, 0, 'Underground...', 36022, 1, 1, 0, 0, 0, 0, '', 0, 0);

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

@@ -580,7 +580,7 @@ public:
events.Reset();
running = false;
}
void Reset() override
{
Initialize();
@@ -1655,25 +1655,25 @@ public:
# npc_wormhole
######*/
#define GOSSIP_ENGINEERING1 "Borean Tundra"
#define GOSSIP_ENGINEERING2 "Howling Fjord"
#define GOSSIP_ENGINEERING3 "Sholazar Basin"
#define GOSSIP_ENGINEERING4 "Icecrown"
#define GOSSIP_ENGINEERING5 "Storm Peaks"
#define GOSSIP_ENGINEERING6 "Underground..."
enum WormholeSpells
enum NPC_Wormhole
{
SPELL_BOREAN_TUNDRA = 67834,
SPELL_SHOLAZAR_BASIN = 67835,
SPELL_ICECROWN = 67836,
SPELL_STORM_PEAKS = 67837,
SPELL_HOWLING_FJORD = 67838,
SPELL_UNDERGROUND = 68081,
DATA_SHOW_UNDERGROUND = 1, // -> Random 0 or 1
TEXT_WORMHOLE = 907,
MENU_ID_WORMHOLE = 10668, // "This tear in the fabric of time and space looks ominous."
NPC_TEXT_WORMHOLE = 14785, // (not 907 "What brings you to this part of the world, $n?")
GOSSIP_OPTION_1 = 0, // "Borean Tundra"
GOSSIP_OPTION_2 = 1, // "Howling Fjord"
GOSSIP_OPTION_3 = 2, // "Sholazar Basin"
GOSSIP_OPTION_4 = 3, // "Icecrown"
GOSSIP_OPTION_5 = 4, // "Storm Peaks"
GOSSIP_OPTION_6 = 5, // "Underground..."
DATA_SHOW_UNDERGROUND = 1,
SPELL_BOREAN_TUNDRA = 67834, // 0
SPELL_HOWLING_FJORD = 67838, // 1
SPELL_SHOLAZAR_BASIN = 67835, // 2
SPELL_ICECROWN = 67836, // 3
SPELL_STORM_PEAKS = 67837, // 4
SPELL_UNDERGROUND = 68081 // 5
};
class npc_wormhole : public CreatureScript
@@ -1713,16 +1713,16 @@ class npc_wormhole : public CreatureScript
{
if (player == creature->ToTempSummon()->GetSummoner())
{
player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ENGINEERING1, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 1);
player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ENGINEERING2, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 2);
player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ENGINEERING3, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 3);
player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ENGINEERING4, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 4);
player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ENGINEERING5, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 5);
player->ADD_GOSSIP_ITEM_DB(MENU_ID_WORMHOLE, GOSSIP_OPTION_1, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 1);
player->ADD_GOSSIP_ITEM_DB(MENU_ID_WORMHOLE, GOSSIP_OPTION_2, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 2);
player->ADD_GOSSIP_ITEM_DB(MENU_ID_WORMHOLE, GOSSIP_OPTION_3, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 3);
player->ADD_GOSSIP_ITEM_DB(MENU_ID_WORMHOLE, GOSSIP_OPTION_4, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 4);
player->ADD_GOSSIP_ITEM_DB(MENU_ID_WORMHOLE, GOSSIP_OPTION_5, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 5);
if (creature->AI()->GetData(DATA_SHOW_UNDERGROUND))
player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ENGINEERING6, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 6);
player->ADD_GOSSIP_ITEM_DB(MENU_ID_WORMHOLE, GOSSIP_OPTION_6, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 6);
player->PlayerTalkClass->SendGossipMenu(TEXT_WORMHOLE, creature->GetGUID());
player->SEND_GOSSIP_MENU(NPC_TEXT_WORMHOLE, creature->GetGUID());
}
}