Merge pull request #560 from NotAdam/stat_calc

correct autoattack potency calculation, fix attack power calc

src/world/Actor/Chara.cpp

@@ -793,7 +793,14 @@ uint32_t Sapphire::Entity::Chara::getStatValue( Sapphire::Common::BaseParam base
 
     case Common::BaseParam::AttackPower:
     {
-      // todo: think this is right... not sure
+      auto primaryStat = getPrimaryStat();
+
+      // everything else uses str for atk power except for brd/rogue/etc who use dex
+      if( primaryStat == Common::BaseParam::Dexterity )
+      {
+        return getStatValue( primaryStat );
+      }
+
       return getStatValue( Common::BaseParam::Strength );
     }
 

src/world/Math/CalcStats.cpp

@@ -308,6 +308,40 @@ float CalcStats::potency( uint16_t potency )
   return potency / 100.f;
 }
 
+float CalcStats::autoAttackPotency( const Sapphire::Entity::Chara& chara )
+{
+  uint32_t aaPotency = AUTO_ATTACK_POTENCY;
+
+  // check if ranged class
+  switch( chara.getClass() )
+  {
+    case Common::ClassJob::Machinist:
+    case Common::ClassJob::Bard:
+    case Common::ClassJob::Archer:
+      aaPotency = RANGED_AUTO_ATTACK_POTENCY;
+
+    default:
+      break;
+  }
+
+  float autoAttackDelay = 2.5f;
+  // fetch actual auto attack delay if its a player
+  if( chara.isPlayer() )
+  {
+    // todo: ew
+    auto pPlayer = const_cast< Entity::Chara& >( chara ).getAsPlayer();
+    assert( pPlayer );
+
+    auto pItem = pPlayer->getEquippedWeapon();
+    assert( pItem );
+
+    autoAttackDelay = pItem->getDelay() / 1000.f;
+  }
+
+  // factors in f(PTC) in order to not lose precision
+  return std::floor( aaPotency / 3.f * autoAttackDelay ) / 100.f;
+}
+
 float CalcStats::weaponDamage( const Sapphire::Entity::Chara& chara, float weaponDamage )
 {
   const auto& baseStats = chara.getStats();
@@ -491,7 +525,7 @@ float CalcStats::autoAttack( const Sapphire::Entity::Chara& chara )
   auto level = chara.getLevel();
   auto mainVal = static_cast< float >( levelTable[ level ][ Common::LevelTableEntry::MAIN ] );
 
-  auto innerCalc = std::floor( ( ( mainVal * primaryStatValue( chara ) ) / 1000.f ) + weaponDamage );
+  auto innerCalc = std::floor( ( mainVal * primaryStatValue( chara ) / 1000.f ) + weaponDamage );
 
   return std::floor( innerCalc * ( autoAttackDelay / 3.f ) );
 }
@@ -506,7 +540,7 @@ float CalcStats::calculateAutoAttackDamage( const Sapphire::Entity::Chara& chara
   // D = ⌊ f(ptc) × f(aa) × f(ap) × f(det) × f(tnc) × traits ⌋ × f(ss) ⌋ ×
   // f(chr) ⌋ × f(dhr) ⌋ × rand[ 0.95, 1.05 ] ⌋ × buff_1 ⌋ × buff... ⌋
 
-  auto pot = potency( AUTO_ATTACK_POTENCY );
+  auto pot = autoAttackPotency( chara );
   auto aa = autoAttack( chara );
   auto ap = getPrimaryAttackPower( chara );
   auto det = determination( chara );

src/world/Math/CalcStats.h

@@ -10,7 +10,8 @@ namespace Sapphire::Math
   class CalcStats
   {
   public:
-    static const uint32_t AUTO_ATTACK_POTENCY = 100;
+    static const uint32_t AUTO_ATTACK_POTENCY = 110;
+    static const uint32_t RANGED_AUTO_ATTACK_POTENCY = 100;
 
     static float calculateBaseStat( const Entity::Chara& chara );
 
@@ -49,6 +50,8 @@ namespace Sapphire::Math
      */
     static float potency( uint16_t potency );
 
+    static float autoAttackPotency( const Sapphire::Entity::Chara& chara );
+
     /*!
      * @brief Weapon damage is the contribution the weapon's damage rating
      *