diff options
author | skotlex <skotlex@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2006-11-27 14:58:50 +0000 |
---|---|---|
committer | skotlex <skotlex@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2006-11-27 14:58:50 +0000 |
commit | 32ebbcf88520ef77425c0b2408ba36c40c3c9aaa (patch) | |
tree | 57ed8c019a56b4ab7d2b531007856fe40e876267 /src/map/skill.c | |
parent | e5516cf57ab6852557eac30f3c056b90dfe59b1d (diff) | |
download | hercules-32ebbcf88520ef77425c0b2408ba36c40c3c9aaa.tar.gz hercules-32ebbcf88520ef77425c0b2408ba36c40c3c9aaa.tar.bz2 hercules-32ebbcf88520ef77425c0b2408ba36c40c3c9aaa.tar.xz hercules-32ebbcf88520ef77425c0b2408ba36c40c3c9aaa.zip |
- Corrected KiriKage's range so it works correctly when used by non-players or when use weapon's range is used.
- Changed service for you's flags so it affects all players on range.
- Corrected the skill animation for Absorb Spirits
- Cleaned up a bit the implementation of how Gravity Field blocks the caster from moving.
- Mob class-changing will fail if the new class is the same as the previous one.
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@9325 54d463be-8e91-2dee-dedb-b68131a5f0ec
Diffstat (limited to 'src/map/skill.c')
-rw-r--r-- | src/map/skill.c | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/src/map/skill.c b/src/map/skill.c index 26f9a8f41..0f78fe32a 100644 --- a/src/map/skill.c +++ b/src/map/skill.c @@ -3174,7 +3174,8 @@ int skill_castend_damage_id (struct block_list* src, struct block_list *bl, int if (unit_movepos(src, x, y, 0, 0)) clif_slide(src,src->x,src->y); } - status_change_end(src, SC_HIDING, -1); + if (sc && sc->data[SC_HIDING].timer != -1) + status_change_end(src, SC_HIDING, -1); skill_attack(BF_WEAPON,src,src,bl,skillid,skilllv,tick,flag); break; case 0: @@ -3945,10 +3946,8 @@ int skill_castend_nodamage_id (struct block_list *src, struct block_list *bl, in i = 2 * dstmd->level; mob_target(dstmd,src,0); } - if (i) { - clif_skill_nodamage(src,bl,skillid,skilllv,0); - status_heal(src, 0, i, 3); - } + if (i) status_heal(src, 0, i, 3); + clif_skill_nodamage(src,bl,skillid,skilllv,i?1:0); break; case AC_MAKINGARROW: |