From 7724dd00d103b4b97864e342abb2966f1872209e Mon Sep 17 00:00:00 2001 From: Benjamin Jackson <38561765+heyitsbench@users.noreply.github.com> Date: Fri, 11 Jul 2025 07:32:10 -0400 Subject: [PATCH] fix(Core/Battlegrounds): Add Call to Arms bonus data to Alterac Valley and fix bonuses for other battlegrounds. (#21923) --- .../Battlegrounds/Zones/BattlegroundAB.cpp | 6 +- .../game/Battlegrounds/Zones/BattlegroundAB.h | 2 +- .../Battlegrounds/Zones/BattlegroundAV.cpp | 104 +++++++++++++----- .../game/Battlegrounds/Zones/BattlegroundAV.h | 15 ++- .../Battlegrounds/Zones/BattlegroundEY.cpp | 3 +- .../Battlegrounds/Zones/BattlegroundWS.cpp | 26 ++--- 6 files changed, 105 insertions(+), 51 deletions(-) diff --git a/src/server/game/Battlegrounds/Zones/BattlegroundAB.cpp b/src/server/game/Battlegrounds/Zones/BattlegroundAB.cpp index 6b1b58c81..10c0956e5 100644 --- a/src/server/game/Battlegrounds/Zones/BattlegroundAB.cpp +++ b/src/server/game/Battlegrounds/Zones/BattlegroundAB.cpp @@ -419,6 +419,9 @@ TeamId BattlegroundAB::GetPrematureWinner() bool BattlegroundAB::SetupBattleground() { + _honorTics = BattlegroundMgr::IsBGWeekend(GetBgTypeID(true)) ? BG_AB_HONOR_TICK_WEEKEND : BG_AB_HONOR_TICK_NORMAL; + _reputationTics = BattlegroundMgr::IsBGWeekend(GetBgTypeID(true)) ? BG_AB_REP_TICK_WEEKEND : BG_AB_REP_TICK_NORMAL; + for (uint32 i = 0; i < BG_AB_DYNAMIC_NODES_COUNT; ++i) { AddObject(BG_AB_OBJECT_BANNER_NEUTRAL + BG_AB_OBJECTS_PER_NODE * i, BG_AB_OBJECTID_NODE_BANNER_0 + i, BG_AB_NodePositions[i][0], BG_AB_NodePositions[i][1], BG_AB_NodePositions[i][2], BG_AB_NodePositions[i][3], 0, 0, std::sin(BG_AB_NodePositions[i][3] / 2), cos(BG_AB_NodePositions[i][3] / 2), RESPAWN_ONE_DAY); @@ -468,9 +471,6 @@ void BattlegroundAB::Init() _bgEvents.Reset(); - _honorTics = BattlegroundMgr::IsBGWeekend(GetBgTypeID(true)) ? BG_AB_HONOR_TICK_WEEKEND : BG_AB_HONOR_TICK_NORMAL; - _reputationTics = BattlegroundMgr::IsBGWeekend(GetBgTypeID(true)) ? BG_AB_REP_TICK_WEEKEND : BG_AB_REP_TICK_NORMAL; - _capturePointInfo[BG_AB_NODE_STABLES]._iconNone = WORLD_STATE_BATTLEGROUND_AB_STABLE_ICON; _capturePointInfo[BG_AB_NODE_FARM]._iconNone = WORLD_STATE_BATTLEGROUND_AB_FARM_ICON; _capturePointInfo[BG_AB_NODE_BLACKSMITH]._iconNone = WORLD_STATE_BATTLEGROUND_AB_BLACKSMITH_ICON; diff --git a/src/server/game/Battlegrounds/Zones/BattlegroundAB.h b/src/server/game/Battlegrounds/Zones/BattlegroundAB.h index 3a100b0fb..a250c9f16 100644 --- a/src/server/game/Battlegrounds/Zones/BattlegroundAB.h +++ b/src/server/game/Battlegrounds/Zones/BattlegroundAB.h @@ -166,7 +166,7 @@ enum BG_AB_Misc BG_AB_HONOR_TICK_NORMAL = 260, BG_AB_HONOR_TICK_WEEKEND = 160, BG_AB_REP_TICK_NORMAL = 160, - BG_AB_REP_TICK_WEEKEND = 120, + BG_AB_REP_TICK_WEEKEND = 150, BG_AB_WARNING_NEAR_VICTORY_SCORE = 1400, BG_AB_MAX_TEAM_SCORE = 1600, diff --git a/src/server/game/Battlegrounds/Zones/BattlegroundAV.cpp b/src/server/game/Battlegrounds/Zones/BattlegroundAV.cpp index 433601b42..5b6a8b335 100644 --- a/src/server/game/Battlegrounds/Zones/BattlegroundAV.cpp +++ b/src/server/game/Battlegrounds/Zones/BattlegroundAV.cpp @@ -16,6 +16,7 @@ */ #include "BattlegroundAV.h" +#include "BattlegroundMgr.h" #include "CreatureTextMgr.h" #include "Formulas.h" #include "GameEventMgr.h" @@ -56,6 +57,14 @@ BattlegroundAV::BattlegroundAV() m_Mine_Timer = 0; + _reputationTower = 0; + _reputationCaptain = 0; + _reputationBoss = 0; + _reputationPerOwnedGraveyard = 0; + _reputationSurvivingCaptain = 0; + _reputationSurvivingTower = 0; + _reputationPerOwnedMine = 0; + for (BG_AV_Nodes i = BG_AV_NODES_FIRSTAID_STATION; i < BG_AV_NODES_MAX; ++i) InitNode(i, TEAM_NEUTRAL, false); @@ -93,7 +102,7 @@ void BattlegroundAV::HandleKillUnit(Creature* unit, Player* killer) if (entry == BG_AV_CreatureInfo[AV_NPC_A_BOSS]) { CastSpellOnTeam(23658, TEAM_HORDE); //this is a spell which finishes a quest where a player has to kill the boss - RewardReputationToTeam(729, BG_AV_REP_BOSS, TEAM_HORDE); + RewardReputationToTeam(729, _reputationBoss, TEAM_HORDE); RewardHonorToTeam(GetBonusHonorFromKill(BG_AV_KILL_BOSS), TEAM_HORDE); EndBattleground(TEAM_HORDE); DelCreature(AV_CPLACE_TRIGGER17); @@ -101,7 +110,7 @@ void BattlegroundAV::HandleKillUnit(Creature* unit, Player* killer) else if (entry == BG_AV_CreatureInfo[AV_NPC_H_BOSS]) { CastSpellOnTeam(23658, TEAM_ALLIANCE); //this is a spell which finishes a quest where a player has to kill the boss - RewardReputationToTeam(730, BG_AV_REP_BOSS, TEAM_ALLIANCE); + RewardReputationToTeam(730, _reputationBoss, TEAM_ALLIANCE); RewardHonorToTeam(GetBonusHonorFromKill(BG_AV_KILL_BOSS), TEAM_ALLIANCE); EndBattleground(TEAM_ALLIANCE); DelCreature(AV_CPLACE_TRIGGER19); @@ -114,7 +123,7 @@ void BattlegroundAV::HandleKillUnit(Creature* unit, Player* killer) return; } m_CaptainAlive[0] = false; - RewardReputationToTeam(729, BG_AV_REP_CAPTAIN, TEAM_HORDE); + RewardReputationToTeam(729, _reputationCaptain, TEAM_HORDE); RewardHonorToTeam(GetBonusHonorFromKill(BG_AV_KILL_CAPTAIN), TEAM_HORDE); UpdateScore(TEAM_ALLIANCE, (-1)*BG_AV_RES_CAPTAIN); //spawn destroyed aura @@ -132,7 +141,7 @@ void BattlegroundAV::HandleKillUnit(Creature* unit, Player* killer) return; } m_CaptainAlive[1] = false; - RewardReputationToTeam(730, BG_AV_REP_CAPTAIN, TEAM_ALLIANCE); + RewardReputationToTeam(730, _reputationCaptain, TEAM_ALLIANCE); RewardHonorToTeam(GetBonusHonorFromKill(BG_AV_KILL_CAPTAIN), TEAM_ALLIANCE); UpdateScore(TEAM_HORDE, (-1)*BG_AV_RES_CAPTAIN); //spawn destroyed aura @@ -174,7 +183,7 @@ void BattlegroundAV::HandleQuestComplete(uint32 questid, Player* player) { LOG_DEBUG("bg.battleground", "BG_AV Quest {} completed starting with unit upgrading..", questid); for (BG_AV_Nodes i = BG_AV_NODES_FIRSTAID_STATION; i <= BG_AV_NODES_FROSTWOLF_HUT; ++i) - if (m_Nodes[i].OwnerId == player->GetTeamId() && m_Nodes[i].State == POINT_CONTROLED) + if (m_Nodes[i].OwnerId == player->GetTeamId() && m_Nodes[i].State == POINT_CONTROLLED) { DePopulateNode(i); PopulateNode(i); @@ -503,29 +512,49 @@ void BattlegroundAV::EndBattleground(TeamId winnerTeamId) //first towers: uint8 kills[2] = {0, 0}; // 0 = Alliance 1 = Horde uint8 rep[2] = {0, 0}; // 0 = Alliance 1 = Horde + + if (BattlegroundMgr::IsBGWeekend(GetBgTypeID(true))) + kills[winnerTeamId] += 4; + for (BG_AV_Nodes i = BG_AV_NODES_DUNBALDAR_SOUTH; i <= BG_AV_NODES_FROSTWOLF_WTOWER; ++i) { - if (m_Nodes[i].State == POINT_CONTROLED) + if (m_Nodes[i].State == POINT_CONTROLLED) { - if (m_Nodes[i].OwnerId == TEAM_ALLIANCE) - { - rep[0] += BG_AV_REP_SURVIVING_TOWER; - kills[0] += BG_AV_KILL_SURVIVING_TOWER; - } + if (m_Nodes[i].OwnerId == TEAM_NEUTRAL) + continue; else { - rep[0] += BG_AV_KILL_SURVIVING_TOWER; - kills[1] += BG_AV_KILL_SURVIVING_TOWER; + rep[m_Nodes[i].OwnerId] += _reputationSurvivingTower; + kills[m_Nodes[i].OwnerId] += BG_AV_KILL_SURVIVING_TOWER; } } } + for (uint8 i = BG_AV_NODES_FIRSTAID_STATION; i <= BG_AV_NODES_FROSTWOLF_HUT; ++i) + { + if (m_Nodes[i].State == POINT_CONTROLLED) + { + if (m_Nodes[i].OwnerId == TEAM_NEUTRAL) + continue; + else + rep[m_Nodes[i].OwnerId] += _reputationPerOwnedGraveyard; + } + } + + for (uint8 mine = 0; mine < 2; mine++) + { + if (m_Mine_Owner[mine] == TEAM_NEUTRAL) + continue; + + rep[m_Mine_Owner[mine]] += _reputationPerOwnedMine; + } + for (TeamId iTeamId = TEAM_ALLIANCE; iTeamId <= TEAM_HORDE; iTeamId = TeamId(iTeamId + 1)) { if (m_CaptainAlive[iTeamId]) { kills[iTeamId] += BG_AV_KILL_SURVIVING_CAPTAIN; - rep[iTeamId] += BG_AV_REP_SURVIVING_CAPTAIN; + rep[iTeamId] += _reputationSurvivingCaptain; } if (rep[iTeamId] != 0) RewardReputationToTeam(iTeamId == TEAM_ALLIANCE ? 730 : 729, rep[iTeamId], iTeamId); @@ -629,7 +658,7 @@ void BattlegroundAV::EventPlayerDestroyedPoint(BG_AV_Nodes node) SpawnBGObject(BG_AV_OBJECT_BURN_DUNBALDAR_SOUTH + i + (tmp * 10), RESPAWN_IMMEDIATELY); UpdateScore((ownerId == TEAM_ALLIANCE) ? TEAM_HORDE : TEAM_ALLIANCE, -1 * BG_AV_RES_TOWER); - RewardReputationToTeam(ownerId == TEAM_ALLIANCE ? 730 : 729, BG_AV_REP_TOWER, ownerId); + RewardReputationToTeam(ownerId == TEAM_ALLIANCE ? 730 : 729, _reputationTower, ownerId); RewardHonorToTeam(GetBonusHonorFromKill(BG_AV_KILL_TOWER), ownerId); SpawnBGObject(static_cast(BG_AV_OBJECT_TAURA_A_DUNBALDAR_SOUTH) + ownerId + (2 * tmp), RESPAWN_ONE_DAY); @@ -863,7 +892,7 @@ uint32 BattlegroundAV::GetObjectThroughNode(BG_AV_Nodes node) if (node >= BG_AV_NODES_ICEBLOOD_TOWER && node <= BG_AV_NODES_FROSTWOLF_WTOWER) return node + 7; } - else if (m_Nodes[node].State == POINT_CONTROLED) + else if (m_Nodes[node].State == POINT_CONTROLLED) if (node <= BG_AV_NODES_STONEHEART_BUNKER) return node; } @@ -874,7 +903,7 @@ uint32 BattlegroundAV::GetObjectThroughNode(BG_AV_Nodes node) if (node <= BG_AV_NODES_STONEHEART_BUNKER) return node + 22; } - else if (m_Nodes[node].State == POINT_CONTROLED) + else if (m_Nodes[node].State == POINT_CONTROLLED) { if (node <= BG_AV_NODES_FROSTWOLF_HUT) return node + 33; @@ -1010,7 +1039,7 @@ void BattlegroundAV::EventPlayerAssaultsPoint(Player* player, uint32 object) } else if (m_Nodes[node].TotalOwnerId == TEAM_NEUTRAL) //recapping, when no team owns this node realy { - if (!(m_Nodes[node].State != POINT_CONTROLED)) + if (!(m_Nodes[node].State != POINT_CONTROLLED)) return; if (teamId == TEAM_ALLIANCE) @@ -1138,14 +1167,14 @@ uint8 BattlegroundAV::GetWorldStateType(uint8 state, TeamId teamId) //this is us //a_c a_a h_c h_a the positions in worldstate-array if (teamId == TEAM_ALLIANCE) { - if (state == POINT_CONTROLED || state == POINT_DESTROYED) + if (state == POINT_CONTROLLED || state == POINT_DESTROYED) return 0; if (state == POINT_ASSAULTED) return 1; } if (teamId == TEAM_HORDE) { - if (state == POINT_DESTROYED || state == POINT_CONTROLED) + if (state == POINT_DESTROYED || state == POINT_CONTROLLED) return 2; if (state == POINT_ASSAULTED) return 3; @@ -1193,7 +1222,7 @@ GraveyardStruct const* BattlegroundAV::GetClosestGraveyard(Player* player) minDist = (pGraveyard->x - x) * (pGraveyard->x - x) + (pGraveyard->y - y) * (pGraveyard->y - y); for (uint8 i = BG_AV_NODES_FIRSTAID_STATION; i <= BG_AV_NODES_FROSTWOLF_HUT; ++i) - if (m_Nodes[i].OwnerId == player->GetTeamId() && m_Nodes[i].State == POINT_CONTROLED) + if (m_Nodes[i].OwnerId == player->GetTeamId() && m_Nodes[i].State == POINT_CONTROLLED) { entry = sGraveyard->GetGraveyard(BG_AV_GraveyardIds[i]); if (entry) @@ -1211,6 +1240,27 @@ GraveyardStruct const* BattlegroundAV::GetClosestGraveyard(Player* player) bool BattlegroundAV::SetupBattleground() { + if (sBattlegroundMgr->IsBGWeekend(GetBgTypeID(true))) + { + _reputationTower = 18; + _reputationCaptain = 185; + _reputationBoss = 525; + _reputationPerOwnedGraveyard = 18; + _reputationSurvivingCaptain = 175; + _reputationSurvivingTower = 18; + _reputationPerOwnedMine = 36; + } + else + { + _reputationTower = 12; + _reputationCaptain = 125; + _reputationBoss = sWorld->getIntConfig(CONFIG_BATTLEGROUND_ALTERAC_REP_ONBOSSDEATH); + _reputationPerOwnedGraveyard = 12; + _reputationSurvivingCaptain = 125; + _reputationSurvivingTower = 12; + _reputationPerOwnedMine = 24; + } + // Create starting objects //spawn node-objects @@ -1735,7 +1785,7 @@ void BattlegroundAV::DestroyNode(BG_AV_Nodes node) m_Nodes[node].TotalOwnerId = m_Nodes[node].OwnerId; m_Nodes[node].PrevOwnerId = m_Nodes[node].OwnerId; m_Nodes[node].PrevState = m_Nodes[node].State; - m_Nodes[node].State = (m_Nodes[node].Tower) ? POINT_DESTROYED : POINT_CONTROLED; + m_Nodes[node].State = (m_Nodes[node].Tower) ? POINT_DESTROYED : POINT_CONTROLLED; m_Nodes[node].Timer = 0; } @@ -1744,7 +1794,7 @@ void BattlegroundAV::InitNode(BG_AV_Nodes node, TeamId teamId, bool tower) m_Nodes[node].TotalOwnerId = teamId; m_Nodes[node].OwnerId = teamId; m_Nodes[node].PrevOwnerId = TEAM_NEUTRAL; - m_Nodes[node].State = POINT_CONTROLED; + m_Nodes[node].State = POINT_CONTROLLED; m_Nodes[node].PrevState = m_Nodes[node].State; m_Nodes[node].Timer = 0; m_Nodes[node].Tower = tower; @@ -1754,11 +1804,11 @@ void BattlegroundAV::DefendNode(BG_AV_Nodes node, TeamId teamId) { ASSERT(m_Nodes[node].TotalOwnerId == teamId); ASSERT(m_Nodes[node].OwnerId != teamId); - ASSERT(m_Nodes[node].State != POINT_CONTROLED && m_Nodes[node].State != POINT_DESTROYED); + ASSERT(m_Nodes[node].State != POINT_CONTROLLED && m_Nodes[node].State != POINT_DESTROYED); m_Nodes[node].PrevOwnerId = m_Nodes[node].OwnerId; m_Nodes[node].OwnerId = teamId; m_Nodes[node].PrevState = m_Nodes[node].State; - m_Nodes[node].State = POINT_CONTROLED; + m_Nodes[node].State = POINT_CONTROLLED; m_Nodes[node].Timer = 0; } @@ -1805,7 +1855,7 @@ bool BattlegroundAV::IsAllTowersControlledAndCaptainAlive(TeamId teamId) const { for (BG_AV_Nodes i = BG_AV_NODES_DUNBALDAR_SOUTH; i <= BG_AV_NODES_STONEHEART_BUNKER; ++i) // alliance towers controlled { - if (m_Nodes[i].State == POINT_CONTROLED) + if (m_Nodes[i].State == POINT_CONTROLLED) { if (m_Nodes[i].OwnerId != TEAM_ALLIANCE) return false; @@ -1824,7 +1874,7 @@ bool BattlegroundAV::IsAllTowersControlledAndCaptainAlive(TeamId teamId) const { for (BG_AV_Nodes i = BG_AV_NODES_ICEBLOOD_TOWER; i <= BG_AV_NODES_FROSTWOLF_WTOWER; ++i) // horde towers controlled { - if (m_Nodes[i].State == POINT_CONTROLED) + if (m_Nodes[i].State == POINT_CONTROLLED) { if (m_Nodes[i].OwnerId != TEAM_HORDE) return false; diff --git a/src/server/game/Battlegrounds/Zones/BattlegroundAV.h b/src/server/game/Battlegrounds/Zones/BattlegroundAV.h index d65fb8a86..a058f1d98 100644 --- a/src/server/game/Battlegrounds/Zones/BattlegroundAV.h +++ b/src/server/game/Battlegrounds/Zones/BattlegroundAV.h @@ -29,23 +29,18 @@ #define SEND_MSG_NEAR_LOSE 120 #define BG_AV_KILL_BOSS 4 -#define BG_AV_REP_BOSS (sWorld->getIntConfig(CONFIG_BATTLEGROUND_ALTERAC_REP_ONBOSSDEATH)) // Blizzlike default is 350 #define BG_AV_KILL_CAPTAIN 3 -#define BG_AV_REP_CAPTAIN 125 #define BG_AV_RES_CAPTAIN 100 #define BG_AV_KILL_TOWER 3 -#define BG_AV_REP_TOWER 12 #define BG_AV_RES_TOWER 75 #define BG_AV_GET_COMMANDER 1 //for a safely returned wingcommander //bonushonor at the end #define BG_AV_KILL_SURVIVING_TOWER 2 -#define BG_AV_REP_SURVIVING_TOWER 12 #define BG_AV_KILL_SURVIVING_CAPTAIN 2 -#define BG_AV_REP_SURVIVING_CAPTAIN 125 #define AV_EVENT_START_BATTLE 9166 // Achievement: The Alterac Blitz @@ -1546,7 +1541,7 @@ enum BG_AV_States POINT_NEUTRAL = 0, POINT_ASSAULTED = 1, POINT_DESTROYED = 2, - POINT_CONTROLED = 3 + POINT_CONTROLLED = 3 }; //alliance_control neutral_control horde_control @@ -1844,6 +1839,14 @@ private: uint32 m_CaptainBuffTimer[2] {}; bool m_CaptainAlive[2] {}; + uint32 _reputationTower = 0; // 12, 18 + uint32 _reputationCaptain = 0; // 125, 185 + uint32 _reputationBoss = 0; // 350, 525 + uint32 _reputationPerOwnedGraveyard = 0; // 12, 18 + uint32 _reputationSurvivingCaptain = 0; // 125, 175 + uint32 _reputationSurvivingTower = 0; // 12, 18 + uint32 _reputationPerOwnedMine = 0; // 24, 36 + bool m_IsInformedNearVictory[2] {}; }; diff --git a/src/server/game/Battlegrounds/Zones/BattlegroundEY.cpp b/src/server/game/Battlegrounds/Zones/BattlegroundEY.cpp index 0b5e665c8..ed636bcf5 100644 --- a/src/server/game/Battlegrounds/Zones/BattlegroundEY.cpp +++ b/src/server/game/Battlegrounds/Zones/BattlegroundEY.cpp @@ -263,6 +263,8 @@ void BattlegroundEY::HandleAreaTrigger(Player* player, uint32 trigger) bool BattlegroundEY::SetupBattleground() { + _honorTics = BattlegroundMgr::IsBGWeekend(GetBgTypeID(true)) ? BG_EY_HONOR_TICK_WEEKEND : BG_EY_HONOR_TICK_NORMAL; + // doors AddObject(BG_EY_OBJECT_DOOR_A, BG_OBJECT_A_DOOR_EY_ENTRY, 2527.6f, 1596.91f, 1262.13f, -3.12414f, -0.173642f, -0.001515f, 0.98477f, -0.008594f, RESPAWN_IMMEDIATELY); AddObject(BG_EY_OBJECT_DOOR_H, BG_OBJECT_H_DOOR_EY_ENTRY, 1803.21f, 1539.49f, 1261.09f, 3.14159f, 0.173648f, 0, 0.984808f, 0, RESPAWN_IMMEDIATELY); @@ -355,7 +357,6 @@ void BattlegroundEY::Init() Battleground::Init(); _bgEvents.Reset(); - _honorTics = BattlegroundMgr::IsBGWeekend(GetBgTypeID(true)) ? BG_EY_HONOR_TICK_WEEKEND : BG_EY_HONOR_TICK_NORMAL; _ownedPointsCount[TEAM_ALLIANCE] = 0; _ownedPointsCount[TEAM_HORDE] = 0; _flagKeeperGUID.Clear(); diff --git a/src/server/game/Battlegrounds/Zones/BattlegroundWS.cpp b/src/server/game/Battlegrounds/Zones/BattlegroundWS.cpp index e4e154f6e..272f07fba 100644 --- a/src/server/game/Battlegrounds/Zones/BattlegroundWS.cpp +++ b/src/server/game/Battlegrounds/Zones/BattlegroundWS.cpp @@ -426,6 +426,19 @@ void BattlegroundWS::HandleAreaTrigger(Player* player, uint32 trigger) bool BattlegroundWS::SetupBattleground() { + if (sBattlegroundMgr->IsBGWeekend(GetBgTypeID(true))) + { + _reputationCapture = 45; + _honorWinKills = 3; + _honorEndKills = 4; + } + else + { + _reputationCapture = 35; + _honorWinKills = 1; + _honorEndKills = 2; + } + // flags AddObject(BG_WS_OBJECT_A_FLAG, BG_OBJECT_A_FLAG_WS_ENTRY, 1540.423f, 1481.325f, 351.8284f, 3.089233f, 0, 0, 0.9996573f, 0.02617699f, RESPAWN_IMMEDIATELY); AddObject(BG_WS_OBJECT_H_FLAG, BG_OBJECT_H_FLAG_WS_ENTRY, 916.0226f, 1434.405f, 345.413f, 0.01745329f, 0, 0, 0.008726535f, 0.9999619f, RESPAWN_IMMEDIATELY); @@ -486,19 +499,6 @@ void BattlegroundWS::Init() _flagState[TEAM_HORDE] = BG_WS_FLAG_STATE_ON_BASE; _lastFlagCaptureTeam = TEAM_NEUTRAL; - if (sBattlegroundMgr->IsBGWeekend(GetBgTypeID(true))) - { - _reputationCapture = 45; - _honorWinKills = 3; - _honorEndKills = 4; - } - else - { - _reputationCapture = 35; - _honorWinKills = 1; - _honorEndKills = 2; - } - uint32 bgWarsongFlagsConfig = sWorld->getIntConfig(CONFIG_BATTLEGROUND_WARSONG_FLAGS); _configurableMaxTeamScore = bgWarsongFlagsConfig > 0 ? bgWarsongFlagsConfig