aboutsummaryrefslogtreecommitdiff
path: root/sql
diff options
context:
space:
mode:
authorMachiavelli <none@none>2009-04-19 21:17:07 +0200
committerMachiavelli <none@none>2009-04-19 21:17:07 +0200
commit0eb86688d6adb1d63a0b9bd7075cf6f1233e630e (patch)
tree36ffd3b0472175f378279f4cd57a0dd36cd3182b /sql
parentb92eac3b273420598f96b6bf8f3da83cf6ccffe6 (diff)
parentdcc7b999827553b5a36d64fbe5c5fba4c3b27b69 (diff)
Merge
--HG-- branch : trunk
Diffstat (limited to 'sql')
-rw-r--r--sql/updates/2773_world_spell_linked_spell.sql6
-rw-r--r--sql/updates/2813_world_scripts.sql3
-rw-r--r--sql/updates/2814_world_spell_linked_spell.sql6
3 files changed, 9 insertions, 6 deletions
diff --git a/sql/updates/2773_world_spell_linked_spell.sql b/sql/updates/2773_world_spell_linked_spell.sql
deleted file mode 100644
index 90f5f8de19b..00000000000
--- a/sql/updates/2773_world_spell_linked_spell.sql
+++ /dev/null
@@ -1,6 +0,0 @@
-DELETE FROM `spell_linked_spell` WHERE `spell_trigger` IN (32386, 32388, 32389, 32390, 32391);
-INSERT INTO `spell_linked_spell` VALUES (32386, 60448, 1, 'Shadow Embrace Rank1');
-INSERT INTO `spell_linked_spell` VALUES (32388, 60465, 1, 'Shadow Embrace Rank2');
-INSERT INTO `spell_linked_spell` VALUES (32389, 60466, 1, 'Shadow Embrace Rank3');
-INSERT INTO `spell_linked_spell` VALUES (32390, 60467, 1, 'Shadow Embrace Rank4');
-INSERT INTO `spell_linked_spell` VALUES (32391, 60468, 1, 'Shadow Embrace Rank5');
diff --git a/sql/updates/2813_world_scripts.sql b/sql/updates/2813_world_scripts.sql
new file mode 100644
index 00000000000..6d7f0317797
--- /dev/null
+++ b/sql/updates/2813_world_scripts.sql
@@ -0,0 +1,3 @@
+UPDATE `creature_template` SET `ScriptName` = 'boss_elder_nadox' WHERE `entry` = 29309;
+UPDATE `creature_template` SET `ScriptName` = 'mob_ahnkahar_nerubian' WHERE `entry` in (30176,30178);
+UPDATE `instance_template` SET `script`= 'instance_ahnkahet' WHERE `map` = 619; \ No newline at end of file
diff --git a/sql/updates/2814_world_spell_linked_spell.sql b/sql/updates/2814_world_spell_linked_spell.sql
new file mode 100644
index 00000000000..4986c2a7e34
--- /dev/null
+++ b/sql/updates/2814_world_spell_linked_spell.sql
@@ -0,0 +1,6 @@
+DELETE FROM `spell_linked_spell` WHERE `spell_trigger` IN (32386, 32388, 32389, 32390, 32391);
+INSERT INTO `spell_linked_spell` VALUES (32386, 60448, 2, 'Shadow Embrace Rank1');
+INSERT INTO `spell_linked_spell` VALUES (32388, 60465, 2, 'Shadow Embrace Rank2');
+INSERT INTO `spell_linked_spell` VALUES (32389, 60466, 2, 'Shadow Embrace Rank3');
+INSERT INTO `spell_linked_spell` VALUES (32390, 60467, 2, 'Shadow Embrace Rank4');
+INSERT INTO `spell_linked_spell` VALUES (32391, 60468, 2, 'Shadow Embrace Rank5');