From 97d488e67801d315730cbe20eef9e0f70e56c0a6 Mon Sep 17 00:00:00 2001 From: rud0lp20 Date: Tue, 8 Jan 2013 12:30:25 +0000 Subject: Fixed bugreport:7125 changed CH_PALMSTRIKE to aspd based like official. Fixed bugreport:7131 where negative def in PRE causes instant death to target. git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@17088 54d463be-8e91-2dee-dedb-b68131a5f0ec --- src/map/battle.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/map/battle.c') diff --git a/src/map/battle.c b/src/map/battle.c index 074319b2f..e67cf16ed 100644 --- a/src/map/battle.c +++ b/src/map/battle.c @@ -3242,8 +3242,8 @@ static struct Damage battle_calc_weapon_attack(struct block_list *src,struct blo #else if (def1 > 100) def1 = 100; ATK_RATE2( - flag.idef ?100:(flag.pdef ? (flag.pdef*(def1+vit_def)) : (100-def1)), - flag.idef2?100:(flag.pdef2? (flag.pdef2*(def1+vit_def)) : (100-def1)) + flag.idef ?100:(flag.pdef ? (def1+vit_def) : (100-def1)), + flag.idef2?100:(flag.pdef2? (def1+vit_def) : (100-def1)) ); ATK_ADD2( flag.idef ||flag.pdef ?0:-vit_def, -- cgit v1.2.3-60-g2f50