diff options
| author | L0ne_W0lf <L0ne_W0lf@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2010-08-17 00:48:37 +0000 |
|---|---|---|
| committer | L0ne_W0lf <L0ne_W0lf@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2010-08-17 00:48:37 +0000 |
| commit | 890930b7296683744525d43f8a914f20704c461a (patch) | |
| tree | 3ee700479ccd7054fd403b7e8056dd1af51c71dd /src/map/battle.c | |
| parent | e8218a6e7a252c5c08b51fb584dbe2c144ba9326 (diff) | |
| download | hercules-890930b7296683744525d43f8a914f20704c461a.tar.gz hercules-890930b7296683744525d43f8a914f20704c461a.tar.bz2 hercules-890930b7296683744525d43f8a914f20704c461a.tar.xz hercules-890930b7296683744525d43f8a914f20704c461a.zip | |
* Attempting to tackle, and fix some simple errors in skills.
- Stormgust hit counter no longer resets under new casts of stormgust.
- RG_STEALCOIN will now cause the monster to aggro player on success. (bugreport:3547)
- SL_WIZARD will now consume one crystal fragement per reflected hit. (bugreport:3603)
- WZ_FROSTNOVA will now ignore targets in area that are already frozen. (bugreport:3980)
- SL_KAAHI will no longer uses SP if player has full health already. (bugreport:3918)
- CG_TAROTCARD "The Lovers" will heal source player instead of target. (bugreport:4171)
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@14378 54d463be-8e91-2dee-dedb-b68131a5f0ec
Diffstat (limited to 'src/map/battle.c')
| -rw-r--r-- | src/map/battle.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/map/battle.c b/src/map/battle.c index 3ed1aa33c..0f800b759 100644 --- a/src/map/battle.c +++ b/src/map/battle.c @@ -3052,7 +3052,7 @@ 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) + if(tsc && tsc->data[SC_KAAHI] && tsc->data[SC_KAAHI]->val4 == -1 && tstatus->hp < tstatus->max_hp) 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_attack(BF_WEAPON, src, target, 0, 0, flag); |