diff --git a/src/server/game/Battlegrounds/Zones/BattlegroundAB.h b/src/server/game/Battlegrounds/Zones/BattlegroundAB.h
index 1547ab3345..8a1509eaa8 100644
--- a/src/server/game/Battlegrounds/Zones/BattlegroundAB.h
+++ b/src/server/game/Battlegrounds/Zones/BattlegroundAB.h
@@ -21,7 +21,6 @@
#include "Battleground.h"
#include "BattlegroundScore.h"
-#include "Object.h"
enum BG_AB_WorldStates
{
diff --git a/src/server/game/Battlegrounds/Zones/BattlegroundBFG.cpp b/src/server/game/Battlegrounds/Zones/BattlegroundBFG.cpp
index 6be0d0473d..0004fc2c27 100644
--- a/src/server/game/Battlegrounds/Zones/BattlegroundBFG.cpp
+++ b/src/server/game/Battlegrounds/Zones/BattlegroundBFG.cpp
@@ -16,7 +16,17 @@
*/
#include "BattlegroundBFG.h"
+#include "BattlegroundMgr.h"
+#include "Creature.h"
+#include "DBCStores.h"
+#include "GameObject.h"
+#include "Log.h"
+#include "Map.h"
+#include "Player.h"
+#include "Random.h"
+#include "Util.h"
#include "WorldPacket.h"
+#include "WorldSession.h"
void BattlegroundBFGScore::BuildObjectivesBlock(WorldPacket& data, ByteBuffer& content)
{
@@ -604,7 +614,7 @@ void BattlegroundBFG::EndBattleground(uint32 winner)
Battleground::EndBattleground(winner);
}
-WorldSafeLocsEntry const* BattlegroundBFG::GetClosestGraveYard(Player* player)
+WorldSafeLocsEntry const* BattlegroundBFG::GetClosestGraveyard(Player* player)
{
TeamId teamIndex = GetTeamIndexByTeamId(player->GetTeam());
diff --git a/src/server/game/Battlegrounds/Zones/BattlegroundBFG.h b/src/server/game/Battlegrounds/Zones/BattlegroundBFG.h
index 7a874dc95f..ccdd6d0ee3 100644
--- a/src/server/game/Battlegrounds/Zones/BattlegroundBFG.h
+++ b/src/server/game/Battlegrounds/Zones/BattlegroundBFG.h
@@ -274,7 +274,7 @@ class BattlegroundBFG : public Battleground
bool SetupBattleground() override;
void Reset() override;
void EndBattleground(uint32 winner) override;
- WorldSafeLocsEntry const* GetClosestGraveYard(Player* player) override;
+ WorldSafeLocsEntry const* GetClosestGraveyard(Player* player) override;
/* Scorekeeping */
bool UpdatePlayerScore(Player* player, uint32 type, uint32 value, bool doAddHonor = true) override;
diff --git a/src/server/game/Battlegrounds/Zones/BattlegroundTP.cpp b/src/server/game/Battlegrounds/Zones/BattlegroundTP.cpp
index 7bb3b0e986..4c10af25d5 100644
--- a/src/server/game/Battlegrounds/Zones/BattlegroundTP.cpp
+++ b/src/server/game/Battlegrounds/Zones/BattlegroundTP.cpp
@@ -15,16 +15,15 @@
* with this program. If not, see .
*/
-#include "Battleground.h"
#include "BattlegroundTP.h"
-#include "Creature.h"
-#include "GameObject.h"
-#include "Language.h"
-#include "Object.h"
-#include "ObjectMgr.h"
#include "BattlegroundMgr.h"
+#include "DBCStores.h"
+#include "GameObject.h"
+#include "Log.h"
+#include "Map.h"
+#include "Object.h"
+#include "ObjectAccessor.h"
#include "Player.h"
-#include "World.h"
#include "WorldPacket.h"
// these variables aren't used outside of this file, so declare them only here
@@ -474,7 +473,7 @@ void BattlegroundTP::UpdateTeamScore(uint32 team)
UpdateWorldState(BG_TP_FLAG_CAPTURES_HORDE, GetTeamScore(team));
}
-WorldSafeLocsEntry const* BattlegroundTP::GetClosestGraveYard(Player* player)
+WorldSafeLocsEntry const* BattlegroundTP::GetClosestGraveyard(Player* player)
{
if (!player)
return NULL;
diff --git a/src/server/game/Battlegrounds/Zones/BattlegroundTP.h b/src/server/game/Battlegrounds/Zones/BattlegroundTP.h
index 4bdb32f794..c45998e5f2 100644
--- a/src/server/game/Battlegrounds/Zones/BattlegroundTP.h
+++ b/src/server/game/Battlegrounds/Zones/BattlegroundTP.h
@@ -20,6 +20,7 @@
#include "Battleground.h"
#include "BattlegroundScore.h"
+#include "EventMap.h"
enum BG_TP_TimerOrScore
{
@@ -250,7 +251,7 @@ class BattlegroundTP : public Battleground
bool SetupBattleground() override;
void Reset() override;
void EndBattleground(uint32 winner) override;
- WorldSafeLocsEntry const* GetClosestGraveYard(Player* player) override;
+ WorldSafeLocsEntry const* GetClosestGraveyard(Player* player) override;
void UpdateFlagState(uint32 team, uint32 value);
void SetLastFlagCapture(uint32 team) { _lastFlagCaptureTeam = team; }
diff --git a/src/server/game/DungeonFinding/LFGMgr.cpp b/src/server/game/DungeonFinding/LFGMgr.cpp
index af77f17caa..1fd58daf9c 100644
--- a/src/server/game/DungeonFinding/LFGMgr.cpp
+++ b/src/server/game/DungeonFinding/LFGMgr.cpp
@@ -43,18 +43,12 @@
namespace lfg
{
-
-LFGDungeonData::LFGDungeonData() : id(0), name(), map(0), type(0), expansion(0), group(0), minlevel(0),
- maxlevel(0), difficulty(REGULAR_DIFFICULTY), seasonal(false), x(0.0f), y(0.0f), z(0.0f), o(0.0f),
- requiredItemLevel(0)
-{
-}
-
LFGDungeonData::LFGDungeonData(LFGDungeonEntry const* dbc) : id(dbc->ID), name(dbc->name), map(dbc->map),
type(dbc->type), expansion(dbc->expansion), group(dbc->grouptype),
minlevel(dbc->minlevel), maxlevel(dbc->maxlevel), difficulty(Difficulty(dbc->difficulty)),
seasonal((dbc->flags & LFG_FLAG_SEASONAL) != 0), x(0.0f), y(0.0f), z(0.0f), o(0.0f),
- requiredItemLevel(0)
+ requiredItemLevel(0), requiredTanks(dbc->requiredTanks), requiredHealers(dbc->requiredHealers),
+ requiredDamageDealers(dbc->requiredDamageDealers)
{
}
diff --git a/src/server/game/DungeonFinding/LFGMgr.h b/src/server/game/DungeonFinding/LFGMgr.h
index c5e8a80794..485d8bd4c0 100644
--- a/src/server/game/DungeonFinding/LFGMgr.h
+++ b/src/server/game/DungeonFinding/LFGMgr.h
@@ -280,14 +280,7 @@ struct LfgPlayerBoot
struct LFGDungeonData
{
LFGDungeonData() = delete;
-
- LFGDungeonData(LFGDungeonEntry const* dbc): id(dbc->ID), name(dbc->name), map(dbc->map),
- type(dbc->type), expansion(dbc->expansion), group(dbc->grouptype),
- minlevel(dbc->minlevel), maxlevel(dbc->maxlevel), difficulty(Difficulty(dbc->difficulty)),
- seasonal((dbc->flags & LFG_FLAG_SEASONAL) != 0), x(0.0f), y(0.0f), z(0.0f), o(0.0f),
- requiredItemLevel(0), requiredTanks(dbc->requiredTanks), requiredHealers(dbc->requiredHealers),
- requiredDamageDealers(dbc->requiredDamageDealers)
- { }
+ LFGDungeonData(LFGDungeonEntry const* dbc);
uint32 id;
std::string name;
diff --git a/src/server/game/Entities/Player/Player.cpp b/src/server/game/Entities/Player/Player.cpp
index df6be81f8b..abb4141ead 100644
--- a/src/server/game/Entities/Player/Player.cpp
+++ b/src/server/game/Entities/Player/Player.cpp
@@ -409,7 +409,7 @@ Player::Player(WorldSession* session): Unit(true)
m_achievementMgr = new AchievementMgr(this);
m_reputationMgr = new ReputationMgr(this);
- hasValidLFGLeavePoint = false;
+ _hasValidLFGLeavePoint = false;
_archaeology = new Archaeology(this);
}
diff --git a/src/server/game/Groups/Group.cpp b/src/server/game/Groups/Group.cpp
index 09195a6ce5..8e84ec943f 100644
--- a/src/server/game/Groups/Group.cpp
+++ b/src/server/game/Groups/Group.cpp
@@ -26,6 +26,7 @@
#include "Formulas.h"
#include "GameObject.h"
#include "GroupMgr.h"
+#include "Guild.h"
#include "InstanceSaveMgr.h"
#include "LFGMgr.h"
#include "LootMgr.h"
diff --git a/src/server/game/Guilds/Guild.h b/src/server/game/Guilds/Guild.h
index a1cecf72c4..1b45e367fe 100644
--- a/src/server/game/Guilds/Guild.h
+++ b/src/server/game/Guilds/Guild.h
@@ -276,11 +276,6 @@ enum GuildChallengeTypes
MAX_GUILD_CHALLENGE_TYPE,
};
-uint32 const GuildChallengeGoldReward[GUILD_CHALLENGES_TYPES] = { 0, 250, 1000, 500 };
-uint32 const GuildChallengeMaxLevelGoldReward[GUILD_CHALLENGES_TYPES] = { 0, 125, 500, 250 };
-uint32 const GuildChallengeXPReward[GUILD_CHALLENGES_TYPES] = { 0, 300000, 3000000, 1500000 };
-uint32 const GuildChallengesPerWeek[GUILD_CHALLENGES_TYPES] = { 0, 7, 1, 3 };
-
// Emblem info
class TC_GAME_API EmblemInfo
{
diff --git a/src/server/game/Instances/InstanceScript.cpp b/src/server/game/Instances/InstanceScript.cpp
index 86b06314a7..45fc18cae0 100644
--- a/src/server/game/Instances/InstanceScript.cpp
+++ b/src/server/game/Instances/InstanceScript.cpp
@@ -25,6 +25,7 @@
#include "DBCStructure.h"
#include "GameObject.h"
#include "Group.h"
+#include "Guild.h"
#include "LFGMgr.h"
#include "Log.h"
#include "Map.h"
diff --git a/src/server/scripts/Commands/cs_reload.cpp b/src/server/scripts/Commands/cs_reload.cpp
index d095dac33e..034652e71c 100644
--- a/src/server/scripts/Commands/cs_reload.cpp
+++ b/src/server/scripts/Commands/cs_reload.cpp
@@ -403,8 +403,8 @@ public:
return true;
}
- static bool HandleReloadOnKillReputationCommand(ChatHandler* handler, const char* /*args*/) {
- TC_LOG_INFO("misc", "Re-Loading creature award reputation definitions...");
+ static bool HandleReloadOnKillRewardCommand(ChatHandler* handler, const char* /*args*/) {
+ TC_LOG_INFO("misc", "Re-Loading creature reward definitions...");
sObjectMgr->LoadRewardOnKill();
handler->SendGlobalGMSysMessage("DB table `creature_onkill_reward` reloaded.");
return true;
diff --git a/src/server/scripts/EasternKingdoms/Deadmines/boss_helix_gearbreaker.cpp b/src/server/scripts/EasternKingdoms/Deadmines/boss_helix_gearbreaker.cpp
index 05251875cf..3453cf0a7c 100644
--- a/src/server/scripts/EasternKingdoms/Deadmines/boss_helix_gearbreaker.cpp
+++ b/src/server/scripts/EasternKingdoms/Deadmines/boss_helix_gearbreaker.cpp
@@ -15,14 +15,20 @@
* with this program. If not, see .
*/
-#include "ObjectMgr.h"
#include "ScriptMgr.h"
-#include "ScriptedCreature.h"
-#include "SpellScript.h"
-#include "SpellAuraEffects.h"
-#include "Player.h"
-#include "Vehicle.h"
#include "deadmines.h"
+#include "InstanceScript.h"
+#include "MotionMaster.h"
+#include "MovementTypedefs.h"
+#include "PassiveAI.h"
+#include "PhasingHandler.h"
+#include "Player.h"
+#include "ScriptedCreature.h"
+#include "SpellAuraEffects.h"
+#include "SpellScript.h"
+#include "SpellMgr.h"
+#include "VehicleDefines.h"
+#include "GridNotifiers.h"
enum Texts
{
diff --git a/src/server/scripts/EasternKingdoms/Deadmines/boss_vanessa_van_cleef.cpp b/src/server/scripts/EasternKingdoms/Deadmines/boss_vanessa_van_cleef.cpp
index 2102773d46..8294722d21 100644
--- a/src/server/scripts/EasternKingdoms/Deadmines/boss_vanessa_van_cleef.cpp
+++ b/src/server/scripts/EasternKingdoms/Deadmines/boss_vanessa_van_cleef.cpp
@@ -15,13 +15,18 @@
* with this program. If not, see .
*/
-#include "ObjectMgr.h"
#include "ScriptMgr.h"
-#include "ScriptedCreature.h"
-#include "SpellScript.h"
-#include "SpellAuraEffects.h"
-#include "Player.h"
#include "deadmines.h"
+#include "InstanceScript.h"
+#include "MotionMaster.h"
+#include "MovementTypedefs.h"
+#include "MoveSplineInit.h"
+#include "PassiveAI.h"
+#include "PhasingHandler.h"
+#include "Player.h"
+#include "ScriptedCreature.h"
+#include "SpellAuraEffects.h"
+#include "SpellScript.h"
enum Texts
{
@@ -203,7 +208,7 @@ class npc_vanessa_vanessa_van_cleef : public CreatureScript
{
Movement::MoveSplineInit init(me);
init.SetWalk(true);
- init.MoveTo(vanessaIntroWalkPos, true);
+ init.MoveTo(vanessaIntroWalkPos.GetPositionX(), vanessaIntroWalkPos.GetPositionY(), vanessaIntroWalkPos.GetPositionZ(), true);
init.Launch();
_events.ScheduleEvent(EVENT_TALK_INTRO_2, Milliseconds(200));
break;
diff --git a/src/server/scripts/EasternKingdoms/Deadmines/instance_deadmines.cpp b/src/server/scripts/EasternKingdoms/Deadmines/instance_deadmines.cpp
index 13623d7bfd..af343bee2c 100644
--- a/src/server/scripts/EasternKingdoms/Deadmines/instance_deadmines.cpp
+++ b/src/server/scripts/EasternKingdoms/Deadmines/instance_deadmines.cpp
@@ -24,6 +24,7 @@
#include "Map.h"
#include "MotionMaster.h"
#include "TemporarySummon.h"
+#include "VehicleDefines.h"
#include "WorldPacket.h"
enum EventIds
diff --git a/src/server/scripts/EasternKingdoms/Gilneas/chapter1.cpp b/src/server/scripts/EasternKingdoms/Gilneas/chapter1.cpp
index ab00c36c9d..14fc2f6c4d 100644
--- a/src/server/scripts/EasternKingdoms/Gilneas/chapter1.cpp
+++ b/src/server/scripts/EasternKingdoms/Gilneas/chapter1.cpp
@@ -17,12 +17,17 @@
#include "gilneas.h"
#include "ScriptMgr.h"
+#include "CombatAI.h"
#include "MotionMaster.h"
+#include "ObjectAccessor.h"
+#include "Player.h"
#include "PassiveAI.h"
#include "PhasingHandler.h"
-#include "Player.h"
#include "ScriptedCreature.h"
+#include "SpellInfo.h"
+#include "SpellScript.h"
#include "TemporarySummon.h"
+#include "Vehicle.h"
/*######
## Quest 14098 - Evacuate the Merchant Square
diff --git a/src/server/scripts/EasternKingdoms/Gilneas/gilneas.h b/src/server/scripts/EasternKingdoms/Gilneas/gilneas.h
index 4761386150..6fb74db172 100644
--- a/src/server/scripts/EasternKingdoms/Gilneas/gilneas.h
+++ b/src/server/scripts/EasternKingdoms/Gilneas/gilneas.h
@@ -25,7 +25,7 @@
// House wave
uint32 const runtHousePathSize1 = 13;
-G3D::Vector3 const worgenRuntHousePath1[runtHousePathSize1] =
+Position const worgenRuntHousePath1[runtHousePathSize1] =
{
{ -1734.77f, 1527.007f, 55.2133f },
{ -1729.345f, 1526.495f, 55.4231f },
@@ -44,7 +44,7 @@ G3D::Vector3 const worgenRuntHousePath1[runtHousePathSize1] =
uint32 const runtHousePathSize2 = 11;
-G3D::Vector3 const worgenRuntHousePath2[runtHousePathSize2] =
+Position const worgenRuntHousePath2[runtHousePathSize2] =
{
{-1705.29f, 1527.974f, 57.49218f },
{-1709.63f, 1527.464f, 56.81163f },
@@ -61,7 +61,7 @@ G3D::Vector3 const worgenRuntHousePath2[runtHousePathSize2] =
uint32 const runtHousePathSize3 = 8;
-G3D::Vector3 const worgenRuntHousePath3[runtHousePathSize3] =
+Position const worgenRuntHousePath3[runtHousePathSize3] =
{
{-1717.74f, 1514.99f, 55.37629f },
{-1717.75f, 1513.727f, 55.39608f },
@@ -75,7 +75,7 @@ G3D::Vector3 const worgenRuntHousePath3[runtHousePathSize3] =
uint32 const runtHousePathSize4 = 11;
-G3D::Vector3 const worgenRuntHousePath4[runtHousePathSize4] =
+Position const worgenRuntHousePath4[runtHousePathSize4] =
{
{ -1727.101f, 1527.078f, 55.5045f },
{ -1724.719f, 1526.731f, 55.60394f },
@@ -92,7 +92,7 @@ G3D::Vector3 const worgenRuntHousePath4[runtHousePathSize4] =
uint32 const runtHousePathSize5 = 11;
-G3D::Vector3 const worgenRuntHousePath5[runtHousePathSize5] =
+Position const worgenRuntHousePath5[runtHousePathSize5] =
{
{ -1709.699f, 1527.335f, 56.34836f },
{ -1713.974f, 1526.625f, 56.13234f },
@@ -109,7 +109,7 @@ G3D::Vector3 const worgenRuntHousePath5[runtHousePathSize5] =
uint32 const runtHousePathSize6 = 9;
-G3D::Vector3 const worgenRuntHousePath6[runtHousePathSize6] =
+Position const worgenRuntHousePath6[runtHousePathSize6] =
{
{ -1718.083f, 1532.09f, 56.25435f },
{ -1718.104f, 1524.071f, 55.80854f },
@@ -124,7 +124,7 @@ G3D::Vector3 const worgenRuntHousePath6[runtHousePathSize6] =
uint32 const runtHousePathSize7 = 9;
-G3D::Vector3 const worgenRuntHousePath7[runtHousePathSize7] =
+Position const worgenRuntHousePath7[runtHousePathSize7] =
{
{ -1718.083f, 1532.09f, 56.25435f },
{ -1718.104f, 1524.071f, 55.80854f },
@@ -139,7 +139,7 @@ G3D::Vector3 const worgenRuntHousePath7[runtHousePathSize7] =
uint32 const runtCathedralPathSize1 = 10;
-G3D::Vector3 const worgenRuntCathedralPath1[runtCathedralPathSize1] =
+Position const worgenRuntCathedralPath1[runtCathedralPathSize1] =
{
{ -1612.885f, 1492.154f, 67.03599f },
{ -1618.054f, 1489.644f, 68.5475f },
@@ -155,7 +155,7 @@ G3D::Vector3 const worgenRuntCathedralPath1[runtCathedralPathSize1] =
uint32 const runtCathedralPathSize2 = 7;
-G3D::Vector3 const worgenRuntCathedralPath2[runtCathedralPathSize2] =
+Position const worgenRuntCathedralPath2[runtCathedralPathSize2] =
{
{ -1618.982f, 1489.76f, 68.56043f },
{ -1625.62f, 1487.033f, 71.4378f },
@@ -168,7 +168,7 @@ G3D::Vector3 const worgenRuntCathedralPath2[runtCathedralPathSize2] =
uint32 const runtCathedralPathSize3 = 6;
-G3D::Vector3 const worgenRuntCathedralPath3[runtCathedralPathSize3] =
+Position const worgenRuntCathedralPath3[runtCathedralPathSize3] =
{
{ -1637.957f, 1493.445f, 67.77746f },
{ -1638.569f, 1489.736f, 68.47077f },
@@ -180,7 +180,7 @@ G3D::Vector3 const worgenRuntCathedralPath3[runtCathedralPathSize3] =
uint32 const runtCathedralPathSize4 = 5;
-G3D::Vector3 const worgenRuntCathedralPath4[runtCathedralPathSize4] =
+Position const worgenRuntCathedralPath4[runtCathedralPathSize4] =
{
{ -1628.66f, 1482.281f, 71.34027f },
{ -1630.399f, 1481.66f, 71.33196f },
@@ -192,7 +192,7 @@ G3D::Vector3 const worgenRuntCathedralPath4[runtCathedralPathSize4] =
uint32 const runtCathedralPathSize5 = 9;
-G3D::Vector3 const worgenRuntCathedralPath5[runtCathedralPathSize5] =
+Position const worgenRuntCathedralPath5[runtCathedralPathSize5] =
{
{ -1620.279f, 1484.46f, 67.03528f },
{ -1622.424f, 1483.882f, 68.05564f },
@@ -207,7 +207,7 @@ G3D::Vector3 const worgenRuntCathedralPath5[runtCathedralPathSize5] =
uint32 const runtCathedralPathSize6 = 10;
-G3D::Vector3 const worgenRuntCathedralPath6[runtCathedralPathSize6] =
+Position const worgenRuntCathedralPath6[runtCathedralPathSize6] =
{
{ -1633.998f, 1495.233f, 68.24403f },
{ -1634.344f, 1491.3f, 70.41303f },
@@ -223,7 +223,7 @@ G3D::Vector3 const worgenRuntCathedralPath6[runtCathedralPathSize6] =
uint32 const runtCathedralPathSize7 = 7;
-G3D::Vector3 const worgenRuntCathedralPath7[runtCathedralPathSize7] =
+Position const worgenRuntCathedralPath7[runtCathedralPathSize7] =
{
{ -1629.975f, 1494.066f, 70.64719f },
{ -1631.979f, 1491.585f, 71.31316f },
@@ -236,7 +236,7 @@ G3D::Vector3 const worgenRuntCathedralPath7[runtCathedralPathSize7] =
uint32 const runtCathedralPathSize8 = 8;
-G3D::Vector3 const worgenRuntCathedralPath8[runtCathedralPathSize8] =
+Position const worgenRuntCathedralPath8[runtCathedralPathSize8] =
{
{ -1620.879f, 1491.133f, 70.67613f },
{ -1622.665f, 1489.818f, 71.04526f },
@@ -274,7 +274,7 @@ Position const worgenRuntJumpPos[] =
######*/
uint32 const pathSize1 = 7;
-G3D::Vector3 const greymanesHorsePath1[pathSize1] =
+Position const greymanesHorsePath1[pathSize1] =
{
{ -1797.425f, 1396.941f, 20.07336f },
{ -1788.675f, 1378.441f, 20.07336f },
@@ -286,7 +286,7 @@ G3D::Vector3 const greymanesHorsePath1[pathSize1] =
};
uint32 const pathSize2 = 13;
-G3D::Vector3 const greymanesHorsePath2[] =
+Position const greymanesHorsePath2[] =
{
{ -1664.807f, 1345.011f, 15.48499f },
{ -1662.807f, 1354.511f, 15.48499f },
diff --git a/src/server/scripts/EasternKingdoms/GrimBatol/boss_erudax.cpp b/src/server/scripts/EasternKingdoms/GrimBatol/boss_erudax.cpp
index dd870eb3a6..267c6f1a65 100644
--- a/src/server/scripts/EasternKingdoms/GrimBatol/boss_erudax.cpp
+++ b/src/server/scripts/EasternKingdoms/GrimBatol/boss_erudax.cpp
@@ -15,13 +15,14 @@
* with this program. If not, see .
*/
-#include "ObjectMgr.h"
#include "ScriptMgr.h"
+#include "grim_batol.h"
+#include "ObjectMgr.h"
#include "ScriptedCreature.h"
#include "SpellScript.h"
#include "SpellAuraEffects.h"
+#include "SpellMgr.h"
#include "Player.h"
-#include "grim_batol.h"
enum Spells
{
diff --git a/src/server/scripts/EasternKingdoms/ShadowfangKeep/instance_shadowfang_keep.cpp b/src/server/scripts/EasternKingdoms/ShadowfangKeep/instance_shadowfang_keep.cpp
index c82254e7a6..9929b4130c 100644
--- a/src/server/scripts/EasternKingdoms/ShadowfangKeep/instance_shadowfang_keep.cpp
+++ b/src/server/scripts/EasternKingdoms/ShadowfangKeep/instance_shadowfang_keep.cpp
@@ -15,11 +15,14 @@
* with this program. If not, see .
*/
-#include "ScriptedCreature.h"
#include "ScriptMgr.h"
+#include "shadowfang_keep.h"
+#include "AreaBoundary.h"
+#include "GameObject.h"
#include "InstanceScript.h"
#include "shadowfang_keep.h"
#include "TemporarySummon.h"
+#include "ScriptedCreature.h"
#include "Player.h"
ObjectData const creatureData[] =
diff --git a/src/server/scripts/EasternKingdoms/ShadowfangKeep/shadowfang_keep.cpp b/src/server/scripts/EasternKingdoms/ShadowfangKeep/shadowfang_keep.cpp
index 3336fda6c8..de7b63f76e 100644
--- a/src/server/scripts/EasternKingdoms/ShadowfangKeep/shadowfang_keep.cpp
+++ b/src/server/scripts/EasternKingdoms/ShadowfangKeep/shadowfang_keep.cpp
@@ -16,12 +16,14 @@
*/
#include "ScriptMgr.h"
+#include "shadowfang_keep.h"
+#include "MotionMaster.h"
+#include "GridNotifiersImpl.h"
#include "ScriptedCreature.h"
#include "ScriptedGossip.h"
#include "SpellScript.h"
#include "SpellAuraEffects.h"
#include "ScriptedEscortAI.h"
-#include "shadowfang_keep.h"
#include "Player.h"
enum Events
@@ -161,7 +163,7 @@ Position const SKBelmontPath1[] =
{ -256.849f, 2117.16f, 81.1796f },
};
-const G3D::Vector3 SKBelmontPath2[] =
+Position const SKBelmontPath2[] =
{
{-253.795f, 2129.375f, 81.6518f },
{-251.545f, 2136.625f, 84.4018f },
@@ -175,7 +177,7 @@ const G3D::Vector3 SKBelmontPath2[] =
{ -241.741f, 2157.09f, 90.624f },
};
-const G3D::Vector3 SKBelmontPath3[] =
+Position const SKBelmontPath3[] =
{
{ -232.822f, 2150.74f, 90.874f },
{ -227.572f, 2148.99f, 90.874f },
@@ -186,7 +188,7 @@ const G3D::Vector3 SKBelmontPath3[] =
Position const SKCromushMovePose1 = { -130.894f, 2166.81f, 138.697f };
-const G3D::Vector3 SKCromushFinalPath[] =
+Position const SKCromushFinalPath[] =
{
{ -130.894f, 2166.81f, 138.697f },
{ -122.2125f, 2164.165f, 139.025f },
@@ -195,7 +197,7 @@ const G3D::Vector3 SKCromushFinalPath[] =
// ---
-const G3D::Vector3 SKBelmontPath4[] =
+Position const SKBelmontPath4[] =
{
{ -268.0123f, 2271.203f, 95.94984f },
{ -267.106f, 2270.78f, 95.94984f },
@@ -212,7 +214,7 @@ const G3D::Vector3 SKBelmontPath4[] =
// ---
-const G3D::Vector3 SKBelmontPath5[] =
+Position const SKBelmontPath5[] =
{
{ -173.513f, 2177.429f, 129.3383f },
{ -173.059f, 2178.32f, 129.3383f },
@@ -223,7 +225,7 @@ const G3D::Vector3 SKBelmontPath5[] =
{ -142.101f, 2171.24f, 128.201f },
};
-const G3D::Vector3 SKBelmontPath6[] =
+Position const SKBelmontPath6[] =
{
{ -137.9335f, 2166.785f, 128.8225f },
{ -135.6835f, 2165.535f, 129.0725f },
@@ -232,7 +234,7 @@ const G3D::Vector3 SKBelmontPath6[] =
// ---
-const G3D::Vector3 SKBelmontFinalPath[] =
+Position const SKBelmontFinalPath[] =
{
{ -168.6964f, 2187.787f, 151.9893f },
{ -169.071f, 2186.86f, 151.9893f },
@@ -251,7 +253,7 @@ enum IvarPaths
PATH_IVAR_ASHBURY_BALCONY = 4700600,
};
-const G3D::Vector3 SKIvarPath2[] =
+Position const SKIvarPath2[] =
{
{ -253.9495f, 2124.95f, 81.65175f },
{ -253.6995f, 2131.45f, 81.65175f },
@@ -266,7 +268,7 @@ const G3D::Vector3 SKIvarPath2[] =
{ -241.84f, 2156.7f, 90.624f },
};
-const G3D::Vector3 SKIvarPath3[] =
+Position const SKIvarPath3[] =
{
{ -241.2605f, 2154.06f, 90.874f },
{ -237.2605f, 2151.81f, 90.874f },
@@ -276,7 +278,7 @@ const G3D::Vector3 SKIvarPath3[] =
Position const IvarJumpPos1 = { -254.559f, 2121.7f, 81.1795f };
-const G3D::Vector3 SKBerserkerPath1[] =
+Position const SKBerserkerPath1[] =
{
{ -235.5815f, 2138.77f, 87.24785f },
{ -238.0815f, 2141.02f, 87.24785f },
@@ -305,7 +307,7 @@ Position const SKBerserkerJumpPositions2[] =
};
// --
-const G3D::Vector3 SKBerserkerPath2[] =
+Position const SKBerserkerPath2[] =
{
{ -254.862f, 2266.08f, 101.0079f },
{ -251.362f, 2264.58f, 101.0079f },
@@ -313,7 +315,7 @@ const G3D::Vector3 SKBerserkerPath2[] =
{ -250.318f, 2249.56f, 100.892f },
};
-const G3D::Vector3 SKBerserkerPath3[] =
+Position const SKBerserkerPath3[] =
{
{ -252.7115f, 2265.245f, 101.0332f },
{ -249.7115f, 2262.495f, 101.0332f },
@@ -322,7 +324,7 @@ const G3D::Vector3 SKBerserkerPath3[] =
{ -257.411f, 2244.82f, 100.891f },
};
-const G3D::Vector3 SKBerserkerPath4[] =
+Position const SKBerserkerPath4[] =
{
{ -252.2485f, 2265.13f, 101.0929f },
{ -249.7485f, 2262.63f, 101.0929f },
@@ -337,7 +339,7 @@ Position const IvarJumpPos3 = { -246.66f, 2163.02f, 96.6991f };
Position const IvarWalkPos1 = { -149.165f, 2174.34f, 127.953f };
-const G3D::Vector3 SKIvarPath4[] =
+Position const SKIvarPath4[] =
{
{ -139.9845f, 2170.305f, 128.6985f },
{ -135.2345f, 2165.305f, 129.1985f },
@@ -377,49 +379,49 @@ Position const BerserkerJumpMovePositions1[] =
{ -132.797f, 2166.66f, 138.697f },
};
-const G3D::Vector3 BerserkerFinalPath0[] =
+Position const BerserkerFinalPath0[] =
{
{ -127.849f, 2166.03f, 139.0555f },
{-123.599f, 2165.53f, 139.0555f },
{-120.089f, 2168.95f, 139.414f },
};
-const G3D::Vector3 BerserkerFinalPath1[] =
+Position const BerserkerFinalPath1[] =
{
{ -126.677f, 2165.465f, 139.0325f },
{ -121.427f, 2165.215f, 139.0325f },
{ -119.319f, 2168.17f, 139.368f },
};
-const G3D::Vector3 BerserkerFinalPath2[] =
+Position const BerserkerFinalPath2[] =
{
{ -134.12f, 2167.11f, 138.697f },
{ -123.1685f, 2165.135f, 139.0035f },
{ -118.717f, 2171.66f, 139.81f },
};
-const G3D::Vector3 BerserkerFinalPath3[] =
+Position const BerserkerFinalPath3[] =
{
{ -130.965f, 2166.47f, 138.697f },
{ -124.0485f, 2164.915f, 139.026f },
{ -120.132f, 2168.36f, 139.355f },
};
-const G3D::Vector3 BerserkerFinalPath4[] =
+Position const BerserkerFinalPath4[] =
{
{ -132.753f, 2167.57f, 138.697f },
{ -122.675f, 2164.24f, 139.0525f },
{ -119.097f, 2172.41f, 139.908f },
};
-const G3D::Vector3 BerserkerFinalPath5[] =
+Position const BerserkerFinalPath5[] =
{
{ -127.396f, 2165.925f, 139.088f },
{ -122.396f, 2164.925f, 139.088f },
{ -119.62f, 2169.44f, 139.479f },
};
-const G3D::Vector3 BerserkerFinalPath6[] =
+Position const BerserkerFinalPath6[] =
{
{ -132.753f, 2167.57f, 138.697f },
{ -124.541f, 2165.705f, 139.0565f },
diff --git a/src/server/scripts/Kalimdor/VortexPinnacle/boss_asaad.cpp b/src/server/scripts/Kalimdor/VortexPinnacle/boss_asaad.cpp
index 9e61ceac36..66a0d31b78 100644
--- a/src/server/scripts/Kalimdor/VortexPinnacle/boss_asaad.cpp
+++ b/src/server/scripts/Kalimdor/VortexPinnacle/boss_asaad.cpp
@@ -853,7 +853,11 @@ public:
if (!stormTargetA || !stormTargetB || !stormTargetC)
return;
- targets.remove_if(TargetInTriangleCheck(false, stormTargetA->GetPosition(), stormTargetB->GetPosition(), stormTargetC->GetPosition()));
+ TriangleBoundary triangle(*stormTargetA, *stormTargetB, *stormTargetC);
+ targets.remove_if([&](WorldObject* target)
+ {
+ return triangle.IsWithinBoundary(target);
+ });
// Hitting 5 dummy npc's per hit
if (!targets.empty() && targets.size() > 5)
diff --git a/src/server/scripts/Kalimdor/VortexPinnacle/boss_grand_vizier_ertan.cpp b/src/server/scripts/Kalimdor/VortexPinnacle/boss_grand_vizier_ertan.cpp
index 509246c199..3667279dac 100644
--- a/src/server/scripts/Kalimdor/VortexPinnacle/boss_grand_vizier_ertan.cpp
+++ b/src/server/scripts/Kalimdor/VortexPinnacle/boss_grand_vizier_ertan.cpp
@@ -17,6 +17,7 @@
#include "ScriptMgr.h"
#include "MotionMaster.h"
+#include "PassiveAI.h"
#include "ScriptedCreature.h"
#include "SpellScript.h"
#include "TemporarySummon.h"
diff --git a/src/server/scripts/Kalimdor/VortexPinnacle/vortex_pinnacle.h b/src/server/scripts/Kalimdor/VortexPinnacle/vortex_pinnacle.h
index 651d94fe96..68db85081a 100644
--- a/src/server/scripts/Kalimdor/VortexPinnacle/vortex_pinnacle.h
+++ b/src/server/scripts/Kalimdor/VortexPinnacle/vortex_pinnacle.h
@@ -50,27 +50,30 @@ enum DataTypes
enum Misc
{
- NPC_GRAND_VIZIER_ERTAN = 43878,
- NPC_ALTAIRUS = 43873,
- NPC_ASAAD = 43875,
+ NPC_GRAND_VIZIER_ERTAN = 43878,
+ NPC_ALTAIRUS = 43873,
+ NPC_ASAAD = 43875,
- NPC_SLIPSTREAM = 45455,
+ NPC_SLIPSTREAM = 45455,
NPC_SLIPSTREAM_LANDING_ZONE = 45504,
- NPC_HOWLING_GALE = 45572,
+ NPC_HOWLING_GALE = 45572,
// Grounding Field
- NPC_GROUNDING_FIELD = 47085,
- SPELL_BEAM_A = 87721,
- SPELL_BEAM_B = 87722,
- SPELL_BEAM_C = 87723,
- ACTION_GROUNDING_FIELD_TOP = 1,
+ NPC_GROUNDING_FIELD = 47085,
+ SPELL_BEAM_A = 87721,
+ SPELL_BEAM_B = 87722,
+ SPELL_BEAM_C = 87723,
+ ACTION_GROUNDING_FIELD_TOP = 1,
+
+ // Skyfall
+ ACTION_SKYFALL_STAR_DEAD = 2,
// Zephyr
- NPC_ZEPHYR = 45991,
- EVENT_SUMMON_ZEPHYRS = 1,
- PATH_ZEPHYR_SOUTH = 4599100,
- PATH_ZEPHYR_NORTH = 4599101,
+ NPC_ZEPHYR = 45991,
+ EVENT_SUMMON_ZEPHYRS = 1,
+ PATH_ZEPHYR_SOUTH = 4599100,
+ PATH_ZEPHYR_NORTH = 4599101,
};
template
diff --git a/src/server/scripts/Spells/spell_dk.cpp b/src/server/scripts/Spells/spell_dk.cpp
index 17f88ef251..b41333bdf5 100644
--- a/src/server/scripts/Spells/spell_dk.cpp
+++ b/src/server/scripts/Spells/spell_dk.cpp
@@ -24,7 +24,9 @@
#include "ScriptMgr.h"
#include "Containers.h"
#include "Creature.h"
+#include "Pet.h"
#include "Player.h"
+#include "Spell.h"
#include "SpellAuraEffects.h"
#include "SpellHistory.h"
#include "SpellMgr.h"
diff --git a/src/server/scripts/Spells/spell_druid.cpp b/src/server/scripts/Spells/spell_druid.cpp
index 75b6b8189e..a52ef9fee5 100644
--- a/src/server/scripts/Spells/spell_druid.cpp
+++ b/src/server/scripts/Spells/spell_druid.cpp
@@ -24,10 +24,12 @@
#include "ScriptMgr.h"
#include "Containers.h"
#include "Player.h"
+#include "Spell.h"
#include "SpellAuraEffects.h"
#include "SpellHistory.h"
#include "SpellMgr.h"
#include "SpellScript.h"
+#include "DynamicObject.h"
enum DruidSpells
{
@@ -1056,7 +1058,7 @@ class spell_dru_stampede : public SpellScriptLoader
{
return ValidateSpellInfo(
{
- SPELL_DRUID_STAMPEDE_BEAR_RANK_1,
+ SPELL_DRUID_STAMPEDE_BAER_RANK_1,
SPELL_DRUID_STAMPEDE_CAT_RANK_1,
SPELL_DRUID_STAMPEDE_CAT_STATE,
SPELL_DRUID_FERAL_CHARGE_CAT,
@@ -1080,7 +1082,7 @@ class spell_dru_stampede : public SpellScriptLoader
if (GetTarget()->GetShapeshiftForm() != FORM_BEAR || eventInfo.GetDamageInfo()->GetSpellInfo()->Id != SPELL_DRUID_FERAL_CHARGE_BEAR)
return;
- GetTarget()->CastSpell(GetTarget(), sSpellMgr->GetSpellWithRank(SPELL_DRUID_STAMPEDE_BEAR_RANK_1, GetSpellInfo()->GetRank()), true, nullptr, aurEff);
+ GetTarget()->CastSpell(GetTarget(), sSpellMgr->GetSpellWithRank(SPELL_DRUID_STAMPEDE_BAER_RANK_1, GetSpellInfo()->GetRank()), true, nullptr, aurEff);
}
void Register() override
diff --git a/src/server/scripts/Spells/spell_pet.cpp b/src/server/scripts/Spells/spell_pet.cpp
index 4f2a99f845..202ab39cbb 100644
--- a/src/server/scripts/Spells/spell_pet.cpp
+++ b/src/server/scripts/Spells/spell_pet.cpp
@@ -884,7 +884,7 @@ public:
DoEffectCalcAmount += AuraEffectCalcAmountFn(spell_hun_pet_scaling_01_AuraScript::CalculateAttackPowerAmount, EFFECT_1, SPELL_AURA_MOD_ATTACK_POWER);
DoEffectCalcAmount += AuraEffectCalcAmountFn(spell_hun_pet_scaling_01_AuraScript::CalculateDamageDoneAmount, EFFECT_2, SPELL_AURA_MOD_DAMAGE_DONE);
}
- uint32 _tempHealth;
+
uint32 _tempHealth = 0;
};
diff --git a/src/server/scripts/Spells/spell_warlock.cpp b/src/server/scripts/Spells/spell_warlock.cpp
index 2a1c42a5f2..fe5fe1122f 100644
--- a/src/server/scripts/Spells/spell_warlock.cpp
+++ b/src/server/scripts/Spells/spell_warlock.cpp
@@ -27,6 +27,7 @@
#include "ObjectMgr.h"
#include "Player.h"
#include "Random.h"
+#include "Spell.h"
#include "SpellAuraEffects.h"
#include "SpellAuras.h"
#include "SpellMgr.h"
diff --git a/src/server/scripts/Spells/spell_warrior.cpp b/src/server/scripts/Spells/spell_warrior.cpp
index f20e475cdf..94485873d5 100644
--- a/src/server/scripts/Spells/spell_warrior.cpp
+++ b/src/server/scripts/Spells/spell_warrior.cpp
@@ -22,12 +22,14 @@
*/
#include "ScriptMgr.h"
+#include "Item.h"
#include "Player.h"
#include "Random.h"
#include "SpellAuraEffects.h"
#include "SpellHistory.h"
#include "SpellMgr.h"
#include "SpellScript.h"
+#include "GridNotifiersImpl.h"
enum WarriorSpells
{