diff --git a/src/world/Action/Action.cpp b/src/world/Action/Action.cpp index 04171d77..6980d11c 100644 --- a/src/world/Action/Action.cpp +++ b/src/world/Action/Action.cpp @@ -496,7 +496,7 @@ void Action::Action::buildEffects() { auto dmg = calcDamage( isCorrectCombo() ? m_lutEntry.damageComboPotency : m_lutEntry.damagePotency ); dmg.first = Math::CalcStats::applyDamageReceiveMultiplier( *actor, dmg.first, m_actionData->attackType ); - m_effectBuilder->damage( actor, actor, dmg.first, m_actionData->attackType, dmg.second ); + m_effectBuilder->damage( actor, actor, dmg.first, dmg.second ); if( dmg.first > 0 ) actor->onActionHostile( m_pSource ); diff --git a/src/world/Action/EffectBuilder.cpp b/src/world/Action/EffectBuilder.cpp index a4388141..3ead03ea 100644 --- a/src/world/Action/EffectBuilder.cpp +++ b/src/world/Action/EffectBuilder.cpp @@ -63,10 +63,10 @@ void EffectBuilder::restoreMP( Entity::CharaPtr& target, Entity::CharaPtr& resto moveToResultList( target, nextResult ); } -void EffectBuilder::damage( Entity::CharaPtr& effectTarget, Entity::CharaPtr& damagingTarget, uint32_t amount, int8_t attackType, Common::ActionHitSeverityType severity, Common::ActionEffectResultFlag flag ) +void EffectBuilder::damage( Entity::CharaPtr& effectTarget, Entity::CharaPtr& damagingTarget, uint32_t amount, Common::ActionHitSeverityType severity, Common::ActionEffectResultFlag flag ) { EffectResultPtr nextResult = make_EffectResult( damagingTarget, nullptr, getResultDelayMs() ); - nextResult->damage( amount, attackType, severity, flag ); + nextResult->damage( amount, severity, flag ); moveToResultList( effectTarget, nextResult ); } diff --git a/src/world/Action/EffectBuilder.h b/src/world/Action/EffectBuilder.h index 7a5904c6..3af9683e 100644 --- a/src/world/Action/EffectBuilder.h +++ b/src/world/Action/EffectBuilder.h @@ -18,7 +18,7 @@ namespace Sapphire::World::Action void restoreMP( Entity::CharaPtr& effectTarget, Entity::CharaPtr& restoringTarget, uint32_t amount, Common::ActionEffectResultFlag flag = Common::ActionEffectResultFlag::None); - void damage( Entity::CharaPtr& effectTarget, Entity::CharaPtr& damagingTarget, uint32_t amount, int8_t attackType, + void damage( Entity::CharaPtr& effectTarget, Entity::CharaPtr& damagingTarget, uint32_t amount, Common::ActionHitSeverityType severity = Common::ActionHitSeverityType::NormalDamage, Common::ActionEffectResultFlag flag = Common::ActionEffectResultFlag::None); diff --git a/src/world/Action/EffectResult.cpp b/src/world/Action/EffectResult.cpp index 65d92694..b5b6c99f 100644 --- a/src/world/Action/EffectResult.cpp +++ b/src/world/Action/EffectResult.cpp @@ -18,7 +18,6 @@ EffectResult::EffectResult( Entity::CharaPtr target, Entity::CharaPtr source, ui m_param0( 0 ), m_param1( 0 ), m_param2( 0 ), - m_attackType( -1 ), m_flag( Common::ActionEffectResultFlag::None ) { @@ -44,12 +43,11 @@ uint64_t EffectResult::getDelay() return m_delayMs; } -void EffectResult::damage( uint32_t amount, int8_t attackType, Common::ActionHitSeverityType severity, Common::ActionEffectResultFlag flag ) +void EffectResult::damage( uint32_t amount, Common::ActionHitSeverityType severity, Common::ActionEffectResultFlag flag ) { m_param0 = static_cast< uint8_t >( severity ); m_value = amount; m_flag = flag; - m_attackType = attackType; m_type = Common::ActionEffectType::Damage; } diff --git a/src/world/Action/EffectResult.h b/src/world/Action/EffectResult.h index 687c2062..61e8b3fe 100644 --- a/src/world/Action/EffectResult.h +++ b/src/world/Action/EffectResult.h @@ -15,7 +15,7 @@ namespace Sapphire::World::Action public: explicit EffectResult( Entity::CharaPtr target, Entity::CharaPtr source, uint64_t delayMs ); - void damage( uint32_t amount, int8_t attackType, Common::ActionHitSeverityType severity, Common::ActionEffectResultFlag flag = Common::ActionEffectResultFlag::None ); + void damage( uint32_t amount, Common::ActionHitSeverityType severity, Common::ActionEffectResultFlag flag = Common::ActionEffectResultFlag::None ); void heal( uint32_t amount, Common::ActionHitSeverityType severity, Common::ActionEffectResultFlag flag = Common::ActionEffectResultFlag::None ); void restoreMP( uint32_t amount, Common::ActionEffectResultFlag flag = Common::ActionEffectResultFlag::None ); void startCombo( uint16_t actionId ); @@ -47,7 +47,6 @@ namespace Sapphire::World::Action uint32_t m_value; uint32_t m_value2; - int8_t m_attackType; Common::ActionEffectResultFlag m_flag; }; }