summaryrefslogtreecommitdiff
path: root/src/map
diff options
context:
space:
mode:
authorskotlex <skotlex@54d463be-8e91-2dee-dedb-b68131a5f0ec>2006-07-18 12:43:17 +0000
committerskotlex <skotlex@54d463be-8e91-2dee-dedb-b68131a5f0ec>2006-07-18 12:43:17 +0000
commit625630e64fe10dd9d46b87c742efbf47bff497da (patch)
treefc3c5ab9cf1b4130dc1c0d38fb71af0f7fce70ed /src/map
parent487155b16f73ecc5477355fea50816c63b83fa80 (diff)
downloadhercules-625630e64fe10dd9d46b87c742efbf47bff497da.tar.gz
hercules-625630e64fe10dd9d46b87c742efbf47bff497da.tar.bz2
hercules-625630e64fe10dd9d46b87c742efbf47bff497da.tar.xz
hercules-625630e64fe10dd9d46b87c742efbf47bff497da.zip
- 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://rathena.svn.sourceforge.net/svnroot/rathena/trunk@7726 54d463be-8e91-2dee-dedb-b68131a5f0ec
Diffstat (limited to 'src/map')
-rw-r--r--src/map/battle.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/map/battle.c b/src/map/battle.c
index 280d4df77..361d93ed3 100644
--- a/src/map/battle.c
+++ b/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)