diff --git a/src/common/Common.h b/src/common/Common.h index f672e8ae..d5716fda 100644 --- a/src/common/Common.h +++ b/src/common/Common.h @@ -946,8 +946,8 @@ namespace Sapphire::Common struct CalcResult { - CalcResultParam CalcResultCt[4]; CalcResultParam CalcResultTg[4]; + CalcResultParam CalcResultCt[4]; }; struct IntegrityStatus diff --git a/src/world/Actor/BNpc.cpp b/src/world/Actor/BNpc.cpp index aa7b55bb..954d036d 100644 --- a/src/world/Actor/BNpc.cpp +++ b/src/world/Actor/BNpc.cpp @@ -991,7 +991,7 @@ void Sapphire::Entity::BNpc::autoAttack( CharaPtr pTarget ) Common::CalcResultParam effectEntry{}; effectEntry.Value = static_cast< int16_t >( damage.first ); effectEntry.Type = ActionEffectType::CALC_RESULT_TYPE_DAMAGE_HP; - effectEntry.Flag = 128; + //effectEntry.Flag = 128; effectEntry.Arg0 = 3; effectEntry.Arg1 = 7; //effectEntry.Arg2 = 0x71; diff --git a/src/world/Actor/Player.cpp b/src/world/Actor/Player.cpp index 89e65279..85078c7d 100644 --- a/src/world/Actor/Player.cpp +++ b/src/world/Actor/Player.cpp @@ -1411,7 +1411,7 @@ void Player::autoAttack( CharaPtr pTarget ) entry.Type = Common::ActionEffectType::CALC_RESULT_TYPE_DAMAGE_HP; entry.Arg0 = 2; entry.Arg1 = 7; - entry.Flag = 128; + //entry.Flag = 128; 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->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 ); pTarget->takeDamage( static_cast< uint32_t >( damage.first ) );