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

More fixes on action related enums.

Browse source
This commit is contained in:
collett 2020-02-24 19:24:29 +09:00
parent ad45d41b8f
commit 2f2d43b939
2 changed files with 9 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
src/common/Common.h
View file

@ -581,11 +581,12 @@ namespace Sapphire::Common
None = 0, // ? None = 0, // ?
MagicPoints = 3, MagicPoints = 3,
TacticsPoints = 5, TacticsPoints = 5,
// WARGauge = 22, StatusEffect = 10,
WARGauge = 22,
// DRKGauge = 25, // DRKGauge = 25,
// AetherflowStack = 30, // AetherflowStack = 30,
// Status = 32, // Status = 32,
// PLDGauge = 41, PLDGauge = 41,
// RDMGaugeBoth = 74, // RDMGaugeBoth = 74,
//// RDMGaugeBlack = 75, // not right? //// RDMGaugeBlack = 75, // not right?
// DRGGauge3Eyes = 76, // DRGGauge3Eyes = 76,
@ -623,17 +624,17 @@ namespace Sapphire::Common
TpLoss = 12, TpLoss = 12,
TpGain = 13, TpGain = 13,
GpGain = 14, GpGain = 14,
ApplyStatusEffect = 15, ApplyStatusEffectTarget = 15,
//ApplyStatusEffect2 = 16, // thin air uses this one but works fine with 15 wtf? ApplyStatusEffectSource = 16, // effect entry on target but buff applies to source, like storm's eye
StatusNoEffect = 21, StatusNoEffect = 20, // shifted one up from 5.18
/*! /*!
* @brief Tells the client that it should show combo indicators on actions. * @brief Tells the client that it should show combo indicators on actions.
* *
* @param flags Required to be 128, doesn't show combo rings on hotbars otherwise * @param flags Required to be 128, doesn't show combo rings on hotbars otherwise
* @param value The actionid that starts/continues the combo. eg, 3617 will start a spinning slash and/or syphon strike combo * @param value The actionid that starts/continues the combo. eg, 3617 will start a spinning slash and/or syphon strike combo
*/ */
StartActionCombo = 27, // why this is changed lol StartActionCombo = 27, // shifted one up from 5.18
ComboSucceed = 29, // this is gone on retail and not working anymore ComboSucceed = 28, // shifted one up from 5.18, on retail this is not seen anymore, still working though.
Knockback = 33, Knockback = 33,
Mount = 39, Mount = 39,
VFX = 59, // links to VFX sheet VFX = 59, // links to VFX sheet

2
src/world/Action/EffectResult.cpp
View file

@ -82,7 +82,7 @@ void EffectResult::applyStatusEffect( uint16_t statusId, uint8_t param )
m_value = statusId; m_value = statusId;
m_param2 = param; m_param2 = param;
m_type = Common::ActionEffectType::ApplyStatusEffect; m_type = Common::ActionEffectType::ApplyStatusEffectTarget;
} }
void EffectResult::mount( uint16_t mountId ) void EffectResult::mount( uint16_t mountId )