diff options
| author | skotlex <skotlex@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2006-07-28 13:33:51 +0000 |
|---|---|---|
| committer | skotlex <skotlex@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2006-07-28 13:33:51 +0000 |
| commit | 71140a6d9bb8b15fdee82745b559db0ca6a0052d (patch) | |
| tree | 0337ec2f6a388fdfb9862e7823f67446206629ee /src/map/battle.c | |
| parent | 16cb5fef019d99367ef818e7c1d52a8c2deb8162 (diff) | |
| download | hercules-71140a6d9bb8b15fdee82745b559db0ca6a0052d.tar.gz hercules-71140a6d9bb8b15fdee82745b559db0ca6a0052d.tar.bz2 hercules-71140a6d9bb8b15fdee82745b559db0ca6a0052d.tar.xz hercules-71140a6d9bb8b15fdee82745b559db0ca6a0052d.zip | |
- Some cleaning of battle_drain, Evil Druid card should work now.
- Made status_damage allow damaging of objects not on a map, this should fix pet-catching making the mob never respawn again.
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@7946 54d463be-8e91-2dee-dedb-b68131a5f0ec
Diffstat (limited to 'src/map/battle.c')
| -rw-r--r-- | src/map/battle.c | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/src/map/battle.c b/src/map/battle.c index 84978c67f..23531c62b 100644 --- a/src/map/battle.c +++ b/src/map/battle.c @@ -2765,7 +2765,7 @@ int battle_calc_return_damage(struct block_list *bl, int *damage, int flag) { return rdamage; } -void battle_drain(TBL_PC *sd, TBL_PC* tsd, int rdamage, int ldamage, int race, int boss) +void battle_drain(TBL_PC *sd, struct block_list *tbl, int rdamage, int ldamage, int race, int boss) { struct weapon_data *wd; int type, thp = 0, tsp = 0, rhp = 0, rsp = 0, hp, sp, i, *damage; @@ -2803,17 +2803,17 @@ void battle_drain(TBL_PC *sd, TBL_PC* tsd, int rdamage, int ldamage, int race, i tsp += sp; } } + + if (sd->sp_vanish_rate && rand()%1000 < sd->sp_vanish_rate) + status_percent_damage(&sd->bl, tbl, 0, (unsigned char)sd->sp_vanish_per); if (!thp && !tsp) return; status_heal(&sd->bl, thp, tsp, battle_config.show_hp_sp_drain?3:1); - if (tsd) { - if (rhp || rsp) - status_zap(&tsd->bl, rhp, rsp); - if (rand()%1000 < sd->sp_vanish_rate) - status_percent_damage(&sd->bl, &tsd->bl, 0, (unsigned char)sd->sp_vanish_per); - } + if (rhp || rsp) + status_zap(tbl, rhp, rsp); } + /*========================================== * ’Ê?í?UŒ‚?ˆ—?‚Ü‚Æ‚ß *------------------------------------------ @@ -2978,9 +2978,9 @@ int battle_weapon_attack( struct block_list *src,struct block_list *target, if (sd) { if (wd.flag & BF_WEAPON && src != target && damage > 0) { if (battle_config.left_cardfix_to_right) - battle_drain(sd, tsd, wd.damage, wd.damage, tstatus->race, is_boss(target)); + battle_drain(sd, target, wd.damage, wd.damage, tstatus->race, is_boss(target)); else - battle_drain(sd, tsd, wd.damage, wd.damage2, tstatus->race, is_boss(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] |