From 747ed75edefe7c74f3f0d848db5685158b94480b Mon Sep 17 00:00:00 2001 From: skotlex Date: Thu, 13 Jul 2006 15:19:15 +0000 Subject: - Reverted temporarily the Cart Termination equation until it can be fixed... git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@7655 54d463be-8e91-2dee-dedb-b68131a5f0ec --- Changelog-Trunk.txt | 2 ++ src/map/battle.c | 4 +++- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/Changelog-Trunk.txt b/Changelog-Trunk.txt index 16927dacc..d154d432c 100644 --- a/Changelog-Trunk.txt +++ b/Changelog-Trunk.txt @@ -4,6 +4,8 @@ AS OF SVN REV. 5091, WE ARE NOW USING TRUNK. ALL UNTESTED BUGFIXES/FEATURES GO IF YOU HAVE A WORKING AND TESTED BUGFIX PUT IT INTO STABLE AS WELL AS TRUNK. 2006/07/13 + * Reverted temporarily the Cart Termination equation until it can be + fixed... [Skotlex] * Fixed script command "recovery". [Skotlex] 2006/07/12 * Fixed a small typo in my code [Zido] diff --git a/src/map/battle.c b/src/map/battle.c index dacfbe015..cee888fe0 100644 --- a/src/map/battle.c +++ b/src/map/battle.c @@ -1426,7 +1426,9 @@ static struct Damage battle_calc_weapon_attack( if (i < 1) i = 1; //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; +// FIXME: Something is wrong with this check! But what...? [Skotlex] +// skillratio += (sd->cart_weight * 80000) / (i * sd->cart_max_weight) - 100; + skillratio += sd->cart_weight/i - 100; else if (!sd) skillratio += 80000 / i - 100; flag.cardfix = 0; -- cgit v1.2.3-70-g09d2