Jelajahi Sumber

- Fixed giving the 100% damage bonus when no-splash-targets are found in the blown path to Grandcross instead of Bowling Bash. Bowling Bash damage equation becomes then +50*lv% rather than +40*lv% when there's no splash-damage (the 50*lv% figure is custom, all we know is that level 10 does 600% instead of 500% damage).

git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@7726 54d463be-8e91-2dee-dedb-b68131a5f0ec
skotlex 19 tahun lalu
induk
melakukan
4cb1768c78
2 mengubah file dengan 9 tambahan dan 3 penghapusan
  1. 6 0
      Changelog-Trunk.txt
  2. 3 3
      src/map/battle.c

+ 6 - 0
Changelog-Trunk.txt

@@ -3,6 +3,12 @@ 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.
 
+2006/07/18
+	* Fixed giving the 100% damage bonus when no-splash-targets are found in
+	  the blown path to Grandcross instead of Bowling Bash. Bowling Bash damage
+	  equation becomes then +50*lv% rather than +40*lv% when there's no
+	  splash-damage (the 50*lv% figure is custom, all we know is that level 10
+	  does 600% instead of 500% damage). [Skotlex]
 2006/07/17
 	* Updated mob_db.sql to current mob_db.txt data. [Skotlex]
 	* The char-server will allow off-line character saves when said char is

+ 3 - 3
src/map/battle.c

@@ -1282,7 +1282,8 @@ static struct Damage battle_calc_weapon_attack(
 					break;
 				}
 				case KN_BOWLINGBASH:
-					skillratio+= 40*skill_lv;
+					//When mflag, this is a no-splash attack, damage gets a bonus of 100% at lv 10.
+					skillratio+= (wflag?50:40)*skill_lv;
 					break;
 				case KN_AUTOCOUNTER:
 				case LK_SPIRALPIERCE:
@@ -2335,8 +2336,7 @@ struct Damage battle_calc_magic_attack(
 		if(skill_num == CR_GRANDCROSS || skill_num == NPC_GRANDDARKNESS)
 		{	//Apply the physical part of the skill's damage. [Skotlex]
 			struct Damage wd = battle_calc_weapon_attack(src,target,skill_num,skill_lv,mflag);
-			//When mflag, this is a no-splash attack, damage gets a bonus of 100%
-			ad.damage = (wd.damage + ad.damage) * ((mflag?200:100) + 40*skill_lv)/100;
+			ad.damage = (wd.damage + ad.damage) * (100 + 40*skill_lv)/100;
 			if(src==target)
 			{
 				if (src->type == BL_PC)