diff options
| author | skotlex <skotlex@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2006-08-28 16:13:28 +0000 |
|---|---|---|
| committer | skotlex <skotlex@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2006-08-28 16:13:28 +0000 |
| commit | 06841373f453322e33aa6a22d68fa803e17ae76d (patch) | |
| tree | e264c45b3244f90da8541c52adf8a192bbb04521 | |
| parent | 7e6a28e43b7303033cc292d22a25b39b7eaec51c (diff) | |
| download | hercules-06841373f453322e33aa6a22d68fa803e17ae76d.tar.gz hercules-06841373f453322e33aa6a22d68fa803e17ae76d.tar.bz2 hercules-06841373f453322e33aa6a22d68fa803e17ae76d.tar.xz hercules-06841373f453322e33aa6a22d68fa803e17ae76d.zip | |
- Reverted the "fix" to mdef reduction code being applied before the number of hits adjustment @.@
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@8521 54d463be-8e91-2dee-dedb-b68131a5f0ec
| -rw-r--r-- | Changelog-Trunk.txt | 2 | ||||
| -rw-r--r-- | src/map/battle.c | 7 |
2 files changed, 3 insertions, 6 deletions
diff --git a/Changelog-Trunk.txt b/Changelog-Trunk.txt index 3da6e56c2..da743eeba 100644 --- a/Changelog-Trunk.txt +++ b/Changelog-Trunk.txt @@ -5,8 +5,6 @@ IF YOU HAVE A WORKING AND TESTED BUGFIX PUT IT INTO STABLE AS WELL AS TRUNK. 2006/08/28
* Fixed exp bonuses applying twice for the job-exp [Skotlex]
- * Magic damage adjustment per number of hits is now performed before mdef
- reductions. [Skotlex]
* @reloadbattleconf will now also update the ragsrvinfo table on the
char-server. [Skotlex]
* Reverted Mpeg's change of NJ_BUNSINJYUTSU SCB [Toms]
diff --git a/src/map/battle.c b/src/map/battle.c index 5410ed3fc..ff9794345 100644 --- a/src/map/battle.c +++ b/src/map/battle.c @@ -2365,8 +2365,6 @@ 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? @@ -2451,8 +2449,9 @@ struct Damage battle_calc_magic_attack( MATK_RATE(cardfix); } - } else //Correct number of hits anyway. - damage_div_fix(ad.damage, ad.div_); + } + + damage_div_fix(ad.damage, ad.div_); if (flag.infdef && ad.damage) ad.damage = ad.damage>0?1:-1; |