diff options
| author | QAston <qaston@gmail.com> | 2011-06-26 19:32:41 +0200 |
|---|---|---|
| committer | QAston <qaston@gmail.com> | 2011-06-26 19:32:41 +0200 |
| commit | e5db97a28ef14bbb7c503da636badbcb5e190184 (patch) | |
| tree | c2bf57ed8188f600c82c808388b1492b107a9b5e /sql | |
| parent | faaba1aa65c17ca48f4f8d25612e4ff5f4afcd5e (diff) | |
| parent | e7778c72314cd697814d6a16c3e69c2e4737c3ec (diff) | |
Merge branch 'master' of https://github.com/TrinityCore/TrinityCore
Diffstat (limited to 'sql')
3 files changed, 31 insertions, 2 deletions
diff --git a/sql/updates/world/2011_06_26_04_world_spell_proc.sql b/sql/updates/world/2011_06_26_04_world_spell_proc.sql index 5a5ea9973e5..063a3edd3bf 100644 --- a/sql/updates/world/2011_06_26_04_world_spell_proc.sql +++ b/sql/updates/world/2011_06_26_04_world_spell_proc.sql @@ -1 +1,19 @@ -DROP TABLE IF EXISTS `spell_proc`;
CREATE TABLE `spell_proc` (
`spellId` mediumint(8) NOT NULL DEFAULT '0',
`schoolMask` tinyint(4) NOT NULL DEFAULT '0',
`spellFamilyName` smallint(5) unsigned NOT NULL DEFAULT '0',
`spellFamilyMask0` int(10) unsigned NOT NULL DEFAULT '0',
`spellFamilyMask1` int(10) unsigned NOT NULL DEFAULT '0',
`spellFamilyMask2` int(10) unsigned NOT NULL DEFAULT '0',
`typeMask` int(10) unsigned NOT NULL DEFAULT '0',
`spellTypeMask` int(10) unsigned NOT NULL DEFAULT '0',
`spellPhaseMask` int(10) NOT NULL DEFAULT '0',
`hitMask` int(10) NOT NULL DEFAULT '0',
`attributesMask` int(10) unsigned NOT NULL DEFAULT '0',
`ratePerMinute` float NOT NULL DEFAULT '0',
`chance` float NOT NULL DEFAULT '0',
`cooldown` float unsigned NOT NULL DEFAULT '0',
`charges` int(10) unsigned NOT NULL DEFAULT '0',
PRIMARY KEY (`spellId`)
) ENGINE=MyISAM DEFAULT CHARSET=utf8;
\ No newline at end of file +DROP TABLE IF EXISTS `spell_proc`;
+CREATE TABLE `spell_proc` (
+ `spellId` mediumint(8) NOT NULL DEFAULT '0',
+ `schoolMask` tinyint(4) NOT NULL DEFAULT '0',
+ `spellFamilyName` smallint(5) unsigned NOT NULL DEFAULT '0',
+ `spellFamilyMask0` int(10) unsigned NOT NULL DEFAULT '0',
+ `spellFamilyMask1` int(10) unsigned NOT NULL DEFAULT '0',
+ `spellFamilyMask2` int(10) unsigned NOT NULL DEFAULT '0',
+ `typeMask` int(10) unsigned NOT NULL DEFAULT '0',
+ `spellTypeMask` int(10) unsigned NOT NULL DEFAULT '0',
+ `spellPhaseMask` int(10) NOT NULL DEFAULT '0',
+ `hitMask` int(10) NOT NULL DEFAULT '0',
+ `attributesMask` int(10) unsigned NOT NULL DEFAULT '0',
+ `ratePerMinute` float NOT NULL DEFAULT '0',
+ `chance` float NOT NULL DEFAULT '0',
+ `cooldown` float unsigned NOT NULL DEFAULT '0',
+ `charges` int(10) unsigned NOT NULL DEFAULT '0',
+ PRIMARY KEY (`spellId`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8;
diff --git a/sql/updates/world/2011_06_26_05_world_command.sql b/sql/updates/world/2011_06_26_05_world_command.sql index 81259662612..b18bbe61954 100644 --- a/sql/updates/world/2011_06_26_05_world_command.sql +++ b/sql/updates/world/2011_06_26_05_world_command.sql @@ -1 +1,3 @@ -DELETE FROM `command` WHERE `name` = 'reload spell_proc';
INSERT INTO `command` VALUES
('reload spell_proc',3,'Syntax: .reload spell_proc\nReload spell_proc table.');
\ No newline at end of file +DELETE FROM `command` WHERE `name` = 'reload spell_proc';
+INSERT INTO `command` VALUES
+('reload spell_proc',3,'Syntax: .reload spell_proc\nReload spell_proc table.');
diff --git a/sql/updates/world/2011_06_26_06_world_achievement_criteria_data.sql b/sql/updates/world/2011_06_26_06_world_achievement_criteria_data.sql new file mode 100644 index 00000000000..b9cd7b9f7a0 --- /dev/null +++ b/sql/updates/world/2011_06_26_06_world_achievement_criteria_data.sql @@ -0,0 +1,9 @@ +DELETE FROM `achievement_criteria_data` WHERE `criteria_id` IN (10447,10448,10449,10459,10460,10461) AND `type` IN (11,18); +INSERT INTO `achievement_criteria_data` (`criteria_id`,`type`,`value1`,`value2`,`ScriptName`) +VALUES +(10447,18,0,0,''), +(10448,18,0,0,''), +(10449,18,0,0,''), +(10459,18,0,0,''), +(10460,18,0,0,''), +(10461,18,0,0,''); |