Mirror/TrinityCore
1
0
Fork 0
mirror of https://github.com/TrinityCore/TrinityCore.git synced 2026-01-25 03:12:09 +01:00
Code Issues Packages Projects Releases Wiki Activity

Core/Players: fixed currency rewards for quests that use a currency type with currency precision

Browse Source 
*fixed average itemlevel calculation if the player is using a two-handed weapon
This commit is contained in:
Ovahlord
2018-05-28 15:47:28 +02:00
parent 50e61f4484
commit e832f056ca
3 changed files with 33 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
sql/updates/world/custom/custom_2018_05_28_00_world.sql Normal file
View File

@@ -0,0 +1,4 @@
UPDATE `quest_template` SET `RewardCurrencyCount1`= 150 WHERE `ID` IN (28905, 29185, 28906, 29183);
UPDATE `quest_template` SET `RewardCurrencyCount1`= 250 WHERE `ID` IN (30177, 30110, 30111);
UPDATE `quest_template` SET `RewardCurrencyCount1`= 140 WHERE `ID`= 28907;
UPDATE `quest_template` SET `RewardCurrencyCount1`= 23 WHERE `ID` IN (24788, 24789);

15
src/server/game/Entities/Player/Player.cpp
View File

@@ -15233,7 +15233,15 @@ void Player::RewardQuest(Quest const* quest, uint32 reward, Object* questGiver,
for (uint8 i = 0; i < QUEST_REWARD_CURRENCY_COUNT; ++i)
if (quest->RewardCurrencyId[i])
ModifyCurrency(quest->RewardCurrencyId[i], quest->RewardCurrencyCount[i], !quest->IsDFQuest());
{
uint32 rewardCurrencyCount = quest->RewardCurrencyCount[i];
CurrencyTypesEntry const* currency = sCurrencyTypesStore.LookupEntry(quest->RewardCurrencyId[i]);
if (currency->Flags & CURRENCY_FLAG_HIGH_PRECISION)
rewardCurrencyCount = rewardCurrencyCount * CURRENCY_PRECISION;
ModifyCurrency(quest->RewardCurrencyId[i], rewardCurrencyCount, !quest->IsDFQuest());
}
if (uint32 skill = quest->GetRewardSkillId())
UpdateSkillPro(skill, 1000, quest->GetRewardSkillPoints());
@@ -27601,6 +27609,11 @@ float Player::GetAverageItemLevel() const
if (i == EQUIPMENT_SLOT_TABARD || i == EQUIPMENT_SLOT_BODY)
continue;
if (i == EQUIPMENT_SLOT_OFFHAND)
if (Item* weapon = m_items[EQUIPMENT_SLOT_MAINHAND])
if (weapon->GetTemplate()->InventoryType == INVTYPE_2HWEAPON)
continue;
if (m_items[i])
sum += m_items[i]->GetTemplate()->ItemLevel;

22
src/server/game/Handlers/LFGHandler.cpp
View File

@@ -67,9 +67,15 @@ void BuildQuestReward(WorldPacket& data, Quest const* quest, Player* player)
{
if (uint32 currencyId = quest->RewardCurrencyId[i])
{
uint32 rewardCurrencyCount = quest->RewardCurrencyCount[i];
CurrencyTypesEntry const* currency = sCurrencyTypesStore.LookupEntry(currencyId);
if (currency->Flags & CURRENCY_FLAG_HIGH_PRECISION)
rewardCurrencyCount = rewardCurrencyCount * CURRENCY_PRECISION;
data << uint32(currencyId);
data << uint32(0);
data << uint32(quest->RewardCurrencyCount[i]);
data << uint32(rewardCurrencyCount);
data << uint8(1); // Is currency
}
}
@@ -332,7 +338,7 @@ void WorldSession::SendLfgPlayerLockInfo()
for (uint8 i = 0; i < QUEST_REWARD_CURRENCY_COUNT; i++)
if (firstQuest->RewardCurrencyId[i] == CURRENCY_TYPE_VALOR_POINTS)
rewValorPoints += firstQuest->RewardCurrencyCount[i];
rewValorPoints += firstQuest->RewardCurrencyCount[i] * CURRENCY_PRECISION;
}
if (Quest const* otherQuest = sObjectMgr->GetQuestTemplate(reward->otherQuest))
@@ -342,7 +348,7 @@ void WorldSession::SendLfgPlayerLockInfo()
for (uint8 i = 0; i < QUEST_REWARD_CURRENCY_COUNT; i++)
if (otherQuest->RewardCurrencyId[i] == CURRENCY_TYPE_VALOR_POINTS)
rewValorPoints += otherQuest->RewardCurrencyCount[i];
rewValorPoints += otherQuest->RewardCurrencyCount[i] * CURRENCY_PRECISION;
}
}
@@ -352,15 +358,17 @@ void WorldSession::SendLfgPlayerLockInfo()
if (currency && rewValorPoints && !reward->completionsPerPeriod)
{
uint32 weekCap = player->GetCurrencyWeekCap(currency);
data << uint32(rewValorPoints); // currencyQuantity (valor points from selected dungeon)
data << uint32(player->GetCurrencyWeekCap(currency)); // some sort of overall cap/weekly cap
data << uint32(weekCap); // some sort of overall cap/weekly cap
data << uint32(CURRENCY_TYPE_VALOR_POINTS); // currencyID (displays name above the cap bar)
data << uint32(0); // tier1Quantity (current valor points from lfr)
data << uint32(player->GetCurrencyWeekCap(currency)); // tier1Limit (total valor points from lfr - always 10000)
data << uint32(weekCap); // tier1Limit (total valor points from lfr)
data << uint32(0); // overallQuantity (current valor points from lfg - always 0)
data << uint32(player->GetCurrencyWeekCap(currency)); // overallLimit (total valor points from lfg)
data << uint32(weekCap); // overallLimit (total valor points from lfg)
data << uint32(player->GetCurrencyOnWeek(CURRENCY_TYPE_VALOR_POINTS, false)); // periodPurseQuantity (valor points this week)
data << uint32(player->GetCurrencyWeekCap(currency)); // periodPurseLimit (weekly cap)
data << uint32(weekCap); // periodPurseLimit (weekly cap)
data << uint32(player->GetCurrency(CURRENCY_TYPE_VALOR_POINTS, false)); // purseQuantity (overall valor points)
data << uint32(0); // purseLimit
data << uint32(rewValorPoints); // some sort of reward for completion