From 422787c9b466f9104650bf8d97021883c3857955 Mon Sep 17 00:00:00 2001 From: skotlex Date: Fri, 18 Aug 2006 21:15:06 +0000 Subject: - Fixed the atk_rate (Turtle General Card) bonus not working on dual-wielders. git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@8354 54d463be-8e91-2dee-dedb-b68131a5f0ec --- Changelog-Trunk.txt | 2 ++ src/map/battle.c | 4 ++-- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/Changelog-Trunk.txt b/Changelog-Trunk.txt index 288d6d4ea..a1669e5b1 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/08/18 + * Fixed the atk_rate (Turtle General Card) bonus not working on + dual-wielders. [Skotlex] * Made HLIF_HEAL a self skill that auto-selects target to caster's master. [Skotlex] * Implemented SC_BLOODLUST and SC_CHANGE, cleaned up HLIF_CHANGE [Skotlex] diff --git a/src/map/battle.c b/src/map/battle.c index fbe9fcfba..0376a2ac3 100644 --- a/src/map/battle.c +++ b/src/map/battle.c @@ -1230,8 +1230,8 @@ static struct Damage battle_calc_weapon_attack( //Add any bonuses that modify the base baseatk+watk (pre-skills) if(sd) { - if (sd->status.weapon < MAX_WEAPON_TYPE && (sd->atk_rate != 100 || sd->weapon_atk_rate[sd->status.weapon] != 0)) - ATK_RATE(sd->atk_rate + sd->weapon_atk_rate[sd->status.weapon]); + if ((sd->atk_rate != 100 || sd->weapon_atk_rate[sd->weapontype1] != 0)) + ATK_RATE(sd->atk_rate + sd->weapon_atk_rate[sd->weapontype1]); if(flag.cri && sd->crit_atk_rate) ATK_ADDRATE(sd->crit_atk_rate); -- cgit v1.2.3-60-g2f50