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

Some aoe work

Browse source
This commit is contained in:
Lucy 2023-03-12 16:45:52 +01:00
parent 293c281eba
commit 49486f5d02
3 changed files with 3 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/common/Common.h
View file

@ -1872,8 +1872,8 @@ namespace Sapphire::Common
{ {
SingleTarget = 1, SingleTarget = 1,
CircularAOE = 2, CircularAOE = 2,
Type3 = 3, // another single target? no idea how to call it RectangularAOE = 3,
RectangularAOE = 4, ConeAOE = 4,
CircularAoEPlaced = 7 CircularAoEPlaced = 7
}; };

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

@ -193,6 +193,7 @@ namespace Sapphire::World::Action
uint8_t m_cooldownGroup{}; uint8_t m_cooldownGroup{};
int8_t m_range{}; int8_t m_range{};
uint8_t m_effectRange{}; uint8_t m_effectRange{};
uint8_t m_effectWidth{};
uint8_t m_xAxisModifier{}; uint8_t m_xAxisModifier{};
Common::ActionAspect m_aspect; Common::ActionAspect m_aspect;
Common::CastType m_castType; Common::CastType m_castType;

7
src/world/Manager/ActionMgr.cpp
View file

@ -71,13 +71,6 @@ void ActionMgr::handleTargetedPlayerAction( Entity::Player& player, uint32_t act
if( !action->init() ) if( !action->init() )
return; return;
// cancel any aoe actions casted with this packet
if( actionData->data().EffectRange )
{
action->interrupt();
return;
}
bootstrapAction( player, action, actionData ); bootstrapAction( player, action, actionData );
} }