diff options
| author | ignizh <ignizh@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2012-06-20 01:08:05 +0000 |
|---|---|---|
| committer | ignizh <ignizh@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2012-06-20 01:08:05 +0000 |
| commit | 1cf8506c4b51235a0e48cd7d55559062b782315f (patch) | |
| tree | 0fbca74e5143516faca0579ad28917d8e98215ee | |
| parent | 1fb98f406f4a1b230f9771fb13dcc2ef1a11bcd6 (diff) | |
| download | hercules-1cf8506c4b51235a0e48cd7d55559062b782315f.tar.gz hercules-1cf8506c4b51235a0e48cd7d55559062b782315f.tar.bz2 hercules-1cf8506c4b51235a0e48cd7d55559062b782315f.tar.xz hercules-1cf8506c4b51235a0e48cd7d55559062b782315f.zip | |
Follow up r16316 and bugreport:6047 - Fixed Enchant Deadly Poison damage on skills that should/shouln't have halved/affected damage on/in non RE mode, cleaned my temporal fix where i missed up non RE mode. For now Rolling Cutter will be non affected by EDP untill we have more info in order to avoid huge damage.
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@16322 54d463be-8e91-2dee-dedb-b68131a5f0ec
| -rw-r--r-- | src/map/battle.c | 39 |
1 files changed, 19 insertions, 20 deletions
diff --git a/src/map/battle.c b/src/map/battle.c index 47f465fcc..eaadf451c 100644 --- a/src/map/battle.c +++ b/src/map/battle.c @@ -2498,27 +2498,26 @@ 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] && - 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); + 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: + 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 + break; #endif + default: + ATK_ADDRATE(sc->data[SC_EDP]->val3); + } + } } switch (skill_num) { |