aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--sql/updates/6644_world_creature_template.sql1
-rw-r--r--sql/updates/6644_world_gossip_menu.sql12
-rw-r--r--sql/updates/6644_world_gossip_menu_option.sql (renamed from sql/updates/6644_world_gossip.sql)40
-rw-r--r--sql/updates/6644_world_gossip_scripts.sql13
-rw-r--r--sql/updates/6644_world_locales_npc_option.sql7
-rw-r--r--sql/updates/6644_world_npc_gossip_textid.sql1
-rw-r--r--sql/updates/6644_world_npc_option.sql1
-rw-r--r--sql/updates/6644_world_script.sql1
-rw-r--r--sql/updates/6644_world_scriptname.sql1
-rw-r--r--sql/updates/6652_world_spell_proc_event.sql4
-rw-r--r--sql/updates/6657_world_spell_proc_event.sql4
11 files changed, 40 insertions, 45 deletions
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_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.sql b/sql/updates/6644_world_gossip_menu_option.sql
index 34ecbf1d684..175f74187be 100644
--- a/sql/updates/6644_world_gossip.sql
+++ b/sql/updates/6644_world_gossip_menu_option.sql
@@ -1,30 +1,3 @@
-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',
@@ -71,16 +44,3 @@ INSERT INTO gossip_menu_option VALUES
(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_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