From 4ca342ff246ee5cb58c8efae3125e1db5c3d82da Mon Sep 17 00:00:00 2001 From: teacher Date: Sun, 20 Dec 2009 18:10:54 +0100 Subject: Renamed and re-arranged sql files with proper Trinity standard. Devs please follow Trinity standard. Ask me if you still have doubts. --HG-- branch : trunk --- sql/updates/6644_world_creature_template.sql | 1 + sql/updates/6644_world_gossip.sql | 86 --------------------------- sql/updates/6644_world_gossip_menu.sql | 12 ++++ sql/updates/6644_world_gossip_menu_option.sql | 46 ++++++++++++++ sql/updates/6644_world_gossip_scripts.sql | 13 ++++ sql/updates/6644_world_locales_npc_option.sql | 7 +++ sql/updates/6644_world_npc_gossip_textid.sql | 1 + sql/updates/6644_world_npc_option.sql | 1 + sql/updates/6644_world_script.sql | 1 - sql/updates/6644_world_scriptname.sql | 1 + sql/updates/6652_world_spell_proc_event.sql | 4 -- sql/updates/6657_world_spell_proc_event.sql | 4 ++ 12 files changed, 86 insertions(+), 91 deletions(-) create mode 100644 sql/updates/6644_world_creature_template.sql delete mode 100644 sql/updates/6644_world_gossip.sql create mode 100644 sql/updates/6644_world_gossip_menu.sql create mode 100644 sql/updates/6644_world_gossip_menu_option.sql create mode 100644 sql/updates/6644_world_gossip_scripts.sql create mode 100644 sql/updates/6644_world_locales_npc_option.sql create mode 100644 sql/updates/6644_world_npc_gossip_textid.sql create mode 100644 sql/updates/6644_world_npc_option.sql delete mode 100644 sql/updates/6644_world_script.sql create mode 100644 sql/updates/6644_world_scriptname.sql delete mode 100644 sql/updates/6652_world_spell_proc_event.sql create mode 100644 sql/updates/6657_world_spell_proc_event.sql (limited to 'sql') diff --git a/sql/updates/6644_world_creature_template.sql b/sql/updates/6644_world_creature_template.sql new file mode 100644 index 00000000000..3f4a8df4fbf --- /dev/null +++ b/sql/updates/6644_world_creature_template.sql @@ -0,0 +1 @@ +ALTER TABLE creature_template ADD gossip_menu_id mediumint(8) unsigned NOT NULL default 0 AFTER IconName; diff --git a/sql/updates/6644_world_gossip.sql b/sql/updates/6644_world_gossip.sql deleted file mode 100644 index 34ecbf1d684..00000000000 --- a/sql/updates/6644_world_gossip.sql +++ /dev/null @@ -1,86 +0,0 @@ -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_gossip_menu.sql b/sql/updates/6644_world_gossip_menu.sql new file mode 100644 index 00000000000..71d715a2579 --- /dev/null +++ b/sql/updates/6644_world_gossip_menu.sql @@ -0,0 +1,12 @@ +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; diff --git a/sql/updates/6644_world_gossip_menu_option.sql b/sql/updates/6644_world_gossip_menu_option.sql new file mode 100644 index 00000000000..175f74187be --- /dev/null +++ b/sql/updates/6644_world_gossip_menu_option.sql @@ -0,0 +1,46 @@ +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); diff --git a/sql/updates/6644_world_gossip_scripts.sql b/sql/updates/6644_world_gossip_scripts.sql new file mode 100644 index 00000000000..10a3dcd1188 --- /dev/null +++ b/sql/updates/6644_world_gossip_scripts.sql @@ -0,0 +1,13 @@ +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; diff --git a/sql/updates/6644_world_locales_npc_option.sql b/sql/updates/6644_world_locales_npc_option.sql new file mode 100644 index 00000000000..969f076bda1 --- /dev/null +++ b/sql/updates/6644_world_locales_npc_option.sql @@ -0,0 +1,7 @@ +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; diff --git a/sql/updates/6644_world_npc_gossip_textid.sql b/sql/updates/6644_world_npc_gossip_textid.sql new file mode 100644 index 00000000000..b6372ac5460 --- /dev/null +++ b/sql/updates/6644_world_npc_gossip_textid.sql @@ -0,0 +1 @@ +DROP TABLE IF EXISTS npc_gossip_textid; diff --git a/sql/updates/6644_world_npc_option.sql b/sql/updates/6644_world_npc_option.sql new file mode 100644 index 00000000000..44ebe8d9415 --- /dev/null +++ b/sql/updates/6644_world_npc_option.sql @@ -0,0 +1 @@ +DROP TABLE IF EXISTS npc_option; diff --git a/sql/updates/6644_world_script.sql b/sql/updates/6644_world_script.sql deleted file mode 100644 index d93fe779216..00000000000 --- a/sql/updates/6644_world_script.sql +++ /dev/null @@ -1 +0,0 @@ -UPDATE `creature_template` SET `npcflag` = 1, `ScriptName` = 'npc_taxi' WHERE `entry` = 17209; \ No newline at end of file diff --git a/sql/updates/6644_world_scriptname.sql b/sql/updates/6644_world_scriptname.sql new file mode 100644 index 00000000000..a801b7d25cd --- /dev/null +++ b/sql/updates/6644_world_scriptname.sql @@ -0,0 +1 @@ +UPDATE `creature_template` SET `ScriptName` = 'npc_taxi' WHERE `entry` = 17209; \ No newline at end of file diff --git a/sql/updates/6652_world_spell_proc_event.sql b/sql/updates/6652_world_spell_proc_event.sql deleted file mode 100644 index f02c5442110..00000000000 --- a/sql/updates/6652_world_spell_proc_event.sql +++ /dev/null @@ -1,4 +0,0 @@ -DELETE FROM spell_proc_event WHERE entry IN (16952, 16954); -INSERT INTO spell_proc_event VALUES -(16952,0,7,233472,1024,262144,0,2,0,0,0), -(16954,0,7,233472,1024,262144,0,2,0,0,0) \ No newline at end of file diff --git a/sql/updates/6657_world_spell_proc_event.sql b/sql/updates/6657_world_spell_proc_event.sql new file mode 100644 index 00000000000..adb0520bed8 --- /dev/null +++ b/sql/updates/6657_world_spell_proc_event.sql @@ -0,0 +1,4 @@ +DELETE FROM `spell_proc_event` WHERE `entry` IN (16952,16954); +INSERT INTO `spell_proc_event` (`entry`,`SchoolMask`,`SpellFamilyName`,`SpellFamilyMask0`,`SpellFamilyMask1`,`SpellFamilyMask2`,`procFlags`,`procEx`,`ppmRate`,`CustomChance`,`Cooldown`) VALUES +(16952,0,7,233472,1024,262144,0,2,0,0,0), +(16954,0,7,233472,1024,262144,0,2,0,0,0); \ No newline at end of file -- cgit v1.2.3