Merge branch 'master' into Playerbot

src/server/scripts/Northrend/AzjolNerub/AzjolNerub/boss_anubarak.cpp

@@ -20,6 +20,7 @@
 #include "SpellScriptLoader.h"
 #include "azjol_nerub.h"
 #include "SpellInfo.h"
+#include "SpellMgr.h"
 #include "SpellScript.h"
 
 enum Spells

src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheChampion/boss_grand_champions.cpp

@@ -22,6 +22,7 @@
 #include "ScriptedCreature.h"
 #include "ScriptedEscortAI.h"
 #include "SpellInfo.h"
+#include "SpellMgr.h"
 #include "Vehicle.h"
 #include "trial_of_the_champion.h"
 

src/server/scripts/Northrend/DraktharonKeep/boss_trollgore.cpp

@@ -22,6 +22,7 @@
 #include "SpellScriptLoader.h"
 #include "drak_tharon_keep.h"
 #include "SpellAuraEffects.h"
+#include "SpellMgr.h"
 #include "SpellScript.h"
 
 enum Yells

src/server/scripts/Northrend/IcecrownCitadel/boss_deathbringer_saurfang.cpp

@@ -24,6 +24,7 @@
 #include "SpellAuras.h"
 #include "SpellScriptLoader.h"
 #include "icecrown_citadel.h"
+#include "SpellMgr.h"
 
 enum ScriptTexts
 {

src/server/scripts/Northrend/IcecrownCitadel/boss_festergut.cpp

@@ -22,6 +22,7 @@
 #include "SpellAuras.h"
 #include "SpellScriptLoader.h"
 #include "icecrown_citadel.h"
+#include "SpellMgr.h"
 
 enum ScriptTexts
 {

src/server/scripts/Northrend/IcecrownCitadel/icecrown_citadel.cpp

@@ -3024,14 +3024,16 @@ struct npc_icc_spire_frostwyrm : public ScriptedAI
         bool _canResetFlyingEffects;
 };
 
-#define VENGEFUL_WP_COUNT 6
+#define VENGEFUL_WP_COUNT 8
 const Position VengefulWP[VENGEFUL_WP_COUNT] =
 {
     {4432.21f, 3041.5f, 372.783f, 0.0f},
+    {4408.67f, 3041.81f, 372.48f, 0.0f},
     {4370.50f, 3042.00f, 372.80f, 0.0f},
     {4370.37f, 3059.16f, 371.69f, 0.0f},
     {4342.53f, 3058.97f, 371.68f, 0.0f},
     {4342.51f, 3041.24f, 372.80f, 0.0f},
+    {4304.75f, 3041.57f, 372.43f, 0.0f},
     {4281.30f, 3041.77f, 372.78f, 0.0f},
 };
 
@@ -3065,6 +3067,8 @@ public:
             me->SetWalk(false);
             events.Reset();
             events.ScheduleEvent(1, 3s, 6s); // leaping face maul
+            if (currPipeWP != VENGEFUL_WP_COUNT)
+                needMove = true;
         }
 
         void JustReachedHome() override
@@ -3132,7 +3136,7 @@ public:
                         --currPipeWP;
                 }
                 me->SetHomePosition(VengefulWP[currPipeWP].GetPositionX(), VengefulWP[currPipeWP].GetPositionY(), VengefulWP[currPipeWP].GetPositionZ(), me->GetOrientation());
-                if ((forward && currPipeWP == 3) || (!forward && currPipeWP == 2))
+                if ((forward && currPipeWP == 4) || (!forward && currPipeWP == 3))
                     me->GetMotionMaster()->MoveJump(VengefulWP[currPipeWP].GetPositionX(), VengefulWP[currPipeWP].GetPositionY(), VengefulWP[currPipeWP].GetPositionZ(), 10.0f, 6.0f, 1);
                 else
                     me->GetMotionMaster()->MovePoint(1, VengefulWP[currPipeWP].GetPositionX(), VengefulWP[currPipeWP].GetPositionY(), VengefulWP[currPipeWP].GetPositionZ());

src/server/scripts/Northrend/IcecrownCitadel/icecrown_citadel_teleport.cpp

@@ -22,6 +22,7 @@
 #include "ScriptedGossip.h"
 #include "Spell.h"
 #include "icecrown_citadel.h"
+#include "SpellMgr.h"
 
 #define GOSSIP_SENDER_ICC_PORT 631