aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--sql/updates/world/3.3.5/2020_02_11_00_world.sql9
-rw-r--r--src/server/scripts/Kalimdor/zone_desolace.cpp39
2 files changed, 9 insertions, 39 deletions
diff --git a/sql/updates/world/3.3.5/2020_02_11_00_world.sql b/sql/updates/world/3.3.5/2020_02_11_00_world.sql
new file mode 100644
index 00000000000..3ea884e6957
--- /dev/null
+++ b/sql/updates/world/3.3.5/2020_02_11_00_world.sql
@@ -0,0 +1,9 @@
+--
+UPDATE `gameobject` SET `spawntimesecs`=180 WHERE `id`=176581;
+-- Hand of Iruxos Crystal SAI
+SET @ENTRY := 176581;
+UPDATE `gameobject_template` SET `AIName`="SmartGameObjectAI", `scriptname`= '' WHERE `entry`=@ENTRY;
+DELETE FROM `smart_scripts` WHERE `entryorguid`=@ENTRY AND `source_type`=1;
+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,1,0,1,70,0,100,0,2,0,0,0,12,11876,4,10000,0,0,0,1,0,0,0,0,0,0,0,"Hand of Iruxos Crystal - On Gameobject State Changed - Summon Creature 'Demon Spirit' for 10000 milliseconds "),
+(@ENTRY,1,1,0,61,0,100,0,0,0,0,0,41,0,0,0,0,0,0,1,0,0,0,0,0,0,0,"Hand of Iruxos Crystal - On Gameobject State Changed - Despawn Instant");
diff --git a/src/server/scripts/Kalimdor/zone_desolace.cpp b/src/server/scripts/Kalimdor/zone_desolace.cpp
index 0237d21a984..5cc045cc27d 100644
--- a/src/server/scripts/Kalimdor/zone_desolace.cpp
+++ b/src/server/scripts/Kalimdor/zone_desolace.cpp
@@ -24,9 +24,6 @@ EndScriptData */
/* ContentData
npc_aged_dying_ancient_kodo
-go_iruxos
-npc_dalinda_malem
-go_demon_portal
EndContentData */
#include "ScriptMgr.h"
@@ -130,43 +127,7 @@ public:
};
-/*######
-## go_iruxos
-## Hand of Iruxos
-######*/
-
-enum Iruxos
-{
- QUEST_HAND_IRUXOS = 5381,
- NPC_DEMON_SPIRIT = 11876
-};
-
-class go_iruxos : public GameObjectScript
-{
- public:
- go_iruxos() : GameObjectScript("go_iruxos") { }
-
- struct go_iruxosAI : public GameObjectAI
- {
- go_iruxosAI(GameObject* go) : GameObjectAI(go) { }
-
- bool GossipHello(Player* player) override
- {
- if (player->GetQuestStatus(QUEST_HAND_IRUXOS) == QUEST_STATUS_INCOMPLETE && !me->FindNearestCreature(NPC_DEMON_SPIRIT, 25.0f, true))
- player->SummonCreature(NPC_DEMON_SPIRIT, me->GetPositionX(), me->GetPositionY(), me->GetPositionZ(), 0.0f, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 10000);
-
- return true;
- }
- };
-
- GameObjectAI* GetAI(GameObject* go) const override
- {
- return new go_iruxosAI(go);
- }
-};
-
void AddSC_desolace()
{
new npc_aged_dying_ancient_kodo();
- new go_iruxos();
}