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

correctly send marketboard item list

Browse source
This commit is contained in:
NotAdam 2019-01-01 11:51:48 +11:00
parent af7a769433
commit 50d1d9d492
8 changed files with 177 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/common/Network/PacketDef/Ipcs.h
View file

@ -266,8 +266,8 @@ namespace Sapphire::Network::Packets
MarketBoardRequestItemInformation = 0x00FE, // updated 4.4
MarketBoardRequestItemListings = 0x00FF, // updated 4.4
MarketBoardSearch = 0x0103, // updated 4.4
SearchMarketboard = 0x0103, // updated 4.4
ReqExamineFcInfo = 0x010F, // updated 4.1
FcInfoReqHandler = 0x011A, // updated 4.2

20
src/common/Network/PacketDef/Zone/ClientZoneDef.h
View file

@ -237,8 +237,9 @@ struct FFXIVIpcSetSharedEstateSettings :
struct FFXIVIpcMarketBoardRequestItemListings :
FFXIVIpcBasePacket< MarketBoardRequestItemListings >
{
/* 0000 */ uint32_t itemCatalogId;
/* 0004 */ uint32_t padding;
/* 0000 */ uint16_t padding1;
/* 0002 */ uint16_t itemCatalogId;
/* 0004 */ uint32_t padding2;
};
struct FFXIVIpcReqPlaceHousingItem :
@ -270,11 +271,11 @@ struct FFXIVIpcHousingUpdateObjectPosition :
/* 001C */ uint32_t padding;
};
struct FFXIVIpcSearchMarketboard :
FFXIVIpcBasePacket< SearchMarketboard >
struct FFXIVIpcMarketBoardSearch :
FFXIVIpcBasePacket< MarketBoardSearch >
{
/* 0000 */ uint32_t unk;
/* 0004 */ uint8_t unk2[2];
/* 0000 */ uint32_t startIdx;
/* 0004 */ uint16_t requestId;
/* 0006 */ uint8_t itemSearchCategory;
/* 0007 */ uint8_t shouldCheckClassJobId; // wat? seems only 1 there at least...
/* 0008 */ uint8_t maxEquipLevel;
@ -283,6 +284,13 @@ struct FFXIVIpcSearchMarketboard :
/* 0032 */ uint16_t unk4[43];
};
struct FFXIVIpcMarketBoardRequestItemInformation :
FFXIVIpcBasePacket< MarketBoardRequestItemInformation >
{
/* 0000 */ uint32_t catalogId;
/* 0000 */ uint32_t requestId;
};
}
}
}

5
src/common/Network/PacketDef/Zone/ServerZoneDef.h
View file

@ -1847,13 +1847,14 @@ struct FFXIVIpcMarketBoardSearchResult :
struct MarketBoardItem
{
uint32_t itemCatalogId;
uint32_t quantity;
uint16_t quantity;
uint16_t demand;
} items[20];
uint32_t itemIndexEnd;
uint32_t padding1;
uint32_t itemIndexStart;
uint32_t padding2;
uint32_t requestId;
};
struct FFFXIVIpcMarketBoardItemListingCount :

106
src/world/Manager/MarketMgr.cpp
View file

