diff options
| author | skotlex <skotlex@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2006-08-28 16:03:23 +0000 |
|---|---|---|
| committer | skotlex <skotlex@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2006-08-28 16:03:23 +0000 |
| commit | 71c735ac06d62215df3dd6f33ec5ae38cd8397a2 (patch) | |
| tree | 046c104b76c6929198d968bf8ca641eab5d2233f /src/map/battle.c | |
| parent | 110493234092936699654cc74accd377b9fc1352 (diff) | |
| download | hercules-71c735ac06d62215df3dd6f33ec5ae38cd8397a2.tar.gz hercules-71c735ac06d62215df3dd6f33ec5ae38cd8397a2.tar.bz2 hercules-71c735ac06d62215df3dd6f33ec5ae38cd8397a2.tar.xz hercules-71c735ac06d62215df3dd6f33ec5ae38cd8397a2.zip | |
- Fixed exp bonuses applying twice for the job-exp
- Magic damage adjustment per number of hits is now performed before mdef reductions.
- @reloadbattleconf will now also update the ragsrvinfo table on the char-server.
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@8518 54d463be-8e91-2dee-dedb-b68131a5f0ec
Diffstat (limited to 'src/map/battle.c')
| -rw-r--r-- | src/map/battle.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/map/battle.c b/src/map/battle.c index 28c8e4c4c..5410ed3fc 100644 --- a/src/map/battle.c +++ b/src/map/battle.c @@ -2365,6 +2365,8 @@ struct Damage battle_calc_magic_attack( MATK_ADD(50); } } + //Adjust damage per number of hits. + damage_div_fix(ad.damage, ad.div_); if(sd) { //Ignore Defense? @@ -2449,9 +2451,8 @@ struct Damage battle_calc_magic_attack( MATK_RATE(cardfix); } - } - - damage_div_fix(ad.damage, ad.div_); + } else //Correct number of hits anyway. + damage_div_fix(ad.damage, ad.div_); if (flag.infdef && ad.damage) ad.damage = ad.damage>0?1:-1; @@ -3746,7 +3747,6 @@ static const struct battle_data_short { { "duel_autoleave_when_die", &battle_config.duel_autoleave_when_die}, //[LuzZza] { "duel_time_interval", &battle_config.duel_time_interval}, // [LuzZza] { "duel_only_on_same_map", &battle_config.duel_only_on_same_map}, // [Toms] - { "skip_teleport_lv1_menu", &battle_config.skip_teleport_lv1_menu}, // [LuzZza] { "allow_skill_without_day", &battle_config.allow_skill_without_day}, // [Komurka] { "allow_es_magic_player", &battle_config.allow_es_magic_pc }, |