summaryrefslogtreecommitdiff
path: root/src/map/battle.c
diff options
context:
space:
mode:
authorignizh <ignizh@54d463be-8e91-2dee-dedb-b68131a5f0ec>2012-06-16 01:34:17 +0000
committerignizh <ignizh@54d463be-8e91-2dee-dedb-b68131a5f0ec>2012-06-16 01:34:17 +0000
commita5a7861de13e54d62dcdeb667a18b70733256fef (patch)
tree90b79a6cae7c20a124c01251cdf2c04508ad4a5f /src/map/battle.c
parent54b84a5d7845efe40d3e06a12ac2f2c5ac0137e6 (diff)
downloadhercules-a5a7861de13e54d62dcdeb667a18b70733256fef.tar.gz
hercules-a5a7861de13e54d62dcdeb667a18b70733256fef.tar.bz2
hercules-a5a7861de13e54d62dcdeb667a18b70733256fef.tar.xz
hercules-a5a7861de13e54d62dcdeb667a18b70733256fef.zip
Fixed Enchant Deadly Poison effect hover skills that should have halved damage or should not be affected in RE mode(bugreport:5322)
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@16309 54d463be-8e91-2dee-dedb-b68131a5f0ec
Diffstat (limited to 'src/map/battle.c')
-rw-r--r--src/map/battle.c17
1 files changed, 14 insertions, 3 deletions
diff --git a/src/map/battle.c b/src/map/battle.c
index a6b422ccb..d52c8bcf8 100644
--- a/src/map/battle.c
+++ b/src/map/battle.c
@@ -2479,11 +2479,22 @@ static struct Damage battle_calc_weapon_attack(struct block_list *src,struct blo
#ifndef RENEWAL_EDP
// renewal EDP doesn't affect your final damage but your atk and weapon atk
if(sc->data[SC_EDP] &&
- skill_num != ASC_BREAKER &&
+ skill_num != AS_GRIMTOOTH &&
skill_num != ASC_METEORASSAULT &&
skill_num != AS_SPLASHER &&
- skill_num != AS_VENOMKNIFE)
- ATK_ADDRATE(sc->data[SC_EDP]->val3);
+ skill_num != AS_VENOMKNIFE &&
+ skill_num != AS_SONICBLOW &&
+ skill_num != ASC_BREAKER &&
+ skill_num != GC_COUNTERSLASH &&
+ skill_num != GC_CROSSIMPACT)
+ ATK_ADDRATE(sc->data[SC_EDP]->val3);
+ // Skills that have halved damage [Igniz]
+ if(sc->data[SC_EDP] &&
+ (skill_num == AS_SONICBLOW ||
+ skill_num == ASC_BREAKER ||
+ skill_num == GC_COUNTERSLASH ||
+ skill_num == GC_CROSSIMPACT))
+ ATK_RATE(50);
#endif
}