Core/Scripts: Include cleanup

9 files changed, 35 insertions, 35 deletions

diff --git a/src/server/scripts/World/achievement_scripts.cpp b/src/server/scripts/World/achievement_scripts.cpp
index 9495970378c..a94bbc853e8 100644
--- a/src/server/scripts/World/achievement_scripts.cpp
+++ b/src/server/scripts/World/achievement_scripts.cpp
@@ -18,9 +18,8 @@
 #include "ScriptMgr.h"
 #include "BattlegroundSA.h"
 #include "BattlegroundIC.h"
-#include "Vehicle.h"
-#include "Player.h"
 #include "Creature.h"
+#include "Player.h"
 
 class achievement_resilient_victory : public AchievementCriteriaScript
 {
diff --git a/src/server/scripts/World/areatrigger_scripts.cpp b/src/server/scripts/World/areatrigger_scripts.cpp
index 59e3452c02f..45a42835858 100644
--- a/src/server/scripts/World/areatrigger_scripts.cpp
+++ b/src/server/scripts/World/areatrigger_scripts.cpp
@@ -36,8 +36,12 @@ at_area_52_entrance
 EndContentData */
 
 #include "ScriptMgr.h"
+#include "GameObject.h"
+#include "ObjectAccessor.h"
 #include "ScriptedCreature.h"
 #include "Player.h"
+#include "TemporarySummon.h"
+#include "World.h"
 
 /*######
 ## at_coilfang_waterfall
diff --git a/src/server/scripts/World/boss_emerald_dragons.cpp b/src/server/scripts/World/boss_emerald_dragons.cpp
index c674a32f43f..ab490ec4a59 100644
--- a/src/server/scripts/World/boss_emerald_dragons.cpp
+++ b/src/server/scripts/World/boss_emerald_dragons.cpp
@@ -16,13 +16,12 @@
  * with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "ObjectMgr.h"
 #include "ScriptMgr.h"
+#include "ObjectAccessor.h"
+#include "PassiveAI.h"
 #include "ScriptedCreature.h"
+#include "SpellInfo.h"
 #include "SpellScript.h"
-#include "Spell.h"
-#include "SpellAuraEffects.h"
-#include "PassiveAI.h"
 
 //
 //  Emerald Dragon NPCs and IDs (kept here for reference)
@@ -770,11 +769,7 @@ class spell_mark_of_nature : public SpellScriptLoader
 
             bool Validate(SpellInfo const* /*spellInfo*/) override
             {
-                if (!sSpellMgr->GetSpellInfo(SPELL_MARK_OF_NATURE))
-                    return false;
-                if (!sSpellMgr->GetSpellInfo(SPELL_AURA_OF_NATURE))
-                    return false;
-                return true;
+                return ValidateSpellInfo({ SPELL_MARK_OF_NATURE, SPELL_AURA_OF_NATURE });
             }
 
             void FilterTargets(std::list<WorldObject*>& targets)
diff --git a/src/server/scripts/World/go_scripts.cpp b/src/server/scripts/World/go_scripts.cpp
index 4f7015bd222..835407a0a4e 100644
--- a/src/server/scripts/World/go_scripts.cpp
+++ b/src/server/scripts/World/go_scripts.cpp
@@ -45,13 +45,13 @@ go_toy_train_set
 EndContentData */
 
 #include "ScriptMgr.h"
+#include "GameObject.h"
 #include "GameObjectAI.h"
 #include "Log.h"
 #include "Player.h"
 #include "ScriptedCreature.h"
 #include "ScriptedGossip.h"
-#include "Spell.h"
-#include "WorldSession.h"
+#include "TemporarySummon.h"
 
 /*######
 ## go_cat_figurine
@@ -864,7 +864,8 @@ enum PrisonersOfWyrmskull
     NPC_PRISONER_PRIEST                           = 24086,
     NPC_PRISONER_MAGE                             = 24088,
     NPC_PRISONER_WARRIOR                          = 24089,
-    NPC_PRISONER_PALADIN                          = 24090
+    NPC_PRISONER_PALADIN                          = 24090,
+    NPC_CAPTURED_VALGARDE_PRISONER_PROXY          = 24124
 };
 
 class go_dragonflayer_cage : public GameObjectScript
@@ -893,13 +894,9 @@ public:
         if (!pPrisoner || !pPrisoner->IsAlive())
             return true;
 
-        Quest const* qInfo = sObjectMgr->GetQuestTemplate(QUEST_PRISONERS_OF_WYRMSKULL);
-        if (qInfo)
-        {
-            /// @todo prisoner should help player for a short period of time
-            player->KilledMonsterCredit(qInfo->Objectives[0].ObjectID);
-            pPrisoner->DisappearAndDie();
-        }
+        /// @todo prisoner should help player for a short period of time
+        player->KilledMonsterCredit(NPC_CAPTURED_VALGARDE_PRISONER_PROXY);
+        pPrisoner->DespawnOrUnsummon();
         return true;
     }
 };
diff --git a/src/server/scripts/World/guards.cpp b/src/server/scripts/World/guards.cpp
index b3a12d11f9d..7ff2a090353 100644
--- a/src/server/scripts/World/guards.cpp
+++ b/src/server/scripts/World/guards.cpp
@@ -30,8 +30,8 @@ guard_shattrath_scryer
 EndContentData */
 
 #include "ScriptMgr.h"
-#include "ScriptedCreature.h"
 #include "GuardAI.h"
+#include "ObjectAccessor.h"
 #include "Player.h"
 #include "SpellInfo.h"
 
