From 4fd5933e75251e2532c9a760e968d4f7f8e7399c Mon Sep 17 00:00:00 2001 From: Drahy Date: Wed, 15 Apr 2009 18:09:55 +0200 Subject: [PATCH] * Used trinity sql coding style * Please Use Delete + Insert instead Ignore it will be better for this kind of data thx --HG-- branch : trunk --- sql/updates/2678_mangos_7662_01_world_spell_bonus_data.sql | 6 ++++++ .../{r991_scriptdev2.sql => 2682_world_SD2_scripts.sql} | 2 +- sql/updates/2683_characters_gm_tickets.sql | 2 +- sql/updates/2683_world_trinity_string.sql | 2 +- sql/updates/2685_world_spell_proc_event.sql | 2 +- sql/updates/2686_characters_gm_tickets.sql | 2 +- sql/updates/2686_world_command.sql | 4 +++- sql/updates/2687_world_spell_proc_event.sql | 2 +- sql/updates/2689_world_spell_linked_spell.sql | 3 ++- sql/updates/7662_02_mangos_spell_bonus_data.sql | 6 ------ 10 files changed, 17 insertions(+), 14 deletions(-) create mode 100644 sql/updates/2678_mangos_7662_01_world_spell_bonus_data.sql rename sql/updates/{r991_scriptdev2.sql => 2682_world_SD2_scripts.sql} (99%) delete mode 100644 sql/updates/7662_02_mangos_spell_bonus_data.sql diff --git a/sql/updates/2678_mangos_7662_01_world_spell_bonus_data.sql b/sql/updates/2678_mangos_7662_01_world_spell_bonus_data.sql new file mode 100644 index 0000000000..7950f33681 --- /dev/null +++ b/sql/updates/2678_mangos_7662_01_world_spell_bonus_data.sql @@ -0,0 +1,6 @@ +/*ALTER TABLE db_version CHANGE COLUMN required_7662_01_mangos_spell_chain required_7662_02_mangos_spell_bonus_data bit;*/ + +DELETE FROM `spell_bonus_data` WHERE entry IN (50288, 50294); +INSERT INTO `spell_bonus_data` VALUES +(50288, 0.05, 0, 0, "Druid - Starfall"), +(50294, 0.012, 0, 0, "Druid - Starfall AOE"); \ No newline at end of file diff --git a/sql/updates/r991_scriptdev2.sql b/sql/updates/2682_world_SD2_scripts.sql similarity index 99% rename from sql/updates/r991_scriptdev2.sql rename to sql/updates/2682_world_SD2_scripts.sql index b75da0b15d..39ac367d09 100644 --- a/sql/updates/r991_scriptdev2.sql +++ b/sql/updates/2682_world_SD2_scripts.sql @@ -43,4 +43,4 @@ INSERT INTO script_texts (entry,content_default,sound,type,language,emote,commen (-1033005,'There we go!',0,0,1,1,'prisoner adamant SAY_POST1_DOOR_AD'), (-1033006,'Good luck with Arugal. I must hurry back to Hadrec now.',0,0,1,1,'prisoner adamant SAY_POST2_DOOR_AD'), (-1033007,'About time someone killed the wretch.',0,0,1,1,'prisoner adamant SAY_BOSS_DIE_AD'), -(-1033008,'For once I agree with you... scum.',0,0,7,1,'prisoner ashcrombe SAY_BOSS_DIE_AS'); +(-1033008,'For once I agree with you... scum.',0,0,7,1,'prisoner ashcrombe SAY_BOSS_DIE_AS'); \ No newline at end of file diff --git a/sql/updates/2683_characters_gm_tickets.sql b/sql/updates/2683_characters_gm_tickets.sql index 688e151b43..d7a668c4b8 100644 --- a/sql/updates/2683_characters_gm_tickets.sql +++ b/sql/updates/2683_characters_gm_tickets.sql @@ -1 +1 @@ -ALTER TABLE `gm_tickets` ADD COLUMN `createtime` int(10) NOT NULL after `message`; +ALTER TABLE `gm_tickets` ADD COLUMN `createtime` int(10) NOT NULL after `message`; \ No newline at end of file diff --git a/sql/updates/2683_world_trinity_string.sql b/sql/updates/2683_world_trinity_string.sql index ead79e05b6..856f105c53 100644 --- a/sql/updates/2683_world_trinity_string.sql +++ b/sql/updates/2683_world_trinity_string.sql @@ -1,3 +1,3 @@ DELETE FROM `trinity_string` WHERE `entry`=2025; INSERT INTO `trinity_string` (`entry`, `content_default`, `content_loc1`, `content_loc2`, `content_loc3`, `content_loc4`, `content_loc5`, `content_loc6`, `content_loc7`, `content_loc8`) VALUES -('2025','|cff00ff00Created|r:|cff00ccff %s ago|r ',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL); +('2025','|cff00ff00Created|r:|cff00ccff %s ago|r ',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL); \ No newline at end of file diff --git a/sql/updates/2685_world_spell_proc_event.sql b/sql/updates/2685_world_spell_proc_event.sql index 3e729af8ea..9c4ea8c1d4 100644 --- a/sql/updates/2685_world_spell_proc_event.sql +++ b/sql/updates/2685_world_spell_proc_event.sql @@ -2,4 +2,4 @@ DELETE FROM `spell_proc_event` WHERE `entry` IN (56337, 56336, 56333); INSERT INTO `spell_proc_event` VALUES (56337, 0x00, 9, 0x00000004, 0x00000000, 0x00000200, 0x00022200, 0x0000000, 0.000000, 0.000000, 0), (56336, 0x00, 9, 0x00000004, 0x00000000, 0x00000200, 0x00022200, 0x0000000, 0.000000, 0.000000, 0), -(56333, 0x00, 9, 0x00000004, 0x00000000, 0x00000200, 0x00022200, 0x0000000, 0.000000, 0.000000, 0); +(56333, 0x00, 9, 0x00000004, 0x00000000, 0x00000200, 0x00022200, 0x0000000, 0.000000, 0.000000, 0); \ No newline at end of file diff --git a/sql/updates/2686_characters_gm_tickets.sql b/sql/updates/2686_characters_gm_tickets.sql index 8a8d61c2b9..11a1e1f149 100644 --- a/sql/updates/2686_characters_gm_tickets.sql +++ b/sql/updates/2686_characters_gm_tickets.sql @@ -1,4 +1,4 @@ ALTER TABLE `gm_tickets` ADD COLUMN `map` INT NOT NULL DEFAULT '0' AFTER `createtime`; ALTER TABLE `gm_tickets` ADD COLUMN `posX` FLOAT NOT NULL DEFAULT '0' AFTER `map`; ALTER TABLE `gm_tickets` ADD COLUMN `posY` FLOAT NOT NULL DEFAULT '0' AFTER `posX`; -ALTER TABLE `gm_tickets` ADD COLUMN `posZ` FLOAT NOT NULL DEFAULT '0' AFTER `posY`; +ALTER TABLE `gm_tickets` ADD COLUMN `posZ` FLOAT NOT NULL DEFAULT '0' AFTER `posY`; \ No newline at end of file diff --git a/sql/updates/2686_world_command.sql b/sql/updates/2686_world_command.sql index a22254a9d2..5d25225dfe 100644 --- a/sql/updates/2686_world_command.sql +++ b/sql/updates/2686_world_command.sql @@ -1 +1,3 @@ -insert into `command` (`name`, `security`, `help`) values('go ticket','1','Syntax: .go ticket #ticketid\r\nTeleports the user to the location where $ticketid was created.'); +DELETE FROM `command` WHERE `name` IN ('go ticket'); +INSERT INTO `command` VALUES +('go ticket','1','Syntax: .go ticket #ticketid\r\nTeleports the user to the location where $ticketid was created.'); \ No newline at end of file diff --git a/sql/updates/2687_world_spell_proc_event.sql b/sql/updates/2687_world_spell_proc_event.sql index 4053afc55f..fd8960d271 100644 --- a/sql/updates/2687_world_spell_proc_event.sql +++ b/sql/updates/2687_world_spell_proc_event.sql @@ -1,4 +1,4 @@ DELETE FROM `spell_proc_event` WHERE `entry` IN (44545, 44543); INSERT INTO `spell_proc_event` VALUES (44545, 0x00, 3, 1049120, 4096, 0, 65536, 0x0000000, 0.000000, 15.000000, 0), -(44543, 0x00, 3, 1049120, 4096, 0, 65536, 0x0000000, 0.000000, 7.000000, 0); +(44543, 0x00, 3, 1049120, 4096, 0, 65536, 0x0000000, 0.000000, 7.000000, 0); \ No newline at end of file diff --git a/sql/updates/2689_world_spell_linked_spell.sql b/sql/updates/2689_world_spell_linked_spell.sql index 6cbeae5e61..8e077e70f0 100644 --- a/sql/updates/2689_world_spell_linked_spell.sql +++ b/sql/updates/2689_world_spell_linked_spell.sql @@ -1 +1,2 @@ -INSERT IGNORE INTO `spell_linked_spell` VALUES (51723, 52874, 0, 'Fan Of Knives'); +DELETE FROM `spell_linked_spell` WHERE `spell_trigger` IN (51723); +INSERT INTO `spell_linked_spell` VALUES (51723, 52874, 0, 'Fan Of Knives'); \ No newline at end of file diff --git a/sql/updates/7662_02_mangos_spell_bonus_data.sql b/sql/updates/7662_02_mangos_spell_bonus_data.sql deleted file mode 100644 index 8aa04924f8..0000000000 --- a/sql/updates/7662_02_mangos_spell_bonus_data.sql +++ /dev/null @@ -1,6 +0,0 @@ -ALTER TABLE db_version CHANGE COLUMN required_7662_01_mangos_spell_chain required_7662_02_mangos_spell_bonus_data bit; - -DELETE FROM `spell_bonus_data` WHERE entry IN (50288, 50294); -INSERT INTO `spell_bonus_data` VALUES -(50288, 0.05, 0, 0, "Druid - Starfall"), -(50294, 0.012, 0, 0, "Druid - Starfall AOE");