aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--sql/updates/world/2014_07_24_13_world_sai.sql14
-rw-r--r--src/server/scripts/Kalimdor/zone_feralas.cpp23
2 files changed, 15 insertions, 22 deletions
diff --git a/sql/updates/world/2014_07_24_13_world_sai.sql b/sql/updates/world/2014_07_24_13_world_sai.sql
new file mode 100644
index 00000000000..e63eb83831a
--- /dev/null
+++ b/sql/updates/world/2014_07_24_13_world_sai.sql
@@ -0,0 +1,14 @@
+SET @ENTRY := 8612;
+
+-- Add missing gossip (by Malcrom)
+DELETE FROM `gossip_menu` WHERE `entry`=1405;
+INSERT INTO `gossip_menu` (`entry`,`text_id`) VALUES (1405,2039);
+UPDATE `creature_template` SET `gossip_menu_id`=1405 WHERE entry=@ENTRY;
+
+-- SAI (by Rushor)
+UPDATE `creature_template` SET `AIName`='SmartAI', `ScriptName`='' WHERE `entry`=@ENTRY;
+DELETE FROM `smart_scripts` WHERE `entryorguid`=@ENTRY 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
+(@ENTRY,0,0,1,64,0,100,0,0,0,0,0,33,8612,0,0,0,0,0,7,0,0,0,0,0,0,0,"Screecher Spirit - On Gossip Hello - Quest Credit 'Screecher Spirits'"),
+(@ENTRY,0,1,2,61,0,100,0,0,0,0,0,18,33554432,0,0,0,0,0,1,0,0,0,0,0,0,0,"Screecher Spirit - On Gossip Hello - Set Flag Not Selectable"),
+(@ENTRY,0,2,0,61,0,100,0,0,0,0,0,41,3000,0,0,0,0,0,1,0,0,0,0,0,0,0,"Screecher Spirit - On Gossip Hello - Despawn In 3000 ms");
diff --git a/src/server/scripts/Kalimdor/zone_feralas.cpp b/src/server/scripts/Kalimdor/zone_feralas.cpp
index ef4ebed0387..17b5ddaf6bb 100644
--- a/src/server/scripts/Kalimdor/zone_feralas.cpp
+++ b/src/server/scripts/Kalimdor/zone_feralas.cpp
@@ -19,7 +19,7 @@
/* ScriptData
SDName: Feralas
SD%Complete: 100
-SDComment: Quest support: 3520, 2767, Special vendor Gregan Brewspewer
+SDComment: Quest support: 2767, Special vendor Gregan Brewspewer
SDCategory: Feralas
EndScriptData */
@@ -183,26 +183,6 @@ public:
};
-/*######
-## npc_screecher_spirit
-######*/
-
-class npc_screecher_spirit : public CreatureScript
-{
-public:
- npc_screecher_spirit() : CreatureScript("npc_screecher_spirit") { }
-
- bool OnGossipHello(Player* player, Creature* creature) override
- {
- player->SEND_GOSSIP_MENU(2039, creature->GetGUID());
- player->TalkedToCreature(creature->GetEntry(), creature->GetGUID());
- creature->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE);
- creature->DespawnOrUnsummon(3*IN_MILLISECONDS);
- return true;
- }
-
-};
-
enum GordunniTrap
{
GO_GORDUNNI_DIRT_MOUND = 144064,
@@ -247,6 +227,5 @@ void AddSC_feralas()
{
new npc_gregan_brewspewer();
new npc_oox22fe();
- new npc_screecher_spirit();
new spell_gordunni_trap();
}