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

Initial inventory container creation ported

Browse source
This commit is contained in:
Mordred 2017-10-25 23:24:47 +02:00
parent 2113e45a5b
commit d73246a4c9
4 changed files with 60 additions and 73 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
src/servers/Server_Common/Database/CharaDbConnection.cpp
View file

@ -101,6 +101,7 @@ void Core::Db::CharaDbConnection::doPrepareStatements()
prepareStatement( CHARA_UP_CFPENATLY, "UPDATE charainfo SET CFPenaltyUntil = ? WHERE CharacterId = ?;", CONNECTION_ASYNC );
/// SEARCH INFO
prepareStatement( CHARA_SEARCHINFO_INS, "INSERT INTO charainfosearch (CharacterId, UPDATE_DATE ) VALUES ( ?, NOW() );", CONNECTION_BOTH );
prepareStatement( CHARA_SEARCHINFO_UP_SELECTCLASS, "UPDATE charainfosearch SET SelectClassId = ? WHERE CharacterId = ?;", CONNECTION_ASYNC );
prepareStatement( CHARA_SEARCHINFO_UP_SELECTREGION, "UPDATE charainfosearch SET SelectRegion = ? WHERE CharacterId = ?;", CONNECTION_ASYNC );
prepareStatement( CHARA_SEARCHINFO_UP_SEARCHCOMMENT, "UPDATE charainfosearch SET SearchComment = ? WHERE CharacterId = ?;", CONNECTION_ASYNC );
@ -126,4 +127,8 @@ void Core::Db::CharaDbConnection::doPrepareStatements()
prepareStatement( CHARA_CLASS_UP, "UPDATE characlass SET Exp = ?, Lvl = ? WHERE CharacterId = ? AND ClassIdx = ?;", CONNECTION_ASYNC );
prepareStatement( CHARA_CLASS_DEL, "DELETE FROM characlass WHERE CharacterId = ?;", CONNECTION_ASYNC );
/// INVENTORY INFO
prepareStatement( CHARA_ITEMINV_INS, "INSERT INTO charaiteminventory ( CharacterId, storageId, UPDATE_DATE ) VALUES ( ?, ?, NOW());", CONNECTION_BOTH );
}

3
src/servers/Server_Common/Database/CharaDbConnection.h
View file

@ -57,6 +57,7 @@ enum CharaDbStatements : uint32_t
CHARA_UP_GMRANK,
CHARA_UP_UNLOCKS,
CHARA_UP_CFPENATLY,
CHARA_SEARCHINFO_INS,
CHARA_SEARCHINFO_UP_SELECTCLASS,
CHARA_SEARCHINFO_UP_SELECTREGION,
CHARA_SEARCHINFO_UP_SEARCHCOMMENT,
@ -70,6 +71,8 @@ enum CharaDbStatements : uint32_t
CHARA_CLASS_UP,
CHARA_CLASS_DEL,
CHARA_ITEMINV_INS,
MAX_STATEMENTS
};

90
src/servers/Server_REST/PlayerMinimal.cpp
View file