@ -1,5 +1,17 @@
#include "MarketMgr.h"
#include <Exd/ExdDataGenerated.h>
#include <Framework.h>
#include <Logging/Logger.h>
#include <Network/CommonNetwork.h>
#include <Network/GamePacketNew.h>
#include <Network/PacketDef/Zone/ServerZoneDef.h>
#include "Actor/Player.h"
using namespace Sapphire::Network::Packets;
Sapphire::World::Manager::MarketMgr::MarketMgr( Sapphire::FrameworkPtr pFw ) :
BaseManager( pFw )
{
@ -8,12 +20,98 @@ Sapphire::World::Manager::MarketMgr::MarketMgr( Sapphire::FrameworkPtr pFw ) :
bool Sapphire::World::Manager::MarketMgr::init()
{
Logger::info( "MarketMgr: warming up marketable item cache..." );
// build item cache
auto exdData = framework()->get< Sapphire::Data::ExdDataGenerated >();
auto idList = exdData->getItemIdList();
for( auto id : idList )
{
auto item = exdData->get< Sapphire::Data::Item >( id );
if( !item )
continue;
if( item->isUntradable )
continue;
MarketableItem cacheEntry {};
cacheEntry.catalogId = id;
cacheEntry.itemSearchCategory = item->itemSearchCategory;
cacheEntry.maxEquipLevel = item->levelEquip;
cacheEntry.name = item->name;
cacheEntry.classJob = item->classJobUse;
m_marketItemCache.push_back( std::move( cacheEntry ) );
}
Logger::info( "MarketMgr: Cached " + std::to_string( m_marketItemCache.size() ) + " marketable items" );
return true;
}
void Sapphire::World::Manager::MarketMgr::searchMarketboard( Entity::Player& player,
uint8_t itemSearchCategory, uint8_t maxEquipLevel,
uint8_t classJob )
void Sapphire::World::Manager::MarketMgr::requestItemListings( Sapphire::Entity::Player& player, uint32_t catalogId,
uint32_t requestId )
{
auto countPkt = makeZonePacket< Server::FFFXIVIpcMarketBoardItemListingCount >( player.getId() );
countPkt->data().quantity = 1;
countPkt->data().itemCatalogId = catalogId;
}
void Sapphire::World::Manager::MarketMgr::searchMarketboard( Entity::Player& player, uint8_t itemSearchCategory,
uint8_t maxEquipLevel, uint8_t classJob,
const std::string_view& searchStr, uint32_t requestId,
uint32_t startIdx )
{
ItemSearchResultList resultList;
findItems( searchStr, itemSearchCategory, maxEquipLevel, classJob, resultList );
auto numResults = resultList.size();
if( startIdx > numResults )
return;
auto endIdx = std::min< size_t >( startIdx + 20, numResults );
auto size = endIdx - startIdx;
auto resultPkt = makeZonePacket< Server::FFXIVIpcMarketBoardSearchResult >( player.getId() );
resultPkt->data().itemIndexStart = startIdx;
resultPkt->data().requestId = requestId;
for( auto i = 0; i < resultList.size(); i++ )
{
auto& item = resultList.at( startIdx + i );
auto& data = resultPkt->data().items[ i ];
data.itemCatalogId = item.catalogId;
data.quantity = item.quantity;
data.demand = 69;
}
if( size < 20 )
resultPkt->data().itemIndexEnd = 0;
else
resultPkt->data().itemIndexEnd = startIdx + 20;
player.queuePacket( resultPkt );
}
void Sapphire::World::Manager::MarketMgr::findItems( const std::string_view& searchStr, uint8_t itemSearchCat,
uint8_t maxEquipLevel, uint8_t classJob,
Sapphire::World::Manager::MarketMgr::ItemSearchResultList& resultList )
{
for( const auto& item : m_marketItemCache )
{
if( item.itemSearchCategory != itemSearchCat )
continue;
if( maxEquipLevel > 0 && item.maxEquipLevel > maxEquipLevel )
continue;
if( classJob > 0 && item.classJob != classJob )
continue;
resultList.push_back( { item.catalogId, 1 } );
}
}

35
src/world/Manager/MarketMgr.h
View file

@ -4,6 +4,8 @@
#include "ForwardsZone.h"
#include "BaseManager.h"
#include <vector>
namespace Sapphire::World::Manager
{
class MarketMgr : public Manager::BaseManager
@ -13,7 +15,38 @@ namespace Sapphire::World::Manager
bool init();
void searchMarketboard( Entity::Player& player, uint8_t itemSearchCategory, uint8_t maxEquipLevel, uint8_t classJob );
void searchMarketboard( Entity::Player& player, uint8_t itemSearchCategory,
uint8_t maxEquipLevel, uint8_t classJob,
const std::string_view& searchStr, uint32_t requestId,
uint32_t startIdx );
void requestItemListings( Entity::Player& player, uint32_t catalogId, uint32_t requestId );
private:
struct ItemSearchResult
{
uint32_t catalogId;
uint16_t quantity;
};
struct MarketableItem
{
uint32_t catalogId;
uint8_t itemSearchCategory;
uint8_t maxEquipLevel;
uint8_t classJob;
std::string name;
};
using ItemSearchResultList = std::vector< ItemSearchResult >;
using MarketableItemCacheList = std::vector< MarketableItem >;
MarketableItemCacheList m_marketItemCache;
void findItems( const std::string_view& searchStr, uint8_t itemSearchCat, uint8_t maxEquipLevel, uint8_t classJob,
ItemSearchResultList& resultList );
};
}

4
src/world/Network/GameConnection.cpp
View file

@ -123,6 +123,10 @@ Sapphire::Network::GameConnection::GameConnection( Sapphire::Network::HivePtr pH
setZoneHandler( ClientZoneIpcType::PerformNoteHandler, "PerformNoteHandler", &GameConnection::performNoteHandler );
setZoneHandler( ClientZoneIpcType::MarketBoardSearch, "MarketBoardSearch", &GameConnection::marketBoardSearch );
setZoneHandler( ClientZoneIpcType::MarketBoardRequestItemInformation, "MarketBoardRequestItemInformation",
&GameConnection::marketBoardRequestItemInfo );
setChatHandler( ClientChatIpcType::TellReq, "TellReq", &GameConnection::tellHandler );
}

4
src/world/Network/GameConnection.h
View file

@ -176,7 +176,9 @@ namespace Sapphire::Network
DECLARE_HANDLER( reqMoveHousingItem );
DECLARE_HANDLER( searchMarketboard );
DECLARE_HANDLER( marketBoardSearch );
DECLARE_HANDLER( marketBoardRequestItemInfo );
};

20
src/world/Network/Handlers/PacketHandlers.cpp
View file

@ -755,14 +755,26 @@ void Sapphire::Network::GameConnection::reqMoveHousingItem( FrameworkPtr pFw,
}
void Sapphire::Network::GameConnection::searchMarketboard( FrameworkPtr pFw,
const Sapphire::Network::Packets::FFXIVARR_PACKET_RAW& inPacket,
void Sapphire::Network::GameConnection::marketBoardSearch( FrameworkPtr pFw,
const Packets::FFXIVARR_PACKET_RAW& inPacket,
Entity::Player& player )
{
auto marketMgr = pFw->get< MarketMgr >();
const auto packet = ZoneChannelPacket< Client::FFXIVIpcSearchMarketboard >( inPacket );
const auto packet = ZoneChannelPacket< Client::FFXIVIpcMarketBoardSearch >( inPacket );
const auto& data = packet.data();
marketMgr->searchMarketboard( player, data.itemSearchCategory, data.maxEquipLevel, data.classJobId );
std::string_view searchStr( data.searchStr );
marketMgr->searchMarketboard( player, data.itemSearchCategory, data.maxEquipLevel, data.classJobId, data.searchStr,
data.requestId, data.startIdx );
}
void Sapphire::Network::GameConnection::marketBoardRequestItemInfo( FrameworkPtr pFw,
const Packets::FFXIVARR_PACKET_RAW& inPacket,
Entity::Player& player )
{
const auto packet = ZoneChannelPacket< Client::FFXIVIpcMarketBoardRequestItemInformation >( inPacket );
auto marketMgr = pFw->get< MarketMgr >();
}