From 00c2674553950b4fb89d072a28c76bd6419e4fb1 Mon Sep 17 00:00:00 2001
From: teacher <none@none>
Date: Thu, 22 Apr 2010 18:50:14 +0200
Subject: [PATCH] Make Divine Guardian proc on Divine Sacrifice only (by
 Liberate). Removed DB data not handled by Core Team. You can find it on
 Database forums. Added missing recently committed data to world.sql...
 Renamed an old file which had wrong name.

--HG--
branch : trunk
---
 ...ters_characters.sql => 7893_characters_item_instance.sql} | 0
 sql/updates/7980_world_spell_area.sql                        | 4 ----
 sql/updates/7982_world_spell_proc_event.sql                  | 4 ++++
 sql/world.sql                                                | 5 ++++-
 4 files changed, 8 insertions(+), 5 deletions(-)
 rename sql/updates/3.3.3a_old/{7893_characters_characters.sql => 7893_characters_item_instance.sql} (100%)
 delete mode 100644 sql/updates/7980_world_spell_area.sql
 create mode 100644 sql/updates/7982_world_spell_proc_event.sql

diff --git a/sql/updates/3.3.3a_old/7893_characters_characters.sql b/sql/updates/3.3.3a_old/7893_characters_item_instance.sql
similarity index 100%
rename from sql/updates/3.3.3a_old/7893_characters_characters.sql
rename to sql/updates/3.3.3a_old/7893_characters_item_instance.sql
diff --git a/sql/updates/7980_world_spell_area.sql b/sql/updates/7980_world_spell_area.sql
deleted file mode 100644
index cabf39f6d6..0000000000
--- a/sql/updates/7980_world_spell_area.sql
+++ /dev/null
@@ -1,4 +0,0 @@
-INSERT IGNORE INTO spell_area (spell, area, quest_start, quest_start_active, quest_end, aura_spell, racemask, gender, autocast) VALUES
-(74411, 3358, 0, 0, 0, 0, 0, 2, 1),(74411, 2597, 0, 0, 0, 0, 0, 2, 1),(74411, 4384, 0, 0, 0, 0, 0, 2, 1),(74411, 3277, 0, 0, 0, 0, 0, 2, 1), 
-(74411, 3820, 0, 0, 0, 0, 0, 2, 1),(74411, 4710, 0, 0, 0, 0, 0, 2, 1),(74411, 4197, 0, 0, 0, 0, 0, 2, 1),(74410, 4378, 0, 0, 0, 0, 0, 2, 1),
-(74410, 4406, 0, 0, 0, 0, 0, 2, 1),(74410, 3968, 0, 0, 0, 0, 0, 2, 1),(74410, 3702, 0, 0, 0, 0, 0, 2, 1),(74410, 3698, 0, 0, 0, 0, 0, 2, 1);
diff --git a/sql/updates/7982_world_spell_proc_event.sql b/sql/updates/7982_world_spell_proc_event.sql
new file mode 100644
index 0000000000..0f21c884c7
--- /dev/null
+++ b/sql/updates/7982_world_spell_proc_event.sql
@@ -0,0 +1,4 @@
+-- Make Divine Guardian proc on Divine Sacrifice only
+DELETE FROM `spell_proc_event` WHERE `entry`=53530;
+INSERT INTO `spell_proc_event` (`entry`,`SchoolMask`,`SpellFamilyName`,`SpellFamilyMask0`,`SpellFamilyMask1`,`SpellFamilyMask2`,`procFlags`,`procEx`,`ppmRate`,`CustomChance`,`Cooldown`) VALUES 
+(53530,1,10,0x0000,0x0000,0x0004,0x0400,0x0001,0,100,0);
diff --git a/sql/world.sql b/sql/world.sql
index 1129e9596e..6fdf717355 100644
--- a/sql/world.sql
+++ b/sql/world.sql
@@ -6478,6 +6478,7 @@ INSERT INTO `spell_proc_event` (`entry`,`SchoolMask`,`SpellFamilyName`,`SpellFam
 ( 31836, 0x00,  10, 0x80000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,   0,   0,   0), -- Light's Grace (Rank 3)
 ( 31871, 0x00,  10, 0x00000010, 0x00000000, 0x00000000, 0x00004000, 0x00000000,   0,   0,   0), -- Divine Purpose (Rank 1)
 ( 31872, 0x00,  10, 0x00000010, 0x00000000, 0x00000000, 0x00004000, 0x00000000,   0,   0,   0), -- Divine Purpose (Rank 2)
+( 53530,    1,  10, 0x00000000, 0x00000000,     0x0004,     0x0400,     0x0001,   0, 100,   0), -- Divine Guardian
 ( 31876, 0x00,  10, 0x00800000, 0x00000000, 0x00000000, 0x00000000, 0x00040000,   0,   0,   0), -- Judgements of the Wise (Rank 1)
 ( 31877, 0x00,  10, 0x00800000, 0x00000000, 0x00000000, 0x00000000, 0x00040000,   0,   0,   0), -- Judgements of the Wise (Rank 2)
 ( 31878, 0x00,  10, 0x00800000, 0x00000000, 0x00000000, 0x00000000, 0x00040000,   0,   0,   0), -- Judgements of the Wise (Rank 3)
@@ -7135,7 +7136,9 @@ INSERT INTO `spell_proc_event` (`entry`,`SchoolMask`,`SpellFamilyName`,`SpellFam
 ( 58375, 0x00,   4, 0x00000000, 0x00000200, 0x00000000, 0x00000010, 0x00000000,   0,   0,   0), -- Glyph of Blocking
 ( 58387, 0x00,   4, 0x00004000, 0x00000040, 0x00000000, 0x00000010, 0x00000000,   0,   0,   0), -- Glyph of Sunder Armor
 ( 54925, 0x02,  10, 0x00000000, 0x00000208, 0x00000000, 0x00000000, 0x00000000,   0,   0,   0), -- Glyph of Seal of Command
-( 67356, 0x08,   7, 0x00000010, 0x00000000, 0x00000000, 0x00000000, 0x00000000,   0,   0,   0); -- Item - Druid T9 Restoration Relic (Rejuvenation)
+( 67356, 0x08,   7, 0x00000010, 0x00000000, 0x00000000, 0x00000000, 0x00000000,   0,   0,   0), -- Item - Druid T9 Restoration Relic (Rejuvenation)
+( 67771,    1,   0, 0x00000000, 0x00000000, 0x00000000,  0x0851154,       0x03,   0,  35,  45), -- Item - Coliseum Melee Trinket 10men
+( 67702,    1,   0, 0x00000000, 0x00000000, 0x00000000,  0x0851154,       0x03,   0,  35,  45); -- Item - Coliseum Melee Trinket 25men
 /*!40000 ALTER TABLE `spell_proc_event` ENABLE KEYS */;
 UNLOCK TABLES;