diff options
Diffstat (limited to 'src/map/battle.c')
| -rw-r--r-- | src/map/battle.c | 17 |
1 files changed, 7 insertions, 10 deletions
diff --git a/src/map/battle.c b/src/map/battle.c index 74db9f7c6..aff678365 100644 --- a/src/map/battle.c +++ b/src/map/battle.c @@ -2091,19 +2091,16 @@ static struct Damage battle_calc_weapon_attack(struct block_list *src,struct blo RE_LVL_DMOD(100); break; case RK_HUNDREDSPEAR: - skillratio += 500 + (80 * skill_lv) + (50 * pc_checkskill(sd,LK_SPIRALPIERCE)); + skillratio += 500 + (80 * skill_lv); if( sd ) { short index = sd->equip_index[EQI_HAND_R]; - if( index >= 0 && sd->inventory_data[index] && sd->inventory_data[index]->type == IT_WEAPON ) - { - short spearwbd = 1000 - sd->inventory_data[index]->weight / 10;// Spear Weight Bonus Damage. - if ( spearwbd < 0 ) - spearwbd = 0;// If weight of weapon is more then 1000, bonus is set to 0 to prevent negative value. [Rytech] - skillratio += spearwbd; - } - } - RE_LVL_DMOD(100); + if( index >= 0 && sd->inventory_data[index] + && sd->inventory_data[index]->type == IT_WEAPON ) + skillratio += max(10000 - sd->inventory_data[index]->weight, 0); + skillratio += 50 * pc_checkskill(sd,LK_SPIRALPIERCE); + } // (1 + [(Caster’s Base Level - 100) / 200]) + skillratio = skillratio * (100 + (status_get_lv(src)-100) / 2) / 100; break; case RK_WINDCUTTER: skillratio += 50 * skill_lv; |