Core/Arenas:
- You earn 180 cp when you win a match - Correctly display cp to the good currency meta - Rename a currency meta to avoid errors
This commit is contained in:
1 parent
3a4bb8fae0
commit
cb118cddc7
6 files changed
+13
-13
No files matched your search
@@ -938,13 +938,13 @@ void Battleground::EndBattleground(uint32 winner)
|
||||
UpdatePlayerScore(player, SCORE_BONUS_HONOR, GetBonusHonorFromKill(winner_kills));
|
||||
if (!player->GetRandomWinner())
|
||||
{
|
||||
// 100cp awarded for the first rated battleground won each day
|
||||
player->ModifyCurrency(CURRENCY_TYPE_CONQUEST_META_BG, BG_REWARD_WINNER_CONQUEST_FIRST);
|
||||
// 100cp awarded for the first random battleground won each day
|
||||
player->ModifyCurrency(CURRENCY_TYPE_CONQUEST_META_ARENA, BG_REWARD_WINNER_CONQUEST_FIRST);
|
||||
player->SetRandomWinner(true);
|
||||
}
|
||||
}
|
||||
else // 50cp awarded for each non-rated battleground won
|
||||
player->ModifyCurrency(CURRENCY_TYPE_CONQUEST_META_BG, BG_REWARD_WINNER_CONQUEST_LAST );
|
||||
player->ModifyCurrency(CURRENCY_TYPE_CONQUEST_META_ARENA, BG_REWARD_WINNER_CONQUEST_LAST);
|
||||
|
||||
player->UpdateAchievementCriteria(ACHIEVEMENT_CRITERIA_TYPE_WIN_BG, 1);
|
||||
if (!guildAwarded)
|
||||
|
||||
@@ -530,7 +530,7 @@ enum CurrencyTypes
|
||||
CURRENCY_TYPE_JUSTICE_POINTS = 395,
|
||||
CURRENCY_TYPE_VALOR_POINTS = 396,
|
||||
CURRENCY_TYPE_CONQUEST_META_ARENA = 483,
|
||||
CURRENCY_TYPE_CONQUEST_META_BG = 484,
|
||||
CURRENCY_TYPE_CONQUEST_META_RBG = 484,
|
||||
};
|
||||
|
||||
#endif
|
||||
@@ -7342,9 +7342,9 @@ void Player::SendPvpRewards() const
|
||||
packet << GetCurrencyOnWeek(CURRENCY_TYPE_CONQUEST_POINTS, true);
|
||||
packet << GetCurrencyWeekCap(CURRENCY_TYPE_CONQUEST_META_ARENA, true);
|
||||
packet << GetCurrencyOnWeek(CURRENCY_TYPE_CONQUEST_META_ARENA, true);
|
||||
packet << GetCurrencyOnWeek(CURRENCY_TYPE_CONQUEST_META_BG, true);
|
||||
packet << GetCurrencyOnWeek(CURRENCY_TYPE_CONQUEST_META_RBG, true);
|
||||
packet << GetCurrencyWeekCap(CURRENCY_TYPE_CONQUEST_POINTS, true);
|
||||
packet << GetCurrencyWeekCap(CURRENCY_TYPE_CONQUEST_META_BG, true);
|
||||
packet << GetCurrencyWeekCap(CURRENCY_TYPE_CONQUEST_META_RBG, true);
|
||||
GetSession()->SendPacket(&packet);
|
||||
}
|
||||
|
||||
@@ -7559,7 +7559,7 @@ uint32 Player::_GetCurrencyWeekCap(const CurrencyTypesEntry* currency) const
|
||||
case CURRENCY_TYPE_CONQUEST_META_ARENA:
|
||||
// should add precision mod = 100
|
||||
return Trinity::Currency::ConquestRatingCalculator(_maxPersonalArenaRate) * CURRENCY_PRECISION;
|
||||
case CURRENCY_TYPE_CONQUEST_META_BG:
|
||||
case CURRENCY_TYPE_CONQUEST_META_RBG:
|
||||
// should add precision mod = 100
|
||||
return Trinity::Currency::BgConquestRatingCalculator(GetRBGPersonalRating()) * CURRENCY_PRECISION;
|
||||
}
|
||||
|
||||
@@ -792,7 +792,7 @@ void WorldSession::HandleRequestRatedBgInfo(WorldPacket & recvData)
|
||||
uint8 unk;
|
||||
recvData >> unk;
|
||||
|
||||
sLog->outDebug(LOG_FILTER_BATTLEGROUND, "WorldSession::HandleRequestRatedBgInfo: get unk = %u", unk);
|
||||
sLog->outDebug(LOG_FILTER_BATTLEGROUND, "WorldSession::HandleRequestRatedBgInfo: unk = %u", unk);
|
||||
|
||||
/// @Todo: perfome research in this case
|
||||
/// The unk fields are related to arenas
|
||||
@@ -852,7 +852,7 @@ void WorldSession::HandleRequestRatedBgStats(WorldPacket& /*recvData*/)
|
||||
data << uint8(3); // unk
|
||||
data << uint32(0); // unk
|
||||
data << uint32(0); // unk
|
||||
data << _player->GetCurrencyWeekCap(CURRENCY_TYPE_CONQUEST_META_BG, true);
|
||||
data << _player->GetCurrencyWeekCap(CURRENCY_TYPE_CONQUEST_META_RBG, true);
|
||||
data << uint32(0); // unk
|
||||
data << uint32(0); // unk
|
||||
data << _player->GetCurrency(CURRENCY_TYPE_CONQUEST_POINTS, true);
|
||||
|
||||
@@ -844,11 +844,11 @@ void World::LoadConfigSettings(bool reload)
|
||||
}
|
||||
m_int_configs[CONFIG_CURRENCY_CONQUEST_POINTS_WEEK_CAP] *= 100; //precision mod
|
||||
|
||||
m_int_configs[CONFIG_CURRENCY_CONQUEST_POINTS_ARENA_REWARD] = ConfigMgr::GetIntDefault("Currency.ConquestPointsArenaReward", 150);
|
||||
m_int_configs[CONFIG_CURRENCY_CONQUEST_POINTS_ARENA_REWARD] = ConfigMgr::GetIntDefault("Currency.ConquestPointsArenaReward", 180);
|
||||
if (int32(m_int_configs[CONFIG_CURRENCY_CONQUEST_POINTS_ARENA_REWARD]) <= 0)
|
||||
{
|
||||
sLog->outError(LOG_FILTER_SERVER_LOADING, "Currency.ConquestPointsArenaReward (%i) must be > 0, set to default 180.", m_int_configs[CONFIG_CURRENCY_CONQUEST_POINTS_ARENA_REWARD]);
|
||||
m_int_configs[CONFIG_CURRENCY_CONQUEST_POINTS_ARENA_REWARD] = 150;
|
||||
m_int_configs[CONFIG_CURRENCY_CONQUEST_POINTS_ARENA_REWARD] = 180;
|
||||
}
|
||||
m_int_configs[CONFIG_CURRENCY_CONQUEST_POINTS_ARENA_REWARD] *= 100; //precision mod
|
||||
|
||||
|
||||
@@ -2942,10 +2942,10 @@ Currency.ConquestPointsDefaultWeekCap = 1350
|
||||
#
|
||||
# Currency.ConquestPointsArenaReward
|
||||
# Amount of conquest points rewarded by winning arenas
|
||||
# Default: 150
|
||||
# Default: 180
|
||||
#
|
||||
|
||||
Currency.ConquestPointsArenaReward = 150
|
||||
Currency.ConquestPointsArenaReward = 180
|
||||
|
||||
#
|
||||
###################################################################################################
|
||||
Reference in new issue
Block a user