diff options
| author | skotlex <skotlex@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2006-08-07 16:53:10 +0000 |
|---|---|---|
| committer | skotlex <skotlex@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2006-08-07 16:53:10 +0000 |
| commit | 1af5eb4ad8b5a03e430772ececf37f3986d0d537 (patch) | |
| tree | 175ee3eb2bcde3c6f146e2607c9956da26b223c2 /src/map/battle.c | |
| parent | cdb9971c1511c4732ce08f0cb1c411a21abe8d77 (diff) | |
| download | hercules-1af5eb4ad8b5a03e430772ececf37f3986d0d537.tar.gz hercules-1af5eb4ad8b5a03e430772ececf37f3986d0d537.tar.bz2 hercules-1af5eb4ad8b5a03e430772ececf37f3986d0d537.tar.xz hercules-1af5eb4ad8b5a03e430772ececf37f3986d0d537.zip | |
- Some code cleaning in status.c
- Reflected damage will now also have a chance of draining hp/sp.
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@8164 54d463be-8e91-2dee-dedb-b68131a5f0ec
Diffstat (limited to 'src/map/battle.c')
| -rw-r--r-- | src/map/battle.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/src/map/battle.c b/src/map/battle.c index 34ff61ad2..9b846e82c 100644 --- a/src/map/battle.c +++ b/src/map/battle.c @@ -25,8 +25,6 @@ #include "guild.h" #include "party.h" -#define is_boss(bl) status_get_mexp(bl) // Can refine later [Aru] - int attr_fix_table[4][ELE_MAX][ELE_MAX]; struct Battle_Config battle_config; @@ -3061,8 +3059,11 @@ int battle_weapon_attack( struct block_list *src,struct block_list *target, battle_drain(sd, target, wd.damage, wd.damage2, tstatus->race, is_boss(target)); } } - if (rdamage > 0) //By sending attack type "none" skill_additional_effect won't be invoked. [Skotlex] + if (rdamage > 0) { //By sending attack type "none" skill_additional_effect won't be invoked. [Skotlex] + + battle_drain(tsd, src, rdamage, rdamage, sstatus->race, is_boss(src)); battle_delay_damage(tick+wd.amotion, target, src, 0, 0, 0, rdamage, ATK_DEF, rdelay); + } if (tsc) { if (tsc->data[SC_POISONREACT].timer != -1 && |