From 756310e146750b9c4e4e54d66548dc8d378f73b2 Mon Sep 17 00:00:00 2001
From: skotlex <skotlex@54d463be-8e91-2dee-dedb-b68131a5f0ec>
Date: Sun, 30 Apr 2006 17:20:31 +0000
Subject: - Merged the code of NJ_SHADOWJUMP with TK_JUMPKICK. - Moved the
 hiding requirement to the skill_require_db.txt as it should be.

git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@6403 54d463be-8e91-2dee-dedb-b68131a5f0ec
---
 db/skill_require_db.txt |  2 +-
 src/map/skill.c         | 22 +++++-----------------
 2 files changed, 6 insertions(+), 18 deletions(-)

diff --git a/db/skill_require_db.txt b/db/skill_require_db.txt
index fe830e964..605868ba4 100644
--- a/db/skill_require_db.txt
+++ b/db/skill_require_db.txt
@@ -415,7 +415,7 @@
 526,0,0,50,0,0,0,0,0,0,none,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0	//NJ_ZENYNAGE
 527,0,0,40,0,0,0,0,0,0,none,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0	//NJ_TATAMIGAESHI
 528,0,0,10:12:14:16:18:20:22:24:26:28,0,0,0,0,0,0,none,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0	//NJ_KASUMIKIRI
-529,0,0,40,0,0,0,0,0,0,none,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0	//NJ_SHADOWJUMP
+529,0,0,40,0,0,0,0,0,0,hiding,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0	//NJ_SHADOWJUMP
 530,0,0,14:16:18:20:22,0,0,0,0,0,0,hiding,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0	//NJ_KIRIKAGE
 531,0,0,12:15:18:21:24,0,0,0,0,0,0,none,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0	//NJ_UTSUSEMI
 532,0,0,30:32:34:36:38:40:42:44:46:48,0,0,0,0,0,0,none,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0	//NJ_BUNSINJYUTSU
diff --git a/src/map/skill.c b/src/map/skill.c
index 180ce6a21..c4ecd5960 100644
--- a/src/map/skill.c
+++ b/src/map/skill.c
@@ -2577,12 +2577,14 @@ int skill_castend_damage_id (struct block_list* src, struct block_list *bl,int s
 			skill_get_splash(skillid, skilllv), BL_CHAR,
 			BF_WEAPON, src, src, skillid, skilllv, tick, flag, BCT_ENEMY);	
 		break;
+
+	case NJ_SHADOWJUMP:	//[blackhole89]
 	case TK_JUMPKICK:
 	{
 		short x, y;
 		x = bl->x;
 		y = bl->y;
-		if (!unit_can_move(src))
+		if (skillid == TK_JUMPKICK && !unit_can_move(src))
 			break;
 		if (src->x < bl->x) x--;
 		else if (src->x > bl->x) x++;
@@ -2590,7 +2592,8 @@ int skill_castend_damage_id (struct block_list* src, struct block_list *bl,int s
 		else if (src->y > bl->y) y++;
 		if (map_getcell(bl->m, x, y, CELL_CHKNOPASS))
 		{	x = bl->x; y = bl->y; }
-		skill_attack(BF_WEAPON,src,src,bl,skillid,skilllv,tick,flag);
+		if (skillid == TK_JUMPKICK)
+			skill_attack(BF_WEAPON,src,src,bl,skillid,skilllv,tick,flag);
 		if (unit_movepos(src, x, y, 0, 0))
 			clif_slide(src,src->x,src->y);
 		break;
@@ -4695,21 +4698,6 @@ int skill_castend_nodamage_id (struct block_list *src, struct block_list *bl, in
 		skill_blown(src,bl,skill_get_blewcount(skillid,skilllv)|0x10000);
 		break;
 
-	case NJ_SHADOWJUMP:	//[blackhole89]
-		{
-			if (sd && !(sd->sc.count && sd->sc.data[SC_HIDING].timer != -1)) {
-				map_freeblock_unlock();
-				return 1;
-			}
-
-			clif_skill_nodamage(src,src,NJ_SHADOWJUMP,skilllv,1);
-			if(map_getcell(src->m,x,y,CELL_CHKPASS)) {
-				unit_movepos(src, x, y, 1, 0);
-				clif_slide(src,x,y);
-			}
-		}
-		break;
-
 	case TK_HIGHJUMP:
 		{
 			int x,y, dir = unit_getdir(src);
-- 
cgit v1.2.3-70-g09d2