From 852d65f7caca3215eaa16049d9f8d83c3ec3e800 Mon Sep 17 00:00:00 2001 From: Vincent_Michael Date: Thu, 20 Dec 2012 16:48:24 +0100 Subject: SQL: Rename SQL merged in PR --- .../2012_12_20_00_characters_create_item_loot.sql | 52 ++++++++++++++++++++++ .../characters/characters_create_item_loot.sql | 52 ---------------------- sql/updates/world/2012_12_19_01_world_misc.sql | 26 ----------- sql/updates/world/2012_12_20_02_world_misc.sql | 26 +++++++++++ 4 files changed, 78 insertions(+), 78 deletions(-) create mode 100644 sql/updates/characters/2012_12_20_00_characters_create_item_loot.sql delete mode 100644 sql/updates/characters/characters_create_item_loot.sql delete mode 100644 sql/updates/world/2012_12_19_01_world_misc.sql create mode 100644 sql/updates/world/2012_12_20_02_world_misc.sql (limited to 'sql/updates') diff --git a/sql/updates/characters/2012_12_20_00_characters_create_item_loot.sql b/sql/updates/characters/2012_12_20_00_characters_create_item_loot.sql new file mode 100644 index 00000000000..3c1529e8bdf --- /dev/null +++ b/sql/updates/characters/2012_12_20_00_characters_create_item_loot.sql @@ -0,0 +1,52 @@ +/* +SQLyog Ultimate v9.63 +MySQL - 5.5.21 : Database - characters +********************************************************************* +*/ + +/*!40101 SET NAMES utf8 */; + +/*!40101 SET SQL_MODE=''*/; + +/*!40014 SET @OLD_UNIQUE_CHECKS=@@UNIQUE_CHECKS, UNIQUE_CHECKS=0 */; +/*!40101 SET @OLD_SQL_MODE=@@SQL_MODE, SQL_MODE='NO_AUTO_VALUE_ON_ZERO' */; +/*!40111 SET @OLD_SQL_NOTES=@@SQL_NOTES, SQL_NOTES=0 */; + +-- +-- Table structure for table `item_loot_items` +-- + +DROP TABLE IF EXISTS `item_loot_items`; +/*!40101 SET @saved_cs_client = @@character_set_client */; +/*!40101 SET character_set_client = utf8 */; +CREATE TABLE `item_loot_items` ( + `container_id` int(10) unsigned NOT NULL DEFAULT '0' COMMENT 'guid of container (item_instance.guid)', + `item_id` int(10) unsigned NOT NULL DEFAULT '0' COMMENT 'loot item entry (item_instance.itemEntry)', + `item_count` int(10) NOT NULL DEFAULT '0' COMMENT 'stack size', + `follow_rules` tinyint(1) NOT NULL DEFAULT '0' COMMENT 'follow loot rules', + `ffa` tinyint(1) NOT NULL DEFAULT '0' COMMENT 'free-for-all', + `blocked` tinyint(1) NOT NULL DEFAULT '0', + `counted` tinyint(1) NOT NULL DEFAULT '0', + `under_threshold` tinyint(1) NOT NULL DEFAULT '0', + `needs_quest` tinyint(1) NOT NULL DEFAULT '0' COMMENT 'quest drop', + `rnd_prop` int(10) NOT NULL DEFAULT '0' COMMENT 'random enchantment added when originally rolled', + `rnd_suffix` int(10) NOT NULL DEFAULT '0' COMMENT 'random suffix added when originally rolled' +) ENGINE=InnoDB DEFAULT CHARSET=latin1; +/*!40101 SET character_set_client = @saved_cs_client */; + +-- +-- Table structure for table `item_loot_money` +-- + +DROP TABLE IF EXISTS `item_loot_money`; +/*!40101 SET @saved_cs_client = @@character_set_client */; +/*!40101 SET character_set_client = utf8 */; +CREATE TABLE `item_loot_money` ( + `container_id` int(10) NOT NULL DEFAULT '0' COMMENT 'guid of container (item_instance.guid)', + `money` int(10) NOT NULL DEFAULT '0' COMMENT 'money loot (in copper)' +) ENGINE=InnoDB DEFAULT CHARSET=latin1; +/*!40101 SET character_set_client = @saved_cs_client */; + +/*!40101 SET SQL_MODE=@OLD_SQL_MODE */; +/*!40014 SET UNIQUE_CHECKS=@OLD_UNIQUE_CHECKS */; +/*!40111 SET SQL_NOTES=@OLD_SQL_NOTES */; diff --git a/sql/updates/characters/characters_create_item_loot.sql b/sql/updates/characters/characters_create_item_loot.sql deleted file mode 100644 index 3c1529e8bdf..00000000000 --- a/sql/updates/characters/characters_create_item_loot.sql +++ /dev/null @@ -1,52 +0,0 @@ -/* -SQLyog Ultimate v9.63 -MySQL - 5.5.21 : Database - characters -********************************************************************* -*/ - -/*!40101 SET NAMES utf8 */; - -/*!40101 SET SQL_MODE=''*/; - -/*!40014 SET @OLD_UNIQUE_CHECKS=@@UNIQUE_CHECKS, UNIQUE_CHECKS=0 */; -/*!40101 SET @OLD_SQL_MODE=@@SQL_MODE, SQL_MODE='NO_AUTO_VALUE_ON_ZERO' */; -/*!40111 SET @OLD_SQL_NOTES=@@SQL_NOTES, SQL_NOTES=0 */; - --- --- Table structure for table `item_loot_items` --- - -DROP TABLE IF EXISTS `item_loot_items`; -/*!40101 SET @saved_cs_client = @@character_set_client */; -/*!40101 SET character_set_client = utf8 */; -CREATE TABLE `item_loot_items` ( - `container_id` int(10) unsigned NOT NULL DEFAULT '0' COMMENT 'guid of container (item_instance.guid)', - `item_id` int(10) unsigned NOT NULL DEFAULT '0' COMMENT 'loot item entry (item_instance.itemEntry)', - `item_count` int(10) NOT NULL DEFAULT '0' COMMENT 'stack size', - `follow_rules` tinyint(1) NOT NULL DEFAULT '0' COMMENT 'follow loot rules', - `ffa` tinyint(1) NOT NULL DEFAULT '0' COMMENT 'free-for-all', - `blocked` tinyint(1) NOT NULL DEFAULT '0', - `counted` tinyint(1) NOT NULL DEFAULT '0', - `under_threshold` tinyint(1) NOT NULL DEFAULT '0', - `needs_quest` tinyint(1) NOT NULL DEFAULT '0' COMMENT 'quest drop', - `rnd_prop` int(10) NOT NULL DEFAULT '0' COMMENT 'random enchantment added when originally rolled', - `rnd_suffix` int(10) NOT NULL DEFAULT '0' COMMENT 'random suffix added when originally rolled' -) ENGINE=InnoDB DEFAULT CHARSET=latin1; -/*!40101 SET character_set_client = @saved_cs_client */; - --- --- Table structure for table `item_loot_money` --- - -DROP TABLE IF EXISTS `item_loot_money`; -/*!40101 SET @saved_cs_client = @@character_set_client */; -/*!40101 SET character_set_client = utf8 */; -CREATE TABLE `item_loot_money` ( - `container_id` int(10) NOT NULL DEFAULT '0' COMMENT 'guid of container (item_instance.guid)', - `money` int(10) NOT NULL DEFAULT '0' COMMENT 'money loot (in copper)' -) ENGINE=InnoDB DEFAULT CHARSET=latin1; -/*!40101 SET character_set_client = @saved_cs_client */; - -/*!40101 SET SQL_MODE=@OLD_SQL_MODE */; -/*!40014 SET UNIQUE_CHECKS=@OLD_UNIQUE_CHECKS */; -/*!40111 SET SQL_NOTES=@OLD_SQL_NOTES */; diff --git a/sql/updates/world/2012_12_19_01_world_misc.sql b/sql/updates/world/2012_12_19_01_world_misc.sql deleted file mode 100644 index c04965d8258..00000000000 --- a/sql/updates/world/2012_12_19_01_world_misc.sql +++ /dev/null @@ -1,26 +0,0 @@ -DELETE FROM `conditions` WHERE `SourceTypeOrReferenceId`=17 AND `SourceEntry`=52781; -INSERT INTO `conditions` (`SourceTypeOrReferenceId`, `SourceGroup`, `SourceEntry`, `SourceId`, `ElseGroup`, `ConditionTypeOrReference`, `ConditionTarget`, `ConditionValue1`, `ConditionValue2`, `ConditionValue3`, `NegativeCondition`, `ErrorType`, `ErrorTextId`, `ScriptName`, `Comment`) VALUES -(17,0,52781,0,0,31,0,3,28610,0,0,27,0,'','Persuasive Strike - Scarlet Marksman'), -(17,0,52781,0,1,31,0,3,28939,0,0,27,0,'','Persuasive Strike - Scarlet Preacher'), -(17,0,52781,0,2,31,0,3,28940,0,0,27,0,'','Persuasive Strike - Scarlet Crusader'); - -DELETE FROM `spell_linked_spell` WHERE `spell_trigger` IN (32096,32098); -INSERT INTO `spell_linked_spell` (`spell_trigger`,`spell_effect`,`type`,`comment`) VALUES -(32096,32172,2,'Thrallmar''s Favor'), -(32098,32172,2,'Honor Hold''s Favor'); - -DELETE FROM `spell_area` WHERE `spell` IN (32096,32098); -INSERT INTO `spell_area` (`spell`,`area`,`autocast`) VALUES -(32096,3483,0), -(32096,3562,0), -(32096,3713,0), -(32096,3714,0), -(32096,3836,0), -(32098,3483,0), -(32098,3562,0), -(32098,3713,0), -(32098,3714,0), -(32098,3836,0); - --- Dark / Light essence removing -DELETE FROM `spell_linked_spell` WHERE `spell_trigger` IN (-67222, -67223, -67224, -65686, -67176, -67177, -67178, -65684); diff --git a/sql/updates/world/2012_12_20_02_world_misc.sql b/sql/updates/world/2012_12_20_02_world_misc.sql new file mode 100644 index 00000000000..c04965d8258 --- /dev/null +++ b/sql/updates/world/2012_12_20_02_world_misc.sql @@ -0,0 +1,26 @@ +DELETE FROM `conditions` WHERE `SourceTypeOrReferenceId`=17 AND `SourceEntry`=52781; +INSERT INTO `conditions` (`SourceTypeOrReferenceId`, `SourceGroup`, `SourceEntry`, `SourceId`, `ElseGroup`, `ConditionTypeOrReference`, `ConditionTarget`, `ConditionValue1`, `ConditionValue2`, `ConditionValue3`, `NegativeCondition`, `ErrorType`, `ErrorTextId`, `ScriptName`, `Comment`) VALUES +(17,0,52781,0,0,31,0,3,28610,0,0,27,0,'','Persuasive Strike - Scarlet Marksman'), +(17,0,52781,0,1,31,0,3,28939,0,0,27,0,'','Persuasive Strike - Scarlet Preacher'), +(17,0,52781,0,2,31,0,3,28940,0,0,27,0,'','Persuasive Strike - Scarlet Crusader'); + +DELETE FROM `spell_linked_spell` WHERE `spell_trigger` IN (32096,32098); +INSERT INTO `spell_linked_spell` (`spell_trigger`,`spell_effect`,`type`,`comment`) VALUES +(32096,32172,2,'Thrallmar''s Favor'), +(32098,32172,2,'Honor Hold''s Favor'); + +DELETE FROM `spell_area` WHERE `spell` IN (32096,32098); +INSERT INTO `spell_area` (`spell`,`area`,`autocast`) VALUES +(32096,3483,0), +(32096,3562,0), +(32096,3713,0), +(32096,3714,0), +(32096,3836,0), +(32098,3483,0), +(32098,3562,0), +(32098,3713,0), +(32098,3714,0), +(32098,3836,0); + +-- Dark / Light essence removing +DELETE FROM `spell_linked_spell` WHERE `spell_trigger` IN (-67222, -67223, -67224, -65686, -67176, -67177, -67178, -65684); -- cgit v1.2.3