@ -155,14 +155,14 @@ namespace Core {
void PlayerMinimal::saveAsNew()
{
std::vector< uint8_t > customize( 32 );
std::vector< uint8_t > customize( 26 );
std::vector< uint8_t > howTo( 32 );
std::vector< uint8_t > aetherytes( 12 );
std::vector< uint8_t > discovery( 411 );
std::vector< uint8_t > questComplete( 200 );
std::vector< uint8_t > unlocks( 64 );
std::vector< uint8_t > modelEquip( 40 );
std::vector< uint8_t > questTracking8(10);
std::vector< uint8_t > questTracking8( 10 );
std::vector< int16_t > questTracking = { -1, -1, -1, -1, -1 };
memset( questComplete.data(), 0, questComplete.size() );
@ -234,7 +234,6 @@ namespace Core {
g_charaDb.directExecute( stmtClass );
auto stmt = g_charaDb.getPreparedStatement( Db::CharaDbStatements::CHARA_INS );
stmt->setInt( 1, m_accountId );
stmt->setInt( 2, m_id );
stmt->setInt64( 3, m_contentId );
@ -268,69 +267,39 @@ namespace Core {
stmt->setInt( 31, m_gmRank );
g_charaDb.directExecute( stmt );
g_charaDb.execute( "INSERT INTO charainfosearch (CharacterId, UPDATE_DATE ) VALUES (" + std::to_string( m_id ) + ", NOW());" );
auto stmtSearchInfo = g_charaDb.getPreparedStatement( Db::CharaDbStatements::CHARA_SEARCHINFO_INS );
stmtSearchInfo->setInt( 1, m_id );
g_charaDb.directExecute( stmtSearchInfo );
/////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
// SET UP INVENTORIES
/// SET UP INVENTORIES
g_charaDb.execute( "INSERT INTO charaiteminventory (storageId, CharacterId, UPDATE_DATE ) "
"VALUES ( " + std::to_string( InventoryType::Bag0 ) + ", " + std::to_string( m_id ) + ", NOW());" );
createInvDbContainer( InventoryType::Bag0 );
createInvDbContainer( InventoryType::Bag1 );
createInvDbContainer( InventoryType::Bag2 );
createInvDbContainer( InventoryType::Bag3 );
g_charaDb.execute( "INSERT INTO charaiteminventory (storageId, CharacterId, UPDATE_DATE ) "
"VALUES ( " + std::to_string( InventoryType::Bag1 ) + ", " + std::to_string( m_id ) + ", NOW());" );
createInvDbContainer( InventoryType::ArmoryOff );
g_charaDb.execute( "INSERT INTO charaiteminventory (storageId, CharacterId, UPDATE_DATE ) "
"VALUES ( " + std::to_string( InventoryType::Bag2 ) + ", " + std::to_string( m_id ) + ", NOW());" );
createInvDbContainer( InventoryType::ArmoryHead );
createInvDbContainer( InventoryType::ArmoryBody );
createInvDbContainer( InventoryType::ArmoryHand );
createInvDbContainer( InventoryType::ArmoryWaist );
createInvDbContainer( InventoryType::ArmoryLegs );
createInvDbContainer( InventoryType::ArmoryFeet );
g_charaDb.execute( "INSERT INTO charaiteminventory (storageId, CharacterId, UPDATE_DATE ) "
"VALUES ( " + std::to_string( InventoryType::Bag3 ) + ", " + std::to_string( m_id ) + ", NOW());" );
createInvDbContainer( InventoryType::ArmotyNeck );
createInvDbContainer( InventoryType::ArmoryEar );
createInvDbContainer( InventoryType::ArmoryWrist );
createInvDbContainer( InventoryType::ArmoryRing );
createInvDbContainer( InventoryType::ArmoryMain );
g_charaDb.execute( "INSERT INTO charaiteminventory (storageId, CharacterId, UPDATE_DATE ) "
"VALUES ( " + std::to_string( InventoryType::ArmoryOff ) + ", " + std::to_string( m_id ) + ", NOW());" );
createInvDbContainer( InventoryType::Currency );
createInvDbContainer( InventoryType::Crystal );
g_charaDb.execute( "INSERT INTO charaiteminventory (storageId, CharacterId, UPDATE_DATE ) "
"VALUES ( " + std::to_string( InventoryType::ArmoryHead ) + ", " + std::to_string( m_id ) + ", NOW());" );
g_charaDb.execute( "INSERT INTO charaiteminventory (storageId, CharacterId, UPDATE_DATE ) "
"VALUES ( " + std::to_string( InventoryType::ArmoryBody ) + ", " + std::to_string( m_id ) + ", NOW());" );
g_charaDb.execute( "INSERT INTO charaiteminventory (storageId, CharacterId, UPDATE_DATE ) "
"VALUES ( " + std::to_string( InventoryType::ArmoryHand ) + ", " + std::to_string( m_id ) + ", NOW());" );
g_charaDb.execute( "INSERT INTO charaiteminventory (storageId, CharacterId, UPDATE_DATE ) "
"VALUES ( " + std::to_string( InventoryType::ArmoryWaist ) + ", " + std::to_string( m_id ) + ", NOW());" );
g_charaDb.execute( "INSERT INTO charaiteminventory (storageId, CharacterId, UPDATE_DATE ) "
"VALUES ( " + std::to_string( InventoryType::ArmoryLegs ) + ", " + std::to_string( m_id ) + ", NOW());" );
g_charaDb.execute( "INSERT INTO charaiteminventory (storageId, CharacterId, UPDATE_DATE ) "
"VALUES ( " + std::to_string( InventoryType::ArmoryFeet ) + ", " + std::to_string( m_id ) + ", NOW());" );
g_charaDb.execute( "INSERT INTO charaiteminventory (storageId, CharacterId, UPDATE_DATE ) "
"VALUES ( " + std::to_string( InventoryType::ArmotyNeck ) + ", " + std::to_string( m_id ) + ", NOW());" );
g_charaDb.execute( "INSERT INTO charaiteminventory (storageId, CharacterId, UPDATE_DATE ) "
"VALUES ( " + std::to_string( InventoryType::ArmoryEar ) + ", " + std::to_string( m_id ) + ", NOW());" );
g_charaDb.execute( "INSERT INTO charaiteminventory (storageId, CharacterId, UPDATE_DATE )"
"VALUES ( " + std::to_string( InventoryType::ArmoryWrist ) + ", " + std::to_string( m_id ) + ", NOW());" );
g_charaDb.execute( "INSERT INTO charaiteminventory (storageId, CharacterId, UPDATE_DATE ) "
"VALUES ( " + std::to_string( InventoryType::ArmoryRing ) + ", " + std::to_string( m_id ) + ", NOW());" );
g_charaDb.execute( "INSERT INTO charaiteminventory (storageId, CharacterId, UPDATE_DATE ) "
"VALUES ( " + std::to_string( InventoryType::ArmoryMain ) + ", " + std::to_string( m_id ) + ", NOW());" );
g_charaDb.execute( "INSERT INTO charaiteminventory (storageId, CharacterId, UPDATE_DATE ) "
"VALUES ( " + std::to_string( InventoryType::Currency ) + ", " + std::to_string( m_id ) + ", NOW());" );
g_charaDb.execute( "INSERT INTO charaiteminventory (storageId, CharacterId, UPDATE_DATE ) "
"VALUES ( " + std::to_string( InventoryType::Crystal ) + ", " + std::to_string( m_id ) + ", NOW());" );
///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
// SETUP EQUIPMENT / STARTING GEAR
/// SETUP EQUIPMENT / STARTING GEAR
auto classJobInfo = g_exdData.m_classJobInfoMap[m_class];
uint32_t weaponId = classJobInfo.start_weapon_id;
uint64_t uniqueId = g_database.getNextUId();
@ -379,6 +348,7 @@ namespace Core {
g_charaDb.execute( "INSERT INTO charaglobalitem (CharacterId, ItemId, catalogId, UPDATE_DATE ) "
"VALUES ( " + std::to_string( m_id ) + ", " + std::to_string( feetUid ) + ", " +
std::to_string( feet ) + ", NOW());" );
g_charaDb.execute( "INSERT INTO charaitemgearset (storageId, CharacterId, "
"container_" + std::to_string( EquipSlot::MainHand ) + ", "
"container_" + std::to_string( EquipSlot::Body ) + ", "
@ -394,4 +364,12 @@ namespace Core {
std::to_string( feetUid ) + ", NOW());" );
}
void PlayerMinimal::createInvDbContainer( uint8_t slot ) const
{
auto stmtCreateInv = g_charaDb.getPreparedStatement( Db::CHARA_ITEMINV_INS );
stmtCreateInv->setInt( 1, m_id );
stmtCreateInv->setInt( 2, slot );
g_charaDb.directExecute( stmtCreateInv );
}
}

35
src/servers/Server_REST/PlayerMinimal.h
View file

@ -150,32 +150,33 @@ namespace Core {
m_gmRank = rank;
}
uint32_t m_modelEquip[10];
void createInvDbContainer( uint8_t slot ) const;
uint32_t m_modelEquip[10];
private:
uint32_t m_accountId;
uint32_t m_id;
uint64_t m_contentId;
uint32_t m_accountId;
uint32_t m_id;
uint64_t m_contentId;
uint8_t m_guardianDeity;
uint8_t m_birthMonth;
uint8_t m_birthDay;
uint8_t m_class;
uint8_t m_guardianDeity;
uint8_t m_birthMonth;
uint8_t m_birthDay;
uint8_t m_class;
uint8_t m_voice;
uint8_t m_voice;
uint8_t m_tribe;
uint8_t m_tribe;
uint16_t m_zoneId;
uint16_t m_zoneId;
std::map<uint8_t, uint32_t> m_lookMap;
std::map<uint8_t, uint16_t> m_classMap;
uint8_t m_look[26];
std::map< uint8_t, uint32_t > m_lookMap;
std::map< uint8_t, uint16_t > m_classMap;
uint8_t m_look[26];
uint8_t m_gmRank;
char m_name[34];
uint8_t m_gmRank;
char m_name[34];
};