mirrors/sapphire
1
Fork 0
mirror of https://github.com/SapphireServer/Sapphire.git synced 2025-04-30 08:07:46 +00:00
Code Activity

handle -1 range case for bard/archer

Browse source
This commit is contained in:
NotAdam 2019-02-11 01:50:41 +11:00
parent cd26f7f48c
commit d219b593a0
2 changed files with 20 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -35,6 +35,23 @@ Sapphire::Action::Action::Action( Entity::CharaPtr caster, uint32_t actionId,
m_castTime = static_cast< uint32_t >( action->cast100ms * 100 ); m_castTime = static_cast< uint32_t >( action->cast100ms * 100 );
m_recastTime = static_cast< uint16_t >( action->recast100ms * 100 ); m_recastTime = static_cast< uint16_t >( action->recast100ms * 100 );
m_cooldownGroup = action->cooldownGroup; m_cooldownGroup = action->cooldownGroup;
m_range = action->range;
m_effectRange = action->effectRange;
// a default range is set by the game for the class/job
if( m_range == -1 )
{
switch( static_cast< Common::ClassJob >( action->classJob ) )
{
case Common::ClassJob::Bard:
case Common::ClassJob::Archer:
m_range = 25;
// anything that isnt ranged
default:
m_range = 3;
}
}
m_actionCost.fill( { Common::ActionCostType::None, 0 } ); m_actionCost.fill( { Common::ActionCostType::None, 0 } );
@ -67,6 +84,7 @@ void Sapphire::Action::Action::setTargetChara( Sapphire::Entity::CharaPtr chara
m_pTarget = chara; m_pTarget = chara;
m_targetId = chara->getId(); m_targetId = chara->getId();
m_hasResidentTarget = false;
} }
void Sapphire::Action::Action::setResidentTargetId( uint64_t targetId ) void Sapphire::Action::Action::setResidentTargetId( uint64_t targetId )

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

@ -122,6 +122,8 @@ namespace Sapphire::Action
uint32_t m_castTime; uint32_t m_castTime;
uint16_t m_recastTime; uint16_t m_recastTime;
uint8_t m_cooldownGroup; uint8_t m_cooldownGroup;
int8_t m_range;
uint8_t m_effectRange;
Entity::CharaPtr m_pSource; Entity::CharaPtr m_pSource;
Entity::CharaPtr m_pTarget; Entity::CharaPtr m_pTarget;