瀏覽代碼

Fixed Flying Side Kick, you can now use it in non-foe and jump to their location (confirmed on official), bugreport:2443

git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@15463 54d463be-8e91-2dee-dedb-b68131a5f0ec
shennetsind 13 年之前
父節點
當前提交
08667a36b8
共有 3 個文件被更改,包括 11 次插入10 次删除
  1. 1 1
      db/pre-re/skill_db.txt
  2. 1 1
      db/re/skill_db.txt
  3. 9 8
      src/map/skill.c

+ 1 - 1
db/pre-re/skill_db.txt

@@ -465,7 +465,7 @@
 418,0,6,4,0,0x1,0,1,1,no,0,0,0,weapon,0,		TK_READYCOUNTER,Counter Kick Stance
 419,-2,8,4,-1,0x40,0,7,-3,no,0,0x200,0,weapon,0,	TK_COUNTER,Counter Kick
 420,0,6,4,0,0x1,0,1,1,no,0,0,0,weapon,0,		TK_DODGE,Tumbling
-421,9,8,1,-1,0,0,7,-3,no,0,0,0,weapon,0,	TK_JUMPKICK,Flying Kick
+421,9,8,16,-1,0x1,0,7,-3,no,0,0,0,weapon,0,	TK_JUMPKICK,Flying Kick
 422,0,0,0,0,0,1,10,0,no,0,0,0,none,0,		TK_HPTIME,Peaceful Break
 423,0,0,0,0,0,1,10,0,no,0,0,0,none,0,		TK_SPTIME,Happy Break
 424,0,0,0,0,0,0,5,0,no,0,0,0,weapon,0,		TK_POWER,Kihop

+ 1 - 1
db/re/skill_db.txt

@@ -465,7 +465,7 @@
 418,0,6,4,0,0x1,0,1,1,no,0,0,0,weapon,0,		TK_READYCOUNTER,Counter Kick Stance
 419,-2,8,4,-1,0x40,0,7,-3,no,0,0x200,0,weapon,0,	TK_COUNTER,Counter Kick
 420,0,6,4,0,0x1,0,1,1,no,0,0,0,weapon,0,		TK_DODGE,Tumbling
-421,9,8,1,-1,0,0,7,-3,no,0,0,0,weapon,0,	TK_JUMPKICK,Flying Kick
+421,9,8,16,-1,0x1,0,7,-3,no,0,0,0,weapon,0,	TK_JUMPKICK,Flying Kick
 422,0,0,0,0,0,1,10,0,no,0,0,0,none,0,		TK_HPTIME,Peaceful Break
 423,0,0,0,0,0,1,10,0,no,0,0,0,none,0,		TK_SPTIME,Happy Break
 424,0,0,0,0,0,0,5,0,no,0,0,0,weapon,0,		TK_POWER,Kihop

+ 9 - 8
src/map/skill.c

@@ -3185,14 +3185,6 @@ int skill_castend_damage_id (struct block_list* src, struct block_list *bl, int
 		}
 		break;
 
-	case TK_JUMPKICK:
-		if( unit_movepos(src, bl->x, bl->y, 1, 1) )
-		{
-			skill_attack(BF_WEAPON,src,src,bl,skillid,skilllv,tick,flag);
-			clif_slide(src,bl->x,bl->y);
-		}
-		break;
-
 	case NC_FLAMELAUNCHER:
 		if (sd) pc_overheat(sd,1);
 	case SN_SHARPSHOOTING:
@@ -4582,6 +4574,15 @@ int skill_castend_nodamage_id (struct block_list *src, struct block_list *bl, in
 		else if( bl->type == BL_MER )
 			skill_blockmerc_start((TBL_MER*)bl, skillid, skill_get_time(skillid, skilllv));
 		break;
+
+	case TK_JUMPKICK:
+		if( unit_movepos(src, bl->x, bl->y, 1, 1) ) {
+			if( battle_check_target(src, bl, BCT_ENEMY) > 0 )
+				skill_attack(BF_WEAPON,src,src,bl,skillid,skilllv,tick,flag);
+			clif_slide(src,bl->x,bl->y);
+		}
+		break;
+
 	case ASC_EDP:
 		clif_skill_nodamage(src,bl,skillid,skilllv,
 			sc_start(bl,type,100,skilllv,skill_get_time(skillid,skilllv) + ( sd ? 3000 * pc_checkskill(sd,GC_RESEARCHNEWPOISON) : 0 )));