Merge pull request #11757 from untaught/Trinity3

Core/Scripts: Move 'npc_deathly_usher' scripts to SAI.

2 files changed, 5 insertions, 32 deletions

diff --git a/sql/updates/world/2014_03_20_01_world_sai.sql b/sql/updates/world/2014_03_20_01_world_sai.sql
new file mode 100644
index 00000000000..8b8e318b524
--- /dev/null
+++ b/sql/updates/world/2014_03_20_01_world_sai.sql
@@ -0,0 +1,4 @@
+UPDATE `creature_template` SET `ainame`='SmartAI', `scriptname`='' WHERE `entry`=8816;
+DELETE FROM `smart_scripts` WHERE `entryorguid`=8816 AND `source_type`=0;
+INSERT INTO `smart_scripts` (`entryorguid`, `source_type`, `id`, `link`, `event_type`, `event_phase_mask`, `event_chance`, `event_flags`, `event_param1`, `event_param2`, `event_param3`, `event_param4`, `action_type`, `action_param1`, `action_param2`, `action_param3`, `action_param4`, `action_param5`, `action_param6`, `target_type`, `target_param1`, `target_param2`, `target_param3`, `target_x`, `target_y`, `target_z`, `target_o`, `comment`) VALUES
+(8816,0,0,0,62,0,100,0,1541,0,0,0,11,12885,2,0,0,0,0,7,0,0,0,0,0,0,0,'On Gossip Option Selected - Cast ''Teleport to Razelikh''');
diff --git a/src/server/scripts/EasternKingdoms/zone_blasted_lands.cpp b/src/server/scripts/EasternKingdoms/zone_blasted_lands.cpp
index 3fcd3c093b7..bc09983fee1 100644
--- a/src/server/scripts/EasternKingdoms/zone_blasted_lands.cpp
+++ b/src/server/scripts/EasternKingdoms/zone_blasted_lands.cpp
@@ -17,11 +17,7 @@
 
 /*
 Blasted_Lands
-Quest support: 3628. Teleporter to Rise of the Defiler.
-*/
-
-/*
-npc_deathly_usher
+Quest support: 3628.
 */
 
 #include "ScriptMgr.h"
@@ -31,10 +27,6 @@ npc_deathly_usher
 #include "Player.h"
 #include "Group.h"
 
-/*######
-## npc_deathly_usher
-######*/
-
 enum DeathlyUsher
 {
     SPELL_TELEPORT_SINGLE               = 12885,
@@ -42,28 +34,6 @@ enum DeathlyUsher
     SPELL_TELEPORT_GROUP                = 27686
 };
 
-class npc_deathly_usher : public CreatureScript
-{
-public:
-    npc_deathly_usher() : CreatureScript("npc_deathly_usher") { }
-
-    struct npc_deathly_usherAI : public ScriptedAI
-    {
-        npc_deathly_usherAI(Creature* creature) : ScriptedAI(creature) { }
-
-        void sGossipSelect(Player* player, uint32 /*sender*/, uint32 /*action*/) OVERRIDE
-        {
-            player->CLOSE_GOSSIP_MENU();
-            me->CastSpell(player, SPELL_TELEPORT_GROUP, true);
-        }
-    };
-
-    CreatureAI* GetAI(Creature* creature) const OVERRIDE
-    {
-        return new npc_deathly_usherAI(creature);
-    }
-};
-
 /*#####
 # spell_razelikh_teleport_group
 #####*/
@@ -113,6 +83,5 @@ class spell_razelikh_teleport_group : public SpellScriptLoader
 
 void AddSC_blasted_lands()
 {
-    new npc_deathly_usher();
     new spell_razelikh_teleport_group();
 }