Skip to content

Instantly share code, notes, and snippets.

@KiriX

KiriX/mr2_m3.diff

Created December 25, 2012 09:31
Show Gist options
  • Star 0 You must be signed in to star a gist
  • Fork 0 You must be signed in to fork a gist
  • Save KiriX/4372445 to your computer and use it in GitHub Desktop.
Save KiriX/4372445 to your computer and use it in GitHub Desktop.
Download ZIP
Raw
mr2_m3.diff
diff --git a/sql_mr/mr00480_mangos_shaman_overload.sql b/sql_mr/mr00480_mangos_shaman_overload.sql
index 6ee11dd..f7e495a 100644
--- a/sql_mr/mr00480_mangos_shaman_overload.sql
+++ b/sql_mr/mr00480_mangos_shaman_overload.sql
@@ -1,20 +1,5 @@
-- Lightning Bolt
DELETE FROM spell_chain WHERE first_spell = 45284;
-INSERT INTO spell_chain (spell_id, prev_spell, first_spell, rank) VALUES
-(45284, 0, 45284, 1),
-(45286, 45284, 45284, 2),
-(45287, 45286, 45284, 3),
-(45288, 45287, 45284, 4),
-(45289, 45288, 45284, 5),
-(45290, 45289, 45284, 6),
-(45291, 45290, 45284, 7),
-(45292, 45291, 45284, 8),
-(45293, 45292, 45284, 9),
-(45294, 45293, 45284, 10),
-(45295, 45294, 45284, 11),
-(45296, 45295, 45284, 12),
-(49239, 45296, 45284, 13),
-(49240, 49239, 45284, 14);
DELETE FROM spell_bonus_data WHERE entry = 45284;
INSERT INTO spell_bonus_data (entry, direct_bonus, comments) VALUES
@@ -22,15 +7,6 @@ INSERT INTO spell_bonus_data (entry, direct_bonus, comments) VALUES
-- Chain Lightning
DELETE FROM spell_chain WHERE first_spell = 45297;
-INSERT INTO spell_chain (spell_id, prev_spell, first_spell, rank) VALUES
-(45297, 0, 45297, 1),
-(45298, 45297, 45297, 2),
-(45299, 45298, 45297, 3),
-(45300, 45299, 45297, 4),
-(45301, 45300, 45297, 5),
-(45302, 45301, 45297, 6),
-(49268, 45302, 45297, 7),
-(49269, 49268, 45297, 8);
DELETE FROM spell_bonus_data WHERE entry = 45297;
INSERT INTO spell_bonus_data (entry, direct_bonus, comments) VALUES
diff --git a/sql_mr/mr01280_mangos_spell_proc_event_hacks.sql b/sql_mr/mr01280_mangos_spell_proc_event_hacks.sql
index 27bb1e5..f52905c 100644
--- a/sql_mr/mr01280_mangos_spell_proc_event_hacks.sql
+++ b/sql_mr/mr01280_mangos_spell_proc_event_hacks.sql
@@ -11,7 +11,6 @@ INSERT INTO spell_proc_event VALUES (57529, 0x00, 3, 0x61400035 | 0x200000 | 0x2
DELETE FROM spell_proc_event WHERE entry IN (44543, 44545);
-- (74396) Fingers of Frost
DELETE FROM `spell_proc_event` WHERE `entry` IN (74396);
-INSERT INTO `spell_proc_event` VALUES (74396, 0x00, 0x03, 685904631, 685904631, 685904631, 1151048, 1151048, 1151048, 0, 0, 0, 65536, 0, 0, 0, 0);
-- Savage Combat
DELETE FROM spell_proc_event WHERE entry = 51682;
diff --git a/sql_mr/mr01384_mangos_spell_bonus_data.sql b/sql_mr/mr01384_mangos_spell_bonus_data.sql
index e7a8500..dca4fef 100644
--- a/sql_mr/mr01384_mangos_spell_bonus_data.sql
+++ b/sql_mr/mr01384_mangos_spell_bonus_data.sql
@@ -27,8 +27,7 @@ VALUES
DELETE FROM `spell_bonus_data` WHERE `entry` IN (7294, 467, 2947);
INSERT INTO `spell_bonus_data`(`entry`,`direct_bonus`,`dot_bonus`,`ap_bonus`,`ap_dot_bonus`,`comments`) VALUES
( 467, 0.033, 0, 0, 0,'Druid - Thorns'),
- (7294, 0.033, 0, 0, 0,'Paladin - Retribution Aura'),
- (2947, 0.033, 0, 0, 0,'Warlock - Fire Shield (Imp)');
+ (7294, 0.033, 0, 0, 0,'Paladin - Retribution Aura');
-- Item's
DELETE FROM `spell_bonus_data` WHERE `entry` IN (16614, 45055, 60488);
diff --git a/sql_mr/mr01792_mangos_spell_linked.sql b/sql_mr/mr01792_mangos_spell_linked.sql
index fb7f8c1..d73b320 100644
--- a/sql_mr/mr01792_mangos_spell_linked.sql
+++ b/sql_mr/mr01792_mangos_spell_linked.sql
@@ -9,16 +9,10 @@ CREATE TABLE IF NOT EXISTS `spell_linked` (
) DEFAULT CHARSET=utf8 PACK_KEYS=0 COMMENT='Linked spells storage';
DELETE FROM `spell_linked` WHERE `entry` = 25780;
-INSERT INTO `spell_linked` (`entry`, `linked_entry`, `type`, `effect_mask`, `comment`) VALUES
-(25780, 57339, 1, 0, 'Paladin - threat addon after 3.0');
DELETE FROM `spell_linked` WHERE `entry` = 21178;
-INSERT INTO `spell_linked` (`entry`, `linked_entry`, `type`, `effect_mask`, `comment`) VALUES
-(21178, 57339, 1, 0, 'Druid Bear form - threat addon after 3.0');
DELETE FROM `spell_linked` WHERE `entry` = 7376;
-INSERT INTO `spell_linked` (`entry`, `linked_entry`, `type`, `effect_mask`, `comment`) VALUES
-(7376, 57339, 1, 0, 'Warrior Defensive Stance Passive - threat addon after 3.0');
DELETE FROM `spell_linked` WHERE `entry` = 64382;
INSERT INTO `spell_linked` (`entry`, `linked_entry`, `type`, `effect_mask`, `comment`) VALUES
diff --git a/sql_mr/mr01839_mangos_Isle_of_Conquest.sql b/sql_mr/mr01839_mangos_Isle_of_Conquest.sql
index 955d10e..fcc9278 100644
--- a/sql_mr/mr01839_mangos_Isle_of_Conquest.sql
+++ b/sql_mr/mr01839_mangos_Isle_of_Conquest.sql
@@ -45,7 +45,8 @@ UPDATE creature_template SET vehicle_id = 452, iconName = 'Gunner', AIName = 'Nu
-- Horde Gunship Cannon
UPDATE creature_template SET vehicle_id = 453, iconName = 'Gunner', AIName = 'NullAI', faction_A = 6, faction_H = 6, ScriptName = '' WHERE entry = 34935;
-- Keep Cannon
-UPDATE creature_template SET ScriptName = '', AIName = 'NullAI' WHERE entry IN (34944, 35429);
+UPDATE creature_template SET ScriptName = '', AIName = 'NullAI' WHERE entry IN (34944);
+UPDATE creature_template SET ScriptName = '', AIName = '' WHERE entry IN (35429);
UPDATE creature_template SET vehicle_id = 160, iconName = 'Gunner', faction_A = 35, faction_H = 35, unit_flags = unit_flags | 4 WHERE entry IN (34944, 35429);
UPDATE creature_template SET mechanic_immune_mask = mechanic_immune_mask|1|2|8|16|32|64|128|1024|2048|4096|8192|131072|262144|8388608|16777216|67108864 WHERE entry IN (34944, 35429, 34793, 35413, 34775, 35415, 34776, 35431, 35069, 35433, 34802, 35419, 35273, 35421);
@@ -403,6 +404,8 @@ INSERT INTO gameobject (guid, id, map, spawnMask, phaseMask, position_x, positio
(@GAMEOBJECT+137 , 195237 , 628 , 3 , 1 , 750.601 , -864.597 , 13.4754 , 1.93731 , 0 , 0 , 0 , 0 , 10 , 0 , 0),
(@GAMEOBJECT+138 , 195237 , 628 , 3 , 1 , 785.509 , -864.715 , 13.3993 , 2.47837 , 0 , 0 , 0 , 0 , 10 , 0 , 0);
+UPDATE gameobject SET spawnMask=1 WHERE map=628;
+
DELETE FROM gameobject_battleground WHERE guid IN (SELECT guid FROM gameobject WHERE map=628);
INSERT INTO gameobject_battleground (guid, event1, event2) VALUES
(@GAMEOBJECT+46 , 0 , 0),
@@ -628,6 +631,8 @@ INSERT INTO creature (guid, id, map, spawnMask, phaseMask, modelid, equipment_id
(@CREATURE+67, 34944, 628, 3, 1, 0, 0, 1142.59, -691.946, 87.9756, 3.9619, 180000, 0, 0, 35000, 0, 0, 0),
(@CREATURE+68, 34944, 628, 3, 1, 0, 0, 1166.13, -858.391, 87.9653, 5.63741, 180000, 0, 0, 35000, 0, 0, 0);
+UPDATE creature SET spawnMask=1 WHERE map=628;
+
DELETE FROM creature_battleground WHERE guid IN (SELECT guid FROM creature WHERE map=628);
INSERT INTO creature_battleground (guid, event1, event2) VALUES
-- siege engines
diff --git a/sql_mr/mr02381_mangos_spell_proc_event.sql b/sql_mr/mr02381_mangos_spell_proc_event.sql
index 2061118..2bf295f 100644
--- a/sql_mr/mr02381_mangos_spell_proc_event.sql
+++ b/sql_mr/mr02381_mangos_spell_proc_event.sql
@@ -5,11 +5,9 @@ INSERT INTO spell_proc_event VALUES (49004, 0x00, 0x0F, 0x00000000, 0x00000000,
-- (49200) Acclimation
DELETE FROM spell_proc_event WHERE entry = 49200;
-INSERT INTO spell_proc_event VALUES (49200, 127, 0x00, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0, 0, 0);
-- (48988) Bloody Vengeance
DELETE FROM spell_proc_event WHERE entry = 48988;
-INSERT INTO spell_proc_event VALUES (48988, 0x00, 0x0F, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000002, 0, 0, 0);
-- (49149) Chill of the Grave
DELETE FROM spell_proc_event WHERE entry = 49149;
@@ -17,11 +15,9 @@ INSERT INTO spell_proc_event VALUES (49149, 0x00, 0x0F, 0x00000006, 0x00000006,
-- (66799) Desolation
DELETE FROM spell_proc_event WHERE entry = 66799;
-INSERT INTO spell_proc_event VALUES (66799, 0x00, 0x0F, 0x00400000, 0x00400000, 0x00400000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0, 0, 0);
-- (49223) Dirge
DELETE FROM spell_proc_event WHERE entry = 49223;
-INSERT INTO spell_proc_event VALUES (49223, 0x00, 0x0F, 0x00000011, 0x00000011, 0x00000011, 0x08000000, 0x08000000, 0x08000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0, 0, 0);
-- (55666) Desecration
DELETE FROM spell_proc_event WHERE entry = 55666;
@@ -33,11 +29,10 @@ INSERT INTO spell_proc_event VALUES (49194, 0x00, 0x0F, 0x00002000, 0x00002000,
-- (49032) Crypt Fever
DELETE FROM spell_proc_event WHERE entry = 49032;
-INSERT INTO spell_proc_event VALUES (49032, 0x00, 0x0F, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00010010, 0x00000000, 0, 100, 0);
-- (51099) Ebon Plaguebringer
DELETE FROM spell_proc_event WHERE entry IN (51099, 3439);
-INSERT INTO spell_proc_event VALUES (51099, 0x00, 0x0F, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00010010, 0x00000000, 0, 100, 0);
+INSERT INTO spell_proc_event VALUES (51099, 0x00, 0x0F, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00010010, 0x00000000, 0, 0, 0);
-- (49222) Bone Shield
DELETE FROM spell_proc_event WHERE entry = 49222;
@@ -49,14 +44,9 @@ INSERT INTO spell_proc_event VALUES (62147, 0x00, 0x0F, 0x00000002, 0x00000002,
-- (50880) Icy Talons
DELETE FROM spell_proc_event WHERE entry = 50880;
-INSERT INTO spell_proc_event VALUES (50880, 0x00, 0x0F, 0x00000000, 0x00000000, 0x00000000, 0x04000000, 0x04000000, 0x04000000, 0x00000000, 0x00000000, 0x00000000, 0x00070000, 0x00000000, 0, 0, 0);
-- (49467) Death Rune Mastery
DELETE FROM spell_proc_event WHERE entry IN (49208, 49467, 54639);
-INSERT INTO spell_proc_event VALUES
-(49467, 0x00, 0x0F, 0x00000010, 0x00020000, 0x00000000, 0x00010010, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0, 0, 0),
-(49208, 0x00, 0x0F, 0x00400000, 0x00010000, 0x00000000, 0x00010010, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0, 0, 0),
-(54639, 0x00, 0x0F, 0x00400000, 0x00010000, 0x00000000, 0x00010010, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0, 0, 0);
-- (70652) Item - Death Knight T10 Tank 4P Bonus
DELETE FROM spell_proc_event WHERE entry = 70652;
@@ -89,20 +79,17 @@ INSERT INTO spell_proc_event VALUES (62459, 0x00, 0x0F, 0x00000004, 0x00000004,
-- (56817) Rune Strike
DELETE FROM spell_proc_event WHERE entry = 56817;
INSERT INTO spell_proc_event VALUES
-(56817, 0, 15, 0, 0, 0, 0x20000000, 0x20000000, 0x20000000, 0, 0, 0, 0x10, 0, 0, 0, 0);
+(56817, 0, 15, 0, 0, 0, 0x20000000, 0x20000000, 0x20000000, 0, 0, 0, 0, 0, 0, 0, 0);
-- (51123) Killing Machine
DELETE FROM spell_proc_event WHERE entry IN (51123, 51127, 51128, 51129, 51130);
INSERT INTO spell_proc_event VALUES
(51123, 0x00, 0x0F, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 1, 0, 0),
(51127, 0x00, 0x0F, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 2, 0, 0),
-(51128, 0x00, 0x0F, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 3, 0, 0),
-(51129, 0x00, 0x0F, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 4, 0, 0),
-(51130, 0x00, 0x0F, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 5, 0, 0);
+(51128, 0x00, 0x0F, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 3, 0, 0);
-- (49217) Wandering Plague
DELETE FROM spell_proc_event WHERE entry IN (49217, 49654, 49655);
-INSERT INTO spell_proc_event VALUES (49217, 0x00, 0x0F, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000001, 0, 0, 3);
-- (49219) Blood-Caked Blade
DELETE FROM `spell_proc_event` WHERE `entry` IN (49219);
@@ -110,7 +97,6 @@ INSERT INTO `spell_proc_event` VALUES (49219, 0x00, 0x0F, 0x00000000, 0x00000000
-- (51209) Hungering Cold
DELETE FROM `spell_proc_event` WHERE `entry` IN (51209);
-INSERT INTO `spell_proc_event` VALUES (51209, 127, 0x00, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00100000, 0x00000000, 0, 0, 0);
-- Druid
-- (16864) Omen of Clarity
@@ -158,7 +144,7 @@ INSERT INTO spell_proc_event VALUES (67361, 0x00, 0x07, 0x00000002, 0x00000002,
-- (67356) Item - Druid T9 Restoration Relic (Rejuvenation)
DELETE FROM spell_proc_event WHERE entry = 67356;
-INSERT INTO spell_proc_event VALUES (67356, 0x00, 0x07, 0x00000010, 0x00000010, 0x00000010, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00040000, 0x00040000, 0, 50, 0);
+INSERT INTO spell_proc_event VALUES (67356, 0x00, 0x07, 0x00000010, 0x00000010, 0x00000010, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00040000, 0, 50, 0);
-- (64952) Item - Druid T8 Feral Relic
DELETE FROM spell_proc_event WHERE entry = 64952;
@@ -194,7 +180,7 @@ INSERT INTO spell_proc_event VALUES (58388, 0x00, 0x04, 0x00000000, 0x00000000,
-- (58375) Glyph of Blocking
DELETE FROM spell_proc_event WHERE entry = 58375;
-INSERT INTO spell_proc_event VALUES (58375, 0x00, 0x04, 0x00000000, 0x00000000, 0x00000000, 0x00000200, 0x00000200, 0x00000200, 0x00000000, 0x00000000, 0x00000000, 16, 0x00000000, 0, 100, 0);
+INSERT INTO spell_proc_event VALUES (58375, 0x00, 0x04, 0x00000000, 0x00000000, 0x00000000, 0x00000200, 0x00000200, 0x00000200, 0x00000000, 0x00000000, 0x00000000, 16, 0x00000000, 0, 0, 0);
-- (29723) Sudden Death
DELETE FROM spell_proc_event WHERE entry IN (29723, 52437);
@@ -221,8 +207,7 @@ INSERT INTO spell_proc_event VALUES (64938, 0x00, 0x04, 0x00200040, 0x00200040,
-- (46910) Furious Attacks
DELETE FROM spell_proc_event WHERE entry IN (46910, 46911);
INSERT INTO spell_proc_event VALUES
-(46910, 0x00, 0x04, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 1, 0, 0),
-(46911, 0x00, 0x04, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 2, 0, 0);
+(46910, 0x00, 0x04, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 1, 0, 0);
-- (46916) Slam! remove wrong proc conditions
DELETE FROM `spell_proc_event` WHERE `entry` IN (46916);
@@ -278,7 +263,6 @@ INSERT INTO spell_proc_event VALUES (43750, 0x00, 0x0B, 0x00000001, 0x00000001,
-- (51940) Earthliving Weapon (Passive)
DELETE FROM spell_proc_event WHERE entry = 51940;
-INSERT INTO spell_proc_event VALUES (51940, 0x00, 0x0B, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0, 0, 0);
-- (51521) Improved Stormstrike
UPDATE spell_proc_event SET SchoolMask = 0, SpellFamilyName = 11, SpellFamilyMaskB0 = 0x01000010, SpellFamilyMaskB1 = 0x01000010, SpellFamilyMaskB2 = 0x01000010 WHERE entry = 51521;
@@ -346,7 +330,6 @@ INSERT INTO spell_proc_event VALUES (60636, 0x00, 0x0A, 0x00000000, 0x00000000,
-- (53601) Sacred Shield
DELETE FROM spell_proc_event WHERE entry IN (53601);
-INSERT INTO spell_proc_event VALUES (53601, 0x7F, 0x00, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00108000, 0x00000000, 0, 0, 6);
-- (34753) Holy Concentration
DELETE FROM spell_proc_event WHERE entry IN (34753, 34859, 34860);
@@ -374,7 +357,6 @@ INSERT INTO spell_proc_event VALUES (44404, 0x00, 0x03, 0x20000021, 0x20000021,
-- (44557) Improved Water Elemental
DELETE FROM spell_proc_event WHERE entry = 44557;
-INSERT INTO spell_proc_event VALUES (44557, 0x00, 0x03, 0x00000020, 0x00000020, 0x00000020, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0, 0, 0);
-- (31571) Arcane Potency
DELETE FROM spell_proc_event WHERE entry = 31571;
@@ -465,7 +447,7 @@ INSERT INTO spell_proc_event VALUES (51692, 0x00, 0x08, 0x00000204, 0x00000204,
-- (56800) Glyph of Backstab
DELETE FROM spell_proc_event WHERE entry = 56800;
-INSERT INTO spell_proc_event VALUES (56800, 0x00, 0x08, 0x00000004, 0x00000004, 0x00000004, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000010, 0x00000000, 0, 0, 0);
+INSERT INTO spell_proc_event VALUES (56800, 0x00, 0x08, 0x00000004, 0x00000004, 0x00000004, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0, 0, 0);
-- Hunter
-- (64860) Item - Hunter T8 4P Bonus
@@ -701,7 +683,7 @@ INSERT INTO spell_proc_event VALUES (41989, 127, 0x00, 0x00000000, 0x00000000, 0
-- (6770) Sap
DELETE FROM `spell_proc_event` WHERE `entry` IN (6770);
-INSERT INTO `spell_proc_event` VALUES (6770, 0x00, 0x00, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00100000, 0x00000000, 0, 100, 0);
+INSERT INTO `spell_proc_event` VALUES (6770, 0x00, 0x00, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00100000, 0x00000000, 0, 0, 0);
-- (47201) Everlasting Affliction (1)
DELETE FROM `spell_proc_event` WHERE `entry` IN (47201);
@@ -713,7 +695,6 @@ INSERT INTO spell_proc_event VALUES (51124, 0x00, 0x0F, 0x00000000, 0x00000000,
-- (49796) Deathchill
DELETE FROM spell_proc_event WHERE entry IN (49796);
-INSERT INTO spell_proc_event VALUES (49796, 0x00, 0x0F, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00010010, 0x00080000, 0, 0, 0);
-- (56453) Lock and load triggered
DELETE FROM `spell_proc_event` WHERE `entry` IN (56453);
@@ -729,11 +710,10 @@ INSERT INTO `spell_proc_event` VALUES (11129, 0x00, 0x03, 0x08C00017, 0x00031048
-- (15337) Improved Spirit Tap
DELETE FROM `spell_proc_event` WHERE `entry` IN (15337);
-INSERT INTO `spell_proc_event` VALUES (15337, 0x20, 0x06, 0x00802000, 0x00000000, 0x00000000, 0x00000002, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000002, 0, 0, 0);
-- (50871) Savage Rend
DELETE FROM `spell_proc_event` WHERE `entry` IN (50871);
-INSERT INTO `spell_proc_event` VALUES (50871, 0x00, 0x09, 0x00000000, 0x00000000, 0x00000000, 0x40000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000010, 0x00000002, 0, 0, 0);
+INSERT INTO `spell_proc_event` VALUES (50871, 0x00, 0x09, 0x00000000, 0x00000000, 0x00000000, 0x40000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000002, 0, 0, 0);
-- (64882) Item - Paladin T8 Protection 4P Bonus
DELETE FROM `spell_proc_event` WHERE `entry` IN (64882);
@@ -742,12 +722,10 @@ INSERT INTO `spell_proc_event` VALUES (64882, 0x00, 0x0A, 0x00000000, 0x00000000
-- Fingers of Frost talent auras proc
DELETE FROM `spell_proc_event` WHERE `entry` IN (44543, 44545);
INSERT INTO `spell_proc_event` VALUES
-(44543,0,0x03,0x021002A0,0x021002A0,0x021002A0,0x1000,0,0,0,0,0,0,0,0,0,0),
-(44545,0,0x03,0x021002A0,0x021002A0,0x021002A0,0x1000,0,0,0,0,0,0,0,0,0,0);
+(44543,0,0x03,0x021002A0,0x021002A0,0x021002A0,0x1000,0,0,0,0,0,0,0,0,0,0);
-- Fingers of Frost buff aura charges dropping
DELETE FROM `spell_proc_event` WHERE `entry` IN (74396);
-INSERT INTO `spell_proc_event` VALUES (74396, 0x10, 0x03, 0x28E212F7, 0x28E212F7, 0x28E212F7, 0x119048, 0x119048, 0x119048, 0, 0, 0, 0x10000, 0, 0, 0, 0);
-- Item - Icecrown 25 Normal/Heroic Healer Weapon Proc
DELETE FROM `spell_proc_event` WHERE `entry` IN (71865, 71868);
@@ -763,7 +741,7 @@ INSERT INTO `spell_proc_event` VALUES
-- (16164) Elemental Focus
DELETE FROM `spell_proc_event` WHERE `entry` IN (16164);
-INSERT INTO `spell_proc_event` VALUES (16164, 0x1C, 0x0B, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00015550, 0x00000002, 0, 0, 0);
+INSERT INTO `spell_proc_event` VALUES (16164, 0x1C, 0x0B, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000002, 0, 0, 0);
-- Pet
-- (53178) Guard Dog
@@ -781,8 +759,8 @@ DELETE FROM `spell_chain` WHERE `first_spell` IN (62764); -- delete this!
-- (70805) Item - Rogue T10 2P Bonus (Rank 3)
DELETE FROM `spell_proc_event` WHERE `entry` IN (70805);
-INSERT INTO `spell_proc_event` VALUES (70805, 0x00, 0x08, 0x00000000, 0x00000000, 0x00000000, 0x00020000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00004400, 0x00000000, 0, 100, 0);
+INSERT INTO `spell_proc_event` VALUES (70805, 0x00, 0x08, 0x00000000, 0x00000000, 0x00000000, 0x00020000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00004400, 0x00000000, 0, 0, 0);
-- (70664) Item - Druid T10 Restoration 4P Bonus (Rejuvenation)
DELETE FROM `spell_proc_event` WHERE `entry` IN (70664);
-INSERT INTO `spell_proc_event` VALUES (70664, 0x00, 0x07, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00040000, 0x00040000, 0, 2, 0);
+INSERT INTO `spell_proc_event` VALUES (70664, 0x00, 0x07, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00040000, 0, 0, 0);
diff --git a/sql_mr/mr02417_00_mangos_pet_spell_auras.sql b/sql_mr/mr02417_00_mangos_pet_spell_auras.sql
index 086f6c7..b0ab72e 100644
--- a/sql_mr/mr02417_00_mangos_pet_spell_auras.sql
+++ b/sql_mr/mr02417_00_mangos_pet_spell_auras.sql
@@ -30,8 +30,6 @@ VALUES
(0,0,417,34957),
(0,0,417,34958),
(0,0,417,61013),
- (54037,0,417,56249),
- (54038,0,417,56249),
-- Mage Water Elemental (old guardian)
(0,0,510,34947),
(0,0,510,34956),
@@ -87,7 +85,5 @@ VALUES
(0,0,37994,34947),
(0,0,37994,34956),
-- Ferocious Inspiration
- (34455,0,0,75593),
- (34459,0,0,75446),
(34460,0,0,75447);
diff --git a/sql_mr/mr02486_mangos_Strand_of_the_Ancients.sql b/sql_mr/mr02486_mangos_Strand_of_the_Ancients.sql
index 645cca2..435e439 100644
--- a/sql_mr/mr02486_mangos_Strand_of_the_Ancients.sql
+++ b/sql_mr/mr02486_mangos_Strand_of_the_Ancients.sql
@@ -50,6 +50,7 @@ UPDATE gameobject_template SET flags = 0 WHERE entry IN (191309, 191310);
-- Vehicles support
-- Battleground Demolisher
UPDATE creature_template SET npcflag = 0, minlevel = 70, maxlevel = 70, minhealth = 80000, maxhealth = 80000, mechanic_immune_mask = mechanic_immune_mask|1|2|8|16|32|64|128|1024|2048|4096|8192|131072|262144|8388608|16777216|67108864, vehicle_id = 158, ScriptName = '', AIName = 'NullAI' WHERE entry IN (28781, 32796);
+UPDATE `creature_template` SET AIName = '' WHERE entry IN (32796);
DELETE FROM npc_spellclick_spells WHERE npc_entry IN (28781, 32796);
INSERT INTO npc_spellclick_spells VALUES
(28781, 60968, 0, 0, 0, 1),
@@ -62,6 +63,7 @@ INSERT INTO creature_template_addon VALUES
-- Antipersonnel Cannon
UPDATE `creature_template` SET npcflag = 0, minlevel = 80, maxlevel = 80, iconName = 'Gunner', unit_flags=4, minhealth = 44910, maxhealth = 44910, faction_A = 35, faction_H = 35, RegenHealth=0, mechanic_immune_mask = mechanic_immune_mask|1|2|8|16|32|64|128|1024|2048|4096|8192|131072|262144|8388608|16777216|67108864, ScriptName = '', AIName = 'NullAI' WHERE entry IN (27894, 32795);
+UPDATE `creature_template` SET AIName = '' WHERE entry IN (32795);
DELETE FROM npc_spellclick_spells WHERE npc_entry IN (27894, 32795);
INSERT INTO npc_spellclick_spells VALUES
(27894, 60968, 0, 0, 0, 1),
@@ -115,6 +117,8 @@ INSERT INTO creature (guid,id,map,spawnMask,phaseMask,modelid,equipment_id,posit
(@CREATURE+34, 13116, 607, 3, 1, 0, 0, 1448.78, -52.9605, 5.74272, 0.0530517, 10, 0, 0, 37890, 6310, 0, 0),
(@CREATURE+35, 13117, 607, 3, 1, 0, 0, 1448.78, -52.9605, 5.74272, 0.0530517, 10, 0, 0, 37420, 6310, 0, 0);
+UPDATE creature SET spawnMask=1 WHERE map=607;
+
DELETE FROM creature_battleground WHERE guid IN (SELECT guid FROM creature WHERE map=607);
INSERT INTO creature_battleground VALUES
-- Workshops
@@ -355,6 +359,8 @@ INSERT INTO gameobject VALUES
(@GAMEOBJECT+181, 192691 , 607 , 3 , 1 , 1218.8 , 78.7113 , 65.5368 , 5.64543 , 0 , 0 , 0 , 0 , 10 , 0 , 0),
(@GAMEOBJECT+182, 192685 , 607 , 3 , 1 , 1057.88 , -107.601 , 94.7255 , 0.0471208 , 0 , 0 , 0 , 0 , 10 , 0 , 0);
+UPDATE gameobject SET spawnMask=1 WHERE map=607;
+
DELETE FROM gameobject_battleground WHERE guid IN (SELECT guid FROM gameobject WHERE map=607);
INSERT INTO gameobject_battleground VALUES
-- Titan Relic & Doors
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment