diff options
| author | rud0lp20 <rud0lp20@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2012-06-25 11:54:35 +0000 |
|---|---|---|
| committer | rud0lp20 <rud0lp20@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2012-06-25 11:54:35 +0000 |
| commit | 388be58765c0527ef37d7858d606ab49cc9c5c41 (patch) | |
| tree | 2a209da768344f0d153f3d020bc44f0f085962e9 /src/map/battle.c | |
| parent | b0e526849f98004da6d21e50639d004072c3bed1 (diff) | |
| download | hercules-388be58765c0527ef37d7858d606ab49cc9c5c41.tar.gz hercules-388be58765c0527ef37d7858d606ab49cc9c5c41.tar.bz2 hercules-388be58765c0527ef37d7858d606ab49cc9c5c41.tar.xz hercules-388be58765c0527ef37d7858d606ab49cc9c5c41.zip | |
Fixed bugreport:5843 WL_HELLINFERNO should now deal 2 elemental(fire ad shadow) hits and updated its damage formula.
Fixed bugreport:6068 Cloaking/Hiding skills is now working to hide it self to non boss/detector monster.
Fixed bugreport:6105 Stone Curse should now stop target to attack once activated.
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@16346 54d463be-8e91-2dee-dedb-b68131a5f0ec
Diffstat (limited to 'src/map/battle.c')
| -rw-r--r-- | src/map/battle.c | 19 |
1 files changed, 10 insertions, 9 deletions
diff --git a/src/map/battle.c b/src/map/battle.c index c834312dd..69d54ad38 100644 --- a/src/map/battle.c +++ b/src/map/battle.c @@ -3513,11 +3513,12 @@ struct Damage battle_calc_magic_attack(struct block_list *src,struct block_list RE_LVL_DMOD(100); break; case WL_HELLINFERNO: - if( status_get_element(target) == ELE_FIRE ) - skillratio = 60 * skill_lv; - else - skillratio = 240 * skill_lv; - RE_LVL_DMOD(100); + skillratio = 300 * skill_lv; + RE_LVL_DMOD(100); + // Shadow: MATK [{( Skill Level x 300 ) x ( Caster’s Base Level / 100 ) x 4/5 }] % + // Fire : MATK [{( Skill Level x 300 ) x ( Caster’s Base Level / 100 ) /5 }] % + if( mflag&ELE_DARK ){ skillratio *= 4; s_ele = ELE_DARK; } + skillratio /= 5; break; case WL_COMET: { struct status_change * sc = status_get_sc(src); @@ -3560,10 +3561,10 @@ struct Damage battle_calc_magic_attack(struct block_list *src,struct block_list RE_LVL_DMOD(100); break; case LG_SHIELDSPELL:// [(Caster’s Base Level x 4) + (Shield MDEF x 100) + (Caster’s INT x 2)] % - if( sd ) { - skillratio = status_get_lv(src) * 4 + sd->bonus.shieldmdef * 100 + status_get_int(src) * 2; - } else - skillratio += 1900; //2000% + if( sd ) { + skillratio = status_get_lv(src) * 4 + sd->bonus.shieldmdef * 100 + status_get_int(src) * 2; + } else + skillratio += 1900; //2000% break; case WM_METALICSOUND: skillratio += 120 * skill_lv + 60 * ( sd? pc_checkskill(sd, WM_LESSON) : 10 ) - 100; |