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

Merge pull request #64 from Minoost/master

Browse source 
Reimplement CFPenaltyTime to reflect recent refactoring
This commit is contained in:
SapphireMordred 2017-08-19 09:19:25 +02:00 • committed by GitHub
commit bb4a84d51a
11 changed files with 144 additions and 63 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
sql/charadetail.sql
View file

@ -77,6 +77,7 @@ CREATE TABLE charadetail (
`ContentRetryTime` blob,
`ContentJoinTime` int(10) DEFAULT NULL,
`ContentClearFlag` blob,
`CFPenaltyUntil` int unsigned NOT NULL DEFAULT '0',
`TownWarpFstFlags` binary(2) DEFAULT NULL,
`PathId` int(10) DEFAULT NULL,
`StepIndex` int(5) DEFAULT NULL,

4
src/servers/Server_Common/Common.h
View file

@ -285,13 +285,15 @@ namespace Core {
HpMp = 0x00000800,
QuestTracker = 0x00001000,
NewGame = 0x00002000,
// 0x4000 is missing here
Unlocks = 0x00008000,
PlayTime = 0x00010000,
NewAdventurer = 0x00020000,
SearchInfo = 0x00040000,
GC = 0x00080000,
CFPenaltyTime = 0x00100000,
All = 0xFFFFFFFF,
};

11
src/servers/Server_Common/Util/Util.cpp
View file

@ -17,17 +17,14 @@ std::string Core::Util::binaryToHexString( uint8_t* pBinData, uint16_t size )
uint64_t Core::Util::getTimeMs()
{
std::chrono::high_resolution_clock::time_point t1 = std::chrono::high_resolution_clock::now();
auto now_ms = std::chrono::time_point_cast< std::chrono::milliseconds >( t1 ).time_since_epoch().count();
return now_ms;
std::chrono::milliseconds epoch = std::chrono::duration_cast< std::chrono::milliseconds >(std::chrono::system_clock::now().time_since_epoch());
return epoch.count();
}
uint64_t Core::Util::getTimeSeconds()
{
std::chrono::high_resolution_clock::time_point t1 = std::chrono::high_resolution_clock::now();
auto now = std::chrono::time_point_cast< std::chrono::seconds >( t1 ).time_since_epoch().count();
return now;
std::chrono::seconds epoch = std::chrono::duration_cast< std::chrono::seconds >(std::chrono::system_clock::now().time_since_epoch());
return epoch.count();
}
uint64_t Core::Util::getEorzeanTimeStamp()

36
src/servers/Server_Zone/Actor/Player.cpp
View file

@ -1569,3 +1569,39 @@ void Core::Entity::Player::handleScriptSkill( uint32_t type, uint32_t actionId,
break;
}
}
/////////////////////////////
// Content Finder
/////////////////////////////
uint32_t Core::Entity::Player::getCFPenaltyTimestamp() const
{
return m_cfPenaltyUntil;
}
void Core::Entity::Player::setCFPenaltyTimestamp( uint32_t timestamp )
{
m_cfPenaltyUntil = timestamp;
setSyncFlag( PlayerSyncFlags::CFPenaltyTime );
}
uint32_t Core::Entity::Player::getCFPenaltyMinutes() const
{
auto currentTimestamp = Core::Util::getTimeSeconds();
auto endTimestamp = getCFPenaltyTimestamp();
// check if penalty timestamp already passed current time
if (currentTimestamp > endTimestamp)
{
return 0;
}
auto deltaTime = endTimestamp - currentTimestamp;
return static_cast< uint32_t > ( ceil( static_cast< float > (deltaTime) / 60 ) );
}
void Core::Entity::Player::setCFPenaltyMinutes( uint32_t minutes )
{
auto currentTimestamp = Core::Util::getTimeSeconds();
setCFPenaltyTimestamp(static_cast< uint32_t >( currentTimestamp + minutes * 60 ));
}

12
src/servers/Server_Zone/Actor/Player.h
View file

@ -484,6 +484,16 @@ public:
void handleScriptSkill( uint32_t type, uint32_t actionId, uint64_t param1, uint64_t param2, Entity::Actor& target );
// Content Finder handling
//////////////////////////////////////////////////////////////////////////////////////////////////////
/*! Get an unix time when the player can register into content finder again. */
uint32_t getCFPenaltyTimestamp() const;
/*! Set an unix time when the player can register into content finder again. */
void setCFPenaltyTimestamp( uint32_t timestamp );
uint32_t getCFPenaltyMinutes() const;
void setCFPenaltyMinutes( uint32_t minutes );
private:
uint32_t m_lastWrite;
uint32_t m_lastPing;
@ -599,6 +609,8 @@ private:
uint8_t m_gc;
uint8_t m_gcRank[3];
// content finder info
uint32_t m_cfPenaltyUntil; // unix time
};
}

