diff --git a/sql/migrations/20180120155742_world.sql b/sql/migrations/20180120155742_world.sql new file mode 100644 index 000000000..dfe58a853 --- /dev/null +++ b/sql/migrations/20180120155742_world.sql @@ -0,0 +1,20 @@ +DROP PROCEDURE IF EXISTS add_migration; +delimiter ?? +CREATE PROCEDURE `add_migration`() +BEGIN +DECLARE v INT DEFAULT 1; +SET v = (SELECT COUNT(*) FROM `migrations` WHERE `id`='20180120155742'); +IF v=0 THEN +INSERT INTO `migrations` VALUES ('20180120155742'); +-- Add your query below. + + +DROP TABLE `gossip_texts`; + + +-- End of migration. +END IF; +END?? +delimiter ; +CALL add_migration(); +DROP PROCEDURE IF EXISTS add_migration; diff --git a/src/game/ScriptMgr.cpp b/src/game/ScriptMgr.cpp index d20c87afd..c1e016bf5 100644 --- a/src/game/ScriptMgr.cpp +++ b/src/game/ScriptMgr.cpp @@ -1319,7 +1319,6 @@ void ScriptMgr::LoadDatabase() { LoadScriptTexts(); LoadScriptTextsCustom(); - LoadScriptGossipTexts(); LoadScriptWaypoints(); LoadEscortData(); } @@ -1329,7 +1328,7 @@ void ScriptMgr::LoadScriptTexts() sLog.outString("Loading Script Texts..."); LoadMangosStrings(WorldDatabase, "script_texts", TEXT_SOURCE_TEXT_START, TEXT_SOURCE_TEXT_END, true); - QueryResult* result = WorldDatabase.PQuery("SELECT entry, sound, type, language, emote FROM script_texts WHERE entry BETWEEN %i AND %i", TEXT_SOURCE_GOSSIP_END, TEXT_SOURCE_TEXT_START); + QueryResult* result = WorldDatabase.PQuery("SELECT entry, sound, type, language, emote FROM script_texts WHERE entry BETWEEN %i AND %i", TEXT_SOURCE_TEXT_END, TEXT_SOURCE_TEXT_START); sLog.outString("Loading Script Texts additional data..."); @@ -1448,12 +1447,6 @@ void ScriptMgr::LoadScriptTextsCustom() } } -void ScriptMgr::LoadScriptGossipTexts() -{ - sLog.outString("Loading Gossip Texts..."); - LoadMangosStrings(WorldDatabase, "gossip_texts", TEXT_SOURCE_GOSSIP_START, TEXT_SOURCE_GOSSIP_END); -} - void ScriptMgr::LoadScriptWaypoints() { // Drop Existing Waypoint list diff --git a/src/game/ScriptMgr.h b/src/game/ScriptMgr.h index be833a34c..10c25eccc 100644 --- a/src/game/ScriptMgr.h +++ b/src/game/ScriptMgr.h @@ -627,9 +627,6 @@ extern ScriptMapMap sCreatureMovementScripts; #define TEXT_SOURCE_CUSTOM_START TEXT_SOURCE_RANGE*2 #define TEXT_SOURCE_CUSTOM_END TEXT_SOURCE_RANGE*3 + 1 -#define TEXT_SOURCE_GOSSIP_START TEXT_SOURCE_RANGE*3 -#define TEXT_SOURCE_GOSSIP_END TEXT_SOURCE_RANGE*4 + 1 - //Spell targets used by SelectSpell enum SelectTarget { @@ -798,7 +795,6 @@ class ScriptMgr void LoadScriptTexts(); void LoadScriptTextsCustom(); - void LoadScriptGossipTexts(); void LoadScriptWaypoints(); void LoadEscortData(); diff --git a/src/scripts/eastern_kingdoms/dun_morogh/gnomeregan/gnomeregan.cpp b/src/scripts/eastern_kingdoms/dun_morogh/gnomeregan/gnomeregan.cpp index 3006c2752..7a16b8946 100644 --- a/src/scripts/eastern_kingdoms/dun_morogh/gnomeregan/gnomeregan.cpp +++ b/src/scripts/eastern_kingdoms/dun_morogh/gnomeregan/gnomeregan.cpp @@ -612,7 +612,7 @@ bool GossipHello_npc_blastmaster_emi_shortfuse(Player* pPlayer, Creature* pCreat { if (pInstance->GetData(TYPE_GRUBBIS) == NOT_STARTED || pInstance->GetData(TYPE_GRUBBIS) == FAIL) { - pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM_START /*"I am ready to begin."*/, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 1); //entry=-3090000 is in gossip_texts, but dos not want to show up. + pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM_START /*"I am ready to begin."*/, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 1); pPlayer->SEND_GOSSIP_MENU(pPlayer->GetGossipTextId(pCreature), pCreature->GetObjectGuid()); } } diff --git a/src/scripts/kalimdor/the_barrens/the_barrens.cpp b/src/scripts/kalimdor/the_barrens/the_barrens.cpp index 0c31595d4..2cf0d1512 100644 --- a/src/scripts/kalimdor/the_barrens/the_barrens.cpp +++ b/src/scripts/kalimdor/the_barrens/the_barrens.cpp @@ -747,7 +747,7 @@ enum NPC_KOLKAR_INVADER = 9524, NPC_LANTIGAH = 9990, - GOSSIP_ITEM_START = -3090001, + GOSSIP_ITEM_START = 4793, SAY_BEWARE = -1780211, SAY_DEFENDER_FALLEN = -1780212,