diff options
author | ZenoX92 <ZenoX92@users.noreply.github.com> | 2018-08-22 18:07:33 +0200 |
---|---|---|
committer | Shauren <shauren.trinity@gmail.com> | 2021-10-22 21:50:04 +0200 |
commit | eb241db1873db339d943e2846f9b1de5344e76c4 (patch) | |
tree | da14ccb65643bb9a834e738f69c5cd063bf44b7b | |
parent | 82d5b7c744f6316ea6c66682ad9f5dd37fb4d2f3 (diff) |
DB/Quest: Move the Sunken Treasure to SAI
Closes #22290
(cherry picked from commit 42fec4a698d0a4b51277d5ad3f484e195eda1d5d)
3 files changed, 62 insertions, 162 deletions
diff --git a/sql/updates/world/master/2021_10_22_07_world_2018_08_22_06_world_335.sql b/sql/updates/world/master/2021_10_22_07_world_2018_08_22_06_world_335.sql new file mode 100644 index 00000000000..7807201139b --- /dev/null +++ b/sql/updates/world/master/2021_10_22_07_world_2018_08_22_06_world_335.sql @@ -0,0 +1,60 @@ +-- Professor Phizzlethorpe +UPDATE `creature_template` SET `AIName`="SmartAI", `ScriptName`="" WHERE `entry`=2768; +DELETE FROM `smart_scripts` WHERE `entryorguid`=2768 AND `source_type`=0; +DELETE FROM `smart_scripts` WHERE `entryorguid` IN (276800,276801,276802,276803) AND `source_type`=9; +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_x`,`target_y`,`target_z`,`target_o`,`comment`) VALUES +(2768,0,0,1,19,0,100,0,665,0,0,0,0,64,1,0,0,0,0,0,7,0,0,0,0,0,0,0,"Professor Phizzlethorpe - On Quest 'Sunken Treasure' Taken - Store Targetlist"), +(2768,0,1,2,61,0,100,0,0,0,0,0,0,83,2,0,0,0,0,0,1,0,0,0,0,0,0,0,"Professor Phizzlethorpe - On Quest 'Sunken Treasure' Taken - Remove Npc Flag Questgiver"), +(2768,0,2,3,61,0,100,0,0,0,0,0,0,80,276800,0,0,0,0,0,1,0,0,0,0,0,0,0,"Professor Phizzlethorpe - On Quest 'Sunken Treasure' Taken - Run Script"), +(2768,0,3,0,61,0,100,0,0,0,0,0,0,2,113,0,0,0,0,0,1,0,0,0,0,0,0,0,"Professor Phizzlethorpe - On Quest 'Sunken Treasure' Taken - Set Faction 113"), +(2768,0,4,0,6,0,100,0,0,0,0,0,0,6,665,0,0,0,0,0,12,1,0,0,0,0,0,0,"Professor Phizzlethorpe - On Just Died - Fail Quest 'Sunken Treasure'"), +(2768,0,5,0,4,0,100,0,0,0,0,0,0,1,4,0,0,0,0,0,1,0,0,0,0,0,0,0,"Professor Phizzlethorpe - On Aggro - Say Line 4"), +(2768,0,6,0,40,0,100,0,5,276800,0,0,0,80,276801,0,0,0,0,0,1,0,0,0,0,0,0,0,"Professor Phizzlethorpe - On Waypoint 5 Reached - Run Script"), +(2768,0,7,0,40,0,100,0,8,276800,0,0,0,80,276802,0,0,0,0,0,1,0,0,0,0,0,0,0,"Professor Phizzlethorpe - On Waypoint 8 Reached - Run Script"), +(2768,0,8,0,40,0,100,0,8,276801,0,0,0,80,276803,0,0,0,0,0,1,0,0,0,0,0,0,0,"Professor Phizzlethorpe - On Waypoint 8 Reached - Run Script"), +(276800,9,0,0,0,0,100,0,0,0,0,0,0,1,0,0,0,0,0,0,12,1,0,0,0,0,0,0,"Professor Phizzlethorpe - On Script - Say Line 0"), +(276800,9,1,0,0,0,100,0,4000,4000,0,0,0,53,0,276800,0,0,0,2,1,0,0,0,0,0,0,0,"Professor Phizzlethorpe - On Script - Start Waypoint"), +(276801,9,0,0,0,0,100,0,0,0,0,0,0,54,7000,0,0,0,0,0,1,0,0,0,0,0,0,0,"Professor Phizzlethorpe - On Script - Pause Waypoint"), +(276801,9,1,0,0,0,100,0,0,0,0,0,0,1,1,0,0,0,0,0,12,1,0,0,0,0,0,0,"Professor Phizzlethorpe - On Script - Say Line 1"), +(276801,9,2,0,0,0,100,0,7000,7000,0,0,0,1,2,0,0,0,0,0,12,1,0,0,0,0,0,0,"Professor Phizzlethorpe - On Script - Say Line 2"), +(276802,9,0,0,0,0,100,0,0,0,0,0,0,1,3,0,0,0,0,0,1,0,0,0,0,0,0,0,"Professor Phizzlethorpe - On Script - Say Line 3"), +(276802,9,1,0,0,0,100,0,10000,10000,0,0,0,107,1,0,0,0,0,0,1,0,0,0,0,0,0,0,"Professor Phizzlethorpe - On Script - Summon Group"), +(276802,9,2,0,0,0,100,0,15000,15000,0,0,0,1,5,0,0,0,0,0,12,1,0,0,0,0,0,0,"Professor Phizzlethorpe - On Script - Say Line 5"), +(276802,9,3,0,0,0,100,0,10000,10000,0,0,0,1,6,0,0,0,0,0,12,1,0,0,0,0,0,0,"Professor Phizzlethorpe - On Script - Say Line 6"), +(276802,9,4,0,0,0,100,0,3000,3000,0,0,0,53,0,276801,0,0,0,2,1,0,0,0,0,0,0,0,"Professor Phizzlethorpe - On Script - Start Waypoint"), +(276803,9,0,0,0,0,100,0,0,0,0,0,0,1,7,0,0,0,0,0,12,1,0,0,0,0,0,0,"Professor Phizzlethorpe - On Script - Say Line 7"), +(276803,9,1,0,0,0,100,0,5000,5000,0,0,0,1,8,0,0,0,0,0,1,0,0,0,0,0,0,0,"Professor Phizzlethorpe - On Script - Say Line 8"), +(276803,9,2,0,0,0,100,0,0,0,0,0,0,1,9,0,0,0,0,0,12,1,0,0,0,0,0,0,"Professor Phizzlethorpe - On Script - Say Line 9"), +(276803,9,3,0,0,0,100,0,0,0,0,0,0,15,665,0,0,0,0,0,12,1,0,0,0,0,0,0,"Professor Phizzlethorpe - On Script - Complete Quest 'Sunken Treasure'"), +(276803,9,4,0,0,0,100,0,0,0,0,0,0,82,2,0,0,0,0,0,1,0,0,0,0,0,0,0,"Professor Phizzlethorpe - On Script - Add Npc Flag Questgiver"), +(276803,9,5,0,0,0,100,0,0,0,0,0,0,2,35,0,0,0,0,0,1,0,0,0,0,0,0,0,"Professor Phizzlethorpe - On Script - Set Faction 35"); + +DELETE FROM `creature_summon_groups` WHERE `summonerId`=2768; +INSERT INTO `creature_summon_groups` (`summonerId`, `summonerType`, `groupId`, `entry`, `position_x`, `position_y`, `position_z`, `orientation`, `summonType`, `summonTime`) VALUES +(2768,0,1,2776,-2056.19,-2143.23,20.4528,5.61003,5,3000), +(2768,0,1,2776,-2052.2,-2139.68,19.6804,5.31158,5,3000); + +DELETE FROM `script_waypoint` WHERE `entry`=2768; +DELETE FROM `waypoints` WHERE `entry` IN (276800, 276801); +INSERT INTO `waypoints` (`entry`,`pointid`,`position_x`,`position_y`,`position_z`,`point_comment`) VALUES +(276800,1,-2077.73,-2091.17,9.49,""), +(276800,2,-2077.99,-2105.33,13.24,""), +(276800,3,-2074.6,-2109.67,14.24,""), +(276800,4,-2076.6,-2117.46,16.67,""), +(276800,5,-2073.51,-2123.46,18.42,""), +(276800,6,-2066.6,-2131.85,21.56,""), +(276800,7,-2053.85,-2143.19,20.31,""), +(276800,8,-2043.49,-2153.73,20.2,""), +(276801,1,-2053.85,-2143.19,20.31,""), +(276801,2,-2063.52,-2131.57,21.22,""), +(276801,3,-2073.51,-2123.46,18.42,""), +(276801,4,-2076.6,-2117.46,16.67,""), +(276801,5,-2074.6,-2109.67,14.24,""), +(276801,6,-2077.99,-2105.33,13.24,""), +(276801,7,-2077.73,-2091.17,9.49,""), +(276801,8,-2066.41,-2086.21,8.97,""); + +-- Vengeful Surge +DELETE FROM `smart_scripts` WHERE `entryorguid`=2776 AND `source_type`=0 AND `id`=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_x`,`target_y`,`target_z`,`target_o`,`comment`) VALUES +(2776,0,1,0,54,0,100,0,0,0,0,0,0,49,0,0,0,0,0,0,19,2768,0,0,0,0,0,0,"Vengeful Surge - Just Summoned - Start Attacking"); diff --git a/src/server/scripts/EasternKingdoms/eastern_kingdoms_script_loader.cpp b/src/server/scripts/EasternKingdoms/eastern_kingdoms_script_loader.cpp index a6d1d6a08c6..cc12b34da46 100644 --- a/src/server/scripts/EasternKingdoms/eastern_kingdoms_script_loader.cpp +++ b/src/server/scripts/EasternKingdoms/eastern_kingdoms_script_loader.cpp @@ -183,7 +183,7 @@ void AddSC_boss_wushoolay(); void AddSC_boss_zanzil(); void AddSC_instance_zulgurub(); //void AddSC_alterac_mountains(); -void AddSC_arathi_highlands(); +//void AddSC_arathi_highlands(); void AddSC_blasted_lands(); void AddSC_burning_steppes(); void AddSC_dun_morogh(); @@ -374,7 +374,7 @@ void AddEasternKingdomsScripts() AddSC_instance_zulgurub(); //AddSC_alterac_mountains(); - AddSC_arathi_highlands(); + //AddSC_arathi_highlands(); AddSC_blasted_lands(); AddSC_burning_steppes(); AddSC_dun_morogh(); diff --git a/src/server/scripts/EasternKingdoms/zone_arathi_highlands.cpp b/src/server/scripts/EasternKingdoms/zone_arathi_highlands.cpp deleted file mode 100644 index 66b80f22b4d..00000000000 --- a/src/server/scripts/EasternKingdoms/zone_arathi_highlands.cpp +++ /dev/null @@ -1,160 +0,0 @@ -/* - * This file is part of the TrinityCore Project. See AUTHORS file for Copyright information - * - * This program is free software; you can redistribute it and/or modify it - * under the terms of the GNU General Public License as published by the - * Free Software Foundation; either version 2 of the License, or (at your - * option) any later version. - * - * This program is distributed in the hope that it will be useful, but WITHOUT - * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or - * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for - * more details. - * - * You should have received a copy of the GNU General Public License along - * with this program. If not, see <http://www.gnu.org/licenses/>. - */ - -/* ScriptData -SDName: Arathi Highlands -SD%Complete: 100 -SDComment: Quest support: 665 -SDCategory: Arathi Highlands -EndScriptData */ - -/* ContentData -npc_professor_phizzlethorpe -EndContentData */ - -#include "ScriptMgr.h" -#include "ScriptedCreature.h" -#include "ScriptedEscortAI.h" -#include "Player.h" - -/*###### -## npc_professor_phizzlethorpe -######*/ - -enum ProfessorPhizzlethorpe -{ - // Yells - SAY_PROGRESS_1 = 0, - SAY_PROGRESS_2 = 1, - SAY_PROGRESS_3 = 2, - EMOTE_PROGRESS_4 = 3, - SAY_AGGRO = 4, - SAY_PROGRESS_5 = 5, - SAY_PROGRESS_6 = 6, - SAY_PROGRESS_7 = 7, - EMOTE_PROGRESS_8 = 8, - SAY_PROGRESS_9 = 9, - EVENT_SAY_3 = 1, - EVENT_SAY_6 = 2, - EVENT_SAY_8 = 3, - - // Quests - QUEST_SUNKEN_TREASURE = 665, - QUEST_GOGGLE_BOGGLE = 26050, - // Creatures - NPC_VENGEFUL_SURGE = 2776 -}; - -class npc_professor_phizzlethorpe : public CreatureScript -{ - public: - npc_professor_phizzlethorpe() : CreatureScript("npc_professor_phizzlethorpe") { } - - struct npc_professor_phizzlethorpeAI : public EscortAI - { - npc_professor_phizzlethorpeAI(Creature* creature) : EscortAI(creature) { } - - void WaypointReached(uint32 waypointId, uint32 /*pathId*/) override - { - Player* player = GetPlayerForEscort(); - if (!player) - return; - - switch (waypointId) - { - case 6: - Talk(SAY_PROGRESS_2, player); - events.ScheduleEvent(EVENT_SAY_3, 3000); - break; - case 8: - Talk(EMOTE_PROGRESS_4); - me->SummonCreature(NPC_VENGEFUL_SURGE, -2065.505f, -2136.88f, 22.20362f, 1.0f, TEMPSUMMON_CORPSE_DESPAWN, 0); - me->SummonCreature(NPC_VENGEFUL_SURGE, -2059.249f, -2134.88f, 21.51582f, 1.0f, TEMPSUMMON_CORPSE_DESPAWN, 0); - break; - case 11: - Talk(SAY_PROGRESS_5, player); - events.ScheduleEvent(EVENT_SAY_6, 11000); - break; - case 17: - Talk(SAY_PROGRESS_7, player); - events.ScheduleEvent(EVENT_SAY_8, 6000); - break; - } - } - - void JustSummoned(Creature* summoned) override - { - summoned->AI()->AttackStart(me); - } - - void JustEngagedWith(Unit* /*who*/) override - { - Talk(SAY_AGGRO); - } - - void QuestAccept(Player* player, Quest const* quest) override - { - if (quest->GetQuestId() == QUEST_SUNKEN_TREASURE) - { - Talk(SAY_PROGRESS_1, player); - EscortAI::Start(false, false, player->GetGUID(), quest); - me->SetFaction(FACTION_ESCORTEE_N_NEUTRAL_PASSIVE); - } - } - - void UpdateAI(uint32 diff) override - { - Player* player = GetPlayerForEscort(); - if (!player) - return; - - events.Update(diff); - - while (uint32 event = events.ExecuteEvent()) - { - switch (event) - { - case EVENT_SAY_3: - Talk(SAY_PROGRESS_3, player); - break; - case EVENT_SAY_6: - Talk(SAY_PROGRESS_6, player); - SetRun(); - break; - case EVENT_SAY_8: - Talk(EMOTE_PROGRESS_8); - Talk(SAY_PROGRESS_9, player); - player->GroupEventHappens(QUEST_GOGGLE_BOGGLE, me); - break; - } - } - EscortAI::UpdateAI(diff); - } - - EventMap events; - }; - - CreatureAI* GetAI(Creature* creature) const override - { - return new npc_professor_phizzlethorpeAI(creature); - } -}; - -void AddSC_arathi_highlands() -{ - new npc_professor_phizzlethorpe(); -} |