From a522db8a246bcac5c1aa82ee070db2c5453f0cb4 Mon Sep 17 00:00:00 2001 From: skotlex Date: Wed, 12 Jul 2006 13:44:42 +0000 Subject: - Fixed Cart Termination's damage. - Added the missing check to remove character from memory when logging out and using the charsave_method which saves character map-server-side. git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@7631 54d463be-8e91-2dee-dedb-b68131a5f0ec --- src/map/battle.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) (limited to 'src/map/battle.c') diff --git a/src/map/battle.c b/src/map/battle.c index c74179db2..c956fcda8 100644 --- a/src/map/battle.c +++ b/src/map/battle.c @@ -1422,12 +1422,13 @@ static struct Damage battle_calc_weapon_attack( skillratio += 30*skill_lv; break; case WS_CARTTERMINATION: - i = (10 * (16 - skill_lv)); + i = 10 * (16 - skill_lv); if (i < 1) i = 1; - if(sd && sd->cart_weight > 0) //Preserve damage ratio when max cart weight is changed. - skillratio += (sd->cart_weight * 8000) / (i * battle_config.max_cart_weight) - 100; + //Preserve damage ratio when max cart weight is changed. + if(sd && sd->cart_weight && sd->cart_max_weight) + skillratio += (sd->cart_weight * 80000) / (i * sd->cart_max_weight) - 100; else if (!sd) - skillratio += 8000 / i - 100; + skillratio += 80000 / i - 100; flag.cardfix = 0; break; case TK_DOWNKICK: -- cgit v1.2.3-70-g09d2