From 3d87a990181fb8e6654ba18c6821106e87c88141 Mon Sep 17 00:00:00 2001
From: panikon <panikon@zoho.com>
Date: Sat, 5 Jul 2014 13:18:51 -0300
Subject: Corrected HT_POWER behaviour, combo and type of skill, and fixed
 TK-combos walking delay (issue: 8241
 http://hercules.ws/board/tracker/issue-8241-cant-move-during-certain-combos/)

---
 src/map/status.c | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

(limited to 'src/map/status.c')

diff --git a/src/map/status.c b/src/map/status.c
index fb74df36c..54a3208d2 100644
--- a/src/map/status.c
+++ b/src/map/status.c
@@ -8095,22 +8095,25 @@ int status_change_start(struct block_list *src, struct block_list *bl, enum sc_t
 				}
 				break;
 
-			case SC_COMBOATTACK: {
+			case SC_COMBOATTACK:
+			{
 				//val1: Skill ID
 				//val2: When given, target (for autotargetting skills)
 				//val3: When set, this combo time should NOT delay attack/movement
+				//val3: If set to 2 this combo will delay ONLY attack
 				//val3: TK: Last used kick
 				//val4: TK: Combo time
 				struct unit_data *ud = unit->bl2ud(bl);
-				if (ud && !val3) {
+				if( ud && (!val3 || val3 == 2) ) {
 					tick += 300 * battle_config.combo_delay_rate/100;
 					ud->attackabletime = timer->gettick()+tick;
-					unit->set_walkdelay(bl, timer->gettick(), tick, 1);
+					if( !val3 )
+						unit->set_walkdelay(bl, timer->gettick(), tick, 1);
 				}
 				val3 = 0;
 				val4 = tick;
-								 }
-								 break;
+				break;
+			}
 			case SC_EARTHSCROLL:
 				val2 = 11-val1; //Chance to consume: 11-skill_lv%
 				break;
-- 
cgit v1.2.3-70-g09d2