From 5b311690d131ce3a242003d365fd0103f6bf033f Mon Sep 17 00:00:00 2001 From: Dr-J Date: Thu, 31 Jul 2014 00:12:33 +0100 Subject: Remove Script from zone_eversong_woods.cpp This cpp is now currently redundant --- .../EasternKingdoms/zone_eversong_woods.cpp | 121 +-------------------- 1 file changed, 1 insertion(+), 120 deletions(-) (limited to 'src') diff --git a/src/server/scripts/EasternKingdoms/zone_eversong_woods.cpp b/src/server/scripts/EasternKingdoms/zone_eversong_woods.cpp index 9e20f6c5cb1..01f7d932c42 100644 --- a/src/server/scripts/EasternKingdoms/zone_eversong_woods.cpp +++ b/src/server/scripts/EasternKingdoms/zone_eversong_woods.cpp @@ -19,12 +19,11 @@ /* ScriptData SDName: Eversong_Woods SD%Complete: 95 -SDComment: Quest support: 8490 +SDComment: Quest support: SDCategory: Eversong Woods EndScriptData */ /* ContentData -npc_infused_crystal EndContentData */ #include "ScriptMgr.h" @@ -33,124 +32,6 @@ EndContentData */ #include "ScriptedEscortAI.h" #include "Player.h" - -/*###### -## npc_infused_crystal -######*/ - -enum InfusedCrystal -{ - // Quest - QUEST_POWERING_OUR_DEFENSES = 8490, - - // Quest Credit - QUEST_POD_CREDIT = 16364, - - // Says - EMOTE = 0, - - // Creatures - NPC_ENRAGED_WRAITH = 17086 -}; - -struct Location -{ - float x, y, z; -}; - -static Location SpawnLocations[] = -{ - {8270.68f, -7188.53f, 139.619f}, - {8284.27f, -7187.78f, 139.603f}, - {8297.43f, -7193.53f, 139.603f}, - {8303.5f, -7201.96f, 139.577f}, - {8273.22f, -7241.82f, 139.382f}, - {8254.89f, -7222.12f, 139.603f}, - {8278.51f, -7242.13f, 139.162f}, - {8267.97f, -7239.17f, 139.517f} -}; - -class npc_infused_crystal : public CreatureScript -{ -public: - npc_infused_crystal() : CreatureScript("npc_infused_crystal") { } - - CreatureAI* GetAI(Creature* creature) const override - { - return new npc_infused_crystalAI(creature); - } - - struct npc_infused_crystalAI : public ScriptedAI - { - npc_infused_crystalAI(Creature* creature) : ScriptedAI(creature) - { - SetCombatMovement(false); - } - - uint32 EndTimer; - uint32 WaveTimer; - bool Completed; - bool Progress; - uint64 PlayerGUID; - - void Reset() override - { - EndTimer = 0; - Completed = false; - Progress = false; - PlayerGUID = 0; - WaveTimer = 0; - } - - void MoveInLineOfSight(Unit* who) override - - { - if (!Progress && who->GetTypeId() == TYPEID_PLAYER && me->IsWithinDistInMap(who, 10.0f)) - { - if (who->ToPlayer()->GetQuestStatus(QUEST_POWERING_OUR_DEFENSES) == QUEST_STATUS_INCOMPLETE) - { - PlayerGUID = who->GetGUID(); - WaveTimer = 1000; - EndTimer = 60000; - Progress = true; - } - } - } - - void JustSummoned(Creature* summoned) override - { - summoned->AI()->AttackStart(me); - } - - void UpdateAI(uint32 diff) override - { - if (EndTimer < diff && Progress) - { - Completed = true; - if (PlayerGUID) - if (Player* player = ObjectAccessor::GetPlayer(*me, PlayerGUID)) - { - Talk(EMOTE, player); - player->KilledMonsterCredit(QUEST_POD_CREDIT); - } - me->RemoveCorpse(); - } else EndTimer -= diff; - - if (WaveTimer < diff && !Completed && Progress) - { - uint32 ran1 = rand32() % 8; - uint32 ran2 = rand32() % 8; - uint32 ran3 = rand32() % 8; - me->SummonCreature(NPC_ENRAGED_WRAITH, SpawnLocations[ran1].x, SpawnLocations[ran1].y, SpawnLocations[ran1].z, 0, TEMPSUMMON_TIMED_OR_CORPSE_DESPAWN, 10000); - me->SummonCreature(NPC_ENRAGED_WRAITH, SpawnLocations[ran2].x, SpawnLocations[ran2].y, SpawnLocations[ran2].z, 0, TEMPSUMMON_TIMED_OR_CORPSE_DESPAWN, 10000); - me->SummonCreature(NPC_ENRAGED_WRAITH, SpawnLocations[ran3].x, SpawnLocations[ran3].y, SpawnLocations[ran3].z, 0, TEMPSUMMON_TIMED_OR_CORPSE_DESPAWN, 10000); - WaveTimer = 30000; - } else WaveTimer -= diff; - } - }; -}; - void AddSC_eversong_woods() { - new npc_infused_crystal(); } -- cgit v1.2.3 From 5418844f15d939d8fdab9402548509b676ed28c4 Mon Sep 17 00:00:00 2001 From: Dr-J Date: Thu, 31 Jul 2014 00:24:08 +0100 Subject: Delete zone_eversong_woods.cpp --- .../EasternKingdoms/zone_eversong_woods.cpp | 37 ---------------------- 1 file changed, 37 deletions(-) delete mode 100644 src/server/scripts/EasternKingdoms/zone_eversong_woods.cpp (limited to 'src') diff --git a/src/server/scripts/EasternKingdoms/zone_eversong_woods.cpp b/src/server/scripts/EasternKingdoms/zone_eversong_woods.cpp deleted file mode 100644 index 01f7d932c42..00000000000 --- a/src/server/scripts/EasternKingdoms/zone_eversong_woods.cpp +++ /dev/null @@ -1,37 +0,0 @@ -/* - * Copyright (C) 2008-2014 TrinityCore - * Copyright (C) 2006-2009 ScriptDev2 - * - * 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 . - */ - -/* ScriptData -SDName: Eversong_Woods -SD%Complete: 95 -SDComment: Quest support: -SDCategory: Eversong Woods -EndScriptData */ - -/* ContentData -EndContentData */ - -#include "ScriptMgr.h" -#include "ScriptedCreature.h" -#include "ScriptedGossip.h" -#include "ScriptedEscortAI.h" -#include "Player.h" - -void AddSC_eversong_woods() -{ -} -- cgit v1.2.3 From bfbfc1f08cc71721cf1a0e5cf4e8e9116de58c4e Mon Sep 17 00:00:00 2001 From: Dr-J Date: Thu, 31 Jul 2014 00:28:10 +0100 Subject: Update ScriptLoader.cpp --- src/server/game/Scripting/ScriptLoader.cpp | 1 - 1 file changed, 1 deletion(-) (limited to 'src') diff --git a/src/server/game/Scripting/ScriptLoader.cpp b/src/server/game/Scripting/ScriptLoader.cpp index 862b8dffddb..a0185bf7709 100644 --- a/src/server/game/Scripting/ScriptLoader.cpp +++ b/src/server/game/Scripting/ScriptLoader.cpp @@ -978,7 +978,6 @@ void AddEasternKingdomsScripts() AddSC_burning_steppes(); AddSC_duskwood(); AddSC_eastern_plaguelands(); - AddSC_eversong_woods(); AddSC_ghostlands(); AddSC_hinterlands(); AddSC_isle_of_queldanas(); -- cgit v1.2.3 From 9253ff7cb784f75caffe4b4e13d9cf2c73785a37 Mon Sep 17 00:00:00 2001 From: Dr-J Date: Thu, 31 Jul 2014 00:29:54 +0100 Subject: Update CMakeLists.txt --- src/server/scripts/EasternKingdoms/CMakeLists.txt | 1 - 1 file changed, 1 deletion(-) (limited to 'src') diff --git a/src/server/scripts/EasternKingdoms/CMakeLists.txt b/src/server/scripts/EasternKingdoms/CMakeLists.txt index 61a5037fa00..d9ab6fa18ce 100644 --- a/src/server/scripts/EasternKingdoms/CMakeLists.txt +++ b/src/server/scripts/EasternKingdoms/CMakeLists.txt @@ -11,7 +11,6 @@ set(scripts_STAT_SRCS ${scripts_STAT_SRCS} EasternKingdoms/zone_ghostlands.cpp - EasternKingdoms/zone_eversong_woods.cpp EasternKingdoms/AlteracValley/boss_galvangar.cpp EasternKingdoms/AlteracValley/boss_balinda.cpp EasternKingdoms/AlteracValley/boss_drekthar.cpp -- cgit v1.2.3