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

Properly initialize hunt data from db

Browse source
This commit is contained in:
Mordred 2019-03-26 23:08:34 +01:00
parent cef2ce979b
commit a6ba575932
2 changed files with 49 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -1678,6 +1678,9 @@ void Sapphire::Entity::Player::sendZonePackets()
//setStateFlag( PlayerStateFlag::BetweenAreas );
//setStateFlag( PlayerStateFlag::BetweenAreas1 );
if( isActionLearned( static_cast< uint8_t >( Common::UnlockEntry::HuntingLog ) ) )
sendHuntingLog();
sendStats();
// only initialize the UI if the player in fact just logged in.
@ -1982,3 +1985,47 @@ Sapphire::Common::HuntingLogEntry& Sapphire::Entity::Player::getHuntingLogEntry(
assert( index < m_huntingLogEntries.size() );
return m_huntingLogEntries[ index ];
}
void Sapphire::Entity::Player::sendHuntingLog()
{
auto pExdData = m_pFw->get< Data::ExdDataGenerated >();
uint8_t count = 0;
for( const auto& entry : m_huntingLogEntries )
{
uint64_t completionFlag = 0;
auto huntPacket = makeZonePacket< FFXIVIpcHuntingLogEntry >( getId() );
huntPacket->data().u0 = -1;
huntPacket->data().rank = entry.rank;
huntPacket->data().index = count;
for( int i = 1; i <= 10; ++i )
{
auto index0 = i - 1;
bool allComplete = true;
auto monsterNoteId = ( count + 1 ) * 10000 + entry.rank * 10 + i;
auto monsterNote = pExdData->get< Data::MonsterNote >( monsterNoteId );
if( !monsterNote )
continue;
const auto huntEntry = entry.entries[ index0 ];
for( int x = 0; x < 3; ++x )
{
if( ( huntEntry[ x ] == monsterNote->count[ x ] ) && monsterNote->count[ x ] != 0 )
completionFlag |= ( 1ull << ( index0 * 5 + x ) );
else if( monsterNote->count[ x ] != 0 )
allComplete = false;
}
if( allComplete )
completionFlag |= ( 1ull << ( index0 * 5 + 4 ) );
}
memcpy( huntPacket->data().entries, entry.entries, sizeof( entry.entries ) );
huntPacket->data().completeFlags = completionFlag;
++count;
queuePacket( huntPacket );
}
}

2
src/world/Actor/Player.h
View file

@ -1099,6 +1099,8 @@ namespace Sapphire::Entity
Util::SpawnIndexAllocator< uint8_t > m_actorSpawnIndexAllocator;
std::array< Common::HuntingLogEntry, 12 > m_huntingLogEntries;
void sendHuntingLog();
};
}