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

Fixes Grand Cross self damage (#6716)

Browse Source 
* Fixes #6647.
* Grand Cross will no longer display miss on self.
Thanks to @eppc0330 and @secretdataz!
This commit is contained in:
Aleos 2022-03-23 10:38:43 -04:00 committed by GitHub
parent 302168d1f3
commit ce4aed26bb
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 0 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
db/re/skill_db.yml
View File

@ -7294,8 +7294,6 @@ Body:
DamageFlags: DamageFlags:
IgnoreAtkCard: true IgnoreAtkCard: true
IgnoreFlee: true IgnoreFlee: true
Flags:
TargetSelf: true
Range: 5 Range: 5
Hit: Single Hit: Single
HitCount: 1 HitCount: 1

5
src/map/battle.cpp
View File

@ -7708,17 +7708,12 @@ struct Damage battle_calc_magic_attack(struct block_list *src,struct block_list
struct Damage wd = battle_calc_weapon_attack(src,target,skill_id,skill_lv,mflag); struct Damage wd = battle_calc_weapon_attack(src,target,skill_id,skill_lv,mflag);
ad.damage = battle_attr_fix(src, target, wd.damage + ad.damage, s_ele, tstatus->def_ele, tstatus->ele_lv) * (100 + 40 * skill_lv) / 100; ad.damage = battle_attr_fix(src, target, wd.damage + ad.damage, s_ele, tstatus->def_ele, tstatus->ele_lv) * (100 + 40 * skill_lv) / 100;
#ifdef RENEWAL
if (src == target)
ad.damage = 0;
#else
if(src == target) { if(src == target) {
if(src->type == BL_PC) if(src->type == BL_PC)
ad.damage = ad.damage / 2; ad.damage = ad.damage / 2;
else else
ad.damage = 0; ad.damage = 0;
} }
#endif
} }
break; break;
} }