Mirroristas/rathena
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Follow up r16316 and bugreport:6047 - Fixed Enchant Deadly Poison damage on skills that should/shouln't have halved/affected damage on RE mode.

Browse Source 
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@16321 54d463be-8e91-2dee-dedb-b68131a5f0ec
This commit is contained in:
ignizh 2012-06-19 23:04:20 +00:00
parent ceb2ecfc7a
commit cd16317a46
1 changed files with 19 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
src/map/battle.c
View File

@ -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 == CR_SHIELDBOOMERANG || skill_num == PA_SHIELDCHAIN ||
skill_num == LG_SHIELDPRESS ) ) skill_num == LG_SHIELDPRESS ) )
ATK_ADDRATE(sc->data[SC_GLOOMYDAY_SK]->val2); 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 // renewal EDP doesn't affect your final damage but your atk and weapon atk
if( sc->data[SC_EDP] ){ if(sc->data[SC_EDP] &&
switch(skill_num){ skill_num != AS_GRIMTOOTH &&
case AS_SPLASHER: case AS_VENOMKNIFE: break; skill_num != ASC_METEORASSAULT &&
#ifndef RENEWAL_EDP skill_num != AS_SPLASHER &&
case ASC_BREAKER: case ASC_METEORASSAULT: break; skill_num != AS_VENOMKNIFE &&
#else skill_num != AS_SONICBLOW &&
case AS_SONICBLOW: skill_num != ASC_BREAKER &&
case ASC_BREAKER: skill_num != GC_COUNTERSLASH &&
case GC_COUNTERSLASH: skill_num != GC_CROSSIMPACT)
case GC_CROSSIMPACT:
ATK_RATE(50); // only modifier is halved but still benefit with the damage bonus
#endif
default:
ATK_ADDRATE(sc->data[SC_EDP]->val3); ATK_ADDRATE(sc->data[SC_EDP]->val3);
} #endif
}
} }
switch (skill_num) { switch (skill_num) {