mirrors/sapphire
1
Fork 0
mirror of https://github.com/SapphireServer/Sapphire.git synced 2025-04-27 06:47:45 +00:00
Code Activity

Merge branch 'develop' of https://github.com/SapphireMordred/Sapphire into develop

Browse source
This commit is contained in:
Mordred 2019-03-28 16:27:41 +01:00
commit 4c35a7e1a7
1 changed files with 2 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
src/world/Actor/PlayerQuest.cpp
View file

@ -1053,7 +1053,6 @@ bool Sapphire::Entity::Player::giveQuestRewards( uint32_t questId, uint32_t opti
// TODO: use the correct formula, this one is wrong // TODO: use the correct formula, this one is wrong
uint32_t exp = uint32_t exp =
( questInfo->expFactor * paramGrowth->questExpModifier * ( 45 + 5 * questInfo->classJobLevel0 ) ) / 100; ( questInfo->expFactor * paramGrowth->questExpModifier * ( 45 + 5 * questInfo->classJobLevel0 ) ) / 100;
exp = exp + ( questInfo->expFactor / 100 ) * 10000;
exp = questInfo->expFactor; exp = questInfo->expFactor;
@ -1070,14 +1069,14 @@ bool Sapphire::Entity::Player::giveQuestRewards( uint32_t questId, uint32_t opti
{ {
for( uint32_t i = 0; i < questInfo->itemReward0.size(); i++ ) for( uint32_t i = 0; i < questInfo->itemReward0.size(); i++ )
{ {
addItem( questInfo->itemCountReward0.at( i ) ); addItem( questInfo->itemReward0.at( i ), questInfo->itemCountReward0.at( i ) );
} }
} }
if( optionalItemCount > 0 ) if( optionalItemCount > 0 )
{ {
auto itemId = questInfo->itemReward1.at( optionalChoice ); auto itemId = questInfo->itemReward1.at( optionalChoice );
addItem( questInfo->itemCountReward1.at( optionalChoice ) ); addItem( itemId, questInfo->itemCountReward1.at( optionalChoice ) );
} }
if( gilReward > 0 ) if( gilReward > 0 )