mirrors/sapphire
1
Fork 0
mirror of https://github.com/SapphireServer/Sapphire.git synced 2025-05-25 19:17:45 +00:00
Code Activity

remove status effect framework workaround.

Browse source
This commit is contained in:
collett 2020-03-02 05:46:24 +09:00
parent 29106a2de7
commit 8a7c11dab8
8 changed files with 9 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/scripts/action/brd/ActionHeavyShot97.cpp
View file

@ -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 );
}
}

4
src/scripts/action/sch/ActionAdloquium185.cpp
View file

@ -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 );
}

2
src/scripts/action/war/ActionInfuriate52.cpp
View file

@ -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 );
}
}

8
src/scripts/action/war/ActionInnerRelease7389.cpp
View file

@ -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 );
}
};

2
src/scripts/action/whm/ActionCure120.cpp
View file

@ -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 );
}
}

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

@ -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 );
}

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

@ -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

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

@ -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 )