From 8a7c11dab808e235775acab71391fa848301de50 Mon Sep 17 00:00:00 2001 From: collett Date: Mon, 2 Mar 2020 05:46:24 +0900 Subject: [PATCH] remove status effect framework workaround. --- src/scripts/action/brd/ActionHeavyShot97.cpp | 2 +- src/scripts/action/sch/ActionAdloquium185.cpp | 4 ++-- src/scripts/action/war/ActionInfuriate52.cpp | 2 +- src/scripts/action/war/ActionInnerRelease7389.cpp | 8 ++++---- src/scripts/action/whm/ActionCure120.cpp | 2 +- src/world/Action/Action.cpp | 6 ------ src/world/Action/Action.h | 2 -- src/world/Actor/Player.cpp | 2 -- 8 files changed, 9 insertions(+), 19 deletions(-) diff --git a/src/scripts/action/brd/ActionHeavyShot97.cpp b/src/scripts/action/brd/ActionHeavyShot97.cpp index bc4f289f..ee8756b5 100644 --- a/src/scripts/action/brd/ActionHeavyShot97.cpp +++ b/src/scripts/action/brd/ActionHeavyShot97.cpp @@ -24,7 +24,7 @@ public: { if( action.getSourceChara()->getLevel() >= 2 && Math::CalcStats::getRandomNumber0To99() < 20 ) { - auto pEffect = action.createStatusEffect( STATUS_ID_STRAIGHT_SHOT_READY, action.getSourceChara(), action.getSourceChara(), 10000, 3000 ); + auto pEffect = Sapphire::StatusEffect::make_StatusEffect( STATUS_ID_STRAIGHT_SHOT_READY, action.getSourceChara(), action.getSourceChara(), 10000, 3000 ); action.getEffectbuilder()->applyStatusEffect( action.getSourceChara(), action.getSourceChara(), pEffect ); } } diff --git a/src/scripts/action/sch/ActionAdloquium185.cpp b/src/scripts/action/sch/ActionAdloquium185.cpp index 847f890b..01af95e9 100644 --- a/src/scripts/action/sch/ActionAdloquium185.cpp +++ b/src/scripts/action/sch/ActionAdloquium185.cpp @@ -42,7 +42,7 @@ public: World::Action::StatusEffectEntry effectEntry; effectEntry.effectType = static_cast< uint32_t >( Common::StatusEffectType::Shield ); effectEntry.effectValue1 = static_cast< int32_t >( shieldValue ); - auto pNewEffect = action.createStatusEffect( STATUS_ID_GALVANIZE, action.getSourceChara(), pTarget, 30000, 3000 ); + auto pNewEffect = Sapphire::StatusEffect::make_StatusEffect( STATUS_ID_GALVANIZE, action.getSourceChara(), pTarget, 30000, 3000 ); pNewEffect->replaceEffectEntry( effectEntry ); action.getEffectbuilder()->applyStatusEffect( pTarget, action.getSourceChara(), pNewEffect ); } @@ -58,7 +58,7 @@ public: World::Action::StatusEffectEntry effectEntry; effectEntry.effectType = static_cast< uint32_t >( Common::StatusEffectType::Shield ); effectEntry.effectValue1 = static_cast< int32_t >( shieldValue ); // same shield value - auto pNewEffect = action.createStatusEffect( STATUS_ID_CATALYZE, action.getSourceChara(), pTarget, 30000, 3000 ); + auto pNewEffect = Sapphire::StatusEffect::make_StatusEffect( STATUS_ID_CATALYZE, action.getSourceChara(), pTarget, 30000, 3000 ); pNewEffect->replaceEffectEntry( effectEntry ); action.getEffectbuilder()->applyStatusEffect( pTarget, action.getSourceChara(), pNewEffect ); } diff --git a/src/scripts/action/war/ActionInfuriate52.cpp b/src/scripts/action/war/ActionInfuriate52.cpp index e6d48113..07722f6f 100644 --- a/src/scripts/action/war/ActionInfuriate52.cpp +++ b/src/scripts/action/war/ActionInfuriate52.cpp @@ -27,7 +27,7 @@ public: pPlayer->gaugeWarSetIb( ib ); if( pPlayer->getLevel() >= 72 ) { - auto pEffect = action.createStatusEffect( STATUS_ID_NASCENT_CHAOS, action.getSourceChara(), action.getSourceChara(), 30000, 3000 ); + auto pEffect = Sapphire::StatusEffect::make_StatusEffect( STATUS_ID_NASCENT_CHAOS, action.getSourceChara(), action.getSourceChara(), 30000, 3000 ); action.getEffectbuilder()->applyStatusEffect( action.getSourceChara(), action.getSourceChara(), pEffect, 0 ); } } diff --git a/src/scripts/action/war/ActionInnerRelease7389.cpp b/src/scripts/action/war/ActionInnerRelease7389.cpp index 7e1160c7..9f142c42 100644 --- a/src/scripts/action/war/ActionInnerRelease7389.cpp +++ b/src/scripts/action/war/ActionInnerRelease7389.cpp @@ -28,10 +28,10 @@ public: effectEntry.effectValue1 = static_cast< int32_t >( Common::ActionTypeFilter::Physical ); effectEntry.effectValue2 = 100; effectEntry.effectValue3 = 100; - auto pNewEffect = action.createStatusEffect( STATUS_ID_INNER_RELEASE, action.getSourceChara(), pSource, 10000, 3000 ); - pNewEffect->replaceEffectEntry( effectEntry ); - pNewEffect->setParam( 65436 ); - action.getEffectbuilder()->applyStatusEffect( pSource, action.getSourceChara(), pNewEffect, 0 ); + auto pEffect = Sapphire::StatusEffect::make_StatusEffect( STATUS_ID_INNER_RELEASE, action.getSourceChara(), pSource, 10000, 3000 ); + pEffect->replaceEffectEntry( effectEntry ); + pEffect->setParam( 65436 ); + action.getEffectbuilder()->applyStatusEffect( pSource, action.getSourceChara(), pEffect, 0 ); } }; diff --git a/src/scripts/action/whm/ActionCure120.cpp b/src/scripts/action/whm/ActionCure120.cpp index 3f2e5f20..d5d1dca4 100644 --- a/src/scripts/action/whm/ActionCure120.cpp +++ b/src/scripts/action/whm/ActionCure120.cpp @@ -24,7 +24,7 @@ public: { if( action.getSourceChara()->getLevel() >= 30 && Math::CalcStats::getRandomNumber0To99() < 15 ) { - auto pEffect = action.createStatusEffect( STATUS_ID_FREECURE, action.getSourceChara(), action.getSourceChara(), 15000, 3000 ); + auto pEffect = Sapphire::StatusEffect::make_StatusEffect( STATUS_ID_FREECURE, action.getSourceChara(), action.getSourceChara(), 15000, 3000 ); action.getEffectbuilder()->applyStatusEffect( action.getSourceChara(), action.getSourceChara(), pEffect ); } } diff --git a/src/world/Action/Action.cpp b/src/world/Action/Action.cpp index 8d45eaf7..1d661920 100644 --- a/src/world/Action/Action.cpp +++ b/src/world/Action/Action.cpp @@ -1036,10 +1036,4 @@ bool Action::Action::checkActionBonusRequirement() } return true; -} - -Sapphire::StatusEffect::StatusEffectPtr Action::Action::createStatusEffect( uint32_t id, Entity::CharaPtr sourceActor, Entity::CharaPtr targetActor, uint32_t duration, uint32_t tickRate ) -{ - // problem solved remove this - return StatusEffect::make_StatusEffect( id, sourceActor, targetActor, duration, tickRate ); } \ No newline at end of file diff --git a/src/world/Action/Action.h b/src/world/Action/Action.h index a22b0343..5470ce98 100644 --- a/src/world/Action/Action.h +++ b/src/world/Action/Action.h @@ -58,8 +58,6 @@ namespace Sapphire::World::Action bool checkActionBonusRequirement(); - StatusEffect::StatusEffectPtr createStatusEffect( uint32_t id, Entity::CharaPtr sourceActor, Entity::CharaPtr targetActor, uint32_t duration, uint32_t tickRate ); - /*! * @brief Checks if a chara has enough resources available to cast the action (tp/mp/etc) * @return true if they have the required resources diff --git a/src/world/Actor/Player.cpp b/src/world/Actor/Player.cpp index a0e45ad7..8753e6df 100644 --- a/src/world/Actor/Player.cpp +++ b/src/world/Actor/Player.cpp @@ -2162,8 +2162,6 @@ bool Sapphire::Entity::Player::checkAction() void Sapphire::Entity::Player::gaugeClear() { std::memset( m_gauge, 0, sizeof( m_gauge ) ); - auto pPacket = makeZonePacket< FFXIVIpcEffect0095 >( getId() ); - queuePacket( pPacket ); } void Sapphire::Entity::Player::gaugeSet( uint8_t index, uint8_t value )