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

Merge branch 'action_data_update_pr' into action_data_update

Browse source
This commit is contained in:
collett 2020-01-11 19:40:38 +09:00
commit a2958601a1
1 changed files with 3 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
src/world/Action/EffectBuilder.cpp
View file

@ -28,7 +28,7 @@ uint64_t EffectBuilder::getResultDelayMs()
{ {
// todo: actually figure this retarded shit out // todo: actually figure this retarded shit out
return Common::Util::getTimeMs() + 850; return Common::Util::getTimeMs() + 600;
} }
void EffectBuilder::moveToResultList( Entity::CharaPtr& chara, EffectResultPtr result ) void EffectBuilder::moveToResultList( Entity::CharaPtr& chara, EffectResultPtr result )
@ -86,7 +86,7 @@ void EffectBuilder::comboSucceed( Entity::CharaPtr& target )
void EffectBuilder::applyStatusEffect( Entity::CharaPtr& target, Entity::CharaPtr& source, uint16_t statusId, uint32_t duration, uint8_t param ) void EffectBuilder::applyStatusEffect( Entity::CharaPtr& target, Entity::CharaPtr& source, uint16_t statusId, uint32_t duration, uint8_t param )
{ {
EffectResultPtr nextResult = make_EffectResult( target, source, 0 ); EffectResultPtr nextResult = make_EffectResult( target, source, getResultDelayMs() );
nextResult->applyStatusEffect( statusId, duration, param ); nextResult->applyStatusEffect( statusId, duration, param );
moveToResultList( target, nextResult ); moveToResultList( target, nextResult );
} }
@ -176,6 +176,7 @@ std::shared_ptr< FFXIVPacketBase > EffectBuilder::buildNextEffectPacket( uint32_
pHeader->effectCount = static_cast< uint8_t >( remainingTargetCount > packetSize ? packetSize : remainingTargetCount ); pHeader->effectCount = static_cast< uint8_t >( remainingTargetCount > packetSize ? packetSize : remainingTargetCount );
pHeader->sourceSequence = m_sequence; pHeader->sourceSequence = m_sequence;
pHeader->globalSequence = globalSequence; pHeader->globalSequence = globalSequence;
pHeader->animationLockTime = 0.6f;
uint8_t targetIndex = 0; uint8_t targetIndex = 0;
for( auto it = m_resolvedEffects.begin(); it != m_resolvedEffects.end(); ) for( auto it = m_resolvedEffects.begin(); it != m_resolvedEffects.end(); )