mirrors/sapphire
1
Fork 0
mirror of https://github.com/SapphireServer/Sapphire.git synced 2025-05-05 18:27:47 +00:00
Code Activity

Merge branch 'master' of https://github.com/SapphireServer/Sapphire into actions-war

Browse source
This commit is contained in:
Lucy 2023-03-13 11:59:34 +01:00
commit 12f289e99c
2 changed files with 3 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
src/world/Action/ActionResult.cpp
View file

@ -99,6 +99,7 @@ void ActionResult::applyStatusEffectSelf( uint32_t id, int32_t duration, uint8_t
m_result.Value = static_cast< int16_t >( id ); m_result.Value = static_cast< int16_t >( id );
m_result.Arg2 = param; m_result.Arg2 = param;
m_result.Type = Common::ActionEffectType::CALC_RESULT_TYPE_SET_STATUS_ME; m_result.Type = Common::ActionEffectType::CALC_RESULT_TYPE_SET_STATUS_ME;
m_result.Flag = static_cast< uint8_t >( Common::ActionResultFlag::EffectOnSource );
m_bOverrideStatus = shouldOverride; m_bOverrideStatus = shouldOverride;
m_pStatus = Sapphire::StatusEffect::make_StatusEffect( id, m_target, m_target, duration, 3000 ); m_pStatus = Sapphire::StatusEffect::make_StatusEffect( id, m_target, m_target, duration, 3000 );

4
src/world/Action/ActionResultBuilder.cpp
View file

@ -1,4 +1,4 @@
#include "ActionResultBuilder.h" #include "ActionResultBuilder.h"
#include "ActionResult.h" #include "ActionResult.h"
#include <Actor/Player.h> #include <Actor/Player.h>
@ -104,7 +104,7 @@ void ActionResultBuilder::applyStatusEffectSelf( uint16_t statusId, uint32_t dur
} }
void ActionResultBuilder::applyStatusEffectSelf( uint16_t statusId, uint32_t duration, uint8_t param, std::vector< World::Action::StatusModifier > modifiers, void ActionResultBuilder::applyStatusEffectSelf( uint16_t statusId, uint32_t duration, uint8_t param, std::vector< World::Action::StatusModifier > modifiers,
uint32_t flag = 0, bool shouldOverride ) uint32_t flag = 0, bool shouldOverride )
{ {
ActionResultPtr nextResult = make_ActionResult( m_sourceChara, 0 ); ActionResultPtr nextResult = make_ActionResult( m_sourceChara, 0 );
nextResult->applyStatusEffectSelf( statusId, duration, param, modifiers, flag, shouldOverride ); nextResult->applyStatusEffectSelf( statusId, duration, param, modifiers, flag, shouldOverride );