From 75e665675b69b5c81a0a4cab3c4f8cff18ed3bc3 Mon Sep 17 00:00:00 2001
From: NotAdam <adam@notadam.me>
Date: Thu, 25 Apr 2019 22:45:23 +1000
Subject: [PATCH] fix autoattack range

---
 src/world/Actor/Chara.cpp  | 4 ++--
 src/world/Actor/Player.cpp | 5 +++--
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/src/world/Actor/Chara.cpp b/src/world/Actor/Chara.cpp
index 779c3afd..bb328c33 100644
--- a/src/world/Actor/Chara.cpp
+++ b/src/world/Actor/Chara.cpp
@@ -793,8 +793,8 @@ uint32_t Sapphire::Entity::Chara::getStatValue( Sapphire::Common::BaseParam base
 
     case Common::BaseParam::AttackPower:
     {
-      value = m_baseStats.attack;
-      break;
+      // todo: think this is right... not sure
+      return getStatValue( Common::BaseParam::Strength );
     }
 
     case Common::BaseParam::AttackMagicPotency:
diff --git a/src/world/Actor/Player.cpp b/src/world/Actor/Player.cpp
index 32852714..bae8edb5 100644
--- a/src/world/Actor/Player.cpp
+++ b/src/world/Actor/Player.cpp
@@ -1105,9 +1105,10 @@ void Sapphire::Entity::Player::update( uint64_t tickCount )
       {
         if( actor->getId() == m_targetId && actor->getAsChara()->isAlive() && mainWeap )
         {
+          auto chara = actor->getAsChara();
+
           // default autoattack range
-          // TODO make this dependant on bnpc size
-          uint32_t range = 7;
+          float range = 3.f + chara->getRadius();
 
           // default autoattack range for ranged classes
           if( getClass() == ClassJob::Machinist ||