summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorshennetsind <shennetsind@54d463be-8e91-2dee-dedb-b68131a5f0ec>2012-02-09 19:55:46 +0000
committershennetsind <shennetsind@54d463be-8e91-2dee-dedb-b68131a5f0ec>2012-02-09 19:55:46 +0000
commit0f1315e03a62353f223386ffc0653453bdfcc355 (patch)
treec02e3d38490afeea6f527d17421fcb1a5f6c156f
parentf872adf65b9f25926ec3e0d8369a97e0c95e86a4 (diff)
downloadhercules-0f1315e03a62353f223386ffc0653453bdfcc355.tar.gz
hercules-0f1315e03a62353f223386ffc0653453bdfcc355.tar.bz2
hercules-0f1315e03a62353f223386ffc0653453bdfcc355.tar.xz
hercules-0f1315e03a62353f223386ffc0653453bdfcc355.zip
Fixed bug that didn't allow LV 90+ TK Rankers from being able to use kicks not corresponding to current kick stance, bugreport:5092
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@15560 54d463be-8e91-2dee-dedb-b68131a5f0ec
-rw-r--r--src/map/skill.c6
1 files changed, 2 insertions, 4 deletions
diff --git a/src/map/skill.c b/src/map/skill.c
index b060e7db5..9fb8f0533 100644
--- a/src/map/skill.c
+++ b/src/map/skill.c
@@ -10529,16 +10529,14 @@ int skill_check_condition_castbegin(struct map_session_data* sd, short skill, sh
if(!(sc && sc->data[SC_COMBO]))
return 0; //Combo needs to be ready
- if (sc->data[SC_COMBO]->val3)
- { //Kick chain
+ if (sc->data[SC_COMBO]->val3) { //Kick chain
//Do not repeat a kick.
if (sc->data[SC_COMBO]->val3 != skill)
break;
status_change_end(&sd->bl, SC_COMBO, INVALID_TIMER);
return 0;
}
- if(sc->data[SC_COMBO]->val1 != skill)
- { //Cancel combo wait.
+ if(sc->data[SC_COMBO]->val1 != skill && !( sd && sd->status.base_level >= 90 && pc_famerank(sd->status.char_id, MAPID_TAEKWON) )) { //Cancel combo wait.
unit_cancel_combo(&sd->bl);
return 0;
}