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

Fixed effectpacket flags.

Browse source
This commit is contained in:
Mordred 2023-01-20 11:40:35 +01:00
parent ba3f091a69
commit 258dc8d69b
3 changed files with 9 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/common/Common.h
View file

@ -946,8 +946,8 @@ namespace Sapphire::Common
struct CalcResult struct CalcResult
{ {
CalcResultParam CalcResultCt[4];
CalcResultParam CalcResultTg[4]; CalcResultParam CalcResultTg[4];
CalcResultParam CalcResultCt[4];
}; };
struct IntegrityStatus struct IntegrityStatus

2
src/world/Actor/BNpc.cpp
View file

@ -991,7 +991,7 @@ void Sapphire::Entity::BNpc::autoAttack( CharaPtr pTarget )
Common::CalcResultParam effectEntry{}; Common::CalcResultParam effectEntry{};
effectEntry.Value = static_cast< int16_t >( damage.first ); effectEntry.Value = static_cast< int16_t >( damage.first );
effectEntry.Type = ActionEffectType::CALC_RESULT_TYPE_DAMAGE_HP; effectEntry.Type = ActionEffectType::CALC_RESULT_TYPE_DAMAGE_HP;
effectEntry.Flag = 128; //effectEntry.Flag = 128;
effectEntry.Arg0 = 3; effectEntry.Arg0 = 3;
effectEntry.Arg1 = 7; effectEntry.Arg1 = 7;
//effectEntry.Arg2 = 0x71; //effectEntry.Arg2 = 0x71;

8
src/world/Actor/Player.cpp
View file

@ -1411,7 +1411,7 @@ void Player::autoAttack( CharaPtr pTarget )
entry.Type = Common::ActionEffectType::CALC_RESULT_TYPE_DAMAGE_HP; entry.Type = Common::ActionEffectType::CALC_RESULT_TYPE_DAMAGE_HP;
entry.Arg0 = 2; entry.Arg0 = 2;
entry.Arg1 = 7; entry.Arg1 = 7;
entry.Flag = 128; //entry.Flag = 128;
if( getClass() == ClassJob::Machinist || getClass() == ClassJob::Bard || getClass() == ClassJob::Archer ) if( getClass() == ClassJob::Machinist || getClass() == ClassJob::Bard || getClass() == ClassJob::Archer )
{ {
@ -1429,6 +1429,12 @@ void Player::autoAttack( CharaPtr pTarget )
effectPacket->setRotation( Util::floatToUInt16Rot( getRot() ) ); effectPacket->setRotation( Util::floatToUInt16Rot( getRot() ) );
effectPacket->addTargetEffect( entry ); effectPacket->addTargetEffect( entry );
Logger::debug(
"Dump:\n{0}",
Util::binaryToHexDump( const_cast< uint8_t* >( &effectPacket->getData()[0] ),
static_cast< uint16_t >( effectPacket->getContentSize() ) )
);
sendToInRangeSet( effectPacket, true ); sendToInRangeSet( effectPacket, true );
pTarget->takeDamage( static_cast< uint32_t >( damage.first ) ); pTarget->takeDamage( static_cast< uint32_t >( damage.first ) );