Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 11 additions & 0 deletions src/server/game/BattlePet/BattlePet.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -213,6 +213,17 @@ uint16 BattlePetExperienceReward(uint8 petLevel, uint8 enemyLevel, uint8 partici
return uint16(std::min<uint32>(reward / participatingPetCount, 0xFFFF));
}

// A won PvE battle pays the owner character experience unless the team's highest-level pet outlevels the
// highest-level enemy pet by more than 5 levels (Wowpedia, Pet Battle System: a win against a team within
// 5 levels of the player's highest-level pet).
bool BattlePetBattlePaysPlayerExperience(uint8 highestAllyLevel, uint8 highestEnemyLevel)
{
if (!highestAllyLevel || !highestEnemyLevel)
return false;

return uint32(highestAllyLevel) <= uint32(highestEnemyLevel) + 5;
}

uint8 BattlePetNormalizeWildLevel(uint8 level)
{
if (!level)
Expand Down
1 change: 1 addition & 0 deletions src/server/game/BattlePet/BattlePet.h
Original file line number Diff line number Diff line change
Expand Up @@ -223,6 +223,7 @@ inline uint8 BattlePetAbilitySlotForJournalFlag(uint32 flag)
uint16 BattlePetHealthFromPercent(uint16 maxHealth, uint8 percent);
uint16 BattlePetExperienceForNextLevel(uint8 level);
uint16 BattlePetExperienceReward(uint8 petLevel, uint8 enemyLevel, uint8 participatingPetCount = 1);
bool BattlePetBattlePaysPlayerExperience(uint8 highestAllyLevel, uint8 highestEnemyLevel);
uint8 BattlePetNormalizeWildLevel(uint8 level);
bool BattlePetSpeciesFlagsAllowWildCapture(uint32 flags);

Expand Down
21 changes: 21 additions & 0 deletions src/server/game/BattlePet/BattlePetMgr.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@
#include "DB2Stores.h"
#include "DB2Enums.h"
#include "DBCEnums.h"
#include "Formulas.h"
#include "ObjectAccessor.h"
#include "ObjectMgr.h"
#include "Opcodes.h"
Expand Down Expand Up @@ -1313,6 +1314,21 @@
return battlePet->AddExperience(reward);
}

// A won wild pet battle pays the character the experience of one creature kill at its own level.
// The amount is not published for 5.4.8; players reported about one mob kill per win.
void BattlePetMgr::RewardPlayerExperience(uint8 highestAllyLevel)
{
uint8 const highestEnemyLevel = m_activePetBattle.EnemyLevel;

if (!BattlePetBattlePaysPlayerExperience(highestAllyLevel, highestEnemyLevel))

Check warning on line 1323 in src/server/game/BattlePet/BattlePetMgr.cpp

View check run for this annotation

SonarQubeCloud / SonarCloud Code Analysis

Use the init-statement to declare "highestEnemyLevel" inside the if statement.

See more on https://sonarcloud.io/project/issues?id=ProjectSkyfire_SkyFire_548&issues=AaHlQEEDz8gDKNt_uf8x&open=AaHlQEEDz8gDKNt_uf8x&pullRequest=1626
return;

uint8 const playerLevel = m_owner->getLevel();
uint32 const baseGain = Skyfire::XP::BaseGain(playerLevel, playerLevel,
GetContentLevelsForMapAndZone(m_owner->GetMapId(), m_owner->GetZoneId()));
m_owner->GiveXP(uint32(baseGain * sWorld->getRate(Rates::RATE_XP_PET_BATTLE_PLAYER)), NULL);

Check failure on line 1329 in src/server/game/BattlePet/BattlePetMgr.cpp

View check run for this annotation

SonarQubeCloud / SonarCloud Code Analysis

Use the "nullptr" literal.

See more on https://sonarcloud.io/project/issues?id=ProjectSkyfire_SkyFire_548&issues=AaHlQEEDz8gDKNt_uf8y&open=AaHlQEEDz8gDKNt_uf8y&pullRequest=1626
}

