diff options
| author | shennetsind <shennetsind@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2012-03-22 17:08:56 +0000 |
|---|---|---|
| committer | shennetsind <shennetsind@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2012-03-22 17:08:56 +0000 |
| commit | e2502cddcd7d361a97ab56421527f2aee75b5832 (patch) | |
| tree | bd4e88aa90b815ca863564e61de58e5d09c7b340 /src/map | |
| parent | 76bc7c8e3f96067b3b56869b9a4072018ece1fe6 (diff) | |
| download | hercules-e2502cddcd7d361a97ab56421527f2aee75b5832.tar.gz hercules-e2502cddcd7d361a97ab56421527f2aee75b5832.tar.bz2 hercules-e2502cddcd7d361a97ab56421527f2aee75b5832.tar.xz hercules-e2502cddcd7d361a97ab56421527f2aee75b5832.zip | |
Fixed bugreport:5344 break fall's dodge combo may be only be used with fly kick now
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@15765 54d463be-8e91-2dee-dedb-b68131a5f0ec
Diffstat (limited to 'src/map')
| -rw-r--r-- | src/map/skill.c | 2 | ||||
| -rw-r--r-- | src/map/status.c | 30 |
2 files changed, 15 insertions, 17 deletions
diff --git a/src/map/skill.c b/src/map/skill.c index b93a40144..90b4c42d8 100644 --- a/src/map/skill.c +++ b/src/map/skill.c @@ -11111,7 +11111,7 @@ int skill_check_condition_castbegin(struct map_session_data* sd, short skill, sh case TK_COUNTER: if ((sd->class_&MAPID_UPPERMASK) == MAPID_SOUL_LINKER) return 0; //Anti-Soul Linker check in case you job-changed with Stances active. - if(!(sc && sc->data[SC_COMBO])) + if(!(sc && sc->data[SC_COMBO]) || sc->data[SC_COMBO]->val1 == TK_JUMPKICK) return 0; //Combo needs to be ready if (sc->data[SC_COMBO]->val3) { //Kick chain diff --git a/src/map/status.c b/src/map/status.c index 48ff5c9ca..464207060 100644 --- a/src/map/status.c +++ b/src/map/status.c @@ -6970,23 +6970,21 @@ int status_change_start(struct block_list* bl,enum sc_type type,int rate,int val } break; - case SC_COMBO: - { - //val1: Skill ID - //val2: When given, target (for autotargetting skills) - //val3: When set, this combo time should NOT delay attack/movement - //val3: TK: Last used kick - //val4: TK: Combo time - struct unit_data *ud = unit_bl2ud(bl); - if (ud && !val3) - { - tick += 300 * battle_config.combo_delay_rate/100; - ud->attackabletime = gettick()+tick; - unit_set_walkdelay(bl, gettick(), tick, 1); + case SC_COMBO: { + //val1: Skill ID + //val2: When given, target (for autotargetting skills) + //val3: When set, this combo time should NOT delay attack/movement + //val3: TK: Last used kick + //val4: TK: Combo time + struct unit_data *ud = unit_bl2ud(bl); + if (ud && !val3) { + tick += 300 * battle_config.combo_delay_rate/100; + ud->attackabletime = gettick()+tick; + unit_set_walkdelay(bl, gettick(), tick, 1); + } + val3 = 0; + val4 = tick; } - val3 = 0; - val4 = tick; - } break; case SC_EARTHSCROLL: val2 = 11-val1; //Chance to consume: 11-skilllv% |