josh/TCPlayerbotCore
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Battlefield/Wintergrasp:

Browse Source 
* Use correct spells on losing and winning factions
* Enums renaming, lowerCamelCase wherever applicable
* Rename some methods and class attributes for them to sound more English and less Engrish or even Frenglish (\o/)
* Use correct spells when trying to build mechanical units at the Workshops.
This commit is contained in:
Warpten
2012-08-20 13:50:49 -04:00
committed by Kandera
parent d31902d858
commit 094f98d3a9
10 changed files with 1389 additions and 1425 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/server/game/Battlefield/Battlefield.cpp
+192 -199
View File
@@ -32,12 +32,11 @@
#include "CreatureTextMgr.h" #include "CreatureTextMgr.h"
#include "GroupMgr.h" #include "GroupMgr.h"
Battlefield::Battlefield() Battlefield::Battlefield()
{ {
m_Timer = 0; m_Timer = 0;
m_enable = true; m_IsEnabled = true;
m_BattlefieldActive = false; m_isActive = false;
m_DefenderTeam = TEAM_NEUTRAL; m_DefenderTeam = TEAM_NEUTRAL;
m_TypeId = 0; m_TypeId = 0;
@@ -51,7 +50,7 @@ Battlefield::Battlefield()
m_TimeForAcceptInvite = 20; m_TimeForAcceptInvite = 20;
m_uiKickDontAcceptTimer = 1000; m_uiKickDontAcceptTimer = 1000;
m_uiKickAfkTimer = 1000; m_uiKickAfkPlayersTimer = 1000;
m_LastResurectTimer = 30 * IN_MILLISECONDS; m_LastResurectTimer = 30 * IN_MILLISECONDS;
m_StartGroupingTimer = 0; m_StartGroupingTimer = 0;
@@ -63,50 +62,49 @@ Battlefield::~Battlefield()
{ {
} }
void Battlefield::HandlePlayerEnterZone(Player *player, uint32 /*zone */ ) // Called when a player enters the zone
void Battlefield::HandlePlayerEnterZone(Player* player, uint32 /*zone*/)
{ {
//If battle is start, // If battle is started,
// if it not fully > invite player to join the war // If not full of players > invite player to join the war
// if it fully > announce to player that BF is full and kick after few second if he dont leave // If full of players > announce to player that BF is full and kick him after a few second if he desn't leave
if (IsWarTime()) if (IsWarTime())
{ {
if (m_PlayersInWar[player->GetTeamId()].size() + m_InvitedPlayers[player->GetTeamId()].size() < m_MaxPlayer) //Not fully if (m_PlayersInWar[player->GetTeamId()].size() + m_InvitedPlayers[player->GetTeamId()].size() < m_MaxPlayer) // Vacant spaces
{
InvitePlayerToWar(player); InvitePlayerToWar(player);
} else // No more vacant places
else //Full
{ {
//TODO:Send packet for announce it to player // TODO: Send a packet to announce it to player
m_PlayersWillBeKick[player->GetTeamId()][player->GetGUID()] = time(NULL) + 10; m_PlayersWillBeKick[player->GetTeamId()][player->GetGUID()] = time(NULL) + 10;
InvitePlayerToQueue(player); InvitePlayerToQueue(player);
} }
} }
else else
{ {
//If time left is <15 minutes invite player to join queue // If time left is < 15 minutes invite player to join queue
if (m_Timer <= m_StartGroupingTimer) if (m_Timer <= m_StartGroupingTimer)
InvitePlayerToQueue(player); InvitePlayerToQueue(player);
} }
//Add player in list of player in zone // Add player in the list of player in zone
m_players[player->GetTeamId()].insert(player->GetGUID()); m_players[player->GetTeamId()].insert(player->GetGUID());
OnPlayerEnterZone(player); //for scripting OnPlayerEnterZone(player);
} }
//Called when a player leave the zone // Called when a player leave the zone
void Battlefield::HandlePlayerLeaveZone(Player *player, uint32 /*zone */ ) void Battlefield::HandlePlayerLeaveZone(Player* player, uint32 /*zone*/)
{ {
if (IsWarTime()) if (IsWarTime())
{ {
//if player is in war list // If the player is participating to the battle
if (m_PlayersInWar[player->GetTeamId()].find(player->GetGUID()) != m_PlayersInWar[player->GetTeamId()].end()) if (m_PlayersInWar[player->GetTeamId()].find(player->GetGUID()) != m_PlayersInWar[player->GetTeamId()].end())
{ {
m_PlayersInWar[player->GetTeamId()].erase(player->GetGUID()); m_PlayersInWar[player->GetTeamId()].erase(player->GetGUID());
player->GetSession()->SendBfLeaveMessage(m_BattleId); player->GetSession()->SendBfLeaveMessage(m_BattleId);
if (Group* group = player->GetGroup()) // remove from raid group if player is member if (Group* group = player->GetGroup()) // Remove the player from the raid group
group->RemoveMember(player->GetGUID()); group->RemoveMember(player->GetGUID());
OnPlayerLeaveWar(player); //For scripting OnPlayerLeaveWar(player);
} }
} }
@@ -118,55 +116,54 @@ void Battlefield::HandlePlayerLeaveZone(Player *player, uint32 /*zone */ )
m_players[player->GetTeamId()].erase(player->GetGUID()); m_players[player->GetTeamId()].erase(player->GetGUID());
SendRemoveWorldStates(player); SendRemoveWorldStates(player);
RemovePlayerFromResurrectQueue(player->GetGUID()); RemovePlayerFromResurrectQueue(player->GetGUID());
OnPlayerLeaveZone(player); //For scripting OnPlayerLeaveZone(player);
} }
bool Battlefield::Update(uint32 diff) bool Battlefield::Update(uint32 diff)
{ {
//When global timer is end
if (m_Timer <= diff) if (m_Timer <= diff)
{ {
//Here end of battle by timer // Battlefield ends on time
if (IsWarTime()) if (IsWarTime())
EndBattle(true); EndBattle(true);
//Start of battle else // Time to start a new battle!
else
StartBattle(); StartBattle();
} }
else else
m_Timer -= diff; m_Timer -= diff;
//Some times before battle start invite player to queue // Invite players a few minutes before the battle's beginning
if (!m_StartGrouping && m_Timer <= m_StartGroupingTimer) if (!m_StartGrouping && m_Timer <= m_StartGroupingTimer)
{ {
m_StartGrouping = true; m_StartGrouping = true;
InvitePlayerInZoneToQueue(); InvitePlayersInZoneToQueue();
OnStartGrouping(); // for scripting OnStartGrouping();
} }
bool objective_changed = false; bool objective_changed = false;
if (IsWarTime()) if (IsWarTime())
{ {
if (m_uiKickAfkTimer <= diff) if (m_uiKickAfkPlayersTimer <= diff)
{ {
m_uiKickAfkTimer = 1000; m_uiKickAfkPlayersTimer = 1000;
KickAfk(); KickAfkPlayers();
} }
else else
m_uiKickAfkTimer -= diff; m_uiKickAfkPlayersTimer -= diff;
//Here kick player witch dont have accept invitation to join the war when time is end (time of windows) // Kick players who chose not to accept invitation to the battle
if (m_uiKickDontAcceptTimer <= diff) if (m_uiKickDontAcceptTimer <= diff)
{ {
for (int team = 0; team < 2; team++) for (int team = 0; team < 2; team++)
for (PlayerTimerMap::iterator itr = m_InvitedPlayers[team].begin(); itr != m_InvitedPlayers[team].end(); itr++) for (PlayerTimerMap::iterator itr = m_InvitedPlayers[team].begin(); itr != m_InvitedPlayers[team].end(); itr++)
if ((*itr).second <= time(NULL)) if ((*itr).second <= time(NULL))
KickPlayerFromBf((*itr).first); KickPlayerFromBattlefield((*itr).first);
InvitePlayerInZoneToWar();
InvitePlayersInZoneToWar();
for (int team = 0; team < 2; team++) for (int team = 0; team < 2; team++)
for (PlayerTimerMap::iterator itr = m_PlayersWillBeKick[team].begin(); itr != m_PlayersWillBeKick[team].end(); itr++) for (PlayerTimerMap::iterator itr = m_PlayersWillBeKick[team].begin(); itr != m_PlayersWillBeKick[team].end(); itr++)
if ((*itr).second <= time(NULL)) if ((*itr).second <= time(NULL))
KickPlayerFromBf((*itr).first); KickPlayerFromBattlefield((*itr).first);
m_uiKickDontAcceptTimer = 1000; m_uiKickDontAcceptTimer = 1000;
} }
@@ -181,9 +178,9 @@ bool Battlefield::Update(uint32 diff)
if (m_LastResurectTimer <= diff) if (m_LastResurectTimer <= diff)
{ {
for (uint8 i = 0; i < m_GraveYardList.size(); i++) for (uint8 i = 0; i < m_GraveyardList.size(); i++)
if (GetGraveYardById(i)) if (GetGraveyardById(i))
m_GraveYardList[i]->Resurrect(); m_GraveyardList[i]->Resurrect();
m_LastResurectTimer = RESURRECTION_INTERVAL; m_LastResurectTimer = RESURRECTION_INTERVAL;
} }
else else
@@ -192,7 +189,7 @@ bool Battlefield::Update(uint32 diff)
return objective_changed; return objective_changed;
} }
void Battlefield::InvitePlayerInZoneToQueue() void Battlefield::InvitePlayersInZoneToQueue()
{ {
for (uint8 team = 0; team < 2; ++team) for (uint8 team = 0; team < 2; ++team)
for (GuidSet::const_iterator itr = m_players[team].begin(); itr != m_players[team].end(); ++itr) for (GuidSet::const_iterator itr = m_players[team].begin(); itr != m_players[team].end(); ++itr)
@@ -200,16 +197,16 @@ void Battlefield::InvitePlayerInZoneToQueue()
InvitePlayerToQueue(player); InvitePlayerToQueue(player);
} }
void Battlefield::InvitePlayerToQueue(Player *player) void Battlefield::InvitePlayerToQueue(Player* player)
{ {
if (m_PlayersInQueue[player->GetTeamId()].count(player->GetGUID())) if (m_PlayersInQueue[player->GetTeamId()].count(player->GetGUID()))
return; return;
if (m_PlayersInQueue[player->GetTeam()].size() <= m_MinPlayer || m_PlayersInQueue[player->GetTeam() == TEAM_ALLIANCE ? TEAM_HORDE : TEAM_ALLIANCE].size() >= m_MinPlayer) if (m_PlayersInQueue[player->GetTeam()].size() <= m_MinPlayer || m_PlayersInQueue[GetOtherTeam(player->GetTeamId())].size() >= m_MinPlayer)
player->GetSession()->SendBfInvitePlayerToQueue(m_BattleId); player->GetSession()->SendBfInvitePlayerToQueue(m_BattleId);
} }
void Battlefield::InvitePlayerInQueueToWar() void Battlefield::InvitePlayersInQueueToWar()
{ {
for (uint8 team = 0; team < BG_TEAMS_COUNT; ++team) for (uint8 team = 0; team < BG_TEAMS_COUNT; ++team)
{ {
@@ -229,7 +226,7 @@ void Battlefield::InvitePlayerInQueueToWar()
} }
} }
void Battlefield::InvitePlayerInZoneToWar() void Battlefield::InvitePlayersInZoneToWar()
{ {
for (uint8 team = 0; team < BG_TEAMS_COUNT; ++team) for (uint8 team = 0; team < BG_TEAMS_COUNT; ++team)
for (GuidSet::const_iterator itr = m_players[team].begin(); itr != m_players[team].end(); ++itr) for (GuidSet::const_iterator itr = m_players[team].begin(); itr != m_players[team].end(); ++itr)
@@ -240,16 +237,13 @@ void Battlefield::InvitePlayerInZoneToWar()
continue; continue;
if (m_PlayersInWar[player->GetTeamId()].size() + m_InvitedPlayers[player->GetTeamId()].size() < m_MaxPlayer) if (m_PlayersInWar[player->GetTeamId()].size() + m_InvitedPlayers[player->GetTeamId()].size() < m_MaxPlayer)
InvitePlayerToWar(player); InvitePlayerToWar(player);
else else // Battlefield is full of players
{
//full
m_PlayersWillBeKick[player->GetTeamId()][player->GetGUID()] = time(NULL) + 10; m_PlayersWillBeKick[player->GetTeamId()][player->GetGUID()] = time(NULL) + 10;
} }
} }
}
} }
void Battlefield::InvitePlayerToWar(Player *player) void Battlefield::InvitePlayerToWar(Player* player)
{ {
if (!player) if (!player)
return; return;
@@ -264,13 +258,15 @@ void Battlefield::InvitePlayerToWar(Player *player)
return; return;
} }
// If the player does not match minimal level requirements for the battlefield, kick him
if (player->getLevel() < m_MinLevel) if (player->getLevel() < m_MinLevel)
{ {
if (m_PlayersWillBeKick[player->GetTeamId()].count(player->GetGUID()) == 0) if (m_PlayersWillBeKick[player->GetTeamId()].count(player->GetGUID()) == 0)
m_PlayersWillBeKick[player->GetTeamId()][player->GetGUID()] = time(NULL) + 10; m_PlayersWillBeKick[player->GetTeamId()][player->GetGUID()] = time(NULL) + 10;
return; return;
} }
//Check if player is not already in war
// Check if player is not already in war
if (m_PlayersInWar[player->GetTeamId()].count(player->GetGUID()) || m_InvitedPlayers[player->GetTeamId()].count(player->GetGUID())) if (m_PlayersInWar[player->GetTeamId()].count(player->GetGUID()) || m_InvitedPlayers[player->GetTeamId()].count(player->GetGUID()))
return; return;
@@ -287,16 +283,16 @@ void Battlefield::InitStalker(uint32 entry, float x, float y, float z, float o)
sLog->outError("Battlefield::InitStalker: could not spawn Stalker (Creature entry %u), zone messeges will be un-available", entry); sLog->outError("Battlefield::InitStalker: could not spawn Stalker (Creature entry %u), zone messeges will be un-available", entry);
} }
void Battlefield::KickAfk() void Battlefield::KickAfkPlayers()
{ {
for (uint8 team = 0; team < BG_TEAMS_COUNT; ++team) for (uint8 team = 0; team < BG_TEAMS_COUNT; ++team)
for (GuidSet::const_iterator itr = m_PlayersInWar[team].begin(); itr != m_PlayersInWar[team].end(); ++itr) for (GuidSet::const_iterator itr = m_PlayersInWar[team].begin(); itr != m_PlayersInWar[team].end(); ++itr)
if (Player* player = sObjectAccessor->FindPlayer(*itr)) if (Player* player = sObjectAccessor->FindPlayer(*itr))
if (player->isAFK()) if (player->isAFK())
KickPlayerFromBf(*itr); KickPlayerFromBattlefield(*itr);
} }
void Battlefield::KickPlayerFromBf(uint64 guid) void Battlefield::KickPlayerFromBattlefield(uint64 guid)
{ {
if (Player* player = sObjectAccessor->FindPlayer(guid)) if (Player* player = sObjectAccessor->FindPlayer(guid))
if (player->GetZoneId() == GetZoneId()) if (player->GetZoneId() == GetZoneId())
@@ -305,7 +301,7 @@ void Battlefield::KickPlayerFromBf(uint64 guid)
void Battlefield::StartBattle() void Battlefield::StartBattle()
{ {
if (m_BattlefieldActive) if (m_isActive)
return; return;
for (int team = 0; team < BG_TEAMS_COUNT; team++) for (int team = 0; team < BG_TEAMS_COUNT; team++)
@@ -315,41 +311,41 @@ void Battlefield::StartBattle()
} }
m_Timer = m_BattleTime; m_Timer = m_BattleTime;
m_BattlefieldActive = true; m_isActive = true;
InvitePlayerInZoneToWar(); InvitePlayersInZoneToWar();
InvitePlayerInQueueToWar(); InvitePlayersInQueueToWar();
PlaySoundToAll(BF_START); DoPlaySoundToAll(BF_START);
OnBattleStart(); OnBattleStart();
} }
void Battlefield::EndBattle(bool endbytimer) void Battlefield::EndBattle(bool endByTimer)
{ {
if (!m_BattlefieldActive) if (!m_isActive)
return; return;
m_BattlefieldActive = false; m_isActive = false;
m_StartGrouping = false; m_StartGrouping = false;
if (!endbytimer) if (!endByTimer)
SetDefenderTeam(GetAttackerTeam()); SetDefenderTeam(GetAttackerTeam());
if (GetDefenderTeam() == TEAM_ALLIANCE) if (GetDefenderTeam() == TEAM_ALLIANCE)
PlaySoundToAll(BF_ALLIANCE_WINS); // alliance wins sound DoPlaySoundToAll(BF_ALLIANCE_WINS);
else else
PlaySoundToAll(BF_HORDE_WINS); // horde wins sound DoPlaySoundToAll(BF_HORDE_WINS);
OnBattleEnd(endbytimer); OnBattleEnd(endByTimer);
// reset bf timer // Reset battlefield timer
m_Timer = m_NoWarBattleTime; m_Timer = m_NoWarBattleTime;
SendInitWorldStatesToAll(); SendInitWorldStatesToAll();
} }
void Battlefield::PlaySoundToAll(uint32 SoundID) void Battlefield::DoPlaySoundToAll(uint32 SoundID)
{ {
WorldPacket data; WorldPacket data;
data.Initialize(SMSG_PLAY_SOUND, 4); data.Initialize(SMSG_PLAY_SOUND, 4);
@@ -357,34 +353,33 @@ void Battlefield::PlaySoundToAll(uint32 SoundID)
for (int team = 0; team < BG_TEAMS_COUNT; team++) for (int team = 0; team < BG_TEAMS_COUNT; team++)
for (GuidSet::const_iterator itr = m_PlayersInWar[team].begin(); itr != m_PlayersInWar[team].end(); ++itr) for (GuidSet::const_iterator itr = m_PlayersInWar[team].begin(); itr != m_PlayersInWar[team].end(); ++itr)
{
if (Player* player = sObjectAccessor->FindPlayer(*itr)) if (Player* player = sObjectAccessor->FindPlayer(*itr))
player->GetSession()->SendPacket(&data); player->GetSession()->SendPacket(&data);
}
} }
bool Battlefield::HasPlayer(Player *player) const bool Battlefield::HasPlayer(Player* player) const
{ {
return m_players[player->GetTeamId()].find(player->GetGUID()) != m_players[player->GetTeamId()].end(); return m_players[player->GetTeamId()].find(player->GetGUID()) != m_players[player->GetTeamId()].end();
} }
// Called in WorldSession::HandleBfQueueInviteResponse // Called in WorldSession::HandleBfQueueInviteResponse
void Battlefield::PlayerAcceptInviteToQueue(Player *player) void Battlefield::PlayerAcceptInviteToQueue(Player* player)
{ {
// Add player in queueVenez // Add player in queue
m_PlayersInQueue[player->GetTeamId()].insert(player->GetGUID()); m_PlayersInQueue[player->GetTeamId()].insert(player->GetGUID());
// Send notification // Send notification
player->GetSession()->SendBfQueueInviteResponce(m_BattleId, m_ZoneId); player->GetSession()->SendBfQueueInviteResponse(m_BattleId, m_ZoneId);
} }
// Called in WorldSession::HandleBfExitRequest // Called in WorldSession::HandleBfExitRequest
void Battlefield::AskToLeaveQueue(Player *player) void Battlefield::AskToLeaveQueue(Player* player)
{ {
// Remove player from queue // Remove player from queue
m_PlayersInQueue[player->GetTeamId()].erase(player->GetGUID()); m_PlayersInQueue[player->GetTeamId()].erase(player->GetGUID());
} }
// Called in WorldSession::HandleBfEntryInviteResponse // Called in WorldSession::HandleBfEntryInviteResponse
void Battlefield::PlayerAcceptInviteToWar(Player *player) void Battlefield::PlayerAcceptInviteToWar(Player* player)
{ {
if (!IsWarTime()) if (!IsWarTime())
return; return;
@@ -394,7 +389,7 @@ void Battlefield::PlayerAcceptInviteToWar(Player *player)
player->GetSession()->SendBfEntered(m_BattleId); player->GetSession()->SendBfEntered(m_BattleId);
m_PlayersInWar[player->GetTeamId()].insert(player->GetGUID()); m_PlayersInWar[player->GetTeamId()].insert(player->GetGUID());
m_InvitedPlayers[player->GetTeamId()].erase(player->GetGUID()); m_InvitedPlayers[player->GetTeamId()].erase(player->GetGUID());
//Remove player AFK
if (player->isAFK()) if (player->isAFK())
player->ToggleAFK(); player->ToggleAFK();
@@ -407,14 +402,14 @@ void Battlefield::TeamCastSpell(TeamId team, int32 spellId)
if (spellId > 0) if (spellId > 0)
for (GuidSet::const_iterator itr = m_PlayersInWar[team].begin(); itr != m_PlayersInWar[team].end(); ++itr) for (GuidSet::const_iterator itr = m_PlayersInWar[team].begin(); itr != m_PlayersInWar[team].end(); ++itr)
if (Player* player = sObjectAccessor->FindPlayer(*itr)) if (Player* player = sObjectAccessor->FindPlayer(*itr))
player->CastSpell(player, (uint32) spellId, true); player->CastSpell(player, uint32(spellId), true);
else else
for (GuidSet::const_iterator itr = m_PlayersInWar[team].begin(); itr != m_PlayersInWar[team].end(); ++itr) for (GuidSet::const_iterator itr = m_PlayersInWar[team].begin(); itr != m_PlayersInWar[team].end(); ++itr)
if (Player* player = sObjectAccessor->FindPlayer(*itr)) if (Player* player = sObjectAccessor->FindPlayer(*itr))
player->RemoveAuraFromStack((uint32) - spellId); player->RemoveAuraFromStack(uint32(-spellId));
} }
void Battlefield::BroadcastPacketZone(WorldPacket & data) const void Battlefield::BroadcastPacketToZone(WorldPacket& data) const
{ {
for (uint8 team = 0; team < BG_TEAMS_COUNT; ++team) for (uint8 team = 0; team < BG_TEAMS_COUNT; ++team)
for (GuidSet::const_iterator itr = m_players[team].begin(); itr != m_players[team].end(); ++itr) for (GuidSet::const_iterator itr = m_players[team].begin(); itr != m_players[team].end(); ++itr)
@@ -422,7 +417,7 @@ void Battlefield::BroadcastPacketZone(WorldPacket & data) const
player->GetSession()->SendPacket(&data); player->GetSession()->SendPacket(&data);
} }
void Battlefield::BroadcastPacketQueue(WorldPacket & data) const void Battlefield::BroadcastPacketToQueue(WorldPacket& data) const
{ {
for (uint8 team = 0; team < BG_TEAMS_COUNT; ++team) for (uint8 team = 0; team < BG_TEAMS_COUNT; ++team)
for (GuidSet::const_iterator itr = m_PlayersInQueue[team].begin(); itr != m_PlayersInQueue[team].end(); ++itr) for (GuidSet::const_iterator itr = m_PlayersInQueue[team].begin(); itr != m_PlayersInQueue[team].end(); ++itr)
@@ -430,7 +425,7 @@ void Battlefield::BroadcastPacketQueue(WorldPacket & data) const
player->GetSession()->SendPacket(&data); player->GetSession()->SendPacket(&data);
} }
void Battlefield::BroadcastPacketWar(WorldPacket & data) const void Battlefield::BroadcastPacketToWar(WorldPacket& data) const
{ {
for (uint8 team = 0; team < BG_TEAMS_COUNT; ++team) for (uint8 team = 0; team < BG_TEAMS_COUNT; ++team)
for (GuidSet::const_iterator itr = m_PlayersInWar[team].begin(); itr != m_PlayersInWar[team].end(); ++itr) for (GuidSet::const_iterator itr = m_PlayersInWar[team].begin(); itr != m_PlayersInWar[team].end(); ++itr)
@@ -477,11 +472,10 @@ void Battlefield::SendWarningToAllInZone(uint32 entry)
WorldPacket data = BuildWarningAnnPacket(msg); WorldPacket data = BuildWarningAnnPacket(msg);
BroadcastPacketWar(data); BroadcastPacketWar(data);
}*/ }*/
void Battlefield::SendWarningToPlayer(Player *player, uint32 entry)
{
if (!player)
return;
void Battlefield::SendWarningToPlayer(Player* player, uint32 entry)
{
if (player)
if (Unit* unit = sObjectAccessor->FindUnit(StalkerGuid)) if (Unit* unit = sObjectAccessor->FindUnit(StalkerGuid))
if (Creature* stalker = unit->ToCreature()) if (Creature* stalker = unit->ToCreature())
sCreatureTextMgr->SendChat(stalker, (uint8)entry, player->GetGUID()); sCreatureTextMgr->SendChat(stalker, (uint8)entry, player->GetGUID());
@@ -500,38 +494,37 @@ void Battlefield::RegisterZone(uint32 zoneId)
sBattlefieldMgr->AddZone(zoneId, this); sBattlefieldMgr->AddZone(zoneId, this);
} }
void Battlefield::HideNpc(Creature *p_Creature) void Battlefield::HideNpc(Creature* creature)
{ {
p_Creature->CombatStop(); creature->CombatStop();
p_Creature->SetReactState(REACT_PASSIVE); creature->SetReactState(REACT_PASSIVE);
p_Creature->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE | UNIT_FLAG_NOT_SELECTABLE); creature->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE | UNIT_FLAG_NOT_SELECTABLE);
p_Creature->SetPhaseMask(2, true); creature->SetPhaseMask(2, true);
p_Creature->DisappearAndDie(); creature->DisappearAndDie();
p_Creature->SetVisible(false); creature->SetVisible(false);
} }
void Battlefield::ShowNpc(Creature *p_Creature, bool p_Aggressive) void Battlefield::ShowNpc(Creature* creature, bool aggressive)
{ {
p_Creature->SetPhaseMask(1, true); creature->SetPhaseMask(1, true);
p_Creature->SetVisible(true); creature->SetVisible(true);
p_Creature->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE | UNIT_FLAG_NOT_SELECTABLE); creature->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE | UNIT_FLAG_NOT_SELECTABLE);
if (!p_Creature->isAlive()) if (!creature->isAlive())
p_Creature->Respawn(true); creature->Respawn(true);
if (p_Aggressive) if (aggressive)
p_Creature->SetReactState(REACT_AGGRESSIVE); creature->SetReactState(REACT_AGGRESSIVE);
else else
{ {
p_Creature->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE); creature->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE);
p_Creature->SetReactState(REACT_PASSIVE); creature->SetReactState(REACT_PASSIVE);
} }
} }
//***************************************************** // ****************************************************
//*******************Group System********************** // ******************* Group System *******************
//***************************************************** // ****************************************************
Group *Battlefield::GetFreeBfRaid(TeamId TeamId) Group* Battlefield::GetFreeBfRaid(TeamId TeamId)
{ {
//if found free group we return it
for (GuidSet::const_iterator itr = m_Groups[TeamId].begin(); itr != m_Groups[TeamId].end(); ++itr) for (GuidSet::const_iterator itr = m_Groups[TeamId].begin(); itr != m_Groups[TeamId].end(); ++itr)
if (Group* group = sGroupMgr->GetGroupByGUID(*itr)) if (Group* group = sGroupMgr->GetGroupByGUID(*itr))
if (!group->IsFull()) if (!group->IsFull())
@@ -540,7 +533,7 @@ Group *Battlefield::GetFreeBfRaid(TeamId TeamId)
return NULL; return NULL;
} }
Group *Battlefield::GetGroupPlayer(uint64 guid, TeamId TeamId) Group* Battlefield::GetGroupPlayer(uint64 guid, TeamId TeamId)
{ {
for (GuidSet::const_iterator itr = m_Groups[TeamId].begin(); itr != m_Groups[TeamId].end(); ++itr) for (GuidSet::const_iterator itr = m_Groups[TeamId].begin(); itr != m_Groups[TeamId].end(); ++itr)
if (Group* group = sGroupMgr->GetGroupByGUID(*itr)) if (Group* group = sGroupMgr->GetGroupByGUID(*itr))
@@ -550,7 +543,7 @@ Group *Battlefield::GetGroupPlayer(uint64 guid, TeamId TeamId)
return NULL; return NULL;
} }
bool Battlefield::AddOrSetPlayerToCorrectBfGroup(Player *player) bool Battlefield::AddOrSetPlayerToCorrectBfGroup(Player* player)
{ {
if (!player->IsInWorld()) if (!player->IsInWorld())
return false; return false;
@@ -583,97 +576,97 @@ bool Battlefield::AddOrSetPlayerToCorrectBfGroup(Player *player)
//***************************************************** //*****************************************************
//***************Spirit Guide System******************* //***************Spirit Guide System*******************
//***************************************************** //*****************************************************
//-------------------- //--------------------
//-Battlefield Method- //-Battlefield Method-
//-------------------- //--------------------
BfGraveYard *Battlefield::GetGraveYardById(uint32 id) BfGraveyard* Battlefield::GetGraveyardById(uint32 id)
{ {
if (id < m_GraveYardList.size()) if (id < m_GraveyardList.size())
{ {
if (m_GraveYardList[id]) if (m_GraveyardList[id])
return m_GraveYardList[id]; return m_GraveyardList[id];
else else
sLog->outError("Battlefield::GetGraveYardById Id:%u not existed", id); sLog->outError("Battlefield::GetGraveyardById Id:%u not existed", id);
} }
else else
sLog->outError("Battlefield::GetGraveYardById Id:%u cant be found", id); sLog->outError("Battlefield::GetGraveyardById Id:%u cant be found", id);
return NULL; return NULL;
} }
WorldSafeLocsEntry const *Battlefield::GetClosestGraveYard(Player *player) WorldSafeLocsEntry const * Battlefield::GetClosestGraveYard(Player* player)
{ {
BfGraveYard* closestGY = NULL; BfGraveyard* closestGY = NULL;
float maxdist = -1; float maxdist = -1;
for (uint8 i = 0; i < m_GraveYardList.size(); i++) for (uint8 i = 0; i < m_GraveyardList.size(); i++)
{ {
if (m_GraveYardList[i]) if (m_GraveyardList[i])
{ {
if (m_GraveYardList[i]->GetControlTeamId() != player->GetTeamId()) if (m_GraveyardList[i]->GetControlTeamId() != player->GetTeamId())
continue; continue;
float dist = m_GraveYardList[i]->GetDistance(player); float dist = m_GraveyardList[i]->GetDistance(player);
if (dist < maxdist || maxdist < 0) if (dist < maxdist || maxdist < 0)
{ {
closestGY = m_GraveYardList[i]; closestGY = m_GraveyardList[i];
maxdist = dist; maxdist = dist;
} }
} }
} }
if (closestGY) if (closestGY)
return sWorldSafeLocsStore.LookupEntry(closestGY->GetGraveYardId()); return sWorldSafeLocsStore.LookupEntry(closestGY->GetGraveyardId());
return NULL; return NULL;
} }
void Battlefield::AddPlayerToResurrectQueue(uint64 npc_guid, uint64 player_guid) void Battlefield::AddPlayerToResurrectQueue(uint64 npcGuid, uint64 playerGuid)
{ {
for (uint8 i = 0; i < m_GraveYardList.size(); i++) for (uint8 i = 0; i < m_GraveyardList.size(); i++)
{ {
if (!m_GraveYardList[i]) if (!m_GraveyardList[i])
continue; continue;
if (m_GraveYardList[i]->HasNpc(npc_guid)) if (m_GraveyardList[i]->HasNpc(npcGuid))
{ {
m_GraveYardList[i]->AddPlayer(player_guid); m_GraveyardList[i]->AddPlayer(playerGuid);
break; break;
} }
} }
} }
void Battlefield::RemovePlayerFromResurrectQueue(uint64 player_guid) void Battlefield::RemovePlayerFromResurrectQueue(uint64 playerGuid)
{ {
for (uint8 i = 0; i < m_GraveYardList.size(); i++) for (uint8 i = 0; i < m_GraveyardList.size(); i++)
{ {
if (!m_GraveYardList[i]) if (!m_GraveyardList[i])
continue; continue;
if (m_GraveYardList[i]->HasPlayer(player_guid)) if (m_GraveyardList[i]->HasPlayer(playerGuid))
{ {
m_GraveYardList[i]->RemovePlayer(player_guid); m_GraveyardList[i]->RemovePlayer(playerGuid);
break; break;
} }
} }
} }
void Battlefield::SendAreaSpiritHealerQueryOpcode(Player *pl, const uint64 &guid) void Battlefield::SendAreaSpiritHealerQueryOpcode(Player* player, const uint64 &guid)
{ {
sLog->outError("SendAreaSpiritHealerQueryOpcode");
WorldPacket data(SMSG_AREA_SPIRIT_HEALER_TIME, 12); WorldPacket data(SMSG_AREA_SPIRIT_HEALER_TIME, 12);
uint32 time = m_LastResurectTimer; // resurrect every 30 seconds uint32 time = m_LastResurectTimer; // resurrect every 30 seconds
data << guid << time; data << guid << time;
ASSERT(pl && pl->GetSession()); ASSERT(player && player->GetSession());
pl->GetSession()->SendPacket(&data); player->GetSession()->SendPacket(&data);
} }
//-------------------- // ----------------------
//-BfGraveYard Method- // - BfGraveyard Method -
//-------------------- // ----------------------
BfGraveYard::BfGraveYard(Battlefield *Bf) BfGraveyard::BfGraveyard(Battlefield* battlefield)
{ {
m_Bf = Bf; m_Bf = battlefield;
m_GraveyardId = 0; m_GraveyardId = 0;
m_ControlTeam = TEAM_NEUTRAL; m_ControlTeam = TEAM_NEUTRAL;
m_SpiritGuide[0] = NULL; m_SpiritGuide[0] = NULL;
@@ -681,17 +674,17 @@ BfGraveYard::BfGraveYard(Battlefield *Bf)
m_ResurrectQueue.clear(); m_ResurrectQueue.clear();
} }
void BfGraveYard::Initialize(TeamId startcontrol, uint32 gy) void BfGraveyard::Initialize(TeamId startControl, uint32 graveyardId)
{ {
m_ControlTeam = startcontrol; m_ControlTeam = startControl;
m_GraveyardId = gy; m_GraveyardId = graveyardId;
} }
void BfGraveYard::SetSpirit(Creature* spirit, TeamId team) void BfGraveyard::SetSpirit(Creature* spirit, TeamId team)
{ {
if (!spirit) if (!spirit)
{ {
sLog->outError("<Error - Wintergrasp>: Invalid Spirit."); sLog->outError("BfGraveyard::SetSpirit: Invalid Spirit.");
return; return;
} }
@@ -699,32 +692,32 @@ void BfGraveYard::SetSpirit(Creature* spirit, TeamId team)
spirit->SetReactState(REACT_PASSIVE); spirit->SetReactState(REACT_PASSIVE);
} }
float BfGraveYard::GetDistance(Player *player) float BfGraveyard::GetDistance(Player* player)
{ {
const WorldSafeLocsEntry* ws = sWorldSafeLocsStore.LookupEntry(m_GraveyardId); const WorldSafeLocsEntry* safeLoc = sWorldSafeLocsStore.LookupEntry(m_GraveyardId);
return player->GetDistance2d(ws->x, ws->y); return player->GetDistance2d(safeLoc->x, safeLoc->y);
} }
void BfGraveYard::AddPlayer(uint64 player_guid) void BfGraveyard::AddPlayer(uint64 playerGuid)
{ {
if (!m_ResurrectQueue.count(player_guid)) if (!m_ResurrectQueue.count(playerGuid))
{ {
m_ResurrectQueue.insert(player_guid); m_ResurrectQueue.insert(playerGuid);
if (Player* player = sObjectAccessor->FindPlayer(player_guid)) if (Player* player = sObjectAccessor->FindPlayer(playerGuid))
player->CastSpell(player, SPELL_WAITING_FOR_RESURRECT, true); player->CastSpell(player, SPELL_WAITING_FOR_RESURRECT, true);
} }
} }
void BfGraveYard::RemovePlayer(uint64 player_guid) void BfGraveyard::RemovePlayer(uint64 playerGuid)
{ {
m_ResurrectQueue.erase(m_ResurrectQueue.find(player_guid)); m_ResurrectQueue.erase(m_ResurrectQueue.find(playerGuid));
if (Player* player = sObjectAccessor->FindPlayer(player_guid)) if (Player* player = sObjectAccessor->FindPlayer(playerGuid))
player->RemoveAurasDueToSpell(SPELL_WAITING_FOR_RESURRECT); player->RemoveAurasDueToSpell(SPELL_WAITING_FOR_RESURRECT);
} }
void BfGraveYard::Resurrect() void BfGraveyard::Resurrect()
{ {
if (m_ResurrectQueue.empty()) if (m_ResurrectQueue.empty())
return; return;
@@ -736,7 +729,7 @@ void BfGraveYard::Resurrect()
if (!player) if (!player)
continue; continue;
// Check player isinworld and player is on good graveyard // Check if the player is in world and on the good graveyard
if (player->IsInWorld()) if (player->IsInWorld())
if (Unit* spirit = sObjectAccessor->FindUnit(m_SpiritGuide[m_ControlTeam])) if (Unit* spirit = sObjectAccessor->FindUnit(m_SpiritGuide[m_ControlTeam]))
spirit->CastSpell(spirit, SPELL_SPIRIT_HEAL, true); spirit->CastSpell(spirit, SPELL_SPIRIT_HEAL, true);
@@ -754,7 +747,7 @@ void BfGraveYard::Resurrect()
} }
// For changing graveyard control // For changing graveyard control
void BfGraveYard::ChangeControl(TeamId team) void BfGraveyard::GiveControlTo(TeamId team)
{ {
// Guide switching // Guide switching
// Note: Visiblity changes are made by phasing // Note: Visiblity changes are made by phasing
@@ -768,52 +761,51 @@ void BfGraveYard::ChangeControl(TeamId team)
RelocateDeadPlayers(); RelocateDeadPlayers();
} }
void BfGraveYard::RelocateDeadPlayers() void BfGraveyard::RelocateDeadPlayers()
{ {
WorldSafeLocsEntry const* ClosestGrave = NULL; WorldSafeLocsEntry const* closestGrave = NULL;
for (GuidSet::const_iterator itr = m_ResurrectQueue.begin(); itr != m_ResurrectQueue.end(); ++itr) for (GuidSet::const_iterator itr = m_ResurrectQueue.begin(); itr != m_ResurrectQueue.end(); ++itr)
{ {
Player* player = sObjectAccessor->FindPlayer(*itr); Player* player = sObjectAccessor->FindPlayer(*itr);
if (!player) if (!player)
continue; continue;
if (ClosestGrave) if (closestGrave)
player->TeleportTo(player->GetMapId(), ClosestGrave->x, ClosestGrave->y, ClosestGrave->z, player->GetOrientation()); player->TeleportTo(player->GetMapId(), closestGrave->x, closestGrave->y, closestGrave->z, player->GetOrientation());
else else
{ {
ClosestGrave = m_Bf->GetClosestGraveYard(player); closestGrave = m_Bf->GetClosestGraveYard(player);
if (ClosestGrave) if (closestGrave)
player->TeleportTo(player->GetMapId(), ClosestGrave->x, ClosestGrave->y, ClosestGrave->z, player->GetOrientation()); player->TeleportTo(player->GetMapId(), closestGrave->x, closestGrave->y, closestGrave->z, player->GetOrientation());
} }
} }
} }
//***************End Spirit Guide system*************** // *******************************************************
// *************** End Spirit Guide system ***************
// *******************************************************
// ********************** Misc ***************************
// *******************************************************
//***************************************************** Creature* Battlefield::SpawnCreature(uint32 entry, Position pos, TeamId team)
//**********************Misc***************************
//*****************************************************
//Method for spawn creature on map
Creature *Battlefield::SpawnCreature(uint32 entry, Position pos, TeamId team)
{ {
return SpawnCreature(entry, pos.m_positionX, pos.m_positionY, pos.m_positionZ, pos.m_orientation, team); return SpawnCreature(entry, pos.m_positionX, pos.m_positionY, pos.m_positionZ, pos.m_orientation, team);
} }
Creature *Battlefield::SpawnCreature(uint32 entry, float x, float y, float z, float o, TeamId team) Creature* Battlefield::SpawnCreature(uint32 entry, float x, float y, float z, float o, TeamId team)
{ {
//Get map object //Get map object
Map* map = const_cast < Map * >(sMapMgr->CreateBaseMap(m_MapId)); Map* map = const_cast < Map * >(sMapMgr->CreateBaseMap(m_MapId));
if (!map) if (!map)
{ {
sLog->outError("Can't create creature entry: %u map not found", entry); sLog->outError("Battlefield::SpawnCreature: Can't create creature entry: %u map not found", entry);
return 0; return 0;
} }
//Create creature
Creature* creature = new Creature; Creature* creature = new Creature;
if (!creature->Create(sObjectMgr->GenerateLowGuid(HIGHGUID_UNIT), map, PHASEMASK_NORMAL, entry, 0, team, x, y, z, o)) if (!creature->Create(sObjectMgr->GenerateLowGuid(HIGHGUID_UNIT), map, PHASEMASK_NORMAL, entry, 0, team, x, y, z, o))
{ {
sLog->outError("Can't create creature entry: %u", entry); sLog->outError("Battlefield::SpawnCreature: Can't create creature entry: %u", entry);
delete creature; delete creature;
return NULL; return NULL;
} }
@@ -823,7 +815,7 @@ Creature *Battlefield::SpawnCreature(uint32 entry, float x, float y, float z, fl
CreatureTemplate const* cinfo = sObjectMgr->GetCreatureTemplate(entry); CreatureTemplate const* cinfo = sObjectMgr->GetCreatureTemplate(entry);
if (!cinfo) if (!cinfo)
{ {
sLog->outErrorDb("Battleground::AddCreature: entry %u does not exist.", entry); sLog->outErrorDb("Battlefield::SpawnCreature: entry %u does not exist.", entry);
return NULL; return NULL;
} }
// force using DB speeds -- do we really need this? // force using DB speeds -- do we really need this?
@@ -838,10 +830,10 @@ Creature *Battlefield::SpawnCreature(uint32 entry, float x, float y, float z, fl
} }
// Method for spawning gameobject on map // Method for spawning gameobject on map
GameObject *Battlefield::SpawnGameObject(uint32 entry, float x, float y, float z, float o) GameObject* Battlefield::SpawnGameObject(uint32 entry, float x, float y, float z, float o)
{ {
// Get map object // Get map object
Map* map = const_cast < Map * >(sMapMgr->CreateBaseMap(571)); Map* map = const_cast<Map*>(sMapMgr->CreateBaseMap(571)); // *vomits*
if (!map) if (!map)
return 0; return 0;
@@ -849,23 +841,24 @@ GameObject *Battlefield::SpawnGameObject(uint32 entry, float x, float y, float z
GameObject* go = new GameObject; GameObject* go = new GameObject;
if (!go->Create(sObjectMgr->GenerateLowGuid(HIGHGUID_GAMEOBJECT), entry, map, PHASEMASK_NORMAL, x, y, z, o, 0, 0, 0, 0, 100, GO_STATE_READY)) if (!go->Create(sObjectMgr->GenerateLowGuid(HIGHGUID_GAMEOBJECT), entry, map, PHASEMASK_NORMAL, x, y, z, o, 0, 0, 0, 0, 100, GO_STATE_READY))
{ {
sLog->outErrorDb("Gameobject template %u not found in database! Battleground not created!", entry); sLog->outErrorDb("Battlefield::SpawnGameObject: Gameobject template %u not found in database! Battlefield not created!", entry);
sLog->outError("Cannot create gameobject template %u! Battleground not created!", entry); sLog->outError("Battlefield::SpawnGameObject: Cannot create gameobject template %u! Battlefield not created!", entry);
delete go; delete go;
return NULL; return NULL;
} }
// Add in the world // Add to world
map->AddToMap(go); map->AddToMap(go);
go->setActive(true); go->setActive(true);
return go; return go;
} }
//***************************************************** // *******************************************************
//*******************CapturePoint********************** // ******************* CapturePoint **********************
//***************************************************** // *******************************************************
BfCapturePoint::BfCapturePoint(Battlefield *Bf):m_Bf(Bf), m_capturePoint(NULL) BfCapturePoint::BfCapturePoint(Battlefield* battlefield) : m_Bf(battlefield), m_capturePoint(NULL)
{ {
m_team = TEAM_NEUTRAL; m_team = TEAM_NEUTRAL;
m_value = 0; m_value = 0;
@@ -877,28 +870,28 @@ BfCapturePoint::BfCapturePoint(Battlefield *Bf):m_Bf(Bf), m_capturePoint(NULL)
m_maxSpeed = 0; m_maxSpeed = 0;
} }
bool BfCapturePoint::HandlePlayerEnter(Player *player) bool BfCapturePoint::HandlePlayerEnter(Player* player)
{ {
if (m_capturePoint) if (m_capturePoint)
{ {
player->SendUpdateWorldState(m_capturePoint->GetGOInfo()->capturePoint.worldState1, 1); player->SendUpdateWorldState(m_capturePoint->GetGOInfo()->capturePoint.worldState1, 1);
player->SendUpdateWorldState(m_capturePoint->GetGOInfo()->capturePoint.worldstate2, (uint32) ceil((m_value + m_maxValue) / (2 * m_maxValue) * 100.0f)); player->SendUpdateWorldState(m_capturePoint->GetGOInfo()->capturePoint.worldstate2, uint32(ceil((m_value + m_maxValue) / (2 * m_maxValue) * 100.0f)));
player->SendUpdateWorldState(m_capturePoint->GetGOInfo()->capturePoint.worldstate3, m_neutralValuePct); player->SendUpdateWorldState(m_capturePoint->GetGOInfo()->capturePoint.worldstate3, m_neutralValuePct);
} }
return m_activePlayers[player->GetTeamId()].insert(player->GetGUID()).second; return m_activePlayers[player->GetTeamId()].insert(player->GetGUID()).second;
} }
GuidSet::iterator BfCapturePoint::HandlePlayerLeave(Player* plr) GuidSet::iterator BfCapturePoint::HandlePlayerLeave(Player* player)
{ {
if (m_capturePoint) if (m_capturePoint)
plr->SendUpdateWorldState(m_capturePoint->GetGOInfo()->capturePoint.worldState1, 0); player->SendUpdateWorldState(m_capturePoint->GetGOInfo()->capturePoint.worldState1, 0);
GuidSet::iterator current = m_activePlayers[plr->GetTeamId()].find(plr->GetGUID()); GuidSet::iterator current = m_activePlayers[player->GetTeamId()].find(player->GetGUID());
if (current == m_activePlayers[plr->GetTeamId()].end()) if (current == m_activePlayers[player->GetTeamId()].end())
return current; // return end() return current; // return end()
m_activePlayers[plr->GetTeamId()].erase(current++); m_activePlayers[player->GetTeamId()].erase(current++);
return current; return current;
} }
@@ -974,10 +967,10 @@ bool BfCapturePoint::Update(uint32 diff)
{ {
for (GuidSet::iterator itr = m_activePlayers[team].begin(); itr != m_activePlayers[team].end();) for (GuidSet::iterator itr = m_activePlayers[team].begin(); itr != m_activePlayers[team].end();)
{ {
if (Player* plr = sObjectAccessor->FindPlayer(*itr)) if (Player* player = sObjectAccessor->FindPlayer(*itr))
{ {
if (!m_capturePoint->IsWithinDistInMap(plr, radius) || !plr->IsOutdoorPvPActive()) if (!m_capturePoint->IsWithinDistInMap(player, radius) || !player->IsOutdoorPvPActive())
itr = HandlePlayerLeave(plr); itr = HandlePlayerLeave(player);
else else
++itr; ++itr;
} }
@@ -1111,7 +1104,7 @@ void BfCapturePoint::SendObjectiveComplete(uint32 id, uint64 guid)
player->KilledMonsterCredit(id, guid); player->KilledMonsterCredit(id, guid);
} }
bool BfCapturePoint::IsInsideObjective(Player *player) const bool BfCapturePoint::IsInsideObjective(Player* player) const
{ {
return m_activePlayers[player->GetTeamId()].find(player->GetGUID()) != m_activePlayers[player->GetTeamId()].end(); return m_activePlayers[player->GetTeamId()].find(player->GetGUID()) != m_activePlayers[player->GetTeamId()].end();
} }
src/server/game/Battlefield/Battlefield.h
+130 -109
View File
@@ -68,94 +68,109 @@ class Creature;
class Unit; class Unit;
class Battlefield; class Battlefield;
class BfGraveYard; class BfGraveyard;
typedef std::set < uint64 > GuidSet; typedef std::set<uint64> GuidSet;
typedef std::vector < BfGraveYard * >GraveYardVect; typedef std::vector<BfGraveyard*> GraveyardVect;
typedef std::map < uint64, uint32 > PlayerTimerMap; typedef std::map<uint64, uint32> PlayerTimerMap;
class BfCapturePoint class BfCapturePoint
{ {
public: public:
BfCapturePoint(Battlefield * bf); BfCapturePoint(Battlefield* bf);
virtual void FillInitialWorldStates(WorldPacket & /*data */ ) {} virtual void FillInitialWorldStates(WorldPacket& /*data*/) {}
// send world state update to all players present // Send world state update to all players present
void SendUpdateWorldState(uint32 field, uint32 value); void SendUpdateWorldState(uint32 field, uint32 value);
// send kill notify to players in the controlling faction // Send kill notify to players in the controlling faction
void SendObjectiveComplete(uint32 id, uint64 guid); void SendObjectiveComplete(uint32 id, uint64 guid);
// used when player is activated/inactivated in the area // Used when player is activated/inactivated in the area
virtual bool HandlePlayerEnter(Player* player); virtual bool HandlePlayerEnter(Player* player);
virtual GuidSet::iterator HandlePlayerLeave(Player* player); virtual GuidSet::iterator HandlePlayerLeave(Player* player);
//virtual void HandlePlayerActivityChanged(Player * player); //virtual void HandlePlayerActivityChanged(Player* player);
// checks if player is in range of a capture credit marker // Checks if player is in range of a capture credit marker
bool IsInsideObjective(Player * player) const; bool IsInsideObjective(Player* player) const;
// returns true if the state of the objective has changed, in this case, the OutdoorPvP must send a world state ui update. // Returns true if the state of the objective has changed, in this case, the OutdoorPvP must send a world state ui update.
virtual bool Update(uint32 diff); virtual bool Update(uint32 diff);
virtual void ChangeTeam(TeamId /*oldTeam */ ) {} virtual void ChangeTeam(TeamId /*oldTeam*/) {}
virtual void SendChangePhase(); virtual void SendChangePhase();
bool SetCapturePointData(GameObject* capturePoint); bool SetCapturePointData(GameObject* capturePoint);
GameObject* GetCapturePointGo() { return m_capturePoint; } GameObject* GetCapturePointGo() { return m_capturePoint; }
TeamId GetTeamId() {return m_team;} TeamId GetTeamId() { return m_team; }
protected: protected:
bool DelCapturePoint(); bool DelCapturePoint();
// active players in the area of the objective, 0 - alliance, 1 - horde // active Players in the area of the objective, 0 - alliance, 1 - horde
GuidSet m_activePlayers[2]; GuidSet m_activePlayers[2];
// total shift needed to capture the objective // Total shift needed to capture the objective
float m_maxValue; float m_maxValue;
float m_minValue; float m_minValue;
// maximum speed of capture // Maximum speed of capture
float m_maxSpeed; float m_maxSpeed;
// the status of the objective // The status of the objective
float m_value; float m_value;
TeamId m_team; TeamId m_team;
// objective states // Objective states
BattlefieldObjectiveStates m_OldState; BattlefieldObjectiveStates m_OldState;
BattlefieldObjectiveStates m_State; BattlefieldObjectiveStates m_State;
// neutral value on capture bar // Neutral value on capture bar
uint32 m_neutralValuePct; uint32 m_neutralValuePct;
// pointer to the Battlefield this objective belongs to // Pointer to the Battlefield this objective belongs to
Battlefield *m_Bf; Battlefield* m_Bf;
// Capture point entry
uint32 m_capturePointEntry; uint32 m_capturePointEntry;
GameObject *m_capturePoint;
// Gameobject related to that capture point
GameObject* m_capturePoint;
}; };
class BfGraveYard class BfGraveyard
{ {
public: public:
BfGraveYard(Battlefield *Bf); BfGraveyard(Battlefield* Bf);
// method for change who control the graveyard // Method to changing who controls the graveyard
void ChangeControl(TeamId team); void GiveControlTo(TeamId team);
TeamId GetControlTeamId() { return m_ControlTeam; } TeamId GetControlTeamId() { return m_ControlTeam; }
// use for found the nearest graveyard // Find the nearest graveyard to a player
float GetDistance(Player * player); float GetDistance(Player* player);
// Initialize the graveyard
void Initialize(TeamId startcontrol, uint32 gy); void Initialize(TeamId startcontrol, uint32 gy);
// Set spirit service for the graveyard
void SetSpirit(Creature* spirit, TeamId team); void SetSpirit(Creature* spirit, TeamId team);
// Add a player to the graveyard
void AddPlayer(uint64 player_guid); void AddPlayer(uint64 player_guid);
// Remove a player from the graveyard
void RemovePlayer(uint64 player_guid); void RemovePlayer(uint64 player_guid);
// Resurrect players
void Resurrect(); void Resurrect();
// Move players waiting to that graveyard on the nearest one
void RelocateDeadPlayers(); void RelocateDeadPlayers();
// Check if this graveyard has a spirit guide
bool HasNpc(uint64 guid) bool HasNpc(uint64 guid)
{ {
// npcs could not be loaded in the map yet.
if (!m_SpiritGuide[0] || !m_SpiritGuide[1]) if (!m_SpiritGuide[0] || !m_SpiritGuide[1])
return false; return false;
@@ -165,16 +180,19 @@ public:
return (m_SpiritGuide[0] == guid || m_SpiritGuide[1] == guid); return (m_SpiritGuide[0] == guid || m_SpiritGuide[1] == guid);
} }
// Check if a player is in this graveyard's ressurect queue
bool HasPlayer(uint64 guid) { return m_ResurrectQueue.find(guid) != m_ResurrectQueue.end(); } bool HasPlayer(uint64 guid) { return m_ResurrectQueue.find(guid) != m_ResurrectQueue.end(); }
uint32 GetGraveYardId() { return m_GraveyardId; }
protected: // Get the graveyard's ID.
uint32 GetGraveyardId() { return m_GraveyardId; }
protected:
TeamId m_ControlTeam; TeamId m_ControlTeam;
uint32 m_GraveyardId; uint32 m_GraveyardId;
uint64 m_SpiritGuide[2]; uint64 m_SpiritGuide[2];
GuidSet m_ResurrectQueue; GuidSet m_ResurrectQueue;
Battlefield *m_Bf; Battlefield* m_Bf;
}; };
class Battlefield : public ZoneScript class Battlefield : public ZoneScript
@@ -188,35 +206,35 @@ class Battlefield : public ZoneScript
virtual ~Battlefield(); virtual ~Battlefield();
/// typedef of map witch store capturepoint and the associate gameobject entry /// typedef of map witch store capturepoint and the associate gameobject entry
typedef std::map < uint32 /*lowguid */ , BfCapturePoint * >BfCapturePointMap; typedef std::map<uint32 /*lowguid */, BfCapturePoint*> BfCapturePointMap;
/// Call this to init the Battlefield /// Call this to init the Battlefield
virtual bool SetupBattlefield() { return true; } virtual bool SetupBattlefield() { return true; }
/// Generate packet which contain all worldstatedata of area /// Generate packet which contain all worldstatedata of area
virtual void FillInitialWorldStates(WorldPacket & /*data */ ) {} virtual void FillInitialWorldStates(WorldPacket& /*data*/) {}
/// Update data of a worldstate to all players present in zone /// Update data of a worldstate to all players present in zone
void SendUpdateWorldState(uint32 field, uint32 value); void SendUpdateWorldState(uint32 field, uint32 value);
/** /**
* \brief Called every time for update bf data and time * \brief Called every time for update bf data and time
* -Update timer for start/end battle * - Update timer for start/end battle
* -Invite player in zone to queue x minutes before start (x = m_StartGroupingTimer) * - Invite player in zone to queue m_StartGroupingTimer minutes before start
* -Kick Afk players * - Kick Afk players
* \param diff : time ellapsed since last call (in ms) * \param diff : time ellapsed since last call (in ms)
*/ */
virtual bool Update(uint32 diff); virtual bool Update(uint32 diff);
/// Invite all player in zone, to join the queue, called x minutes before battle start in Update() /// Invite all players in zone to join the queue, called x minutes before battle start in Update()
void InvitePlayerInZoneToQueue(); void InvitePlayersInZoneToQueue();
/// Invite all player in queue to join battle on battle start /// Invite all players in queue to join battle on battle start
void InvitePlayerInQueueToWar(); void InvitePlayersInQueueToWar();
/// Invite all player in zone to join battle on battle start /// Invite all players in zone to join battle on battle start
void InvitePlayerInZoneToWar(); void InvitePlayersInZoneToWar();
/// Called when a Unit is kill in battlefield zone /// Called when a Unit is kill in battlefield zone
virtual void HandleKill(Player * /*killer */ , Unit * /*killed */ ) {}; virtual void HandleKill(Player* /*killer*/, Unit* /*killed*/) {};
uint32 GetTypeId() { return m_TypeId; } uint32 GetTypeId() { return m_TypeId; }
uint32 GetZoneId() { return m_ZoneId; } uint32 GetZoneId() { return m_ZoneId; }
@@ -224,35 +242,37 @@ class Battlefield : public ZoneScript
void TeamApplyBuff(TeamId team, uint32 spellId, uint32 spellId2 = 0); void TeamApplyBuff(TeamId team, uint32 spellId, uint32 spellId2 = 0);
/// Return true if battle is start, false if battle is not started /// Return true if battle is start, false if battle is not started
bool IsWarTime() { return m_BattlefieldActive; } bool IsWarTime() { return m_isActive; }
/// Enable or Disable battlefield /// Enable or Disable battlefield
void SetEnable(bool enable) { m_enable = enable; } void ToggleBattlefield(bool enable) { m_IsEnabled = enable; }
/// Return if battlefield is enable /// Return if battlefield is enable
bool GetEnable() { return m_enable; } bool IsEnabled() { return m_IsEnabled; }
/** /**
* \brief Kick player from battlefield and teleport him to kick-point location * \brief Kick player from battlefield and teleport him to kick-point location
* \param guid : guid of player who must be kick * \param guid : guid of player who must be kick
*/ */
void KickPlayerFromBf(uint64 guid); void KickPlayerFromBattlefield(uint64 guid);
/// Called when player (player) enter in zone /// Called when player (player) enter in zone
void HandlePlayerEnterZone(Player * player, uint32 zone); void HandlePlayerEnterZone(Player* player, uint32 zone);
/// Called when player (player) leave the zone /// Called when player (player) leave the zone
void HandlePlayerLeaveZone(Player * player, uint32 zone); void HandlePlayerLeaveZone(Player* player, uint32 zone);
// All-purpose data storage 64 bit // All-purpose data storage 64 bit
virtual uint64 GetData64(uint32 DataId) { return m_Data64[DataId]; } virtual uint64 GetData64(uint32 dataId) { return m_Data64[dataId]; }
virtual void SetData64(uint32 DataId, uint64 Value) { m_Data64[DataId] = Value; } virtual void SetData64(uint32 dataId, uint64 value) { m_Data64[dataId] = value; }
// All-purpose data storage 32 bit // All-purpose data storage 32 bit
virtual uint32 GetData(uint32 DataId) { return m_Data32[DataId]; } virtual uint32 GetData(uint32 dataId) { return m_Data32[dataId]; }
virtual void SetData(uint32 DataId, uint32 Value) { m_Data32[DataId] = Value; } virtual void SetData(uint32 dataId, uint32 value) { m_Data32[dataId] = value; }
virtual void UpdateData(uint32 index, int32 pad) { m_Data32[index] += pad; }
// Battlefield - generic methods // Battlefield - generic methods
TeamId GetDefenderTeam() { return m_DefenderTeam; } TeamId GetDefenderTeam() { return m_DefenderTeam; }
TeamId GetAttackerTeam() { return TeamId(1 - m_DefenderTeam); } TeamId GetAttackerTeam() { return TeamId(1 - m_DefenderTeam); }
TeamId GetOtherTeam(TeamId team) { return (team == TEAM_HORDE ? TEAM_ALLIANCE : TEAM_HORDE); }
void SetDefenderTeam(TeamId team) { m_DefenderTeam = team; } void SetDefenderTeam(TeamId team) { m_DefenderTeam = team; }
// Group methods // Group methods
@@ -260,98 +280,99 @@ class Battlefield : public ZoneScript
* \brief Find a not full battlefield group, if there is no, create one * \brief Find a not full battlefield group, if there is no, create one
* \param TeamId : Id of player team for who we search a group (player->GetTeamId()) * \param TeamId : Id of player team for who we search a group (player->GetTeamId())
*/ */
Group *GetFreeBfRaid(TeamId TeamId); Group* GetFreeBfRaid(TeamId TeamId);
/// Return battlefield group where player is. /// Return battlefield group where player is.
Group *GetGroupPlayer(uint64 guid, TeamId TeamId); Group* GetGroupPlayer(uint64 guid, TeamId TeamId);
/// Force player to join a battlefield group /// Force player to join a battlefield group
bool AddOrSetPlayerToCorrectBfGroup(Player * player); bool AddOrSetPlayerToCorrectBfGroup(Player* player);
// Graveyard methods // Graveyard methods
// Find which graveyard the player must be teleported to to be resurrected by spiritguide // Find which graveyard the player must be teleported to to be resurrected by spiritguide
WorldSafeLocsEntry const *GetClosestGraveYard(Player * player); WorldSafeLocsEntry const * GetClosestGraveYard(Player* player);
virtual void AddPlayerToResurrectQueue(uint64 npc_guid, uint64 player_guid); virtual void AddPlayerToResurrectQueue(uint64 npc_guid, uint64 player_guid);
void RemovePlayerFromResurrectQueue(uint64 player_guid); void RemovePlayerFromResurrectQueue(uint64 player_guid);
void SetGraveyardNumber(uint32 number) { m_GraveYardList.resize(number); } void SetGraveyardNumber(uint32 number) { m_GraveyardList.resize(number); }
BfGraveYard *GetGraveYardById(uint32 id); BfGraveyard* GetGraveyardById(uint32 id);
// Misc methods // Misc methods
Creature *SpawnCreature(uint32 entry, float x, float y, float z, float o, TeamId team); Creature* SpawnCreature(uint32 entry, float x, float y, float z, float o, TeamId team);
Creature *SpawnCreature(uint32 entry, Position pos, TeamId team); Creature* SpawnCreature(uint32 entry, Position pos, TeamId team);
GameObject *SpawnGameObject(uint32 entry, float x, float y, float z, float o); GameObject* SpawnGameObject(uint32 entry, float x, float y, float z, float o);
// Script-methods // Script-methods
/// Called on start /// Called on start
virtual void OnBattleStart() {}; virtual void OnBattleStart() {};
/// Called at the end of battle /// Called at the end of battle
virtual void OnBattleEnd(bool /*endbytimer */ ) {}; virtual void OnBattleEnd(bool /*endByTimer*/) {};
/// Called x minutes before battle start when player in zone are invite to join queue /// Called x minutes before battle start when player in zone are invite to join queue
virtual void OnStartGrouping() {}; virtual void OnStartGrouping() {};
/// Called when a player accept to join the battle /// Called when a player accept to join the battle
virtual void OnPlayerJoinWar(Player * /*player */ ) {}; virtual void OnPlayerJoinWar(Player* /*player*/) {};
/// Called when a player leave the battle /// Called when a player leave the battle
virtual void OnPlayerLeaveWar(Player * /*player */ ) {}; virtual void OnPlayerLeaveWar(Player* /*player*/) {};
/// Called when a player leave battlefield zone /// Called when a player leave battlefield zone
virtual void OnPlayerLeaveZone(Player * /*player */ ) {}; virtual void OnPlayerLeaveZone(Player* /*player*/) {};
/// Called when a player enter in battlefield zone /// Called when a player enter in battlefield zone
virtual void OnPlayerEnterZone(Player * /*player */ ) {}; virtual void OnPlayerEnterZone(Player* /*player*/) {};
WorldPacket BuildWarningAnnPacket(std::string msg); WorldPacket BuildWarningAnnPacket(std::string msg);
void SendWarningToAllInZone(uint32 entry); void SendWarningToAllInZone(uint32 entry);
//void SendWarningToAllInWar(int32 entry, ...); -- UNUSED //void SendWarningToAllInWar(int32 entry, ...); -- UNUSED
void SendWarningToPlayer(Player * player, uint32 entry); void SendWarningToPlayer(Player* player, uint32 entry);
void PlayerAcceptInviteToQueue(Player * player); void PlayerAcceptInviteToQueue(Player* player);
void PlayerAcceptInviteToWar(Player * player); void PlayerAcceptInviteToWar(Player* player);
uint32 GetBattleId() { return m_BattleId; } uint32 GetBattleId() { return m_BattleId; }
void AskToLeaveQueue(Player * player); void AskToLeaveQueue(Player* player);
virtual void DoCompleteOrIncrementAchievement(uint32 /*achievement */ , Player * /*player */ , uint8 /*incrementNumber = 1 */ ) {}; virtual void DoCompleteOrIncrementAchievement(uint32 /*achievement*/, Player* /*player*/, uint8 /*incrementNumber = 1*/) {};
/// Send all worldstate data to all player in zone. /// Send all worldstate data to all player in zone.
virtual void SendInitWorldStatesToAll() {}; virtual void SendInitWorldStatesToAll() {};
/// Return if we can use mount in battlefield /// Return if we can use mount in battlefield
bool CanFlyIn() { return !m_BattlefieldActive; } // Used for check if we can use flying mount or not bool CanFlyIn() { return !m_isActive; }
void SendAreaSpiritHealerQueryOpcode(Player * pl, const uint64 & guid);
void SendAreaSpiritHealerQueryOpcode(Player* player, const uint64 & guid);
void StartBattle(); void StartBattle();
void EndBattle(bool endbytimer); void EndBattle(bool endByTimer);
void HideNpc(Creature * p_Creature); void HideNpc(Creature* creature);
void ShowNpc(Creature * p_Creature, bool p_Aggressive); void ShowNpc(Creature* creature, bool aggressive);
GraveYardVect GetGraveYardVect() { return m_GraveYardList; } GraveyardVect GetGraveyardVector() { return m_GraveyardList; }
uint32 GetTimer() { return m_Timer; } uint32 GetTimer() { return m_Timer; }
void SetTimer(uint32 timer) { m_Timer = timer; } void SetTimer(uint32 timer) { m_Timer = timer; }
void PlaySoundToAll(uint32 SoundID); void DoPlaySoundToAll(uint32 SoundID);
void InvitePlayerToQueue(Player * player); void InvitePlayerToQueue(Player* player);
void InvitePlayerToWar(Player * player); void InvitePlayerToWar(Player* player);
void InitStalker(uint32 entry, float x, float y, float z, float o); void InitStalker(uint32 entry, float x, float y, float z, float o);
protected: protected:
uint64 StalkerGuid; uint64 StalkerGuid;
uint32 m_Timer; // Global timer for event uint32 m_Timer; // Global timer for event
bool m_enable; bool m_IsEnabled;
bool m_BattlefieldActive; bool m_isActive;
TeamId m_DefenderTeam; TeamId m_DefenderTeam;
// the map of the objectives belonging to this outdoorpvp // Map of the objectives belonging to this OutdoorPvP
BfCapturePointMap m_capturePoints; BfCapturePointMap m_capturePoints;
// the set of player // Players info maps
GuidSet m_players[BG_TEAMS_COUNT]; // Players in zone GuidSet m_players[BG_TEAMS_COUNT]; // Players in zone
GuidSet m_PlayersInQueue[BG_TEAMS_COUNT]; // Players in the queue GuidSet m_PlayersInQueue[BG_TEAMS_COUNT]; // Players in the queue
GuidSet m_PlayersInWar[BG_TEAMS_COUNT]; // Players in WG combat GuidSet m_PlayersInWar[BG_TEAMS_COUNT]; // Players in WG combat
PlayerTimerMap m_InvitedPlayers[BG_TEAMS_COUNT]; PlayerTimerMap m_InvitedPlayers[BG_TEAMS_COUNT];
PlayerTimerMap m_PlayersWillBeKick[BG_TEAMS_COUNT]; PlayerTimerMap m_PlayersWillBeKick[BG_TEAMS_COUNT];
//Variables that must exist for each battlefield // Variables that must exist for each battlefield
uint32 m_TypeId; // See enum BattlefieldTypes uint32 m_TypeId; // See enum BattlefieldTypes
uint32 m_BattleId; // BattleID (for packet) uint32 m_BattleId; // BattleID (for packet)
uint32 m_ZoneId; // ZoneID of Wintergrasp = 4197 uint32 m_ZoneId; // ZoneID of Wintergrasp = 4197
@@ -364,12 +385,12 @@ protected:
uint32 m_RestartAfterCrash; // Delay to restart Wintergrasp if the server crashed during a running battle. uint32 m_RestartAfterCrash; // Delay to restart Wintergrasp if the server crashed during a running battle.
uint32 m_TimeForAcceptInvite; uint32 m_TimeForAcceptInvite;
uint32 m_uiKickDontAcceptTimer; uint32 m_uiKickDontAcceptTimer;
WorldLocation KickPosition; // Position where player is teleport if they switch to afk during battle or if they dont accept invitation WorldLocation KickPosition; // Position where players are teleported if they switch to afk during the battle or if they don't accept invitation
uint32 m_uiKickAfkTimer; // Timer for check Afk in war uint32 m_uiKickAfkPlayersTimer; // Timer for check Afk in war
//Graveyard variables // Graveyard variables
GraveYardVect m_GraveYardList; // Vector witch contain the different GY of the battle GraveyardVect m_GraveyardList; // Vector witch contain the different GY of the battle
uint32 m_LastResurectTimer; // Timer for resurect player every 30 sec uint32 m_LastResurectTimer; // Timer for resurect player every 30 sec
uint32 m_StartGroupingTimer; // Timer for invite players in area 15 minute before start battle uint32 m_StartGroupingTimer; // Timer for invite players in area 15 minute before start battle
@@ -377,22 +398,23 @@ protected:
GuidSet m_Groups[BG_TEAMS_COUNT]; // Contain different raid group GuidSet m_Groups[BG_TEAMS_COUNT]; // Contain different raid group
std::vector < uint64 > m_Data64; std::vector<uint64> m_Data64;
std::vector < uint32 > m_Data32; std::vector<uint32> m_Data32;
void KickAfkPlayers();
void KickAfk();
// use for switch off all worldstate for client // use for switch off all worldstate for client
virtual void SendRemoveWorldStates(Player * /*player */ ) {} virtual void SendRemoveWorldStates(Player* /*player*/) {}
// use for send a packet for all player list // use for send a packet for all player list
void BroadcastPacketZone(WorldPacket & data) const; void BroadcastPacketToZone(WorldPacket& data) const;
void BroadcastPacketQueue(WorldPacket & data) const; void BroadcastPacketToQueue(WorldPacket& data) const;
void BroadcastPacketWar(WorldPacket & data) const; void BroadcastPacketToWar(WorldPacket& data) const;
//CapturePoint system // CapturePoint system
void AddCapturePoint(BfCapturePoint * cp) { m_capturePoints[cp->GetCapturePointGo()->GetEntry()] = cp; } void AddCapturePoint(BfCapturePoint* cp) { m_capturePoints[cp->GetCapturePointGo()->GetEntry()] = cp; }
BfCapturePoint *GetCapturePoint(uint32 lowguid) const BfCapturePoint* GetCapturePoint(uint32 lowguid) const
{ {
Battlefield::BfCapturePointMap::const_iterator itr = m_capturePoints.find(lowguid); Battlefield::BfCapturePointMap::const_iterator itr = m_capturePoints.find(lowguid);
if (itr != m_capturePoints.end()) if (itr != m_capturePoints.end())
@@ -401,9 +423,8 @@ protected:
} }
void RegisterZone(uint32 zoneid); void RegisterZone(uint32 zoneid);
bool HasPlayer(Player * player) const; bool HasPlayer(Player* player) const;
void TeamCastSpell(TeamId team, int32 spellId); void TeamCastSpell(TeamId team, int32 spellId);
}; };
#endif #endif
src/server/game/Battlefield/BattlefieldHandler.cpp
+2 -2
View File
@@ -60,7 +60,7 @@ void WorldSession::SendBfInvitePlayerToQueue(uint32 BattleId)
//Param2:(ZoneId) the zone where the battle is (4197 for wg) //Param2:(ZoneId) the zone where the battle is (4197 for wg)
//Param3:(CanQueue) if able to queue //Param3:(CanQueue) if able to queue
//Param4:(Full) on log in is full //Param4:(Full) on log in is full
void WorldSession::SendBfQueueInviteResponce(uint32 BattleId,uint32 ZoneId, bool CanQueue, bool Full) void WorldSession::SendBfQueueInviteResponse(uint32 BattleId,uint32 ZoneId, bool CanQueue, bool Full)
{ {
WorldPacket data(SMSG_BATTLEFIELD_MGR_QUEUE_REQUEST_RESPONSE, 11); WorldPacket data(SMSG_BATTLEFIELD_MGR_QUEUE_REQUEST_RESPONSE, 11);
data << uint32(BattleId); data << uint32(BattleId);
@@ -132,7 +132,7 @@ void WorldSession::HandleBfEntryInviteResponse(WorldPacket & recv_data)
else else
{ {
if (_player->GetZoneId() == Bf->GetZoneId()) if (_player->GetZoneId() == Bf->GetZoneId())
Bf->KickPlayerFromBf(_player->GetGUID()); Bf->KickPlayerFromBattlefield(_player->GetGUID());
} }
} }
src/server/game/Battlefield/BattlefieldMgr.cpp
+4 -5
View File
@@ -77,10 +77,9 @@ void BattlefieldMgr::HandlePlayerEnterZone(Player * player, uint32 zoneid)
if (itr == m_BattlefieldMap.end()) if (itr == m_BattlefieldMap.end())
return; return;
if (itr->second->HasPlayer(player)) if (itr->second->HasPlayer(player) || !itr->second->IsEnabled())
return;
if (itr->second->GetEnable() == false)
return; return;
itr->second->HandlePlayerEnterZone(player, zoneid); itr->second->HandlePlayerEnterZone(player, zoneid);
sLog->outDebug(LOG_FILTER_BATTLEFIELD, "Player %u entered outdoorpvp id %u", player->GetGUIDLow(), itr->second->GetTypeId()); sLog->outDebug(LOG_FILTER_BATTLEFIELD, "Player %u entered outdoorpvp id %u", player->GetGUIDLow(), itr->second->GetTypeId());
} }
@@ -106,7 +105,7 @@ Battlefield *BattlefieldMgr::GetBattlefieldToZoneId(uint32 zoneid)
// no handle for this zone, return // no handle for this zone, return
return NULL; return NULL;
} }
if (itr->second->GetEnable() == false) if (!itr->second->IsEnabled())
return NULL; return NULL;
return itr->second; return itr->second;
} }
@@ -127,7 +126,7 @@ void BattlefieldMgr::Update(uint32 diff)
if (m_UpdateTimer > BATTLEFIELD_OBJECTIVE_UPDATE_INTERVAL) if (m_UpdateTimer > BATTLEFIELD_OBJECTIVE_UPDATE_INTERVAL)
{ {
for (BattlefieldSet::iterator itr = m_BattlefieldSet.begin(); itr != m_BattlefieldSet.end(); ++itr) for (BattlefieldSet::iterator itr = m_BattlefieldSet.begin(); itr != m_BattlefieldSet.end(); ++itr)
if ((*itr)->GetEnable()) if ((*itr)->IsEnabled())
(*itr)->Update(m_UpdateTimer); (*itr)->Update(m_UpdateTimer);
m_UpdateTimer = 0; m_UpdateTimer = 0;
} }
src/server/game/Battlefield/Zones/BattlefieldWG.cpp
+184 -277
View File
@@ -25,7 +25,7 @@
#include "SpellAuras.h" #include "SpellAuras.h"
#include "Vehicle.h" #include "Vehicle.h"
enum WGBfData enum WintergrastData
{ {
BATTLEFIELD_WG_ZONEID = 4197, // Wintergrasp BATTLEFIELD_WG_ZONEID = 4197, // Wintergrasp
BATTLEFIELD_WG_MAPID = 571, // Northrend BATTLEFIELD_WG_MAPID = 571, // Northrend
@@ -49,7 +49,7 @@ bool BattlefieldWG::SetupBattlefield()
m_MapId = BATTLEFIELD_WG_MAPID; m_MapId = BATTLEFIELD_WG_MAPID;
m_MaxPlayer = sWorld->getIntConfig(CONFIG_WINTERGRASP_PLR_MAX); m_MaxPlayer = sWorld->getIntConfig(CONFIG_WINTERGRASP_PLR_MAX);
m_enable = sWorld->getBoolConfig(CONFIG_WINTERGRASP_ENABLE); m_IsEnabled = sWorld->getBoolConfig(CONFIG_WINTERGRASP_ENABLE);
m_MinPlayer = sWorld->getIntConfig(CONFIG_WINTERGRASP_PLR_MIN); m_MinPlayer = sWorld->getIntConfig(CONFIG_WINTERGRASP_PLR_MIN);
m_MinLevel = sWorld->getIntConfig(CONFIG_WINTERGRASP_PLR_MIN_LVL); m_MinLevel = sWorld->getIntConfig(CONFIG_WINTERGRASP_PLR_MIN_LVL);
m_BattleTime = sWorld->getIntConfig(CONFIG_WINTERGRASP_BATTLETIME) * MINUTE * IN_MILLISECONDS; m_BattleTime = sWorld->getIntConfig(CONFIG_WINTERGRASP_BATTLETIME) * MINUTE * IN_MILLISECONDS;
@@ -72,39 +72,39 @@ bool BattlefieldWG::SetupBattlefield()
m_saveTimer = 60000; m_saveTimer = 60000;
// Init GraveYards // Init GraveYards
SetGraveyardNumber(BATTLEFIELD_WG_GY_MAX); SetGraveyardNumber(BATTLEFIELD_WG_GRAVEYARD_MAX);
// Load from db // Load from db
if ((sWorld->getWorldState(BATTLEFIELD_WG_WORLD_STATE_ACTIVE) == 0) && (sWorld->getWorldState(BATTLEFIELD_WG_WORLD_STATE_DEFENDER) == 0) if ((sWorld->getWorldState(BATTLEFIELD_WG_WORLD_STATE_ACTIVE) == 0) && (sWorld->getWorldState(BATTLEFIELD_WG_WORLD_STATE_DEFENDER) == 0)
&& (sWorld->getWorldState(ClockWorldState[0]) == 0)) && (sWorld->getWorldState(ClockWorldState[0]) == 0))
{ {
sWorld->setWorldState(BATTLEFIELD_WG_WORLD_STATE_ACTIVE, false); sWorld->setWorldState(BATTLEFIELD_WG_WORLD_STATE_ACTIVE, uint64(false));
sWorld->setWorldState(BATTLEFIELD_WG_WORLD_STATE_DEFENDER, urand(0, 1)); sWorld->setWorldState(BATTLEFIELD_WG_WORLD_STATE_DEFENDER, uint64(urand(0, 1)));
sWorld->setWorldState(ClockWorldState[0], m_NoWarBattleTime); sWorld->setWorldState(ClockWorldState[0], uint64(m_NoWarBattleTime));
} }
m_BattlefieldActive = sWorld->getWorldState(BATTLEFIELD_WG_WORLD_STATE_ACTIVE); m_isActive = bool(sWorld->getWorldState(BATTLEFIELD_WG_WORLD_STATE_ACTIVE));
m_DefenderTeam = TeamId(sWorld->getWorldState(BATTLEFIELD_WG_WORLD_STATE_DEFENDER)); m_DefenderTeam = TeamId(sWorld->getWorldState(BATTLEFIELD_WG_WORLD_STATE_DEFENDER));
m_Timer = sWorld->getWorldState(ClockWorldState[0]); m_Timer = sWorld->getWorldState(ClockWorldState[0]);
if (m_BattlefieldActive) if (m_isActive)
{ {
m_BattlefieldActive = false; m_isActive = false;
m_Timer = m_RestartAfterCrash; m_Timer = m_RestartAfterCrash;
} }
for (uint8 i = 0; i < BATTLEFIELD_WG_GY_MAX; i++) for (uint8 i = 0; i < BATTLEFIELD_WG_GRAVEYARD_MAX; i++)
{ {
BfGraveYardWG *gy = new BfGraveYardWG(this); BfGraveyardWG* graveyard = new BfGraveyardWG(this);
// When between games, the graveyard is controlled by the defending team // When between games, the graveyard is controlled by the defending team
if (WGGraveYard[i].startcontrol == TEAM_NEUTRAL) if (WGGraveYard[i].startcontrol == TEAM_NEUTRAL)
gy->Initialize(m_DefenderTeam, WGGraveYard[i].gyid); graveyard->Initialize(m_DefenderTeam, WGGraveYard[i].gyid);
else else
gy->Initialize(WGGraveYard[i].startcontrol, WGGraveYard[i].gyid); graveyard->Initialize(WGGraveYard[i].startcontrol, WGGraveYard[i].gyid);
gy->SetTextId(WGGraveYard[i].textid); graveyard->SetTextId(WGGraveYard[i].textid);
m_GraveYardList[i] = gy; m_GraveyardList[i] = graveyard;
} }
@@ -113,61 +113,68 @@ bool BattlefieldWG::SetupBattlefield()
{ {
WGWorkshop* workshop = new WGWorkshop(this, i); WGWorkshop* workshop = new WGWorkshop(this, i);
if (i < BATTLEFIELD_WG_WORKSHOP_KEEP_WEST) if (i < BATTLEFIELD_WG_WORKSHOP_KEEP_WEST)
workshop->ChangeControl(GetAttackerTeam(), true); workshop->GiveControlTo(GetAttackerTeam(), true);
else else
workshop->ChangeControl(GetDefenderTeam(), true); workshop->GiveControlTo(GetDefenderTeam(), true);
//Note: Capture point is added once the gameobject is created.
// Note: Capture point is added once the gameobject is created.
WorkshopsList.insert(workshop); WorkshopsList.insert(workshop);
} }
// Spawning npc in keep // Spawn NPCs in the defender's keep, both Horde and Alliance
for (uint8 i = 0; i < WG_MAX_KEEP_NPC; i++) for (uint8 i = 0; i < WG_MAX_KEEP_NPC; i++)
{ {
// Horde npc // Horde npc
if (Creature* creature = SpawnCreature(WGKeepNPC[i].entryh, WGKeepNPC[i].x, WGKeepNPC[i].y, WGKeepNPC[i].z, WGKeepNPC[i].o, TEAM_HORDE)) if (Creature* creature = SpawnCreature(WGKeepNPC[i].entryHorde, WGKeepNPC[i].x, WGKeepNPC[i].y, WGKeepNPC[i].z, WGKeepNPC[i].o, TEAM_HORDE))
KeepCreature[TEAM_HORDE].insert(creature->GetGUID()); KeepCreature[TEAM_HORDE].insert(creature->GetGUID());
// Alliance npc // Alliance npc
if (Creature* creature = SpawnCreature(WGKeepNPC[i].entrya, WGKeepNPC[i].x, WGKeepNPC[i].y, WGKeepNPC[i].z, WGKeepNPC[i].o, TEAM_ALLIANCE)) if (Creature* creature = SpawnCreature(WGKeepNPC[i].entryAlliance, WGKeepNPC[i].x, WGKeepNPC[i].y, WGKeepNPC[i].z, WGKeepNPC[i].o, TEAM_ALLIANCE))
KeepCreature[TEAM_ALLIANCE].insert(creature->GetGUID()); KeepCreature[TEAM_ALLIANCE].insert(creature->GetGUID());
} }
// Hide keep npc
// Hide NPCs from the Attacker's team in the keep
for (GuidSet::const_iterator itr = KeepCreature[GetAttackerTeam()].begin(); itr != KeepCreature[GetAttackerTeam()].end(); ++itr) for (GuidSet::const_iterator itr = KeepCreature[GetAttackerTeam()].begin(); itr != KeepCreature[GetAttackerTeam()].end(); ++itr)
if (Unit* unit = sObjectAccessor->FindUnit(*itr)) if (Unit* unit = sObjectAccessor->FindUnit(*itr))
if (Creature* creature = unit->ToCreature()) if (Creature* creature = unit->ToCreature())
HideNpc(creature); HideNpc(creature);
// Spawn out of keep npc
// Horde npc // Spawn Horde NPCs outside the keep
for (uint8 i = 0; i < WG_OUTSIDE_ALLIANCE_NPC; i++) for (uint8 i = 0; i < WG_OUTSIDE_ALLIANCE_NPC; i++)
if (Creature* creature = SpawnCreature(WGOutsideNPC[i].entryh, WGOutsideNPC[i].x, WGOutsideNPC[i].y, WGOutsideNPC[i].z, WGOutsideNPC[i].o, TEAM_HORDE)) if (Creature* creature = SpawnCreature(WGOutsideNPC[i].entryHorde, WGOutsideNPC[i].x, WGOutsideNPC[i].y, WGOutsideNPC[i].z, WGOutsideNPC[i].o, TEAM_HORDE))
OutsideCreature[TEAM_HORDE].insert(creature->GetGUID()); OutsideCreature[TEAM_HORDE].insert(creature->GetGUID());
// Alliance npc
// Spawn Alliance NPCs outside the keep
for (uint8 i = WG_OUTSIDE_ALLIANCE_NPC; i < WG_MAX_OUTSIDE_NPC; i++) for (uint8 i = WG_OUTSIDE_ALLIANCE_NPC; i < WG_MAX_OUTSIDE_NPC; i++)
if (Creature* creature = SpawnCreature(WGOutsideNPC[i].entrya, WGOutsideNPC[i].x, WGOutsideNPC[i].y, WGOutsideNPC[i].z, WGOutsideNPC[i].o, TEAM_ALLIANCE)) if (Creature* creature = SpawnCreature(WGOutsideNPC[i].entryAlliance, WGOutsideNPC[i].x, WGOutsideNPC[i].y, WGOutsideNPC[i].z, WGOutsideNPC[i].o, TEAM_ALLIANCE))
OutsideCreature[TEAM_ALLIANCE].insert(creature->GetGUID()); OutsideCreature[TEAM_ALLIANCE].insert(creature->GetGUID());
// Hide outside npc
// Hide units outside the keep that are defenders
for (GuidSet::const_iterator itr = OutsideCreature[GetDefenderTeam()].begin(); itr != OutsideCreature[GetDefenderTeam()].end(); ++itr) for (GuidSet::const_iterator itr = OutsideCreature[GetDefenderTeam()].begin(); itr != OutsideCreature[GetDefenderTeam()].end(); ++itr)
if (Unit* unit = sObjectAccessor->FindUnit(*itr)) if (Unit* unit = sObjectAccessor->FindUnit(*itr))
if (Creature* creature = unit->ToCreature()) if (Creature* creature = unit->ToCreature())
HideNpc(creature); HideNpc(creature);
// Spawn turrets and hide them per default
for (uint8 i = 0; i < WG_MAX_TURRET; i++) for (uint8 i = 0; i < WG_MAX_TURRET; i++)
{ {
if (Creature* creature = SpawnCreature(28366, WGTurret[i].x, WGTurret[i].y, WGTurret[i].z, WGTurret[i].o, TeamId(0))) Position towerCannonPos;
WGTurret[i].GetPosition(&towerCannonPos);
if (Creature* creature = SpawnCreature(NPC_TOWER_CANNON, towerCannonPos, TEAM_ALLIANCE))
{ {
CanonList.insert(creature->GetGUID()); CanonList.insert(creature->GetGUID());
HideNpc(creature); HideNpc(creature);
} }
} }
// Spawning Buiding
// Spawn all gameobjects
for (uint8 i = 0; i < WG_MAX_OBJ; i++) for (uint8 i = 0; i < WG_MAX_OBJ; i++)
{ {
GameObject* go = GameObject* go = SpawnGameObject(WGGameObjectBuilding[i].entry, WGGameObjectBuilding[i].x, WGGameObjectBuilding[i].y, WGGameObjectBuilding[i].z, WGGameObjectBuilding[i].o);
SpawnGameObject(WGGameObjectBuillding[i].entry, WGGameObjectBuillding[i].x, WGGameObjectBuillding[i].y, WGGameObjectBuillding[i].z, WGGameObjectBuillding[i].o); BfWGGameObjectBuilding* b = new BfWGGameObjectBuilding(this);
BfWGGameObjectBuilding *b = new BfWGGameObjectBuilding(this); b->Init(go, WGGameObjectBuilding[i].type, WGGameObjectBuilding[i].WorldState, WGGameObjectBuilding[i].nameId);
b->Init(go, WGGameObjectBuillding[i].type, WGGameObjectBuillding[i].WorldState, WGGameObjectBuillding[i].nameid);
BuildingsInZone.insert(b); BuildingsInZone.insert(b);
} }
// Spawning portal defender // Spawning portal defender
for (uint8 i = 0; i < WG_MAX_TELEPORTER; i++) for (uint8 i = 0; i < WG_MAX_TELEPORTER; i++)
{ {
@@ -176,15 +183,15 @@ bool BattlefieldWG::SetupBattlefield()
go->SetUInt32Value(GAMEOBJECT_FACTION, WintergraspFaction[GetDefenderTeam()]); go->SetUInt32Value(GAMEOBJECT_FACTION, WintergraspFaction[GetDefenderTeam()]);
} }
// Spawn banner in keep // Spawn banners in the keep
for (uint8 i = 0; i < WG_KEEPGAMEOBJECT_MAX; i++) for (uint8 i = 0; i < WG_KEEPGAMEOBJECT_MAX; i++)
{ {
if (GameObject* go = SpawnGameObject(WGKeepGameObject[i].entryh, WGKeepGameObject[i].x, WGKeepGameObject[i].y, WGKeepGameObject[i].z, WGKeepGameObject[i].o)) if (GameObject* go = SpawnGameObject(WGKeepGameObject[i].entryHorde, WGKeepGameObject[i].x, WGKeepGameObject[i].y, WGKeepGameObject[i].z, WGKeepGameObject[i].o))
{ {
go->SetRespawnTime(GetDefenderTeam()? RESPAWN_ONE_DAY : RESPAWN_IMMEDIATELY); go->SetRespawnTime(GetDefenderTeam()? RESPAWN_ONE_DAY : RESPAWN_IMMEDIATELY);
m_KeepGameObject[1].insert(go); m_KeepGameObject[1].insert(go);
} }
if (GameObject* go = SpawnGameObject(WGKeepGameObject[i].entrya, WGKeepGameObject[i].x, WGKeepGameObject[i].y, WGKeepGameObject[i].z, WGKeepGameObject[i].o)) if (GameObject* go = SpawnGameObject(WGKeepGameObject[i].entryAlliance, WGKeepGameObject[i].x, WGKeepGameObject[i].y, WGKeepGameObject[i].z, WGKeepGameObject[i].o))
{ {
go->SetRespawnTime(GetDefenderTeam()? RESPAWN_IMMEDIATELY : RESPAWN_ONE_DAY); go->SetRespawnTime(GetDefenderTeam()? RESPAWN_IMMEDIATELY : RESPAWN_ONE_DAY);
m_KeepGameObject[0].insert(go); m_KeepGameObject[0].insert(go);
@@ -208,7 +215,7 @@ bool BattlefieldWG::Update(uint32 diff)
bool m_return = Battlefield::Update(diff); bool m_return = Battlefield::Update(diff);
if (m_saveTimer <= diff) if (m_saveTimer <= diff)
{ {
sWorld->setWorldState(BATTLEFIELD_WG_WORLD_STATE_ACTIVE, m_BattlefieldActive); sWorld->setWorldState(BATTLEFIELD_WG_WORLD_STATE_ACTIVE, m_isActive);
sWorld->setWorldState(BATTLEFIELD_WG_WORLD_STATE_DEFENDER, m_DefenderTeam); sWorld->setWorldState(BATTLEFIELD_WG_WORLD_STATE_DEFENDER, m_DefenderTeam);
sWorld->setWorldState(ClockWorldState[0], m_Timer); sWorld->setWorldState(ClockWorldState[0], m_Timer);
m_saveTimer = 60 * IN_MILLISECONDS; m_saveTimer = 60 * IN_MILLISECONDS;
@@ -222,13 +229,13 @@ bool BattlefieldWG::Update(uint32 diff)
void BattlefieldWG::OnBattleStart() void BattlefieldWG::OnBattleStart()
{ {
// Spawn titan relic // Spawn titan relic
m_relic = SpawnGameObject(BATTLEFIELD_WG_GAMEOBJECT_TITAN_RELIC, 5440.0f, 2840.8f, 430.43f, 0); m_titansRelic = SpawnGameObject(GO_WINTERGRASP_TITAN_S_RELIC, 5440.0f, 2840.8f, 430.43f, 0);
if (m_relic) if (m_titansRelic)
{ {
// Update faction of relic, only attacker can click on // Update faction of relic, only attacker can click on
m_relic->SetUInt32Value(GAMEOBJECT_FACTION, WintergraspFaction[GetAttackerTeam()]); m_titansRelic->SetUInt32Value(GAMEOBJECT_FACTION, WintergraspFaction[GetAttackerTeam()]);
// Set in use (not allow to click on before last door is broken) // Set in use (not allow to click on before last door is broken)
m_relic->SetFlag(GAMEOBJECT_FLAGS, GO_FLAG_IN_USE); m_titansRelic->SetFlag(GAMEOBJECT_FLAGS, GO_FLAG_IN_USE);
} }
else else
sLog->outError("WG: Failed to spawn titan relic."); sLog->outError("WG: Failed to spawn titan relic.");
@@ -257,17 +264,15 @@ void BattlefieldWG::OnBattleStart()
} }
} }
m_Data32[BATTLEFIELD_WG_DATA_BROKEN_TOWER_ATT] = 0; SetData(BATTLEFIELD_WG_DATA_BROKEN_TOWER_ATT, 0);
m_Data32[BATTLEFIELD_WG_DATA_BROKEN_TOWER_DEF] = 0; SetData(BATTLEFIELD_WG_DATA_BROKEN_TOWER_DEF, 0);
m_Data32[BATTLEFIELD_WG_DATA_DAMAGED_TOWER_ATT] = 0; SetData(BATTLEFIELD_WG_DATA_DAMAGED_TOWER_ATT, 0);
m_Data32[BATTLEFIELD_WG_DATA_DAMAGED_TOWER_DEF] = 0; SetData(BATTLEFIELD_WG_DATA_DAMAGED_TOWER_DEF, 0);
// Update graveyard (in no war time all graveyard is to deffender, in war time, depend of base) // Update graveyard (in no war time all graveyard is to deffender, in war time, depend of base)
for (Workshop::const_iterator itr = WorkshopsList.begin(); itr != WorkshopsList.end(); ++itr) for (Workshop::const_iterator itr = WorkshopsList.begin(); itr != WorkshopsList.end(); ++itr)
{
if (*itr) if (*itr)
(*itr)->UpdateGraveYardAndWorkshop(); (*itr)->UpdateGraveyardAndWorkshop();
}
for (uint8 team = 0; team < 2; ++team) for (uint8 team = 0; team < 2; ++team)
for (GuidSet::const_iterator itr = m_players[team].begin(); itr != m_players[team].end(); ++itr) for (GuidSet::const_iterator itr = m_players[team].begin(); itr != m_players[team].end(); ++itr)
@@ -292,32 +297,32 @@ void BattlefieldWG::UpdateCounterVehicle(bool init)
{ {
if (init) if (init)
{ {
m_Data32[BATTLEFIELD_WG_DATA_VEHICLE_H] = 0; SetData(BATTLEFIELD_WG_DATA_VEHICLE_H, 0);
m_Data32[BATTLEFIELD_WG_DATA_VEHICLE_A] = 0; SetData(BATTLEFIELD_WG_DATA_VEHICLE_A, 0);
} }
m_Data32[BATTLEFIELD_WG_DATA_MAX_VEHICLE_H] = 0; SetData(BATTLEFIELD_WG_DATA_MAX_VEHICLE_H, 0);
m_Data32[BATTLEFIELD_WG_DATA_MAX_VEHICLE_A] = 0; SetData(BATTLEFIELD_WG_DATA_MAX_VEHICLE_A, 0);
for (Workshop::const_iterator itr = WorkshopsList.begin(); itr != WorkshopsList.end(); ++itr) for (Workshop::const_iterator itr = WorkshopsList.begin(); itr != WorkshopsList.end(); ++itr)
{ {
if (WGWorkshop* workshop = (*itr)) if (WGWorkshop* workshop = (*itr))
{ {
if (workshop->teamControl == TEAM_ALLIANCE) if (workshop->teamControl == TEAM_ALLIANCE)
m_Data32[BATTLEFIELD_WG_DATA_MAX_VEHICLE_A] = m_Data32[BATTLEFIELD_WG_DATA_MAX_VEHICLE_A] + 4; UpdateData(BATTLEFIELD_WG_DATA_MAX_VEHICLE_A, 4);
else if (workshop->teamControl == TEAM_HORDE) else if (workshop->teamControl == TEAM_HORDE)
m_Data32[BATTLEFIELD_WG_DATA_MAX_VEHICLE_H] = m_Data32[BATTLEFIELD_WG_DATA_MAX_VEHICLE_H] + 4; UpdateData(BATTLEFIELD_WG_DATA_MAX_VEHICLE_H, 4);
} }
} }
UpdateVehicleCountWG(); UpdateVehicleCountWG();
} }
void BattlefieldWG::OnBattleEnd(bool endbytimer) void BattlefieldWG::OnBattleEnd(bool endByTimer)
{ {
// Remove relic // Remove relic
if (m_relic) if (m_titansRelic)
m_relic->RemoveFromWorld(); m_titansRelic->RemoveFromWorld();
m_relic = NULL; m_titansRelic = NULL;
// Remove turret // Remove turret
for (GuidSet::const_iterator itr = CanonList.begin(); itr != CanonList.end(); ++itr) for (GuidSet::const_iterator itr = CanonList.begin(); itr != CanonList.end(); ++itr)
@@ -326,52 +331,42 @@ void BattlefieldWG::OnBattleEnd(bool endbytimer)
{ {
if (Creature* creature = unit->ToCreature()) if (Creature* creature = unit->ToCreature())
{ {
if (!endbytimer) if (!endByTimer)
creature->setFaction(WintergraspFaction[GetDefenderTeam()]); creature->setFaction(WintergraspFaction[GetDefenderTeam()]);
HideNpc(creature); HideNpc(creature);
} }
} }
} }
// If endbytimer is false, battle is end by clicking on relic if (!endByTimer) // One player triggered the relic
if (!endbytimer)
{ {
// Change all npc in keep // Change all npc in keep
for (GuidSet::const_iterator itr = KeepCreature[GetAttackerTeam()].begin(); itr != KeepCreature[GetAttackerTeam()].end(); ++itr) for (GuidSet::const_iterator itr = KeepCreature[GetAttackerTeam()].begin(); itr != KeepCreature[GetAttackerTeam()].end(); ++itr)
{
if (Unit* unit = sObjectAccessor->FindUnit(*itr)) if (Unit* unit = sObjectAccessor->FindUnit(*itr))
if (Creature* creature = unit->ToCreature()) if (Creature* creature = unit->ToCreature())
HideNpc(creature); HideNpc(creature);
}
for (GuidSet::const_iterator itr = KeepCreature[GetDefenderTeam()].begin(); itr != KeepCreature[GetDefenderTeam()].end(); ++itr) for (GuidSet::const_iterator itr = KeepCreature[GetDefenderTeam()].begin(); itr != KeepCreature[GetDefenderTeam()].end(); ++itr)
{
if (Unit* unit = sObjectAccessor->FindUnit(*itr)) if (Unit* unit = sObjectAccessor->FindUnit(*itr))
if (Creature* creature = unit->ToCreature()) if (Creature* creature = unit->ToCreature())
ShowNpc(creature, true); ShowNpc(creature, true);
}
// Change all npc out of keep // Change all npc out of keep
for (GuidSet::const_iterator itr = OutsideCreature[GetDefenderTeam()].begin(); itr != OutsideCreature[GetDefenderTeam()].end(); ++itr) for (GuidSet::const_iterator itr = OutsideCreature[GetDefenderTeam()].begin(); itr != OutsideCreature[GetDefenderTeam()].end(); ++itr)
{
if (Unit* unit = sObjectAccessor->FindUnit(*itr)) if (Unit* unit = sObjectAccessor->FindUnit(*itr))
if (Creature* creature = unit->ToCreature()) if (Creature* creature = unit->ToCreature())
HideNpc(creature); HideNpc(creature);
}
for (GuidSet::const_iterator itr = OutsideCreature[GetAttackerTeam()].begin(); itr != OutsideCreature[GetAttackerTeam()].end(); ++itr) for (GuidSet::const_iterator itr = OutsideCreature[GetAttackerTeam()].begin(); itr != OutsideCreature[GetAttackerTeam()].end(); ++itr)
{
if (Unit* unit = sObjectAccessor->FindUnit(*itr)) if (Unit* unit = sObjectAccessor->FindUnit(*itr))
if (Creature* creature = unit->ToCreature()) if (Creature* creature = unit->ToCreature())
ShowNpc(creature, true); ShowNpc(creature, true);
} }
}
// Update all graveyard, control is to defender when no wartime // Update all graveyard, control is to defender when no wartime
for (uint8 i = 0; i < BATTLEFIELD_WG_GY_HORDE; i++) for (uint8 i = 0; i < BATTLEFIELD_WG_GY_HORDE; i++)
{ if (BfGraveyard* graveyard = GetGraveyardById(i))
if (GetGraveYardById(i)) graveyard->GiveControlTo(GetDefenderTeam());
{
GetGraveYardById(i)->ChangeControl(GetDefenderTeam());
}
}
for (GameObjectSet::const_iterator itr = m_KeepGameObject[GetDefenderTeam()].begin(); itr != m_KeepGameObject[GetDefenderTeam()].end(); ++itr) for (GameObjectSet::const_iterator itr = m_KeepGameObject[GetDefenderTeam()].begin(); itr != m_KeepGameObject[GetDefenderTeam()].end(); ++itr)
(*itr)->SetRespawnTime(RESPAWN_IMMEDIATELY); (*itr)->SetRespawnTime(RESPAWN_IMMEDIATELY);
@@ -389,58 +384,23 @@ void BattlefieldWG::OnBattleEnd(bool endbytimer)
for (Workshop::const_iterator itr = WorkshopsList.begin(); itr != WorkshopsList.end(); ++itr) for (Workshop::const_iterator itr = WorkshopsList.begin(); itr != WorkshopsList.end(); ++itr)
(*itr)->Save(); (*itr)->Save();
uint32 WinHonor = 0;
uint32 LossHonor = 0;
if (!endbytimer)
{
WinHonor = 3000 + 400 * m_Data32[BATTLEFIELD_WG_DATA_BROKEN_TOWER_DEF] + 100 * m_Data32[BATTLEFIELD_WG_DATA_DAMAGED_TOWER_DEF];
LossHonor = 1000 + 400 * m_Data32[BATTLEFIELD_WG_DATA_BROKEN_TOWER_ATT] + 100 * m_Data32[BATTLEFIELD_WG_DATA_DAMAGED_TOWER_ATT];
}
else
{
WinHonor = 3000 + 400 * m_Data32[BATTLEFIELD_WG_DATA_BROKEN_TOWER_ATT] + 100 * m_Data32[BATTLEFIELD_WG_DATA_DAMAGED_TOWER_ATT];
LossHonor = 1000 + 400 * m_Data32[BATTLEFIELD_WG_DATA_BROKEN_TOWER_DEF] + 100 * m_Data32[BATTLEFIELD_WG_DATA_DAMAGED_TOWER_DEF];
}
for (GuidSet::const_iterator itr = m_PlayersInWar[GetDefenderTeam()].begin(); itr != m_PlayersInWar[GetDefenderTeam()].end(); ++itr) for (GuidSet::const_iterator itr = m_PlayersInWar[GetDefenderTeam()].begin(); itr != m_PlayersInWar[GetDefenderTeam()].end(); ++itr)
{ {
if (Player* player = sObjectAccessor->FindPlayer(*itr)) if (Player* player = sObjectAccessor->FindPlayer(*itr))
{ {
player->AddAura(SPELL_ESSENCE_OF_WINTERGRASP, player); player->CastSpell(player, SPELL_ESSENCE_OF_WINTERGRASP, true);
if (player->HasAura(SPELL_LIEUTENANT)) player->CastSpell(player, SPELL_VICTORY_REWARD, true);
{
player->RewardHonor(NULL, 1, WinHonor);
RewardMarkOfHonor(player, 3);
}
else if (player->HasAura(SPELL_CORPORAL))
{
player->RewardHonor(NULL, 1, WinHonor);
RewardMarkOfHonor(player, 2);
}
// Send Wintergrasp victory achievement // Send Wintergrasp victory achievement
DoCompleteOrIncrementAchievement(ACHIEVEMENTS_WIN_WG, player); DoCompleteOrIncrementAchievement(ACHIEVEMENTS_WIN_WG, player);
// Award achievement for succeeding in Wintergrasp in 10 minutes or less // Award achievement for succeeding in Wintergrasp in 10 minutes or less
if (!endbytimer && GetTimer() <= 10000) if (!endByTimer && GetTimer() <= 10000)
DoCompleteOrIncrementAchievement(ACHIEVEMENTS_WIN_WG_TIMER_10, player); DoCompleteOrIncrementAchievement(ACHIEVEMENTS_WIN_WG_TIMER_10, player);
} }
} }
for (GuidSet::const_iterator itr = m_PlayersInWar[GetAttackerTeam()].begin(); itr != m_PlayersInWar[GetAttackerTeam()].end(); ++itr) for (GuidSet::const_iterator itr = m_PlayersInWar[GetAttackerTeam()].begin(); itr != m_PlayersInWar[GetAttackerTeam()].end(); ++itr)
{
if (Player* player = sObjectAccessor->FindPlayer(*itr)) if (Player* player = sObjectAccessor->FindPlayer(*itr))
{ player->CastSpell(player, SPELL_DEFEAT_REWARD, true);
if (player->HasAura(SPELL_LIEUTENANT))
{
player->RewardHonor(NULL, 1, LossHonor);
RewardMarkOfHonor(player, 1);
}
else if (player->HasAura(SPELL_CORPORAL))
{
player->RewardHonor(NULL, 1, LossHonor);
RewardMarkOfHonor(player, 1);
}
}
}
for (uint8 team = 0; team < 2; ++team) for (uint8 team = 0; team < 2; ++team)
{ {
@@ -451,16 +411,15 @@ void BattlefieldWG::OnBattleEnd(bool endbytimer)
m_PlayersInWar[team].clear(); m_PlayersInWar[team].clear();
for (GuidSet::const_iterator itr = m_vehicles[team].begin(); itr != m_vehicles[team].end(); ++itr) for (GuidSet::const_iterator itr = m_vehicles[team].begin(); itr != m_vehicles[team].end(); ++itr)
{
if (Unit* unit = sObjectAccessor->FindUnit(*itr)) if (Unit* unit = sObjectAccessor->FindUnit(*itr))
if (Creature* creature = unit->ToCreature()) if (Creature* creature = unit->ToCreature())
if (creature->IsVehicle()) if (creature->IsVehicle())
creature->GetVehicleKit()->Dismiss(); creature->GetVehicleKit()->Dismiss();
}
m_vehicles[team].clear(); m_vehicles[team].clear();
} }
if (!endbytimer) if (!endByTimer)
{ {
for (uint8 team = 0; team < 2; ++team) for (uint8 team = 0; team < 2; ++team)
{ {
@@ -475,22 +434,21 @@ void BattlefieldWG::OnBattleEnd(bool endbytimer)
} }
} }
if (!endbytimer) if (!endByTimer) // win alli/horde
{ // win alli/horde
SendWarningToAllInZone((GetDefenderTeam() == TEAM_ALLIANCE) ? BATTLEFIELD_WG_TEXT_WIN_KEEP : BATTLEFIELD_WG_TEXT_WIN_KEEP + 1); SendWarningToAllInZone((GetDefenderTeam() == TEAM_ALLIANCE) ? BATTLEFIELD_WG_TEXT_WIN_KEEP : BATTLEFIELD_WG_TEXT_WIN_KEEP + 1);
} else // defend alli/horde
else
{ // defend alli/horde
SendWarningToAllInZone((GetDefenderTeam() == TEAM_ALLIANCE) ? BATTLEFIELD_WG_TEXT_DEFEND_KEEP : BATTLEFIELD_WG_TEXT_DEFEND_KEEP + 1); SendWarningToAllInZone((GetDefenderTeam() == TEAM_ALLIANCE) ? BATTLEFIELD_WG_TEXT_DEFEND_KEEP : BATTLEFIELD_WG_TEXT_DEFEND_KEEP + 1);
}
} }
// ***************************************************** // *******************************************************
// *******************Reward System********************* // ******************* Reward System *********************
// ***************************************************** // *******************************************************
void BattlefieldWG::DoCompleteOrIncrementAchievement(uint32 achievement, Player *player, uint8 /*incrementNumber */ ) void BattlefieldWG::DoCompleteOrIncrementAchievement(uint32 achievement, Player* player, uint8 /*incrementNumber*/)
{ {
AchievementEntry const* AE = sAchievementStore.LookupEntry(achievement); AchievementEntry const* achievementEntry = sAchievementStore.LookupEntry(achievement);
if (!achievementEntry)
return;
switch (achievement) switch (achievement)
{ {
@@ -501,46 +459,20 @@ void BattlefieldWG::DoCompleteOrIncrementAchievement(uint32 achievement, Player
default: default:
{ {
if (player) if (player)
player->CompletedAchievement(AE); player->CompletedAchievement(achievementEntry);
}
break; break;
} }
}
void BattlefieldWG::RewardMarkOfHonor(Player* player, uint32 count)
{
// 'Inactive' this aura prevents the player from gaining honor points and battleground tokens
if (count == 0)
return;
ItemPosCountVec dest;
uint32 no_space_count = 0;
uint8 msg = player->CanStoreNewItem(NULL_BAG, NULL_SLOT, dest, WG_MARK_OF_HONOR, count, &no_space_count);
if (msg == EQUIP_ERR_ITEM_NOT_FOUND)
{
return;
} }
if (msg != EQUIP_ERR_OK) // convert to possible store amount
count -= no_space_count;
if (count != 0 && !dest.empty()) // can add some
if (Item * item = player->StoreNewItem(dest, WG_MARK_OF_HONOR, true, 0))
player->SendNewItem(item, count, true, false);
} }
void BattlefieldWG::OnStartGrouping() void BattlefieldWG::OnStartGrouping()
{ {
// Warn
SendWarningToAllInZone(BATTLEFIELD_WG_TEXT_WILL_START); SendWarningToAllInZone(BATTLEFIELD_WG_TEXT_WILL_START);
} }
uint8 BattlefieldWG::GetSpiritGraveyardId(uint32 areaId) uint8 BattlefieldWG::GetSpiritGraveyardId(uint32 areaId)
{ {
uint8 graveyardId = 0;
switch (areaId) switch (areaId)
{ {
case AREA_WINTERGRASP_FORTRESS: case AREA_WINTERGRASP_FORTRESS:
@@ -558,40 +490,38 @@ uint8 BattlefieldWG::GetSpiritGraveyardId(uint32 areaId)
case AREA_THE_CHILLED_QUAGMIRE: case AREA_THE_CHILLED_QUAGMIRE:
return BATTLEFIELD_WG_GY_HORDE; return BATTLEFIELD_WG_GY_HORDE;
default: default:
sLog->outError("<Error - Wintergrasp>: Unexpected Area Id %u", areaId); sLog->outError("BattlefieldWG::GetSpiritGraveyardId: Unexpected Area Id %u", areaId);
break; break;
} }
return graveyardId; return 0;
} }
void BattlefieldWG::OnCreatureCreate(Creature *creature) void BattlefieldWG::OnCreatureCreate(Creature* creature)
{ {
// Accessing to db spawned creatures // Accessing to db spawned creatures
switch (creature->GetEntry()) switch (creature->GetEntry())
{ {
// Alliance Spirit
case NPC_DWARVEN_SPIRIT_GUIDE: case NPC_DWARVEN_SPIRIT_GUIDE:
// Horde Spirit
case NPC_TAUNKA_SPIRIT_GUIDE: case NPC_TAUNKA_SPIRIT_GUIDE:
{ {
TeamId teamId = creature->GetEntry() == NPC_DWARVEN_SPIRIT_GUIDE ? TEAM_ALLIANCE : TEAM_HORDE; TeamId teamId = (creature->GetEntry() == NPC_DWARVEN_SPIRIT_GUIDE ? TEAM_ALLIANCE : TEAM_HORDE);
uint8 graveyardId = GetSpiritGraveyardId(creature->GetAreaId()); uint8 graveyardId = GetSpiritGraveyardId(creature->GetAreaId());
if (m_GraveYardList[graveyardId]) if (m_GraveyardList[graveyardId])
m_GraveYardList[graveyardId]->SetSpirit(creature, teamId); m_GraveyardList[graveyardId]->SetSpirit(creature, teamId);
}
break; break;
} }
}
// untested code - not sure if it is valid. // untested code - not sure if it is valid.
if (IsWarTime()) if (IsWarTime())
{ {
switch (creature->GetEntry()) switch (creature->GetEntry())
{ {
case NPC_WG_SEIGE_ENGINE_ALLIANCE: case NPC_WINTERGRASP_SIEGE_ENGINE_1:
case NPC_WG_SEIGE_ENGINE_HORDE: case NPC_WINTERGRASP_SIEGE_ENGINE_2:
case NPC_WG_CATAPULT: case NPC_WINTERGRASP_CATAPULT:
case NPC_WG_DEMOLISHER: case NPC_WINTERGRASP_DEMOLISHER:
{ {
uint8 team; uint8 team;
if (creature->getFaction() == WintergraspFaction[TEAM_ALLIANCE]) if (creature->getFaction() == WintergraspFaction[TEAM_ALLIANCE])
@@ -605,7 +535,7 @@ void BattlefieldWG::OnCreatureCreate(Creature *creature)
{ {
if (GetData(BATTLEFIELD_WG_DATA_VEHICLE_H) <= GetData(BATTLEFIELD_WG_DATA_MAX_VEHICLE_H)) if (GetData(BATTLEFIELD_WG_DATA_VEHICLE_H) <= GetData(BATTLEFIELD_WG_DATA_MAX_VEHICLE_H))
{ {
m_Data32[BATTLEFIELD_WG_DATA_VEHICLE_H]++; UpdateData(BATTLEFIELD_WG_DATA_VEHICLE_H, 1);
creature->CastSpell(creature, SPELL_HORDE_FLAG, true); creature->CastSpell(creature, SPELL_HORDE_FLAG, true);
m_vehicles[team].insert(creature->GetGUID()); m_vehicles[team].insert(creature->GetGUID());
UpdateVehicleCountWG(); UpdateVehicleCountWG();
@@ -621,8 +551,8 @@ void BattlefieldWG::OnCreatureCreate(Creature *creature)
{ {
if (GetData(BATTLEFIELD_WG_DATA_VEHICLE_A) <= GetData(BATTLEFIELD_WG_DATA_MAX_VEHICLE_A)) if (GetData(BATTLEFIELD_WG_DATA_VEHICLE_A) <= GetData(BATTLEFIELD_WG_DATA_MAX_VEHICLE_A))
{ {
m_Data32[BATTLEFIELD_WG_DATA_VEHICLE_A]++; UpdateData(BATTLEFIELD_WG_DATA_VEHICLE_A, 1);
creature->CastSpell(creature, SPELL_ALLIANCE_FLAG, true); creature->CastSpell(creature, SPELL_HORDE_FLAG, true);
m_vehicles[team].insert(creature->GetGUID()); m_vehicles[team].insert(creature->GetGUID());
UpdateVehicleCountWG(); UpdateVehicleCountWG();
} }
@@ -645,10 +575,10 @@ void BattlefieldWG::OnCreatureRemove(Creature* creature)
{ {
switch (creature->GetEntry()) switch (creature->GetEntry())
{ {
case NPC_WG_SEIGE_ENGINE_ALLIANCE: case NPC_WINTERGRASP_SIEGE_ENGINE_1:
case NPC_WG_SEIGE_ENGINE_HORDE: case NPC_WINTERGRASP_SIEGE_ENGINE_2:
case NPC_WG_CATAPULT: case NPC_WINTERGRASP_CATAPULT:
case NPC_WG_DEMOLISHER: case NPC_WINTERGRASP_DEMOLISHER:
{ {
uint8 team; uint8 team;
if (creature->getFaction() == WintergraspFaction[TEAM_ALLIANCE]) if (creature->getFaction() == WintergraspFaction[TEAM_ALLIANCE])
@@ -660,9 +590,9 @@ void BattlefieldWG::OnCreatureRemove(Creature* creature)
m_vehicles[team].erase(creature->GetGUID()); m_vehicles[team].erase(creature->GetGUID());
if (team == TEAM_HORDE) if (team == TEAM_HORDE)
m_Data32[BATTLEFIELD_WG_DATA_VEHICLE_H]--; UpdateData(BATTLEFIELD_WG_DATA_VEHICLE_H, -1);
else else
m_Data32[BATTLEFIELD_WG_DATA_VEHICLE_A]--; UpdateData(BATTLEFIELD_WG_DATA_VEHICLE_A, -1);
UpdateVehicleCountWG(); UpdateVehicleCountWG();
break; break;
@@ -678,43 +608,43 @@ void BattlefieldWG::OnGameObjectCreate(GameObject* go)
switch (go->GetEntry()) switch (go->GetEntry())
{ {
case BATTLEFIELD_WG_GAMEOBJECT_FACTORY_BANNER_NE: case GO_WINTERGRASP_FACTORY_BANNER_NE:
isWorkshop = true; isWorkshop = true;
workshopId = BATTLEFIELD_WG_WORKSHOP_NE; workshopId = BATTLEFIELD_WG_WORKSHOP_NE;
break; break;
case BATTLEFIELD_WG_GAMEOBJECT_FACTORY_BANNER_NW: case GO_WINTERGRASP_FACTORY_BANNER_NW:
isWorkshop = true; isWorkshop = true;
workshopId = BATTLEFIELD_WG_WORKSHOP_NW; workshopId = BATTLEFIELD_WG_WORKSHOP_NW;
break; break;
case BATTLEFIELD_WG_GAMEOBJECT_FACTORY_BANNER_SE: case GO_WINTERGRASP_FACTORY_BANNER_SE:
isWorkshop = true; isWorkshop = true;
workshopId = BATTLEFIELD_WG_WORKSHOP_SE; workshopId = BATTLEFIELD_WG_WORKSHOP_SE;
break; break;
case BATTLEFIELD_WG_GAMEOBJECT_FACTORY_BANNER_SW: case GO_WINTERGRASP_FACTORY_BANNER_SW:
isWorkshop = true; isWorkshop = true;
workshopId = BATTLEFIELD_WG_WORKSHOP_SW; workshopId = BATTLEFIELD_WG_WORKSHOP_SW;
break; break;
} }
if (isWorkshop) if (!isWorkshop)
{ return;
for (Workshop::const_iterator itr = WorkshopsList.begin(); itr != WorkshopsList.end(); ++itr) for (Workshop::const_iterator itr = WorkshopsList.begin(); itr != WorkshopsList.end(); ++itr)
{ {
if (WGWorkshop* workshop = (*itr)) if (WGWorkshop* workshop = (*itr))
{ {
if (workshop->workshopId == workshopId) if (workshop->workshopId == workshopId)
{ {
BfCapturePointWG* capturePoint = new BfCapturePointWG(this, GetAttackerTeam()); WintergraspCapturePoint* capturePoint = new WintergraspCapturePoint(this, GetAttackerTeam());
capturePoint->SetCapturePointData(go); capturePoint->SetCapturePointData(go);
capturePoint->LinkToWorkShop(workshop); capturePoint->LinkToWorkshop(workshop);
AddCapturePoint(capturePoint); AddCapturePoint(capturePoint);
break; break;
} }
} }
} }
}
} }
// Called when player kill a unit in wg zone // Called when player kill a unit in wg zone
@@ -727,29 +657,20 @@ void BattlefieldWG::HandleKill(Player* killer, Unit* victim)
if (victim->GetTypeId() == TYPEID_PLAYER) if (victim->GetTypeId() == TYPEID_PLAYER)
{ {
for (GuidSet::const_iterator itr = m_PlayersInWar[killer->GetTeamId()].begin(); itr != m_PlayersInWar[killer->GetTeamId()].end(); ++itr) for (GuidSet::const_iterator itr = m_PlayersInWar[killer->GetTeamId()].begin(); itr != m_PlayersInWar[killer->GetTeamId()].end(); ++itr)
{
if (Player* player = sObjectAccessor->FindPlayer(*itr)) if (Player* player = sObjectAccessor->FindPlayer(*itr))
if (player->GetDistance2d(killer) < 40) if (player->GetDistance2d(killer) < 40)
PromotePlayer(player); PromotePlayer(player);
}
return; return;
} }
for (GuidSet::const_iterator itr = m_vehicles[killer->GetTeamId()? TEAM_ALLIANCE : TEAM_HORDE].begin();
itr != m_vehicles[killer->GetTeamId()? TEAM_ALLIANCE : TEAM_HORDE].end(); ++itr) for (GuidSet::const_iterator itr = m_vehicles[GetOtherTeam(killer->GetTeamId())].begin(); itr != m_vehicles[GetOtherTeam(killer->GetTeamId())].end(); ++itr)
{
if (Unit* unit = sObjectAccessor->FindUnit(*itr)) if (Unit* unit = sObjectAccessor->FindUnit(*itr))
{
if (Creature* creature = unit->ToCreature()) if (Creature* creature = unit->ToCreature())
{
if (victim->GetEntry() == creature->GetEntry() && !again) if (victim->GetEntry() == creature->GetEntry() && !again)
{
again = true; again = true;
}
} for (GuidSet::const_iterator itr = KeepCreature[GetOtherTeam(killer->GetTeamId())].begin();
} itr != KeepCreature[GetOtherTeam(killer->GetTeamId())].end(); ++itr)
}
for (GuidSet::const_iterator itr = KeepCreature[killer->GetTeamId()? TEAM_ALLIANCE : TEAM_HORDE].begin();
itr != KeepCreature[killer->GetTeamId()? TEAM_ALLIANCE : TEAM_HORDE].end(); ++itr)
{ {
if (Unit* unit = sObjectAccessor->FindUnit(*itr)) if (Unit* unit = sObjectAccessor->FindUnit(*itr))
{ {
@@ -759,27 +680,25 @@ void BattlefieldWG::HandleKill(Player* killer, Unit* victim)
{ {
again = true; again = true;
for (GuidSet::const_iterator iter = m_PlayersInWar[killer->GetTeamId()].begin(); iter != m_PlayersInWar[killer->GetTeamId()].end(); ++iter) for (GuidSet::const_iterator iter = m_PlayersInWar[killer->GetTeamId()].begin(); iter != m_PlayersInWar[killer->GetTeamId()].end(); ++iter)
{
if (Player* player = sObjectAccessor->FindPlayer(*iter)) if (Player* player = sObjectAccessor->FindPlayer(*iter))
if (player->GetDistance2d(killer) < 40) if (player->GetDistance2d(killer) < 40.0f)
PromotePlayer(player); PromotePlayer(player);
} }
} }
} }
} }
}
// TODO:Recent PvP activity worldstate // TODO:Recent PvP activity worldstate
} }
// Update rank for player // Update rank for player
void BattlefieldWG::PromotePlayer(Player* killer) void BattlefieldWG::PromotePlayer(Player* killer)
{ {
if (!m_BattlefieldActive) if (!m_isActive)
return; return;
// Updating rank of player // Updating rank of player
if (Aura* aur = killer->GetAura(SPELL_RECRUIT)) if (Aura* aur = killer->GetAura(SPELL_RECRUIT))
{ {
if (aur->GetStackAmount() >= 5) // 7 or more TODO: if (aur->GetStackAmount() >= 5)
{ {
killer->RemoveAura(SPELL_RECRUIT); killer->RemoveAura(SPELL_RECRUIT);
killer->CastSpell(killer, SPELL_CORPORAL, true); killer->CastSpell(killer, SPELL_CORPORAL, true);
@@ -790,7 +709,7 @@ void BattlefieldWG::PromotePlayer(Player* killer)
} }
else if (Aura* aur = killer->GetAura(SPELL_CORPORAL)) else if (Aura* aur = killer->GetAura(SPELL_CORPORAL))
{ {
if (aur->GetStackAmount() >= 5) // 7 or more TODO: if (aur->GetStackAmount() >= 5)
{ {
killer->RemoveAura(SPELL_CORPORAL); killer->RemoveAura(SPELL_CORPORAL);
killer->CastSpell(killer, SPELL_LIEUTENANT, true); killer->CastSpell(killer, SPELL_LIEUTENANT, true);
@@ -822,9 +741,7 @@ void BattlefieldWG::OnPlayerJoinWar(Player* player)
if (player->GetZoneId() != m_ZoneId) if (player->GetZoneId() != m_ZoneId)
{ {
if (player->GetTeamId() == GetDefenderTeam()) if (player->GetTeamId() == GetDefenderTeam())
{
player->TeleportTo(571, 5345, 2842, 410, 3.14f); player->TeleportTo(571, 5345, 2842, 410, 3.14f);
}
else else
{ {
if (player->GetTeamId() == TEAM_HORDE) if (player->GetTeamId() == TEAM_HORDE)
@@ -838,13 +755,13 @@ void BattlefieldWG::OnPlayerJoinWar(Player* player)
if (player->GetTeamId() == GetAttackerTeam()) if (player->GetTeamId() == GetAttackerTeam())
{ {
if (3 - m_Data32[BATTLEFIELD_WG_DATA_BROKEN_TOWER_ATT] > 0) if (GetData(BATTLEFIELD_WG_DATA_BROKEN_TOWER_ATT) < 3)
player->SetAuraStack(SPELL_TOWER_CONTROL, player, 3 - m_Data32[BATTLEFIELD_WG_DATA_BROKEN_TOWER_ATT]); player->SetAuraStack(SPELL_TOWER_CONTROL, player, 3 - GetData(BATTLEFIELD_WG_DATA_BROKEN_TOWER_ATT));
} }
else else
{ {
if (m_Data32[BATTLEFIELD_WG_DATA_BROKEN_TOWER_ATT] > 0) if (GetData(BATTLEFIELD_WG_DATA_BROKEN_TOWER_ATT) > 0)
player->SetAuraStack(SPELL_TOWER_CONTROL, player, m_Data32[BATTLEFIELD_WG_DATA_BROKEN_TOWER_ATT]); player->SetAuraStack(SPELL_TOWER_CONTROL, player, GetData(BATTLEFIELD_WG_DATA_BROKEN_TOWER_ATT));
} }
SendInitWorldStatesTo(player); SendInitWorldStatesTo(player);
} }
@@ -858,6 +775,7 @@ void BattlefieldWG::OnPlayerLeaveWar(Player* player)
player->GetVehicle()->Dismiss(); player->GetVehicle()->Dismiss();
RemoveAurasFromPlayer(player); RemoveAurasFromPlayer(player);
} }
player->RemoveAurasDueToSpell(SPELL_HORDE_CONTROLS_FACTORY_PHASE_SHIFT); player->RemoveAurasDueToSpell(SPELL_HORDE_CONTROLS_FACTORY_PHASE_SHIFT);
player->RemoveAurasDueToSpell(SPELL_ALLIANCE_CONTROLS_FACTORY_PHASE_SHIFT); player->RemoveAurasDueToSpell(SPELL_ALLIANCE_CONTROLS_FACTORY_PHASE_SHIFT);
player->RemoveAurasDueToSpell(SPELL_HORDE_CONTROL_PHASE_SHIFT); player->RemoveAurasDueToSpell(SPELL_HORDE_CONTROL_PHASE_SHIFT);
@@ -866,7 +784,7 @@ void BattlefieldWG::OnPlayerLeaveWar(Player* player)
void BattlefieldWG::OnPlayerLeaveZone(Player* player) void BattlefieldWG::OnPlayerLeaveZone(Player* player)
{ {
if (!m_BattlefieldActive) if (!m_isActive)
RemoveAurasFromPlayer(player); RemoveAurasFromPlayer(player);
player->RemoveAurasDueToSpell(SPELL_HORDE_CONTROLS_FACTORY_PHASE_SHIFT); player->RemoveAurasDueToSpell(SPELL_HORDE_CONTROLS_FACTORY_PHASE_SHIFT);
@@ -877,7 +795,7 @@ void BattlefieldWG::OnPlayerLeaveZone(Player* player)
void BattlefieldWG::OnPlayerEnterZone(Player* player) void BattlefieldWG::OnPlayerEnterZone(Player* player)
{ {
if (!m_BattlefieldActive) if (!m_isActive)
RemoveAurasFromPlayer(player); RemoveAurasFromPlayer(player);
player->AddAura(m_DefenderTeam == TEAM_HORDE ? SPELL_HORDE_CONTROL_PHASE_SHIFT : SPELL_ALLIANCE_CONTROL_PHASE_SHIFT, player); player->AddAura(m_DefenderTeam == TEAM_HORDE ? SPELL_HORDE_CONTROL_PHASE_SHIFT : SPELL_ALLIANCE_CONTROL_PHASE_SHIFT, player);
@@ -896,11 +814,8 @@ uint32 BattlefieldWG::GetData(uint32 data)
case AREA_WESTPARK_WORKSHOP: case AREA_WESTPARK_WORKSHOP:
case AREA_EASTPARK_WORKSHOP: case AREA_EASTPARK_WORKSHOP:
// Graveyards and Workshops are controlled by the same team. // Graveyards and Workshops are controlled by the same team.
if (m_GraveYardList[GetSpiritGraveyardId(data)]) if (m_GraveyardList[GetSpiritGraveyardId(data)])
return m_GraveYardList[GetSpiritGraveyardId(data)]->GetControlTeamId(); return m_GraveyardList[GetSpiritGraveyardId(data)]->GetControlTeamId();
default:
if (m_Data32[data])
return m_Data32[data];
} }
return Battlefield::GetData(data); return Battlefield::GetData(data);
@@ -918,8 +833,8 @@ WorldPacket BattlefieldWG::BuildInitWorldStates()
data << uint32(BATTLEFIELD_WG_WORLD_STATE_ATTACKER) << uint32(GetAttackerTeam()); data << uint32(BATTLEFIELD_WG_WORLD_STATE_ATTACKER) << uint32(GetAttackerTeam());
data << uint32(BATTLEFIELD_WG_WORLD_STATE_DEFENDER) << uint32(GetDefenderTeam()); data << uint32(BATTLEFIELD_WG_WORLD_STATE_DEFENDER) << uint32(GetDefenderTeam());
data << uint32(BATTLEFIELD_WG_WORLD_STATE_ACTIVE) << uint32(IsWarTime()? 0 : 1); data << uint32(BATTLEFIELD_WG_WORLD_STATE_ACTIVE) << uint32(IsWarTime()? 0 : 1); // Note: cleanup these two, their names look awkward
data << uint32(3710) << uint32(IsWarTime()? 1 : 0); data << uint32(BATTLEFIELD_WG_WORLD_STATE_SHOW_WORLDSTATE) << uint32(IsWarTime()? 1 : 0);
for (uint32 i = 0; i < 2; ++i) for (uint32 i = 0; i < 2; ++i)
data << ClockWorldState[i] << uint32(time(NULL) + (m_Timer / 1000)); data << ClockWorldState[i] << uint32(time(NULL) + (m_Timer / 1000));
@@ -930,20 +845,16 @@ WorldPacket BattlefieldWG::BuildInitWorldStates()
data << uint32(BATTLEFIELD_WG_WORLD_STATE_MAX_VEHICLE_A) << GetData(BATTLEFIELD_WG_DATA_MAX_VEHICLE_A); data << uint32(BATTLEFIELD_WG_WORLD_STATE_MAX_VEHICLE_A) << GetData(BATTLEFIELD_WG_DATA_MAX_VEHICLE_A);
for (GameObjectBuilding::const_iterator itr = BuildingsInZone.begin(); itr != BuildingsInZone.end(); ++itr) for (GameObjectBuilding::const_iterator itr = BuildingsInZone.begin(); itr != BuildingsInZone.end(); ++itr)
{
data << (*itr)->m_WorldState << (*itr)->m_State; data << (*itr)->m_WorldState << (*itr)->m_State;
}
for (Workshop::const_iterator itr = WorkshopsList.begin(); itr != WorkshopsList.end(); ++itr)
{
if (!*itr)
continue;
for (Workshop::const_iterator itr = WorkshopsList.begin(); itr != WorkshopsList.end(); ++itr)
if (*itr)
data << WorkshopsData[(*itr)->workshopId].worldstate << (*itr)->state; data << WorkshopsData[(*itr)->workshopId].worldstate << (*itr)->state;
}
return data; return data;
} }
void BattlefieldWG::SendInitWorldStatesTo(Player *player) void BattlefieldWG::SendInitWorldStatesTo(Player* player)
{ {
WorldPacket data = BuildInitWorldStates(); WorldPacket data = BuildInitWorldStates();
player->GetSession()->SendPacket(&data); player->GetSession()->SendPacket(&data);
@@ -970,47 +881,44 @@ void BattlefieldWG::BrokenWallOrTower(TeamId team)
} }
}*/ }*/
} }
// Called when a tower is broke // Called when a tower is broke
void BattlefieldWG::AddBrokenTower(TeamId team) void BattlefieldWG::UpdatedDestroyedTowerCount(TeamId team)
{ {
// Destroy an attack tower // Destroy an attack tower
if (team == GetAttackerTeam()) if (team == GetAttackerTeam())
{ {
// Update counter // Update counter
m_Data32[BATTLEFIELD_WG_DATA_DAMAGED_TOWER_ATT]--; UpdateData(BATTLEFIELD_WG_DATA_DAMAGED_TOWER_ATT, -1);
m_Data32[BATTLEFIELD_WG_DATA_BROKEN_TOWER_ATT]++; UpdateData(BATTLEFIELD_WG_DATA_BROKEN_TOWER_ATT, 1);
// Remove buff stack // Remove buff stack on attackers
for (GuidSet::const_iterator itr = m_PlayersInWar[GetAttackerTeam()].begin(); itr != m_PlayersInWar[GetAttackerTeam()].end(); ++itr) for (GuidSet::const_iterator itr = m_PlayersInWar[GetAttackerTeam()].begin(); itr != m_PlayersInWar[GetAttackerTeam()].end(); ++itr)
if (Player* player = sObjectAccessor->FindPlayer(*itr)) if (Player* player = sObjectAccessor->FindPlayer(*itr))
player->RemoveAuraFromStack(SPELL_TOWER_CONTROL); player->RemoveAuraFromStack(SPELL_TOWER_CONTROL);
// Add buff stack // Add buff stack to defenders
for (GuidSet::const_iterator itr = m_PlayersInWar[GetDefenderTeam()].begin(); itr != m_PlayersInWar[GetDefenderTeam()].end(); ++itr) for (GuidSet::const_iterator itr = m_PlayersInWar[GetDefenderTeam()].begin(); itr != m_PlayersInWar[GetDefenderTeam()].end(); ++itr)
if (Player* player = sObjectAccessor->FindPlayer(*itr)) if (Player* player = sObjectAccessor->FindPlayer(*itr))
{ {
player->CastSpell(player, SPELL_TOWER_CONTROL, true); player->CastSpell(player, SPELL_TOWER_CONTROL, true);
DoCompleteOrIncrementAchievement(ACHIEVEMENTS_WG_TOWER_DESTROY, player); DoCompleteOrIncrementAchievement(ACHIEVEMENTS_WG_TOWER_DESTROY, player);
} }
// If the threw south tower is destroy
if (m_Data32[BATTLEFIELD_WG_DATA_BROKEN_TOWER_ATT] == 3) // If all three south towers are destroyed (ie. all attack towers), remove ten minutes from battle time
if (GetData(BATTLEFIELD_WG_DATA_BROKEN_TOWER_ATT) == 3)
{ {
// Remove 10 minutes to battle time
if (int32(m_Timer - 600000) < 0) if (int32(m_Timer - 600000) < 0)
{
m_Timer = 0; m_Timer = 0;
}
else else
{
m_Timer -= 600000; m_Timer -= 600000;
}
SendInitWorldStatesToAll(); SendInitWorldStatesToAll();
} }
} }
else else
{ {
m_Data32[BATTLEFIELD_WG_DATA_DAMAGED_TOWER_DEF]--; UpdateData(BATTLEFIELD_WG_DATA_DAMAGED_TOWER_DEF, -1);
m_Data32[BATTLEFIELD_WG_DATA_BROKEN_TOWER_DEF]++; UpdateData(BATTLEFIELD_WG_DATA_BROKEN_TOWER_DEF, 1);
} }
} }
@@ -1025,13 +933,12 @@ void BattlefieldWG::ProcessEvent(WorldObject *obj, uint32 eventId)
return; return;
// On click on titan relic // On click on titan relic
if (go->GetEntry() == BATTLEFIELD_WG_GAMEOBJECT_TITAN_RELIC) if (go->GetEntry() == GO_WINTERGRASP_TITAN_S_RELIC)
{ {
// Check that the door is break if (CanInteractWithRelic())
if (m_CanClickOnOrb)
EndBattle(false); EndBattle(false);
else // if door is not break, respawn relic. else
m_relic->SetRespawnTime(RESPAWN_IMMEDIATELY); GetRelic()->SetRespawnTime(RESPAWN_IMMEDIATELY);
} }
// if destroy or damage event, search the wall/tower and update worldstate/send warning message // if destroy or damage event, search the wall/tower and update worldstate/send warning message
@@ -1051,16 +958,12 @@ void BattlefieldWG::ProcessEvent(WorldObject *obj, uint32 eventId)
} }
// Called when a tower is damaged, used for honor reward calcul // Called when a tower is damaged, used for honor reward calcul
void BattlefieldWG::AddDamagedTower(TeamId team) void BattlefieldWG::UpdateDamagedTowerCount(TeamId team)
{ {
if (team == GetAttackerTeam()) if (team == GetAttackerTeam())
{ UpdateData(BATTLEFIELD_WG_DATA_DAMAGED_TOWER_ATT, 1);
m_Data32[BATTLEFIELD_WG_DATA_DAMAGED_TOWER_ATT]++;
}
else else
{ UpdateData(BATTLEFIELD_WG_DATA_DAMAGED_TOWER_DEF, 1);
m_Data32[BATTLEFIELD_WG_DATA_DAMAGED_TOWER_DEF]++;
}
} }
// Update vehicle count WorldState to player // Update vehicle count WorldState to player
@@ -1075,16 +978,16 @@ void BattlefieldWG::UpdateVehicleCountWG()
void BattlefieldWG::UpdateTenacity() void BattlefieldWG::UpdateTenacity()
{ {
TeamId team = TEAM_NEUTRAL; TeamId team = TEAM_NEUTRAL;
uint32 allianceNum = m_PlayersInWar[TEAM_ALLIANCE].size(); uint32 alliancePlayers = m_PlayersInWar[TEAM_ALLIANCE].size();
uint32 hordeNum = m_PlayersInWar[TEAM_HORDE].size(); uint32 hordePlayers = m_PlayersInWar[TEAM_HORDE].size();
int32 newStack = 0; int32 newStack = 0;
if (allianceNum && hordeNum) if (alliancePlayers && hordePlayers)
{ {
if (allianceNum < hordeNum) if (alliancePlayers < hordePlayers)
newStack = int32((float (hordeNum) / float (allianceNum) - 1) *4); // positive, should cast on alliance newStack = int32((float(hordePlayers / alliancePlayers) - 1) * 4); // positive, should cast on alliance
else if (allianceNum > hordeNum) else if (alliancePlayers > hordePlayers)
newStack = int32((1 - float (allianceNum) / float (hordeNum)) *4); // negative, should cast on horde newStack = int32((1 - float(alliancePlayers / hordePlayers)) * 4); // negative, should cast on horde
} }
if (newStack == int32(m_tenacityStack)) if (newStack == int32(m_tenacityStack))
@@ -1121,13 +1024,17 @@ void BattlefieldWG::UpdateTenacity()
newStack = 20; newStack = 20;
uint32 buff_honor = SPELL_GREATEST_HONOR; uint32 buff_honor = SPELL_GREATEST_HONOR;
buff_honor = (newStack < 15) ? (uint32) SPELL_GREATER_HONOR : buff_honor; if (newStack < 15)
buff_honor = (newStack < 10) ? (uint32) SPELL_GREAT_HONOR : buff_honor; buff_honor = SPELL_GREATER_HONOR;
buff_honor = (newStack < 5) ? 0 : buff_honor; if (newStack < 10)
buff_honor = SPELL_GREAT_HONOR;
if (newStack < 5)
buff_honor = 0;
for (GuidSet::const_iterator itr = m_PlayersInWar[team].begin(); itr != m_PlayersInWar[team].end(); ++itr) for (GuidSet::const_iterator itr = m_PlayersInWar[team].begin(); itr != m_PlayersInWar[team].end(); ++itr)
if (Player* player = sObjectAccessor->FindPlayer(*itr)) if (Player* player = sObjectAccessor->FindPlayer(*itr))
player->SetAuraStack(SPELL_TENACITY, player, newStack); player->SetAuraStack(SPELL_TENACITY, player, newStack);
for (GuidSet::const_iterator itr = m_vehicles[team].begin(); itr != m_vehicles[team].end(); ++itr) for (GuidSet::const_iterator itr = m_vehicles[team].begin(); itr != m_vehicles[team].end(); ++itr)
if (Unit* unit = sObjectAccessor->FindUnit(*itr)) if (Unit* unit = sObjectAccessor->FindUnit(*itr))
if (Creature* creature = unit->ToCreature()) if (Creature* creature = unit->ToCreature())
@@ -1137,27 +1044,27 @@ void BattlefieldWG::UpdateTenacity()
{ {
for (GuidSet::const_iterator itr = m_PlayersInWar[team].begin(); itr != m_PlayersInWar[team].end(); ++itr) for (GuidSet::const_iterator itr = m_PlayersInWar[team].begin(); itr != m_PlayersInWar[team].end(); ++itr)
if (Player* player = sObjectAccessor->FindPlayer(*itr)) if (Player* player = sObjectAccessor->FindPlayer(*itr))
player->AddAura(buff_honor, player); player->CastSpell(player, buff_honor, true);
for (GuidSet::const_iterator itr = m_vehicles[team].begin(); itr != m_vehicles[team].end(); ++itr) for (GuidSet::const_iterator itr = m_vehicles[team].begin(); itr != m_vehicles[team].end(); ++itr)
if (Unit* unit = sObjectAccessor->FindUnit(*itr)) if (Unit* unit = sObjectAccessor->FindUnit(*itr))
if (Creature* creature = unit->ToCreature()) if (Creature* creature = unit->ToCreature())
creature->AddAura(buff_honor, creature); creature->CastSpell(creature, buff_honor, true);
} }
} }
} }
void BfCapturePointWG::ChangeTeam(TeamId /*oldTeam */ ) WintergraspCapturePoint::WintergraspCapturePoint(BattlefieldWG* battlefield, TeamId teamInControl) : BfCapturePoint(battlefield)
{ {
m_WorkShop->ChangeControl(m_team, false); m_Bf = battlefield;
m_team = teamInControl;
} }
BfCapturePointWG::BfCapturePointWG(BattlefieldWG* bf, TeamId control) : BfCapturePoint(bf) void WintergraspCapturePoint::ChangeTeam(TeamId /*oldTeam*/)
{ {
m_Bf = bf; m_Workshop->GiveControlTo(m_team, false);
m_team = control;
} }
BfGraveYardWG::BfGraveYardWG(BattlefieldWG* bf) : BfGraveYard(bf) BfGraveyardWG::BfGraveyardWG(BattlefieldWG* battlefield) : BfGraveyard(battlefield)
{ {
m_Bf = bf; m_Bf = battlefield;
} }
src/server/game/Battlefield/Zones/BattlefieldWG.h
+239 -269
View File
File diff suppressed because it is too large Load Diff
src/server/game/Globals/ObjectMgr.h
-5
View File
@@ -821,11 +821,6 @@ class ObjectMgr
return &_creatureQuestRelations; return &_creatureQuestRelations;
} }
QuestRelations* GetCreatureQuestInvolvedRelation()
{
return &_creatureQuestInvolvedRelations;
}
QuestRelationBounds GetCreatureQuestRelationBounds(uint32 creature_entry) QuestRelationBounds GetCreatureQuestRelationBounds(uint32 creature_entry)
{ {
return _creatureQuestRelations.equal_range(creature_entry); return _creatureQuestRelations.equal_range(creature_entry);
src/server/game/Server/WorldSession.h
+1 -1
View File
@@ -800,7 +800,7 @@ class WorldSession
// Battlefield // Battlefield
void SendBfInvitePlayerToWar(uint32 BattleId,uint32 ZoneId,uint32 time); void SendBfInvitePlayerToWar(uint32 BattleId,uint32 ZoneId,uint32 time);
void SendBfInvitePlayerToQueue(uint32 BattleId); void SendBfInvitePlayerToQueue(uint32 BattleId);
void SendBfQueueInviteResponce(uint32 BattleId,uint32 ZoneId, bool CanQueue = true, bool Full = false); void SendBfQueueInviteResponse(uint32 BattleId,uint32 ZoneId, bool CanQueue = true, bool Full = false);
void SendBfEntered(uint32 BattleId); void SendBfEntered(uint32 BattleId);
void SendBfLeaveMessage(uint32 BattleId, BFLeaveReason reason = BF_LEAVE_REASON_EXITED); void SendBfLeaveMessage(uint32 BattleId, BFLeaveReason reason = BF_LEAVE_REASON_EXITED);
void HandleBfQueueInviteResponse(WorldPacket &recv_data); void HandleBfQueueInviteResponse(WorldPacket &recv_data);
src/server/scripts/Commands/cs_bf.cpp
+3 -3
View File
@@ -108,15 +108,15 @@ public:
if (!bf) if (!bf)
return false; return false;
if (bf->GetEnable()) if (bf->IsEnabled())
{ {
bf->SetEnable(false); bf->ToggleBattlefield(false);
if (battleid == 1) if (battleid == 1)
handler->SendGlobalGMSysMessage("Wintergrasp is disabled"); handler->SendGlobalGMSysMessage("Wintergrasp is disabled");
} }
else else
{ {
bf->SetEnable(true); bf->ToggleBattlefield(true);
if (battleid == 1) if (battleid == 1)
handler->SendGlobalGMSysMessage("Wintergrasp is enabled"); handler->SendGlobalGMSysMessage("Wintergrasp is enabled");
} }
src/server/scripts/Northrend/wintergrasp.cpp
+250 -171
View File
@@ -38,42 +38,84 @@ enum eWGqueuenpctext
WG_NPCQUEUE_TEXTOPTION_JOIN = -1850507, WG_NPCQUEUE_TEXTOPTION_JOIN = -1850507,
}; };
enum WGscriptdata enum Spells
{ {
// engineer spells // Demolisher engineers spells
SPELL_BUILD_CATAPULT = 56663, SPELL_BUILD_SIEGE_VEHICLE_FORCE_1 = 61409, //
SPELL_BUILD_DEMOLISHER = 56575, SPELL_BUILD_SIEGE_VEHICLE_FORCE_2 = 56662, // Which faction uses which ?
SPELL_BUILD_SIEGE_ENGINE = 61408, SPELL_BUILD_CATAPULT_FORCE = 56664,
SPELL_BUILD_SIEGE_ENGINE2 = 56661, // does it's really needed here? SPELL_BUILD_DEMOLISHER_FORCE = 56659,
SPELL_ACTIVATE_ROBOTIC_ARMS = 49899, SPELL_ACTIVATE_CONTROL_ARMS = 49899,
// teleporter spells
SPELL_VEHICLE_TELEPORT = 49759, SPELL_VEHICLE_TELEPORT = 49759,
// npcs // Spirit guide
NPC_ROBOTIC_ARMS = 27852, SPELL_CHANNEL_SPIRIT_HEAL = 22011,
NPC_WORLD_TRIGGER_WG = 23472, };
enum CreatureIds
{
NPC_GOBLIN_MECHANIC = 30400,
NPC_GNOMISH_ENGINEER = 30499,
NPC_WINTERGRASP_CONTROL_ARMS = 27852,
NPC_WORLD_TRIGGER_LARGE_AOI_NOT_IMMUNE_PC_NPC = 23742,
};
enum QuestIds
{
QUEST_BONES_AND_ARROWS_HORDE_ATT = 13193,
QUEST_JINXING_THE_WALLS_HORDE_ATT = 13202,
QUEST_SLAY_THEM_ALL_HORDE_ATT = 13180,
QUEST_FUELING_THE_DEMOLISHERS_HORDE_ATT = 13200,
QUEST_HEALING_WITH_ROSES_HORDE_ATT = 13201,
QUEST_DEFEND_THE_SIEGE_HORDE_ATT = 13223,
QUEST_BONES_AND_ARROWS_HORDE_DEF = 13199,
QUEST_WARDING_THE_WALLS_HORDE_DEF = 13192,
QUEST_SLAY_THEM_ALL_HORDE_DEF = 13178,
QUEST_FUELING_THE_DEMOLISHERS_HORDE_DEF = 13191,
QUEST_HEALING_WITH_ROSES_HORDE_DEF = 13194,
QUEST_TOPPLING_THE_TOWERS_HORDE_DEF = 13539,
QUEST_STOP_THE_SIEGE_HORDE_DEF = 13185,
QUEST_BONES_AND_ARROWS_ALLIANCE_ATT = 13196,
QUEST_WARDING_THE_WARRIORS_ALLIANCE_ATT = 13198,
QUEST_NO_MERCY_FOR_THE_MERCILESS_ALLIANCE_ATT = 13179,
QUEST_DEFEND_THE_SIEGE_ALLIANCE_ATT = 13222,
QUEST_A_RARE_HERB_ALLIANCE_ATT = 13195,
QUEST_BONES_AND_ARROWS_ALLIANCE_DEF = 13154,
QUEST_WARDING_THE_WARRIORS_ALLIANCE_DEF = 13153,
QUEST_NO_MERCY_FOR_THE_MERCILESS_ALLIANCE_DEF = 13177,
QUEST_SHOUTHERN_SABOTAGE_ALLIANCE_DEF = 13538,
QUEST_STOP_THE_SIEGE_ALLIANCE_DEF = 13186,
QUEST_A_RARE_HERB_ALLIANCE_DEF = 13156,
};
uint8 const MAX_WINTERGRASP_VEHICLES = 4;
uint32 const vehiclesList[MAX_WINTERGRASP_VEHICLES] = {
NPC_WINTERGRASP_CATAPULT,
NPC_WINTERGRASP_DEMOLISHER,
NPC_WINTERGRASP_SIEGE_ENGINE_1,
NPC_WINTERGRASP_SIEGE_ENGINE_2
}; };
class npc_wg_demolisher_engineer : public CreatureScript class npc_wg_demolisher_engineer : public CreatureScript
{ {
public: public:
npc_wg_demolisher_engineer() : CreatureScript("npc_wg_demolisher_engineer") npc_wg_demolisher_engineer() : CreatureScript("npc_wg_demolisher_engineer") { }
{
}
bool OnGossipHello(Player* player, Creature* creature) bool OnGossipHello(Player* player, Creature* creature)
{ {
if (creature->isQuestGiver()) if (creature->isQuestGiver())
player->PrepareQuestMenu(creature->GetGUID()); player->PrepareQuestMenu(creature->GetGUID());
Battlefield* BfWG = sBattlefieldMgr->GetBattlefieldByBattleId(BATTLEFIELD_BATTLEID_WG); Battlefield* wintergrasp = sBattlefieldMgr->GetBattlefieldByBattleId(1);
if (!BfWG) if (canBuild(creature))
return true;
if (BfWG->GetData(creature->GetEntry() == 30400 ? BATTLEFIELD_WG_DATA_MAX_VEHICLE_H : BATTLEFIELD_WG_DATA_MAX_VEHICLE_A) >
BfWG->GetData(creature->GetEntry() == 30400 ? BATTLEFIELD_WG_DATA_VEHICLE_H : BATTLEFIELD_WG_DATA_VEHICLE_A))
{ {
if (player->HasAura(SPELL_CORPORAL)) if (player->HasAura(SPELL_CORPORAL))
player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_HELLO_DEMO1, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF); player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_HELLO_DEMO1, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF);
@@ -95,60 +137,65 @@ class npc_wg_demolisher_engineer : public CreatureScript
{ {
player->CLOSE_GOSSIP_MENU(); player->CLOSE_GOSSIP_MENU();
Battlefield* BfWG = sBattlefieldMgr->GetBattlefieldByBattleId(BATTLEFIELD_BATTLEID_WG); Battlefield* wintergrasp= sBattlefieldMgr->GetBattlefieldByBattleId(BATTLEFIELD_BATTLEID_WG);
if (!BfWG) if (canBuild(creature))
return true;
if (BfWG->GetData(creature->GetEntry() == 30400 ? BATTLEFIELD_WG_DATA_MAX_VEHICLE_H : BATTLEFIELD_WG_DATA_MAX_VEHICLE_A) >
BfWG->GetData(creature->GetEntry() == 30400 ? BATTLEFIELD_WG_DATA_VEHICLE_H : BATTLEFIELD_WG_DATA_VEHICLE_A))
{ {
switch (action - GOSSIP_ACTION_INFO_DEF) switch (action - GOSSIP_ACTION_INFO_DEF)
{ {
case 0: case 0:
player->CastSpell(player, SPELL_BUILD_CATAPULT, false, NULL, NULL, creature->GetGUID()); creature->CastSpell(player, SPELL_BUILD_CATAPULT_FORCE, true);
break; break;
case 1: case 1:
player->CastSpell(player, SPELL_BUILD_DEMOLISHER, false, NULL, NULL, creature->GetGUID()); creature->CastSpell(player, SPELL_BUILD_DEMOLISHER_FORCE, true);
break; break;
case 2: case 2:
player->CastSpell(player, player->GetTeamId() ? SPELL_BUILD_SIEGE_ENGINE : SPELL_BUILD_SIEGE_ENGINE2, false, NULL, NULL, creature->GetGUID()); creature->CastSpell(player, player->GetTeamId() == TEAM_ALLIANCE ? SPELL_BUILD_SIEGE_VEHICLE_FORCE_1 : SPELL_BUILD_SIEGE_VEHICLE_FORCE_2, true);
break; break;
} }
//spell 49899 Emote : 406 from sniff if (Creature* controlArms = creature->FindNearestCreature(NPC_WINTERGRASP_CONTROL_ARMS, 30.0f, true))
//INSERT INTO `spell_scripts` (`id`, `delay`, `command`, `datalong`, `datalong2`, `dataint`, `x`, `y`, `z`, `o`) VALUES ('49899', '0', '1', '406', '0', '0', '0', '0', '0', '0'); creature->CastSpell(controlArms, SPELL_ACTIVATE_CONTROL_ARMS, true);
if (Creature* mechCreature = creature->FindNearestCreature(NPC_ROBOTIC_ARMS, 30.0f, true))
creature->CastSpell(mechCreature, SPELL_ACTIVATE_ROBOTIC_ARMS, true);
} }
return true; return true;
} }
private:
bool canBuild(Creature* creature)
{
Battlefield* wintergrasp = sBattlefieldMgr->GetBattlefieldByBattleId(BATTLEFIELD_BATTLEID_WG);
if (!wintergrasp)
return false;
switch (creature->GetEntry())
{
case NPC_GOBLIN_MECHANIC:
return (wintergrasp->GetData(BATTLEFIELD_WG_DATA_MAX_VEHICLE_H) > wintergrasp->GetData(BATTLEFIELD_WG_DATA_VEHICLE_H));
case NPC_GNOMISH_ENGINEER:
return (wintergrasp->GetData(BATTLEFIELD_WG_DATA_MAX_VEHICLE_A) > wintergrasp->GetData(BATTLEFIELD_WG_DATA_VEHICLE_A));
default:
return false;
}
}
}; };
class npc_wg_spirit_guide : public CreatureScript class npc_wg_spirit_guide : public CreatureScript
{ {
public: public:
npc_wg_spirit_guide() : CreatureScript("npc_wg_spirit_guide") npc_wg_spirit_guide() : CreatureScript("npc_wg_spirit_guide") { }
{
}
bool OnGossipHello(Player* player, Creature* creature) bool OnGossipHello(Player* player, Creature* creature)
{ {
if (creature->isQuestGiver()) if (creature->isQuestGiver())
player->PrepareQuestMenu(creature->GetGUID()); player->PrepareQuestMenu(creature->GetGUID());
Battlefield* BfWG = sBattlefieldMgr->GetBattlefieldByBattleId(BATTLEFIELD_BATTLEID_WG); Battlefield* wintergrasp = sBattlefieldMgr->GetBattlefieldByBattleId(BATTLEFIELD_BATTLEID_WG);
if (BfWG) if (!wintergrasp)
{ return true;
GraveYardVect gy = BfWG->GetGraveYardVect();
for (uint8 i = 0; i < gy.size(); i++) GraveyardVect graveyard = wintergrasp->GetGraveyardVector();
{ for (uint8 i = 0; i < graveyard.size(); i++)
if (gy[i]->GetControlTeamId() == player->GetTeamId()) if (graveyard[i]->GetControlTeamId() == player->GetTeamId())
{ player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, sObjectMgr->GetTrinityStringForDBCLocale(((BfGraveyardWG*)graveyard[i])->GetTextId()), GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + i);
player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, sObjectMgr->GetTrinityStringForDBCLocale(((BfGraveYardWG *) gy[i])->GetTextId()), GOSSIP_SENDER_MAIN,
GOSSIP_ACTION_INFO_DEF + i);
}
}
}
player->SEND_GOSSIP_MENU(player->GetGossipTextId(creature), creature->GetGUID()); player->SEND_GOSSIP_MENU(player->GetGossipTextId(creature), creature->GetGUID());
return true; return true;
@@ -158,129 +205,124 @@ class npc_wg_spirit_guide : public CreatureScript
{ {
player->CLOSE_GOSSIP_MENU(); player->CLOSE_GOSSIP_MENU();
Battlefield* BfWG = sBattlefieldMgr->GetBattlefieldByBattleId(BATTLEFIELD_BATTLEID_WG); Battlefield* wintergrasp = sBattlefieldMgr->GetBattlefieldByBattleId(BATTLEFIELD_BATTLEID_WG);
if (BfWG) if (wintergrasp)
{ {
GraveYardVect gy = BfWG->GetGraveYardVect(); GraveyardVect gy = wintergrasp->GetGraveyardVector();
for (uint8 i = 0; i < gy.size(); i++) for (uint8 i = 0; i < gy.size(); i++)
{
if (action - GOSSIP_ACTION_INFO_DEF == i && gy[i]->GetControlTeamId() == player->GetTeamId()) if (action - GOSSIP_ACTION_INFO_DEF == i && gy[i]->GetControlTeamId() == player->GetTeamId())
{ if (WorldSafeLocsEntry const* safeLoc = sWorldSafeLocsStore.LookupEntry(gy[i]->GetGraveyardId()))
WorldSafeLocsEntry const* ws = sWorldSafeLocsStore.LookupEntry(gy[i]->GetGraveYardId()); player->TeleportTo(safeLoc->map_id, safeLoc->x, safeLoc->y, safeLoc->z, 0);
player->TeleportTo(ws->map_id, ws->x, ws->y, ws->z, 0);
}
}
} }
return true; return true;
} }
struct npc_wg_spirit_guideAI : public ScriptedAI
{
npc_wg_spirit_guideAI(Creature* creature) : ScriptedAI(creature)
{ }
void UpdateAI(const uint32 /* diff */)
{
if (!me->HasUnitState(UNIT_STATE_CASTING))
DoCast(me, SPELL_CHANNEL_SPIRIT_HEAL);
}
};
CreatureAI *GetAI(Creature* creature) const
{
return new npc_wg_spirit_guideAI(creature);
}
}; };
class npc_wg_queue : public CreatureScript class npc_wg_queue : public CreatureScript
{ {
public: public:
npc_wg_queue() : CreatureScript("npc_wg_queue") npc_wg_queue() : CreatureScript("npc_wg_queue") { }
{
}
bool OnGossipHello(Player* player, Creature* creature) bool OnGossipHello(Player* player, Creature* creature)
{ {
if (creature->isQuestGiver()) if (creature->isQuestGiver())
player->PrepareQuestMenu(creature->GetGUID()); player->PrepareQuestMenu(creature->GetGUID());
Battlefield* BfWG = sBattlefieldMgr->GetBattlefieldByBattleId(BATTLEFIELD_BATTLEID_WG); Battlefield* wintergrasp = sBattlefieldMgr->GetBattlefieldByBattleId(BATTLEFIELD_BATTLEID_WG);
if (BfWG) if (!wintergrasp)
{ return true;
if (BfWG->IsWarTime()) if (wintergrasp->IsWarTime())
{ {
player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, sObjectMgr->GetTrinityStringForDBCLocale(WG_NPCQUEUE_TEXTOPTION_JOIN), GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF); player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, sObjectMgr->GetTrinityStringForDBCLocale(WG_NPCQUEUE_TEXTOPTION_JOIN), GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF);
player->SEND_GOSSIP_MENU(BfWG->GetDefenderTeam()? WG_NPCQUEUE_TEXT_H_WAR : WG_NPCQUEUE_TEXT_A_WAR, creature->GetGUID()); player->SEND_GOSSIP_MENU(wintergrasp->GetDefenderTeam()? WG_NPCQUEUE_TEXT_H_WAR : WG_NPCQUEUE_TEXT_A_WAR, creature->GetGUID());
} }
else else
{ {
uint32 uiTime = BfWG->GetTimer() / 1000; uint32 timer = wintergrasp->GetTimer() / 1000;
player->SendUpdateWorldState(4354, time(NULL) + uiTime); player->SendUpdateWorldState(4354, time(NULL) + timer);
if (uiTime < 15 * MINUTE) if (timer < 15 * MINUTE)
{ {
player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, sObjectMgr->GetTrinityStringForDBCLocale(WG_NPCQUEUE_TEXTOPTION_JOIN), GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF); player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, sObjectMgr->GetTrinityStringForDBCLocale(WG_NPCQUEUE_TEXTOPTION_JOIN), GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF);
player->SEND_GOSSIP_MENU(BfWG->GetDefenderTeam() ? WG_NPCQUEUE_TEXT_H_QUEUE : WG_NPCQUEUE_TEXT_A_QUEUE, creature->GetGUID()); player->SEND_GOSSIP_MENU(wintergrasp->GetDefenderTeam() ? WG_NPCQUEUE_TEXT_H_QUEUE : WG_NPCQUEUE_TEXT_A_QUEUE, creature->GetGUID());
} }
else else
{ player->SEND_GOSSIP_MENU(wintergrasp->GetDefenderTeam() ? WG_NPCQUEUE_TEXT_H_NOWAR : WG_NPCQUEUE_TEXT_A_NOWAR, creature->GetGUID());
player->SEND_GOSSIP_MENU(BfWG->GetDefenderTeam() ? WG_NPCQUEUE_TEXT_H_NOWAR : WG_NPCQUEUE_TEXT_A_NOWAR, creature->GetGUID());
}
}
} }
return true; return true;
} }
bool OnGossipSelect(Player* player, Creature* /*creature */ , uint32 /*sender */ , uint32 /*action */ ) bool OnGossipSelect(Player* player, Creature* /*creature */ , uint32 /*sender */ , uint32 /*action*/)
{ {
player->CLOSE_GOSSIP_MENU(); player->CLOSE_GOSSIP_MENU();
Battlefield* BfWG = sBattlefieldMgr->GetBattlefieldByBattleId(BATTLEFIELD_BATTLEID_WG); Battlefield* wintergrasp = sBattlefieldMgr->GetBattlefieldByBattleId(BATTLEFIELD_BATTLEID_WG);
if (BfWG) if (!wintergrasp)
{ return true;
if (BfWG->IsWarTime())
{ if (wintergrasp->IsWarTime())
BfWG->InvitePlayerToWar(player); wintergrasp->InvitePlayerToWar(player);
}
else else
{ {
uint32 uiTime = BfWG->GetTimer() / 1000; uint32 timer = wintergrasp->GetTimer() / 1000;
if (uiTime < 15 * MINUTE) if (timer < 15 * MINUTE)
BfWG->InvitePlayerToQueue(player); wintergrasp->InvitePlayerToQueue(player);
}
} }
return true; return true;
} }
}; };
const uint32 Vehicules[4] = { 32627, 28312, 28094, 27881 };
class go_wg_vehicle_teleporter : public GameObjectScript class go_wg_vehicle_teleporter : public GameObjectScript
{ {
public: public:
go_wg_vehicle_teleporter() : GameObjectScript("go_wg_vehicle_teleporter") go_wg_vehicle_teleporter() : GameObjectScript("go_wg_vehicle_teleporter") { }
{
}
struct go_wg_vehicle_teleporterAI : public GameObjectAI struct go_wg_vehicle_teleporterAI : public GameObjectAI
{ {
go_wg_vehicle_teleporterAI(GameObject* g) : GameObjectAI(g) go_wg_vehicle_teleporterAI(GameObject* gameObject) : GameObjectAI(gameObject),
{ _checkTimer(1000)
uiCheckTimer = 1000; { }
}
void UpdateAI(const uint32 diff) void UpdateAI(const uint32 diff)
{ {
if (uiCheckTimer <= diff) if (_checkTimer <= diff)
{ {
for (uint8 i = 0; i < 4; i++) // Tabulation madness in the hole!
if (Creature* vehicleCreature = go->FindNearestCreature(Vehicules[i], 3.0f, true)) for (uint8 i = 0; i < MAX_WINTERGRASP_VEHICLES; i++)
if (Creature* vehicleCreature = go->FindNearestCreature(vehiclesList[i], 3.0f, true))
if (!vehicleCreature->HasAura(SPELL_VEHICLE_TELEPORT)) if (!vehicleCreature->HasAura(SPELL_VEHICLE_TELEPORT))
if (Vehicle* vehicle = vehicleCreature->GetVehicle()) if (Vehicle* vehicle = vehicleCreature->GetVehicle())
if (Unit* passenger = vehicle->GetPassenger(0)) if (Unit* passenger = vehicle->GetPassenger(0))
{ if (go->GetUInt32Value(GAMEOBJECT_FACTION) == passenger->getFaction())
uint32 gofaction = go->GetUInt32Value(GAMEOBJECT_FACTION); if (Creature* teleportTrigger = vehicleCreature->FindNearestCreature(NPC_WORLD_TRIGGER_LARGE_AOI_NOT_IMMUNE_PC_NPC, 100.0f, true))
uint32 plfaction = passenger->getFaction();
if (gofaction == plfaction)
{
if (Creature* teleportTrigger = vehicleCreature->FindNearestCreature(NPC_WORLD_TRIGGER_WG,100.0f,true))
teleportTrigger->CastSpell(vehicleCreature, SPELL_VEHICLE_TELEPORT, true); teleportTrigger->CastSpell(vehicleCreature, SPELL_VEHICLE_TELEPORT, true);
}
}
uiCheckTimer = 1000; _checkTimer = 1000;
} }
else else _checkTimer -= diff;
uiCheckTimer -= diff;
} }
private: private:
uint32 uiCheckTimer; uint32 _checkTimer;
}; };
GameObjectAI *GetAI(GameObject* go) const GameObjectAI* GetAI(GameObject* go) const
{ {
return new go_wg_vehicle_teleporterAI(go); return new go_wg_vehicle_teleporterAI(go);
} }
@@ -289,121 +331,121 @@ class go_wg_vehicle_teleporter : public GameObjectScript
class npc_wg_quest_giver : public CreatureScript class npc_wg_quest_giver : public CreatureScript
{ {
public: public:
npc_wg_quest_giver() : CreatureScript("npc_wg_quest_giver") npc_wg_quest_giver() : CreatureScript("npc_wg_quest_giver") { }
{
}
bool OnGossipHello(Player* player, Creature* creature) bool OnGossipHello(Player* player, Creature* creature)
{ {
if (creature->isQuestGiver()) if (creature->isQuestGiver())
player->PrepareQuestMenu(creature->GetGUID()); player->PrepareQuestMenu(creature->GetGUID());
Battlefield* BfWG = sBattlefieldMgr->GetBattlefieldByBattleId(BATTLEFIELD_BATTLEID_WG); Battlefield* wintergrasp = sBattlefieldMgr->GetBattlefieldByBattleId(BATTLEFIELD_BATTLEID_WG);
if (BfWG) if (!wintergrasp)
{ return true;
if (creature->isQuestGiver()) if (creature->isQuestGiver())
{ {
Object* object = (Object *) creature; QuestRelationBounds objectQR = sObjectMgr->GetCreatureQuestRelationBounds(creature->GetEntry());
QuestRelations* objectQR = sObjectMgr->GetCreatureQuestRelationMap(); QuestRelationBounds objectQIR = sObjectMgr->GetCreatureQuestInvolvedRelationBounds(creature->GetEntry());
QuestRelations* objectQIR = sObjectMgr->GetCreatureQuestInvolvedRelation();
QuestMenu & qm = player->PlayerTalkClass->GetQuestMenu(); QuestMenu& qm = player->PlayerTalkClass->GetQuestMenu();
qm.ClearMenu(); qm.ClearMenu();
for (QuestRelations::const_iterator i = objectQIR->lower_bound(object->GetEntry()); i != objectQIR->upper_bound(object->GetEntry()); ++i) for (QuestRelations::const_iterator i = objectQIR.first; i != objectQIR.second; ++i)
{ {
uint32 quest_id = i->second; uint32 quest_id = i->second;
QuestStatus status = player->GetQuestStatus(quest_id); QuestStatus status = player->GetQuestStatus(quest_id);
if (status == QUEST_STATUS_COMPLETE && !player->GetQuestRewardStatus(quest_id)) if (status == QUEST_STATUS_COMPLETE)
qm.AddMenuItem(quest_id, 4); qm.AddMenuItem(quest_id, 4);
else if (status == QUEST_STATUS_INCOMPLETE) else if (status == QUEST_STATUS_INCOMPLETE)
qm.AddMenuItem(quest_id, 4); qm.AddMenuItem(quest_id, 4);
//else if (status == QUEST_STATUS_AVAILABLE)
// qm.AddMenuItem(quest_id, 2);
} }
for (QuestRelations::const_iterator i = objectQR->lower_bound(object->GetEntry()); i != objectQR->upper_bound(object->GetEntry()); ++i) for (QuestRelations::const_iterator i = objectQR.first; i != objectQR.second; ++i)
{ {
uint32 quest_id = i->second; uint32 questId = i->second;
Quest const* quest = sObjectMgr->GetQuestTemplate(quest_id); Quest const* quest = sObjectMgr->GetQuestTemplate(questId);
if (!quest) if (!quest)
continue; continue;
switch (quest_id) switch (questId)
{ {
// Horde attacker // Horde attacker
case 13193: case QUEST_BONES_AND_ARROWS_HORDE_ATT:
case 13202: case QUEST_JINXING_THE_WALLS_HORDE_ATT:
case 13180: case QUEST_SLAY_THEM_ALL_HORDE_ATT:
case 13200: case QUEST_FUELING_THE_DEMOLISHERS_HORDE_ATT:
case 13201: case QUEST_HEALING_WITH_ROSES_HORDE_ATT:
case 13223: case QUEST_DEFEND_THE_SIEGE_HORDE_ATT:
if (BfWG->GetAttackerTeam() == TEAM_HORDE) if (wintergrasp->GetAttackerTeam() == TEAM_HORDE)
{ {
QuestStatus status = player->GetQuestStatus(quest_id); QuestStatus status = player->GetQuestStatus(questId);
if (quest->IsAutoComplete() && player->CanTakeQuest(quest, false)) if (quest->IsAutoComplete() && player->CanTakeQuest(quest, false))
qm.AddMenuItem(quest_id, 4); qm.AddMenuItem(questId, 4);
else if (status == QUEST_STATUS_NONE && player->CanTakeQuest(quest, false)) else if (status == QUEST_STATUS_NONE && player->CanTakeQuest(quest, false))
qm.AddMenuItem(quest_id, 2); qm.AddMenuItem(questId, 2);
} }
break; break;
// Horde defender // Horde defender
case 13199: case QUEST_BONES_AND_ARROWS_HORDE_DEF:
case 13192: case QUEST_WARDING_THE_WALLS_HORDE_DEF:
case 13178: case QUEST_SLAY_THEM_ALL_HORDE_DEF:
case 13191: case QUEST_FUELING_THE_DEMOLISHERS_HORDE_DEF:
case 13194: case QUEST_HEALING_WITH_ROSES_HORDE_DEF:
case 13539: case QUEST_TOPPLING_THE_TOWERS_HORDE_DEF:
case 13185: case QUEST_STOP_THE_SIEGE_HORDE_DEF:
if (BfWG->GetDefenderTeam() == TEAM_HORDE) if (wintergrasp->GetDefenderTeam() == TEAM_HORDE)
{ {
QuestStatus status = player->GetQuestStatus(quest_id); QuestStatus status = player->GetQuestStatus(questId);
if (quest->IsAutoComplete() && player->CanTakeQuest(quest, false)) if (quest->IsAutoComplete() && player->CanTakeQuest(quest, false))
qm.AddMenuItem(quest_id, 4); qm.AddMenuItem(questId, 4);
else if (status == QUEST_STATUS_NONE && player->CanTakeQuest(quest, false)) else if (status == QUEST_STATUS_NONE && player->CanTakeQuest(quest, false))
qm.AddMenuItem(quest_id, 2); qm.AddMenuItem(questId, 2);
} }
break; break;
// Alliance attacker // Alliance attacker
case 13196: case QUEST_BONES_AND_ARROWS_ALLIANCE_ATT:
case 13198: case QUEST_WARDING_THE_WARRIORS_ALLIANCE_ATT:
case 13179: case QUEST_NO_MERCY_FOR_THE_MERCILESS_ALLIANCE_ATT:
case 13222: case QUEST_DEFEND_THE_SIEGE_ALLIANCE_ATT:
case 13195: case QUEST_A_RARE_HERB_ALLIANCE_ATT:
if (BfWG->GetAttackerTeam() == TEAM_ALLIANCE) if (wintergrasp->GetAttackerTeam() == TEAM_ALLIANCE)
{ {
QuestStatus status = player->GetQuestStatus(quest_id); QuestStatus status = player->GetQuestStatus(questId);
if (quest->IsAutoComplete() && player->CanTakeQuest(quest, false)) if (quest->IsAutoComplete() && player->CanTakeQuest(quest, false))
qm.AddMenuItem(quest_id, 4); qm.AddMenuItem(questId, 4);
else if (status == QUEST_STATUS_NONE && player->CanTakeQuest(quest, false)) else if (status == QUEST_STATUS_NONE && player->CanTakeQuest(quest, false))
qm.AddMenuItem(quest_id, 2); qm.AddMenuItem(questId, 2);
} }
break; break;
// Alliance defender // Alliance defender
case 13154: case QUEST_BONES_AND_ARROWS_ALLIANCE_DEF:
case 13153: case QUEST_WARDING_THE_WARRIORS_ALLIANCE_DEF:
case 13177: case QUEST_NO_MERCY_FOR_THE_MERCILESS_ALLIANCE_DEF:
case 13538: case QUEST_SHOUTHERN_SABOTAGE_ALLIANCE_DEF:
case 13186: case QUEST_STOP_THE_SIEGE_ALLIANCE_DEF:
case 13156: case QUEST_A_RARE_HERB_ALLIANCE_DEF:
if (BfWG->GetDefenderTeam() == TEAM_ALLIANCE) if (wintergrasp->GetDefenderTeam() == TEAM_ALLIANCE)
{ {
QuestStatus status = player->GetQuestStatus(quest_id); QuestStatus status = player->GetQuestStatus(questId);
if (quest->IsAutoComplete() && player->CanTakeQuest(quest, false)) if (quest->IsAutoComplete() && player->CanTakeQuest(quest, false))
qm.AddMenuItem(quest_id, 4); qm.AddMenuItem(questId, 4);
else if (status == QUEST_STATUS_NONE && player->CanTakeQuest(quest, false)) else if (status == QUEST_STATUS_NONE && player->CanTakeQuest(quest, false))
qm.AddMenuItem(quest_id, 2); qm.AddMenuItem(questId, 2);
} }
break; break;
default: default:
QuestStatus status = player->GetQuestStatus(quest_id); QuestStatus status = player->GetQuestStatus(questId);
if (quest->IsAutoComplete() && player->CanTakeQuest(quest, false)) if (quest->IsAutoComplete() && player->CanTakeQuest(quest, false))
qm.AddMenuItem(quest_id, 4); qm.AddMenuItem(questId, 4);
else if (status == QUEST_STATUS_NONE && player->CanTakeQuest(quest, false)) else if (status == QUEST_STATUS_NONE && player->CanTakeQuest(quest, false))
qm.AddMenuItem(quest_id, 2); qm.AddMenuItem(questId, 2);
break; break;
} }
} }
@@ -411,8 +453,43 @@ class npc_wg_quest_giver : public CreatureScript
player->SEND_GOSSIP_MENU(player->GetGossipTextId(creature), creature->GetGUID()); player->SEND_GOSSIP_MENU(player->GetGossipTextId(creature), creature->GetGUID());
return true; return true;
} }
};
class spell_wintergrasp_force_building : public SpellScriptLoader
{
public:
spell_wintergrasp_force_building() : SpellScriptLoader("spell_wintergrasp_force_building") { }
class spell_wintergrasp_force_building_SpellScript : public SpellScript
{
PrepareSpellScript(spell_wintergrasp_force_building_SpellScript);
bool Validate(SpellInfo const* /*spell*/)
{
if (!sSpellMgr->GetSpellInfo(SPELL_BUILD_CATAPULT_FORCE)
|| !sSpellMgr->GetSpellInfo(SPELL_BUILD_DEMOLISHER_FORCE)
|| !sSpellMgr->GetSpellInfo(SPELL_BUILD_SIEGE_VEHICLE_FORCE_1)
|| !sSpellMgr->GetSpellInfo(SPELL_BUILD_SIEGE_VEHICLE_FORCE_2))
return false;
return true; return true;
} }
void HandleScript(SpellEffIndex effIndex)
{
PreventHitDefaultEffect(effIndex);
GetHitUnit()->CastSpell(GetHitUnit(), GetEffectValue(), true);
}
void Register()
{
OnEffectHitTarget += SpellEffectFn(spell_wintergrasp_force_building_SpellScript::HandleScript, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT);
}
};
SpellScript* GetSpellScript() const
{
return new spell_wintergrasp_force_building_SpellScript();
}
}; };
class achievement_wg_didnt_stand_a_chance : public AchievementCriteriaScript class achievement_wg_didnt_stand_a_chance : public AchievementCriteriaScript
@@ -444,7 +521,9 @@ void AddSC_wintergrasp()
new npc_wg_queue(); new npc_wg_queue();
new npc_wg_spirit_guide(); new npc_wg_spirit_guide();
new npc_wg_demolisher_engineer(); new npc_wg_demolisher_engineer();
new go_wg_vehicle_teleporter();
new npc_wg_quest_giver(); new npc_wg_quest_giver();
new achievement_wg_didnt_stand_a_chance(); new achievement_wg_didnt_stand_a_chance();
new spell_wintergrasp_force_building();
new go_wg_vehicle_teleporter();
} }