Mirroristas/rathena
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Follow up to 083cf5d

Browse Source 
- Fixed MATK calculation for pre-renewal.
- Resolved compile warnings.
This commit is contained in:
aleos89 2015-02-11 09:56:44 -05:00
parent abc78e51f7
commit 831dcc2608
1 changed files with 8 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/map/status.c
View File

@ -4475,12 +4475,7 @@ void status_calc_bl_main(struct block_list *bl, /*enum scb_flag*/int flag)
break; break;
case BL_HOM: case BL_HOM:
if ((bl->type&BL_HOM && battle_config.hom_setting&HOMSET_SAME_MATK) /// Hom Min Matk is always the same as Max Matk status->matk_min += (status_get_homint(bl) + status_get_homdex(bl)) / 5;
|| (sc && sc->data[SC_RECOGNIZEDSPELL]))
status->matk_min = status->matk_max;
else
status->matk_min += (status_get_homint(bl) + status_get_homdex(bl)) / 5;
status->matk_max += (status_get_homluk(bl) + status_get_homint(bl) + status_get_homdex(bl)) / 3; status->matk_max += (status_get_homluk(bl) + status_get_homint(bl) + status_get_homdex(bl)) / 3;
break; break;
@ -4488,11 +4483,6 @@ void status_calc_bl_main(struct block_list *bl, /*enum scb_flag*/int flag)
status->matk_min += 70 * ((TBL_MOB*)bl)->status.rhw.atk2 / 100; status->matk_min += 70 * ((TBL_MOB*)bl)->status.rhw.atk2 / 100;
status->matk_max += 130 * ((TBL_MOB*)bl)->status.rhw.atk2 / 100; status->matk_max += 130 * ((TBL_MOB*)bl)->status.rhw.atk2 / 100;
break; break;
default:
status->matk_max = status_calc_matk(bl, sc, status->matk_max);
status->matk_min = status_calc_matk(bl, sc, status->matk_min);
break;
} }
#endif #endif
if (bl->type&BL_PC && sd->matk_rate != 100) { if (bl->type&BL_PC && sd->matk_rate != 100) {
@ -4500,12 +4490,19 @@ void status_calc_bl_main(struct block_list *bl, /*enum scb_flag*/int flag)
status->matk_min = status->matk_min * sd->matk_rate/100; status->matk_min = status->matk_min * sd->matk_rate/100;
} }
if ((bl->type&BL_HOM && battle_config.hom_setting&HOMSET_SAME_MATK) /// Hom Min Matk is always the same as Max Matk
|| (sc && sc->data[SC_RECOGNIZEDSPELL]))
status->matk_min = status->matk_max;
#ifdef RENEWAL #ifdef RENEWAL
if( sd && sd->right_weapon.overrefine > 0) { if( sd && sd->right_weapon.overrefine > 0) {
status->matk_min++; status->matk_min++;
status->matk_max += sd->right_weapon.overrefine - 1; status->matk_max += sd->right_weapon.overrefine - 1;
} }
#endif #endif
status->matk_max = status_calc_matk(bl, sc, status->matk_max);
status->matk_min = status_calc_matk(bl, sc, status->matk_min);
} }
if(flag&SCB_ASPD) { if(flag&SCB_ASPD) {