diff options
| -rw-r--r-- | src/server/game/Entities/Player/Player.cpp | 4 | ||||
| -rw-r--r-- | src/server/game/World/World.cpp | 3 | ||||
| -rw-r--r-- | src/server/game/World/World.h | 1 | ||||
| -rw-r--r-- | src/server/worldserver/worldserver.conf.dist | 15 |
4 files changed, 16 insertions, 7 deletions
diff --git a/src/server/game/Entities/Player/Player.cpp b/src/server/game/Entities/Player/Player.cpp index 02482f27f02..b49a30f3c37 100644 --- a/src/server/game/Entities/Player/Player.cpp +++ b/src/server/game/Entities/Player/Player.cpp @@ -6669,11 +6669,13 @@ void Player::SendPvpRewards() const pvpRewardsResponse.FirstRandomBGWinReward.Currency.push_back(WorldPackets::LFG::LfgPlayerQuestRewardCurrency(CLASSIC_CONQUEST_CURRENCY_ID, static_cast<int32>(sWorld->getIntConfig(CONFIG_BG_REWARD_WINNER_CONQUEST_FIRST)))); pvpRewardsResponse.NthRandomBGWinReward.Honor = sWorld->getIntConfig(CONFIG_BG_REWARD_WINNER_HONOR_LAST); - pvpRewardsResponse.FirstRandomBGWinReward.Currency.push_back(WorldPackets::LFG::LfgPlayerQuestRewardCurrency(CLASSIC_CONQUEST_CURRENCY_ID, static_cast<int32>(sWorld->getIntConfig(CONFIG_BG_REWARD_WINNER_CONQUEST_LAST)))); + pvpRewardsResponse.NthRandomBGWinReward.Currency.push_back(WorldPackets::LFG::LfgPlayerQuestRewardCurrency(CLASSIC_CONQUEST_CURRENCY_ID, static_cast<int32>(sWorld->getIntConfig(CONFIG_BG_REWARD_WINNER_CONQUEST_LAST)))); pvpRewardsResponse.FirstRandomBGLossReward.Honor = sWorld->getIntConfig(CONFIG_BG_REWARD_LOSER_HONOR_FIRST); pvpRewardsResponse.NthRandomBGLossReward.Honor = sWorld->getIntConfig(CONFIG_BG_REWARD_LOSER_HONOR_LAST); + pvpRewardsResponse.RatedBGRewards.Currency.push_back(WorldPackets::LFG::LfgPlayerQuestRewardCurrency(CLASSIC_CONQUEST_CURRENCY_ID, static_cast<int32>(sWorld->getIntConfig(CONFIG_BG_RATED_REWARD_WINNER_CONQUEST)))); + SendDirectMessage(pvpRewardsResponse.Write()); } diff --git a/src/server/game/World/World.cpp b/src/server/game/World/World.cpp index 5621ed5e045..60b4a29d711 100644 --- a/src/server/game/World/World.cpp +++ b/src/server/game/World/World.cpp @@ -1614,6 +1614,9 @@ void World::LoadConfigSettings(bool reload) m_int_configs[CONFIG_BG_REWARD_LOSER_HONOR_FIRST] = sConfigMgr->GetIntDefault("Battleground.RewardLoserHonorFirst", 9000); m_int_configs[CONFIG_BG_REWARD_LOSER_HONOR_LAST] = sConfigMgr->GetIntDefault("Battleground.RewardLoserHonorLast", 9000); + // Ratted Battleground Rewards + m_int_configs[CONFIG_BG_RATED_REWARD_WINNER_CONQUEST] = sConfigMgr->GetIntDefault("Battleground.RatedRewardWinnerConquest", 75000); + // Max instances per hour m_int_configs[CONFIG_MAX_INSTANCES_PER_HOUR] = sConfigMgr->GetIntDefault("AccountInstancesPerHour", 5); diff --git a/src/server/game/World/World.h b/src/server/game/World/World.h index 56892b85884..d3ae3e7f44a 100644 --- a/src/server/game/World/World.h +++ b/src/server/game/World/World.h @@ -412,6 +412,7 @@ enum WorldIntConfigs CONFIG_BG_REWARD_LOSER_HONOR_LAST, CONFIG_BG_REWARD_WINNER_CONQUEST_FIRST, CONFIG_BG_REWARD_WINNER_CONQUEST_LAST, + CONFIG_BG_RATED_REWARD_WINNER_CONQUEST, CONFIG_CREATURE_PICKPOCKET_REFILL, CONFIG_CREATURE_STOP_FOR_PLAYER, CONFIG_AHBOT_UPDATE_INTERVAL, diff --git a/src/server/worldserver/worldserver.conf.dist b/src/server/worldserver/worldserver.conf.dist index 53ee5dc8218..39bd12adfca 100644 --- a/src/server/worldserver/worldserver.conf.dist +++ b/src/server/worldserver/worldserver.conf.dist @@ -2891,13 +2891,15 @@ Battleground.Random.ResetHour = 6 # Battleground.RewardWinnerConquestLast # Battleground.RewardLoserHonorFirst # Battleground.RewardLoserHonorLast +# Battleground.RatedRewardWinnerConquest # Description: Random Battlegrounds / call to the arms rewards. -# Default: 30 - Battleground.RewardWinnerHonorFirst -# 25 - Battleground.RewardWinnerArenaFirst -# 15 - Battleground.RewardWinnerHonorLast -# 0 - Battleground.RewardWinnerArenaLast -# 5 - Battleground.RewardLoserHonorFirst -# 5 - Battleground.RewardLoserHonorLast +# Default: 54000 - Battleground.RewardWinnerHonorFirst +# 12000 - Battleground.RewardWinnerConquestFirst +# 54000 - Battleground.RewardWinnerHonorLast +# 10000 - Battleground.RewardWinnerConquestLast +# 9000 - Battleground.RewardLoserHonorFirst +# 9000 - Battleground.RewardLoserHonorLast +# 75000 - Battleground.RatedRewardWinnerConquest # Battleground.RewardWinnerHonorFirst = 54000 @@ -2906,6 +2908,7 @@ Battleground.RewardWinnerHonorLast = 54000 Battleground.RewardWinnerConquestLast = 10000 Battleground.RewardLoserHonorFirst = 9000 Battleground.RewardLoserHonorLast = 9000 +Battleground.RatedRewardWinnerConquest = 75000 # # Battleground.ReportAFK |