19
src/servers/Server_Zone/Actor/PlayerSql.cpp
View file

@ -43,7 +43,8 @@ bool Core::Entity::Player::load( uint32_t charId, Core::SessionPtr pSession )
// TODO: can't help but think that the whole player loading could be handled better...
const std::string char_id_str = std::to_string( charId );
auto pQR = g_database.query( "SELECT c.Name, "
auto pQR = g_database.query( "SELECT "
"c.Name, "
"c.PrimaryTerritoryId, "
"c.Hp, "
"c.Mp, "
@ -53,7 +54,7 @@ bool Core::Entity::Player::load( uint32_t charId, Core::SessionPtr pSession )
"c.Pos_0_1, "
"c.Pos_0_2, "
"c.Pos_0_3, "
"c.FirstLogin, "
"c.FirstLogin, " // 10
"c.Customize, "
"c.ModelMainWeapon, "
"c.ModelSubWeapon, "
@ -63,7 +64,7 @@ bool Core::Entity::Player::load( uint32_t charId, Core::SessionPtr pSession )
"cd.BirthMonth, "
"cd.Status, "
"cd.Class, "
"cd.Homepoint, "
"cd.Homepoint, " // 20
"cd.HowTo, "
"c.ContentId, "
"c.Voice, "
@ -73,11 +74,12 @@ bool Core::Entity::Player::load( uint32_t charId, Core::SessionPtr pSession )
"cd.Aetheryte, "
"cd.unlocks, "
"cd.Discovery, "
"cd.StartTown, "
"cd.StartTown, " // 30
"cd.TotalPlayTime, "
"c.IsNewAdventurer, "
"cd.GrandCompany, "
"cd.GrandCompanyRank "
"cd.GrandCompanyRank, "
"cd.CFPenaltyUntil "
"FROM charabase AS c "
" INNER JOIN charadetail AS cd "
" ON c.CharacterId = cd.CharacterId "
@ -166,6 +168,8 @@ bool Core::Entity::Player::load( uint32_t charId, Core::SessionPtr pSession )
m_gc = field[33].getUInt8();
field[34].getBinary( reinterpret_cast< char* >( m_gcRank ), 3 );
m_cfPenaltyUntil = field[35].getUInt32();
m_pCell = nullptr;
if( !loadActiveQuests() || !loadClassData() || !loadSearchInfo() )
@ -327,7 +331,10 @@ void Core::Entity::Player::createUpdateSql()
charaDetailSet.insert( " GrandCompanyRank = UNHEX('" + std::string( Util::binaryToHexString( reinterpret_cast< uint8_t* >( m_gcRank ), sizeof( m_gcRank ) ) ) + "')" );
}
if( m_updateFlags & PlayerSyncFlags::CFPenaltyTime )
{
charaDetailSet.insert( " CFPenaltyUntil = " + std::to_string( m_cfPenaltyUntil ) );
}
if( m_updateFlags & PlayerSyncFlags::ExpLevel )
{

0
src/servers/Server_Zone/ContentFinder/ContentFinder.cpp Normal file
View file

7
src/servers/Server_Zone/ContentFinder/ContentFinder.h Normal file
View file

@ -0,0 +1,7 @@
#ifndef _CONTENTFINDER_H
#define _CONTENTFINDER_H
#include "../Forwards.h"
#endif

11
src/servers/Server_Zone/DebugCommand/DebugCommandHandler.cpp
View file

@ -104,7 +104,6 @@ void Core::DebugCommandHandler::execCommand( char * data, Core::Entity::PlayerPt
}
///////////////////////////////////////////////////////////////////////////////////////
// Definition of the commands
///////////////////////////////////////////////////////////////////////////////////////
@ -267,8 +266,6 @@ void Core::DebugCommandHandler::set( char * data, Core::Entity::PlayerPtr pPlaye
sscanf( params.c_str(), "%d", &id );
uint8_t typeshift = 0x6;
uint8_t mask = 1 << typeshift;
id &= mask;
@ -282,6 +279,14 @@ void Core::DebugCommandHandler::set( char * data, Core::Entity::PlayerPtr pPlaye
sscanf( params.c_str(), "%d", &id );
pPlayer->sendDebug( std::to_string( pPlayer->actionHasCastTime( id ) ) );
}
else if ( subCommand == "cfpenalty" )
{
int32_t minutes;
sscanf( params.c_str(), "%d", &minutes );
pPlayer->setCFPenaltyMinutes( minutes );
}
}

5
src/servers/Server_Zone/Forwards.h
View file

@ -62,6 +62,11 @@ namespace Core
}
}
namespace ContentFinder
{
TYPE_FORWARD( ContentFinder );
}
namespace Scripting
{
typedef std::function< void( Entity::Player&, uint32_t, uint16_t, uint16_t, uint16_t ) > EventReturnCallback;

55
src/servers/Server_Zone/Network/Handlers/CFHandlers.cpp
View file

@ -27,46 +27,55 @@ using namespace Core::Network::Packets::Server;
void Core::Network::GameConnection::cfDutyInfoRequest( const Packets::GamePacket& inPacket,
Entity::PlayerPtr pPlayer )
{
GamePacketNew< FFXIVIpcCFDutyInfo > dutyInfoPacket( pPlayer->getId() );
queueOutPacket( dutyInfoPacket );
GamePacketNew< FFXIVIpcCFDutyInfo > dutyInfoPacket( pPlayer->getId() );
GamePacketNew< FFXIVIpcCFPlayerInNeed > inNeedsPacket( pPlayer->getId() );
queueOutPacket( inNeedsPacket );
auto penaltyMinutes = pPlayer->getCFPenaltyMinutes();
if (penaltyMinutes > 255)
{
// cap it since it's uint8_t in packets
penaltyMinutes = 255;
}
dutyInfoPacket.data().penaltyTime = penaltyMinutes;
queueOutPacket( dutyInfoPacket );
GamePacketNew< FFXIVIpcCFPlayerInNeed > inNeedsPacket( pPlayer->getId() );
queueOutPacket( inNeedsPacket );
}
void Core::Network::GameConnection::cfRegisterDuty( const Packets::GamePacket& inPacket,
Entity::PlayerPtr pPlayer)
{
// TODO use for loop for this
auto contentId1 = inPacket.getValAt< uint16_t >( 46 );
auto contentId2 = inPacket.getValAt< uint16_t >( 48 );
auto contentId3 = inPacket.getValAt< uint16_t >( 50 );
auto contentId4 = inPacket.getValAt< uint16_t >( 52 );
auto contentId5 = inPacket.getValAt< uint16_t >( 54 );
// TODO use for loop for this
auto contentId1 = inPacket.getValAt< uint16_t >( 46 );
auto contentId2 = inPacket.getValAt< uint16_t >( 48 );
auto contentId3 = inPacket.getValAt< uint16_t >( 50 );
auto contentId4 = inPacket.getValAt< uint16_t >( 52 );
auto contentId5 = inPacket.getValAt< uint16_t >( 54 );
pPlayer->sendDebug("Duty register request");
pPlayer->sendDebug("ContentId1" + std::to_string(contentId1));
pPlayer->sendDebug("ContentId2" + std::to_string(contentId2));
pPlayer->sendDebug("ContentId3" + std::to_string(contentId3));
pPlayer->sendDebug("ContentId4" + std::to_string(contentId4));
pPlayer->sendDebug("ContentId5" + std::to_string(contentId5));
pPlayer->sendDebug("Duty register request");
pPlayer->sendDebug("ContentId1" + std::to_string(contentId1));
pPlayer->sendDebug("ContentId2" + std::to_string(contentId2));
pPlayer->sendDebug("ContentId3" + std::to_string(contentId3));
pPlayer->sendDebug("ContentId4" + std::to_string(contentId4));
pPlayer->sendDebug("ContentId5" + std::to_string(contentId5));
// let's cancel it because otherwise you can't register it again
GamePacketNew< FFXIVIpcCFNotify > cfCancelPacket( pPlayer->getId() );
cfCancelPacket.data().state1 = 3;
cfCancelPacket.data().state2 = 1; // Your registration is withdrawn.
queueOutPacket( cfCancelPacket );
// let's cancel it because otherwise you can't register it again
GamePacketNew< FFXIVIpcCFNotify > cfCancelPacket( pPlayer->getId() );
cfCancelPacket.data().state1 = 3;
cfCancelPacket.data().state2 = 1; // Your registration is withdrawn.
queueOutPacket( cfCancelPacket );
}
void Core::Network::GameConnection::cfRegisterRoulette( const Packets::GamePacket& inPacket,
Entity::PlayerPtr pPlayer)
{
pPlayer->sendDebug("Roulette register");
pPlayer->sendDebug("Roulette register");
}
void Core::Network::GameConnection::cfDutyAccepted( const Packets::GamePacket& inPacket,
Entity::PlayerPtr pPlayer)
{
pPlayer->sendDebug("TODO: Duty accept");
pPlayer->sendDebug("TODO: Duty accept");
}