diff options
| author | markzd <markzd@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2012-12-20 01:03:42 +0000 |
|---|---|---|
| committer | markzd <markzd@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2012-12-20 01:03:42 +0000 |
| commit | 300f20998ac8012373024b3a3d7d88b80de7e040 (patch) | |
| tree | e9a1df823b3fe142cb158f64ee4d68b9f416915c /src/map/battle.c | |
| parent | 6b5b18378c89aa875c98e8323082856ec49c127f (diff) | |
| download | hercules-300f20998ac8012373024b3a3d7d88b80de7e040.tar.gz hercules-300f20998ac8012373024b3a3d7d88b80de7e040.tar.bz2 hercules-300f20998ac8012373024b3a3d7d88b80de7e040.tar.xz hercules-300f20998ac8012373024b3a3d7d88b80de7e040.zip | |
* Follow up r16676
1. Fixed a behavior which allowed devotion to be bypassed when the caster was under Reflect Damage Buff.
2. Fixed the reflected magic damage to always hit the target and not the paladin when it's not reflected by kaite.
- Implemented bonus2 bMagicAtkEle which increases/decreases the caster magic damage based on its element.(bugreport:6943)
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@17030 54d463be-8e91-2dee-dedb-b68131a5f0ec
Diffstat (limited to 'src/map/battle.c')
| -rw-r--r-- | src/map/battle.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/map/battle.c b/src/map/battle.c index 22a3ba948..b148305f5 100644 --- a/src/map/battle.c +++ b/src/map/battle.c @@ -440,10 +440,11 @@ int battle_calc_cardfix(int attack_type, struct block_list *src, struct block_li cardfix=cardfix*(100+sd->magic_addele[tstatus->def_ele])/100; cardfix=cardfix*(100+sd->magic_addsize[tstatus->size])/100; cardfix=cardfix*(100+sd->magic_addrace[is_boss(target)?RC_BOSS:RC_NONBOSS])/100; + cardfix=cardfix*(100+sd->magic_atk_ele[s_ele])/100; for(i=0; i< ARRAYLENGTH(sd->add_mdmg) && sd->add_mdmg[i].rate;i++) { if(sd->add_mdmg[i].class_ == t_class) { cardfix=cardfix*(100+sd->add_mdmg[i].rate)/100; - continue; + break; } } if (cardfix != 1000) |