diff options
Diffstat (limited to 'sql')
| -rw-r--r-- | sql/FULL/world_scripts_full.sql | 2 | ||||
| -rw-r--r-- | sql/FULL/world_trinity_string_full.sql | 5 | ||||
| -rw-r--r-- | sql/updates/6644_world_gossip.sql | 86 | ||||
| -rw-r--r-- | sql/updates/6644_world_script.sql | 1 | ||||
| -rw-r--r-- | sql/world.sql | 170 |
5 files changed, 193 insertions, 71 deletions
diff --git a/sql/FULL/world_scripts_full.sql b/sql/FULL/world_scripts_full.sql index 28ab3b51ab5..5bc728b6ee4 100644 --- a/sql/FULL/world_scripts_full.sql +++ b/sql/FULL/world_scripts_full.sql @@ -112,7 +112,7 @@ UPDATE `creature_template` SET `ScriptName`='npc_snake_trap_serpents' WHERE `ent UPDATE `creature_template` SET `ScriptName`='npc_unworthy_initiate' WHERE `entry` IN (29519,29520,29565,29566,29567); UPDATE `creature_template` SET `ScriptName`='npc_unworthy_initiate_anchor' WHERE `entry`=29521; UPDATE `creature_template` SET `ScriptName`='npc_kingdom_of_dalaran_quests' WHERE `entry` IN (29169,23729,26673,27158,29158,29161,26471,29155,29159,29160,29162); -UPDATE `creature_template` SET `ScriptName`='npc_taxi' WHERE `entry` IN (17435,23413,18725,19401,19409,20235,25059,25236,20903,20162,29154,23415,27575,26443,26949,23816,23704,26602); +UPDATE `creature_template` SET `ScriptName`='npc_taxi' WHERE `entry` IN (17435,23413,18725,19401,19409,20235,25059,25236,20903,20162,29154,23415,27575,26443,26949,23816,23704,26602,17209); UPDATE `creature_template` SET `ScriptName`='npc_death_knight_initiate' WHERE `entry`=28406; UPDATE `creature_template` SET `ScriptName`='npc_salanar_the_horseman' WHERE `entry` IN (28653,28788); UPDATE `creature_template` SET `ScriptName`='npc_dark_rider_of_acherus' WHERE `entry` =28654; diff --git a/sql/FULL/world_trinity_string_full.sql b/sql/FULL/world_trinity_string_full.sql index 833d6aaabc8..c683168edc8 100644 --- a/sql/FULL/world_trinity_string_full.sql +++ b/sql/FULL/world_trinity_string_full.sql @@ -811,9 +811,4 @@ INSERT INTO `trinity_string` (`entry`, `content_default`, `content_loc1`, `conte (10048, 'The Alliance lost the Plaguewood Tower!', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL), (10049, 'The Horde has collected 200 silithyst!', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL), (10050, 'The Alliance has collected 200 silithyst!', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL), -(10051, 'Take me to Northpass Tower.', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL), -(10052, 'Take me to Eastwall Tower.', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL), -(10053, 'Take me to Crown Guard Tower.', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL), -(10054, 'Give me the flag, I''ll take it to the central beacon for the glory of the Alliance!', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL), -(10055, 'Give me the flag, I''ll take it to the central beacon for the glory of the Horde!', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL), (11000, '|cffffff00[|c00077766Autobroadcast|cffffff00]: |cFFF222FF%s|r', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL); diff --git a/sql/updates/6644_world_gossip.sql b/sql/updates/6644_world_gossip.sql new file mode 100644 index 00000000000..34ecbf1d684 --- /dev/null +++ b/sql/updates/6644_world_gossip.sql @@ -0,0 +1,86 @@ +DROP TABLE IF EXISTS `gossip_scripts`; +CREATE TABLE `gossip_scripts` ( + `id` mediumint(8) unsigned NOT NULL default '0', + `delay` int(10) unsigned NOT NULL default '0', + `command` mediumint(8) unsigned NOT NULL default '0', + `datalong` mediumint(8) unsigned NOT NULL default '0', + `datalong2` int(10) unsigned NOT NULL default '0', + `dataint` int(11) NOT NULL default '0', + `x` float NOT NULL default '0', + `y` float NOT NULL default '0', + `z` float NOT NULL default '0', + `o` float NOT NULL default '0' +) ENGINE=MyISAM DEFAULT CHARSET=utf8; + +DROP TABLE IF EXISTS gossip_menu; +CREATE TABLE gossip_menu ( + entry smallint(6) unsigned NOT NULL default '0', + text_id mediumint(8) unsigned NOT NULL default '0', + cond_1 tinyint(3) unsigned NOT NULL default '0', + cond_1_val_1 mediumint(8) unsigned NOT NULL default '0', + cond_1_val_2 mediumint(8) unsigned NOT NULL default '0', + cond_2 tinyint(3) unsigned NOT NULL default '0', + cond_2_val_1 mediumint(8) unsigned NOT NULL default '0', + cond_2_val_2 mediumint(8) unsigned NOT NULL default '0', + PRIMARY KEY (entry, text_id) +) ENGINE=MyISAM DEFAULT CHARSET=utf8; + +DROP TABLE IF EXISTS gossip_menu_option; +CREATE TABLE gossip_menu_option ( + menu_id smallint(6) unsigned NOT NULL default '0', + id smallint(6) unsigned NOT NULL default '0', + option_icon mediumint(8) unsigned NOT NULL default '0', + option_text text, + option_id tinyint(3) unsigned NOT NULL default '0', + npc_option_npcflag int(10) unsigned NOT NULL default '0', + action_menu_id mediumint(8) unsigned NOT NULL default '0', + action_poi_id mediumint(8) unsigned NOT NULL default '0', + action_script_id mediumint(8) unsigned NOT NULL default '0', + box_coded tinyint(3) unsigned NOT NULL default '0', + box_money int(11) unsigned NOT NULL default '0', + box_text text, + cond_1 tinyint(3) unsigned NOT NULL default '0', + cond_1_val_1 mediumint(8) unsigned NOT NULL default '0', + cond_1_val_2 mediumint(8) unsigned NOT NULL default '0', + cond_2 tinyint(3) unsigned NOT NULL default '0', + cond_2_val_1 mediumint(8) unsigned NOT NULL default '0', + cond_2_val_2 mediumint(8) unsigned NOT NULL default '0', + cond_3 tinyint(3) unsigned NOT NULL default '0', + cond_3_val_1 mediumint(8) unsigned NOT NULL default '0', + cond_3_val_2 mediumint(8) unsigned NOT NULL default '0', + PRIMARY KEY (menu_id, id) +) ENGINE=MyISAM DEFAULT CHARSET=utf8; + +DELETE FROM gossip_menu_option WHERE menu_id=0; +INSERT INTO gossip_menu_option VALUES +(0,0,0,'GOSSIP_OPTION_QUESTGIVER',2,2,0,0,0,0,0,NULL,0,0,0,0,0,0,0,0,0), +(0,1,1,'GOSSIP_OPTION_VENDOR',3,128,0,0,0,0,0,NULL,0,0,0,0,0,0,0,0,0), +(0,2,2,'GOSSIP_OPTION_TAXIVENDOR',4,8192,0,0,0,0,0,NULL,0,0,0,0,0,0,0,0,0), +(0,3,3,'GOSSIP_OPTION_TRAINER',5,16,0,0,0,0,0,NULL,0,0,0,0,0,0,0,0,0), +(0,4,4,'GOSSIP_OPTION_SPIRITHEALER',6,16384,0,0,0,0,0,NULL,0,0,0,0,0,0,0,0,0), +(0,5,4,'GOSSIP_OPTION_SPIRITGUIDE',7,32768,0,0,0,0,0,NULL,0,0,0,0,0,0,0,0,0), +(0,6,5,'GOSSIP_OPTION_INNKEEPER',8,65536,0,0,0,0,0,NULL,0,0,0,0,0,0,0,0,0), +(0,7,6,'GOSSIP_OPTION_BANKER',9,131072,0,0,0,0,0,NULL,0,0,0,0,0,0,0,0,0), +(0,8,7,'GOSSIP_OPTION_PETITIONER',10,262144,0,0,0,0,0,NULL,0,0,0,0,0,0,0,0,0), +(0,9,8,'GOSSIP_OPTION_TABARDDESIGNER',11,524288,0,0,0,0,0,NULL,0,0,0,0,0,0,0,0,0), +(0,10,9,'GOSSIP_OPTION_BATTLEFIELD',12,1048576,0,0,0,0,0,NULL,0,0,0,0,0,0,0,0,0), +(0,11,6,'GOSSIP_OPTION_AUCTIONEER',13,2097152,0,0,0,0,0,NULL,0,0,0,0,0,0,0,0,0), +(0,12,0,'GOSSIP_OPTION_STABLEPET',14,4194304,0,0,0,0,0,NULL,0,0,0,0,0,0,0,0,0), +(0,13,1,'GOSSIP_OPTION_ARMORER',15,4096,0,0,0,0,0,NULL,0,0,0,0,0,0,0,0,0), +(0,14,2,'GOSSIP_OPTION_UNLEARNTALENTS',16,16,0,0,0,0,0,NULL,0,0,0,0,0,0,0,0,0), +(0,15,2,'GOSSIP_OPTION_UNLEARNPETSKILLS',17,16,0,0,0,0,0,NULL,0,0,0,0,0,0,0,0,0), +(0,16,2,'GOSSIP_OPTION_LEARNDUALSPEC',18,16,0,0,0,0,10000000,NULL,0,0,0,0,0,0,0,0,0), +(0,17,0,'GOSSIP_OPTION_OUTDOORPVP',1,19,536870912,0,0,0,0,NULL,0,0,0,0,0,0,0,0,0); + +ALTER TABLE creature_template ADD gossip_menu_id mediumint(8) unsigned NOT NULL default 0 AFTER IconName; + +ALTER TABLE locales_npc_option CHANGE COLUMN entry id smallint(6) unsigned NOT NULL default '0'; +ALTER TABLE locales_npc_option ADD menu_id smallint(6) unsigned NOT NULL default '0' FIRST; + +ALTER TABLE locales_npc_option DROP PRIMARY KEY; +ALTER TABLE locales_npc_option ADD PRIMARY KEY (menu_id, id); + +RENAME TABLE locales_npc_option TO locales_gossip_menu_option; + +DROP TABLE IF EXISTS npc_option; +DROP TABLE IF EXISTS npc_gossip_textid; diff --git a/sql/updates/6644_world_script.sql b/sql/updates/6644_world_script.sql new file mode 100644 index 00000000000..d93fe779216 --- /dev/null +++ b/sql/updates/6644_world_script.sql @@ -0,0 +1 @@ +UPDATE `creature_template` SET `npcflag` = 1, `ScriptName` = 'npc_taxi' WHERE `entry` = 17209;
\ No newline at end of file diff --git a/sql/world.sql b/sql/world.sql index da84099a59e..3de75d0c3dc 100644 --- a/sql/world.sql +++ b/sql/world.sql @@ -503,6 +503,7 @@ CREATE TABLE `creature_template` ( `name` char(100) NOT NULL default '0', `subname` char(100) default NULL, `IconName` char(100) default NULL, + `gossip_menu_id` mediumint(8) unsigned NOT NULL default '0', `minlevel` tinyint(3) unsigned NOT NULL default '1', `maxlevel` tinyint(3) unsigned NOT NULL default '1', `minhealth` int(10) unsigned NOT NULL default '0', @@ -1171,6 +1172,80 @@ CREATE TABLE `gameobject_template` ( SET character_set_client = @saved_cs_client; -- +-- Table structure for table `gossip_menu` +-- + +DROP TABLE IF EXISTS `gossip_menu`; +SET @saved_cs_client = @@character_set_client; +SET character_set_client = utf8; +CREATE TABLE `gossip_menu` ( + `entry` smallint(6) unsigned NOT NULL default '0', + `text_id` mediumint(8) unsigned NOT NULL default '0', + `cond_1` tinyint(3) unsigned NOT NULL default '0', + `cond_1_val_1` mediumint(8) unsigned NOT NULL default '0', + `cond_1_val_2` mediumint(8) unsigned NOT NULL default '0', + `cond_2` tinyint(3) unsigned NOT NULL default '0', + `cond_2_val_1` mediumint(8) unsigned NOT NULL default '0', + `cond_2_val_2` mediumint(8) unsigned NOT NULL default '0', + PRIMARY KEY (`entry`, `text_id`) +) ENGINE=MyISAM DEFAULT CHARSET=utf8 COMMENT='Gossip System'; +SET character_set_client = @saved_cs_client; + +-- +-- Table structure for table `gossip_menu_option` +-- + +DROP TABLE IF EXISTS `gossip_menu_option`; +SET @saved_cs_client = @@character_set_client; +SET character_set_client = utf8; +CREATE TABLE `gossip_menu_option` ( + `menu_id` smallint(6) unsigned NOT NULL default '0', + `id` smallint(6) unsigned NOT NULL default '0', + `option_icon` mediumint(8) unsigned NOT NULL default '0', + `option_text` text, + `option_id` tinyint(3) unsigned NOT NULL default '0', + `npc_option_npcflag` int(10) unsigned NOT NULL default '0', + `action_menu_id` mediumint(8) unsigned NOT NULL default '0', + `action_poi_id` mediumint(8) unsigned NOT NULL default '0', + `action_script_id` mediumint(8) unsigned NOT NULL default '0', + `box_coded` tinyint(3) unsigned NOT NULL default '0', + `box_money` int(11) unsigned NOT NULL default '0', + `box_text` text, + `cond_1` tinyint(3) unsigned NOT NULL default '0', + `cond_1_val_1` mediumint(8) unsigned NOT NULL default '0', + `cond_1_val_2` mediumint(8) unsigned NOT NULL default '0', + `cond_2` tinyint(3) unsigned NOT NULL default '0', + `cond_2_val_1` mediumint(8) unsigned NOT NULL default '0', + `cond_2_val_2` mediumint(8) unsigned NOT NULL default '0', + `cond_3` tinyint(3) unsigned NOT NULL default '0', + `cond_3_val_1` mediumint(8) unsigned NOT NULL default '0', + `cond_3_val_2` mediumint(8) unsigned NOT NULL default '0', + PRIMARY KEY (`menu_id`, `id`) +) ENGINE=MyISAM DEFAULT CHARSET=utf8 COMMENT='Gossip System'; +SET character_set_client = @saved_cs_client; + +-- +-- Table structure for table `gossip_scripts` +-- + +DROP TABLE IF EXISTS `gossip_scripts`; +SET @saved_cs_client = @@character_set_client; +SET character_set_client = utf8; +CREATE TABLE `gossip_scripts` ( + `id` mediumint(8) unsigned NOT NULL default '0', + `delay` int(10) unsigned NOT NULL default '0', + `command` mediumint(8) unsigned NOT NULL default '0', + `datalong` mediumint(8) unsigned NOT NULL default '0', + `datalong2` int(10) unsigned NOT NULL default '0', + `dataint` int(11) NOT NULL default '0', + `x` float NOT NULL default '0', + `y` float NOT NULL default '0', + `z` float NOT NULL default '0', + `o` float NOT NULL default '0' +) ENGINE=MyISAM DEFAULT CHARSET=utf8 COMMENT='Gossip System'; +SET character_set_client = @saved_cs_client; + +-- -- Table structure for table `instance_template` -- @@ -1481,6 +1556,36 @@ CREATE TABLE `locales_gameobject` ( SET character_set_client = @saved_cs_client; -- +-- Table structure for table `locales_gossip_menu_option` +-- + +DROP TABLE IF EXISTS `locales_gossip_menu_option`; +SET @saved_cs_client = @@character_set_client; +SET character_set_client = utf8; +CREATE TABLE `locales_gossip_menu_option` ( + `menu_id` smallint(6) unsigned NOT NULL default '0', + `id` smallint(6) unsigned NOT NULL default '0', + `option_text_loc1` text, + `option_text_loc2` text, + `option_text_loc3` text, + `option_text_loc4` text, + `option_text_loc5` text, + `option_text_loc6` text, + `option_text_loc7` text, + `option_text_loc8` text, + `box_text_loc1` text, + `box_text_loc2` text, + `box_text_loc3` text, + `box_text_loc4` text, + `box_text_loc5` text, + `box_text_loc6` text, + `box_text_loc7` text, + `box_text_loc8` text, + PRIMARY KEY (`menu_id`, `id`) +) ENGINE=MyISAM DEFAULT CHARSET=utf8; +SET character_set_client = @saved_cs_client; + +-- -- Table structure for table `locales_item` -- @@ -1510,35 +1615,6 @@ CREATE TABLE `locales_item` ( SET character_set_client = @saved_cs_client; -- --- Table structure for table `locales_npc_option` --- - -DROP TABLE IF EXISTS `locales_npc_option`; -SET @saved_cs_client = @@character_set_client; -SET character_set_client = utf8; -CREATE TABLE `locales_npc_option` ( - `entry` mediumint(8) unsigned NOT NULL default '0', - `option_text_loc1` text, - `option_text_loc2` text, - `option_text_loc3` text, - `option_text_loc4` text, - `option_text_loc5` text, - `option_text_loc6` text, - `option_text_loc7` text, - `option_text_loc8` text, - `box_text_loc1` text, - `box_text_loc2` text, - `box_text_loc3` text, - `box_text_loc4` text, - `box_text_loc5` text, - `box_text_loc6` text, - `box_text_loc7` text, - `box_text_loc8` text, - PRIMARY KEY (`entry`) -) ENGINE=MyISAM DEFAULT CHARSET=utf8; -SET character_set_client = @saved_cs_client; - --- -- Table structure for table `locales_npc_text` -- @@ -1884,42 +1960,6 @@ CREATE TABLE `npc_gossip` ( SET character_set_client = @saved_cs_client; -- --- Table structure for table `npc_gossip_textid` --- - -DROP TABLE IF EXISTS `npc_gossip_textid`; -SET @saved_cs_client = @@character_set_client; -SET character_set_client = utf8; -CREATE TABLE `npc_gossip_textid` ( - `zoneid` smallint(5) unsigned NOT NULL default '0', - `action` smallint(5) unsigned NOT NULL default '0', - `textid` mediumint(8) unsigned NOT NULL default '0', - KEY `zoneid` (`zoneid`) -) ENGINE=MyISAM DEFAULT CHARSET=utf8; -SET character_set_client = @saved_cs_client; - --- --- Table structure for table `npc_option` --- - -DROP TABLE IF EXISTS `npc_option`; -SET @saved_cs_client = @@character_set_client; -SET character_set_client = utf8; -CREATE TABLE `npc_option` ( - `id` mediumint(8) unsigned NOT NULL default '0', - `gossip_id` mediumint(8) unsigned NOT NULL default '0', - `npcflag` int(10) unsigned NOT NULL default '0', - `icon` tinyint(3) unsigned NOT NULL default '0', - `action` mediumint(8) unsigned NOT NULL default '0', - `box_money` int(10) unsigned NOT NULL default '0', - `coded` tinyint(3) unsigned NOT NULL default '0', - `option_text` text, - `box_text` text, - PRIMARY KEY (`id`) -) ENGINE=MyISAM DEFAULT CHARSET=utf8; -SET character_set_client = @saved_cs_client; - --- -- Table structure for table `npc_spellclick_spells` -- |