diff --git a/src/server/scripts/World/item_scripts.cpp b/src/server/scripts/World/item_scripts.cpp
index 05f9054ab48..7b93769cbe6 100644
--- a/src/server/scripts/World/item_scripts.cpp
+++ b/src/server/scripts/World/item_scripts.cpp
@@ -31,9 +31,13 @@ item_only_for_flight                Items which should only useable while flying
 EndContentData */
 
 #include "ScriptMgr.h"
+#include "GameObject.h"
+#include "Item.h"
+#include "Player.h"
 #include "ScriptedCreature.h"
 #include "Spell.h"
-#include "Player.h"
+#include "SpellMgr.h"
+#include "TemporarySummon.h"
 
 /*#####
 # item_only_for_flight
@@ -241,7 +245,7 @@ public:
 
         float x, y, z;
         go->GetClosePoint(x, y, z, go->GetObjectSize() / 3, 7.0f);
-        go->SummonGameObject(GO_HIGH_QUALITY_FUR, *go, G3D::Quat(), 1);
+        go->SummonGameObject(GO_HIGH_QUALITY_FUR, *go, QuaternionData(), 1);
         if (TempSummon* summon = player->SummonCreature(NPC_NESINGWARY_TRAPPER, x, y, z, go->GetOrientation(), TEMPSUMMON_DEAD_DESPAWN, 1000))
         {
             summon->SetVisible(false);
@@ -275,7 +279,7 @@ public:
 
         if (!player->GetTransport() || player->GetAreaId() != AREA_ID_SHATTERED_STRAITS)
         {
-            if (const SpellInfo* spellInfo = sSpellMgr->GetSpellInfo(SPELL_PETROV_BOMB))
+            if (SpellInfo const* spellInfo = sSpellMgr->GetSpellInfo(SPELL_PETROV_BOMB))
                 Spell::SendCastResult(player, spellInfo, 0, castId, SPELL_FAILED_NOT_HERE);
 
             return true;
diff --git a/src/server/scripts/World/mob_generic_creature.cpp b/src/server/scripts/World/mob_generic_creature.cpp
index 6fee5b870b9..c7feb0a64fc 100644
--- a/src/server/scripts/World/mob_generic_creature.cpp
+++ b/src/server/scripts/World/mob_generic_creature.cpp
@@ -17,8 +17,9 @@
  */
 
 #include "ScriptMgr.h"
-#include "ScriptedCreature.h"
 #include "PassiveAI.h"
+#include "ScriptedCreature.h"
+#include "SpellMgr.h"
 
 class trigger_periodic : public CreatureScript
 {
diff --git a/src/server/scripts/World/npc_innkeeper.cpp b/src/server/scripts/World/npc_innkeeper.cpp
index 8c321c82664..261e94c1ee9 100644
--- a/src/server/scripts/World/npc_innkeeper.cpp
+++ b/src/server/scripts/World/npc_innkeeper.cpp
@@ -24,10 +24,10 @@ SDCategory: NPCs
 EndScriptData */
 
 #include "ScriptMgr.h"
-#include "ScriptedCreature.h"
-#include "ScriptedGossip.h"
 #include "GameEventMgr.h"
 #include "Player.h"
+#include "ScriptedCreature.h"
+#include "ScriptedGossip.h"
 #include "WorldSession.h"
 
 enum Spells
diff --git a/src/server/scripts/World/npcs_special.cpp b/src/server/scripts/World/npcs_special.cpp
index 9987168141c..2d42afd23ff 100644
--- a/src/server/scripts/World/npcs_special.cpp
+++ b/src/server/scripts/World/npcs_special.cpp
@@ -17,24 +17,24 @@
  */
 
 #include "ScriptMgr.h"
-#include "Cell.h"
 #include "CellImpl.h"
 #include "CreatureTextMgr.h"
 #include "GameEventMgr.h"
+#include "GameObject.h"
 #include "GameObjectAI.h"
-#include "GridNotifiers.h"
 #include "GridNotifiersImpl.h"
 #include "Log.h"
+#include "ObjectAccessor.h"
 #include "ObjectMgr.h"
 #include "PassiveAI.h"
-#include "Pet.h"
-#include "ScriptedCreature.h"
+#include "Player.h"
+#include "QuestDef.h"
 #include "ScriptedEscortAI.h"
 #include "ScriptedGossip.h"
-#include "ScriptMgr.h"
 #include "SpellAuras.h"
 #include "SpellHistory.h"
-#include "World.h"
+#include "SpellInfo.h"
+#include "TemporarySummon.h"
 
 /*########
 # npc_air_force_bots
@@ -2080,7 +2080,7 @@ public:
 
                 float displacement = 0.7f;
                 for (uint8 i = 0; i < 4; i++)
-                    me->SummonGameObject(GetFireworkGameObjectId(), me->GetPositionX() + (i % 2 == 0 ? displacement : -displacement), me->GetPositionY() + (i > 1 ? displacement : -displacement), me->GetPositionZ() + 4.0f, me->GetOrientation(), G3D::Quat(), 1);
+                    me->SummonGameObject(GetFireworkGameObjectId(), me->GetPositionX() + (i % 2 == 0 ? displacement : -displacement), me->GetPositionY() + (i > 1 ? displacement : -displacement), me->GetPositionZ() + 4.0f, me->GetOrientation(), QuaternionData(), 1);
             }
             else
                 //me->CastSpell(me, GetFireworkSpell(me->GetEntry()), true);