diff options
| author | xantara <xantara@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2012-02-22 02:08:57 +0000 |
|---|---|---|
| committer | xantara <xantara@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2012-02-22 02:08:57 +0000 |
| commit | a72cf01c7ca53a6ffc810a2b1983ad8b34ef0467 (patch) | |
| tree | c71953f31f482c7c542497b16f265ee5f6eae548 /src/map/battle.c | |
| parent | 25d71a5dcfbda1f3442982db42bd8d642db12833 (diff) | |
| download | hercules-a72cf01c7ca53a6ffc810a2b1983ad8b34ef0467.tar.gz hercules-a72cf01c7ca53a6ffc810a2b1983ad8b34ef0467.tar.bz2 hercules-a72cf01c7ca53a6ffc810a2b1983ad8b34ef0467.tar.xz hercules-a72cf01c7ca53a6ffc810a2b1983ad8b34ef0467.zip | |
Applied renewal skill changes: (bugreport:5302)
- Arrow Shower's attack power (50+10*SkillLvl)
- Wind Blade's MATK per hit (from 100% to 150%)
- Storm Gust's chance of freezing (65-5*SkillLvl)
- Land Mine, Blast Mine, Claymore Trap's damage formula
- Spear Quicken's ASPD (fixed 7), CRIT (3*SkillLvl) and FLEE (2*SkillLvl)
- Holy Cross's double damage with 2-handed spear
- Axe Mastery's damage increase also applies to Sword class weapons
- Spiral Pierce's weapon requirement (now allows swords)
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@15626 54d463be-8e91-2dee-dedb-b68131a5f0ec
Diffstat (limited to 'src/map/battle.c')
| -rw-r--r-- | src/map/battle.c | 43 |
1 files changed, 40 insertions, 3 deletions
diff --git a/src/map/battle.c b/src/map/battle.c index e9b9862a8..aa9bdbb62 100644 --- a/src/map/battle.c +++ b/src/map/battle.c @@ -892,12 +892,20 @@ int battle_addmastery(struct map_session_data *sd,struct block_list *target,int weapon = sd->weapontype2; switch(weapon) { - case W_DAGGER: case W_1HSWORD: + #if REMODE + if((skill = pc_checkskill(sd,AM_AXEMASTERY)) > 0) + damage += (skill * 3); + #endif + case W_DAGGER: if((skill = pc_checkskill(sd,SM_SWORD)) > 0) damage += (skill * 4); break; case W_2HSWORD: + #if REMODE + if((skill = pc_checkskill(sd,AM_AXEMASTERY)) > 0) + damage += (skill * 3); + #endif if((skill = pc_checkskill(sd,SM_TWOHAND)) > 0) damage += (skill * 4); break; @@ -1617,7 +1625,11 @@ static struct Damage battle_calc_weapon_attack(struct block_list *src,struct blo break; case AC_SHOWER: case MA_SHOWER: - skillratio += 5*skill_lv-25; + #if REMODE + skillratio += 50+10*skill_lv; + #else + skillratio += -25+5*skill_lv; + #endif break; case AC_CHARGEARROW: case MA_CHARGEARROW: @@ -1718,8 +1730,15 @@ static struct Damage battle_calc_weapon_attack(struct block_list *src,struct blo break; case NPC_DARKCROSS: case CR_HOLYCROSS: - skillratio += 35*skill_lv; + { + int ratio = 35*skill_lv; + #if REMODE + if(sd && sd->status.weapon == W_2HSPEAR) + ratio *= 2; + #endif + skillratio += ratio; break; + } case AM_DEMONSTRATION: skillratio += 20*skill_lv; break; @@ -3063,6 +3082,11 @@ struct Damage battle_calc_magic_attack(struct block_list *src,struct block_list case NJ_RAIGEKISAI: skillratio += 60 + 40*skill_lv; break; + #if REMODE + case NJ_HUUJIN: + skillratio += 50; + break; + #endif case NJ_KAMAITACHI: case NPC_ENERGYDRAIN: skillratio += 100*skill_lv; @@ -3472,6 +3496,18 @@ struct Damage battle_calc_misc_attack(struct block_list *src,struct block_list * switch( skill_num ) { +#if REMODE + case HT_LANDMINE: + case MA_LANDMINE: + case HT_BLASTMINE: + case HT_CLAYMORETRAP: + { + int level = sd?sd->status.base_level:status_get_lv(src); + md.damage = skill_lv*sstatus->dex*(3+level/100)*(1+sstatus->int_/35); + md.damage+= md.damage*(rand()%20-10)/100; + md.damage+= 40*(sd?pc_checkskill(sd,RA_RESEARCHTRAP):0); + } +#else case HT_LANDMINE: case MA_LANDMINE: md.damage=skill_lv*(sstatus->dex+75)*(100+sstatus->int_)/100; @@ -3482,6 +3518,7 @@ struct Damage battle_calc_misc_attack(struct block_list *src,struct block_list * case HT_CLAYMORETRAP: md.damage=skill_lv*(sstatus->dex/2+75)*(100+sstatus->int_)/100; break; +#endif case HT_BLITZBEAT: case SN_FALCONASSAULT: //Blitz-beat Damage. |