diff options
| author | skotlex <skotlex@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2007-01-24 14:44:14 +0000 |
|---|---|---|
| committer | skotlex <skotlex@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2007-01-24 14:44:14 +0000 |
| commit | cd075dd33186145e46c1fb76be879617343db75c (patch) | |
| tree | 617d1b101d6e5cb80b0f116e6b75f8a8c9b8a99f /src/map/battle.c | |
| parent | 1407fa930fd4be0eb22ab3757b0f41b0a63c2a64 (diff) | |
| download | hercules-cd075dd33186145e46c1fb76be879617343db75c.tar.gz hercules-cd075dd33186145e46c1fb76be879617343db75c.tar.bz2 hercules-cd075dd33186145e46c1fb76be879617343db75c.tar.xz hercules-cd075dd33186145e46c1fb76be879617343db75c.zip | |
- Cleaned up some more the Joint Beat implementation, so the status don't take effect until the attack connects.
- Some minor cleanups.
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@9704 54d463be-8e91-2dee-dedb-b68131a5f0ec
Diffstat (limited to 'src/map/battle.c')
| -rw-r--r-- | src/map/battle.c | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/src/map/battle.c b/src/map/battle.c index aec804b3d..e65fd0da7 100644 --- a/src/map/battle.c +++ b/src/map/battle.c @@ -1481,7 +1481,10 @@ static struct Damage battle_calc_weapon_attack( skillratio += 40*skill_lv; break; case LK_JOINTBEAT: - skillratio += 10*skill_lv-50; + i = 10*skill_lv-50; + // Although not clear, it's being assumed that the 2x damage is only for the break neck ailment. + if (wflag&BREAK_NECK) i*=2; + skillratio += i; break; case ASC_METEORASSAULT: skillratio += 40*skill_lv-60; @@ -2079,10 +2082,6 @@ static struct Damage battle_calc_weapon_attack( { //Breaker's int-based damage (a misc attack?) struct Damage md = battle_calc_misc_attack(src, target, skill_num, skill_lv, wflag); wd.damage += md.damage; - } else if( skill_num == LK_JOINTBEAT && wflag&BREAK_NECK ) { - //##TODO should this be here?[FlavioJS] - // Although not clear, it's being assumed that the 2x damage is only for the break neck ailment. - wd.damage *= 2; // 2x damage when breaking neck } if (wd.damage || wd.damage2) { |