diff options
| author | panikon <panikon@zoho.com> | 2014-07-05 13:18:51 -0300 |
|---|---|---|
| committer | panikon <panikon@zoho.com> | 2014-07-05 13:18:51 -0300 |
| commit | 3d87a990181fb8e6654ba18c6821106e87c88141 (patch) | |
| tree | 48303f67cdf05bab6a777e047860901425a8b0b1 /src/map/skill.c | |
| parent | 91057aae931adf43580f4bc19d2f84b3157c819e (diff) | |
| download | hercules-3d87a990181fb8e6654ba18c6821106e87c88141.tar.gz hercules-3d87a990181fb8e6654ba18c6821106e87c88141.tar.bz2 hercules-3d87a990181fb8e6654ba18c6821106e87c88141.tar.xz hercules-3d87a990181fb8e6654ba18c6821106e87c88141.zip | |
Corrected HT_POWER behaviour, combo and type of skill, and fixed TK-combos walking delay (issue: 8241 http://hercules.ws/board/tracker/issue-8241-cant-move-during-certain-combos/)
Diffstat (limited to 'src/map/skill.c')
| -rw-r--r-- | src/map/skill.c | 24 |
1 files changed, 16 insertions, 8 deletions
diff --git a/src/map/skill.c b/src/map/skill.c index 9676a6d9f..04aee371c 100644 --- a/src/map/skill.c +++ b/src/map/skill.c @@ -762,15 +762,18 @@ int skill_additional_effect(struct block_list* src, struct block_list *bl, uint1 // Chance to trigger Taekwon kicks [Dralnu] if(sc && !sc->data[SC_COMBOATTACK]) { if(sc->data[SC_STORMKICK_READY] && - sc_start(src,src,SC_COMBOATTACK, 15, TK_STORMKICK, + sc_start4(src,src,SC_COMBOATTACK, 15, TK_STORMKICK, + bl->id, 2, 0, (2000 - 4*sstatus->agi - 2*sstatus->dex))) ; //Stance triggered else if(sc->data[SC_DOWNKICK_READY] && - sc_start(src,src,SC_COMBOATTACK, 15, TK_DOWNKICK, + sc_start4(src,src,SC_COMBOATTACK, 15, TK_DOWNKICK, + bl->id, 2, 0, (2000 - 4*sstatus->agi - 2*sstatus->dex))) ; //Stance triggered else if(sc->data[SC_TURNKICK_READY] && - sc_start(src,src,SC_COMBOATTACK, 15, TK_TURNKICK, + sc_start4(src,src,SC_COMBOATTACK, 15, TK_TURNKICK, + bl->id, 2, 0, (2000 - 4*sstatus->agi - 2*sstatus->dex))) ; //Stance triggered else if (sc->data[SC_COUNTERKICK_READY]) { //additional chance from SG_FRIEND [Komurka] @@ -2339,10 +2342,11 @@ int skill_attack(int attack_type, struct block_list* src, struct block_list *dsr combo=1; break; case AC_DOUBLE: - if( (tstatus->race == RC_BRUTE || tstatus->race == RC_INSECT) && pc->checkskill(sd, HT_POWER)) - { - //TODO: This code was taken from Triple Blows, is this even how it should be? [Skotlex] - sc_start2(NULL,src,SC_COMBOATTACK,100,HT_POWER,bl->id,2000); + // AC_DOUBLE can start the combo with other monster types, but the + // monster that's going to be hit by HT_POWER should be RC_BRUTE or RC_INSECT [Panikon] + if( pc->checkskill(sd, HT_POWER) ) + { + sc_start4(NULL,src,SC_COMBOATTACK,100,HT_POWER,0,1,0,2000); clif->combo_delay(src,2000); } break; @@ -3509,7 +3513,6 @@ int skill_castend_damage_id(struct block_list* src, struct block_list *bl, uint1 case WS_CARTTERMINATION: // Cart Termination case AS_VENOMKNIFE: case HT_PHANTASMIC: - case HT_POWER: case TK_DOWNKICK: case TK_COUNTER: case GS_CHAINACTION: @@ -3731,6 +3734,11 @@ int skill_castend_damage_id(struct block_list* src, struct block_list *bl, uint1 } break; + case HT_POWER: + if( tstatus->race == RC_BRUTE || tstatus->race == RC_INSECT ) + skill->attack(BF_WEAPON,src,src,bl,skill_id,skill_lv,tick,flag); + break; + //Splash attack skills. case AS_GRIMTOOTH: case MC_CARTREVOLUTION: |