Merge branch 'master' of https://github.com/TrinityCore/TrinityCore

4 files changed, 45 insertions, 0 deletions

diff --git a/sql/updates/world/2012_04_12_00_world_creature_template.sql b/sql/updates/world/2012_04_12_00_world_creature_template.sql
new file mode 100644
index 00000000000..ef4596939f5
--- /dev/null
+++ b/sql/updates/world/2012_04_12_00_world_creature_template.sql
@@ -0,0 +1,2 @@
+-- Update proper modelid for Celestial Steed (31957 is wrong)
+UPDATE `creature_template` SET `modelid1`=31958,`modelid2`=0 WHERE `entry`=40625;
diff --git a/sql/updates/world/2012_04_12_01_world_creature_template.sql b/sql/updates/world/2012_04_12_01_world_creature_template.sql
new file mode 100644
index 00000000000..bfe7b698ae9
--- /dev/null
+++ b/sql/updates/world/2012_04_12_01_world_creature_template.sql
@@ -0,0 +1,6 @@
+UPDATE `creature_template` SET `WDBVerified`=12340 WHERE `entry`=40624; -- Verified
+
+-- Remove temp entry 68686 and replace with wdb verified 38686
+UPDATE `creature_template` SET `difficulty_entry_3`=38686 WHERE `entry`=36950;
+UPDATE `creature_template` SET `minlevel`=82,`maxlevel`=82,`exp`=2,`faction_A`=84,`faction_H`=84,`mindmg`=488,`maxdmg`=642,`attackpower`=782,`unit_flags`=32832,`dynamicflags`=8,`minrangedmg`=363,`maxrangedmg`=521,`rangedattackpower`=121 WHERE `entry`=38686;
+DELETE FROM `creature_template` WHERE `entry`=68686;
diff --git a/sql/updates/world/2012_04_12_02_world_spell_bonus_data.sql b/sql/updates/world/2012_04_12_02_world_spell_bonus_data.sql
new file mode 100644
index 00000000000..db35f5d97ee
--- /dev/null
+++ b/sql/updates/world/2012_04_12_02_world_spell_bonus_data.sql
@@ -0,0 +1,29 @@
+-- Druid
+UPDATE `spell_bonus_data` SET `direct_bonus`=0,`dot_bonus`=0 WHERE `entry` IN (779,1822,60089);
+DELETE FROM `spell_bonus_data` WHERE `entry` IN (1079,9007,22568);
+INSERT INTO `spell_bonus_data` (`entry`,`direct_bonus`,`dot_bonus`,`ap_bonus`,`ap_dot_bonus`,`comments`) VALUES
+(1079,0,0,-1,-1, 'Druid - Rip'),
+(9007,0,0,-1,-1, 'Druid - Pounce Bleed'),
+(22568,0,0,-1,-1, 'Druid - Ferocious Bite');
+
+-- Hunter
+UPDATE `spell_bonus_data` SET `direct_bonus`=0,`dot_bonus`=0 WHERE `entry` IN (3044,3674,53352,13812,13797,1978,42243);
+UPDATE `spell_bonus_data` SET `ap_dot_bonus`=0.1 WHERE `entry`=13812;
+DELETE FROM `spell_bonus_data` WHERE `entry` IN (24131,53353);
+INSERT INTO `spell_bonus_data` (`entry`,`direct_bonus`,`dot_bonus`,`ap_bonus`,`ap_dot_bonus`,`comments`) VALUES
+(24131,0,0,-1,-1, 'Hunter - Wyvern Sting (triggered)'),
+(53353,0,0,-1,-1, 'Hunter - Chimera Shot (Serpent)');
+DELETE FROM `spell_ranks` WHERE `first_spell_id`=24131;
+INSERT INTO `spell_ranks` VALUES
+(24131,24131,1),
+(24131,24134,2),
+(24131,24135,3),
+(24131,27069,4),
+(24131,49009,5),
+(24131,49010,6);
+
+-- Rogue
+UPDATE `spell_bonus_data` SET `direct_bonus`=0,`dot_bonus`=0 WHERE `entry` IN (2818,2819,11353,11354,25349,26968,27187,57969,57970);
+
+-- Howling blast
+UPDATE `spell_bonus_data` SET `ap_bonus`=0.2 WHERE `entry`=49184;
diff --git a/sql/updates/world/2012_04_12_03_world_spell_bonus_data.sql b/sql/updates/world/2012_04_12_03_world_spell_bonus_data.sql
new file mode 100644
index 00000000000..d2262e52e98
--- /dev/null
+++ b/sql/updates/world/2012_04_12_03_world_spell_bonus_data.sql
@@ -0,0 +1,8 @@
+-- Fixes some spell power stacking exploits
+DELETE FROM `spell_bonus_data` WHERE `entry` IN (44525,18798,16614,7712,13897);
+INSERT INTO `spell_bonus_data` (`entry`,`direct_bonus`,`dot_bonus`,`ap_bonus`,`ap_dot_bonus`,`comments`) VALUES
+(44525,0,0,-1,-1, 'Enchant Weapon - Icebreaker'),
+(18798,0,0,-1,-1, 'Item - Freezing Band'),
+(16614,0,0,-1,-1, 'Item - Storm Gauntlets'),
+(7712,0,0,-1,-1, 'Item - Fiery Retributer | Blazefury Medallion'),
+(13897,0,0,-1,-1, 'Enchant Weapon - Fiery Weapon');