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/unit.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/unit.c')
| -rw-r--r-- | src/map/unit.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/map/unit.c b/src/map/unit.c index 116b8c3d5..3d15ba6c8 100644 --- a/src/map/unit.c +++ b/src/map/unit.c @@ -844,10 +844,10 @@ int unit_skilluse_id2(struct block_list *src, int target_id, short skill_num, sh sc = status_get_sc(src); if (sc && !sc->count) sc = NULL; //Unneeded + //temp: used to signal combo-skills right now. - temp = (target_id == src->id && !(sd && sd->state.skill_flag) - && skill_get_inf(skill_num)&INF_SELF_SKILL - && skill_get_inf2(skill_num)&INF2_NO_TARGET_SELF); + temp = ( target_id == src->id && + ( (sd && sd->state.combo) || (skill_get_inf(skill_num)&INF_SELF_SKILL && skill_get_inf2(skill_num)&INF2_NO_TARGET_SELF) ) ); if (temp) target_id = ud->target; //Auto-select skills. [Skotlex] @@ -961,7 +961,7 @@ int unit_skilluse_id2(struct block_list *src, int target_id, short skill_num, sh if( ((TBL_MOB*)src)->master_id && ((TBL_MOB*)src)->special_state.ai ) return 0; } - + //Check range when not using skill on yourself or is a combo-skill during attack //(these are supposed to always have the same range as your attack) if( src->id != target_id && (!temp || ud->attacktimer == -1) ) |