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

Fixes remaining status calculation flag issues (#6740)

Browse Source 
* Follow up to d739e8f and 302168d.
* Resolves the status_calc_bl_main call not properly assigning any sub status calculation effects based on any primary stat changes.
Thanks to @Singe-Horizontal!
This commit is contained in:
Aleos 2022-03-24 11:54:33 -04:00 committed by GitHub
parent d7ac7e98b9
commit 5a7d2dc2a1
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 40 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

67
src/map/status.cpp
View File

@ -4927,91 +4927,104 @@ void status_calc_bl_main(struct block_list *bl, std::bitset<SCB_MAX> flag)
if(flag[SCB_STR]) { if(flag[SCB_STR]) {
status->str = status_calc_str(bl, sc, b_status->str); status->str = status_calc_str(bl, sc, b_status->str);
flag|=SCB_BATK; flag.set(SCB_BATK);
if( bl->type&BL_HOM ) if( bl->type&BL_HOM )
flag |= SCB_WATK; flag.set(SCB_WATK);
} }
if(flag[SCB_AGI]) { if(flag[SCB_AGI]) {
status->agi = status_calc_agi(bl, sc, b_status->agi); status->agi = status_calc_agi(bl, sc, b_status->agi);
flag|=SCB_FLEE flag.set(SCB_FLEE);
#ifdef RENEWAL #ifdef RENEWAL
|SCB_DEF2 flag.set(SCB_DEF2);
#endif #endif
; if( bl->type&(BL_PC|BL_HOM) ) {
if( bl->type&(BL_PC|BL_HOM) ) flag.set(SCB_ASPD);
flag |= SCB_ASPD|SCB_DSPD; flag.set(SCB_DSPD);
}
} }
if(flag[SCB_VIT]) { if(flag[SCB_VIT]) {
status->vit = status_calc_vit(bl, sc, b_status->vit); status->vit = status_calc_vit(bl, sc, b_status->vit);
flag|=SCB_DEF2|SCB_MDEF2; flag.set(SCB_DEF2);
flag.set(SCB_MDEF2);
if( bl->type&(BL_PC|BL_HOM|BL_MER|BL_ELEM) ) if( bl->type&(BL_PC|BL_HOM|BL_MER|BL_ELEM) )
flag |= SCB_MAXHP; flag.set(SCB_MAXHP);
if( bl->type&BL_HOM ) if( bl->type&BL_HOM )
flag |= SCB_DEF; flag.set(SCB_DEF);
} }
if(flag[SCB_INT]) { if(flag[SCB_INT]) {
status->int_ = status_calc_int(bl, sc, b_status->int_); status->int_ = status_calc_int(bl, sc, b_status->int_);
flag|=SCB_MATK|SCB_MDEF2; flag.set(SCB_MATK);
flag.set(SCB_MDEF2);
if( bl->type&(BL_PC|BL_HOM|BL_MER|BL_ELEM) ) if( bl->type&(BL_PC|BL_HOM|BL_MER|BL_ELEM) )
flag |= SCB_MAXSP; flag.set(SCB_MAXSP);
if( bl->type&BL_HOM ) if( bl->type&BL_HOM )
flag |= SCB_MDEF; flag.set(SCB_MDEF);
} }
if(flag[SCB_DEX]) { if(flag[SCB_DEX]) {
status->dex = status_calc_dex(bl, sc, b_status->dex); status->dex = status_calc_dex(bl, sc, b_status->dex);
flag|=SCB_BATK|SCB_HIT flag.set(SCB_BATK);
flag.set(SCB_HIT);
#ifdef RENEWAL #ifdef RENEWAL
|SCB_MATK|SCB_MDEF2 flag.set(SCB_MATK);
flag.set(SCB_MDEF2);
#endif #endif
;
if( bl->type&(BL_PC|BL_HOM) ) if( bl->type&(BL_PC|BL_HOM) )
flag |= SCB_ASPD; flag.set(SCB_ASPD);
if( bl->type&BL_HOM ) if( bl->type&BL_HOM )
flag |= SCB_WATK; flag.set(SCB_WATK);
} }
if(flag[SCB_LUK]) { if(flag[SCB_LUK]) {
status->luk = status_calc_luk(bl, sc, b_status->luk); status->luk = status_calc_luk(bl, sc, b_status->luk);
flag|=SCB_BATK|SCB_CRI|SCB_FLEE2 flag.set(SCB_BATK);
flag.set(SCB_CRI);
flag.set(SCB_FLEE2);
#ifdef RENEWAL #ifdef RENEWAL
|SCB_MATK|SCB_HIT|SCB_FLEE flag.set(SCB_MATK);
flag.set(SCB_HIT);
flag.set(SCB_FLEE);
#endif #endif
;
} }
#ifdef RENEWAL #ifdef RENEWAL
if (flag[SCB_POW]) { if (flag[SCB_POW]) {
status->pow = status_calc_pow(bl, sc, b_status->pow); status->pow = status_calc_pow(bl, sc, b_status->pow);
flag |= SCB_BATK|SCB_PATK; flag.set(SCB_BATK);
flag.set(SCB_PATK);
} }
if (flag[SCB_STA]) { if (flag[SCB_STA]) {
status->sta = status_calc_sta(bl, sc, b_status->sta); status->sta = status_calc_sta(bl, sc, b_status->sta);
flag |= SCB_RES; flag.set(SCB_RES);
} }
if (flag[SCB_WIS]) { if (flag[SCB_WIS]) {
status->wis = status_calc_wis(bl, sc, b_status->wis); status->wis = status_calc_wis(bl, sc, b_status->wis);
flag |= SCB_MRES; flag.set(SCB_MRES);
} }
if (flag[SCB_SPL]) { if (flag[SCB_SPL]) {
status->spl = status_calc_spl(bl, sc, b_status->spl); status->spl = status_calc_spl(bl, sc, b_status->spl);
flag |= SCB_MATK|SCB_SMATK; flag.set(SCB_MATK);
flag.set(SCB_SMATK);
} }
if (flag[SCB_CON]) { if (flag[SCB_CON]) {
status->con = status_calc_con(bl, sc, b_status->con); status->con = status_calc_con(bl, sc, b_status->con);
flag |= SCB_HIT|SCB_FLEE|SCB_PATK|SCB_SMATK; flag.set(SCB_HIT);
flag.set(SCB_FLEE);
flag.set(SCB_PATK);
flag.set(SCB_SMATK);
} }
if (flag[SCB_CRT]) { if (flag[SCB_CRT]) {
status->crt = status_calc_crt(bl, sc, b_status->crt); status->crt = status_calc_crt(bl, sc, b_status->crt);
flag |= SCB_HPLUS|SCB_CRATE; flag.set(SCB_HPLUS);
flag.set(SCB_CRATE);
} }
#endif #endif