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

Adjusts map_foreachindir to include caster's cell (#5314)

Browse Source 
* Fixes #3502.
* Adjusts map_foreachindir to include the caster's cell when calculating area of effect.
* Adds battle config 'skill_eightpath_same_cell' to allow toggling of the effect.
Thanks to @mrjnumber1!
This commit is contained in:
Aleos 2020-08-13 11:16:55 -04:00 committed by GitHub
parent 78676d8a6f
commit 3060865aa0
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
conf/battle/skill.conf
View File

@ -355,6 +355,10 @@ default_fixed_castrate: 20
// Note: Brandish Spear will always use this algorithm due to its special damage behavior.
skill_eightpath_algorithm: yes
// Should skills that use skill_eightpath_algorithm include targets in the caster's cell?
// Official: yes
skill_eightpath_same_cell: yes
// Can damage skill units like icewall and traps (Note 3)
// On official servers, players can damage icewalls and some traps with skills. When monsters use skills, damage
// will show on the icewalls and traps, but it is not actually substracted from the durability.

1
src/map/battle.cpp
View File

@ -8939,6 +8939,7 @@ static const struct _battle_data {
{ "monster_eye_range_bonus", &battle_config.mob_eye_range_bonus, 0, 0, 10, },
{ "monster_stuck_warning", &battle_config.mob_stuck_warning, 0, 0, 1, },
{ "skill_eightpath_algorithm", &battle_config.skill_eightpath_algorithm, 1, 0, 1, },
{ "skill_eightpath_same_cell", &battle_config.skill_eightpath_same_cell, 1, 0, 1, },
{ "death_penalty_maxlv", &battle_config.death_penalty_maxlv, 0, 0, 3, },
{ "exp_cost_redemptio", &battle_config.exp_cost_redemptio, 1, 0, 100, },
{ "exp_cost_redemptio_limit", &battle_config.exp_cost_redemptio_limit, 5, 0, MAX_PARTY, },

1
src/map/battle.hpp
View File

@ -622,6 +622,7 @@ struct Battle_Config
int mob_eye_range_bonus; //Vulture's Eye and Snake's Eye range bonus
int mob_stuck_warning; //Show warning if a monster is stuck too long
int skill_eightpath_algorithm; //Official path algorithm
int skill_eightpath_same_cell;
int death_penalty_maxlv;
int exp_cost_redemptio;
int exp_cost_redemptio_limit;

4
src/map/map.cpp
View File

@ -1420,7 +1420,7 @@ int map_foreachindir(int(*func)(struct block_list*, va_list), int16 m, int16 x0,
rx = (bl->x - x0);
ry = (bl->y - y0);
//Do not hit source cell
if (rx == 0 && ry == 0)
if (battle_config.skill_eightpath_same_cell == 0 && rx == 0 && ry == 0)
continue;
//This turns it so that the area that is hit is always with positive rx and ry
rx *= dx;
@ -1456,7 +1456,7 @@ int map_foreachindir(int(*func)(struct block_list*, va_list), int16 m, int16 x0,
rx = (bl->x - x0);
ry = (bl->y - y0);
//Do not hit source cell
if (rx == 0 && ry == 0)
if (battle_config.skill_eightpath_same_cell == 0 && rx == 0 && ry == 0)
continue;
//This turns it so that the area that is hit is always with positive rx and ry
rx *= dx;