diff options
| -rw-r--r-- | sql/updates/world/3.3.5/2020_05_19_05_world.sql | 20 | ||||
| -rw-r--r-- | src/server/scripts/Kalimdor/zone_thousand_needles.cpp | 73 |
2 files changed, 20 insertions, 73 deletions
diff --git a/sql/updates/world/3.3.5/2020_05_19_05_world.sql b/sql/updates/world/3.3.5/2020_05_19_05_world.sql new file mode 100644 index 00000000000..1bfdfbb8a01 --- /dev/null +++ b/sql/updates/world/3.3.5/2020_05_19_05_world.sql @@ -0,0 +1,20 @@ +-- Panther Cage SAI (Source: https://www.youtube.com/watch?v=BObxNsbRWsc) +SET @ID := 176195; +UPDATE `gameobject_template` SET `AIName` = "SmartGameObjectAI", `ScriptName` = "" WHERE `entry` = @ID; +DELETE FROM `smart_scripts` WHERE `entryorguid` = @ID 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`,`event_param5`,`action_type`,`action_param1`,`action_param2`,`action_param3`,`action_param4`,`action_param5`,`action_param6`,`target_type`,`target_param1`,`target_param2`,`target_param3`,`target_param4`,`target_x`,`target_y`,`target_z`,`target_o`,`comment`) VALUES +(@ID,1,0,1,70,0,100,0,2,0,0,0,0,64,1,0,0,0,0,0,7,0,0,0,0,0,0,0,0,"Panther Cage - On Gameobject State Changed - Store Targetlist"), +(@ID,1,1,2,61,0,100,0,0,0,0,0,0,19,2,0,0,0,0,0,19,10992,5,0,0,0,0,0,0,"Panther Cage - On Link - Remove Flag Not Attackable (Enraged Panther)"), +(@ID,1,2,3,61,0,100,0,0,0,0,0,0,8,2,0,0,0,0,0,19,10992,5,0,0,0,0,0,0,"Panther Cage - On Link - Set Reactstate Aggressive (Enraged Panther)"), +(@ID,1,3,4,61,0,100,0,0,0,0,0,0,100,1,0,0,0,0,0,19,10992,5,0,0,0,0,0,0,"Panther Cage - On Link - Send Target 1 (Enraged Panther)"), +(@ID,1,4,0,61,0,100,0,0,0,0,0,0,45,0,1,0,0,0,0,19,10992,5,0,0,0,0,0,0,"Panther Cage - On Link - Set Data 0 1 (Enraged Panther)"); + +-- Enraged Panther SAI (Source: https://www.youtube.com/watch?v=BObxNsbRWsc) +SET @ID := 10992; +UPDATE `creature` SET `spawntimesecs` = 300 where `guid` = 21705 AND `id` = 10992; +UPDATE `creature_template` SET `AIName` = "SmartAI", `ScriptName` = "" WHERE `entry` = @ID; +DELETE FROM `smart_scripts` WHERE `entryorguid` = @ID 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`,`event_param5`,`action_type`,`action_param1`,`action_param2`,`action_param3`,`action_param4`,`action_param5`,`action_param6`,`target_type`,`target_param1`,`target_param2`,`target_param3`,`target_param4`,`target_x`,`target_y`,`target_z`,`target_o`,`comment`) VALUES +(@ID,0,0,1,11,0,100,0,0,0,0,0,0,18,2,0,0,0,0,0,1,0,0,0,0,0,0,0,0,"Enraged Panther - On Respawn - Set Flag Not Attackable"), +(@ID,0,1,0,61,0,100,0,0,0,0,0,0,8,0,0,0,0,0,0,1,0,0,0,0,0,0,0,0,"Enraged Panther - On Link - Set Reactstate Passive"), +(@ID,0,2,0,38,0,100,0,0,1,0,0,0,49,0,0,0,0,0,0,12,1,0,0,0,0,0,0,0,"Enraged Panther - On Data Set 0 1 - Start Attacking"); diff --git a/src/server/scripts/Kalimdor/zone_thousand_needles.cpp b/src/server/scripts/Kalimdor/zone_thousand_needles.cpp index 6e677153374..8a69dec95e5 100644 --- a/src/server/scripts/Kalimdor/zone_thousand_needles.cpp +++ b/src/server/scripts/Kalimdor/zone_thousand_needles.cpp @@ -25,8 +25,6 @@ EndScriptData */ /* ContentData npc_lakota_windsong npc_swiftmountain -npc_enraged_panther -go_panther_cage EndContentData */ #include "ScriptMgr.h" @@ -199,79 +197,8 @@ public: } }; -enum PantherCage -{ - QUEST_HYPERCAPACITOR_GIZMO = 5151, - ENRAGED_PANTHER = 10992 -}; - -class go_panther_cage : public GameObjectScript -{ -public: - go_panther_cage() : GameObjectScript("go_panther_cage") { } - - struct go_panther_cageAI : public GameObjectAI - { - go_panther_cageAI(GameObject* go) : GameObjectAI(go) { } - - bool GossipHello(Player* player) override - { - me->UseDoorOrButton(); - if (player->GetQuestStatus(QUEST_HYPERCAPACITOR_GIZMO) == QUEST_STATUS_INCOMPLETE) - { - if (Creature* panther = me->FindNearestCreature(ENRAGED_PANTHER, 5, true)) - { - panther->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE); - panther->SetReactState(REACT_AGGRESSIVE); - panther->AI()->AttackStart(player); - } - } - - return true; - } - }; - - GameObjectAI* GetAI(GameObject* go) const override - { - return new go_panther_cageAI(go); - } -}; - -class npc_enraged_panther : public CreatureScript -{ -public: - npc_enraged_panther() : CreatureScript("npc_enraged_panther") { } - - CreatureAI* GetAI(Creature* creature) const override - { - return new npc_enraged_pantherAI(creature); - } - - struct npc_enraged_pantherAI : public ScriptedAI - { - npc_enraged_pantherAI(Creature* creature) : ScriptedAI(creature) { } - - void Reset() override - { - me->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE); - me->SetReactState(REACT_PASSIVE); - } - - void UpdateAI(uint32 /*diff*/) override - { - if (!UpdateVictim()) - return; - - DoMeleeAttackIfReady(); - } - }; - -}; - void AddSC_thousand_needles() { new npc_lakota_windsong(); new npc_paoka_swiftmountain(); - new npc_enraged_panther(); - new go_panther_cage(); } |