Selaa lähdekoodia

* Martyr's Reckoning can be perfect dodged.
* Casting Flying Kick while running and in the spurt status doubles the damage dealt without spurt status. (bugreport:1898)
- TODO: bonus on running is still not correct.


git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@13929 54d463be-8e91-2dee-dedb-b68131a5f0ec

Inkfish 16 vuotta sitten
vanhempi
commit
ef5faf1479
2 muutettua tiedostoa jossa 9 lisäystä ja 1 poistoa
  1. 4 0
      Changelog-Trunk.txt
  2. 5 1
      src/map/battle.c

+ 4 - 0
Changelog-Trunk.txt

@@ -3,6 +3,10 @@ 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.
 
+09/07/03
+	* Martyr's Reckoning can be perfect dodged. [Inkfish]
+	* Casting Flying Kick while running and in the spurt status doubles the damage dealt without spurt status. (bugreport:1898) [Inkfish]
+	- TODO: bonus on running is still not correct.
 09/07/02
 	* Updated autobonus [Inkfish]
 	- added documentation for autobonus.

+ 5 - 1
src/map/battle.c

@@ -1031,7 +1031,7 @@ static struct Damage battle_calc_weapon_attack(struct block_list *src,struct blo
 	} else //Range for normal attacks.
 		wd.flag |= flag.arrow?BF_LONG:BF_SHORT;
 	
-	if (!skill_num && tstatus->flee2 && rand()%1000 < tstatus->flee2)
+	if ( (!skill_num || skill_num == PA_SACRIFICE) && tstatus->flee2 && rand()%1000 < tstatus->flee2 )
 	{	//Check for Lucky Dodge
 		wd.type=0x0b;
 		wd.dmg_lv=ATK_LUCKY;
@@ -1614,7 +1614,11 @@ static struct Damage battle_calc_weapon_attack(struct block_list *src,struct blo
 					if (sc && sc->data[SC_COMBO] && sc->data[SC_COMBO]->val1 == skill_num)
 						skillratio += 10*status_get_lv(src)/3; //Tumble bonus
 					if (wflag)
+					{
 						skillratio += 10*status_get_lv(src)/3; //Running bonus (TODO: What is the real bonus?)
+						if( sc && sc->data[SC_SPURT] )  // Spurt bonus
+							skillratio *= 2;
+					}
 					break;
 				case GS_TRIPLEACTION:
 					skillratio += 50*skill_lv;