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

Fixed monster attack calculations (#6319)

Browse Source 
Fixes #6273

Thanks to @Zeloss, @zyudimosha, @sonniez, @Everade and @limitro
This commit is contained in:
Lemongrass3110 2021-10-18 11:16:29 +02:00 committed by GitHub
parent e015832fa0
commit 36ca3bca05
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/map/battle.cpp
View File

@ -6105,13 +6105,17 @@ static struct Damage battle_calc_weapon_attack(struct block_list *src, struct bl
#endif #endif
} }
#ifndef RENEWAL #ifdef RENEWAL
if(tsd) { // Card Fix for target (tsd), 2 is not added to the "left" flag meaning "target cards only" // In renewal only do it for non player attacks
if( tsd && !sd ){
#else
if( tsd ){
#endif
// Card Fix for target (tsd), 2 is not added to the "left" flag meaning "target cards only"
wd.damage += battle_calc_cardfix(BF_WEAPON, src, target, nk, right_element, left_element, wd.damage, 0, wd.flag); wd.damage += battle_calc_cardfix(BF_WEAPON, src, target, nk, right_element, left_element, wd.damage, 0, wd.flag);
if(is_attack_left_handed(src, skill_id)) if(is_attack_left_handed(src, skill_id))
wd.damage2 += battle_calc_cardfix(BF_WEAPON, src, target, nk, right_element, left_element, wd.damage2, 1, wd.flag); wd.damage2 += battle_calc_cardfix(BF_WEAPON, src, target, nk, right_element, left_element, wd.damage2, 1, wd.flag);
} }
#endif
// only do 1 dmg to plant, no need to calculate rest // only do 1 dmg to plant, no need to calculate rest
if(infdef){ if(infdef){