aboutsummaryrefslogtreecommitdiff
path: root/sql
diff options
context:
space:
mode:
Diffstat (limited to 'sql')
-rw-r--r--sql/FULL/world_scripts_full.sql7
-rw-r--r--sql/FULL/world_spell_full.sql8
-rw-r--r--sql/updates/6277_world.sql8
3 files changed, 20 insertions, 3 deletions
diff --git a/sql/FULL/world_scripts_full.sql b/sql/FULL/world_scripts_full.sql
index e6200bbb7d1..47ab1e12e81 100644
--- a/sql/FULL/world_scripts_full.sql
+++ b/sql/FULL/world_scripts_full.sql
@@ -375,9 +375,7 @@ UPDATE `item_template` SET `ScriptName`='item_pile_fake_furs' WHERE `entry`=3512
/* BURNING STEPPES */
UPDATE `creature_template` SET `ScriptName`='npc_ragged_john' WHERE `entry`=9563;
-/* */
/* CAVERNS OF TIME */
-/* */
/* MT. HYJAL */
UPDATE `instance_template` SET `script`='instance_hyjal' WHERE `map`=534;
@@ -473,6 +471,11 @@ UPDATE `creature_template` SET `ScriptName`='mob_coilfang_strider' WHERE `entry`
UPDATE `creature_template` SET `ScriptName`='mob_toxic_sporebat' WHERE `entry`=22140;
UPDATE `creature_template` SET `ScriptName`='mob_shield_generator_channel' WHERE `entry`=19870;
+/* CRYSTALSONG FOREST */
+
+/* DALARAN */
+UPDATE `creature_template` SET `ScriptName`='npc_mageguard_dalaran' WHERE `entry` IN (29254,29255);
+
/* DARKSHORE */
UPDATE `creature_template` SET `ScriptName`='npc_kerlonian' WHERE `entry`=11218;
UPDATE `creature_template` SET `ScriptName`='npc_threshwackonator' WHERE `entry`=6669;
diff --git a/sql/FULL/world_spell_full.sql b/sql/FULL/world_spell_full.sql
index 716ec6ef46f..67ebd0749fc 100644
--- a/sql/FULL/world_spell_full.sql
+++ b/sql/FULL/world_spell_full.sql
@@ -527,7 +527,7 @@ INSERT INTO `spell_script_target` VALUES
-- POSITION
-- --------
DELETE FROM spell_target_position WHERE `id` IN (46019, 46020, 53360);
-INSERT INTO spell_target_position () VALUES
+INSERT INTO spell_target_position (`id`, `target_map`, `target_position_x`, `target_position_y`, `target_position_z`, `target_orientation`) VALUES
(46019, 580, 1704.34, 928.17, -74.558, 0),
(46020, 580, 1704.34, 928.17, 53.079, 0),
(53360, 571, 5807.829, 587.960, 660.939, 1.663);
@@ -538,6 +538,12 @@ INSERT INTO `spell_target_position` (`id`, `target_map`, `target_position_x`, `t
(54744, 0, 2418.67, -5621.41, 420.644, 3.89597),
(54746, 0, 2402.15, -5633.74, 377.021, 3.65249);
+-- positions for Dalaran 'Trespasser!' spell
+DELETE FROM `spell_target_position` WHERE `id` IN (54028,54029);
+INSERT INTO `spell_target_position` (`id`, `target_map`, `target_position_x`, `target_position_y`, `target_position_z`, `target_orientation`) VALUES
+(54028, 571, 5758.79, 678.359, 642.726, 5.572);
+(54029, 571, 5849.16, 602.093, 651.13, 2.364);
+
-- --------
-- MISC
-- --------
diff --git a/sql/updates/6277_world.sql b/sql/updates/6277_world.sql
new file mode 100644
index 00000000000..e89b87bdbd9
--- /dev/null
+++ b/sql/updates/6277_world.sql
@@ -0,0 +1,8 @@
+
+UPDATE `creature_template` SET `ScriptName`='npc_mageguard_dalaran' WHERE `entry` IN (29254,29255);
+
+-- positions for Dalaran 'Trespasser!' spell
+DELETE FROM `spell_target_position` WHERE `id` IN (54028,54029);
+INSERT INTO `spell_target_position` (`id`, `target_map`, `target_position_x`, `target_position_y`, `target_position_z`, `target_orientation`) VALUES
+(54028, 571, 5758.79, 678.359, 642.726, 5.572);
+(54029, 571, 5849.16, 602.093, 651.13, 2.364);