summaryrefslogtreecommitdiff
path: root/src/map
diff options
context:
space:
mode:
authorcsnv <ctt@csnv.es>2014-12-27 04:48:09 +0100
committercsnv <ctt@csnv.es>2014-12-27 04:48:09 +0100
commit2ee1f3292ec7d7fe212bbac6bcab3ca88aae758e (patch)
tree0663fb1f1e477079bb9b9673fab93e3afb0744db /src/map
parentdbbdd34dd5d0f479591dcd377433cd9d6ffa3535 (diff)
downloadhercules-2ee1f3292ec7d7fe212bbac6bcab3ca88aae758e.tar.gz
hercules-2ee1f3292ec7d7fe212bbac6bcab3ca88aae758e.tar.bz2
hercules-2ee1f3292ec7d7fe212bbac6bcab3ca88aae758e.tar.xz
hercules-2ee1f3292ec7d7fe212bbac6bcab3ca88aae758e.zip
Fixes EDP for Grimtooth and Venom Knife. Bug report 6259: http://hercules.ws/board/tracker/issue-6259-edp-on-grimtooth-not-working-properly-pre-re/
Diffstat (limited to 'src/map')
-rw-r--r--src/map/battle.c8
1 files changed, 3 insertions, 5 deletions
diff --git a/src/map/battle.c b/src/map/battle.c
index f740d6518..bbb03eb1f 100644
--- a/src/map/battle.c
+++ b/src/map/battle.c
@@ -440,12 +440,12 @@ int64 battle_calc_weapon_damage(struct block_list *src, struct block_list *bl, u
if( sc && sc->count ){
if( sc->data[SC_ZENKAI] && watk->ele == sc->data[SC_ZENKAI]->val2 )
eatk += 200;
- #ifdef RENEWAL_EDP
+#ifdef RENEWAL_EDP
if( sc->data[SC_EDP] && skill_id != AS_GRIMTOOTH && skill_id != AS_VENOMKNIFE && skill_id != ASC_BREAKER ){
eatk = eatk * (sc->data[SC_EDP]->val4 / 100 - 1);
damage = damage * (sc->data[SC_EDP]->val4 / 100);
}
- #endif
+#endif
}
if( skill_id != ASC_METEORASSAULT ){
@@ -4880,10 +4880,8 @@ struct Damage battle_calc_weapon_attack(struct block_list *src,struct block_list
#ifndef RENEWAL_EDP
if( sc->data[SC_EDP] ){
switch(skill_id){
- case AS_SPLASHER:
- case AS_GRIMTOOTH:
+ case AS_SPLASHER: // Needs more info
case ASC_BREAKER:
- case AS_VENOMKNIFE:
case ASC_METEORASSAULT: break;
default:
ATK_ADDRATE(sc->data[SC_EDP]->val3);