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

Merge branch 'misc_fix' into develop_c

Browse source
This commit is contained in:
collett 2020-01-13 19:36:20 +09:00
commit 4485f22040
4 changed files with 28 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
src/world/Action/Action.cpp
View file

@ -439,7 +439,7 @@ void Action::Action::buildEffects()
if( m_disableGenericHandler || !hasValidLutEntry() )
{
// send any effect packet added by script or an empty one just to play animation for other players
m_effectBuilder->buildAndSendPackets();
m_effectBuilder->buildAndSendPackets( getAnimationLock() );
return;
}
@ -543,7 +543,7 @@ void Action::Action::buildEffects()
m_effectBuilder->applyStatusEffect( m_pSource, m_pSource, m_lutEntry.selfStatus, m_lutEntry.selfStatusDuration, m_lutEntry.selfStatusParam );
}
m_effectBuilder->buildAndSendPackets();
m_effectBuilder->buildAndSendPackets( getAnimationLock() );
// at this point we're done with it and no longer need it
m_effectBuilder.reset();
@ -815,6 +815,22 @@ bool Action::Action::hasValidLutEntry() const
m_lutEntry.targetStatus != 0 || m_lutEntry.gainMPPercentage != 0;
}
float Action::Action::getAnimationLock()
{
switch( static_cast< Common::ActionCategory >( m_actionData->actionCategory ) )
{
case Common::ActionCategory::Item:
{
return 1.1f;
}
case Common::ActionCategory::Mount:
{
return 0.1f;
}
}
return 0.6f;
}
Action::EffectBuilderPtr Action::Action::getEffectbuilder()
{
return m_effectBuilder;

2
src/world/Action/Action.h
View file

@ -129,6 +129,8 @@ namespace Sapphire::World::Action
ActionEntry getActionEntry() const;
float getAnimationLock();
bool isPhysical() const;
bool isMagical() const;

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

@ -105,7 +105,7 @@ void EffectBuilder::statusNoEffect( Entity::CharaPtr& target, uint16_t statusId
moveToResultList( target, nextResult );
}
void EffectBuilder::buildAndSendPackets()
void EffectBuilder::buildAndSendPackets( float animationLock )
{
auto targetCount = m_resolvedEffects.size();
//Logger::debug( "EffectBuilder result: " );
@ -115,13 +115,13 @@ void EffectBuilder::buildAndSendPackets()
do // we want to send at least one packet even nothing is hit so other players can see
{
auto packet = buildNextEffectPacket( globalSequence );
auto packet = buildNextEffectPacket( globalSequence, animationLock );
m_sourceChara->sendToInRangeSet( packet, true );
}
while( !m_resolvedEffects.empty() );
}
std::shared_ptr< FFXIVPacketBase > EffectBuilder::buildNextEffectPacket( uint32_t globalSequence )
std::shared_ptr< FFXIVPacketBase > EffectBuilder::buildNextEffectPacket( uint32_t globalSequence, float animationLock )
{
auto remainingTargetCount = m_resolvedEffects.size();
@ -190,7 +190,7 @@ std::shared_ptr< FFXIVPacketBase > EffectBuilder::buildNextEffectPacket( uint32_
pHeader->effectCount = static_cast< uint8_t >( remainingTargetCount > packetSize ? packetSize : remainingTargetCount );
pHeader->sourceSequence = m_sequence;
pHeader->globalSequence = globalSequence;
pHeader->animationLockTime = 0.6f;
pHeader->animationLockTime = animationLock;
uint8_t targetIndex = 0;
for( auto it = m_resolvedEffects.begin(); it != m_resolvedEffects.end(); )
@ -235,7 +235,7 @@ std::shared_ptr< FFXIVPacketBase > EffectBuilder::buildNextEffectPacket( uint32_
auto effectPacket = std::make_shared< Server::EffectPacket >( m_sourceChara->getId(), firstResult->getTarget()->getId(), m_actionId );
effectPacket->setRotation( Common::Util::floatToUInt16Rot( m_sourceChara->getRot() ) );
effectPacket->setSequence( seq, m_sequence );
effectPacket->data().animationLockTime = 0.6f;
effectPacket->data().animationLockTime = animationLock;
for( int i = 0; i < resultList->size(); i++ )
{
@ -263,7 +263,7 @@ std::shared_ptr< FFXIVPacketBase > EffectBuilder::buildNextEffectPacket( uint32_
effectPacket->data().effectCount = 0;
effectPacket->data().sourceSequence = m_sequence;
effectPacket->data().globalSequence = globalSequence;
effectPacket->data().animationLockTime = 0.6f;
effectPacket->data().animationLockTime = animationLock;
return effectPacket;
}

4
src/world/Action/EffectBuilder.h
View file

@ -31,14 +31,14 @@ namespace Sapphire::World::Action
void statusNoEffect( Entity::CharaPtr& target, uint16_t statusId );
void buildAndSendPackets();
void buildAndSendPackets( float animationLock );
private:
void moveToResultList( Entity::CharaPtr& chara, EffectResultPtr result );
uint64_t getResultDelayMs();
std::shared_ptr< Sapphire::Network::Packets::FFXIVPacketBase > buildNextEffectPacket( uint32_t globalSequence );
std::shared_ptr< Sapphire::Network::Packets::FFXIVPacketBase > buildNextEffectPacket( uint32_t globalSequence, float animationLock );
private:
uint32_t m_actionId;