diff options
| author | Inkfish <Inkfish@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2009-07-29 04:33:00 +0000 |
|---|---|---|
| committer | Inkfish <Inkfish@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2009-07-29 04:33:00 +0000 |
| commit | e7d01f7b12e109ac54dcc29f9d368e20512c57e6 (patch) | |
| tree | dfdd2ac4d8db3cec19a455d9fe9bb8542664d95e /src/map/battle.c | |
| parent | df3489bd7cd6da79c1654d97600aa7f3ba213fd3 (diff) | |
| download | hercules-e7d01f7b12e109ac54dcc29f9d368e20512c57e6.tar.gz hercules-e7d01f7b12e109ac54dcc29f9d368e20512c57e6.tar.bz2 hercules-e7d01f7b12e109ac54dcc29f9d368e20512c57e6.tar.xz hercules-e7d01f7b12e109ac54dcc29f9d368e20512c57e6.zip | |
* Kaahi heals no matter if attack connects. (bugreport:2440)
* Fixed a typo causing skillitem always resets skill delay. (bugreport:3431)
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@13977 54d463be-8e91-2dee-dedb-b68131a5f0ec
Diffstat (limited to 'src/map/battle.c')
| -rw-r--r-- | src/map/battle.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/src/map/battle.c b/src/map/battle.c index 8852d19bd..17073a447 100644 --- a/src/map/battle.c +++ b/src/map/battle.c @@ -3004,6 +3004,9 @@ enum damage_lv battle_weapon_attack(struct block_list* src, struct block_list* t return (damage_lv)skill_attack(BF_MAGIC,src,src,target,NPC_MAGICALATTACK,sc->data[SC_MAGICALATTACK]->val1,tick,0); } + if(tsc && tsc->data[SC_KAAHI] && tsc->data[SC_KAAHI]->val4 == -1) + tsc->data[SC_KAAHI]->val4 = add_timer(tick + skill_get_time2(SL_KAAHI,tsc->data[SC_KAAHI]->val1), kaahi_heal_timer, target->id, SC_KAAHI); //Activate heal. + wd = battle_calc_weapon_attack(src, target, 0, 0, flag); if (sd && sd->state.arrow_atk) //Consume arrow. |