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

more instancecontent work;

Browse source
This commit is contained in:
Alice Ogeda 2023-03-08 17:18:13 -03:00 • committed by Tahir
parent a5fdc0b323
commit c8ab6debec
3 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/world/Encounter/InstanceContent/IfritNormal.h
View file

@ -18,7 +18,7 @@ namespace Sapphire
void init() override void init() override
{ {
Logger::info( "ifrit FAN CLUB GEOcities <blink>EUNUCH ONLY</blink>" ); Logger::info( "stage 2 init" );
} }
void update( uint64_t deltaTime ) override void update( uint64_t deltaTime ) override
@ -55,7 +55,7 @@ namespace Sapphire
void init() override void init() override
{ {
Logger::info( "ifrit FAN CLUB GEOcities <blink>EUNUCH ONLY</blink>" ); Logger::info( "stage 1 init" );
} }
void update( uint64_t deltaTime ) override void update( uint64_t deltaTime ) override
@ -76,7 +76,7 @@ namespace Sapphire
m_pEncounter->addState( ifritTwoState ); m_pEncounter->addState( ifritTwoState );
} }
if( timeElapsedMs > 10000 ) if( timeElapsedMs > 12000 )
{ {
pIfrit->hateListGetHighest()->die(); pIfrit->hateListGetHighest()->die();
} }

3
src/world/Network/PacketWrappers/MoveActorPacket.h
View file

@ -10,8 +10,7 @@ namespace Sapphire::Network::Packets::WorldPackets::Server
{ {
/** /**
* @brief The Client UI Initialization packet. This must be sent to the client * @brief The MoveActor packet for updating an actor's position.
* once upon connection to configure the UI.
*/ */
class MoveActorPacket : public ZoneChannelPacket< FFXIVIpcActorMove > class MoveActorPacket : public ZoneChannelPacket< FFXIVIpcActorMove >
{ {

5
src/world/Territory/InstanceContent.cpp
View file

@ -177,7 +177,7 @@ void Sapphire::InstanceContent::onUpdate( uint64_t tickCount )
// todo: revive players if trial/enclosed raid arena, add reset timer // todo: revive players if trial/enclosed raid arena, add reset timer
if( m_instanceResetTime == 0 ) if( m_instanceResetTime == 0 )
{ {
//sendDutyReset(); sendDutyReset();
m_instanceResetTime = tickCount + 3000; m_instanceResetTime = tickCount + 3000;
return; return;
@ -187,7 +187,7 @@ void Sapphire::InstanceContent::onUpdate( uint64_t tickCount )
if( m_instanceResetFinishTime == 0 ) if( m_instanceResetFinishTime == 0 )
{ {
m_instanceResetFinishTime = tickCount + 3000; m_instanceResetFinishTime = tickCount + 5000;
m_pEncounter->reset(); m_pEncounter->reset();
auto& server = Common::Service< World::WorldServer >::ref(); auto& server = Common::Service< World::WorldServer >::ref();
@ -202,6 +202,7 @@ void Sapphire::InstanceContent::onUpdate( uint64_t tickCount )
movePlayerToEntrance( *pPlayer ); movePlayerToEntrance( *pPlayer );
auto zoneInPacket = makeActorControlSelf( pPlayer->getId(), Appear, 0x3, 0, 0, 0 ); auto zoneInPacket = makeActorControlSelf( pPlayer->getId(), Appear, 0x3, 0, 0, 0 );
auto setStatusPacket = makeActorControl( pPlayer->getId(), SetStatus, static_cast< uint8_t >( Common::ActorStatus::Idle ) ); auto setStatusPacket = makeActorControl( pPlayer->getId(), SetStatus, static_cast< uint8_t >( Common::ActorStatus::Idle ) );
server.queueForPlayer( pPlayer->getCharacterId(), zoneInPacket ); server.queueForPlayer( pPlayer->getCharacterId(), zoneInPacket );
server.queueForPlayers( pPlayer->getInRangePlayerIds( true ), setStatusPacket ); server.queueForPlayers( pPlayer->getInRangePlayerIds( true ), setStatusPacket );