diff options
| author | Inkfish <Inkfish@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2009-06-20 08:22:52 +0000 |
|---|---|---|
| committer | Inkfish <Inkfish@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2009-06-20 08:22:52 +0000 |
| commit | 6f700c626efe9253ce77865667d1d5e598daab65 (patch) | |
| tree | 39181382b553076654fe401c9e8d6116f81852d9 /src/map/status.c | |
| parent | e0812d1de5710c08e5242e0a958e675d1bce0829 (diff) | |
| download | hercules-6f700c626efe9253ce77865667d1d5e598daab65.tar.gz hercules-6f700c626efe9253ce77865667d1d5e598daab65.tar.bz2 hercules-6f700c626efe9253ce77865667d1d5e598daab65.tar.xz hercules-6f700c626efe9253ce77865667d1d5e598daab65.zip | |
* Changed Asura Strike/Jump Kick to target skill to get rid of the "target delay". (bugreport:2174)
- skill tree will be re-sent on status change to handle using these two skills during combo.
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@13900 54d463be-8e91-2dee-dedb-b68131a5f0ec
Diffstat (limited to 'src/map/status.c')
| -rw-r--r-- | src/map/status.c | 28 |
1 files changed, 26 insertions, 2 deletions
diff --git a/src/map/status.c b/src/map/status.c index 467626106..2955520c6 100644 --- a/src/map/status.c +++ b/src/map/status.c @@ -5668,6 +5668,22 @@ int status_change_start(struct block_list* bl,enum sc_type type,int rate,int val case TK_COUNTER: clif_skill_nodamage(bl,bl,TK_READYCOUNTER,1,1); break; + case MO_COMBOFINISH: + case CH_TIGERFIST: + case CH_CHAINCRUSH: + if( sd ) + { + sd->state.combo = 1; + clif_skillinfoblock(sd); + } + break; + case TK_JUMPKICK: + if( sd ) + { + sd->state.combo = 2; + clif_skillinfoblock(sd); + } + break; } if (ud && !val3) { @@ -6497,8 +6513,16 @@ int status_change_end(struct block_list* bl, enum sc_type type, int tid) } break; case SC_COMBO: //Clear last used skill when it is part of a combo. - if (sd && sd->skillid_old == sce->val1) - sd->skillid_old = sd->skilllv_old = 0; + if( sd ) + { + if( sd->state.combo ) + { + sd->state.combo = 0; + clif_skillinfoblock(sd); + } + if( sd->skillid_old == sce->val1 ) + sd->skillid_old = sd->skilllv_old = 0; + } break; case SC_MARIONETTE: |