diff options
| author | rud0lp20 <rud0lp20@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2012-09-10 16:32:06 +0000 |
|---|---|---|
| committer | rud0lp20 <rud0lp20@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2012-09-10 16:32:06 +0000 |
| commit | b970380ed01b23c948c6cc1b9fc9e8f8a2deca53 (patch) | |
| tree | 4535f49b3c7c9ad0d9869fb8f4b3288d770757e2 /src/map/battle.c | |
| parent | d8bd7d857896c04afb43b4c7012735a09b9644f7 (diff) | |
| download | hercules-b970380ed01b23c948c6cc1b9fc9e8f8a2deca53.tar.gz hercules-b970380ed01b23c948c6cc1b9fc9e8f8a2deca53.tar.bz2 hercules-b970380ed01b23c948c6cc1b9fc9e8f8a2deca53.tar.xz hercules-b970380ed01b23c948c6cc1b9fc9e8f8a2deca53.zip | |
Fixed bugreport:6650 where WZ_QUAGMIRE affects caster in non PK map.
Fixed bugreport:6635 where SO_FIREWALK & SO_ELECTRIC walk still active after changing map.
Updated EDP to it's Renewal damage formula bonus.
NOTE: result damage still quite huge than official since renewal atk is not yet fully implemented.
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@16770 54d463be-8e91-2dee-dedb-b68131a5f0ec
Diffstat (limited to 'src/map/battle.c')
| -rw-r--r-- | src/map/battle.c | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/src/map/battle.c b/src/map/battle.c index a3a097c92..c48f4ce63 100644 --- a/src/map/battle.c +++ b/src/map/battle.c @@ -2632,10 +2632,9 @@ static struct Damage battle_calc_weapon_attack(struct block_list *src,struct blo skill_num == LG_SHIELDPRESS ) ) ATK_ADDRATE(sc->data[SC_GLOOMYDAY_SK]->val2); if( sc->data[SC_EDP] ){ - // FIX ME: Should Rolling Cutter be affected by EDP? switch(skill_num){ case AS_SPLASHER: case AS_VENOMKNIFE: - case AS_GRIMTOOTH: case GC_ROLLINGCUTTER: + case AS_GRIMTOOTH: break; #ifndef RENEWAL_EDP case ASC_BREAKER: case ASC_METEORASSAULT: break; @@ -3070,7 +3069,12 @@ static struct Damage battle_calc_weapon_attack(struct block_list *src,struct blo if( wd.flag&BF_LONG ) cardfix = cardfix * ( 100 + sd->bonus.long_attack_atk_rate ) / 100; - +#ifdef RENEWAL_EDP + if( sc && sc->data[SC_EDP] ){ + cardfix = cardfix * (100 + sc->data[SC_EDP]->val1 * 60 ) / 100; + cardfix_ = cardfix_ * (100 + sc->data[SC_EDP]->val1 * 60 ) / 100; + } +#endif if( cardfix != 1000 || cardfix_ != 1000 ) ATK_RATE2(cardfix/10, cardfix_/10); //What happens if you use right-to-left and there's no right weapon, only left? } |