diff options
| author | shadow <shadow@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2008-06-10 16:09:16 +0000 |
|---|---|---|
| committer | shadow <shadow@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2008-06-10 16:09:16 +0000 |
| commit | c81fe7d47a39ab1a6bfe95549aa4bc4153f98f2b (patch) | |
| tree | 3f66173c2d02891e1d2992cfb805c064217d6711 | |
| parent | a72a01810966c4be3d25323a407d044916d62687 (diff) | |
| download | hercules-c81fe7d47a39ab1a6bfe95549aa4bc4153f98f2b.tar.gz hercules-c81fe7d47a39ab1a6bfe95549aa4bc4153f98f2b.tar.bz2 hercules-c81fe7d47a39ab1a6bfe95549aa4bc4153f98f2b.tar.xz hercules-c81fe7d47a39ab1a6bfe95549aa4bc4153f98f2b.zip | |
Fixed double attack working with unarmed attacks, as reported by Lone Wolf.
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@12809 54d463be-8e91-2dee-dedb-b68131a5f0ec
| -rw-r--r-- | Changelog-Trunk.txt | 3 | ||||
| -rw-r--r-- | src/map/battle.c | 3 |
2 files changed, 5 insertions, 1 deletions
diff --git a/Changelog-Trunk.txt b/Changelog-Trunk.txt index 2a18ed491..99ce42486 100644 --- a/Changelog-Trunk.txt +++ b/Changelog-Trunk.txt @@ -3,8 +3,11 @@ Date Added AS OF SVN REV. 5091, WE ARE NOW USING TRUNK. ALL UNTESTED BUGFIXES/FEATURES GO INTO TRUNK. IF YOU HAVE A WORKING AND TESTED BUGFIX PUT IT INTO STABLE AS WELL AS TRUNK. + 2008/06/10 + * Fixed double attack working with unarmed attacks, as reported by Lone Wolf. [Brainstorm] * Added experimental code to set the socket limit at runtime. [FlavioJS] + 2008/06/09 * Fixed SN_SHARPSHOOTING doing 100% atk less damage than it should, bugreport:1654 * Fixed Active Guild skills not working when WoE is OFF, follow up on r12770, bugreport:1653 and bugreport:1637 diff --git a/src/map/battle.c b/src/map/battle.c index 76a6b606f..a1f9f6e8b 100644 --- a/src/map/battle.c +++ b/src/map/battle.c @@ -1964,7 +1964,8 @@ static struct Damage battle_calc_weapon_attack(struct block_list *src,struct blo if(sd && !skill_num && !flag.cri) { //Check for double attack. - if(((skill_lv = pc_checkskill(sd,TF_DOUBLE)) > 0 && sd->weapontype1 == W_DAGGER) || sd->double_rate > 0) + if(((skill_lv = pc_checkskill(sd,TF_DOUBLE)) > 0 && sd->weapontype1 == W_DAGGER) + ||(sd->double_rate > 0 && sd->weapontype1 != W_FIST)) //Will fail bare-handed { //Success chance is not added, the higher one is used [Skotlex] if (rand()%100 < (5*skill_lv>sd->double_rate?5*skill_lv:sd->double_rate)) { |