uint32 BattlePetMgr::GetUniqueBattlePetSpeciesCount() const
{
std::set<uint16> species;
Expand Down Expand Up @@ -1440,6 +1456,7 @@
&& !m_activePetBattle.RewardsApplied && m_activePetBattle.Winner == PET_BATTLE_WINNER_ALLY;

std::vector<Skyfire::BattlePetPackets::BattlePetFinalRoundPet> pets;
uint8 highestAllyLevel = 0;
for (uint8 i = 0; i < ActivePetBattle::BATTLE_PET_MAX_ACTIVE_TEAM_PETS; ++i)
{
if (!m_activePetBattle.HasAllyPet(i))
Expand All @@ -1448,6 +1465,7 @@
Skyfire::BattlePetPackets::BattlePetFinalRoundPet allyPet;
BattlePet* battlePet = GetBattlePet(m_activePetBattle.AllyTeam[i].PetID);
uint8 const initialLevel = battlePet ? battlePet->GetLevel() : 0;
highestAllyLevel = std::max(highestAllyLevel, initialLevel);
bool const petEarnedExperience = awardExperience && i == m_activePetBattle.AllyFrontPet
&& m_activePetBattle.AllyTeam[i].Health != 0;
uint16 const awardedXp = RewardActivePetBattlePet(
Expand All @@ -1470,7 +1488,10 @@
}

if (awardExperience)
{
RewardPlayerExperience(highestAllyLevel);
m_activePetBattle.RewardsApplied = true;
}

UpdateFinishedPetBattleAchievements();

Expand Down
1 change: 1 addition & 0 deletions src/server/game/BattlePet/BattlePetMgr.h
Original file line number Diff line number Diff line change
Expand Up @@ -239,6 +239,7 @@ class BattlePetMgr
void ClearActivePetBattlePlayerState();
void PersistActivePetBattleHealth();
uint16 RewardActivePetBattlePet(BattlePet* battlePet, bool awardExperience);
void RewardPlayerExperience(uint8 highestAllyLevel);
uint32 GetUniqueBattlePetSpeciesCount() const;
void UpdateBattlePetCollectionAchievements(BattlePet const* battlePet = NULL);
void UpdateCapturedBattlePetAchievements(BattlePet const& battlePet);
Expand Down
1 change: 1 addition & 0 deletions src/server/game/World/World.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -500,6 +500,7 @@ void World::LoadConfigSettings(bool reload)
setRate(Rates::RATE_XP_KILL, sConfigMgr->GetFloatDefault("Rate.XP.Kill", 1.0f));
setRate(Rates::RATE_XP_QUEST, sConfigMgr->GetFloatDefault("Rate.XP.Quest", 1.0f));
setRate(Rates::RATE_XP_EXPLORE, sConfigMgr->GetFloatDefault("Rate.XP.Explore", 1.0f));
setRate(Rates::RATE_XP_PET_BATTLE_PLAYER, sConfigMgr->GetFloatDefault("Rate.XP.PetBattlePlayer", 1.0f));
setRate(Rates::RATE_REPAIRCOST, sConfigMgr->GetFloatDefault("Rate.RepairCost", 1.0f));
if (getRate(Rates::RATE_REPAIRCOST) < 0.0f)
{
Expand Down
1 change: 1 addition & 0 deletions src/server/game/World/World.h
Original file line number Diff line number Diff line change
Expand Up @@ -397,6 +397,7 @@ enum class Rates
RATE_XP_QUEST,
RATE_XP_GUILD_MODIFIER,
RATE_XP_EXPLORE,
RATE_XP_PET_BATTLE_PLAYER,
RATE_REPAIRCOST,
RATE_REPUTATION_GAIN,
RATE_REPUTATION_LFG_BONUS,
Expand Down
9 changes: 9 additions & 0 deletions src/server/worldserver/worldserver.conf.dist
Original file line number Diff line number Diff line change
Expand Up @@ -2022,6 +2022,15 @@ Rate.XP.Kill = 1
Rate.XP.Quest = 1
Rate.XP.Explore = 1

#
# Rate.XP.PetBattlePlayer
# Description: Multiplier for the character experience a won wild pet battle pays.
# 1 pays the experience of one creature kill at the character's own level.
# Default: 1
#

Rate.XP.PetBattlePlayer = 1

#
# Rate.RepairCost
# Description: Repair cost rate.
Expand Down
19 changes: 19 additions & 0 deletions src/tests/BattlePetPacketTests.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -664,6 +664,24 @@ namespace
return passed;
}

bool TestBattlePetBattlePaysPlayerExperienceWithinFiveLevels()
{
bool passed = true;

passed &= Expect(BattlePetBattlePaysPlayerExperience(10, 10),
"A same-level win should pay the character experience");
passed &= Expect(BattlePetBattlePaysPlayerExperience(15, 10),
"A team pet five levels above the enemy should still pay the character experience");
passed &= Expect(!BattlePetBattlePaysPlayerExperience(16, 10),
"A team pet more than five levels above the enemy should pay no character experience");
passed &= Expect(BattlePetBattlePaysPlayerExperience(3, 25),
"A lower-level team should pay the character experience");
passed &= Expect(!BattlePetBattlePaysPlayerExperience(0, 10) && !BattlePetBattlePaysPlayerExperience(10, 0),
"Unknown levels should pay no character experience");

return passed;
}

bool TestBattlePetCapturedLevelPenalty()
{
bool passed = true;
Expand Down Expand Up @@ -2423,6 +2441,7 @@ int main()
passed &= TestBattlePetExperienceLevelsAtThreshold();
passed &= TestBattlePetExperienceCapsAtMaxLevel();
passed &= TestBattlePetExperienceRewardScalesByLevelDifference();
passed &= TestBattlePetBattlePaysPlayerExperienceWithinFiveLevels();
passed &= TestBattlePetCapturedLevelPenalty();
passed &= TestBattlePetTrapAbilityForLoadoutFlags();
passed &= TestBattlePetAchievementLoadoutRewards();
Expand Down
Loading