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

Fixes renewal Brandish Spear range (#5310)

Browse Source 
* Fixes #5251.
* Range should be BF_LONG only and not stacked with BF_SHORT.
* Cleans up battle_range_type checks.
Thanks to @PipeDeveloper!
This commit is contained in:
Aleos 2020-08-11 08:51:03 -04:00 committed by GitHub
parent 84223d5e22
commit 90956f2a79
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 16 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
src/map/battle.cpp
View File

@ -2278,13 +2278,22 @@ static int battle_range_type(struct block_list *src, struct block_list *target,
if (skill_get_inf2(skill_id, INF2_ISTRAP)) if (skill_get_inf2(skill_id, INF2_ISTRAP))
return BF_SHORT; return BF_SHORT;
// When monsters use Arrow Shower or Bomb, it is always short range switch (skill_id) {
if (src->type == BL_MOB && (skill_id == AC_SHOWER || skill_id == AM_DEMONSTRATION)) case AC_SHOWER:
return BF_SHORT; case AM_DEMONSTRATION:
// When monsters use Arrow Shower or Bomb, it is always short range
// Cast range is 7 cells and player jumps to target but skill is considered melee if (src->type == BL_MOB)
if (skill_id == GC_CROSSIMPACT) return BF_SHORT;
return BF_SHORT; break;
#ifdef RENEWAL
case KN_BRANDISHSPEAR:
// Renewal changes to ranged physical damage
return BF_LONG;
#endif
case GC_CROSSIMPACT:
// Cast range is 7 cells and player jumps to target but skill is considered melee
return BF_SHORT;
}
//Skill Range Criteria //Skill Range Criteria
if (battle_config.skillrange_by_distance && if (battle_config.skillrange_by_distance &&
@ -5622,11 +5631,6 @@ static struct Damage initialize_weapon_data(struct block_list *src, struct block
wd.blewcount = 0; wd.blewcount = 0;
break; break;
#ifdef RENEWAL
case KN_BRANDISHSPEAR:
wd.flag |= BF_LONG;
break;
#endif
case KN_AUTOCOUNTER: case KN_AUTOCOUNTER:
wd.flag = (wd.flag&~BF_SKILLMASK)|BF_NORMAL; wd.flag = (wd.flag&~BF_SKILLMASK)|BF_NORMAL;
break; break;