From a31cce3c60cc170db0d4a8ff707626e8777b0801 Mon Sep 17 00:00:00 2001 From: rud0lp20 Date: Sun, 30 Dec 2012 07:13:29 +0000 Subject: Follow up r17062 where ignore def is not working properly.XD Fixed bugreport:6408 where casting WL_WHITEIMPRISON caster is not attach to trigger autoloot and events. Update WZ_ESTIMATION settings to RE default. git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@17064 54d463be-8e91-2dee-dedb-b68131a5f0ec --- src/map/battle.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'src/map/battle.c') diff --git a/src/map/battle.c b/src/map/battle.c index aab2ad3eb..f80148d57 100644 --- a/src/map/battle.c +++ b/src/map/battle.c @@ -3214,11 +3214,11 @@ static struct Damage battle_calc_weapon_attack(struct block_list *src,struct blo flag.pdef ?(def1+vit_def):0, flag.pdef2?(def1+vit_def):0 ); - if (!flag.idef || !flag.idef2){ + if( !flag.idef ) wd.damage = wd.damage * (4000+def1) / (4000+10*def1) - vit_def; - if(flag.lh) - wd.damage2 = wd.damage2 * (4000+def1) / (4000+10*def1) - vit_def; - } + if( flag.lh && !flag.idef2 ) + wd.damage2 = wd.damage2 * (4000+def1) / (4000+10*def1) - vit_def; + #else if (def1 > 100) def1 = 100; -- cgit v1.2.3-70-g09d2