diff options
| author | toms <toms@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2006-08-18 15:22:24 +0000 |
|---|---|---|
| committer | toms <toms@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2006-08-18 15:22:24 +0000 |
| commit | 40418b2ae80248b13521bd3f670999437b556806 (patch) | |
| tree | 4b6580840bc4fa60b476bc575282cf066572a743 /src/map/battle.c | |
| parent | adf1641e5efb0e136a03d5bdefdc9ae20c2d6450 (diff) | |
| download | hercules-40418b2ae80248b13521bd3f670999437b556806.tar.gz hercules-40418b2ae80248b13521bd3f670999437b556806.tar.bz2 hercules-40418b2ae80248b13521bd3f670999437b556806.tar.xz hercules-40418b2ae80248b13521bd3f670999437b556806.zip | |
Applied Mpeg's work on ninja (http://gpegon.free.fr/ea/ninja_08-18-06_mpeg.txt)
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@8347 54d463be-8e91-2dee-dedb-b68131a5f0ec
Diffstat (limited to 'src/map/battle.c')
| -rw-r--r-- | src/map/battle.c | 16 |
1 files changed, 7 insertions, 9 deletions
diff --git a/src/map/battle.c b/src/map/battle.c index c481d0034..f16a58314 100644 --- a/src/map/battle.c +++ b/src/map/battle.c @@ -318,15 +318,6 @@ int battle_calc_damage(struct block_list *src,struct block_list *bl,int damage,i return 0; } - if(sc->data[SC_UTSUSEMI].timer != -1 && !skill_num) - { - clif_specialeffect(bl, 462, AREA); - skill_blown (src, bl, sc->data[SC_UTSUSEMI].val3); - if (--sc->data[SC_UTSUSEMI].val2 <= 0) - status_change_end(bl, SC_UTSUSEMI, -1); - return 0; - } - if(sc->data[SC_BUNSINJYUTSU].timer != -1 && (flag&(BF_WEAPON|BF_MISC)) ) { if (--sc->data[SC_BUNSINJYUTSU].val2 <= 0) @@ -2927,6 +2918,13 @@ int battle_weapon_attack( struct block_list *src,struct block_list *target, return 0; } } + if (tsc->data[SC_UTSUSEMI].timer != -1) { + clif_specialeffect(target, 462, AREA); + skill_blown (src, target, tsc->data[SC_UTSUSEMI].val3); + if (--tsc->data[SC_UTSUSEMI].val2 <= 0) + status_change_end(target, SC_UTSUSEMI, -1); + return 0; + } } //Recycled the damage variable rather than use a new one... [Skotlex] if(sd && (damage = pc_checkskill(sd,MO_TRIPLEATTACK)) > 0) |