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

slight improvements to bnpc avoidance

Browse source
This commit is contained in:
NotAdam 2019-01-31 23:19:25 +11:00
parent 8bb5f9737d
commit 12e09da3ca
1 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
src/world/Actor/BNpc.cpp
View file

@ -606,7 +606,7 @@ void Sapphire::Entity::BNpc::checkAggro()
if( pClosestChara && pClosestChara->isAlive() && pClosestChara->isPlayer() ) if( pClosestChara && pClosestChara->isAlive() && pClosestChara->isPlayer() )
{ {
// will use this range if chara level is lower than bnpc, otherwise deminishing equation applies // will use this range if chara level is lower than bnpc, otherwise diminishing equation applies
float range = 13.f; float range = 13.f;
if( pClosestChara->getLevel() > m_level ) if( pClosestChara->getLevel() > m_level )
@ -638,8 +638,11 @@ void Sapphire::Entity::BNpc::pushNearbyBNpcs()
auto pos = bNpc->getPos(); auto pos = bNpc->getPos();
auto distance = Util::distance( m_pos, bNpc->getPos() ); auto distance = Util::distance( m_pos, bNpc->getPos() );
// todo: not sure what's good here
auto factor = bNpc->getNaviTargetReachedDistance();
// too far away, ignore it // too far away, ignore it
if( distance > getNaviTargetReachedDistance() ) if( distance > factor )
continue; continue;
auto angle = Util::calcAngFrom( m_pos.x, m_pos.y, pos.x, pos.y ) + PI; auto angle = Util::calcAngFrom( m_pos.x, m_pos.y, pos.x, pos.y ) + PI;
@ -647,9 +650,6 @@ void Sapphire::Entity::BNpc::pushNearbyBNpcs()
auto x = ( cosf( angle ) ); auto x = ( cosf( angle ) );
auto z = ( sinf( angle ) ); auto z = ( sinf( angle ) );
// todo: not sure what's good here
auto factor = bNpc->getScale();
bNpc->setPos( pos.x + ( x * factor ), bNpc->setPos( pos.x + ( x * factor ),
pos.y, pos.y,
pos.z + ( z * factor ) ); pos.z + ( z * factor ) );