summaryrefslogtreecommitdiff
path: root/src/map/battle.c
diff options
context:
space:
mode:
authorInkfish <Inkfish@54d463be-8e91-2dee-dedb-b68131a5f0ec>2009-07-04 03:54:58 +0000
committerInkfish <Inkfish@54d463be-8e91-2dee-dedb-b68131a5f0ec>2009-07-04 03:54:58 +0000
commit194db7969cd18c1611a7bcb244d1d26d4fb2eac7 (patch)
tree6ebd5e06e976d176f9fa099b5e4838e42d659898 /src/map/battle.c
parentfd6b626d09cdac0ee1c4d1b5d223a13555c4159a (diff)
downloadhercules-194db7969cd18c1611a7bcb244d1d26d4fb2eac7.tar.gz
hercules-194db7969cd18c1611a7bcb244d1d26d4fb2eac7.tar.bz2
hercules-194db7969cd18c1611a7bcb244d1d26d4fb2eac7.tar.xz
hercules-194db7969cd18c1611a7bcb244d1d26d4fb2eac7.zip
* 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://rathena.svn.sourceforge.net/svnroot/rathena/trunk@13929 54d463be-8e91-2dee-dedb-b68131a5f0ec
Diffstat (limited to 'src/map/battle.c')
-rw-r--r--src/map/battle.c6
1 files changed, 5 insertions, 1 deletions
diff --git a/src/map/battle.c b/src/map/battle.c
index 3e0a9556e..68d04d135 100644
--- a/src/map/battle.c
+++ b/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;