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

Fixed a sign error in battle_calc_cardfix (#5285)

Browse Source 
Fixed #5273
Mistake introduced in 2e04ca98b0
Thanks to @ecdarreola
This commit is contained in:
Atemo 2020-08-04 01:40:05 +02:00 committed by GitHub
parent 47a1c7112d
commit d1be0ec6cb
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/map/battle.cpp
View File

@ -700,7 +700,7 @@ int battle_calc_cardfix(int attack_type, struct block_list *src, struct block_li
cardfix = cardfix * (100 - tsd->subsize[sstatus->size] - tsd->subsize[SZ_ALL]) / 100; cardfix = cardfix * (100 - tsd->subsize[sstatus->size] - tsd->subsize[SZ_ALL]) / 100;
cardfix = cardfix * (100 - tsd->magic_subsize[sstatus->size] - tsd->magic_subsize[SZ_ALL]) / 100; cardfix = cardfix * (100 - tsd->magic_subsize[sstatus->size] - tsd->magic_subsize[SZ_ALL]) / 100;
cardfix = cardfix * (100 - tsd->subrace2[s_race2]) / 100; cardfix = cardfix * (100 - tsd->subrace2[s_race2]) / 100;
int race_fix = tsd->subrace[sstatus->race] - tsd->subrace[RC_ALL]; int race_fix = tsd->subrace[sstatus->race] + tsd->subrace[RC_ALL];
for (const auto &it : tsd->subrace3) { for (const auto &it : tsd->subrace3) {
if (it.race != sstatus->race) if (it.race != sstatus->race)
continue; continue;
@ -909,7 +909,7 @@ int battle_calc_cardfix(int attack_type, struct block_list *src, struct block_li
} }
cardfix = cardfix * (100 - tsd->subsize[sstatus->size] - tsd->subsize[SZ_ALL]) / 100; cardfix = cardfix * (100 - tsd->subsize[sstatus->size] - tsd->subsize[SZ_ALL]) / 100;
cardfix = cardfix * (100 - tsd->subrace2[s_race2]) / 100; cardfix = cardfix * (100 - tsd->subrace2[s_race2]) / 100;
int race_fix = tsd->subrace[sstatus->race] - tsd->subrace[RC_ALL]; int race_fix = tsd->subrace[sstatus->race] + tsd->subrace[RC_ALL];
for (const auto &it : tsd->subrace3) { for (const auto &it : tsd->subrace3) {
if (it.race != sstatus->race) if (it.race != sstatus->race)
continue; continue;
@ -956,7 +956,7 @@ int battle_calc_cardfix(int attack_type, struct block_list *src, struct block_li
ele_fix += tsd->subdefele[s_defele] + tsd->subdefele[ELE_ALL]; ele_fix += tsd->subdefele[s_defele] + tsd->subdefele[ELE_ALL];
cardfix = cardfix * (100 - ele_fix) / 100; cardfix = cardfix * (100 - ele_fix) / 100;
} }
int race_fix = tsd->subrace[sstatus->race] - tsd->subrace[RC_ALL]; int race_fix = tsd->subrace[sstatus->race] + tsd->subrace[RC_ALL];
for (const auto &it : tsd->subrace3) { for (const auto &it : tsd->subrace3) {
if (it.race != sstatus->race) if (it.race != sstatus->race)
continue; continue;