- Musical Lessons now increases Dissonance damage by [dissonance_lv * musical_lesson_lv] in pre-re - Musical Lessons now increases Ugly Dance damage by [dissonance_lv * musical_lesson_lv] in pre-re - Fixes #9187
@@ -9628,9 +9628,8 @@ struct Damage battle_calc_misc_attack(struct block_list *src,struct block_list *
break;
#ifndef RENEWAL
case BA_DISSONANCE:
- md.damage = 30 + skill_lv * 10;
- if (sd)
- md.damage += 3 * pc_checkskill(sd,BA_MUSICALLESSON);
+ md.damage = 30 + 10 * skill_lv;
+ md.damage += skill_lv * pc_checkskill(sd, BA_MUSICALLESSON);
#endif
case NPC_SELFDESTRUCTION:
@@ -1629,12 +1629,7 @@ int32 skill_additional_effect( struct block_list* src, struct block_list *bl, ui
#else
case DC_UGLYDANCE: {
int32 rate = 5 + 5 * skill_lv;
- int32 skill = pc_checkskill( sd, DC_DANCINGLESSON );
-
- if( skill > 0 ){
- rate += 5 + skill;
- }
+ rate += skill_lv * pc_checkskill(sd, DC_DANCINGLESSON);
status_zap( bl, 0, rate );
} break;