summaryrefslogtreecommitdiff
path: root/src/map
diff options
context:
space:
mode:
authorignizh <ignizh@54d463be-8e91-2dee-dedb-b68131a5f0ec>2012-06-19 23:04:20 +0000
committerignizh <ignizh@54d463be-8e91-2dee-dedb-b68131a5f0ec>2012-06-19 23:04:20 +0000
commit1fb98f406f4a1b230f9771fb13dcc2ef1a11bcd6 (patch)
treef3d69a0670cac9ae4d43d81cae569b47a1620fae /src/map
parenta359f1f247f8614a05874a36417852c30d54c733 (diff)
downloadhercules-1fb98f406f4a1b230f9771fb13dcc2ef1a11bcd6.tar.gz
hercules-1fb98f406f4a1b230f9771fb13dcc2ef1a11bcd6.tar.bz2
hercules-1fb98f406f4a1b230f9771fb13dcc2ef1a11bcd6.tar.xz
hercules-1fb98f406f4a1b230f9771fb13dcc2ef1a11bcd6.zip
Follow up r16316 and bugreport:6047 - Fixed Enchant Deadly Poison damage on skills that should/shouln't have halved/affected damage on RE mode.
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@16321 54d463be-8e91-2dee-dedb-b68131a5f0ec
Diffstat (limited to 'src/map')
-rw-r--r--src/map/battle.c34
1 files changed, 19 insertions, 15 deletions
diff --git a/src/map/battle.c b/src/map/battle.c
index 488a1d38e..47f465fcc 100644
--- a/src/map/battle.c
+++ b/src/map/battle.c
@@ -2498,23 +2498,27 @@ static struct Damage battle_calc_weapon_attack(struct block_list *src,struct blo
skill_num == CR_SHIELDBOOMERANG || skill_num == PA_SHIELDCHAIN ||
skill_num == LG_SHIELDPRESS ) )
ATK_ADDRATE(sc->data[SC_GLOOMYDAY_SK]->val2);
+#ifdef RENEWAL_EDP
+ // First, we halve the damage, then we apply the atk & weapon atk bonus. [Igniz]
+ // Skills that have halved damage
+ if(sc->data[SC_EDP] &&
+ (skill_num == AS_SONICBLOW ||
+ skill_num == ASC_BREAKER ||
+ skill_num == GC_COUNTERSLASH ||
+ skill_num == GC_CROSSIMPACT))
+ ATK_RATE(50);
// renewal EDP doesn't affect your final damage but your atk and weapon atk
- if( sc->data[SC_EDP] ){
- switch(skill_num){
- case AS_SPLASHER: case AS_VENOMKNIFE: break;
-#ifndef RENEWAL_EDP
- case ASC_BREAKER: case ASC_METEORASSAULT: break;
-#else
- case AS_SONICBLOW:
- case ASC_BREAKER:
- case GC_COUNTERSLASH:
- case GC_CROSSIMPACT:
- ATK_RATE(50); // only modifier is halved but still benefit with the damage bonus
-#endif
- default:
+ if(sc->data[SC_EDP] &&
+ skill_num != AS_GRIMTOOTH &&
+ skill_num != ASC_METEORASSAULT &&
+ skill_num != AS_SPLASHER &&
+ 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);
- }
- }
+#endif
}
switch (skill_num) {