summaryrefslogtreecommitdiff
path: root/src/map/skill.c
diff options
context:
space:
mode:
authorshennetsind <shennetsind@54d463be-8e91-2dee-dedb-b68131a5f0ec>2012-01-15 05:12:23 +0000
committershennetsind <shennetsind@54d463be-8e91-2dee-dedb-b68131a5f0ec>2012-01-15 05:12:23 +0000
commit0a689d5a948a03870c1ed2294e795046e7094dac (patch)
treeb2f65cb4a9d6c1be05e456f40cc964d94ca33413 /src/map/skill.c
parentc9a0b6b049054a60d0d43af1505e873c5b26a5a8 (diff)
downloadhercules-0a689d5a948a03870c1ed2294e795046e7094dac.tar.gz
hercules-0a689d5a948a03870c1ed2294e795046e7094dac.tar.bz2
hercules-0a689d5a948a03870c1ed2294e795046e7094dac.tar.xz
hercules-0a689d5a948a03870c1ed2294e795046e7094dac.zip
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://rathena.svn.sourceforge.net/svnroot/rathena/trunk@15463 54d463be-8e91-2dee-dedb-b68131a5f0ec
Diffstat (limited to 'src/map/skill.c')
-rw-r--r--src/map/skill.c17
1 files changed, 9 insertions, 8 deletions
diff --git a/src/map/skill.c b/src/map/skill.c
index ef19c35b1..de5b34f1e 100644
--- a/src/map/skill.c
+++ b/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 )));