diff options
| author | celest <celest@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2005-03-29 15:23:08 +0000 |
|---|---|---|
| committer | celest <celest@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2005-03-29 15:23:08 +0000 |
| commit | 1a194c732064c612f23e55c6c0033ffea0303050 (patch) | |
| tree | 6badd615f887a0a019f182e886804e3d0fd51060 /src/map/battle.c | |
| parent | 371ce27789b684a49675c463ae31328985dbd0a0 (diff) | |
| download | hercules-1a194c732064c612f23e55c6c0033ffea0303050.tar.gz hercules-1a194c732064c612f23e55c6c0033ffea0303050.tar.bz2 hercules-1a194c732064c612f23e55c6c0033ffea0303050.tar.xz hercules-1a194c732064c612f23e55c6c0033ffea0303050.zip | |
* Updated damage calculation for Magnum Break
* Fixed #item not working properly
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/branches/stable@1331 54d463be-8e91-2dee-dedb-b68131a5f0ec
Diffstat (limited to 'src/map/battle.c')
| -rw-r--r-- | src/map/battle.c | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/src/map/battle.c b/src/map/battle.c index 25aae5ec0..46d84705c 100644 --- a/src/map/battle.c +++ b/src/map/battle.c @@ -740,7 +740,8 @@ static struct Damage battle_calc_pet_weapon_attack( hitrate = (hitrate*(100+5*skill_lv))/100; break; case SM_MAGNUM: // マグナムブレイク - damage = damage*(5*skill_lv + (wflag?65:115))/100; + damage = damage*(wflag > 1 ? 5*skill_lv+115 : 30*skill_lv+100)/100; + hitrate = (hitrate*(100+10*skill_lv))/100; break; case MC_MAMMONITE: // メマーナイト damage = damage*(100+ 50*skill_lv)/100; @@ -1236,7 +1237,8 @@ static struct Damage battle_calc_mob_weapon_attack( hitrate = (hitrate*(100+5*skill_lv))/100; break; case SM_MAGNUM: // マグナムブレイク - damage = damage*(5*skill_lv +(wflag?65:115))/100; + damage = damage*(wflag > 1 ? 5*skill_lv+115 : 30*skill_lv+100)/100; + hitrate = (hitrate*(100+10*skill_lv))/100; break; case MC_MAMMONITE: // メマーナイト damage = damage*(100+ 50*skill_lv)/100; @@ -1965,8 +1967,10 @@ static struct Damage battle_calc_pc_weapon_attack( hitrate = (hitrate*(100+5*skill_lv))/100; break; case SM_MAGNUM: // マグナムブレイク - damage = damage*(5*skill_lv +(wflag?65:115) )/100; - damage2 = damage2*(5*skill_lv +(wflag?65:115) )/100; + // 20*skill level+100? i think this will do for now [based on jRO info] + damage = damage*(wflag > 1 ? 5*skill_lv+115 : 30*skill_lv+100)/100; + damage2 = damage2*(wflag > 1 ? 5*skill_lv+115 : 30*skill_lv+100)/100; + hitrate = (hitrate*(100+10*skill_lv))/100; break; case MC_MAMMONITE: // メマーナイト damage = damage*(100+ 50*skill_lv)/100; |