From be0c0efe40db74b67b5d2b26d14bfc46977309b9 Mon Sep 17 00:00:00 2001
From: Daegaladh <Daegaladh@users.noreply.github.com>
Date: Thu, 30 Apr 2020 16:49:40 +0200
Subject: [PATCH] Follow up to 38cf16edbaa36836072780b4481023e57e014892

*Thanks to @aleos89 and @LordWhiplash
---
 src/map/battle.cpp | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/src/map/battle.cpp b/src/map/battle.cpp
index e7b1a6ad23..f641a3fca0 100644
--- a/src/map/battle.cpp
+++ b/src/map/battle.cpp
@@ -3768,7 +3768,7 @@ static int battle_calc_attack_skill_ratio(struct Damage* wd, struct block_list *
 			break;
 		case MO_FINGEROFFENSIVE:
 #ifdef RENEWAL
-			skillratio += 500 + skill_lv * 2;
+			skillratio += 500 + skill_lv * 200;
 			if (tsc && tsc->data[SC_BLADESTOP])
 				skillratio += skillratio / 2;
 #else
@@ -5481,8 +5481,12 @@ static struct Damage initialize_weapon_data(struct block_list *src, struct block
 			}
 				break;
 			case MO_FINGEROFFENSIVE:
-				if (sd)
-					wd.div_ = (battle_config.finger_offensive_type)?1:sd->spiritball_old;
+				if (sd) {
+					if (battle_config.finger_offensive_type)
+						wd.div_ = 1;
+					else if ((sd->spiritball + sd->spiritball_old) < wd.div_)
+						wd.div_ = sd->spiritball + sd->spiritball_old;
+				}
 				break;
 
 			case KN_PIERCE: