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

Core/Battlefield: removed "magic numbers"

Browse Source
This commit is contained in:
Imprtat
2012-08-20 13:25:48 -04:00
committed by Kandera
parent eb669c31e2
commit 4ac5301c9f
2 changed files with 14 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/server/game/Battlefield/Zones/BattlefieldWG.cpp
+7 -18
View File
@@ -482,10 +482,7 @@ void BattlefieldWG::OnBattleEnd(bool endbytimer)
player->RewardHonor(NULL, 1, WinHonor); player->RewardHonor(NULL, 1, WinHonor);
RewardMarkOfHonor(player, 2); RewardMarkOfHonor(player, 2);
} }
if (player->GetTeamId() == TEAM_HORDE) IncrementQuest(player, WGQuest[killer->GetTeamId()][1], true);
IncrementQuest(player, 13183, true);
else
IncrementQuest(player, 13181, true);
// 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
@@ -939,12 +936,7 @@ void BattlefieldWG::BrokenWallOrTower(TeamId team)
for (GuidSet::const_iterator p_itr = m_PlayersInWar[GetAttackerTeam()].begin(); p_itr != m_PlayersInWar[GetAttackerTeam()].end(); ++p_itr) for (GuidSet::const_iterator p_itr = m_PlayersInWar[GetAttackerTeam()].begin(); p_itr != m_PlayersInWar[GetAttackerTeam()].end(); ++p_itr)
{ {
if (Player* player = sObjectMgr->GetPlayer((*p_itr))) if (Player* player = sObjectMgr->GetPlayer((*p_itr)))
{ IncrementQuest(player, WGQuest[killer->GetTeamId()][2], true);
if (player->GetTeamId() == TEAM_ALLIANCE)
IncrementQuest(player, 13222);
else
IncrementQuest(player, 13223);
}
} }
} }
} }
@@ -968,10 +960,7 @@ void BattlefieldWG::AddBrokenTower(TeamId team)
if (Player* player = sObjectMgr->GetPlayer((*itr))) if (Player* player = sObjectMgr->GetPlayer((*itr)))
{ {
player->CastSpell(player, SPELL_TOWER_CONTROL, true); player->CastSpell(player, SPELL_TOWER_CONTROL, true);
if (player->GetTeamId() == TEAM_HORDE) IncrementQuest(player, WGQuest[killer->GetTeamId()][3], true);
IncrementQuest(player, 13539, true);
else
IncrementQuest(player, 13538, true);
DoCompleteOrIncrementAchievement(ACHIEVEMENTS_WG_TOWER_DESTROY, player); DoCompleteOrIncrementAchievement(ACHIEVEMENTS_WG_TOWER_DESTROY, player);
} }
// If the threw south tower is destroy // If the threw south tower is destroy
@@ -1043,10 +1032,10 @@ void BattlefieldWG::AddDamagedTower(TeamId team)
// Update vehicle count WorldState to player // Update vehicle count WorldState to player
void BattlefieldWG::UpdateVehicleCountWG() void BattlefieldWG::UpdateVehicleCountWG()
{ {
SendUpdateWorldState(3490, GetData(BATTLEFIELD_WG_DATA_VEHICLE_H)); SendUpdateWorldState(BATTLEFIELD_WG_WORLD_STATE_VEHICLE_H, GetData(BATTLEFIELD_WG_DATA_VEHICLE_H));
SendUpdateWorldState(3491, GetData(BATTLEFIELD_WG_DATA_MAX_VEHICLE_H)); SendUpdateWorldState(BATTLEFIELD_WG_WORLD_STATE_MAX_VEHICLE_H, GetData(BATTLEFIELD_WG_DATA_MAX_VEHICLE_H));
SendUpdateWorldState(3680, GetData(BATTLEFIELD_WG_DATA_VEHICLE_A)); SendUpdateWorldState(BATTLEFIELD_WG_WORLD_STATE_VEHICLE_A, GetData(BATTLEFIELD_WG_DATA_VEHICLE_A));
SendUpdateWorldState(3681, GetData(BATTLEFIELD_WG_DATA_MAX_VEHICLE_A)); SendUpdateWorldState(BATTLEFIELD_WG_WORLD_STATE_MAX_VEHICLE_A, GetData(BATTLEFIELD_WG_DATA_MAX_VEHICLE_A));
} }
void BattlefieldWG::UpdateTenacity() void BattlefieldWG::UpdateTenacity()
src/server/game/Battlefield/Zones/BattlefieldWG.h
+4
View File
@@ -134,6 +134,10 @@ enum WB_ACHIEVEMENTS
enum eWGWorldStates enum eWGWorldStates
{ {
BATTLEFIELD_WG_WORLD_STATE_VEHICLE_H = 3490,
BATTLEFIELD_WG_WORLD_STATE_MAX_VEHICLE_H = 3491,
BATTLEFIELD_WG_WORLD_STATE_VEHICLE_A = 3680,
BATTLEFIELD_WG_WORLD_STATE_MAX_VEHICLE_A = 3681,
BATTLEFIELD_WG_WORLD_STATE_ACTIVE = 3801, BATTLEFIELD_WG_WORLD_STATE_ACTIVE = 3801,
BATTLEFIELD_WG_WORLD_STATE_DEFENDER = 3802, BATTLEFIELD_WG_WORLD_STATE_DEFENDER = 3802,
BATTLEFIELD_WG_WORLD_STATE_ATTACKER = 3803, BATTLEFIELD_WG_WORLD_STATE_ATTACKER = 3803,