Explorar el Código

Fixed double attack working with unarmed attacks, as reported by Lone Wolf.

git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@12809 54d463be-8e91-2dee-dedb-b68131a5f0ec
shadow hace 17 años
padre
commit
91f75e6d21
Se han modificado 2 ficheros con 5 adiciones y 1 borrados
  1. 3 0
      Changelog-Trunk.txt
  2. 2 1
      src/map/battle.c

+ 3 - 0
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

+ 2 - 1
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))
 			{