diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/server/game/Battlegrounds/Arena.cpp | 1 | ||||
| -rw-r--r-- | src/server/game/Battlegrounds/Battleground.cpp | 9 | ||||
| -rw-r--r-- | src/server/game/DataStores/DBCEnums.h | 4 | ||||
| -rw-r--r-- | src/server/game/Entities/Player/Player.cpp | 67 | ||||
| -rw-r--r-- | src/server/game/Entities/Player/Player.h | 4 | ||||
| -rw-r--r-- | src/server/game/World/World.cpp | 36 | ||||
| -rw-r--r-- | src/server/game/World/World.h | 5 | ||||
| -rw-r--r-- | src/server/scripts/Commands/cs_modify.cpp | 4 | ||||
| -rw-r--r-- | src/server/worldserver/worldserver.conf.dist | 40 |
9 files changed, 10 insertions, 160 deletions
diff --git a/src/server/game/Battlegrounds/Arena.cpp b/src/server/game/Battlegrounds/Arena.cpp index 8e101e71923..44ac6c5076c 100644 --- a/src/server/game/Battlegrounds/Arena.cpp +++ b/src/server/game/Battlegrounds/Arena.cpp @@ -224,7 +224,6 @@ void Arena::EndBattleground(uint32 winner) uint32 rating = player->GetArenaPersonalRating(winnerArenaTeam->GetSlot()); player->UpdateCriteria(CRITERIA_TYPE_WIN_RATED_ARENA, rating ? rating : 1); player->UpdateCriteria(CRITERIA_TYPE_WIN_ARENA, GetMapId()); - player->ModifyCurrency(CURRENCY_TYPE_CONQUEST_META_ARENA, sWorld->getIntConfig(CONFIG_CURRENCY_CONQUEST_POINTS_ARENA_REWARD)); // Last standing - Rated 5v5 arena & be solely alive player if (GetArenaType() == ARENA_TYPE_5v5 && aliveWinners == 1 && player->IsAlive()) diff --git a/src/server/game/Battlegrounds/Battleground.cpp b/src/server/game/Battlegrounds/Battleground.cpp index 147070f98af..62a42db2192 100644 --- a/src/server/game/Battlegrounds/Battleground.cpp +++ b/src/server/game/Battlegrounds/Battleground.cpp @@ -861,13 +861,14 @@ void Battleground::EndBattleground(uint32 winner) UpdatePlayerScore(player, SCORE_BONUS_HONOR, GetBonusHonorFromKill(winnerKills)); if (!player->GetRandomWinner()) { - // 100cp awarded for the first random battleground won each day - player->ModifyCurrency(CURRENCY_TYPE_CONQUEST_META_ARENA, sWorld->getIntConfig(CONFIG_BG_REWARD_WINNER_CONQUEST_FIRST)); player->SetRandomWinner(true); + // TODO: win honor xp } } - else // 50cp awarded for each non-rated battleground won - player->ModifyCurrency(CURRENCY_TYPE_CONQUEST_META_ARENA, sWorld->getIntConfig(CONFIG_BG_REWARD_WINNER_CONQUEST_LAST)); + else + { + // TODO: loss honor xp + } player->UpdateCriteria(CRITERIA_TYPE_WIN_BG, 1); if (!guildAwarded) diff --git a/src/server/game/DataStores/DBCEnums.h b/src/server/game/DataStores/DBCEnums.h index 0aa0c05e3a8..ac819d51d46 100644 --- a/src/server/game/DataStores/DBCEnums.h +++ b/src/server/game/DataStores/DBCEnums.h @@ -881,12 +881,8 @@ enum VehicleSeatFlagsB // CurrencyTypes.dbc enum CurrencyTypes { - CURRENCY_TYPE_CONQUEST_POINTS = 390, - CURRENCY_TYPE_HONOR_POINTS = 392, CURRENCY_TYPE_JUSTICE_POINTS = 395, CURRENCY_TYPE_VALOR_POINTS = 396, - CURRENCY_TYPE_CONQUEST_META_ARENA = 483, - CURRENCY_TYPE_CONQUEST_META_RBG = 484, CURRENCY_TYPE_APEXIS_CRYSTALS = 823, CURRENCY_TYPE_ARTIFACT_KNOWLEDGE = 1171, }; diff --git a/src/server/game/Entities/Player/Player.cpp b/src/server/game/Entities/Player/Player.cpp index 5f7032bb5ce..9bc98b3b63f 100644 --- a/src/server/game/Entities/Player/Player.cpp +++ b/src/server/game/Entities/Player/Player.cpp @@ -325,7 +325,6 @@ Player::Player(WorldSession* session) : Unit(true), m_sceneMgr(this) _activeCheats = CHEAT_NONE; healthBeforeDuel = 0; manaBeforeDuel = 0; - _maxPersonalArenaRate = 0; memset(_voidStorageItems, 0, VOID_STORAGE_MAX_SLOT * sizeof(VoidStorageItem*)); @@ -496,10 +495,8 @@ bool Player::Create(ObjectGuid::LowType guidlow, WorldPackets::Character::Charac InitRunes(); SetUInt32Value(PLAYER_FIELD_COINAGE, sWorld->getIntConfig(CONFIG_START_PLAYER_MONEY)); - SetCurrency(CURRENCY_TYPE_HONOR_POINTS, sWorld->getIntConfig(CONFIG_CURRENCY_START_HONOR_POINTS)); SetCurrency(CURRENCY_TYPE_APEXIS_CRYSTALS, sWorld->getIntConfig(CONFIG_CURRENCY_START_APEXIS_CRYSTALS)); SetCurrency(CURRENCY_TYPE_JUSTICE_POINTS, sWorld->getIntConfig(CONFIG_CURRENCY_START_JUSTICE_POINTS)); - SetCurrency(CURRENCY_TYPE_CONQUEST_POINTS, sWorld->getIntConfig(CONFIG_CURRENCY_START_CONQUEST_POINTS)); // start with every map explored if (sWorld->getBoolConfig(CONFIG_START_ALL_EXPLORED)) @@ -6361,8 +6358,7 @@ bool Player::RewardHonor(Unit* victim, uint32 groupsize, int32 honor, bool pvpto GetSession()->SendPacket(data.Write()); - // add honor points - ModifyCurrency(CURRENCY_TYPE_HONOR_POINTS, int32(honor)); + // TODO: add honor xp if (InBattleground() && honor > 0) { @@ -6517,15 +6513,8 @@ void Player::SendCurrencies() const void Player::SendPvpRewards() const { - WorldPacket packet(SMSG_REQUEST_PVP_REWARDS_RESPONSE, 24); - packet << GetCurrencyWeekCap(CURRENCY_TYPE_CONQUEST_POINTS); - packet << GetCurrencyOnWeek(CURRENCY_TYPE_CONQUEST_POINTS); - packet << GetCurrencyWeekCap(CURRENCY_TYPE_CONQUEST_META_ARENA); - packet << GetCurrencyOnWeek(CURRENCY_TYPE_CONQUEST_META_RBG); - packet << GetCurrencyOnWeek(CURRENCY_TYPE_CONQUEST_META_ARENA); - packet << GetCurrencyWeekCap(CURRENCY_TYPE_CONQUEST_POINTS); - - GetSession()->SendPacket(&packet); + //WorldPacket packet(SMSG_REQUEST_PVP_REWARDS_RESPONSE, 24); + //GetSession()->SendPacket(&packet); } uint32 Player::GetCurrency(uint32 id) const @@ -6637,13 +6626,6 @@ void Player::ModifyCurrency(uint32 id, int32 count, bool printLog/* = true*/, bo CurrencyChanged(id, count); - if (currency->CategoryID == CURRENCY_CATEGORY_META_CONQUEST) - { - // count was changed to week limit, now we can modify original points. - ModifyCurrency(CURRENCY_TYPE_CONQUEST_POINTS, count, printLog); - return; - } - WorldPackets::Misc::SetCurrency packet; packet.Type = id; packet.Quantity = newTotalCount; @@ -6706,36 +6688,15 @@ void Player::ResetCurrencyWeekCap() uint32 Player::GetCurrencyWeekCap(CurrencyTypesEntry const* currency) const { - switch (currency->ID) - { - //original conquest not have week cap - case CURRENCY_TYPE_CONQUEST_POINTS: - return std::max(GetCurrencyWeekCap(CURRENCY_TYPE_CONQUEST_META_ARENA), GetCurrencyWeekCap(CURRENCY_TYPE_CONQUEST_META_RBG)); - case CURRENCY_TYPE_CONQUEST_META_ARENA: - // should add precision mod = 100 - return Trinity::Currency::ConquestRatingCalculator(_maxPersonalArenaRate) * CURRENCY_PRECISION; - case CURRENCY_TYPE_CONQUEST_META_RBG: - // should add precision mod = 100 - return Trinity::Currency::BgConquestRatingCalculator(GetRBGPersonalRating()) * CURRENCY_PRECISION; - } - return currency->MaxEarnablePerWeek; } uint32 Player::GetCurrencyTotalCap(CurrencyTypesEntry const* currency) const { - // @TODO: Possibly use caps from CurrencyTypes.dbc uint32 cap = currency->MaxQty; switch (currency->ID) { - case CURRENCY_TYPE_HONOR_POINTS: - { - uint32 honorcap = sWorld->getIntConfig(CONFIG_CURRENCY_MAX_HONOR_POINTS); - if (honorcap > 0) - cap = honorcap; - break; - } case CURRENCY_TYPE_APEXIS_CRYSTALS: { uint32 apexiscap = sWorld->getIntConfig(CONFIG_CURRENCY_MAX_APEXIS_CRYSTALS); @@ -6755,23 +6716,6 @@ uint32 Player::GetCurrencyTotalCap(CurrencyTypesEntry const* currency) const return cap; } -void Player::UpdateConquestCurrencyCap(uint32 currency) const -{ - uint32 currenciesToUpdate[2] = { currency, CURRENCY_TYPE_CONQUEST_POINTS }; - - for (uint32 i = 0; i < 2; ++i) - { - CurrencyTypesEntry const* currencyEntry = sCurrencyTypesStore.LookupEntry(currenciesToUpdate[i]); - if (!currencyEntry) - continue; - - WorldPacket packet(SMSG_SET_MAX_WEEKLY_QUANTITY, 8); - packet << uint32(GetCurrencyWeekCap(currencyEntry)); - packet << uint32(currenciesToUpdate[i]); - GetSession()->SendPacket(&packet); - } -} - void Player::SetInGuild(ObjectGuid::LowType guildId) { if (guildId) @@ -6806,11 +6750,6 @@ uint8 Player::GetRankFromDB(ObjectGuid guid) void Player::SetArenaTeamInfoField(uint8 slot, ArenaTeamInfoType type, uint32 value) { SetUInt32Value(PLAYER_FIELD_ARENA_TEAM_INFO_1_1 + (slot * ARENA_TEAM_END) + type, value); - if (type == ARENA_TEAM_PERSONAL_RATING && value > _maxPersonalArenaRate) - { - _maxPersonalArenaRate = value; - UpdateConquestCurrencyCap(CURRENCY_TYPE_CONQUEST_META_ARENA); - } } void Player::SetInArenaTeam(uint32 ArenaTeamId, uint8 slot, uint8 type) diff --git a/src/server/game/Entities/Player/Player.h b/src/server/game/Entities/Player/Player.h index f53b55a4caa..d9cd1fca30d 100644 --- a/src/server/game/Entities/Player/Player.h +++ b/src/server/game/Entities/Player/Player.h @@ -2631,9 +2631,6 @@ class TC_GAME_API Player : public Unit, public GridObject<Player> */ uint32 GetCurrencyTotalCap(CurrencyTypesEntry const* currency) const; - /// Updates weekly conquest point cap (dynamic cap) - void UpdateConquestCurrencyCap(uint32 currency) const; - VoidStorageItem* _voidStorageItems[VOID_STORAGE_MAX_SLOT]; std::vector<Item*> m_itemUpdateQueue; @@ -2816,7 +2813,6 @@ class TC_GAME_API Player : public Unit, public GridObject<Player> uint32 _pendingBindTimer; uint32 _activeCheats; - uint32 _maxPersonalArenaRate; std::unique_ptr<Garrison> _garrison; diff --git a/src/server/game/World/World.cpp b/src/server/game/World/World.cpp index 75b6a3e0931..50ffc1d7a24 100644 --- a/src/server/game/World/World.cpp +++ b/src/server/game/World/World.cpp @@ -920,20 +920,6 @@ void World::LoadConfigSettings(bool reload) m_int_configs[CONFIG_CURRENCY_RESET_INTERVAL] = 7; } - m_int_configs[CONFIG_CURRENCY_START_HONOR_POINTS] = sConfigMgr->GetIntDefault("Currency.StartHonorPoints", 0); - if (int32(m_int_configs[CONFIG_CURRENCY_START_HONOR_POINTS]) < 0) - { - TC_LOG_ERROR("server.loading", "Currency.StartHonorPoints (%i) must be >= 0, set to default 0.", m_int_configs[CONFIG_CURRENCY_START_HONOR_POINTS]); - m_int_configs[CONFIG_CURRENCY_START_HONOR_POINTS] = 0; - } - m_int_configs[CONFIG_CURRENCY_MAX_HONOR_POINTS] = sConfigMgr->GetIntDefault("Currency.MaxHonorPoints", 4000); - if (int32(m_int_configs[CONFIG_CURRENCY_MAX_HONOR_POINTS]) < 0) - { - TC_LOG_ERROR("server.loading", "Currency.MaxHonorPoints (%i) can't be negative. Set to default 4000.", m_int_configs[CONFIG_CURRENCY_MAX_HONOR_POINTS]); - m_int_configs[CONFIG_CURRENCY_MAX_HONOR_POINTS] = 4000; - } - m_int_configs[CONFIG_CURRENCY_MAX_HONOR_POINTS] *= 100; //precision mod - m_int_configs[CONFIG_CURRENCY_START_APEXIS_CRYSTALS] = sConfigMgr->GetIntDefault("Currency.StartApexisCrystals", 0); if (int32(m_int_configs[CONFIG_CURRENCY_START_APEXIS_CRYSTALS]) < 0) { @@ -962,28 +948,6 @@ void World::LoadConfigSettings(bool reload) } m_int_configs[CONFIG_CURRENCY_MAX_JUSTICE_POINTS] *= 100; //precision mod - m_int_configs[CONFIG_CURRENCY_START_CONQUEST_POINTS] = sConfigMgr->GetIntDefault("Currency.StartConquestPoints", 0); - if (int32(m_int_configs[CONFIG_CURRENCY_START_CONQUEST_POINTS]) < 0) - { - TC_LOG_ERROR("server.loading", "Currency.StartConquestPoints (%i) must be >= 0, set to default 0.", m_int_configs[CONFIG_CURRENCY_START_CONQUEST_POINTS]); - m_int_configs[CONFIG_CURRENCY_START_CONQUEST_POINTS] = 0; - } - m_int_configs[CONFIG_CURRENCY_CONQUEST_POINTS_WEEK_CAP] = sConfigMgr->GetIntDefault("Currency.ConquestPointsWeekCap", 1650); - if (int32(m_int_configs[CONFIG_CURRENCY_CONQUEST_POINTS_WEEK_CAP]) <= 0) - { - TC_LOG_ERROR("server.loading", "Currency.ConquestPointsWeekCap (%i) must be > 0, set to default 1650.", m_int_configs[CONFIG_CURRENCY_CONQUEST_POINTS_WEEK_CAP]); - m_int_configs[CONFIG_CURRENCY_CONQUEST_POINTS_WEEK_CAP] = 1650; - } - m_int_configs[CONFIG_CURRENCY_CONQUEST_POINTS_WEEK_CAP] *= 100; //precision mod - - m_int_configs[CONFIG_CURRENCY_CONQUEST_POINTS_ARENA_REWARD] = sConfigMgr->GetIntDefault("Currency.ConquestPointsArenaReward", 180); - if (int32(m_int_configs[CONFIG_CURRENCY_CONQUEST_POINTS_ARENA_REWARD]) <= 0) - { - TC_LOG_ERROR("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] = 180; - } - m_int_configs[CONFIG_CURRENCY_CONQUEST_POINTS_ARENA_REWARD] *= 100; //precision mod - m_int_configs[CONFIG_MAX_RECRUIT_A_FRIEND_BONUS_PLAYER_LEVEL] = sConfigMgr->GetIntDefault("RecruitAFriend.MaxLevel", 85); if (m_int_configs[CONFIG_MAX_RECRUIT_A_FRIEND_BONUS_PLAYER_LEVEL] > m_int_configs[CONFIG_MAX_PLAYER_LEVEL]) { diff --git a/src/server/game/World/World.h b/src/server/game/World/World.h index 31e33711a37..24efe5391a5 100644 --- a/src/server/game/World/World.h +++ b/src/server/game/World/World.h @@ -258,11 +258,6 @@ enum WorldIntConfigs CONFIG_CURRENCY_MAX_APEXIS_CRYSTALS, CONFIG_CURRENCY_START_JUSTICE_POINTS, CONFIG_CURRENCY_MAX_JUSTICE_POINTS, - CONFIG_CURRENCY_START_HONOR_POINTS, - CONFIG_CURRENCY_MAX_HONOR_POINTS, - CONFIG_CURRENCY_START_CONQUEST_POINTS, - CONFIG_CURRENCY_CONQUEST_POINTS_WEEK_CAP, - CONFIG_CURRENCY_CONQUEST_POINTS_ARENA_REWARD, CONFIG_CURRENCY_RESET_HOUR, CONFIG_CURRENCY_RESET_DAY, CONFIG_CURRENCY_RESET_INTERVAL, diff --git a/src/server/scripts/Commands/cs_modify.cpp b/src/server/scripts/Commands/cs_modify.cpp index 435c3c74231..3279e630042 100644 --- a/src/server/scripts/Commands/cs_modify.cpp +++ b/src/server/scripts/Commands/cs_modify.cpp @@ -898,9 +898,9 @@ public: int32 amount = (uint32)atoi(args); - target->ModifyCurrency(CURRENCY_TYPE_HONOR_POINTS, amount, true, true); + handler->PSendSysMessage("NOT IMPLEMENTED: %d honor NOT added.", amount); - handler->PSendSysMessage(LANG_COMMAND_MODIFY_HONOR, handler->GetNameLink(target).c_str(), target->GetCurrency(CURRENCY_TYPE_HONOR_POINTS)); + //handler->PSendSysMessage(LANG_COMMAND_MODIFY_HONOR, handler->GetNameLink(target).c_str(), target->GetCurrency(CURRENCY_TYPE_HONOR_POINTS)); return true; } diff --git a/src/server/worldserver/worldserver.conf.dist b/src/server/worldserver/worldserver.conf.dist index abc7b55eecd..8533149cd23 100644 --- a/src/server/worldserver/worldserver.conf.dist +++ b/src/server/worldserver/worldserver.conf.dist @@ -3860,22 +3860,6 @@ Currency.ResetDay = 3 Currency.ResetHour = 6 # -# Currency.StartHonorPoints -# Amount of honor points that new players will start with -# Default: 0 (with precision) -# - -Currency.StartHonorPoints = 0 - -# -# Currency.MaxHonorPoints -# Amount honor points a player can have -# Default: 4000 -# - -Currency.MaxHonorPoints = 4000 - -# # Currency.StartApexisCrystals # Amount of Apexis Crystals that new players will start with # Default: 0 (with precision) @@ -3908,30 +3892,6 @@ Currency.StartJusticePoints = 0 Currency.MaxJusticePoints = 4000 # -# Currency.StartConquestPoints -# Amount of conquest points that new players will start with -# Default: 0 (with precision) -# - -Currency.StartConquestPoints = 0 - -# -# Currency.ConquestPointsWeekCap -# Amount of conquest points that player can earn per week -# Default: 1350 -# - -Currency.ConquestPointsWeekCap = 1350 - -# -# Currency.ConquestPointsArenaReward -# Amount of conquest points rewarded by winning arenas -# Default: 180 -# - -Currency.ConquestPointsArenaReward = 180 - -# ################################################################################################### ################################################################################################### |