mirrors/sapphire
1
Fork 0
mirror of https://github.com/SapphireServer/Sapphire.git synced 2025-05-28 04:17:44 +00:00
Code Activity

Merge remote-tracking branch 'remotes/origin/develop' into develop_5.2

Browse source
This commit is contained in:
collett 2020-03-03 18:17:45 +09:00
commit 7d561ffcbe
1 changed files with 28 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

30
src/world/Actor/Player.cpp
View file

@ -606,8 +606,13 @@ void Sapphire::Entity::Player::discover( int16_t map_id, int16_t sub_id )
int32_t offset = 4; int32_t offset = 4;
auto info = exdData.get< Sapphire::Data::Map >( auto info = exdData.get< Sapphire::Data::Map >( map_id );
exdData.get< Sapphire::Data::TerritoryType >( getCurrentTerritory()->getTerritoryTypeId() )->map ); if ( !info )
{
sendDebug( "discover(): Could not obtain map data for map_id == {0}", map_id );
return;
}
if( info->discoveryArrayByte ) if( info->discoveryArrayByte )
offset = 5 + 2 * info->discoveryIndex; offset = 5 + 2 * info->discoveryIndex;
else else
@ -626,7 +631,28 @@ void Sapphire::Entity::Player::discover( int16_t map_id, int16_t sub_id )
gainExp( exp ); gainExp( exp );
// gain 10x additional EXP if entire map is completed
uint32_t mask = info->discoveryFlag;
uint32_t discoveredAreas;
if( info->discoveryArrayByte )
{
discoveredAreas = ( m_discovery[ offset + 1 ] << 8 ) |
m_discovery[ offset ];
}
else
{
discoveredAreas = ( m_discovery[ offset + 3 ] << 24 ) |
( m_discovery[ offset + 2 ] << 16 ) |
( m_discovery[ offset + 1 ] << 8 ) |
m_discovery[ offset ];
}
bool allDiscovered = ( ( discoveredAreas & mask ) == mask );
if( allDiscovered )
{
gainExp( exp * 10 );
}
} }
bool Sapphire::Entity::Player::isNewAdventurer() const bool Sapphire::Entity::Player::isNewAdventurer() const