Merge pull request #10046 from WinterSolstice8/ranged_tp_return_thing

[core] Use slot to determine delay for TP return

Author: Xaver-DaRed

src/map/utils/battleutils.cpp

@@ -1864,17 +1864,22 @@ auto GetBaseRangedDelay(CBattleEntity* PEntity) -> uint16
     return baseDelay;
 }
 
-auto CalculateTPFromDamageDealt(CBattleEntity* PAttacker, bool isZanshin) -> int32
+auto CalculateTPFromDamageDealt(CBattleEntity* PAttacker, const bool& isZanshin, const SLOTTYPE& slot) -> int32
 {
     if (PAttacker == nullptr)
     {
         ShowWarning("battleutils::CalculateTPFromDamageDealt() - PAttacker was null.");
         return 0;
     }
 
-    int32 tpReturn = luautils::callGlobal<int32>("xi.combat.tp.getSingleMeleeHitTPReturn", PAttacker, isZanshin);
-
-    return tpReturn;
+    if (slot == SLOT_RANGED || slot == SLOT_AMMO)
+    {
+        return luautils::callGlobal<int32>("xi.combat.tp.getSingleRangedHitTPReturn", PAttacker);
+    }
+    else
+    {
+        return luautils::callGlobal<int32>("xi.combat.tp.getSingleMeleeHitTPReturn", PAttacker, isZanshin);
+    }
 }
 
 auto CalculateTPFromDamageTaken(CBattleEntity* PAttacker, CBattleEntity* PDefender, int32 damage, uint16 delay) -> int32
@@ -2267,7 +2272,7 @@ int32 TakePhysicalDamage(CBattleEntity* PAttacker, CBattleEntity* PDefender, PHY
         {
             bool isZanshin = physicalAttackType == PHYSICAL_ATTACK_TYPE::ZANSHIN;
 
-            int16 attackerTPReturn = CalculateTPFromDamageDealt(PAttacker, isZanshin);
+            int16 attackerTPReturn = CalculateTPFromDamageDealt(PAttacker, isZanshin, static_cast<SLOTTYPE>(slot));
 
             PAttacker->addTP((int16)(tpMultiplier * attackerTPReturn));
         }
@@ -2396,7 +2401,7 @@ int32 TakeWeaponskillDamage(CBattleEntity* PAttacker, CBattleEntity* PDefender,
         if (primary)
         // Calculate TP Return from WS
         {
-            int16 baseTp = CalculateTPFromDamageDealt(PAttacker, false);
+            int16 baseTp = CalculateTPFromDamageDealt(PAttacker, false, static_cast<SLOTTYPE>(slot));
 
             standbyTp = bonusTP + (int16)((tpMultiplier * baseTp));
         }

src/map/utils/battleutils.h

@@ -180,7 +180,7 @@ bool  CanUseWeaponskill(CCharEntity* PChar, CWeaponSkill* PSkill);
 int16 CalculateBaseTP(CBattleEntity* PEntity, int32 delay);
 auto  GetBaseDelay(CBattleEntity* PEntity) -> uint16;       // get base delay of entity, melee only
 auto  GetBaseRangedDelay(CBattleEntity* PEntity) -> uint16; // get base delay of entity, ranged only
-auto  CalculateTPFromDamageDealt(CBattleEntity* PAttacker, bool isZanshin) -> int32;
+auto  CalculateTPFromDamageDealt(CBattleEntity* PAttacker, const bool& isZanshin, const SLOTTYPE& slot) -> int32;
 auto  CalculateTPFromDamageTaken(CBattleEntity* PAttacker, CBattleEntity* PDefender, int32 damage, uint16 delay) -> int32;
 void  GenerateCureEnmity(CBattleEntity* PSource, CBattleEntity* PTarget, int32 amount, int32 fixedCE = 0, int32 fixedVE = 0);
 void  GenerateInRangeEnmity(CBattleEntity* PSource, int32 CE, int32 VE);