From 8ac081660afbb0bb829a50acecc405730ce7c96f Mon Sep 17 00:00:00 2001 From: skotlex Date: Wed, 5 Apr 2006 21:28:28 +0000 Subject: - Fixed a compilation error due to a missing semicolon... - TK ranking kicks can't be used on sucession now (can't use any of the kick skills twice in a row without using a different one first). git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@5915 54d463be-8e91-2dee-dedb-b68131a5f0ec --- src/map/skill.c | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) (limited to 'src') diff --git a/src/map/skill.c b/src/map/skill.c index a4fd1f7bc..623e62302 100644 --- a/src/map/skill.c +++ b/src/map/skill.c @@ -7534,7 +7534,7 @@ int skill_isammotype(TBL_PC *sd, int skill) (sd->status.weapon == W_BOW || (sd->status.weapon >= W_REVOLVER && sd->status.weapon <= W_GRENADE)) && skill != HT_PHANTASMIC && skill != GS_MAGICALBULLET && skill_get_type(skill) == BF_WEAPON && !(skill_get_nk(skill)&NK_NO_DAMAGE) - ) + ); } /*========================================== @@ -7818,7 +7818,16 @@ int skill_check_condition(struct map_session_data *sd,int skill, int lv, int typ if(sd->sc.data[SC_COMBO].timer != -1 && sd->sc.data[SC_COMBO].val1 == skill) break; //Combo ready. if (pc_istop10fame(sd->char_id,MAPID_TAEKWON)) - break; //Unlimited Combo + { //Unlimited Combo + if (skill == sd->skillid_old) + return 0; //Can't repeat previous combo skill. + if (type&1) { + //On cast-end, set this skill as previous one. + sd->skillid_old = skill; + sd->skilllv_old = lv; + } + break; + } return 0; case BD_ADAPTATION: /* ƒAƒhƒŠƒu */ { -- cgit v1.2.3-70-g09d2